@astroanywhere/agent 0.3.2 → 0.3.4

package/dist/lib/task-executor.d.ts.map

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

package/dist/lib/task-executor.js

@@ -16,7 +16,7 @@ import { SlurmJobMonitor } from './slurm-job-monitor.js';
 import { createWorktree, syncProjectWorktree } from './worktree.js';
 import { ensureProjectWorkspace } from './workspace-root.js';
 import { BranchLockManager } from './branch-lock.js';
-import { pushAndCreatePR, mergePullRequest, getRemoteBranchSha, isGhAvailable } from './git-pr.js';
+import { pushAndCreatePR, mergePullRequest, getRemoteBranchSha, isGhAvailable, getRepoSlug } from './git-pr.js';
 import { localMergeIntoProjectBranch } from './local-merge.js';
 import { checkWorkdirSafety, isGitAvailable, isGitRepo, isUntrackedInParentRepo, createSandbox, WorkdirSafetyTier, } from './workdir-safety.js';
 import { initializeGit } from './git-bootstrap.js';
@@ -94,22 +94,45 @@ After you force-push, I will automatically retry the GitHub merge.`;
  * existing merge retry loop handles real conflicts.
  */
 async function tryPreMergeRebase(workdir, targetBranch, isRemote) {
+    // `git rebase` always operates on the currently checked-out branch (HEAD).
+    // It cannot rebase a detached branch ref. When the worktree is gone, HEAD
+    // in gitRoot is the user's main checkout (e.g., main) — NOT the task branch.
+    // Rebasing from gitRoot would corrupt the user's working directory.
+    // Skip the rebase entirely; the merge/PR flow handles conflicts anyway.
+    //
+    // Best-effort check — worktree could still be deleted after this (TOCTOU),
+    // but the git commands will fail safely and be caught by the outer catch.
+    try {
+        statSync(workdir);
+    }
+    catch {
+        console.log(`[git] Worktree at ${workdir} gone — skipping rebase (cannot rebase non-checked-out branch)`);
+        return { rebased: false, skipped: true };
+    }
     try {
         const rebaseTarget = isRemote ? `origin/${targetBranch}` : targetBranch;
+        const gitEnv = { ...process.env, GIT_TERMINAL_PROMPT: '0' };
         if (isRemote) {
-            await execFileAsync('git', ['fetch', 'origin', targetBranch], { cwd: workdir, timeout: 30_000 });
+            console.log(`[git] fetch origin ${targetBranch} (cwd: ${workdir})`);
+            await execFileAsync('git', ['fetch', 'origin', targetBranch], { cwd: workdir, env: gitEnv, timeout: 30_000 });
         }
         // Check if rebase is needed (target branch moved since we branched)
-        const { stdout: mergeBase } = await execFileAsync('git', ['merge-base', 'HEAD', rebaseTarget], { cwd: workdir });
-        const { stdout: targetTip } = await execFileAsync('git', ['rev-parse', rebaseTarget], { cwd: workdir });
+        console.log(`[git] merge-base HEAD ${rebaseTarget} (cwd: ${workdir})`);
+        const { stdout: mergeBase } = await execFileAsync('git', ['merge-base', 'HEAD', rebaseTarget], { cwd: workdir, env: gitEnv });
+        const { stdout: targetTip } = await execFileAsync('git', ['rev-parse', rebaseTarget], { cwd: workdir, env: gitEnv });
         if (mergeBase.trim() === targetTip.trim()) {
-            return { rebased: false, skipped: true }; // Already up to date
+            console.log(`[git] Already up to date (merge-base = target tip: ${targetTip.trim().slice(0, 7)})`);
+            return { rebased: false, skipped: true };
         }
         // Try automatic rebase — timeout after 60s (should be fast for non-conflicting changes)
-        await execFileAsync('git', ['rebase', rebaseTarget], { cwd: workdir, timeout: 60_000 });
+        console.log(`[git] rebase ${rebaseTarget} (cwd: ${workdir})`);
+        await execFileAsync('git', ['rebase', rebaseTarget], { cwd: workdir, env: gitEnv, timeout: 60_000 });
+        console.log(`[git] Rebase onto ${rebaseTarget} succeeded`);
         return { rebased: true };
     }
-    catch {
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        console.warn(`[git] Rebase onto ${targetBranch} failed: ${msg}`);
         // Abort on failure — existing retry loop will handle conflicts
         await execFileAsync('git', ['rebase', '--abort'], { cwd: workdir }).catch(() => { });
         return { rebased: false };
@@ -571,11 +594,11 @@ export class TaskExecutor {
             text: (data) => {
                 this.wsClient.sendTaskText(taskId, data, textSequence++);
             },
-            toolUse: (toolName, toolInput) => {
-                this.wsClient.sendTaskToolUse(taskId, toolName, toolInput);
+            toolUse: (toolName, toolInput, toolUseId) => {
+                this.wsClient.sendTaskToolUse(taskId, toolName, toolInput, toolUseId);
             },
-            toolResult: (toolName, result, success) => {
-                this.wsClient.sendTaskToolResult(taskId, toolName, result, success);
+            toolResult: (toolName, result, success, toolUseId) => {
+                this.wsClient.sendTaskToolResult(taskId, toolName, result, success, toolUseId);
             },
             fileChange: (path, action, linesAdded, linesRemoved, diff) => {
                 this.wsClient.sendTaskFileChange(taskId, path, action, linesAdded, linesRemoved, diff);
@@ -902,13 +925,13 @@ export class TaskExecutor {
                 resetIdleTimeout();
                 this.wsClient.sendTaskText(normalizedTask.id, data, textSequence++);
             },
-            toolUse: (toolName, toolInput) => {
+            toolUse: (toolName, toolInput, toolUseId) => {
                 resetIdleTimeout();
-                this.wsClient.sendTaskToolUse(normalizedTask.id, toolName, toolInput);
+                this.wsClient.sendTaskToolUse(normalizedTask.id, toolName, toolInput, toolUseId);
             },
-            toolResult: (toolName, result, success) => {
+            toolResult: (toolName, result, success, toolUseId) => {
                 resetIdleTimeout();
-                this.wsClient.sendTaskToolResult(normalizedTask.id, toolName, result, success);
+                this.wsClient.sendTaskToolResult(normalizedTask.id, toolName, result, success, toolUseId);
             },
             fileChange: (path, action, linesAdded, linesRemoved, diff) => {
                 resetIdleTimeout();
@@ -947,14 +970,15 @@ export class TaskExecutor {
         // 30s aligns with the server's heartbeat check interval and is well under
         // the 3-minute startup timeout (STARTUP_TIMEOUT_MS in dispatch.ts).
         const TASK_HEARTBEAT_INTERVAL_MS = 30_000;
-        let taskHeartbeatPhase = 'preparing';
         let heartbeatSeq = 0;
         const taskHeartbeatTimer = setInterval(() => {
             // Send directly via wsClient to keep the server's activity timer alive
             // WITHOUT resetting the agent-side idle timeout. stream.text() calls
             // resetIdleTimeout(), which would make a hung agent run until hard cap
             // instead of idle-timing out after 15 minutes of no real activity.
-            this.wsClient.sendTaskText(normalizedTask.id, `[Astro] Heartbeat — ${taskHeartbeatPhase}...\n`, -(++heartbeatSeq));
+            // Heartbeat text is intentionally empty — it exists only to keep the
+            // server's activity timer alive, not to display anything to the user.
+            this.wsClient.sendTaskText(normalizedTask.id, '', -(++heartbeatSeq));
         }, TASK_HEARTBEAT_INTERVAL_MS);
         // Text-only tasks (plan/chat/summarize) without a working directory skip workspace prep
         const isTextOnly = normalizedTask.type === 'summarize' || normalizedTask.type === 'chat' || normalizedTask.type === 'plan';
@@ -975,7 +999,6 @@ export class TaskExecutor {
         }
         const taskWithWorkspace = { ...normalizedTask, workingDirectory: prepared.workingDirectory };
         runningTask.task = taskWithWorkspace;
-        taskHeartbeatPhase = 'executing';
         console.log(`[executor] Task ${task.id}: workspace prepared, cwd=${prepared.workingDirectory}`);
         // Execute with idle timeout + hard cap.
         // Idle timeout resets on every stream activity (text, tool, file, etc.).
@@ -1078,9 +1101,12 @@ export class TaskExecutor {
                 ? `[${task.shortProjectId}/${task.shortNodeId}] ${rawTitle}`
                 : rawTitle;
             if (prepared.branchName && result.status === 'completed') {
-                taskHeartbeatPhase = 'delivering';
-                stream.text?.(`\n[Astro] Delivering changes (mode: ${deliveryMode})...\n`);
+                stream.text?.(`\n── [Astro] Delivering changes (mode: ${deliveryMode})...\n`);
                 this.wsClient.sendTaskStatus(task.id, 'running', 90, 'Delivering changes...');
+                // Resolve GitHub repo slug (OWNER/REPO) for explicit gh --repo targeting.
+                // This makes gh pr create/merge independent of local filesystem state
+                // (worktree may be cleaned up by the agent during execution).
+                const repoSlug = prepared.gitRoot ? await getRepoSlug(prepared.gitRoot) : undefined;
                 // Build PR body: enrich with summary data when available
                 const prBodyParts = [];
                 if (summary) {
@@ -1113,14 +1139,16 @@ export class TaskExecutor {
                 try {
                     if (deliveryMode === 'direct') {
                         // No git delivery — files modified in-place
+                        stream.text?.(`── [Delivery] Changes applied in-place (direct mode)\n`);
                         console.log(`[executor] Task ${task.id}: direct mode, skipping git delivery`);
                     }
                     else if (deliveryMode === 'copy') {
                         // Copy mode: worktree preserved, no git operations
+                        stream.text?.(`── [Delivery] Worktree preserved (copy mode)\n`);
                         console.log(`[executor] Task ${task.id}: copy mode, worktree preserved at ${prepared.workingDirectory}`);
                     }
                     else if (deliveryMode === 'branch') {
-                        stream.text?.(`[Astro] Merging into project branch ${prepared.projectBranch ?? 'local'}...\n`);
+                        stream.text?.(`── [Git] Merging into project branch ${prepared.projectBranch ?? 'local'}...\n`);
                         // Branch mode: commit locally, merge into project branch if available.
                         // The merge lock is held only during the squash-merge (seconds, not minutes),
                         // allowing tasks to execute in parallel. The squash merge naturally handles
@@ -1138,9 +1166,11 @@ export class TaskExecutor {
                             // don't overlap, and saves one retry cycle when they do.
                             const preRebase = await tryPreMergeRebase(prepared.workingDirectory, prepared.projectBranch, false);
                             if (preRebase.rebased) {
+                                stream.text?.(`── [Git] Rebased onto ${prepared.projectBranch}\n`);
                                 console.log(`[executor] Task ${task.id}: pre-merge rebase onto ${prepared.projectBranch} succeeded`);
                             }
                             else if (!preRebase.skipped) {
+                                stream.text?.(`── [Git] Rebase skipped (conflicts), retrying via merge\n`);
                                 console.log(`[executor] Task ${task.id}: pre-merge rebase had conflicts, falling back to merge retry loop`);
                             }
                             const mergeLockKey = BranchLockManager.computeLockKey(prepared.gitRoot, task.shortProjectId, task.shortNodeId, task.id);
@@ -1153,7 +1183,7 @@ export class TaskExecutor {
                                 let mergeResult;
                                 try {
                                     this.wsClient.sendTaskStatus(task.id, 'running', 96, 'Merging into project branch...');
-                                    mergeResult = await localMergeIntoProjectBranch(prepared.gitRoot, prepared.branchName, prepared.projectBranch, commitMessage);
+                                    mergeResult = await localMergeIntoProjectBranch(prepared.gitRoot, prepared.branchName, prepared.projectBranch, commitMessage, (msg) => stream.text?.(`── [Git] ${msg}\n`));
                                 }
                                 finally {
                                     mergeLock.release();
@@ -1162,7 +1192,7 @@ export class TaskExecutor {
                                 if (mergeResult.merged) {
                                     result.deliveryStatus = 'success';
                                     result.commitAfterSha = mergeResult.commitSha;
-                                    stream.text?.(`[Astro] Merged into ${prepared.projectBranch} (${mergeResult.commitSha?.slice(0, 7)})\n`);
+                                    stream.text?.(`── [Git] Merged into ${prepared.projectBranch} (${mergeResult.commitSha?.slice(0, 7)})\n`);
                                     console.log(`[executor] Task ${task.id}: merged into ${prepared.projectBranch} (${mergeResult.commitSha})`);
                                     // Sync project worktree to reflect the merged changes on disk
                                     if (prepared.projectWorktreePath && prepared.projectBranch && prepared.gitRoot) {
@@ -1178,7 +1208,7 @@ export class TaskExecutor {
                                         : null;
                                     if (taskContext?.sessionId && this.isResumableAdapter(adapter) && attempt < MAX_MERGE_ATTEMPTS) {
                                         const conflictFiles = mergeResult.conflictFiles?.join(', ') ?? 'unknown files';
-                                        stream.text?.(`[Astro] Merge conflict in: ${conflictFiles} — agent resolving (attempt ${attempt})...\n`);
+                                        stream.text?.(`── [Git] Merge conflict: ${conflictFiles} — agent resolving (attempt ${attempt})...\n`);
                                         console.log(`[executor] Task ${task.id}: merge conflict (attempt ${attempt}), resuming ${adapter.name} to resolve: ${conflictFiles}`);
                                         this.wsClient.sendTaskStatus(task.id, 'running', 97, `Merge conflict — agent resolving (attempt ${attempt})...`);
                                         // Resume agent session with conflict resolution instructions.
@@ -1227,7 +1257,7 @@ export class TaskExecutor {
                     }
                     else if (deliveryMode === 'push') {
                         // Push branch to remote, but don't create a PR — user creates PR manually
-                        stream.text?.(`[Astro] Pushing branch ${prepared.branchName} to origin...\n`);
+                        stream.text?.(`── [Git] Pushing ${prepared.branchName} to origin...\n`);
                         this.wsClient.sendTaskStatus(task.id, 'running', 95, 'Pushing branch...');
                         console.log(`[executor] Task ${task.id}: push mode, pushing branch ${prepared.branchName}`);
                         const prResult = await pushAndCreatePR(prepared.workingDirectory, {
@@ -1236,30 +1266,31 @@ export class TaskExecutor {
                             taskDescription: task.description || task.prompt.slice(0, 500),
                             skipPR: true,
                             baseBranch: prepared.baseBranch,
+                            gitRoot: prepared.gitRoot,
                         });
                         result.branchName = prResult.branchName;
                         if (prResult.error) {
                             // Delivery failure — don't override execution status
                             result.deliveryStatus = 'failed';
                             result.deliveryError = `Push delivery failed: ${prResult.error}`;
-                            stream.text?.(`[Astro] Push failed: ${prResult.error}\n`);
+                            stream.text?.(`── [Git] Push failed: ${prResult.error}\n`);
                             console.error(`[executor] Task ${task.id}: push delivery failed: ${prResult.error}`);
                         }
                         else if (prResult.pushed) {
                             result.deliveryStatus = 'success';
                             keepBranch = true;
-                            stream.text?.(`[Astro] Branch pushed to origin: ${prepared.branchName}\n`);
+                            stream.text?.(`── [Git] Pushed to origin: ${prepared.branchName}\n`);
                             console.log(`[executor] Task ${task.id}: branch pushed (${prepared.branchName})`);
                         }
                         else {
                             result.deliveryStatus = 'skipped';
-                            stream.text?.(`[Astro] No changes to push\n`);
+                            stream.text?.(`── [Git] No changes to push\n`);
                             console.log(`[executor] Task ${task.id}: no changes to push`);
                         }
                     }
                     else {
                         // 'pr' — push + create PR, auto-merge into project branch if applicable
-                        stream.text?.(`[Astro] Creating pull request for branch ${prepared.branchName}...\n`);
+                        stream.text?.(`── [Git] Creating PR: ${prepared.branchName} → ${prepared.baseBranch ?? 'main'}...\n`);
                         this.wsClient.sendTaskStatus(task.id, 'running', 94, 'Rebasing before push...');
                         // Pre-push rebase: if the target branch moved forward, rebase our task
                         // branch so the PR will be cleanly mergeable. The branch hasn't been
@@ -1267,9 +1298,11 @@ export class TaskExecutor {
                         if (prepared.baseBranch) {
                             const preRebase = await tryPreMergeRebase(prepared.workingDirectory, prepared.baseBranch, true);
                             if (preRebase.rebased) {
+                                stream.text?.(`── [Git] Rebased onto origin/${prepared.baseBranch}\n`);
                                 console.log(`[executor] Task ${task.id}: pre-push rebase onto origin/${prepared.baseBranch} succeeded`);
                             }
                             else if (!preRebase.skipped) {
+                                stream.text?.(`── [Git] Rebase skipped (conflicts), proceeding without rebase\n`);
                                 console.log(`[executor] Task ${task.id}: pre-push rebase had conflicts, proceeding without rebase`);
                             }
                         }
@@ -1284,6 +1317,7 @@ export class TaskExecutor {
                             baseBranch: prepared.baseBranch,
                             autoMerge: hasProjectBranch,
                             commitBeforeSha: prepared.commitBeforeSha,
+                            gitRoot: prepared.gitRoot,
                         });
                         result.branchName = prResult.branchName;
                         if (prResult.prUrl) {
@@ -1292,7 +1326,7 @@ export class TaskExecutor {
                             result.commitBeforeSha = prResult.commitBeforeSha;
                             result.commitAfterSha = prResult.commitAfterSha;
                             keepBranch = true;
-                            stream.text?.(`[Astro] Pull request created: ${prResult.prUrl}\n`);
+                            stream.text?.(`── [Git] PR created: ${prResult.prUrl}\n`);
                             if (prResult.autoMergeFailed) {
                                 // PR was created but auto-merge failed (likely conflict).
                                 // If the adapter supports session resume, ask the agent to
@@ -1304,7 +1338,7 @@ export class TaskExecutor {
                                     : null;
                                 if (prTaskContext?.sessionId && this.isResumableAdapter(adapter) && hasProjectBranch && prepared.branchName && prepared.baseBranch && prResult.prNumber && prepared.gitRoot) {
                                     for (let attempt = 1; attempt <= MAX_PR_MERGE_ATTEMPTS; attempt++) {
-                                        stream.text?.(`[Astro] PR auto-merge failed — agent resolving conflict (attempt ${attempt})...\n`);
+                                        stream.text?.(`── [Git] Auto-merge failed — agent resolving conflict (attempt ${attempt})...\n`);
                                         console.log(`[executor] Task ${task.id}: PR auto-merge failed (attempt ${attempt}), resuming ${adapter.name} to resolve`);
                                         this.wsClient.sendTaskStatus(task.id, 'running', 97, `PR merge conflict — agent resolving (attempt ${attempt})...`);
                                         // Resume agent session — agent rebases and force-pushes.
@@ -1318,11 +1352,14 @@ export class TaskExecutor {
                                             result.deliveryError = `PR created but auto-merge failed. Agent resolution failed: ${resumeErr instanceof Error ? resumeErr.message : resumeErr}`;
                                             break;
                                         }
-                                        // Retry the GitHub merge
+                                        // Retry the GitHub merge.
+                                        // Use gitRoot as cwd (always valid, guarded at L1518) instead of
+                                        // worktree path which may have been deleted during resolution.
                                         this.wsClient.sendTaskStatus(task.id, 'running', 98, `Retrying PR merge (attempt ${attempt})...`);
-                                        const retryMerge = await mergePullRequest(prepared.workingDirectory, prResult.prNumber, {
+                                        const retryMerge = await mergePullRequest(prepared.gitRoot, prResult.prNumber, {
                                             method: 'squash',
                                             deleteBranch: true,
+                                            repoSlug: repoSlug ?? undefined,
                                         });
                                         if (retryMerge.ok) {
                                             result.commitAfterSha = await getRemoteBranchSha(prepared.gitRoot, prepared.baseBranch) ?? undefined;
@@ -1362,18 +1399,18 @@ export class TaskExecutor {
                             result.deliveryStatus = 'failed';
                             result.deliveryError = `PR delivery failed: ${prResult.error}`;
                             keepBranch = prResult.pushed ?? false; // Keep branch if it was pushed
-                            stream.text?.(`[Astro] PR delivery failed: ${prResult.error}\n`);
+                            stream.text?.(`── [Git] PR delivery failed: ${prResult.error}\n`);
                             console.error(`[executor] Task ${task.id}: PR delivery failed: ${prResult.error}`);
                         }
                         else {
-                            stream.text?.(`[Astro] No changes to deliver\n`);
+                            stream.text?.(`── [Git] No changes to deliver\n`);
                             console.log(`[executor] Task ${task.id}: no changes to push`);
                         }
                     }
                 }
                 catch (prError) {
                     const prMsg = prError instanceof Error ? prError.message : String(prError);
-                    stream.text?.(`[Astro] Delivery failed: ${prMsg}\n`);
+                    stream.text?.(`── [Delivery] Failed: ${prMsg}\n`);
                     console.error(`[executor] Task ${task.id}: delivery (${deliveryMode}) failed: ${prMsg}`);
                     // Delivery failure — don't override execution status
                     result.deliveryStatus = 'failed';
@@ -1430,14 +1467,13 @@ export class TaskExecutor {
             clearTimeout(hardCapTimeoutId);
             if (idleTimerId !== undefined)
                 clearTimeout(idleTimerId);
-            taskHeartbeatPhase = 'cleaning up';
             // Always cleanup the local worktree directory to reclaim disk space
             // (node_modules alone is ~680MB per worktree). When keepBranch is true
             // (PR created or branch pushed), we preserve the git branch but still
             // remove the working copy — the branch lives on remote/local refs,
             // and re-execution will create a fresh worktree if needed.
             if (prepared.branchName) {
-                stream.text?.(`\n[Astro] Cleaning up worktree (branch: ${prepared.branchName})...\n`);
+                stream.text?.(`\n── [Astro] Cleaning up worktree (branch: ${prepared.branchName})...\n`);
             }
             if (this.preserveWorktrees) {
                 console.log(`[executor] Task ${task.id}: worktree preserved (debug mode)`);