@sagentlab/navarch-runtime 0.1.52 → 0.1.53

package/README.md

@@ -152,10 +152,10 @@ The from-source flow — `git clone` + `./install.sh` + `node bin/navarch.cjs
 
 | Command | Purpose |
 |---|---|
-| `register --token <t> --name <n> [--agent claude-code\|codex\|gemini\|opencode\|acp] […]` | Registers this machine, saves its local agent choice, and prints the token once. |
-| `connect --token <t> --name <n> [--agent claude-code\|codex\|gemini\|opencode\|acp] [--project <id>] […]` | Connects this machine to one project, saves its local agent choice, and prints the token once. |
-| `start [--agent claude-code\|codex\|gemini\|opencode\|acp]` | Runs the daemon. A start-time agent choice overrides the saved choice. |
-| `supervise [--agent claude-code\|codex\|gemini\|opencode\|acp]` | Runs the daemon under the update supervisor, enabling drain-safe automatic updates and rollback. |
+| `register --token <t> --name <n> [--agent claude-code\|codex\|gemini\|opencode\|acp\|qoder] […]` | Registers this machine, saves its local agent choice, and prints the token once. |
+| `connect --token <t> --name <n> [--agent claude-code\|codex\|gemini\|opencode\|acp\|qoder] [--project <id>] […]` | Connects this machine to one project, saves its local agent choice, and prints the token once. |
+| `start [--agent claude-code\|codex\|gemini\|opencode\|acp\|qoder]` | Runs the daemon. A start-time agent choice overrides the saved choice. |
+| `supervise [--agent claude-code\|codex\|gemini\|opencode\|acp\|qoder]` | Runs the daemon under the update supervisor, enabling drain-safe automatic updates and rollback. |
 | `doctor` | Prints resolved config + Docker/registration status; no side effects. |
 
 ### Running multiple agents on one machine
@@ -368,7 +368,7 @@ unchanged across the deployment.
 | `NAVARCH_SANDBOX_PROFILE` | `trusted-development` | Named security profile for Docker sessions (`src/sandbox-profile.cts`): `trusted-development` (image-default user, uncapped, open egress), `untrusted-code` (non-root, 2 CPU / 4g / 512 PIDs, deny-by-default egress, read-only shared git), `elevated-verification` (non-root, 4 CPU / 8g / 2048 PIDs, egress limited to GitHub plus package registries). The default is the exact pre-profile flag set. |
 | `NAVARCH_SANDBOX_EGRESS_NETWORK` | _(unset)_ | Docker network that enforces a profile's egress allowlist. Docker cannot filter by domain itself, so an allowlist profile without this fails closed to `--network=none` and records the denial. |
 | `NAVARCH_DOCKER_IMAGE` | `ghcr.io/sagentlab/navarch-sandbox-agent:0.1.0` | Version-pinned per-session image with Node 20, git, GitHub CLI, ripgrep, jq, SSH, and Claude Code 2.1.218. Override with an image tag or digest you control. |
-| `NAVARCH_AGENT` | saved choice, then `claude-code` | Local choice of agent adapter: `claude-code`, `codex`, `gemini`, `opencode`, or `acp`. Overrides the choice saved by `connect`/`register`; `start --agent` has highest priority. |
+| `NAVARCH_AGENT` | saved choice, then `claude-code` | Local choice of agent adapter: `claude-code`, `codex`, `gemini`, `opencode`, `acp`, or `qoder`. Overrides the choice saved by `connect`/`register`; `start --agent` has highest priority. |
 | `NAVARCH_RUNTIMES` | resolved local agent choice | Comma list of installed/authenticated adapters advertised to dispatch. The control plane chooses among these per project/task. |
 | `NAVARCH_UPDATE_CHANNEL` | `stable` | Release channel advertised by the worker (`stable` or `canary`); the server-managed machine channel remains authoritative. |
 | `NAVARCH_AUTO_UPDATE` | on under `supervise` | Set `off`, `false`, or `0` to report releases without staging or activating them. Automatic activation is always off under plain `start`. |
@@ -382,6 +382,8 @@ unchanged across the deployment.
 | `NAVARCH_OPENCODE_EXTRA_ARGS` | — | Comma list of extra CLI args appended after `run`, the prompt, and the generated `--format json` argument. Explicit `--format`, `--model`, or `--variant` values replace the corresponding per-session default. |
 | `NAVARCH_ACP_BIN` | `dsh` | Path/name of an Agent Client Protocol v1 stdio server. DeepSeek Harness is the default implementation. |
 | `NAVARCH_ACP_EXTRA_ARGS` | `--profile,acp` | Comma list of arguments used to start the ACP server. Override this together with `NAVARCH_ACP_BIN` for another ACP-compatible coding agent. |
+| `NAVARCH_QODER_BIN` | `qoder` | Path/name of the Qoder CLI binary. |
+| `NAVARCH_QODER_EXTRA_ARGS` | — | Comma list of extra CLI args appended after the unattended defaults (`--setting-sources`, `--permission-mode auto`, `--output-format json`). An explicit `--output-format`, `--permission-mode`, `--settings`, `--model`, or `--reasoning-effort` here replaces the per-session default. Qoder selects its own account models; pin one via `--model` here or `connect --model` to override. |
 | `NAVARCH_MCP_CONFIG_PATH` | — | Path to the platform MCP config passed as `--mcp-config`. |
 | `NAVARCH_WORKTREE_GUARD` | on | Host-mode sessions get an adapter-native per-session worktree boundary guard (see below). Set `off` to disable it for every runtime on the machine — required to run OpenCode on the host. |
 | `NAVARCH_GUARD_EXTRA_ROOTS` | — | `path.delimiter`-separated (`:` on POSIX) extra directories the worktree guard allows beyond the session worktree, shared bare repo, and temp dirs. |
@@ -514,10 +516,15 @@ export NAVARCH_AGENT=opencode
 # Override NAVARCH_ACP_BIN / NAVARCH_ACP_EXTRA_ARGS for another ACP v1 server.
 export NAVARCH_AGENT=acp
 
+# Qoder — requires an authenticated `qoder` CLI (or NAVARCH_QODER_BIN pointing
+# at it). Model selection is account-owned; NAVARCH_QODER_EXTRA_ARGS or
+# `connect --model` can pin one explicitly.
+export NAVARCH_AGENT=qoder
+
 # Advanced compatibility mode: advertise every installed adapter. On a guarded
 # host, `opencode` is dropped from this list (see the boundary notes above);
 # the rest are advertised as written.
-export NAVARCH_RUNTIMES=claude-code,codex,gemini,opencode,acp
+export NAVARCH_RUNTIMES=claude-code,codex,gemini,opencode,acp,qoder
 ```
 
 For the legacy single-runtime setting, priority is `start --agent` →
