@sagentlab/navarch-runtime 0.1.33 → 0.1.35

package/dist/adapters/index.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runOpenCodeAdapter = exports.openCodeAdapter = exports.runGeminiAdapter = exports.geminiAdapter = exports.runCodexAdapter = exports.codexAdapter = exports.runClaudeCodeAdapter = exports.claudeCodeAdapter = void 0;
+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; } });
@@ -14,6 +14,9 @@ Object.defineProperty(exports, "runGeminiAdapter", { enumerable: true, get: func
 const opencode_cjs_1 = require("./opencode.cjs");
 Object.defineProperty(exports, "openCodeAdapter", { enumerable: true, get: function () { return opencode_cjs_1.openCodeAdapter; } });
 Object.defineProperty(exports, "runOpenCodeAdapter", { enumerable: true, get: function () { return opencode_cjs_1.runOpenCodeAdapter; } });
+const pi_cjs_1 = require("./pi.cjs");
+Object.defineProperty(exports, "piAdapter", { enumerable: true, get: function () { return pi_cjs_1.piAdapter; } });
+Object.defineProperty(exports, "runPiAdapter", { enumerable: true, get: function () { return pi_cjs_1.runPiAdapter; } });
 /**
  * Picks the AgentAdapter (adapters/types.cts) session.cts should run a
  * session with, keyed off config.cts's `agentType` (NAVARCH_AGENT). This is
@@ -31,6 +34,11 @@ function selectAdapter(agentType) {
             return opencode_cjs_1.openCodeAdapter;
         case "claude-code":
             return claude_cjs_1.claudeCodeAdapter;
+        case "pi":
+            // Managed hosted runtime (#885): reachable only on a managed runner
+            // executing a `runtime: "pi"` claim — config.cts never produces "pi"
+            // from NAVARCH_AGENT, so a BYO machine cannot select it locally.
+            return pi_cjs_1.piAdapter;
         default: {
             // Exhaustiveness guard: config.cts only ever produces the values
             // above, but fall back to Claude Code rather than throwing if this

package/dist/adapters/pi.cjs

@@ -0,0 +1,367 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.piAdapter = exports.HOSTED_PI_MAX_PROVIDER_TURNS = exports.DEFAULT_HOSTED_PI_MODEL = exports.HOSTED_PI_MODELS = exports.DEEPSEEK_API_KEY_ENV = exports.PI_PROVIDER_NAME = void 0;
+exports.buildHostedPiBudgetExtension = buildHostedPiBudgetExtension;
+exports.resolveHostedPiModel = resolveHostedPiModel;
+exports.buildPiProviderConfig = buildPiProviderConfig;
+exports.parsePiJsonEvents = parsePiJsonEvents;
+exports.runPiAdapter = runPiAdapter;
+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"));
+/**
+ * Headless Pi coding-agent adapter (#885) — the process-side twin of the
+ * Cloudflare hosted executor (worker/hosted-pi/lifecycle.ts). It invokes
+ * `pi --mode json -p <prompt>` against DeepSeek V4 through a generated
+ * OpenAI-compatible custom-provider config and normalizes the JSON event
+ * stream into the common AdapterResult boundary.
+ *
+ * Hosted Pi is control-plane provisioned (docs/navarch/runtime-adapter-contract.md
+ * — "Hosted Pi is not a fifth AgentAdapter" for BYO workers): config.cts
+ * never selects this adapter from NAVARCH_AGENT, and dispatch never returns
+ * `runtime: "pi"` to a BYO machine. This module exists so the managed runner
+ * has the same normalized process boundary as every other CLI, with one
+ * shared parsing/provider-config contract.
+ *
+ * Secret hygiene: the generated models.json references the DeepSeek key ONLY
+ * as the `DEEPSEEK_API_KEY` environment-variable name (Pi resolves it from
+ * the child environment at request time). The literal key never appears in
+ * argv, in the config file, or in any file that survives cleanup. A missing
+ * DEEPSEEK_API_KEY in the session environment is a hard configuration
+ * failure — the adapter refuses to launch rather than fall back to an
+ * ambient credential.
+ *
+ * MCP: Pi has no MCP client, so `mcpConfigPath` is a documented unsupported
+ * control for this adapter (contract: "document an unsupported control
+ * instead of inventing one"); platform MCP tools are unavailable to hosted
+ * Pi sessions.
+ */
+// ---------------------------------------------------------------------------
+// Provider config — MIRROR of worker/hosted-pi/provider-config.ts. Both
+// sides must keep the same provider name, env reference, and model ids.
+// ---------------------------------------------------------------------------
+exports.PI_PROVIDER_NAME = "deepseek";
+exports.DEEPSEEK_API_KEY_ENV = "DEEPSEEK_API_KEY";
+exports.HOSTED_PI_MODELS = ["deepseek-v4-flash", "deepseek-v4-pro"];
+exports.DEFAULT_HOSTED_PI_MODEL = "deepseek-v4-flash";
+exports.HOSTED_PI_MAX_PROVIDER_TURNS = 3;
+function buildHostedPiBudgetExtension() {
+    return `export default function navarchHostedPiBudget(pi) {
+  let providerTurns = 0;
+  pi.on("turn_start", (_event, ctx) => {
+    providerTurns += 1;
+    if (providerTurns > ${exports.HOSTED_PI_MAX_PROVIDER_TURNS}) ctx.abort();
+  });
+}
+`;
+}
+function resolveHostedPiModel(configured) {
+    const trimmed = (configured ?? "").trim();
+    const bare = trimmed.startsWith(`${exports.PI_PROVIDER_NAME}/`)
+        ? trimmed.slice(exports.PI_PROVIDER_NAME.length + 1)
+        : trimmed;
+    return exports.HOSTED_PI_MODELS.includes(bare)
+        ? bare
+        : exports.DEFAULT_HOSTED_PI_MODEL;
+}
+/**
+ * Pi custom-provider models.json. Cost figures mirror the OFF-PEAK DeepSeek
+ * prices from lib/navarch/hosted-credits.ts and only drive Pi's local cost
+ * display; billing authority is the control plane's immutable price
+ * snapshot, never this file.
+ */
+function buildPiProviderConfig() {
+    const models = [
+        {
+            id: "deepseek-v4-flash",
+            name: "DeepSeek V4 Flash",
+            reasoning: true,
+            input: ["text"],
+            cost: { input: 0.22, output: 0.66, cacheRead: 0.007, cacheWrite: 0.22 },
+            contextWindow: 128_000,
+            maxTokens: 16_384,
+        },
+        {
+            id: "deepseek-v4-pro",
+            name: "DeepSeek V4 Pro",
+            reasoning: true,
+            input: ["text"],
+            cost: { input: 0.66, output: 1.98, cacheRead: 0.022, cacheWrite: 0.66 },
+            contextWindow: 128_000,
+            maxTokens: 16_384,
+        },
+    ];
+    return `${JSON.stringify({
+        providers: {
+            [exports.PI_PROVIDER_NAME]: {
+                baseUrl: "https://api.deepseek.com",
+                api: "openai-completions",
+                apiKey: exports.DEEPSEEK_API_KEY_ENV,
+                models,
+            },
+        },
+    }, null, 2)}\n`;
+}
+function tokenCount(value) {
+    return typeof value === "number" && Number.isFinite(value) && value >= 0
+        ? Math.floor(value)
+        : undefined;
+}
+function usdAmount(value) {
+    return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : undefined;
+}
+function extractText(content) {
+    if (typeof content === "string")
+        return content;
+    if (!Array.isArray(content))
+        return "";
+    return content
+        .map((block) => {
+        if (typeof block === "string")
+            return block;
+        if (block &&
+            typeof block === "object" &&
+            block.type === "text" &&
+            typeof block.text === "string") {
+            return block.text;
+        }
+        return "";
+    })
+        .filter(Boolean)
+        .join("\n");
+}
+function parsePiJsonEvents(stdout) {
+    const events = [];
+    for (const line of stdout.split(/\r?\n/)) {
+        const trimmed = line.trim();
+        if (!trimmed.startsWith("{"))
+            continue;
+        try {
+            const parsed = JSON.parse(trimmed);
+            if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+                events.push(parsed);
+            }
+        }
+        catch {
+            // Unknown lines remain available in the raw transcript.
+        }
+    }
+    return events;
+}
+function attachPiOutput(result) {
+    const events = parsePiJsonEvents(result.stdout);
+    if (events.length === 0)
+        return result;
+    let cacheHit = 0;
+    let cacheMiss = 0;
+    let output = 0;
+    let costUsd;
+    let sawUsage = false;
+    let reportText = "";
+    for (const event of events) {
+        const message = event.message;
+        if (event.type !== "message_end" || !message || message.role !== "assistant")
+            continue;
+        const text = extractText(message.content);
+        if (text.trim())
+            reportText = text.trim();
+        const usage = message.usage;
+        if (usage && typeof usage === "object") {
+            const input = tokenCount(usage.input);
+            const read = tokenCount(usage.cacheRead);
+            const write = tokenCount(usage.cacheWrite);
+            const out = tokenCount(usage.output);
+            if (input !== undefined || read !== undefined || write !== undefined || out !== undefined) {
+                sawUsage = true;
+                cacheHit += read ?? 0;
+                // DeepSeek bills cache writes at the miss rate; cache-miss input is
+                // regular input plus cache writes (docs/navarch/hosted-prepaid-credits.md).
+                cacheMiss += (input ?? 0) + (write ?? 0);
+                output += out ?? 0;
+                const total = usage.cost ? usdAmount(usage.cost.total) : undefined;
+                if (total !== undefined)
+                    costUsd = (costUsd ?? 0) + total;
+            }
+        }
+    }
+    return {
+        ...result,
+        ...(sawUsage
+            ? {
+                // AdapterResult semantics: tokensIn folds every input category
+                // together and cacheHitTokensIn is its cache-read component.
+                tokensIn: cacheHit + cacheMiss,
+                tokensOut: output,
+                cacheHitTokensIn: cacheHit,
+            }
+            : {}),
+        ...(costUsd !== undefined ? { costUsd } : {}),
+        ...(reportText ? { reportText } : {}),
+    };
+}
+// ---------------------------------------------------------------------------
+// Invocation
+// ---------------------------------------------------------------------------
+const CONTAINER_PI_DIR = "/tmp/navarch-pi-agent";
+const BUDGET_EXTENSION_NAME = "navarch-budget.js";
+function withBudgetExtension(args, extensionPath) {
+    const promptIndex = args.indexOf("-p");
+    if (promptIndex < 0)
+        return [...args, "--extension", extensionPath];
+    return [...args.slice(0, promptIndex), "--extension", extensionPath, ...args.slice(promptIndex)];
+}
+function hasArg(args, ...flags) {
+    return args.some((arg) => flags.some((flag) => arg === flag || arg.startsWith(`${flag}=`)));
+}
+async function runPiAdapter(options) {
+    if (!options.env[exports.DEEPSEEK_API_KEY_ENV]) {
+        // Fail closed: launching without the referenced managed credential would
+        // let Pi fall back to ambient/operator auth outside the session boundary.
+        throw new Error(`pi adapter: ${exports.DEEPSEEK_API_KEY_ENV} is missing from the session environment; ` +
+            "the managed provider credential must be injected by the hosted runner");
+    }
+    const args = ["--mode", "json", "--no-extensions"];
+    if (!hasArg(options.extraArgs, "--no-session")) {
+        // Ephemeral by default: session persistence would leave conversation
+        // files (which may quote repository content) behind after cleanup.
+        args.push("--no-session");
+    }
+    args.push(...options.extraArgs);
+    const model = resolveHostedPiModel(options.model);
+    args.push("--model", `${exports.PI_PROVIDER_NAME}/${model}`);
+    if (options.reasoningEffort) {
+        // Pi 0.73.1 tops out at xhigh. Navarch's max effort must clamp rather
+        // than passing an invalid value that Pi warns about and ignores.
+        args.push("--thinking", options.reasoningEffort === "max" ? "xhigh" : options.reasoningEffort);
+    }
+    args.push("-p", options.prompt);
+    const raw = options.dockerExec
+        ? await runViaDocker(options, args)
+        : await runOnHost(options, args);
+    return attachPiOutput(raw);
+}
+async function runOnHost(options, args) {
+    // Isolated agent dir so the generated provider config never touches (or
+    // reads) an operator's ~/.pi configuration/credentials.
+    const agentDir = await node_fs_1.promises.mkdtemp(node_path_1.default.join(node_os_1.default.tmpdir(), "navarch-pi-agent-"));
+    await node_fs_1.promises.writeFile(node_path_1.default.join(agentDir, "models.json"), buildPiProviderConfig(), { mode: 0o600 });
+    const budgetExtensionPath = node_path_1.default.join(agentDir, BUDGET_EXTENSION_NAME);
+    await node_fs_1.promises.writeFile(budgetExtensionPath, buildHostedPiBudgetExtension(), {
+        mode: 0o600,
+    });
+    const env = { ...options.env, PI_CODING_AGENT_DIR: agentDir };
+    const boundedArgs = withBudgetExtension(args, budgetExtensionPath);
+    try {
+        return await new Promise((resolve) => {
+            let stdout = "";
+            let stderr = "";
+            let timedOut = false;
+            let killedByLeaseLoss = false;
+            const child = (0, node_child_process_1.spawn)(options.bin, boundedArgs, {
+                cwd: options.cwd,
+                env: { ...process.env, ...env },
+            });
+            child.stdin?.end();
+            const timer = setTimeout(() => {
+                timedOut = true;
+                child.kill("SIGKILL");
+            }, options.timeoutMs);
+            const onAbort = () => {
+                killedByLeaseLoss = true;
+                child.kill("SIGKILL");
+            };
+            options.signal?.addEventListener("abort", onAbort, { once: true });
+            child.stdout.on("data", (data) => {
+                stdout += data.toString();
+            });
+            child.stderr.on("data", (data) => {
+                stderr += data.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,
+                });
+            });
+        });
+    }
+    finally {
+        await node_fs_1.promises.rm(agentDir, { recursive: true, force: true }).catch(() => undefined);
+    }
+}
+async function runViaDocker(options, args) {
+    const { containerName, runner } = options.dockerExec;
+    // The provider config carries no secret values (only the DEEPSEEK_API_KEY
+    // env reference), so materializing it through the container shell is safe.
+    const command = `[ -f /tmp/session.env ] && . /tmp/session.env; cd repo 2>/dev/null; ` +
+        `mkdir -p ${CONTAINER_PI_DIR} && cat > ${CONTAINER_PI_DIR}/models.json <<'NAVARCH_PI_EOF'\n` +
+        `${buildPiProviderConfig()}NAVARCH_PI_EOF\n` +
+        `cat > ${CONTAINER_PI_DIR}/${BUDGET_EXTENSION_NAME} <<'NAVARCH_PI_BUDGET_EOF'\n` +
+        `${buildHostedPiBudgetExtension()}NAVARCH_PI_BUDGET_EOF\n` +
+        `PI_CODING_AGENT_DIR=${CONTAINER_PI_DIR} ${[
+            options.bin,
+            ...withBudgetExtension(args, `${CONTAINER_PI_DIR}/${BUDGET_EXTENSION_NAME}`),
+        ]
+            .map(shellQuote)
+            .join(" ")}`;
+    let killedByLeaseLoss = false;
+    const onAbort = () => {
+        killedByLeaseLoss = true;
+        runner.run("docker", ["kill", containerName]).catch(() => undefined);
+    };
+    options.signal?.addEventListener("abort", onAbort, { once: true });
+    try {
+        const forwardedEnv = Object.keys(options.env).flatMap((name) => ["--env", name]);
+        const result = await runner.run("docker", ["exec", ...forwardedEnv, containerName, "sh", "-c", command], {
+            timeoutMs: options.timeoutMs,
+            env: { ...process.env, ...options.env },
+        });
+        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, `'\\''`)}'`;
+}
+exports.piAdapter = {
+    agentType: "pi",
+    run: runPiAdapter,
+};

