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

package/commands/init.mjs

@@ -4,9 +4,9 @@
 // Uses core.hooksPath (git-lfs pattern) for system-wide hook interception.
 // Uses IDE tasks for auto-pull on workspace open.
 
-import { existsSync, mkdirSync, writeFileSync, symlinkSync, lstatSync, readdirSync, readFileSync, rmSync, realpathSync, appendFileSync } from 'node:fs';
+import { existsSync, writeFileSync, symlinkSync, lstatSync, readdirSync, readFileSync, rmSync, realpathSync, appendFileSync } from 'node:fs';
 import { execSync } from 'node:child_process';
-import { join, dirname, basename, sep } from 'node:path';
+import { join, dirname, sep } from 'node:path';
 import { homedir } from 'node:os';
 import { fileURLToPath } from 'node:url';
 import * as config from '../config.mjs';
@@ -103,48 +103,6 @@ function installIdeTasks() {
   }
 }
 
-/**
- * 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 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 */ }
-    }
-
-    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 */ }
-}
-
 const ALLOWED_NAMESPACES = ['platform', 'revex', 'mobile', 'commerce', 'leadgen', 'crm', 'marketplace', 'ai'];
 
 export async function initCommand(args) {
@@ -314,7 +272,6 @@ export async function initCommand(args) {
         if (!silent) fmt.logStep('Linked current project');
       } catch { /* best effort */ }
     }
-    installVscodeGitSettings(cwd !== HOME ? cwd : null);
 
     // Wire ~/.claude/.cursor/.codex to the project's registry when in a project,
     // so edits to project/.aw/.aw_registry/ are instantly visible in global IDE dirs.
@@ -441,7 +398,6 @@ export async function initCommand(args) {
       fmt.logStep('Linked current project');
     } catch { /* best effort */ }
   }
-  installVscodeGitSettings(cwd !== HOME ? cwd : null);
 
   // Step 5: Wire ~/.claude/.cursor/.codex to the project's registry when in a project,
   // so edits to project/.aw/.aw_registry/ are instantly visible in global IDE dirs.

package/git.mjs

@@ -242,7 +242,11 @@ export async function fetchAndMerge(awHome, { silent = true } = {}) {
     );
     const currentBranch = branchOut.trim();
 
-    if (currentBranch !== REGISTRY_BASE_BRANCH && currentBranch !== 'HEAD') {
+    // Only auto-correct if on `main` — the known partial-init drift state.
+    // Push branches (upload/, remove/, sync/, feat/) are intentional and must
+    // not be switched away from: doing so would make aw push changes disappear.
+    const isDriftBranch = currentBranch === 'main';
+    if (currentBranch !== REGISTRY_BASE_BRANCH && currentBranch !== 'HEAD' && isDriftBranch) {
       // Re-enable sparse checkout before switching branches.
       // If sparse-checkout was disabled (e.g. by an old --no-edit merge),
       // `init --no-cone` restores it from the existing sparse-checkout file.

package/package.json

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