@sagentlab/navarch-runtime 0.1.66 → 0.1.68

package/dist/api.cjs

@@ -142,8 +142,8 @@ class NavarchApiClient {
         return result;
     }
     /** Best-effort, lease-scoped activity signal for connected machines. */
-    async reportActivity(leaseId, phase) {
-        await this.request("POST", `/api/dispatch/${encodeURIComponent(leaseId)}/activity`, { phase }, { allowEmpty: true });
+    async reportActivity(leaseId, phase, detail) {
+        await this.request("POST", `/api/dispatch/${encodeURIComponent(leaseId)}/activity`, { phase, ...(detail ? { detail } : {}) }, { allowEmpty: true });
     }
     /** schema-design.md §7 — `POST /api/dispatch/:leaseId/complete {status, report, evidence_urls, cost}`. */
     async completeLease(leaseId, req) {

package/dist/delivery.cjs

@@ -110,6 +110,13 @@ function evaluateDelivery(probe) {
         }
         return { status: "no_changes" };
     }
+    // A failed GitHub lookup also means we cannot distinguish a genuinely
+    // unpushed commit from a successful push whose remote-tracking ref was not
+    // fetched after the agent turn. Do not fail and delete a delivered worktree
+    // based only on the cache in that state.
+    if (probe.pullRequestLookupFailed) {
+        return { status: "unknown", reason: "the pull request lookup could not run, so delivery cannot be confirmed" };
+    }
     if (probe.unpushedCommits > 0) {
         const plural = probe.unpushedCommits === 1 ? "commit" : "commits";
         return {
@@ -118,10 +125,7 @@ function evaluateDelivery(probe) {
                 "were never pushed, so the work exists only in this session's worktree",
         };
     }
-    // Pushed, but nothing carries it. Only gate when GitHub actually answered.
-    if (probe.pullRequestLookupFailed) {
-        return { status: "unknown", reason: "the pull request lookup could not run, so delivery cannot be confirmed" };
-    }
+    // Pushed, but nothing carries it. GitHub answered the lookup above.
     const plural = probe.commitsAhead === 1 ? "commit" : "commits";
     return {
         status: "incomplete",

package/dist/git-worktree.cjs

@@ -31,6 +31,7 @@ class GitWorktree {
     cloneUrl;
     githubToken;
     repoLocalGithubToken;
+    prContinuation;
     taskBranchSuffix;
     legacyTaskBranchSuffix;
     taskOwnershipTrailer;
@@ -57,11 +58,16 @@ class GitWorktree {
         this.legacyTaskBranchSuffix = `-${normalizedTaskId}`;
         this.taskOwnershipTrailer = `Navarch-Task-ID: ${normalizedTaskId}`;
         this.sessionTokenMarker = `navarch-session-github-token:${sessionKey}`;
-        this.branch = `navarch/${branchSlug(options)}${this.taskBranchSuffix}`;
+        // A continuation delivers on the reviewed PR's existing branch. Its
+        // initial worktree branch is disposable and must not collide with a
+        // previous attempt's temporary branch in the bare cache.
+        this.branch = `navarch/${branchSlug(options)}${this.taskBranchSuffix}` +
+            (options.prContinuation ? `-${sessionKey}` : "");
         this.runner = options.runner ?? sandbox_cjs_1.nodeCommandRunner;
         this.cloneUrl = options.cloneUrl;
         this.githubToken = options.githubToken;
         this.repoLocalGithubToken = options.repoLocalGithubToken;
+        this.prContinuation = options.prContinuation ?? false;
         this.hostedCheckpointRef = options.restoreHostedCheckpoint ? hostedCheckpointRef(options.taskId) : null;
         this.hostedCheckpointLocalRef = `refs/navarch/restored-checkpoints/${taskKey}`;
     }
@@ -349,6 +355,12 @@ class GitWorktree {
     }
     /** Returns the fetched task-owned remote branch when an earlier attempt pushed it. */
     async resolveTaskBranchRef() {
+        // A follow-up must check out the reviewed PR's head, not adopt a branch
+        // bearing this task's short suffix. An earlier attempt may have pushed its
+        // temporary branch after dropping the claim commit; that branch must not
+        // prevent later attempts from reaching the actual PR.
+        if (this.prContinuation)
+            return null;
         const refs = await this.runGit(["--git-dir", this.repositoryPath, "for-each-ref", "--format=%(refname)", "refs/remotes/origin/navarch"], false);
         const suffixMatches = refs.stdout
             .split("\n")

package/dist/session.cjs

@@ -199,6 +199,7 @@ async function runClaimedSession(deps, claimed, sessionId, lifecycle) {
         taskId: task.id,
         taskSummary: task.summary,
         taskType: task.task_type,
+        prContinuation: allowBranchRename,
         sessionId,
         cloneUrl,
         githubToken,
@@ -400,16 +401,22 @@ async function runClaimedSession(deps, claimed, sessionId, lifecycle) {
     let activityPending = Promise.resolve();
     let outputObservedAt = 0;
     let outputReportedAt = 0;
+    let outputUpdates = 0;
+    let agentTurnStartedAt = 0;
     let adapterRunning = false;
-    const reportActivity = (phase) => {
-        activityPending = activityPending.then(() => api.reportActivity(leaseId, phase)).catch((error) => {
+    const reportActivity = (phase, detail) => {
+        activityPending = activityPending.then(() => api.reportActivity(leaseId, phase, detail)).catch((error) => {
             log.warn(`activity update failed for ${leaseId}: ${(0, redact_cjs_1.redactText)(String(error), registry.list())}`);
         });
     };
     const activityTimer = setInterval(() => {
         if (adapterRunning && outputObservedAt > outputReportedAt && Date.now() - outputReportedAt >= 60_000) {
             outputReportedAt = Date.now();
-            reportActivity("output");
+            reportActivity("output", {
+                outputUpdates,
+                elapsedSeconds: Math.floor((outputReportedAt - agentTurnStartedAt) / 1000),
+            });
+            outputUpdates = 0;
         }
     }, 15_000);
     const heartbeatGuard = new lease_heartbeat_cjs_1.LeaseHeartbeatGuard(claimed.expires_at, () => {
@@ -484,6 +491,9 @@ async function runClaimedSession(deps, claimed, sessionId, lifecycle) {
             await node_fs_1.promises.writeFile(node_path_1.default.join(workDir, "prompt.md"), runPrompt, "utf8");
             adapterStarted = true;
             adapterRunning = true;
+            agentTurnStartedAt = Date.now();
+            outputReportedAt = agentTurnStartedAt;
+            outputUpdates = 0;
             reportActivity("running");
             const remainingRuntimeMs = maxRuntimeMs > 0
                 ? maxRuntimeMs - (node_perf_hooks_1.performance.now() - agentBudgetStartedAt)
@@ -508,7 +518,7 @@ async function runClaimedSession(deps, claimed, sessionId, lifecycle) {
                     cwd: gitWorktree.worktreePath,
                     dockerExec: sandbox ? { containerName: sandbox.name, runner: sandbox_cjs_1.nodeCommandRunner } : undefined,
                     signal: activeAbortController.signal,
-                    onActivity: () => { outputObservedAt = Date.now(); },
+                    onActivity: () => { outputObservedAt = Date.now(); outputUpdates += 1; },
                 }, task.idle_timeout_ms ?? config.sessionIdleTimeoutMs ?? 45 * 60_000, runtime === "opencode" ? config.opencodeStartupTimeoutMs : 0);
             activeAbortController = null;
             adapterRunning = false;
@@ -622,7 +632,8 @@ async function runClaimedSession(deps, claimed, sessionId, lifecycle) {
                     deliveryFailureSummary =
                         `Session ended without delivering the task: ${delivery.reason}. ` +
                             `${deliveryCorrectionRetries} correction turn(s) did not recover it. ` +
-                            "The session worktree is deleted at teardown, so the work is gone; the task needs another attempt.";
+                            "The session worktree is deleted at teardown. Pushed commits remain on origin; " +
+                            "uncommitted or unpushed work may be lost. The task needs another attempt.";
                     log.warn(`failing ${leaseId}: ${deliveryFailureSummary}`);
                     mapping.leaseOutcome = "failed";
                     mapping.exitStatus = "failed";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sagentlab/navarch-runtime",
-  "version": "0.1.66",
+  "version": "0.1.68",
   "description": "Navarch machine-side session manager: claims delivery tasks and runs them through local coding agents.",
   "type": "commonjs",
   "license": "MIT",