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

package/commands/init.mjs

@@ -4,7 +4,7 @@
 // Uses core.hooksPath (git-lfs pattern) for system-wide hook interception.
 // Uses IDE tasks for auto-pull on workspace open.
 
-import { existsSync, writeFileSync, symlinkSync, lstatSync, readdirSync, readFileSync, rmSync, realpathSync, appendFileSync } from 'node:fs';
+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 { homedir } from 'node:os';
@@ -103,6 +103,29 @@ 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.
+ */
+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 repos = settings['git.additionalRepositories'] || [];
+    if (!repos.includes('.aw')) {
+      settings['git.additionalRepositories'] = [...repos, '.aw'];
+      writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n');
+    }
+  } catch { /* best effort */ }
+}
+
 const ALLOWED_NAMESPACES = ['platform', 'revex', 'mobile', 'commerce', 'leadgen', 'crm', 'marketplace', 'ai'];
 
 export async function initCommand(args) {
@@ -272,6 +295,7 @@ 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.
@@ -398,6 +422,7 @@ 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

@@ -231,32 +231,74 @@ export function removeFromSparseCheckout(awHome, removePaths) {
  */
 export async function fetchAndMerge(awHome, { silent = true } = {}) {
   // ── 1. Branch guard ──────────────────────────────────────────────────────
-  // If ~/.aw is on the wrong branch (e.g. initPersistentClone cloned but the
-  // `git checkout chore/stream-registry` step failed, leaving HEAD on main),
-  // stash any local changes and switch back before doing anything.
+  // If ~/.aw drifted off REGISTRY_BASE_BRANCH (e.g. partial init left it on
+  // `main`), repair the sparse checkout and switch back — then RETURN EARLY.
+  // We never run fetch/rebase on a wrong-branch run: a --no-edit merge or a
+  // rebase between unrelated histories can disable sparse checkout and wipe
+  // the working tree.  The NEXT aw init call (hook/IDE/user) will do the sync.
   try {
     const { stdout: branchOut } = await exec(
       `git -C "${awHome}" rev-parse --abbrev-ref HEAD`,
     );
     const currentBranch = branchOut.trim();
+
     if (currentBranch !== REGISTRY_BASE_BRANCH && currentBranch !== 'HEAD') {
-      let stashed = false;
+      // 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.
+      // If the file is also empty/gone we set a safe fallback covering the
+      // whole registry so the checkout materialises *something*.
       try {
-        const { stdout: stashOut } = await exec(
-          `git -C "${awHome}" stash push --include-untracked -m "aw: branch-guard stash"`,
+        await exec(`git -C "${awHome}" sparse-checkout init --no-cone`);
+        const { stdout: listOut } = await exec(
+          `git -C "${awHome}" sparse-checkout list`,
         );
-        stashed = !stashOut.includes('No local changes to save');
-      } catch { /* best effort */ }
+        if (!listOut.trim()) {
+          // Paths were cleared — restore a safe default (full registry tree)
+          await exec(
+            `git -C "${awHome}" sparse-checkout set "${REGISTRY_DIR}/"`,
+          );
+        }
+      } catch {
+        // Completely broken sparse config — force a safe default
+        try {
+          await exec(`git -C "${awHome}" sparse-checkout init --no-cone`);
+          await exec(
+            `git -C "${awHome}" sparse-checkout set "${REGISTRY_DIR}/"`,
+          );
+        } catch { /* best effort */ }
+      }
+
+      // Switch to the correct branch; this materialises files via lazy fetch.
       try {
         await exec(`git -C "${awHome}" checkout ${REGISTRY_BASE_BRANCH}`);
-      } catch { /* if checkout fails, proceed — fetch will still work */ }
-      if (stashed) {
-        try { await exec(`git -C "${awHome}" stash pop`); } catch { /* best effort */ }
+      } catch {
+        // checkout failed — repo is in a bad state we cannot repair here.
+        // Return without touching anything; the user can run `aw init` to
+        // trigger a full re-clone via initPersistentClone.
+        return { updated: false, conflicts: [] };
       }
+
+      // Branch repaired.  Do NOT continue to fetch/rebase on this same run —
+      // that combination is what caused the original wipe.
+      return { updated: false, conflicts: [] };
     }
-  } catch { /* if branch detection fails, proceed */ }
+  } catch { /* branch detection failed — proceed with normal sync */ }
+
+  // ── 2. Repair sparse checkout if disabled on correct branch ──────────────
+  // Guard: if something disabled sparse checkout while on the right branch
+  // (should be rare), re-enable before fetch so the working tree stays intact.
+  try {
+    await exec(`git -C "${awHome}" sparse-checkout list`);
+  } catch {
+    try {
+      await exec(`git -C "${awHome}" sparse-checkout init --no-cone`);
+      // Re-checkout to materialise files according to restored sparse config
+      await exec(`git -C "${awHome}" checkout ${REGISTRY_BASE_BRANCH}`);
+    } catch { /* best effort */ }
+  }
 
-  // ── 2. Fetch ──────────────────────────────────────────────────────────────
+  // ── 3. Fetch ──────────────────────────────────────────────────────────────
   try {
     await exec(`git -C "${awHome}" fetch origin ${REGISTRY_BASE_BRANCH}`);
   } catch (e) {
@@ -266,7 +308,7 @@ export async function fetchAndMerge(awHome, { silent = true } = {}) {
   let updated = false;
   const conflicts = [];
 
-  // ── 3. Fast-forward (clean case — no local commits ahead of remote) ──────
+  // ── 4. Fast-forward (clean case — no local commits ahead of remote) ──────
   try {
     const { stdout } = await exec(
       `git -C "${awHome}" merge origin/${REGISTRY_BASE_BRANCH} --ff-only`,
@@ -275,7 +317,7 @@ export async function fetchAndMerge(awHome, { silent = true } = {}) {
     return { updated, conflicts };
   } catch { /* ff-only failed — local commits exist, fall through to rebase */ }
 
-  // ── 4. Rebase local commits onto remote ───────────────────────────────────
+  // ── 5. Rebase local commits onto remote ───────────────────────────────────
   // Rebase keeps history linear and never disables sparse checkout.
   try {
     await exec(`git -C "${awHome}" rebase origin/${REGISTRY_BASE_BRANCH}`);

package/package.json

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