@@ -642,6 +649,7 @@ cli.cts
                     - geminiAdapter     (adapters/gemini.cts) — `gemini --prompt <prompt> --output-format stream-json`
                     - openCodeAdapter   (adapters/opencode.cts) — `opencode run <prompt> --format json`
                     - acpAdapter        (adapters/acp.cts) — ACP v1 JSON-RPC/stdio; defaults to `dsh --profile acp`
+                    - qoderAdapter      (adapters/qoder.cts) — `qoder -p <prompt> --output-format json`
                   heartbeating the lease every NAVARCH_LEASE_HEARTBEAT_INTERVAL_MS throughout either;
                   a failed heartbeat aborts the run (kills the process) and marks the outcome as lease-lost
                5. mapExitCondition (exit-conditions.cts) → redact.cts scrubs the transcript → upload.cts PUTs it

package/dist/adapters/index.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runAcpAdapter = exports.acpAdapter = exports.runPiAdapter = exports.piAdapter = exports.runOpenCodeAdapter = exports.openCodeAdapter = exports.runGeminiAdapter = exports.geminiAdapter = exports.runCodexAdapter = exports.codexAdapter = exports.runClaudeCodeAdapter = exports.claudeCodeAdapter = void 0;
+exports.runQoderAdapter = exports.qoderAdapter = exports.runAcpAdapter = exports.acpAdapter = exports.runPiAdapter = exports.piAdapter = exports.runOpenCodeAdapter = exports.openCodeAdapter = exports.runGeminiAdapter = exports.geminiAdapter = exports.runCodexAdapter = exports.codexAdapter = exports.runClaudeCodeAdapter = exports.claudeCodeAdapter = void 0;
 exports.selectAdapter = selectAdapter;
 const claude_cjs_1 = require("./claude.cjs");
 Object.defineProperty(exports, "claudeCodeAdapter", { enumerable: true, get: function () { return claude_cjs_1.claudeCodeAdapter; } });
