@ghl-ai/aw 0.1.36-beta.31 → 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,
@@ -320,24 +320,32 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
   const deletedParts = Object.entries(groupBy(deleted, 'type')).map(([t, items]) => `${items.length} ${singular(t, items.length)} removed`);
   const countParts = [...addedParts, ...deletedParts];
 
-  if (files.length === 0) {
-    fmt.logInfo('Branching current state (no new changes)');
-  } else {
-    fmt.logInfo(`${chalk.bold(files.length)} file${files.length > 1 ? 's' : ''} to push (${countParts.join(', ')})`);
-  }
-
+  // ── Dry-run: just list files and exit ──────────────────────────────
   if (dryRun) {
-    for (const f of files) {
-      const ns = chalk.dim(` [${f.namespace}]`);
-      const label = f.deleted ? chalk.red('DELETE') : chalk.yellow(f.type);
-      fmt.logMessage(`  ${label}/${f.slug}${ns}`);
+    if (files.length === 0) {
+      fmt.logInfo('No new changes — would branch current state');
+    } else {
+      fmt.logInfo(`${chalk.bold(files.length)} file${files.length > 1 ? 's' : ''} to push (${countParts.join(', ')})`);
+      for (const f of files) {
+        const ns = chalk.dim(` [${f.namespace}]`);
+        const label = f.deleted ? chalk.red('DELETE') : chalk.yellow(f.type);
+        fmt.logMessage(`  ${label}/${f.slug}${ns}`);
+      }
     }
     fmt.logWarn('No changes made (--dry-run)');
     fmt.outro(chalk.dim('Remove --dry-run to push'));
     return;
   }
 
-  // Handle CODEOWNERS for new namespaces
+  // ── Phase 1: Prepare commit ────────────────────────────────────────
+  const prepLabel = files.length === 0
+    ? 'Creating upload branch from HEAD...'
+    : `Preparing ${countParts.join(', ')}...`;
+
+  const s = fmt.spinner();
+  s.start(prepLabel);
+
+  // CODEOWNERS for new namespaces (runs inside spinner so no silent gap)
   const topNamespaces = [...new Set(files.map(f => f.namespace.split('/')[0]))];
   const codeownersPath = join(awHome, 'CODEOWNERS');
   const newNamespaces = [];
@@ -359,19 +367,14 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
   const prTitle = generatePrTitle(files, awHome);
   const prBody = generatePrBody(files, newNamespaces, awHome);
 
-  const s = fmt.spinner();
-  s.start('Committing and pushing...');
+  // ── Phase 2: Commit + push branch ──────────────────────────────────
+  s.message('Creating branch and pushing...');
 
   let finalBranch;
   try {
     if (worktreeFlow) {
-      // ── Worktree flow ─────────────────────────────────────────────────
-      // Always create a new branch from current state, commit, push, stay there.
-      // Every push = one new branch + one new PR. No force-push, no branch reuse.
       finalBranch = createPushBranch(awHome, generateBranchName(files), pathsToStage, commitMsg, preStaged);
     } else {
-      // ── Global clone flow ─────────────────────────────────────────────
-      // Checkout main → create branch → commit → push → return to main.
       if (!preStaged) {
         try { checkoutMain(awHome); } catch (e) {
           s.stop(chalk.red('Push failed'));
@@ -382,17 +385,21 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
       finalBranch = createPushBranch(awHome, generateBranchName(files), pathsToStage, commitMsg, preStaged);
       try { checkoutMain(awHome); } catch { /* best effort */ }
     }
-    s.stop('Branch pushed');
+    const branchLabel = files.length === 0
+      ? 'Branch created'
+      : `Pushed ${countParts.join(', ')}`;
+    s.stop(branchLabel);
   } catch (e) {
     s.stop(chalk.red('Push failed'));
     fmt.cancel(`Push failed: ${e.message}`);
     return;
   }
 
+  // ── Phase 3: Open PR ───────────────────────────────────────────────
   const s2 = fmt.spinner();
-  s2.start('Creating PR...');
+  s2.start('Opening pull request...');
   const { url: prUrl, updated: prUpdated } = createOrUpdatePR(awHome, finalBranch, prTitle, prBody);
-  s2.stop(prUpdated ? 'PR updated' : 'PR created');
+  s2.stop(prUpdated ? `PR updated — ${chalk.cyan(prUrl)}` : `PR opened — ${chalk.cyan(prUrl)}`);
 
   if (newNamespaces.length > 0) {
     fmt.logInfo(`New namespace${newNamespaces.length > 1 ? 's' : ''} ${chalk.cyan(newNamespaces.join(', '))} — CODEOWNERS entr${newNamespaces.length > 1 ? 'ies' : 'y'} added`);
@@ -400,7 +407,6 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
   if (worktreeFlow) {
     fmt.logInfo(chalk.dim(`On branch ${finalBranch} — run aw push again to open a new PR`));
   }
-  fmt.logSuccess(`PR: ${chalk.cyan(prUrl)}`);
   fmt.outro('⟁  Push complete');
 }
 
@@ -416,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.31",
+  "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",