@sagentlab/navarch-runtime 0.1.54 → 0.1.56

package/dist/adapters/opencode.cjs

@@ -1,9 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openCodeAdapter = void 0;
 exports.runOpenCodeAdapter = runOpenCodeAdapter;
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
+const node_os_1 = __importDefault(require("node:os"));
+const node_path_1 = __importDefault(require("node:path"));
 const config_cjs_1 = require("../config.cjs");
 const kill_agent_cjs_1 = require("../kill-agent.cjs");
 /**
@@ -30,7 +35,7 @@ async function runOpenCodeAdapter(options) {
         };
     }
     const env = { ...options.env };
-    await prepareOpenCodeConfig(options.mcpConfigPath, env);
+    await prepareOpenCodeConfig(options.mcpConfigPath, env, Boolean(options.dockerExec));
     const args = ["run", options.prompt];
     // Provider failures may only appear in logs, absent from assistant events.
     if (!hasArg(options.extraArgs, "--print-logs"))
@@ -57,7 +62,7 @@ async function runOpenCodeAdapter(options) {
 function hasArg(args, ...flags) {
     return args.some((arg) => flags.some((flag) => arg === flag || arg.startsWith(`${flag}=`)));
 }
-async function prepareOpenCodeConfig(mcpConfigPath, env) {
+async function prepareOpenCodeConfig(mcpConfigPath, env, inDocker) {
     if (!mcpConfigPath) {
         throw new Error("OpenCode requires a per-session MCP config path for isolated execution.");
     }
@@ -101,6 +106,11 @@ async function prepareOpenCodeConfig(mcpConfigPath, env) {
         permissions: [
             { action: "*", resource: "*", effect: "allow" },
             { action: "external_directory", resource: "*", effect: "deny" },
+            ...(await openCodeManagedDirectories(env, inDocker)).map((resource) => ({
+                action: "external_directory",
+                resource,
+                effect: "allow",
+            })),
             { action: "question", resource: "*", effect: "deny" },
         ],
     };
@@ -117,6 +127,39 @@ async function prepareOpenCodeConfig(mcpConfigPath, env) {
     env.OPENCODE_DISABLE_PROJECT_CONFIG = "true";
     env.XDG_CONFIG_HOME = xdgConfigHome;
 }
+/**
+ * OpenCode's own scratch locations: `os.tmpdir()/opencode` and the data dir's
+ * truncated tool-output and background-shell output files. OpenCode grants
+ * itself `external_directory` access to these, but config rules are appended
+ * after its grants and the last matching rule wins, so the blanket deny above
+ * would otherwise hide a background command's log from the agent. Inside the
+ * sandbox container the Linux defaults apply (`~` expands to the OpenCode
+ * process's home); on the host they follow the child environment, plus the
+ * canonical temp path since OpenCode canonicalizes before matching (macOS
+ * `/var` -> `/private/var`).
+ */
+async function openCodeManagedDirectories(env, inDocker) {
+    if (inDocker) {
+        return [
+            "/tmp/opencode/*",
+            "~/.local/share/opencode/tool-output/*",
+            "~/.local/share/opencode/shell/*/*",
+        ];
+    }
+    const tmpRoot = env.TMPDIR || process.env.TMPDIR || node_os_1.default.tmpdir();
+    const tmpRoots = [tmpRoot, await node_fs_1.promises.realpath(tmpRoot).catch(() => tmpRoot)];
+    const dataHome = env.XDG_DATA_HOME ||
+        process.env.XDG_DATA_HOME ||
+        node_path_1.default.join(env.HOME || node_os_1.default.homedir(), ".local", "share");
+    const data = node_path_1.default.join(dataHome, "opencode");
+    return [
+        ...new Set([
+            ...tmpRoots.map((root) => node_path_1.default.join(root, "opencode", "*")),
+            node_path_1.default.join(data, "tool-output", "*"),
+            node_path_1.default.join(data, "shell", "*", "*"),
+        ]),
+    ];
+}
 function safeEnvSegment(value) {
     return value.toUpperCase().replace(/[^A-Z0-9_]/g, "_");
 }

package/dist/exit-conditions.cjs

@@ -6,6 +6,7 @@ exports.parseCodexJsonEvents = parseCodexJsonEvents;
 exports.extractUsageFromCodexEvents = extractUsageFromCodexEvents;
 exports.extractFinalMessageFromCodexEvents = extractFinalMessageFromCodexEvents;
 exports.leadingVerificationVerdict = leadingVerificationVerdict;
+exports.leadWithReviewFixMarker = leadWithReviewFixMarker;
 exports.mapExitCondition = mapExitCondition;
 /**
  * Best-effort parse of `claude -p --output-format json` stdout into the
@@ -201,6 +202,26 @@ function leadingVerificationVerdict(report) {
     const match = /^Verification verdict:\s*(PASS|FAIL|BLOCKED)\b/i.exec(firstLine ?? "");
     return match?.[1] ? match[1].toLowerCase() : null;
 }
+const REVIEW_FIX_MARKER_LINE = /^[ \t]*Review fix delivered: [a-f0-9]{40}(?=\s|$)/im;
+/**
+ * Moves a `Review fix delivered: <sha>` line to the top of the report. The
+ * control plane (lib/navarch/review-fix-marker.ts) accepts the marker at the
+ * start of any line, but summarize() collapses whitespace and truncates, so a
+ * marker below a sentence of preamble ends up mid-sentence or cut off and the
+ * review fix is rejected. Kept in step with leadWithReviewFixMarker there;
+ * this package cannot import it. A report without a marker is unchanged.
+ */
+function leadWithReviewFixMarker(report) {
+    const marker = REVIEW_FIX_MARKER_LINE.exec(report);
+    if (!marker || !report.slice(0, marker.index).trim())
+        return report;
+    const lineEnd = report.indexOf("\n", marker.index);
+    const line = report.slice(marker.index, lineEnd === -1 ? undefined : lineEnd).trim();
+    const rest = (report.slice(0, marker.index) + (lineEnd === -1 ? "" : report.slice(lineEnd + 1)))
+        .replace(/\n{3,}/g, "\n\n")
+        .trim();
+    return rest ? `${line}\n\n${rest}` : line;
+}
 function summarize(text, maxLen = 500) {
     const trimmed = text.trim();
     if (!trimmed)
@@ -292,7 +313,7 @@ function mapExitCondition(result) {
     // falls back to raw stdout when neither is available (see
     // parseClaudeJsonResult's doc comment).
     const reportText = result.reportText ?? parsedJson?.result ?? result.stdout;
-    const reportSummary = summarize(reportText) || "Adapter completed with no report text.";
+    const reportSummary = summarize(leadWithReviewFixMarker(reportText)) || "Adapter completed with no report text.";
     // A verify agent's FAIL/BLOCKED verdict is a successful agent run whose
     // conclusion is that the delivery did not pass. The completion API only
     // accepts those verdicts with a failed outcome, so map them to a failed

package/package.json

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