@ghl-ai/aw 0.1.36-beta.3 → 0.1.36-beta.4

package/commands/drop.mjs

@@ -7,7 +7,7 @@ import * as config from '../config.mjs';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
 import { resolveInput } from '../paths.mjs';
-import { removeFromSparseCheckout, isValidClone } from '../git.mjs';
+import { removeFromSparseCheckout, isValidClone, getLocalRegistryDir } from '../git.mjs';
 import { REGISTRY_DIR, REGISTRY_REPO } from '../constants.mjs';
 import { linkWorkspace } from '../link.mjs';
 
@@ -18,7 +18,7 @@ export function dropCommand(args) {
   const HOME = homedir();
   const AW_HOME = join(HOME, '.aw');
   const GLOBAL_AW_DIR = join(HOME, '.aw_registry');
-  const workspaceDir = join(cwd, '.aw_registry');
+  const workspaceDir = getLocalRegistryDir(cwd, GLOBAL_AW_DIR);
 
   fmt.intro('aw drop');
 

package/commands/init.mjs

@@ -205,7 +205,7 @@ export async function initCommand(args) {
     if (cwd !== HOME) await setupMcp(cwd, freshCfg?.namespace || team, { silent });
     installGlobalHooks();
 
-    if (cwd !== HOME && !existsSync(join(cwd, '.aw_registry')) && !isWorktree(join(cwd, '.aw'))) {
+    if (cwd !== HOME && !isWorktree(join(cwd, '.aw'))) {
       try {
         addProjectWorktree(AW_HOME, cwd);
         if (!silent) fmt.logStep('Linked current project as git worktree');
@@ -220,7 +220,7 @@ export async function initCommand(args) {
         '',
         `  ${chalk.green('✓')} Registry updated`,
         `  ${chalk.green('✓')} IDE integration refreshed`,
-        cwd !== HOME && existsSync(join(cwd, '.aw_registry')) ? `  ${chalk.green('✓')} Current project linked` : null,
+        cwd !== HOME && isWorktree(join(cwd, '.aw')) ? `  ${chalk.green('✓')} Current project linked` : null,
       ].filter(Boolean).join('\n'));
     }
     return;
@@ -301,7 +301,7 @@ export async function initCommand(args) {
   installIdeTasks();
 
   // Step 4: Link current project as a git worktree (gives IDE git panel)
-  if (cwd !== HOME && !existsSync(join(cwd, '.aw_registry')) && !isWorktree(join(cwd, '.aw'))) {
+  if (cwd !== HOME && !isWorktree(join(cwd, '.aw'))) {
     try {
       addProjectWorktree(AW_HOME, cwd);
       fmt.logStep('Linked current project as git worktree');
@@ -319,7 +319,7 @@ export async function initCommand(args) {
     `  ${chalk.green('✓')} IDE integration: ~/.claude/, ~/.cursor/, ~/.codex/`,
     hooksInstalled ? `  ${chalk.green('✓')} Git hooks: auto-sync on pull/clone (core.hooksPath)` : null,
     `  ${chalk.green('✓')} IDE task: auto-sync on workspace open`,
-    cwd !== HOME && existsSync(join(cwd, '.aw_registry')) ? `  ${chalk.green('✓')} Linked in current project` : null,
+    cwd !== HOME && isWorktree(join(cwd, '.aw')) ? `  ${chalk.green('✓')} Linked in current project` : null,
     '',
     `  ${chalk.dim('Existing repos:')} ${chalk.bold('cd <project> && aw link')}`,
     `  ${chalk.dim('New clones:')}     auto-linked via git hook`,

package/commands/link-project.mjs

@@ -1,12 +1,11 @@
 // commands/link-project.mjs — Link current project to registry via git worktree
 
-import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { homedir } from 'node:os';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
 import { addProjectWorktree, isWorktree, isValidClone } from '../git.mjs';
-import { REGISTRY_REPO } from '../constants.mjs';
+import { REGISTRY_DIR, REGISTRY_REPO } from '../constants.mjs';
 
 const HOME = homedir();
 const AW_HOME = join(HOME, '.aw');
@@ -28,25 +27,19 @@ export function linkProjectCommand(args) {
   }
 
   const worktreeDir = join(cwd, '.aw');
-  const registryLink = join(cwd, '.aw_registry');
 
   if (isWorktree(worktreeDir)) {
     fmt.logSuccess(`Already linked — ${chalk.dim('.aw/')} is a git worktree`);
     return;
   }
 
-  if (existsSync(registryLink)) {
-    fmt.logSuccess('.aw_registry already exists in this project');
-    return;
-  }
-
   try {
     addProjectWorktree(AW_HOME, cwd);
     fmt.logSuccess([
       `Linked project as git worktree`,
       '',
-      `  ${chalk.green('✓')} ${chalk.dim('.aw/')}          git worktree (IDE git panel enabled)`,
-      `  ${chalk.green('✓')} ${chalk.dim('.aw_registry/')} symlink → .aw/.aw_registry/`,
+      `  ${chalk.green('✓')} ${chalk.dim('.aw/')}                  git worktree (IDE git panel enabled)`,
+      `  ${chalk.green('✓')} ${chalk.dim(`.aw/${REGISTRY_DIR}/`)} registry content`,
     ].join('\n'));
   } catch (e) {
     fmt.cancel(`Failed to link project: ${e.message}`);

package/commands/push.mjs

@@ -16,6 +16,7 @@ import {
   getCurrentBranch,
   isValidClone,
   isWorktree,
+  getLocalRegistryDir,
 } from '../git.mjs';
 
 const PUSHABLE_TYPES = ['agents', 'skills', 'commands', 'evals'];
@@ -355,7 +356,7 @@ export function pushCommand(args) {
   const hasWorktree = isWorktree(localAw);
   const awHome = hasWorktree ? localAw : globalAw;
   const registrySubDir = join(awHome, REGISTRY_DIR);
-  const workspaceDir = join(cwd, '.aw_registry');
+  const workspaceDir = getLocalRegistryDir(cwd, join(HOME, '.aw_registry'));
 
   // Save current worktree branch so we can restore it after push
   const worktreeBranch = hasWorktree ? getCurrentBranch(awHome) : null;

package/commands/search.mjs

@@ -2,12 +2,13 @@
 
 import { readFileSync, existsSync, readdirSync, statSync, mkdtempSync } from 'node:fs';
 import { join } from 'node:path';
-import { tmpdir } from 'node:os';
+import { tmpdir, homedir } from 'node:os';
 import { execSync } from 'node:child_process';
 import * as config from '../config.mjs';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
 import { REGISTRY_BASE_BRANCH, REGISTRY_REPO, REGISTRY_DIR } from '../constants.mjs';
+import { getLocalRegistryDir } from '../git.mjs';
 
 export function searchCommand(args) {
   const query = (args._positional || []).join(' ').toLowerCase();
@@ -19,7 +20,7 @@ export function searchCommand(args) {
   fmt.intro('aw search');
 
   const cwd = process.cwd();
-  const workspaceDir = join(cwd, '.aw_registry');
+  const workspaceDir = getLocalRegistryDir(cwd, join(homedir(), '.aw_registry'));
 
   // ── Local search ──
   const localResults = searchLocal(workspaceDir, query);

package/git.mjs

@@ -1,7 +1,7 @@
 // git.mjs — Git helpers: sparse checkout (temp) + persistent clone operations.
 
 import { execSync, exec as execCb } from 'node:child_process';
-import { mkdtempSync, existsSync, lstatSync, symlinkSync, rmSync } from 'node:fs';
+import { mkdtempSync, existsSync, lstatSync, rmSync } from 'node:fs';
 import { join, basename } from 'node:path';
 import { tmpdir } from 'node:os';
 import { promisify } from 'node:util';
@@ -28,7 +28,7 @@ export function sparseCheckout(repo, paths) {
   }
 
   try {
-    execSync('git sparse-checkout init --cone', { cwd: tempDir, stdio: 'pipe' });
+    execSync('git sparse-checkout init --no-cone', { cwd: tempDir, stdio: 'pipe' });
     execSync(`git sparse-checkout set --skip-checks ${paths.map(p => `"${p}"`).join(' ')}`, {
       cwd: tempDir, stdio: 'pipe',
     });
@@ -55,7 +55,7 @@ export async function sparseCheckoutAsync(repo, paths) {
   }
 
   try {
-    await exec('git sparse-checkout init --cone', { cwd: tempDir });
+    await exec('git sparse-checkout init --no-cone', { cwd: tempDir });
     await exec(`git sparse-checkout set --skip-checks ${paths.map(p => `"${p}"`).join(' ')}`, { cwd: tempDir });
     await exec(`git checkout ${REGISTRY_BASE_BRANCH}`, { cwd: tempDir });
   } catch (e) {
@@ -123,7 +123,7 @@ export function initPersistentClone(repoUrl, awHome, sparsePaths) {
   }
 
   try {
-    execSync('git sparse-checkout init --cone', { cwd: awHome, stdio: 'pipe' });
+    execSync('git sparse-checkout init --no-cone', { cwd: awHome, stdio: 'pipe' });
     execSync(`git sparse-checkout set ${sparsePaths.map(p => `"${p}"`).join(' ')}`, { cwd: awHome, stdio: 'pipe' });
     execSync(`git checkout ${REGISTRY_BASE_BRANCH}`, { cwd: awHome, stdio: 'pipe' });
   } catch (e) {
@@ -327,6 +327,20 @@ export function checkoutMain(awHome) {
 
 // ── Project worktree operations ────────────────────────────────────────────────
 
+/**
+ * Resolve the registry directory for a given working directory.
+ *
+ * - If cwd/.aw/ is a linked worktree → returns cwd/.aw/.aw_registry/
+ * - Otherwise                         → returns fallback (usually ~/.aw_registry/)
+ *
+ * Works correctly when cwd is HOME: ~/.aw/ is the main clone (not a linked
+ * worktree), so isWorktree returns false and the global fallback is used.
+ */
+export function getLocalRegistryDir(cwd, fallback) {
+  if (isWorktree(join(cwd, '.aw'))) return join(cwd, '.aw', REGISTRY_DIR);
+  return fallback;
+}
+
 /**
  * Check if dir is a git linked worktree (has .git as a FILE, not a directory).
  */
@@ -348,15 +362,9 @@ export function isWorktree(dir) {
  */
 export function addProjectWorktree(awHome, projectDir) {
   const worktreeDir = join(projectDir, '.aw');
-  const registryLink = join(projectDir, '.aw_registry');
 
-  // Already set up — just ensure symlink exists
-  if (isWorktree(worktreeDir)) {
-    if (!existsSync(registryLink)) {
-      symlinkSync(join('.aw', REGISTRY_DIR), registryLink);
-    }
-    return worktreeDir;
-  }
+  // Already set up
+  if (isWorktree(worktreeDir)) return worktreeDir;
 
   const slug = basename(projectDir)
     .toLowerCase()
@@ -388,7 +396,7 @@ export function addProjectWorktree(awHome, projectDir) {
 
   // Set up sparse checkout in the worktree, mirroring the main clone's paths
   try {
-    execSync(`git -C "${worktreeDir}" sparse-checkout init --cone`, { stdio: 'pipe' });
+    execSync(`git -C "${worktreeDir}" sparse-checkout init --no-cone`, { stdio: 'pipe' });
 
     let sparsePaths = [];
     try {
@@ -406,11 +414,6 @@ export function addProjectWorktree(awHome, projectDir) {
     throw new Error(`Failed to configure worktree sparse checkout: ${e.message}`);
   }
 
-  // Relative symlink: project/.aw_registry → .aw/.aw_registry
-  if (!existsSync(registryLink)) {
-    symlinkSync(join('.aw', REGISTRY_DIR), registryLink);
-  }
-
   return worktreeDir;
 }
 
@@ -420,10 +423,6 @@ export function addProjectWorktree(awHome, projectDir) {
  */
 export function removeProjectWorktree(awHome, projectDir) {
   const worktreeDir = join(projectDir, '.aw');
-  const registryLink = join(projectDir, '.aw_registry');
-
-  // Remove .aw_registry symlink
-  try { rmSync(registryLink, { force: true }); } catch { /* best effort */ }
 
   // Remove via git first
   try {

package/hooks.mjs

@@ -55,9 +55,8 @@ if command -v aw >/dev/null 2>&1; then
 fi`);
 
 const POST_CHECKOUT = makeDispatcher('post-checkout', `\
-AW_REGISTRY="$HOME/.aw_registry"
-if [ -d "$AW_REGISTRY" ] && [ ! -e ".aw_registry" ] && [ -d ".git" ]; then
-  ln -s "$AW_REGISTRY" ".aw_registry" 2>/dev/null
+if [ -d "$HOME/.aw" ] && [ ! -d ".aw" ] && [ -d ".git" ] && command -v aw >/dev/null 2>&1; then
+  aw link >/dev/null 2>&1 &
 fi
 if command -v aw >/dev/null 2>&1; then
   aw init --silent >/dev/null 2>&1 &

package/integrate.mjs

@@ -2,15 +2,17 @@
 
 import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
+import { homedir } from 'node:os';
 import * as fmt from './fmt.mjs';
 import * as config from './config.mjs';
+import { getLocalRegistryDir } from './git.mjs';
 
 /**
  * Count hand-written commands already present in the registry.
  * No CLI stub generation — all commands come from the registry itself.
  */
 export function generateCommands(cwd) {
-  const awDir = join(cwd, '.aw_registry');
+  const awDir = getLocalRegistryDir(cwd, join(homedir(), '.aw_registry'));
 
   // Clean old .generated-commands if it exists (migration)
   const oldGenDir = join(awDir, '.generated-commands');

package/link.mjs

@@ -4,6 +4,7 @@ import { existsSync, lstatSync, mkdirSync, readdirSync, unlinkSync, symlinkSync,
 import { join, relative } from 'node:path';
 import { homedir } from 'node:os';
 import * as fmt from './fmt.mjs';
+import { getLocalRegistryDir } from './git.mjs';
 
 function forceSymlink(target, linkPath) {
   try { unlinkSync(linkPath); } catch { /* not there yet */ }
@@ -126,7 +127,8 @@ function flatName(ns, name) {
  * file content is resolved by LLMs at runtime using AW-PROTOCOL.md context.
  */
 export function linkWorkspace(cwd) {
-  const awDir = join(cwd, '.aw_registry');
+  const GLOBAL_AW_DIR = join(homedir(), '.aw_registry');
+  const awDir = getLocalRegistryDir(cwd, GLOBAL_AW_DIR);
   if (!existsSync(awDir)) return 0;
 
   let created = 0;

package/package.json

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