@sagentlab/navarch-runtime 0.1.146 → 0.1.149

package/dist/agent-model.cjs

@@ -11,6 +11,22 @@ exports.detectAgentModelUnavailable = detectAgentModelUnavailable;
  */
 const NO_ROUTE_PATTERN = /\bprovider\.no-route\b|\bModelUnavailableError\b|\bModel unavailable:/i;
 const MODEL_NAME_PATTERN = /\bModel unavailable:\s*([^\s"'\\,;)]+)/i;
+const TRANSPORT_PATTERN = /\bprovider\.transport\b|\bConnectionRefused\b|\bECONNREFUSED\b|\bconnection refused\b/i;
+/** A failed connection is a machine problem only before the session does work. */
+function madeModelProgress(result) {
+    if (result.reportText?.trim() || (result.tokensIn ?? 0) > 0 ||
+        (result.tokensOut ?? 0) > 0 || (result.costUsd ?? 0) > 0)
+        return true;
+    return result.stdout.split(/\r?\n/).some((line) => {
+        try {
+            const event = JSON.parse(line);
+            return ["step_start", "step_finish", "text", "reasoning", "tool_use", "tool_result", "tool"].includes(event?.type);
+        }
+        catch {
+            return false;
+        }
+    });
+}
 function clip(text) {
     const trimmed = text.trim().replace(/\s+/g, " ");
     return trimmed.length > 300 ? `${trimmed.slice(0, 299)}…` : trimmed;
@@ -50,7 +66,8 @@ function errorEventMessages(stdout) {
 }
 /**
  * Detects a turn the coding agent CLI could not start because the model it
- * was told to use has no route on this machine (OpenCode `provider.no-route`).
+ * was told to use has no route on this machine (OpenCode `provider.no-route`),
+ * or its provider connection fails before any model progress in this session.
  * Like a dead login (agent-auth.cts), every task the machine claims then fails
  * the same way within seconds, so the control plane requeues the task without
  * spending a retry and pauses the machine until the model is fixed.
@@ -59,19 +76,20 @@ function errorEventMessages(stdout) {
  * ERROR log lines — and only for a turn that failed or produced no report, so
  * an agent writing about this very error cannot pause its own machine.
  */
-function detectAgentModelUnavailable(result) {
+function detectAgentModelUnavailable(result, previousAttempts = []) {
     if (result.killedByLeaseLoss || result.timedOut || result.capacityError || result.authError)
         return null;
     if (result.exitCode === 0 && result.reportText)
         return null;
+    const beforeProgress = !madeModelProgress(result) && !previousAttempts.some(madeModelProgress);
     for (const message of errorEventMessages(result.stdout)) {
-        if (NO_ROUTE_PATTERN.test(message))
+        if (NO_ROUTE_PATTERN.test(message) || (beforeProgress && TRANSPORT_PATTERN.test(message)))
             return failure(message);
     }
     if (result.exitCode === 0)
         return null;
     for (const line of result.stderr.split(/\r?\n/)) {
-        if (/ERROR/.test(line) && NO_ROUTE_PATTERN.test(line)) {
+        if (/ERROR/.test(line) && (NO_ROUTE_PATTERN.test(line) || (beforeProgress && TRANSPORT_PATTERN.test(line)))) {
             const cause = line.match(/Model unavailable:[^"\n]*/i)?.[0];
             return failure(cause ?? line);
         }

package/dist/cli.cjs

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = main;
 const config_cjs_1 = require("./config.cjs");
 const node_crypto_1 = require("node:crypto");
+const model_reference_cjs_1 = require("./model-reference.cjs");
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
 const machine_store_cjs_1 = require("./machine-store.cjs");
@@ -126,10 +127,7 @@ function warnUnknownAdapters(config) {
 /** Saved pins only apply to the adapter they were selected for. */
 function modelFromFlags(flags, agentType, identity) {
     const model = flags.model ?? (identity?.agent_type === agentType ? identity.model : undefined);
-    if (model !== undefined && (!model.trim() || model === "true" || /\s/.test(model))) {
-        throw new Error("--model requires a non-empty model reference without whitespace.");
-    }
-    return model;
+    return model === undefined ? undefined : (0, model_reference_cjs_1.normalizeRuntimeModelReference)(model);
 }
 function parseArgs(argv) {
     const [command, ...rest] = argv;

package/dist/machine-store.cjs

@@ -8,15 +8,19 @@ exports.loadMachineIdentity = loadMachineIdentity;
 exports.resolveMachineIdentity = resolveMachineIdentity;
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
+const model_reference_cjs_1 = require("./model-reference.cjs");
 const agent_types_cjs_1 = require("./agent-types.cjs");
 function storePath(configDir) {
     return node_path_1.default.join(configDir, "machine.json");
 }
 /** Persists the machine's long-lived auth token to `<configDir>/machine.json`, mode 0600. */
 async function saveMachineIdentity(configDir, identity) {
+    const normalized = identity.model === undefined
+        ? identity
+        : { ...identity, model: (0, model_reference_cjs_1.normalizeRuntimeModelReference)(identity.model) };
     await node_fs_1.promises.mkdir(configDir, { recursive: true, mode: 0o700 });
     const file = storePath(configDir);
-    await node_fs_1.promises.writeFile(file, `${JSON.stringify(identity, null, 2)}\n`, { mode: 0o600 });
+    await node_fs_1.promises.writeFile(file, `${JSON.stringify(normalized, null, 2)}\n`, { mode: 0o600 });
     await node_fs_1.promises.chmod(file, 0o600);
 }
 async function loadMachineIdentity(configDir) {

package/dist/model-reference.cjs

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeModelReference = normalizeModelReference;
+exports.normalizeRuntimeModelReference = normalizeRuntimeModelReference;
+/** Mirrors normalizeModelReference in lib/navarch/execution-policy.ts for this standalone package. */
+function normalizeModelReference(value) {
+    if (typeof value !== "string")
+        return null;
+    let model = value.trim();
+    const pairs = { '"': '"', "'": "'", "`": "`", "‘": "’", "“": "”" };
+    if (model.length >= 2 && pairs[model[0]] === model.at(-1)) {
+        model = model.slice(1, -1).trim();
+    }
+    if (!model || model.length > 500 || /[\u0000-\u001f\u007f'"`‘’“”]/.test(model))
+        return null;
+    return model;
+}
+/** Validate both new CLI pins and saved identities before use or persistence. */
+function normalizeRuntimeModelReference(value) {
+    const model = normalizeModelReference(value);
+    if (!model || model === "true" || /\s/.test(model)) {
+        throw new Error("--model requires a non-empty model reference without whitespace or embedded quotes.");
+    }
+    return model;
+}

package/dist/session.cjs

@@ -1080,7 +1080,10 @@ async function runClaimedSession(deps, claimed, sessionId, lifecycle) {
             }
             // A model the CLI has no route to (OpenCode `provider.no-route`) fails
             // every task the same way, so it gets the same treatment as a dead login.
-            const modelUnavailable = capacityLimit || authFailure ? null : (0, agent_model_cjs_1.detectAgentModelUnavailable)(turnResult);
+            // Startup transport failures also qualify, unless this session already
+            // made model progress in this or an earlier turn.
+            const modelUnavailable = capacityLimit || authFailure
+                ? null : (0, agent_model_cjs_1.detectAgentModelUnavailable)(turnResult, attempts.slice(0, -1));
             if (modelUnavailable) {
                 turnResult.modelUnavailableError = modelUnavailable.detail;
                 log.warn(`session ${leaseId}: coding agent model unavailable: ${modelUnavailable.detail}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sagentlab/navarch-runtime",
-  "version": "0.1.146",
+  "version": "0.1.149",
   "description": "Navarch machine-side session manager: claims delivery tasks and runs them through local coding agents.",
   "type": "commonjs",
   "license": "MIT",
@@ -39,7 +39,7 @@
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "typecheck": "bun check -p tsconfig.json",
     "test": "vitest run",
     "test:watch": "vitest",
     "prepublishOnly": "npm run build && npm test",