@ghl-ai/aw 0.1.36-beta.32 → 0.1.36-beta.33

package/commands/pull.mjs

@@ -7,7 +7,7 @@ import { execSync } from 'node:child_process';
 import * as config from '../config.mjs';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
-import { fetchAndMerge, addToSparseCheckout, isValidClone, isWorktree, rebaseOntoOriginMain } from '../git.mjs';
+import { fetchAndMerge, addToSparseCheckout, isValidClone, findNearestWorktree, rebaseOntoOriginMain } from '../git.mjs';
 import { REGISTRY_DIR, REGISTRY_REPO, REGISTRY_URL, DOCS_SOURCE_DIR } from '../constants.mjs';
 import { linkWorkspace } from '../link.mjs';
 import { generateCommands, copyInstructions } from '../integrate.mjs';
@@ -76,8 +76,8 @@ export async function pullCommand(args) {
   }
 
   // Always rebase project worktree's current branch onto origin/main
-  const localAw = join(cwd, '.aw');
-  if (cwd !== HOME && isWorktree(localAw)) {
+  const localAw = cwd !== HOME ? findNearestWorktree(cwd, HOME) : null;
+  if (localAw) {
     const rebaseSpinner = log.spinner();
     rebaseSpinner.start('Rebasing local branch onto latest...');
     try {

package/commands/push.mjs

@@ -15,7 +15,7 @@ import {
   createPushBranch,
   checkoutMain,
   isValidClone,
-  isWorktree,
+  findNearestWorktree,
   getLocalRegistryDir,
   commitsAheadOfMain,
   logAheadOfMain,
@@ -422,8 +422,8 @@ export function pushCommand(args) {
 
   // If the project has a local worktree (.aw/ with a .git file), use it so
   // changes made inside the project are correctly detected and committed.
-  const localAw = join(cwd, '.aw');
-  const hasWorktree = isWorktree(localAw);
+  const localAw = findNearestWorktree(cwd, HOME);
+  const hasWorktree = localAw !== null;
   const awHome = hasWorktree ? localAw : globalAw;
   const registrySubDir = join(awHome, REGISTRY_DIR);
   const workspaceDir = getLocalRegistryDir(cwd, join(HOME, '.aw_registry'));

package/commands/status.mjs

@@ -5,7 +5,7 @@ import { homedir } from 'node:os';
 import * as config from '../config.mjs';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
-import { detectChanges, getCurrentBranch, commitsAheadOfMain, isValidClone, isWorktree } from '../git.mjs';
+import { detectChanges, getCurrentBranch, commitsAheadOfMain, isValidClone, findNearestWorktree } from '../git.mjs';
 import { REGISTRY_DIR, REGISTRY_REPO, REGISTRY_URL } from '../constants.mjs';
 
 export function statusCommand(args) {
@@ -15,12 +15,12 @@ export function statusCommand(args) {
   const GLOBAL_AW_DIR = join(HOME, '.aw_registry');
 
   // Use local project worktree if present so changes made there are visible
-  const localAw = join(cwd, '.aw');
-  const AW_HOME = isWorktree(localAw) ? localAw : globalAw;
+  const localAw = cwd !== HOME ? findNearestWorktree(cwd, HOME) : null;
+  const AW_HOME = localAw ?? globalAw;
 
   fmt.intro('aw status');
 
-  if (!isWorktree(localAw) && !isValidClone(AW_HOME, REGISTRY_URL)) {
+  if (!localAw && !isValidClone(AW_HOME, REGISTRY_URL)) {
     fmt.cancel('Registry not initialized. Run: aw init');
     return;
   }

package/git.mjs

@@ -2,8 +2,8 @@
 
 import { execSync, exec as execCb } from 'node:child_process';
 import { mkdtempSync, existsSync, lstatSync, rmSync } from 'node:fs';
-import { join, basename } from 'node:path';
-import { tmpdir } from 'node:os';
+import { join, basename, dirname } from 'node:path';
+import { homedir, tmpdir } from 'node:os';
 import { promisify } from 'node:util';
 import { REGISTRY_BASE_BRANCH, REGISTRY_DIR, DOCS_SOURCE_DIR } from './constants.mjs';
 
@@ -468,10 +468,28 @@ export function rebaseOntoOriginMain(awHome) {
  * 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);
+  const wt = findNearestWorktree(cwd, homedir());
+  if (wt) return join(wt, REGISTRY_DIR);
   return fallback;
 }
 
+/**
+ * Walk up from `startDir` toward `stopDir` looking for the nearest `.aw`
+ * linked worktree. Returns the `.aw` path if found, null otherwise.
+ * Stops at `stopDir` (usually homedir) so it never escapes the user's tree.
+ */
+export function findNearestWorktree(startDir, stopDir) {
+  let dir = startDir;
+  while (dir !== stopDir) {
+    const candidate = join(dir, '.aw');
+    if (isWorktree(candidate)) return candidate;
+    const parent = dirname(dir);
+    if (parent === dir) break; // filesystem root
+    dir = parent;
+  }
+  return null;
+}
+
 /**
  * Check if dir is a git linked worktree (has .git as a FILE, not a directory).
  */

package/package.json

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