@sagentlab/navarch-runtime 0.1.65 → 0.1.67

package/dist/adapters/opencode.cjs

@@ -36,11 +36,30 @@ async function runOpenCodeAdapter(options) {
         };
     }
     const env = { ...options.env };
+    // V2 resolves its workspace from PWD. spawn({ cwd }) alone leaves the
+    // supervisor's PWD in the inherited environment (often the home directory).
+    if (!options.dockerExec && options.cwd)
+        env.PWD = node_path_1.default.resolve(options.cwd);
     await prepareOpenCodeConfig(options.mcpConfigPath, env, Boolean(options.dockerExec));
+    // V2's default background service owns its own cwd, environment and MCP
+    // configuration. A client process's isolated config does not isolate that
+    // service. Probe help without starting a turn, so older in-process CLIs
+    // remain supported and upgrades are detected on the next session.
+    const runOptions = { ...options, env };
+    const probeOptions = { ...runOptions, timeoutMs: 10_000, onProcessStarted: undefined };
+    const help = options.dockerExec
+        ? await runViaDocker(probeOptions, ["run", "--help"])
+        : await runOnHost(probeOptions, ["run", "--help"]);
+    if (help.exitCode !== 0 || help.timedOut || help.killedByLeaseLoss) {
+        return { ...help, stderr: `OpenCode CLI capability check failed. ${help.stderr}` };
+    }
     const binaryKey = `${options.dockerExec ? "docker:" : ""}${options.bin ?? "opencode"}`;
     const defaultLogLevel = !hasArg(options.extraArgs, "--log-level");
     const logLevel = defaultLogLevel ? (openCodeLogLevels.get(binaryKey) ?? "ERROR") : null;
     const args = ["run", options.prompt];
+    if (/^\s*--standalone\b/m.test(help.stdout) && !hasArg(options.extraArgs, "--standalone")) {
+        args.push("--standalone");
+    }
     // Provider failures may only appear in logs, absent from assistant events.
     if (!hasArg(options.extraArgs, "--print-logs"))
         args.push("--print-logs");
@@ -57,7 +76,6 @@ async function runOpenCodeAdapter(options) {
         // use the model's own default.
         args.push("--model", options.reasoningEffort ? `${options.model}#${options.reasoningEffort}` : options.model);
     }
-    const runOptions = { ...options, env };
     const run = (runArgs) => runOptions.dockerExec ? runViaDocker(runOptions, runArgs) : runOnHost(runOptions, runArgs);
     let raw = await run(args);
     if (logLevel && raw.exitCode !== 0 && isLogLevelRejection(raw.stderr)) {

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/prompt.cjs

@@ -4,6 +4,7 @@ exports.renderPrompt = renderPrompt;
 exports.renderGuidanceCorrectionPrompt = renderGuidanceCorrectionPrompt;
 exports.renderHostedCheckpointNote = renderHostedCheckpointNote;
 const CODE_GRAPH_GUIDANCE = "For JS/TS dependency inspection, the runtime provides `navarch-runtime code-graph --query <symbol-or-file> --mode search|callers|callees|impact --commit HEAD`. If the runtime is not on PATH, use its installed entry point; do not install another copy mid-task. Results describe committed source and include commit/freshness warnings; inspect current files for uncommitted changes and unresolved dependencies.";
+const PROCESS_GUIDANCE = "Process management: this host may run other agent sessions. Keep the PID or tool handle of each preview server you start and stop only that owned process. Never use broad process-name or command-line matching (pkill, killall) to clean up servers: the agent launcher carries the task prompt in its arguments and can match those patterns, terminating your own session. Use a different port when a port is occupied by a process you do not own. Keep scratch files in the current worktree; paths in previous transcripts belong to earlier sessions.";
 /**
  * Renders the four-layer context bundle (project-plan.md §3.8: steering docs,
  * task itself, task-type playbook, depends_on reports) into the single prompt
@@ -16,13 +17,14 @@ function renderPrompt(task, bundle) {
         const repositoryContext = bundle.repository
             ? `Repository: ${bundle.repository.full_name} (${bundle.repository.url})\nLocal checkout: this session's isolated git worktree (current working directory).`
             : null;
-        return [repositoryContext, bundle.task_context.trim(), CODE_GRAPH_GUIDANCE, bundle.retry_context?.trim()]
+        return [repositoryContext, PROCESS_GUIDANCE, bundle.task_context.trim(), CODE_GRAPH_GUIDANCE, bundle.retry_context?.trim()]
             .filter((section) => Boolean(section))
             .join("\n\n") + "\n";
     }
     const sections = [];
     sections.push(`# Task: ${task.summary}`);
     sections.push(`Type: ${task.task_type} | Repo: ${task.repo} | Environment: ${task.environment_scope}`);
+    sections.push(PROCESS_GUIDANCE);
     if (bundle.repository) {
         sections.push(`Repository URL: ${bundle.repository.url}\nLocal checkout: this session's isolated git worktree (current working directory).`);
     }

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,
@@ -622,7 +623,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.65",
+  "version": "0.1.67",
   "description": "Navarch machine-side session manager: claims delivery tasks and runs them through local coding agents.",
   "type": "commonjs",
   "license": "MIT",