@sagentlab/navarch-runtime 0.1.34 → 0.1.35

package/dist/adapters/pi.cjs

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.piAdapter = exports.DEFAULT_HOSTED_PI_MODEL = exports.HOSTED_PI_MODELS = exports.DEEPSEEK_API_KEY_ENV = exports.PI_PROVIDER_NAME = void 0;
+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;
@@ -27,9 +28,9 @@ const node_path_1 = __importDefault(require("node:path"));
  * shared parsing/provider-config contract.
  *
  * Secret hygiene: the generated models.json references the DeepSeek key ONLY
- * as a `$DEEPSEEK_API_KEY` environment interpolation (Pi expands it from the
- * child environment at load time). The literal key never appears in argv, in
- * the config file, or in any file that survives cleanup. A missing
+ * 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.
@@ -47,6 +48,17 @@ 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}/`)
@@ -88,7 +100,7 @@ function buildPiProviderConfig() {
             [exports.PI_PROVIDER_NAME]: {
                 baseUrl: "https://api.deepseek.com",
                 api: "openai-completions",
-                apiKey: `$${exports.DEEPSEEK_API_KEY_ENV}`,
+                apiKey: exports.DEEPSEEK_API_KEY_ENV,
                 models,
             },
         },
@@ -195,6 +207,13 @@ function attachPiOutput(result) {
 // 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}=`)));
 }
@@ -205,7 +224,7 @@ async function runPiAdapter(options) {
         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"];
+    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.
@@ -215,9 +234,9 @@ async function runPiAdapter(options) {
     const model = resolveHostedPiModel(options.model);
     args.push("--model", `${exports.PI_PROVIDER_NAME}/${model}`);
     if (options.reasoningEffort) {
-        // Pi's --thinking accepts off|minimal|low|medium|high|xhigh|max; the
-        // resolved efforts are a subset, so they map directly.
-        args.push("--thinking", 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
@@ -230,14 +249,19 @@ async function runOnHost(options, args) {
     // 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, args, {
+            const child = (0, node_child_process_1.spawn)(options.bin, boundedArgs, {
                 cwd: options.cwd,
                 env: { ...process.env, ...env },
             });
@@ -261,12 +285,24 @@ async function runOnHost(options, args) {
                 clearTimeout(timer);
                 options.signal?.removeEventListener("abort", onAbort);
                 stderr += `\n${String(err)}`;
-                resolve({ exitCode: null, timedOut, killedByLeaseLoss, stdout, stderr });
+                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 });
+                resolve({
+                    exitCode: code,
+                    timedOut,
+                    killedByLeaseLoss,
+                    stdout,
+                    stderr,
+                });
             });
         });
     }
@@ -276,12 +312,19 @@ async function runOnHost(options, args) {
 }
 async function runViaDocker(options, args) {
     const { containerName, runner } = options.dockerExec;
-    // The provider config carries no secret values (only the $DEEPSEEK_API_KEY
+    // 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` +
-        `PI_CODING_AGENT_DIR=${CONTAINER_PI_DIR} ${[options.bin, ...args].map(shellQuote).join(" ")}`;
+        `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;
@@ -290,7 +333,10 @@ async function runViaDocker(options, args) {
     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 } });
+        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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sagentlab/navarch-runtime",
-  "version": "0.1.34",
+  "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",