@ghl-ai/aw 0.1.36-beta.88 → 0.1.36-beta.90

package/commands/init.mjs

@@ -6,7 +6,7 @@
 
 import { existsSync, mkdirSync, writeFileSync, symlinkSync, lstatSync, readdirSync, readFileSync, rmSync, realpathSync, appendFileSync } from 'node:fs';
 import { execSync } from 'node:child_process';
-import { join, dirname, sep } from 'node:path';
+import { join, dirname, basename, sep } from 'node:path';
 import { homedir } from 'node:os';
 import { fileURLToPath } from 'node:url';
 import * as config from '../config.mjs';
@@ -104,24 +104,43 @@ function installIdeTasks() {
 }
 
 /**
- * Write .vscode/settings.json so Cursor/VS Code always treats .aw/ as a git
- * repository — even on first load before the symlink existed at scan time.
- * Without this, the git panel is blank until the user reloads the IDE.
+ * Write .vscode/settings.json so Cursor/VS Code always treats ~/.aw as a git
+ * repository in the source-control panel.
+ *
+ * VS Code/Cursor does NOT follow symlinks when scanning for git repos, so
+ * `.aw/` → `~/.aw` is never auto-detected. `git.scanRepositories` is also
+ * documented as unreliable for this case.
+ *
+ * The only reliable fix: a `.code-workspace` file that adds `~/.aw` as an
+ * explicit second folder. VS Code/Cursor fully supports multi-root workspaces
+ * and will show the git panel for every folder listed there.
+ *
+ * We create/update `<project>.code-workspace` in the project root and merge
+ * `~/.aw` into its folders array without touching anything else.
  */
 function installVscodeGitSettings(projectDir) {
   if (!projectDir || projectDir === HOME) return;
   try {
-    const vscodeDir = join(projectDir, '.vscode');
-    mkdirSync(vscodeDir, { recursive: true });
-    const settingsPath = join(vscodeDir, 'settings.json');
-    let settings = {};
-    if (existsSync(settingsPath)) {
-      try { settings = JSON.parse(readFileSync(settingsPath, 'utf8')); } catch { /* corrupted — overwrite */ }
+    const projectName = basename(projectDir);
+    const workspacePath = join(projectDir, `${projectName}.code-workspace`);
+
+    let workspace = { folders: [], settings: {} };
+    if (existsSync(workspacePath)) {
+      try { workspace = JSON.parse(readFileSync(workspacePath, 'utf8')); } catch { /* corrupted — overwrite */ }
     }
-    const repos = settings['git.additionalRepositories'] || [];
-    if (!repos.includes('.aw')) {
-      settings['git.additionalRepositories'] = [...repos, '.aw'];
-      writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n');
+
+    workspace.folders = workspace.folders || [];
+    workspace.settings = workspace.settings || {};
+
+    // Ensure project root is listed first
+    const hasRoot = workspace.folders.some(f => f.path === '.' || f.path === projectDir);
+    if (!hasRoot) workspace.folders.unshift({ path: '.' });
+
+    // Add ~/.aw as a second folder if not already present
+    const hasAw = workspace.folders.some(f => f.path === AW_HOME || f.name === 'aw registry');
+    if (!hasAw) {
+      workspace.folders.push({ path: AW_HOME, name: 'aw registry' });
+      writeFileSync(workspacePath, JSON.stringify(workspace, null, 2) + '\n');
     }
   } catch { /* best effort */ }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghl-ai/aw",
-  "version": "0.1.36-beta.88",
+  "version": "0.1.36-beta.90",
   "description": "Agentic Workspace CLI — pull, push & manage agents, skills and commands from the registry",
   "type": "module",
   "bin": "bin.js",