@ghl-ai/aw 0.1.36-beta.73 → 0.1.36-beta.74

package/commands/init.mjs

@@ -235,10 +235,13 @@ export async function initCommand(args) {
     }
 
     const isInsideAw = cwd.endsWith(`${sep}.aw`) || cwd.includes(`${sep}.aw${sep}`);
-    if (cwd !== HOME && !isInsideAw && !isWorktree(join(cwd, '.aw'))) {
+    // Only skip if already a valid symlink (new model). Old git worktrees must be migrated.
+    const awLink = join(cwd, '.aw');
+    const isAlreadySymlink = (() => { try { return lstatSync(awLink).isSymbolicLink() && existsSync(awLink); } catch { return false; } })();
+    if (cwd !== HOME && !isInsideAw && !isAlreadySymlink) {
       try {
         addProjectWorktree(AW_HOME, cwd);
-        if (!silent) fmt.logStep('Linked current project as git worktree');
+        if (!silent) fmt.logStep('Linked current project');
       } catch { /* best effort */ }
     }
 
@@ -356,12 +359,14 @@ export async function initCommand(args) {
     } catch { /* not there, fine */ }
   }
 
-  // Step 4: Link current project as a git worktree (gives IDE git panel)
+  // Step 4: Link current project as a symlink to ~/.aw (gives IDE git panel, shared across all workspaces)
   const isInsideAw = cwd.endsWith(`${sep}.aw`) || cwd.includes(`${sep}.aw${sep}`);