@@ -20,6 +20,9 @@ Object.defineProperty(exports, "runPiAdapter", { enumerable: true, get: function
 const acp_cjs_1 = require("./acp.cjs");
 Object.defineProperty(exports, "acpAdapter", { enumerable: true, get: function () { return acp_cjs_1.acpAdapter; } });
 Object.defineProperty(exports, "runAcpAdapter", { enumerable: true, get: function () { return acp_cjs_1.runAcpAdapter; } });
+const qoder_cjs_1 = require("./qoder.cjs");
+Object.defineProperty(exports, "qoderAdapter", { enumerable: true, get: function () { return qoder_cjs_1.qoderAdapter; } });
+Object.defineProperty(exports, "runQoderAdapter", { enumerable: true, get: function () { return qoder_cjs_1.runQoderAdapter; } });
 /**
  * Picks the AgentAdapter (adapters/types.cts) session.cts should run a
  * session with, keyed off config.cts's `agentType` (NAVARCH_AGENT). This is
@@ -37,6 +40,8 @@ function selectAdapter(agentType) {
             return opencode_cjs_1.openCodeAdapter;
         case "acp":
             return acp_cjs_1.acpAdapter;
+        case "qoder":
+            return qoder_cjs_1.qoderAdapter;
         case "claude-code":
             return claude_cjs_1.claudeCodeAdapter;
         case "pi":

package/dist/adapters/opencode.cjs

@@ -41,8 +41,11 @@ async function runOpenCodeAdapter(options) {
         args.push("--format", "json");
     args.push(...options.extraArgs);
     if (options.model && options.model !== "default" && !hasArg(options.extraArgs, "--model", "-m")) {
-        // OpenCode V2 selects a reasoning variant through the model reference
-        // (`provider/model#variant`) rather than a separate flag.
+        // OpenCode V2 folds the reasoning variant into the model reference
+        // (`provider/model#variant`) and hard-fails on a variant the model does
+        // not advertise. The claim route clamps the effort to the model's
+        // advertised variants, so a present value is always valid; absent means
+        // use the model's own default.
         args.push("--model", options.reasoningEffort ? `${options.model}#${options.reasoningEffort}` : options.model);
     }
     const runOptions = { ...options, env };

package/dist/adapters/qoder.cjs

@@ -0,0 +1,166 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.qoderAdapter = void 0;
+exports.runQoderAdapter = runQoderAdapter;
+const node_child_process_1 = require("node:child_process");
+const exit_conditions_cjs_1 = require("../exit-conditions.cjs");
+const kill_agent_cjs_1 = require("../kill-agent.cjs");
+function hasFlag(args, flag) {
+    return args.some((arg) => arg === flag || arg.startsWith(`${flag}=`));
+}
+/**
+ * Headless Qoder CLI adapter: `qoder -p "<prompt>" --output-format json`.
+ * Qoder's print mode emits the same single-JSON result shape as Claude Code
+ * (verified against qodercli 1.1.56), so usage/cost parsing reuses
+ * parseClaudeJsonResult and its result text lands in the ordinary
+ * exit-conditions path.
+ *
+ * Model selection is account-owned (`qoder --list-models`), so the claim-time
+ * `"default"` sentinel (execution-policy.ts / session.cts) is passed through
+ * as no `--model` flag; an explicit pin from `--model` at enroll or
+ * NAVARCH_QODER_EXTRA_ARGS still reaches the CLI.
+ */
+async function runQoderAdapter(options) {
+    if (options.signal?.aborted) {
+        return { exitCode: null, timedOut: false, killedByLeaseLoss: true, stdout: "", stderr: "" };
+    }
+    const args = ["-p", options.prompt];
+    // Runtime sessions must not inherit an operator's personal or project-local
+    // Qoder hooks, for the same reason as the Claude adapter: they make
+    // execution machine-dependent and can fail otherwise-good sessions. The
+    // empty source list still permits an explicit --settings file below.
+    if (!hasFlag(options.extraArgs, "--setting-sources")) {
+        args.push("--setting-sources", "");
+    }
+    // Unattended sessions route permission decisions through Qoder's native
+    // auto classifier rather than prompting or bypassing checks.
+    if (!["--permission-mode", "--permission-prompt-tool", "--dangerously-skip-permissions"].some((flag) => hasFlag(options.extraArgs, flag))) {
+        args.push("--permission-mode", "auto");
+    }
+    if (options.settingsPath && !hasFlag(options.extraArgs, "--settings")) {
+        args.push("--settings", options.settingsPath);
+    }
+    if (options.mcpConfigPath) {
+        args.push("--mcp-config", options.mcpConfigPath);
+    }
+    if (!hasFlag(options.extraArgs, "--output-format")) {
+        args.push("--output-format", "json");
+    }
+    args.push(...options.extraArgs);
+    if (options.model && options.model !== "default" && !hasFlag(options.extraArgs, "--model")) {
+        args.push("--model", options.model);
+    }
+    if (options.reasoningEffort && !hasFlag(options.extraArgs, "--reasoning-effort")) {
+        args.push("--reasoning-effort", options.reasoningEffort);
+    }
+    const raw = options.dockerExec ? await runViaDocker(options, args) : await runOnHost(options, args);
+    return attachUsage(raw);
+}
+/** Parses stdout for `qoder -p --output-format json` usage and folds it onto the raw result (best-effort). */
+function attachUsage(result) {
+    const parsed = (0, exit_conditions_cjs_1.parseClaudeJsonResult)(result.stdout);
+    if (!parsed)
+        return result;
+    const usage = (0, exit_conditions_cjs_1.extractUsageFromClaudeJson)(parsed);
+    return {
+        ...result,
+        tokensIn: usage.tokensIn,
+        tokensOut: usage.tokensOut,
+        cacheHitTokensIn: usage.cacheHitTokensIn,
+        costUsd: usage.costUsd,
+    };
+}
+async function runOnHost(options, args) {
+    return new Promise((resolve) => {
+        let stdout = "";
+        let stderr = "";
+        let timedOut = false;
+        let killedByLeaseLoss = false;
+        const child = (0, node_child_process_1.spawn)(options.bin, args, {
+            detached: process.platform !== "win32",
+            cwd: options.cwd,
+            env: { ...process.env, ...options.env },
+        });
+        // `qoder -p` checks stdin for a piped prompt; close it so the child does
+        // not wait when the complete prompt was supplied as an argument.
+        child.stdin?.end();
+        options.onProcessStarted?.(child.pid);
+        const timer = options.timeoutMs > 0 ? setTimeout(() => {
+            timedOut = true;
+            (0, kill_agent_cjs_1.killAgent)(child);
+        }, options.timeoutMs) : undefined;
+        const onAbort = () => {
+            killedByLeaseLoss = true;
+            (0, kill_agent_cjs_1.killAgent)(child);
+        };
+        options.signal?.addEventListener("abort", onAbort, { once: true });
+        if (options.signal?.aborted)
+            onAbort();
+        child.stdout.on("data", (d) => {
+            options.onActivity?.();
+            stdout += d.toString();
+        });
+        child.stderr.on("data", (d) => {
+            options.onActivity?.();
+            stderr += d.toString();
+        });
+        child.on("error", (err) => {
+            clearTimeout(timer);
+            options.signal?.removeEventListener("abort", onAbort);
+            stderr += `\n${String(err)}`;
+            resolve({ exitCode: null, timedOut, killedByLeaseLoss, stdout, stderr });
+        });
+        child.on("close", (code) => {
+            clearTimeout(timer);
+            options.signal?.removeEventListener("abort", onAbort);
+            resolve({ exitCode: code, timedOut, killedByLeaseLoss, stdout, stderr });
+        });
+    });
+}
+async function runViaDocker(options, args) {
+    const { containerName, runner } = options.dockerExec;
+    const quoted = [options.bin, ...args].map(shellQuote).join(" ");
+    const command = `[ -f /tmp/session.env ] && . /tmp/session.env; cd repo 2>/dev/null; ${quoted}`;
+    let killedByLeaseLoss = false;
+    const onAbort = () => {
+        killedByLeaseLoss = true;
+        runner.run("docker", ["kill", containerName], { timeoutMs: 10_000 }).catch(() => undefined);
+    };
+    options.signal?.addEventListener("abort", onAbort, { once: true });
+    if (options.signal?.aborted)
+        onAbort();
+    try {
+        const result = await runner.run("docker", ["exec", containerName, "sh", "-c", command], {
+            timeoutMs: options.timeoutMs,
+            onActivity: options.onActivity,
+            signal: options.signal,
+        });
+        return {
+            exitCode: result.code,
+            timedOut: false,
+            killedByLeaseLoss,
+            stdout: result.stdout,
+            stderr: result.stderr,
+        };
+    }
+    catch (err) {
+        return {
+            exitCode: null,
+            timedOut: false,
+            killedByLeaseLoss,
+            stdout: "",
+            stderr: String(err),
+        };
+    }
+    finally {
+        options.signal?.removeEventListener("abort", onAbort);
+    }
+}
+function shellQuote(value) {
+    return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+/** The AgentAdapter (adapters/types.cts) wrapper session.cts selects via NAVARCH_AGENT=qoder. */
+exports.qoderAdapter = {
+    agentType: "qoder",
+    run: runQoderAdapter,
+};

package/dist/cli.cjs

@@ -78,7 +78,7 @@ function agentFromFlag(flags) {
     if (value === undefined)
         return undefined;
     if (!(0, config_cjs_1.isRuntimeAgentType)(value)) {
-        throw new Error("--agent must be one of 'claude-code', 'codex', 'gemini', 'opencode', or 'acp'.");
+        throw new Error("--agent must be one of 'claude-code', 'codex', 'gemini', 'opencode', 'acp', or 'qoder'.");
     }
     return value;
 }

package/dist/config.cjs

@@ -17,7 +17,8 @@ function isRuntimeAgentType(value) {
         value === "codex" ||
         value === "gemini" ||
         value === "opencode" ||
-        value === "acp");
+        value === "acp" ||
+        value === "qoder");
 }
 function envInt(env, name, fallback) {
     const raw = env[name];
@@ -123,6 +124,8 @@ function loadRuntimeConfig(env = process.env) {
         opencodeExtraArgs: envList(env, "NAVARCH_OPENCODE_EXTRA_ARGS", []),
         acpBin: env.NAVARCH_ACP_BIN ?? "dsh",
         acpExtraArgs: envList(env, "NAVARCH_ACP_EXTRA_ARGS", ["--profile", "acp"]),
+        qoderBin: env.NAVARCH_QODER_BIN ?? "qoder",
+        qoderExtraArgs: envList(env, "NAVARCH_QODER_EXTRA_ARGS", []),
         gitAuthorName: env.NAVARCH_GIT_AUTHOR_NAME ?? "sagentlab",
         gitAuthorEmail: env.NAVARCH_GIT_AUTHOR_EMAIL ?? "z@sagentlab.com",
         mcpConfigPath: env.NAVARCH_MCP_CONFIG_PATH ?? null,

package/dist/machine-store.cjs

@@ -52,7 +52,8 @@ async function resolveMachineIdentity(configDir, apiBaseFallback) {
                 process.env.NAVARCH_AGENT === "claude-code" ||
                 process.env.NAVARCH_AGENT === "gemini" ||
                 process.env.NAVARCH_AGENT === "opencode" ||
-                process.env.NAVARCH_AGENT === "acp"
+                process.env.NAVARCH_AGENT === "acp" ||
+                process.env.NAVARCH_AGENT === "qoder"
                 ? process.env.NAVARCH_AGENT
                 : undefined,
         };

package/dist/session.cjs

@@ -44,7 +44,7 @@ function resolveSessionExecution(config, claimed) {
         profile: claimed.task.execution_profile ?? "standard",
         model: runtime === "codex" ? "gpt-6-astra"
             : runtime === "gemini" ? "auto"
-                : runtime === "opencode" || runtime === "acp" ? "default"
+                : runtime === "opencode" || runtime === "acp" || runtime === "qoder" ? "default"
                     : "claude-opus-5",
         reasoning_effort: "medium",
     };
@@ -763,6 +763,8 @@ function adapterCommand(config, runtime) {
             return { bin: config.opencodeBin, extraArgs: config.opencodeExtraArgs };
         case "acp":
             return { bin: config.acpBin, extraArgs: config.acpExtraArgs };
+        case "qoder":
+            return { bin: config.qoderBin, extraArgs: config.qoderExtraArgs };
     }
 }
 /**

package/package.json

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