@sagentlab/navarch-runtime 0.1.9 → 0.1.10

package/dist/adapters/codex.cjs

@@ -136,7 +136,11 @@ function tomlKey(value) {
 function safeEnvSegment(value) {
     return value.toUpperCase().replace(/[^A-Z0-9_]/g, "_");
 }
-/** Parses stdout for `codex exec --json` usage/final-message events and folds them onto the raw result (best-effort; leaves tokensIn/tokensOut/costUsd/reportText unset when nothing parses — see exit-conditions.cts#parseCodexJsonEvents). */
+/**
+ * Parses stdout for `codex exec --json` usage/final-message events and folds
+ * them onto the raw result. Codex currently reports token counts but no USD
+ * cost, so costUsd remains absent unless the stream explicitly provides one.
+ */
 function attachUsage(result) {
     const events = (0, exit_conditions_cjs_1.parseCodexJsonEvents)(result.stdout);
     if (events.length === 0)
@@ -147,7 +151,7 @@ function attachUsage(result) {
         ...result,
         tokensIn: usage.tokensIn,
         tokensOut: usage.tokensOut,
-        costUsd: usage.costUsd,
+        ...(usage.costUsd !== undefined ? { costUsd: usage.costUsd } : {}),
         ...(reportText !== undefined ? { reportText } : {}),
     };
 }

package/dist/cli.cjs

@@ -19,6 +19,19 @@ const update_coordinator_cjs_1 = require("./update-coordinator.cjs");
 const supervisor_cjs_1 = require("./supervisor.cjs");
 const log = (0, logger_cjs_1.createLogger)("cli");
 const PACKAGE_NAME = "@sagentlab/navarch-runtime";
+/** Include a control-plane response's safe error detail in top-level CLI failures. */
+function describeCliError(err) {
+    const message = err instanceof Error ? err.message : String(err);
+    if (!err || typeof err !== "object" || !("body" in err))
+        return message;
+    const body = err.body;
+    const detail = body && typeof body === "object" && "error" in body && typeof body.error === "string"
+        ? body.error
+        : typeof body === "string"
+            ? body
+            : undefined;
+    return detail && !message.includes(detail) ? `${message}: ${detail}` : message;
+}
 /**
  * How to tell the user to re-invoke this CLI, matching however THEY launched
  * it. The bare `navarch-runtime` bin only exists on PATH after a global install
@@ -305,7 +318,7 @@ async function main(argv = process.argv.slice(2)) {
         }
     }
     catch (err) {
-        log.error(err instanceof Error ? err.message : String(err));
+        log.error(describeCliError(err));
         process.exitCode = 1;
     }
 }

package/dist/exit-conditions.cjs

@@ -95,7 +95,7 @@ function parseCodexJsonEvents(stdout) {
 function extractUsageFromCodexEvents(events) {
     let tokensIn = 0;
     let tokensOut = 0;
-    let costUsd = 0;
+    let costUsd;
     for (const event of events) {
         if (event.type === "turn.completed" && event.usage) {
             tokensIn = event.usage.input_tokens ?? 0;
@@ -104,8 +104,22 @@ function extractUsageFromCodexEvents(events) {
                 costUsd = event.usage.total_cost_usd;
         }
         if (event.msg?.type === "token_count") {
-            tokensIn = (event.msg.input_tokens ?? 0) + (event.msg.cached_input_tokens ?? 0);
-            tokensOut = event.msg.output_tokens ?? 0;
+            const nested = event.msg.info?.total_token_usage;
+            tokensIn = nested
+                ? (nested.input_tokens ?? 0)
+                : (event.msg.input_tokens ?? 0) + (event.msg.cached_input_tokens ?? 0);
+            tokensOut = nested?.output_tokens ?? event.msg.output_tokens ?? 0;
+            if (typeof nested?.total_cost_usd === "number")
+                costUsd = nested.total_cost_usd;
+        }
+        if (event.type === "event_msg" && event.payload?.type === "token_count") {
+            const total = event.payload.info?.total_token_usage;
+            if (total) {
+                tokensIn = total.input_tokens ?? 0;
+                tokensOut = total.output_tokens ?? 0;
+                if (typeof total.total_cost_usd === "number")
+                    costUsd = total.total_cost_usd;
+            }
         }
         if (typeof event.msg?.total_cost_usd === "number") {
             costUsd = event.msg.total_cost_usd;

package/dist/session.cjs

@@ -7,6 +7,7 @@ exports.runSession = runSession;
 exports.toEnvMap = toEnvMap;
 const node_path_1 = __importDefault(require("node:path"));
 const node_fs_1 = require("node:fs");
+const api_cjs_1 = require("./api.cjs");
 const sandbox_cjs_1 = require("./sandbox.cjs");
 const index_cjs_1 = require("./adapters/index.cjs");
 const exit_conditions_cjs_1 = require("./exit-conditions.cjs");
@@ -21,6 +22,7 @@ const worktree_guard_cjs_1 = require("./worktree-guard.cjs");
 /** Filename the generated platform MCP config is written under inside the session metadata directory. */
 const MCP_CONFIG_FILENAME = "mcp-config.json";
 const GIT_CREDENTIAL_HELPER_FILENAME = "git-credential-navarch.cjs";
+const PR_REQUIRED_COMPLETION_RETRIES = 2;
 const log = (0, logger_cjs_1.createLogger)("session");
 /**
  * Runs one claimed task end to end (implementation-plan.md WP-07):
@@ -250,7 +252,8 @@ async function runSession(deps, claimed, sessionId) {
         const bin = config.agentType === "codex" ? config.codexBin : config.claudeBin;
         const extraArgs = config.agentType === "codex" ? config.codexExtraArgs : config.claudeExtraArgs;
         const attempts = [];
-        let result;
+        let nextPrompt = null;
+        let prRequiredCompletionRetries = 0;
         while (true) {
             // Guidance can arrive while the worktree/sandbox is being prepared.
             // It is already included in deliveredGuidance, so clear the pending
@@ -259,9 +262,11 @@ async function runSession(deps, claimed, sessionId) {
             activeAbortController = new AbortController();
             if (leaseLost)
                 activeAbortController.abort();
-            const runPrompt = deliveredGuidance.length > (bundle.guidance?.length ?? 0)
-                ? (0, prompt_cjs_1.renderGuidanceCorrectionPrompt)(promptText, deliveredGuidance)
-                : promptText;
+            const runPrompt = nextPrompt ??
+                (deliveredGuidance.length > (bundle.guidance?.length ?? 0)
+                    ? (0, prompt_cjs_1.renderGuidanceCorrectionPrompt)(promptText, deliveredGuidance)
+                    : promptText);
+            nextPrompt = null;
             await node_fs_1.promises.writeFile(node_path_1.default.join(workDir, "prompt.md"), runPrompt, "utf8");
             const turnResult = await adapter.run({
                 prompt: runPrompt,
@@ -286,66 +291,93 @@ async function runSession(deps, claimed, sessionId) {
             await pollLease();
             if (!leaseLost && pendingGuidance.length > 0)
                 continue;
-            result = {
+            const result = {
                 ...turnResult,
-                tokensIn: attempts.reduce((sum, attempt) => sum + (attempt.tokensIn ?? 0), 0),
-                tokensOut: attempts.reduce((sum, attempt) => sum + (attempt.tokensOut ?? 0), 0),
-                costUsd: attempts.reduce((sum, attempt) => sum + (attempt.costUsd ?? 0), 0),
+                tokensIn: sumReportedUsage(attempts, "tokensIn"),
+                tokensOut: sumReportedUsage(attempts, "tokensOut"),
+                costUsd: sumReportedUsage(attempts, "costUsd"),
             };
-            break;
-        }
-        const mapping = (0, exit_conditions_cjs_1.mapExitCondition)({ ...result, killedByLeaseLoss: leaseLost || result.killedByLeaseLoss });
-        try {
-            const prUrl = await (0, github_pr_cjs_1.findHeadBranchPullRequestUrl)({
-                repository: bundle.repository?.full_name ?? task.repo,
-                headBranch: gitWorktree.branch,
-                githubToken,
+            const mapping = (0, exit_conditions_cjs_1.mapExitCondition)({
+                ...result,
+                killedByLeaseLoss: leaseLost || result.killedByLeaseLoss,
             });
-            if (prUrl)
-                mapping.evidenceUrls.push(prUrl);
-        }
-        catch (err) {
-            // Evidence discovery is best-effort: a GitHub outage or token scope
-            // mismatch must not turn an otherwise valid completion into a crash.
-            log.warn(`head-branch PR lookup failed for ${leaseId}: ${String(err)}`);
-        }
-        const knownSecrets = registry.list();
-        if (mapping.leaseOutcome === "failed") {
-            log.warn(`adapter failed for ${leaseId}: ${(0, redact_cjs_1.redactText)(mapping.reportSummary, knownSecrets)}`);
-        }
-        const transcript = attempts
-            .flatMap((attempt, index) => [
-            `# agent turn ${index + 1} stdout`,
-            (0, redact_cjs_1.redactText)(attempt.stdout, knownSecrets),
-            "",
-            `# agent turn ${index + 1} stderr`,
-            (0, redact_cjs_1.redactText)(attempt.stderr, knownSecrets),
-            "",
-        ])
-            .join("\n");
-        let transcriptUrl;
-        try {
-            const { upload_url, public_url } = await api.getTranscriptUploadUrl(leaseId);
-            await (0, upload_cjs_1.uploadTranscript)(upload_url, transcript);
-            transcriptUrl = public_url;
-        }
-        catch (err) {
-            log.warn(`transcript upload failed for ${leaseId}: ${String(err)}`);
+            try {
+                const prUrl = await (0, github_pr_cjs_1.findHeadBranchPullRequestUrl)({
+                    repository: bundle.repository?.full_name ?? task.repo,
+                    headBranch: gitWorktree.branch,
+                    githubToken,
+                });
+                if (prUrl)
+                    mapping.evidenceUrls.push(prUrl);
+            }
+            catch (err) {
+                // Evidence discovery is best-effort: a GitHub outage or token scope
+                // mismatch must not turn an otherwise valid completion into a crash.
+                log.warn(`head-branch PR lookup failed for ${leaseId}: ${String(err)}`);
+            }
+            const knownSecrets = registry.list();
+            if (mapping.leaseOutcome === "failed") {
+                log.warn(`adapter failed for ${leaseId}: ${(0, redact_cjs_1.redactText)(mapping.reportSummary, knownSecrets)}`);
+            }
+            const transcript = attempts
+                .flatMap((attempt, index) => [
+                `# agent turn ${index + 1} stdout`,
+                (0, redact_cjs_1.redactText)(attempt.stdout, knownSecrets),
+                "",
+                `# agent turn ${index + 1} stderr`,
+                (0, redact_cjs_1.redactText)(attempt.stderr, knownSecrets),
+                "",
+            ])
+                .join("\n");
+            let transcriptUrl;
+            try {
+                const { upload_url, public_url } = await api.getTranscriptUploadUrl(leaseId);
+                await (0, upload_cjs_1.uploadTranscript)(upload_url, transcript);
+                transcriptUrl = public_url;
+            }
+            catch (err) {
+                log.warn(`transcript upload failed for ${leaseId}: ${String(err)}`);
+            }
+            const completion = {
+                status: mapping.leaseOutcome,
+                report: (0, redact_cjs_1.redactText)(mapping.reportSummary, knownSecrets),
+                evidence_urls: mapping.evidenceUrls,
+                cost: {
+                    ...(result.tokensIn !== undefined ? { tokens_in: result.tokensIn } : {}),
+                    ...(result.tokensOut !== undefined ? { tokens_out: result.tokensOut } : {}),
+                    ...(result.costUsd !== undefined ? { cost_usd: result.costUsd } : {}),
+                },
+                transcript_url: transcriptUrl,
+                exit_status: mapping.exitStatus,
+                agent_type: config.agentType,
+                ...executionReport,
+            };
+            try {
+                await api.completeLease(leaseId, completion);
+                break;
+            }
+            catch (err) {
+                const rejection = mapping.leaseOutcome === "completed" ? prRequiredRejectionMessage(err) : null;
+                if (!rejection)
+                    throw err;
+                const redactedRejection = (0, redact_cjs_1.redactText)(rejection, knownSecrets);
+                if (prRequiredCompletionRetries < PR_REQUIRED_COMPLETION_RETRIES) {
+                    prRequiredCompletionRetries += 1;
+                    log.warn(`completion for ${leaseId} requires a pull request; restarting agent turn ${prRequiredCompletionRetries}/${PR_REQUIRED_COMPLETION_RETRIES} in the same worktree.`);
+                    nextPrompt = redactedRejection;
+                    continue;
+                }
+                log.warn(`completion for ${leaseId} still requires a pull request after ${PR_REQUIRED_COMPLETION_RETRIES} retries; failing with the control-plane rejection.`);
+                await api.completeLease(leaseId, {
+                    ...completion,
+                    status: "failed",
+                    report: redactedRejection,
+                    failure_summary: redactedRejection,
+                    exit_status: "failed",
+                });
+                break;
+            }
         }
-        await api.completeLease(leaseId, {
-            status: mapping.leaseOutcome,
-            report: (0, redact_cjs_1.redactText)(mapping.reportSummary, knownSecrets),
-            evidence_urls: mapping.evidenceUrls,
-            cost: {
-                tokens_in: result.tokensIn ?? 0,
-                tokens_out: result.tokensOut ?? 0,
-                cost_usd: result.costUsd ?? 0,
-            },
-            transcript_url: transcriptUrl,
-            exit_status: mapping.exitStatus,
-            agent_type: config.agentType,
-            ...executionReport,
-        });
     }
     catch (err) {
         log.error(`session ${leaseId} threw before completing: ${String(err)}`);
@@ -373,6 +405,23 @@ async function runSession(deps, claimed, sessionId) {
         await node_fs_1.promises.rm(workDir, { recursive: true, force: true }).catch(() => undefined);
     }
 }
+function sumReportedUsage(attempts, key) {
+    const reported = attempts.flatMap((attempt) => {
+        const value = attempt[key];
+        return value === undefined ? [] : [value];
+    });
+    return reported.length > 0 ? reported.reduce((sum, value) => sum + value, 0) : undefined;
+}
+function prRequiredRejectionMessage(err) {
+    if (!(err instanceof api_cjs_1.NavarchApiError) || err.status !== 409)
+        return null;
+    if (typeof err.body !== "object" || err.body === null || Array.isArray(err.body))
+        return null;
+    const body = err.body;
+    return body.code === "pr_required" && typeof body.error === "string"
+        ? body.error
+        : null;
+}
 /** Uppercases + sanitizes secret names into shell-safe env var names for injectEnv(). */
 function toEnvMap(secrets, credentialRefreshOrAuthorName, gitAuthorNameOrEmail = "sagentlab", gitAuthorEmail = "z@sagentlab.com") {
     // Keep the existing `(secrets, authorName, authorEmail)` call shape while

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sagentlab/navarch-runtime",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "Navarch machine-side session manager: registers a machine, claims tasks from the control-plane dispatcher, runs them via the Claude Code or Codex adapter, and reports results back.",
   "type": "commonjs",
   "license": "MIT",