Merge branch 'api-branch' into api/remove-git-feature

Author: KTrain5169

packages/cli/package.json

@@ -14,15 +14,17 @@
   },
   "keywords": [],
   "author": "",
-  "license": "ISC",
+  "license": "MIT",
   "dependencies": {
     "@octokit/rest": "^22.0.1",
+    "adm-zip": "^0.5.17",
     "ansis": "^4.2.0",
     "citty": "^0.2.2"
   },
   "devDependencies": {
-    "@types/node": "22.14.0",
-    "@typescript/native-preview": "7.0.0-dev.20260418.1",
+    "@types/adm-zip": "^0.5.8",
+    "@types/node": "24.12.0",
+    "@typescript/native-preview": "7.0.0-dev.20260502.1",
     "tsdown": "^0.21.7"
   }
 }

packages/cli/src/commands/new.ts

@@ -1,4 +1,9 @@
 import { defineCommand } from 'citty';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
+import assert from 'assert';
+import { exec } from 'child_process';
 
 export const newCommand = defineCommand({
     meta: {
@@ -25,12 +30,68 @@ export const newCommand = defineCommand({
         },
     },
     async run(ctx) {
-        if (!ctx.args.directory) console.warn(`No directory provided, defaulitng to ${process.cwd()}`);
+        const targetDir = ctx.args.directory;
+
+        console.log(`Downloading template to ${targetDir}...`);
+
+        // Download the zipball
         const client = new (await import('@octokit/rest')).Octokit();
         const response = await client.repos.downloadZipballArchive({
             owner: 'VSC-NeuroPilot',
             repo: 'neuropilot-companion-template',
             ref: 'master',
         });
+
+        // Create a temporary file
+        const tempDir = os.tmpdir();
+        const tempZipPath = path.join(tempDir, `neuropilot-template-${Date.now()}.zip`);
+
+        // Write the zip data to the temp file
+        // The response.data is a Buffer or ArrayBuffer
+        fs.writeFileSync(tempZipPath, Buffer.from(response.data as ArrayBuffer));
+
+        // Extract the zip file
+        const AdmZip = (await import('adm-zip')).default;
+        const zip = new AdmZip(tempZipPath);
+        const tempExtractDir = path.join(tempDir, `neuropilot-template-extract-${Date.now()}`);
+        zip.extractAllTo(tempExtractDir, true);
+
+        // GitHub wraps the content in a folder named like "repo-ref"
+        // Find that folder and copy its contents to the target directory
+        const extractedContents = fs.readdirSync(tempExtractDir);
+        assert(extractedContents.length !== 0, 'Extracted archive is empty');
+        const wrappedFolder = extractedContents[0]!; // Should be the only item
+        const sourceDir = path.join(tempExtractDir, wrappedFolder);
+
+        // Create target directory if it doesn't exist
+        if (!fs.existsSync(targetDir)) {
+            fs.mkdirSync(targetDir, { recursive: true });
+        }
+
+        // Copy contents from source to target
+        const copyRecursive = (src: string, dest: string) => {
+            const items = fs.readdirSync(src);
+            for (const item of items) {
+                const srcPath = path.join(src, item);
+                const destPath = path.join(dest, item);
+
+                if (fs.statSync(srcPath).isDirectory()) {
+                    fs.mkdirSync(destPath, { recursive: true });
+                    copyRecursive(srcPath, destPath);
+                } else {
+                    fs.copyFileSync(srcPath, destPath);
+                }
+            }
+        };
+
+        copyRecursive(sourceDir, targetDir);
+
+        // Clean up temporary files
+        fs.rmSync(tempZipPath);
+        fs.rmSync(tempExtractDir, { recursive: true });
+
+        console.log('Template downloaded successfully!');
+
+        // Handle git init and npm install based on args...
     },
 });

packages/cli/src/commands/test.ts

@@ -0,0 +1,15 @@
+import { defineCommand } from 'citty';
+
+export const testCommand = defineCommand({
+    meta: {
+        name: 'test',
+        description: 'Install and open the integration test extension in VS Code.',
+        hidden: true,
+    },
+    args: {
+        version: {},
+        github: {},
+        vscode: {},
+    },
+    run(ctx) {},
+});

packages/cli/src/index.ts

@@ -1,16 +1,18 @@
 import { defineCommand, runMain } from 'citty';
 
-import { downloadCommand } from './commands/download';
-
 import pkg from '../package.json';
 
+import { downloadCommand } from './commands/download';
+import { newCommand } from './commands/new';
+import { testCommand } from './commands/test';
+
 const main = defineCommand({
     meta: {
         name: Object.keys(pkg.bin)[0]!,
         version: pkg.version,
         description: pkg.description,
     },
-    subCommands: { download: downloadCommand },
+    subCommands: { download: downloadCommand, new: newCommand, test: testCommand },
 });
 
 runMain(main);

packages/types/package.json

@@ -22,7 +22,7 @@
   },
   "keywords": [],
   "author": "KTrain5369",
-  "license": "ISC",
+  "license": "MIT",
   "devDependencies": {
     "@arethetypeswrong/core": "^0.18.2",
     "@types/vscode": "^1.95.0",