@astroanywhere/agent 0.4.0 → 0.4.1

package/README.md

@@ -20,6 +20,17 @@
 
 ---
 
+<details open>
+<summary><h2>📰 News</h2></summary>
+
+| Date | Update |
+|:-----|:-------|
+| **2026-03-19** | **🤖 Pi Coding Agent support** &mdash; Astro now natively supports [Pi](https://github.com/badlogic/pi-mono), the coding agent powering [OpenClaw](https://github.com/openclaw-ai/openclaw). Auto-detected at launch alongside Claude Code, Codex, and OpenCode. Full streaming, tool result rendering, session preservation, and multi-turn resume. |
+
+</details>
+
+---
+
 ## What is Astro?
 
 [**Astro**](https://astroanywhere.com/landing/) is an orchestrator for AI coding agents. It takes a complex goal, decomposes it into a dependency graph of tasks, and executes them **in parallel** across your machines &mdash; your laptop, GPU servers, HPC clusters, cloud VMs.
@@ -572,9 +583,12 @@ Astro works with the AI coding agents you already use. Install any supported age
 |---|---|---|
 | **Claude Code** | `npm i -g @anthropic-ai/claude-code` | [anthropic.com/claude-code](https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/overview) |
 | **Codex** | `npm i -g @openai/codex` | [github.com/openai/codex](https://github.com/openai/codex) |
+| **Pi** | `npm i -g @mariozechner/pi-coding-agent` | [github.com/badlogic/pi-mono](https://github.com/badlogic/pi-mono) |
 | **OpenClaw** | `npm i -g openclaw` | [github.com/openclaw-ai/openclaw](https://github.com/openclaw-ai/openclaw) |
 | **OpenCode** | `bun i -g opencode` | [github.com/opencode-ai/opencode](https://github.com/opencode-ai/opencode) |
 
+Pi is the coding agent that powers OpenClaw. If you have OpenClaw installed, Pi is already available &mdash; Astro detects it automatically. You can also install Pi standalone for direct access to its multi-provider model support (Anthropic, OpenAI, Google, Bedrock, custom providers via `models.json`).
+
 All agents get full project context injection, real-time output streaming, and session preservation for multi-turn resume. Your API keys stay on your machine &mdash; Astro never sees them.
 
 ### 3. GitHub-Native Workflow

package/dist/lib/git-pr.d.ts

@@ -1,5 +1,13 @@
 /**
- * Git PR utilities for creating pull requests after task execution
+ * Git PR utilities for creating pull requests after task execution.
+ *
+ * GitHub workflow: task branch → PR → project branch (auto-merge).
+ * Task branches NEVER create PRs directly to the base branch (main).
+ * The only PR to main comes from the "Push to GitHub" task node.
+ *
+ * When the worktree is gone (agent cleaned it up during execution),
+ * git operations fall back to gitRoot (branch refs live in shared store),
+ * and gh commands use explicit --repo OWNER/REPO (no local context needed).
  */
 export interface PRResult {
     branchName: string;
@@ -20,35 +28,62 @@ export interface PRResult {
  */
 export declare function getDefaultBranch(repoDir: string): Promise<string>;
 /**
- * Check if the current branch has commits ahead of the base branch
+ * Check if a branch has commits ahead of the base branch.
+ *
+ * When called from a worktree, HEAD resolves to the task branch.
+ * When called from the git root (worktree cleaned up), pass branchName
+ * explicitly so we compare the right ref instead of HEAD.
  */
-export declare function hasBranchCommits(worktreePath: string, baseBranch: string): Promise<boolean>;
+export declare function hasBranchCommits(repoDir: string, baseBranch: string, branchName?: string): Promise<boolean>;
 /**
  * Push the branch to origin
  */
-export declare function pushBranch(worktreePath: string, branchName: string): Promise<{
+export declare function pushBranch(repoDir: string, branchName: string): Promise<{
     ok: boolean;
     error?: string;
 }>;
 /**
- * Create a pull request using the `gh` CLI
+ * Extract the GitHub repo slug (OWNER/REPO) from a git remote URL.
+ * Supports both SSH and HTTPS formats:
+ *   git@github.com:owner/repo.git → owner/repo
+ *   https://github.com/owner/repo.git → owner/repo
  */
-export declare function createPullRequest(worktreePath: string, options: {
+export declare function parseRepoSlug(remoteUrl: string): string | null;
+/**
+ * Get the GitHub repo slug (OWNER/REPO) from a git directory's origin remote.
+ */
+export declare function getRepoSlug(repoDir: string): Promise<string | null>;
+/**
+ * Create a pull request using the `gh` CLI.
+ *
+ * Uses --repo OWNER/REPO when provided so the command doesn't depend on
+ * the local git directory being valid (worktree may have been cleaned up).
+ */
+export declare function createPullRequest(cwd: string, options: {
     branchName: string;
     baseBranch: string;
     title: string;
     body: string;
+    /** Explicit GitHub repo slug (OWNER/REPO) — avoids local git context resolution */
+    repoSlug?: string;
 }): Promise<{
     prUrl: string;
     prNumber: number;
-} | null>;
+} | {
+    error: string;
+}>;
 /**
  * Merge a pull request using the `gh` CLI.
  * Used to auto-merge per-task PRs into the project branch.
+ *
+ * Uses --repo OWNER/REPO when provided so the command doesn't depend on
+ * the local git directory being valid.
  */
-export declare function mergePullRequest(worktreePath: string, prNumber: number, options?: {
+export declare function mergePullRequest(cwd: string, prNumber: number, options?: {
     method?: 'squash' | 'merge' | 'rebase';
     deleteBranch?: boolean;
+    /** Explicit GitHub repo slug (OWNER/REPO) */
+    repoSlug?: string;
 }): Promise<{
     ok: boolean;
     error?: string;
@@ -58,6 +93,27 @@ export declare function mergePullRequest(worktreePath: string, prNumber: number,
  * Fetches first to ensure we have the latest.
  */
 export declare function getRemoteBranchSha(repoDir: string, branchName: string): Promise<string | undefined>;
+/**
+ * Push a branch to origin with retry, delay, and post-push verification.
+ *
+ * Shared by ensureProjectBranch() and the safety net in pushAndCreatePR().
+ * Returns { ok: true } on success, { ok: false, error } on failure.
+ *
+ * - 2-attempt retry with 2s delay between attempts
+ * - "Everything up-to-date" treated as success
+ * - Post-push verification via fetch + rev-parse
+ */
+export declare function pushBranchToRemote(gitRoot: string, branchName: string, options?: {
+    /** Structured operational status line */
+    operational?: (message: string, source: 'astro' | 'git' | 'delivery') => void;
+    /** Label for log messages (default: 'push') */
+    label?: string;
+}): Promise<{
+    ok: true;
+} | {
+    ok: false;
+    error: string;
+}>;
 /**
  * Check if `gh` CLI is available and authenticated
  */
@@ -76,7 +132,21 @@ export declare function getGitRoot(dir: string): Promise<string | null>;
  */
 export declare function autoCommitChanges(worktreePath: string, taskTitle: string): Promise<boolean>;
 /**
- * Full PR creation flow: auto-commit + push + create PR, with graceful fallbacks
+ * Full PR delivery following the accumulative project branch workflow:
+ *
+ *   task branch → push → PR → auto-merge → project branch
+ *
+ * When the worktree has been cleaned up (agent removed it during execution):
+ * - git operations (push, rev-list) use gitRoot — the task branch lives in
+ *   the shared git object store, not the worktree directory
+ * - gh operations (pr create, pr merge) use --repo OWNER/REPO — explicitly
+ *   targets the GitHub repo without depending on local filesystem state
+ * - auto-commit is skipped (nothing to stage if the worktree is gone)
+ *
+ * baseBranch MUST be provided by the caller. It is the project branch
+ * (e.g., astro/7b19a9), never auto-detected. Task branches must never
+ * create PRs directly to the base branch (main) — that's exclusively
+ * the "Push to GitHub" node's responsibility.
  */
 export declare function pushAndCreatePR(worktreePath: string, options: {
     branchName: string;
@@ -88,13 +158,15 @@ export declare function pushAndCreatePR(worktreePath: string, options: {
     autoCommit?: boolean;
     /** Override the default PR body */
     body?: string;
-    /** Target branch for PR base — avoids re-detecting (should match what worktree was created from) */
+    /** Target branch for PR base (project branch). Required for PR creation. */
     baseBranch?: string;
-    /** If true, auto-merge the PR after creation (squash merge into base branch) */
+    /** If true, auto-merge the PR after creation (squash merge into project branch) */
     autoMerge?: boolean;
     /** Merge method for auto-merge (default: 'squash') */
     mergeMethod?: 'squash' | 'merge' | 'rebase';
     /** Git SHA of the base branch before this task — passed through to PRResult */
     commitBeforeSha?: string;
+    /** Git root directory — used when the worktree has been cleaned up */
+    gitRoot?: string;
 }): Promise<PRResult>;
 //# sourceMappingURL=git-pr.d.ts.map

package/dist/lib/git-pr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-pr.d.ts","sourceRoot":"","sources":["../../src/lib/git-pr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"git-pr.d.ts","sourceRoot":"","sources":["../../src/lib/git-pr.ts"],"names":[],"mappings":"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"}

package/dist/lib/git-pr.js

@@ -1,5 +1,13 @@
 /**
- * Git PR utilities for creating pull requests after task execution
+ * Git PR utilities for creating pull requests after task execution.
+ *
+ * GitHub workflow: task branch → PR → project branch (auto-merge).
+ * Task branches NEVER create PRs directly to the base branch (main).
+ * The only PR to main comes from the "Push to GitHub" task node.
+ *
+ * When the worktree is gone (agent cleaned it up during execution),
+ * git operations fall back to gitRoot (branch refs live in shared store),
+ * and gh commands use explicit --repo OWNER/REPO (no local context needed).
  */
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
@@ -41,11 +49,16 @@ export async function getDefaultBranch(repoDir) {
     return 'main';
 }
 /**
- * Check if the current branch has commits ahead of the base branch
+ * Check if a branch has commits ahead of the base branch.
+ *
+ * When called from a worktree, HEAD resolves to the task branch.
+ * When called from the git root (worktree cleaned up), pass branchName
+ * explicitly so we compare the right ref instead of HEAD.
  */
-export async function hasBranchCommits(worktreePath, baseBranch) {
+export async function hasBranchCommits(repoDir, baseBranch, branchName) {
     try {
-        const { stdout } = await execFileAsync('git', ['-C', worktreePath, 'rev-list', '--count', `origin/${baseBranch}..HEAD`], { env: withGitEnv(), timeout: 10_000 });
+        const headRef = branchName ?? 'HEAD';
+        const { stdout } = await execFileAsync('git', ['-C', repoDir, 'rev-list', '--count', `origin/${baseBranch}..${headRef}`], { env: withGitEnv(), timeout: 10_000 });
         return parseInt(stdout.trim(), 10) > 0;
     }
     catch {
@@ -55,17 +68,17 @@ export async function hasBranchCommits(worktreePath, baseBranch) {
 /**
  * Push the branch to origin
  */
-export async function pushBranch(worktreePath, branchName) {
+export async function pushBranch(repoDir, branchName) {
     // Log remote URL for debugging push target
     try {
-        const { stdout: remoteUrl } = await execFileAsync('git', ['-C', worktreePath, 'remote', 'get-url', 'origin'], { env: withGitEnv(), timeout: 5_000 });
+        const { stdout: remoteUrl } = await execFileAsync('git', ['-C', repoDir, 'remote', 'get-url', 'origin'], { env: withGitEnv(), timeout: 5_000 });
         console.log(`[git-pr] Pushing branch ${branchName} to origin (${remoteUrl.trim()})`);
     }
     catch {
-        console.warn(`[git-pr] Could not resolve origin URL for ${worktreePath}`);
+        console.warn(`[git-pr] Could not resolve origin URL for ${repoDir}`);
     }
     try {
-        const { stdout, stderr } = await execFileAsync('git', ['-C', worktreePath, 'push', '-u', 'origin', branchName], { env: withGitEnv(), timeout: 60_000 });
+        const { stdout, stderr } = await execFileAsync('git', ['-C', repoDir, 'push', '-u', 'origin', branchName], { env: withGitEnv(), timeout: 60_000 });
         if (stderr)
             console.log(`[git-pr] Push stderr: ${stderr.trim()}`);
         if (stdout)
@@ -80,17 +93,52 @@ export async function pushBranch(worktreePath, branchName) {
     }
 }
 /**
- * Create a pull request using the `gh` CLI
+ * Extract the GitHub repo slug (OWNER/REPO) from a git remote URL.
+ * Supports both SSH and HTTPS formats:
+ *   git@github.com:owner/repo.git → owner/repo
+ *   https://github.com/owner/repo.git → owner/repo
  */
-export async function createPullRequest(worktreePath, options) {
+export function parseRepoSlug(remoteUrl) {
+    // Handles both SSH (git@github.com:owner/repo.git)
+    // and HTTPS (https://github.com/owner/repo.git) formats.
+    // Note: assumes OWNER/REPO (two segments). GitLab subgroups
+    // (group/subgroup/repo) will extract only the last two segments.
+    const match = remoteUrl.match(/[:/]([^/]+\/[^/]+?)(?:\.git)?$/);
+    if (match)
+        return match[1];
+    return null;
+}
+/**
+ * Get the GitHub repo slug (OWNER/REPO) from a git directory's origin remote.
+ */
+export async function getRepoSlug(repoDir) {
     try {
-        const { stdout } = await execFileAsync('gh', [
+        const { stdout } = await execFileAsync('git', ['-C', repoDir, 'remote', 'get-url', 'origin'], { env: withGitEnv(), timeout: 5_000 });
+        return parseRepoSlug(stdout.trim());
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Create a pull request using the `gh` CLI.
+ *
+ * Uses --repo OWNER/REPO when provided so the command doesn't depend on
+ * the local git directory being valid (worktree may have been cleaned up).
+ */
+export async function createPullRequest(cwd, options) {
+    try {
+        const args = [
             'pr', 'create',
             '--base', options.baseBranch,
             '--head', options.branchName,
             '--title', options.title,
             '--body', options.body,
-        ], { cwd: worktreePath, env: withGitEnv(), timeout: 30_000 });
+        ];
+        if (options.repoSlug) {
+            args.push('--repo', options.repoSlug);
+        }
+        const { stdout } = await execFileAsync('gh', args, { cwd, env: withGitEnv(), timeout: 30_000 });
         const prUrl = stdout.trim();
         // Extract PR number from URL: https://github.com/user/repo/pull/123
         const match = prUrl.match(/\/pull\/(\d+)/);
@@ -100,14 +148,50 @@ export async function createPullRequest(worktreePath, options) {
     catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         console.error(`[git-pr] Failed to create PR: ${msg}`);
-        return null;
+        // If a PR already exists for this branch, look it up instead of failing
+        if (/already exists|already a pull request/i.test(msg)) {
+            console.log(`[git-pr] PR already exists for ${options.branchName}, looking up existing PR`);
+            const existing = await findExistingPR(cwd, options.branchName, options.repoSlug);
+            if (existing)
+                return existing;
+        }
+        // Try to extract PR URL from the error message itself (gh sometimes includes it)
+        const urlMatch = msg.match(/https:\/\/github\.com\/[^/]+\/[^/]+\/pull\/(\d+)/);
+        if (urlMatch) {
+            return { prUrl: urlMatch[0], prNumber: parseInt(urlMatch[1], 10) };
+        }
+        return { error: msg };
     }
 }
+/**
+ * Look up an existing PR for a given branch using `gh pr view`.
+ */
+async function findExistingPR(cwd, branchName, repoSlug) {
+    try {
+        const args = ['pr', 'view', branchName, '--json', 'url,number'];
+        if (repoSlug) {
+            args.push('--repo', repoSlug);
+        }
+        const { stdout } = await execFileAsync('gh', args, { cwd, env: withGitEnv(), timeout: 15_000 });
+        const parsed = JSON.parse(stdout.trim());
+        if (parsed.url && parsed.number) {
+            console.log(`[git-pr] Found existing PR #${parsed.number}: ${parsed.url}`);
+            return { prUrl: parsed.url, prNumber: parsed.number };
+        }
+    }
+    catch (lookupErr) {
+        console.warn(`[git-pr] Failed to look up existing PR for ${branchName}:`, lookupErr);
+    }
+    return null;
+}
 /**
  * Merge a pull request using the `gh` CLI.
  * Used to auto-merge per-task PRs into the project branch.
+ *
+ * Uses --repo OWNER/REPO when provided so the command doesn't depend on
+ * the local git directory being valid.
  */
-export async function mergePullRequest(worktreePath, prNumber, options) {
+export async function mergePullRequest(cwd, prNumber, options) {
     const method = options?.method ?? 'squash';
     const args = [
         'pr', 'merge', String(prNumber),
@@ -116,9 +200,12 @@ export async function mergePullRequest(worktreePath, prNumber, options) {
     if (options?.deleteBranch !== false) {
         args.push('--delete-branch');
     }
+    if (options?.repoSlug) {
+        args.push('--repo', options.repoSlug);
+    }
     try {
         await execFileAsync('gh', args, {
-            cwd: worktreePath,
+            cwd,
             env: withGitEnv(),
             timeout: 60_000,
         });
@@ -145,6 +232,62 @@ export async function getRemoteBranchSha(repoDir, branchName) {
         return undefined;
     }
 }
+/**
+ * Push a branch to origin with retry, delay, and post-push verification.
+ *
+ * Shared by ensureProjectBranch() and the safety net in pushAndCreatePR().
+ * Returns { ok: true } on success, { ok: false, error } on failure.
+ *
+ * - 2-attempt retry with 2s delay between attempts
+ * - "Everything up-to-date" treated as success
+ * - Post-push verification via fetch + rev-parse
+ */
+export async function pushBranchToRemote(gitRoot, branchName, options) {
+    const operational = options?.operational;
+    const label = options?.label ?? 'push';
+    const MAX_ATTEMPTS = 2;
+    let lastError;
+    for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+        try {
+            operational?.(`Pushing ${branchName} to origin (${label} attempt ${attempt}/${MAX_ATTEMPTS})...`, 'git');
+            await execFileAsync('git', ['-C', gitRoot, 'push', '-u', 'origin', branchName], { env: withGitEnv(), timeout: 30_000 });
+            lastError = undefined;
+            operational?.(`${branchName} pushed to origin`, 'git');
+            console.log(`[git-pr] Pushed ${branchName} to origin (${label} attempt ${attempt})`);
+            break;
+        }
+        catch (err) {
+            lastError = err instanceof Error ? err.message : String(err);
+            // "everything up-to-date" is not an error
+            if (lastError.includes('Everything up-to-date') || lastError.includes('up to date')) {
+                operational?.(`${branchName} already up-to-date on origin`, 'git');
+                console.log(`[git-pr] ${branchName} already up-to-date on origin`);
+                lastError = undefined;
+                break;
+            }
+            console.error(`[git-pr] ${label} attempt ${attempt} failed: ${lastError}`);
+            if (attempt < MAX_ATTEMPTS) {
+                operational?.(`Push failed (attempt ${attempt}): ${lastError} — retrying in 2s...`, 'git');
+                await new Promise(resolve => setTimeout(resolve, 2_000));
+            }
+        }
+    }
+    if (lastError) {
+        operational?.(`ERROR: Failed to push ${branchName} to origin: ${lastError}`, 'git');
+        return { ok: false, error: `Failed to push ${branchName} to origin after ${MAX_ATTEMPTS} attempts: ${lastError}` };
+    }
+    // Verify the branch is actually on origin after push.
+    const remoteSha = await getRemoteBranchSha(gitRoot, branchName);
+    if (!remoteSha) {
+        const msg = `Push reported success but ${branchName} not visible on origin (fetch + rev-parse failed)`;
+        operational?.(`ERROR: ${msg}`, 'git');
+        console.error(`[git-pr] ${msg}`);
+        return { ok: false, error: msg };
+    }
+    operational?.(`Verified: ${branchName} on origin (${remoteSha.slice(0, 8)})`, 'git');
+    console.log(`[git-pr] Verified ${branchName} on origin (sha: ${remoteSha.slice(0, 8)})`);
+    return { ok: true };
+}
 /**
  * Check if `gh` CLI is available and authenticated
  */
@@ -224,45 +367,88 @@ async function readBaseBranchFromConfig(gitRoot) {
     return null;
 }
 /**
- * Full PR creation flow: auto-commit + push + create PR, with graceful fallbacks
+ * Full PR delivery following the accumulative project branch workflow:
+ *
+ *   task branch → push → PR → auto-merge → project branch
+ *
+ * When the worktree has been cleaned up (agent removed it during execution):
+ * - git operations (push, rev-list) use gitRoot — the task branch lives in
+ *   the shared git object store, not the worktree directory
+ * - gh operations (pr create, pr merge) use --repo OWNER/REPO — explicitly
+ *   targets the GitHub repo without depending on local filesystem state
+ * - auto-commit is skipped (nothing to stage if the worktree is gone)
+ *
+ * baseBranch MUST be provided by the caller. It is the project branch
+ * (e.g., astro/7b19a9), never auto-detected. Task branches must never
+ * create PRs directly to the base branch (main) — that's exclusively
+ * the "Push to GitHub" node's responsibility.
  */
 export async function pushAndCreatePR(worktreePath, options) {
     const result = { branchName: options.branchName };
-    // Get git root from worktree to find default branch
-    const gitRoot = await getGitRoot(worktreePath);
+    // Resolve git context: worktree if it still exists, gitRoot otherwise.
+    // The task branch lives in the shared git object store (all worktrees
+    // share one .git), so push/rev-list work from gitRoot even when the
+    // worktree directory is gone.
+    const worktreeGitRoot = await getGitRoot(worktreePath);
+    const gitRoot = worktreeGitRoot ?? options.gitRoot ?? null;
     if (!gitRoot) {
-        console.warn(`[git-pr] No git root found for ${worktreePath}, skipping PR`);
+        console.warn(`[git-pr] No git root found for ${worktreePath} and no gitRoot provided`);
         result.error = 'Not a git repository';
         return result;
     }
+    const worktreeAlive = !!worktreeGitRoot;
+    // For git commands: use worktree when available (HEAD = task branch),
+    // fall back to gitRoot (need explicit branch name for rev-list).
+    const gitDir = worktreeAlive ? worktreePath : gitRoot;
+    if (!worktreeAlive) {
+        console.log(`[git-pr] Worktree at ${worktreePath} is gone, using gitRoot: ${gitRoot}`);
+    }
     // Check if repo has a remote
     if (!(await hasRemoteOrigin(gitRoot))) {
         console.warn(`[git-pr] No remote origin for ${gitRoot}, skipping PR`);
         result.error = 'No remote origin configured — cannot push';
         return result;
     }
-    // Priority: caller-provided baseBranch > config file > auto-detection
+    // Resolve the repo slug for gh commands (OWNER/REPO from remote URL).
+    // This makes gh pr create/merge independent of the local filesystem.
+    // Only required when we'll actually run gh commands (not skipPR mode).
+    const repoSlug = await getRepoSlug(gitRoot);
+    if (!repoSlug && !worktreeAlive && !options.skipPR) {
+        console.warn(`[git-pr] Cannot resolve repo slug from ${gitRoot} and worktree is gone`);
+        result.error = 'Cannot resolve GitHub repo — worktree gone and no repo slug';
+        return result;
+    }
+    // baseBranch: caller-provided (project branch) > config > auto-detect.
+    // For the accumulative workflow, the caller should always provide the
+    // project branch. Auto-detection is only a fallback for edge cases
+    // (e.g., "Push to GitHub" node targeting the default branch).
     const baseBranch = options.baseBranch ?? await readBaseBranchFromConfig(gitRoot) ?? await getDefaultBranch(gitRoot);
-    // Auto-commit any uncommitted changes the agent left behind (opt-in, default true)
-    if (options.autoCommit !== false) {
+    // Auto-commit uncommitted changes — only when the worktree still exists.
+    // When the worktree is gone, there's nothing to stage (agent cleaned it up).
+    if (options.autoCommit !== false && worktreeAlive) {
         await autoCommitChanges(worktreePath, options.taskTitle);
     }
-    // Check if there are commits to push
-    const hasCommits = await hasBranchCommits(worktreePath, baseBranch);
+    else if (options.autoCommit !== false && !worktreeAlive) {
+        console.log(`[git-pr] Skipping auto-commit — worktree at ${worktreePath} no longer exists`);
+    }
+    // Check if there are commits to push.
+    // From gitRoot, HEAD is the main checkout (not the task branch), so we
+    // must compare by explicit branch name.
+    const hasCommits = await hasBranchCommits(gitDir, baseBranch, worktreeAlive ? undefined : options.branchName);
     if (!hasCommits) {
-        console.log(`[git-pr] No commits ahead of ${baseBranch} in ${worktreePath}, skipping PR`);
-        // Not an error — agent made no changes
+        console.log(`[git-pr] No commits ahead of ${baseBranch} for ${options.branchName}`);
         return result;
     }
     console.log(`[git-pr] Branch ${options.branchName} has commits ahead of ${baseBranch}`);
-    // Push the branch
-    const pushResult = await pushBranch(worktreePath, options.branchName);
+    // Push the task branch to origin.
+    // Works from gitRoot because the branch ref lives in the shared store.
+    const pushResult = await pushBranch(gitDir, options.branchName);
     if (!pushResult.ok) {
         result.error = pushResult.error || 'Failed to push branch';
         return result;
     }
     result.pushed = true;
-    // Skip PR creation if requested (push-only mode)
+    // Skip PR creation if requested (push-only mode, e.g., "Push to GitHub" node)
     if (options.skipPR) {
         console.log(`[git-pr] skipPR=true, branch pushed (${options.branchName})`);
         return result;
@@ -277,21 +463,51 @@ export async function pushAndCreatePR(worktreePath, options) {
         ?? (options.taskDescription
             ? `## Task\n\n${options.taskDescription}\n\n---\n*Created by Astro task automation*`
             : '*Created by Astro task automation*');
-    const pr = await createPullRequest(worktreePath, {
+    // Safety net: verify the project branch (base for PR) exists on the remote.
+    // ensureProjectBranch() handles this during workspace prep, but if the branch
+    // was deleted between prep and delivery, recover here as a last resort.
+    // Only runs for project branches (autoMerge=true), not for PRs to main/master.
+    if (options.autoMerge) {
+        const remoteSha = await getRemoteBranchSha(gitRoot, baseBranch);
+        if (!remoteSha) {
+            console.warn(`[git-pr] Base branch ${baseBranch} not found on remote — safety-net recovery`);
+            const pushRecovery = await pushBranchToRemote(gitRoot, baseBranch, {
+                label: 'safety-net',
+            });
+            if (!pushRecovery.ok) {
+                result.error = `Base branch ${baseBranch} not on remote: ${pushRecovery.error}. PR delivery cannot proceed.`;
+                return result;
+            }
+        }
+    }
+    // Create PR: task branch → project branch.
+    // Uses --repo when available so gh doesn't depend on local git context.
+    // Guard: if repoSlug is null (non-standard remote URL) and the worktree
+    // was deleted between the initial check and now, gh will fail with a
+    // misleading "not a git repository" error. Re-check and fail clearly.
+    if (!repoSlug && !(await getGitRoot(worktreePath))) {
+        console.warn(`[git-pr] Worktree gone after push and no repo slug — cannot create PR`);
+        result.error = 'Cannot resolve GitHub repo — worktree gone and no repo slug';
+        return result;
+    }
+    console.log(`[git-pr] Creating PR: ${options.branchName} → ${baseBranch}${repoSlug ? ` (repo: ${repoSlug})` : ''}`);
+    const pr = await createPullRequest(gitDir, {
         branchName: options.branchName,
         baseBranch,
         title: options.taskTitle,
         body,
+        repoSlug: repoSlug ?? undefined,
     });
-    if (pr) {
+    if ('prUrl' in pr) {
         result.prUrl = pr.prUrl;
         result.prNumber = pr.prNumber;
         result.commitBeforeSha = options.commitBeforeSha;
         // Auto-merge: squash-merge the per-task PR into the project branch
         if (options.autoMerge && pr.prNumber) {
-            const mergeResult = await mergePullRequest(worktreePath, pr.prNumber, {
+            const mergeResult = await mergePullRequest(gitDir, pr.prNumber, {
                 method: options.mergeMethod ?? 'squash',
                 deleteBranch: true,
+                repoSlug: repoSlug ?? undefined,
             });
             if (mergeResult.ok) {
                 // Capture the project branch SHA after merge
@@ -308,7 +524,7 @@ export async function pushAndCreatePR(worktreePath, options) {
         }
     }
     else {
-        result.error = 'PR creation failed (gh pr create returned an error)';
+        result.error = `PR creation failed: ${pr.error}`;
     }
     return result;
 }