package/dist/redact.cjs

@@ -7,10 +7,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecretRegistry = void 0;
 exports.redactText = redactText;
+// Keep in sync with lib/navarch/redaction.ts's SECRET_SHAPE_PATTERNS — the
+// hosted Pi executor (worker/hosted-pi) shares these shapes for its own
+// transcript/progress scrubbing.
 const SECRET_PATTERNS = [
     /gh[pousr]_[A-Za-z0-9]{20,}/g, // GitHub PAT / OAuth / user-to-server / refresh tokens
     /github_pat_[A-Za-z0-9_]{20,}/g, // GitHub fine-grained PAT
-    /sk-[A-Za-z0-9-]{20,}/g, // generic vendor secret-key style token
+    /sk-[A-Za-z0-9-]{20,}/g, // OpenAI-compatible secret keys, incl. DeepSeek `sk-…` (hosted Pi provider)
+    /\/\/[^/\s:@]+:[^/\s@]+@/g, // basic-auth userinfo in URLs (e.g. x-access-token:…@github.com clones)
     /-----BEGIN [A-Z0-9 ]*PRIVATE KEY-----[\s\S]+?-----END [A-Z0-9 ]*PRIVATE KEY-----/g,
 ];
 const REDACTED = "[REDACTED]";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sagentlab/navarch-runtime",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "Navarch machine-side session manager: claims delivery tasks and runs them through Claude Code, Codex, Gemini, or OpenCode.",
   "type": "commonjs",
   "license": "MIT",