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

package/commands/push.mjs

@@ -2,8 +2,12 @@
 
 import { existsSync, statSync, readFileSync, appendFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { execSync, execFileSync } from 'node:child_process';
+import { exec as execCb, execFile as execFileCb } from 'node:child_process';
+import { promisify } from 'node:util';
 import { homedir } from 'node:os';
+
+const exec = promisify(execCb);
+const execFile = promisify(execFileCb);
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
 import { REGISTRY_REPO, REGISTRY_URL, REGISTRY_BASE_BRANCH, REGISTRY_DIR } from '../constants.mjs';
@@ -258,12 +262,14 @@ function parseRegistryPath(relPath) {
 
 // ── CODEOWNERS helpers ────────────────────────────────────────────────
 
-function getGitHubUser() {
+async function getGitHubUser() {
   try {
-    return execSync('gh api user --jq .login', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+    const { stdout } = await exec('gh api user --jq .login');
+    return stdout.trim();
   } catch {
     try {
-      return execSync('git config user.name', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+      const { stdout } = await exec('git config user.name');
+      return stdout.trim();
     } catch {
       return null;
     }
@@ -279,25 +285,26 @@ function isNewNamespaceInCodeowners(codeownersPath, namespace) {
 // ── Create or update PR via gh ────────────────────────────────────────
 
 // Returns { url, updated } — updated=true if an existing PR was refreshed.
-function createOrUpdatePR(awHome, branch, prTitle, prBody) {
+async function createOrUpdatePR(awHome, branch, prTitle, prBody) {
   // Check for existing open PR on this branch
   try {
-    const url = execFileSync('gh', [
+    const { stdout } = await execFile('gh', [
       'pr', 'view', branch, '--json', 'url', '--jq', '.url',
-    ], { cwd: awHome, encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+    ], { cwd: awHome, encoding: 'utf8' });
+    const url = stdout.trim();
     if (url) return { url, updated: true };
   } catch { /* no existing PR */ }
 
   // Create new PR
   try {
-    const url = execFileSync('gh', [
+    const { stdout } = await execFile('gh', [
       'pr', 'create',
       '--base', REGISTRY_BASE_BRANCH,
       '--head', branch,
       '--title', prTitle,
       '--body', prBody,
-    ], { cwd: awHome, encoding: 'utf8' }).trim();
-    return { url, updated: false };
+    ], { cwd: awHome, encoding: 'utf8' });
+    return { url: stdout.trim(), updated: false };
   } catch {
     return {
       url: `https://github.com/${REGISTRY_REPO}/compare/${REGISTRY_BASE_BRANCH}...${branch}?expand=1`,
@@ -312,7 +319,7 @@ function createOrUpdatePR(awHome, branch, prTitle, prBody) {
 //   - Always creates a new branch from current state, commits, pushes, stays there.
 //   - Every aw push = one new branch + one new PR. No force-push, no reuse.
 // Global flow (worktreeFlow=false): same but returns to main after push.
-function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false) {
+async function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false) {
   const added = files.filter(f => !f.deleted);
   const deleted = files.filter(f => f.deleted);
 
@@ -349,7 +356,7 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
   const topNamespaces = [...new Set(files.map(f => f.namespace.split('/')[0]))];
   const codeownersPath = join(awHome, 'CODEOWNERS');
   const newNamespaces = [];
-  const ghUser = getGitHubUser();
+  const ghUser = await getGitHubUser();
   for (const ns of topNamespaces) {
     if (ghUser && isNewNamespaceInCodeowners(codeownersPath, ns)) {
       newNamespaces.push(ns);
@@ -373,7 +380,7 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
   let finalBranch;
   try {
     if (worktreeFlow) {
-      finalBranch = createPushBranch(awHome, generateBranchName(files), pathsToStage, commitMsg, preStaged);
+      finalBranch = await createPushBranch(awHome, generateBranchName(files), pathsToStage, commitMsg, preStaged);
     } else {
       if (!preStaged) {
         try { checkoutMain(awHome); } catch (e) {
@@ -382,7 +389,7 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
           return;
         }
       }
-      finalBranch = createPushBranch(awHome, generateBranchName(files), pathsToStage, commitMsg, preStaged);
+      finalBranch = await createPushBranch(awHome, generateBranchName(files), pathsToStage, commitMsg, preStaged);
       try { checkoutMain(awHome); } catch { /* best effort */ }
     }
     const branchLabel = files.length === 0
@@ -398,7 +405,7 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
   // ── Phase 3: Open PR ───────────────────────────────────────────────
   const s2 = fmt.spinner();
   s2.start('Opening pull request...');
-  const { url: prUrl, updated: prUpdated } = createOrUpdatePR(awHome, finalBranch, prTitle, prBody);
+  const { url: prUrl, updated: prUpdated } = await createOrUpdatePR(awHome, finalBranch, prTitle, prBody);
   s2.stop(prUpdated ? `PR updated — ${chalk.cyan(prUrl)}` : `PR opened — ${chalk.cyan(prUrl)}`);
 
   if (newNamespaces.length > 0) {
@@ -412,7 +419,7 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
 
 // ── Main command ─────────────────────────────────────────────────────
 
-export function pushCommand(args) {
+export async function pushCommand(args) {
   const input = args._positional?.[0];
   const dryRun = args['--dry-run'] === true;
   const cwd = process.cwd();
@@ -457,7 +464,7 @@ export function pushCommand(args) {
         };
       });
       fmt.logInfo(`${chalk.dim('mode:')} staged (${files.length} file${files.length > 1 ? 's' : ''})`);
-      doPush(files, awHome, dryRun, worktreeFlow, true);
+      await doPush(files, awHome, dryRun, worktreeFlow, true);
       return;
     }
 
@@ -471,7 +478,7 @@ export function pushCommand(args) {
 
     if (allEntries.length === 0 && worktreeFlow && commitsAheadOfMain(awHome) > 0) {
       fmt.logInfo(`${chalk.dim('mode:')} auto (no new changes — branching current state)`);
-      doPush([], awHome, dryRun, worktreeFlow, false);
+      await doPush([], awHome, dryRun, worktreeFlow, false);
       return;
     }
 
@@ -498,7 +505,7 @@ export function pushCommand(args) {
       // In worktree flow, still push if there are commits ahead of main not yet in a PR
       if (worktreeFlow && commitsAheadOfMain(awHome) > 0) {
         fmt.logInfo(`${chalk.dim('mode:')} auto (no new changes — branching current state)`);
-        doPush([], awHome, dryRun, worktreeFlow, false);
+        await doPush([], awHome, dryRun, worktreeFlow, false);
         return;
       }
       fmt.cancel('Nothing to push — no staged or modified files.\n\n  Stage files in your IDE or use `aw status` to see changes.');
@@ -506,7 +513,7 @@ export function pushCommand(args) {
     }
 
     fmt.logInfo(`${chalk.dim('mode:')} auto (${files.length} file${files.length > 1 ? 's' : ''} — stage specific files to push a subset)`);
-    doPush(files, awHome, dryRun, worktreeFlow, false);
+    await doPush(files, awHome, dryRun, worktreeFlow, false);
     return;
   }
 
@@ -546,7 +553,7 @@ export function pushCommand(args) {
       fmt.cancel(`Nothing to push in ${chalk.cyan(input)} — no agents, skills, commands, or evals found.`);
       return;
     }
-    doPush(files, awHome, dryRun, worktreeFlow);
+    await doPush(files, awHome, dryRun, worktreeFlow);
     return;
   }
 
@@ -580,7 +587,7 @@ export function pushCommand(args) {
     ? `${REGISTRY_DIR}/${namespacePath}/${parentDir}/${slug}`
     : `${REGISTRY_DIR}/${namespacePath}/${parentDir}/${slug}.md`;
 
-  doPush([{
+  await doPush([{
     absPath,
     registryTarget,
     type: parentDir,

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, rmSync } from 'node:fs';
+import { mkdtempSync, existsSync, lstatSync, rmSync, readFileSync } from 'node:fs';
 import { join, basename, dirname } from 'node:path';
 import { homedir, tmpdir } from 'node:os';
 import { promisify } from 'node:util';
@@ -349,9 +349,9 @@ export function updatePushBranch(awHome, pushBranchName) {
  *
  * Branch stays on disk for iteration. Returns the branch name.
  */
-export function createPushBranch(awHome, branchName, files, commitMsg, preStaged = false) {
+export async function createPushBranch(awHome, branchName, files, commitMsg, preStaged = false) {
   try {
-    execSync(`git -C "${awHome}" checkout -b "${branchName}"`, { stdio: 'pipe' });
+    await exec(`git -C "${awHome}" checkout -b "${branchName}"`);
   } catch (e) {
     throw new Error(`Failed to create branch ${branchName}: ${e.message}`);
   }
@@ -360,21 +360,21 @@ export function createPushBranch(awHome, branchName, files, commitMsg, preStaged
     if (!preStaged) {
       try {
         const quotedFiles = files.map(f => `"${f}"`).join(' ');
-        execSync(`git -C "${awHome}" add ${quotedFiles}`, { stdio: 'pipe' });
+        await exec(`git -C "${awHome}" add ${quotedFiles}`);
       } catch (e) {
         throw new Error(`Failed to stage files: ${e.message}`);
       }
     }
 
     try {
-      execSync(`git -C "${awHome}" commit -m "${commitMsg.replace(/"/g, '\\"')}"`, { stdio: 'pipe' });
+      await exec(`git -C "${awHome}" commit -m "${commitMsg.replace(/"/g, '\\"')}"`);
     } catch (e) {
       throw new Error(`Failed to commit: ${e.message}`);
     }
   }
 
   try {
-    execSync(`git -C "${awHome}" push -u origin "${branchName}"`, { stdio: 'pipe' });
+    await exec(`git -C "${awHome}" push -u origin "${branchName}"`);
   } catch (e) {
     throw new Error(`Failed to push branch: ${e.message}`);
   }
@@ -496,7 +496,12 @@ export function findNearestWorktree(startDir, stopDir) {
 export function isWorktree(dir) {
   const gitPath = join(dir, '.git');
   try {
-    return lstatSync(gitPath).isFile();
+    if (!lstatSync(gitPath).isFile()) return false;
+    // Verify the gitdir it points to actually exists (guards against stale worktrees)
+    const content = readFileSync(gitPath, 'utf8').trim();
+    const match = content.match(/^gitdir:\s*(.+)$/);
+    if (!match) return false;
+    return existsSync(match[1]);
   } catch {
     return false;
   }

package/package.json

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