@ghl-ai/aw 0.1.36-beta.10 → 0.1.36-beta.12

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 } from '../git.mjs';
+import { fetchAndMerge, addToSparseCheckout, isValidClone, isWorktree, rebaseOntoOriginMain } from '../git.mjs';
 import { REGISTRY_DIR, REGISTRY_REPO, DOCS_SOURCE_DIR } from '../constants.mjs';
 import { linkWorkspace } from '../link.mjs';
 import { generateCommands, copyInstructions } from '../integrate.mjs';
@@ -73,6 +73,18 @@ export async function pullCommand(args) {
     log.logWarn(`Conflicts in: ${fetchResult.conflicts.join(', ')}`);
   }
 
+  // Always rebase project worktree's current branch onto origin/main
+  const localAw = join(cwd, '.aw');
+  if (cwd !== HOME && isWorktree(localAw)) {
+    try {
+      rebaseOntoOriginMain(localAw);
+      if (!silent) log.logStep('Local branch rebased onto latest main');
+    } catch (e) {
+      const msg = e.message?.split('\n').find(l => l.trim()) ?? e.message;
+      if (!silent) log.logWarn(`Rebase skipped: ${msg}`);
+    }
+  }
+
   // Sync content/ → platform/docs/
   syncDocs(AW_HOME, GLOBAL_AW_DIR);
 

package/commands/push.mjs

@@ -12,11 +12,8 @@ import { walkRegistryTree } from '../registry.mjs';
 import {
   detectChanges,
   getStagedFiles,
-  commitToCurrentBranch,
-  updatePushBranch,
   createPushBranch,
   checkoutMain,
-  getCurrentBranch,
   isValidClone,
   isWorktree,
   getLocalRegistryDir,
@@ -26,19 +23,7 @@ const PUSHABLE_TYPES = ['agents', 'skills', 'commands', 'evals'];
 
 // ── PR content generation ────────────────────────────────────────────
 
-// Persistent push branch for a worktree: push/<slug> derived from worktree/<slug>.
-// Same branch is reused across pushes — force-pushed each time, one open PR.
-function getPushBranchName(awHome) {
-  const branch = getCurrentBranch(awHome);
-  if (branch?.startsWith('worktree/')) {
-    return `push/${branch.slice('worktree/'.length)}`;
-  }
-  // Fallback for non-worktree or detached HEAD
-  const shortId = Date.now().toString(36).slice(-5);
-  return `push/batch-${shortId}`;
-}
-
-// Timestamped branch for the global-clone (non-worktree) flow.
+// Auto-generate a branch name from the files being pushed.
 function generateBranchName(files) {
   const shortId = Date.now().toString(36).slice(-5);
   const namespaces = [...new Set(files.map(f => f.namespace))];
@@ -265,6 +250,7 @@ function createOrUpdatePR(awHome, branch, prTitle, prBody) {
     const url = execFileSync('gh', [
       'pr', 'create',
       '--base', REGISTRY_BASE_BRANCH,
+      '--head', branch,
       '--title', prTitle,
       '--body', prBody,
     ], { cwd: awHome, encoding: 'utf8' }).trim();
@@ -280,10 +266,9 @@ function createOrUpdatePR(awHome, branch, prTitle, prBody) {
 // ── Main push pipeline ────────────────────────────────────────────────
 
 // worktreeFlow: true when awHome is a project worktree (not the global clone).
-//   - Commits to the current worktree branch (changes stay visible locally).
-//   - Force-updates persistent push/<slug> branch — no branch switching.
-//   - Reuses same PR across pushes (force-push updates it).
-// Global flow (worktreeFlow=false): legacy branch-per-push on global clone.
+//   - 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) {
   const added = files.filter(f => !f.deleted);
   const deleted = files.filter(f => f.deleted);
@@ -333,14 +318,13 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
   let finalBranch;
   try {
     if (worktreeFlow) {
-      // ── Worktree flow ──────────────────────────────────────────────────
-      // 1. Commit to the current worktree branch — changes stay in local history.
-      commitToCurrentBranch(awHome, pathsToStage, commitMsg, preStaged);
-      // 2. Force-update push/<slug> to HEAD (no branch switch), then force-push.
-      finalBranch = updatePushBranch(awHome, getPushBranchName(awHome));
+      // ── 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 timestamped branch → commit → push → return to main.
+      // ── 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'));
@@ -367,7 +351,7 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
     fmt.logInfo(`New namespace${newNamespaces.length > 1 ? 's' : ''} ${chalk.cyan(newNamespaces.join(', '))} — CODEOWNERS entr${newNamespaces.length > 1 ? 'ies' : 'y'} added`);
   }
   if (worktreeFlow) {
-    fmt.logInfo(chalk.dim('Changes committed locally — iterate freely, push again to update the PR'));
+    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');
@@ -391,7 +375,6 @@ export function pushCommand(args) {
   const registrySubDir = join(awHome, REGISTRY_DIR);
   const workspaceDir = getLocalRegistryDir(cwd, join(HOME, '.aw_registry'));
 
-  // Save current worktree branch so we can restore it after push
   const worktreeFlow = hasWorktree;
 
   fmt.intro('aw push');
@@ -530,7 +513,7 @@ export function pushCommand(args) {
     slug,
     isDir,
     deleted: false,
-  }], awHome, dryRun, worktreeBranch);
+  }], awHome, dryRun, worktreeFlow);
 }
 
 // ── Utilities ─────────────────────────────────────────────────────────

package/git.mjs

@@ -404,6 +404,21 @@ export function checkoutMain(awHome) {
   }
 }
 
+/**
+ * Rebase the current branch onto origin/main.
+ * Assumes `git fetch` has already been run (e.g. via fetchAndMerge).
+ * Throws if there are conflicts — caller should surface the message.
+ */
+export function rebaseOntoOriginMain(awHome) {
+  try {
+    execSync(`git -C "${awHome}" rebase origin/${REGISTRY_BASE_BRANCH}`, { stdio: 'pipe' });
+  } catch (e) {
+    // Surface stderr so callers can show a meaningful message
+    const stderr = e.stderr?.toString().trim() || e.stdout?.toString().trim() || e.message;
+    throw new Error(stderr);
+  }
+}
+
 // ── Project worktree operations ────────────────────────────────────────────────
 
 /**

package/package.json

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