-  if (cwd !== HOME && !isInsideAw && !isWorktree(join(cwd, '.aw'))) {
+  const awLinkFresh = join(cwd, '.aw');
+  const isAlreadySymlinkFresh = (() => { try { return lstatSync(awLinkFresh).isSymbolicLink() && existsSync(awLinkFresh); } catch { return false; } })();
+  if (cwd !== HOME && !isInsideAw && !isAlreadySymlinkFresh) {
     try {
       addProjectWorktree(AW_HOME, cwd);
-      fmt.logStep('Linked current project as git worktree');
+      fmt.logStep('Linked current project');
     } catch { /* best effort */ }
   }
 

package/commands/nuke.mjs

@@ -260,30 +260,45 @@ export async function nukeCommand(args) {
     try { if (existsSync(p)) rmSync(p, { recursive: true, force: true }); } catch { /* best effort */ }
   }
 
-  // Phase 4: git worktrees
+  // Phase 4: project .aw/ links — covers both old git worktrees and new symlinks
   const AW_HOME = join(HOME, '.aw');
+  const wtSpinner = fmt.spinner();
+  wtSpinner.start('Removing project .aw/ links...');
+  let wtRemoved = 0;
+
+  // 4a. Remove old git worktrees (worktree/* branches in ~/.aw)
   if (existsSync(AW_HOME)) {
     try {
       const worktrees = listProjectWorktrees(AW_HOME);
-      if (worktrees.length > 0) {
-        const wtSpinner = fmt.spinner();
-        wtSpinner.start('Removing git worktrees...');
-        let wtRemoved = 0;
-        for (const wt of worktrees) {
-          try {
-            await exec(`git -C "${AW_HOME}" worktree remove "${wt.path}" --force`);
-            wtRemoved++;
-          } catch {
-            try { rmSync(wt.path, { recursive: true, force: true }); } catch { /* best effort */ }
-            wtRemoved++;
-          }
-        }
-        try { await exec(`git -C "${AW_HOME}" worktree prune`); } catch { /* best effort */ }
-        wtSpinner.stop(`Removed ${wtRemoved} project worktree${wtRemoved > 1 ? 's' : ''}`);
+      for (const wt of worktrees) {
+        try { await exec(`git -C "${AW_HOME}" worktree remove "${wt.path}" --force`); } catch {}
+        try { rmSync(wt.path, { recursive: true, force: true }); } catch {}
+        wtRemoved++;
       }
+      try { await exec(`git -C "${AW_HOME}" worktree prune`); } catch {}
     } catch { /* best effort */ }
   }
 
+  // 4b. Remove new-style .aw symlinks pointing to ~/.aw
+  // These are created by the symlink model and are NOT tracked by git worktree list.
+  try {
+    const { stdout: awLinks } = await exec(
+      `find "${HOME}" -maxdepth 5 -name ".aw" -type l 2>/dev/null || true`,
+      { encoding: 'utf8', timeout: 30000 }
+    );
+    for (const linkPath of awLinks.trim().split('\n').filter(Boolean)) {
+      try {
+        const target = readlinkSync(linkPath);
+        if (target === AW_HOME || target.endsWith('/.aw')) {
+          unlinkSync(linkPath);
+          wtRemoved++;
+        }
+      } catch { /* best effort */ }
+    }
+  } catch { /* best effort */ }
+
+  wtSpinner.stop(`Removed ${wtRemoved} project .aw/ link${wtRemoved !== 1 ? 's' : ''}`);
+
   // Phase 6: remove registry clone + docs
   const cloneSpinner = fmt.spinner();
   cloneSpinner.start('Removing registry clone...');

package/commands/status.mjs

@@ -89,22 +89,54 @@ export function statusCommand(args) {
   }
 
   // ── Uncommitted local changes (on top of drift) ───────────────────────────
-  const local = detectChanges(AW_HOME, REGISTRY_DIR);
-  const localDirty = [...local.modified, ...local.added, ...local.deleted, ...local.untracked];
+  const rawLocal = detectChanges(AW_HOME, REGISTRY_DIR);
+  // Filter out internal config files that are managed by `aw init`, not the user
+  const skipFiles = new Set(['.sync-config.json']);
+  const filterConfig = arr => arr.filter(e => !skipFiles.has(e.registryPath));
+  const local = {
+    modified: filterConfig(rawLocal.modified),
+    added: filterConfig(rawLocal.added),
+    deleted: filterConfig(rawLocal.deleted),
+    untracked: filterConfig(rawLocal.untracked),
+  };
+  const localNew = [...local.added, ...local.untracked];
+  const localDirty = [...local.modified, ...localNew, ...local.deleted];
 
   if (localDirty.length > 0) {
     const localParts = [
       (local.modified.length > 0) ? chalk.yellow(`${local.modified.length} modified`) : null,
-      (local.added.length + local.untracked.length > 0) ? chalk.green(`${local.added.length + local.untracked.length} new`) : null,
+      (localNew.length > 0) ? chalk.green(`${localNew.length} new`) : null,
       (local.deleted.length > 0) ? chalk.dim(`${local.deleted.length} deleted`) : null,
     ].filter(Boolean);
     fmt.logWarn(`Uncommitted local changes: ${localParts.join(chalk.dim(' · '))} — run ${chalk.dim('aw push')} to commit & open PR`);
+
+    if (localNew.length > 0) {
+      fmt.note(
+        localNew.map(f => chalk.green(`  + ${f.registryPath}`)).join('\n'),
+        chalk.green('New (uncommitted)')
+      );
+    }
+    if (local.modified.length > 0) {
+      fmt.note(
+        local.modified.map(f => chalk.yellow(`  ~ ${f.registryPath}`)).join('\n'),
+        chalk.yellow('Modified (uncommitted)')
+      );
+    }
+    if (local.deleted.length > 0) {
+      fmt.note(
+        local.deleted.map(f => chalk.dim(`  - ${f.registryPath}`)).join('\n'),
+        chalk.dim('Deleted (uncommitted)')
+      );
+    }
   }
 
-  if (!isOnMain) {
-    const ahead = commitsAheadOfMain(AW_HOME);
-    const aheadStr = ahead > 0 ? ` (${chalk.yellow(`${ahead} commit${ahead !== 1 ? 's' : ''} ahead of main`)})` : '';
-    fmt.logWarn(`On branch ${chalk.yellow(branch)}${aheadStr} — run ${chalk.dim('aw push')} to open a PR or ${chalk.dim('aw pull')} to sync`);
+  const ahead = commitsAheadOfMain(AW_HOME);
+  if (ahead > 0) {
+    const aheadStr = chalk.yellow(`${ahead} commit${ahead !== 1 ? 's' : ''} ahead of main`);
+    const branchStr = isOnMain ? '' : ` on ${chalk.yellow(branch)}`;
+    fmt.logWarn(`${aheadStr}${branchStr} — run ${chalk.dim('aw push')} to open a PR or ${chalk.dim('aw pull')} to sync`);
+  } else if (!isOnMain) {
+    fmt.logWarn(`On branch ${chalk.yellow(branch)} — run ${chalk.dim('aw push')} to open a PR or ${chalk.dim('aw pull')} to sync`);
   }
 
   // Hints

package/git.mjs

@@ -404,18 +404,22 @@ export async function createPushBranch(awHome, branchName, files, commitMsg, pre
 }
 
 /**
- * Count commits on the current branch that are not yet in main.
+ * Count commits on the current branch that are not yet in origin/main.
+ * Falls back to local main if origin/main is not available (e.g. offline).
  */
 export function commitsAheadOfMain(awHome) {
-  try {
-    const out = execSync(
-      `git -C "${awHome}" rev-list --count ${REGISTRY_BASE_BRANCH}..HEAD`,
-      { stdio: 'pipe', encoding: 'utf8' },
-    );
-    return parseInt(out.trim(), 10) || 0;
-  } catch {
-    return 0;
+  for (const base of [`origin/${REGISTRY_BASE_BRANCH}`, REGISTRY_BASE_BRANCH]) {
+    try {
+      const out = execSync(
+        `git -C "${awHome}" rev-list --count ${base}..HEAD`,
+        { stdio: 'pipe', encoding: 'utf8' },
+      );
+      return parseInt(out.trim(), 10) || 0;
+    } catch {
+      continue;
+    }
   }
+  return 0;
 }
 
 /**

package/package.json

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