fix(inference): harden Ollama restart recovery

src/lib/actions/sandbox/agent/ollama-restart-recovery.test.ts

@@ -3,7 +3,6 @@
 
 import { describe, expect, it, vi } from "vitest";
 import { OLLAMA_PORT, OLLAMA_PROXY_PORT } from "../../../core/ports";
-import { prepareOllamaApiExecution } from "../../../inference/local";
 import {
   maybeWarmOllamaAfterDaemonRestart,
   type OllamaRestartRecoveryDeps,
@@ -76,14 +75,9 @@ describe("maybeWarmOllamaAfterDaemonRestart", () => {
           runCaptureImpl,
           runCaptureExImpl,
           prepareDockerEnvironment,
-          prepareOllamaApiExecution: (command, host, options) =>
-            prepareOllamaApiExecution(command, host, {
-              ...options,
-              prepareDockerEnvironment,
-            }),
         },
       ),
-    ).toEqual({ kind: "warmed", ok: true, timedOut: false });
+    ).toEqual({ kind: "warmed", ok: true });
 
     expect(getCommandUrl(runCaptureImpl.mock.calls[0][0])).toBe(
       `http://host.docker.internal:${OLLAMA_PORT}/api/ps`,
@@ -199,7 +193,11 @@ describe("maybeWarmOllamaAfterDaemonRestart", () => {
         { provider: "ollama-local", model: "qwen3.6:35b" },
         { runCaptureImpl: () => "", runCaptureExImpl },
       ),
-    ).toEqual({ kind: "skipped", reason: "unreachable" });
+    ).toEqual({
+      kind: "skipped",
+      reason: "unreachable",
+      endpoint: `http://127.0.0.1:${OLLAMA_PORT}`,
+    });
     expect(runCaptureExImpl).not.toHaveBeenCalled();
   });
 
@@ -219,13 +217,97 @@ describe("maybeWarmOllamaAfterDaemonRestart", () => {
     ).toEqual({
       kind: "warmed",
       ok: false,
-      timedOut: true,
       reason: "timeout",
       endpoint: "http://127.0.0.1:11434",
       detail: "warm-up exceeded 300 seconds",
     });
   });
 
+  it("limits warm-up to the command timeout budget remaining after the probe", () => {
+    let nowMs = 1_000;
+    const runCaptureExImpl = vi.fn(
+      (_command: string[], _options?: { env?: NodeJS.ProcessEnv; timeout?: number }) =>
+        successfulWarmResult(),
+    );
+    const probeRuntimeModelStatus = vi.fn(() => {
+      nowMs = 6_000;
+      return unloadedStatus;
+    });
+
+    expect(
+      maybeWarmOllamaAfterDaemonRestart(
+        { provider: "ollama-local", model: "qwen3.6:35b" },
+        {
+          probeRuntimeModelStatus,
+          runCaptureExImpl,
+          timeoutSeconds: 30,
+          now: () => nowMs,
+        },
+      ),
+    ).toEqual({ kind: "warmed", ok: true });
+
+    const warmCommand = runCaptureExImpl.mock.calls[0][0];
+    expect(warmCommand[warmCommand.indexOf("--max-time") + 1]).toBe("25");
+    expect(runCaptureExImpl.mock.calls[0][1]?.timeout).toBe(25_000);
+    expect(probeRuntimeModelStatus).toHaveBeenCalledWith(
+      "qwen3.6:35b",
+      expect.any(Function),
+      expect.any(Function),
+      5_000,
+    );
+  });
+
+  it("skips warm-up when the probe consumes the command timeout budget", () => {
+    let nowMs = 1_000;
+    const runCaptureExImpl = vi.fn(() => successfulWarmResult());
+    const probeRuntimeModelStatus = vi.fn(() => {
+      nowMs = 31_000;
+      return unloadedStatus;
+    });
+
+    expect(
+      maybeWarmOllamaAfterDaemonRestart(
+        { provider: "ollama-local", model: "qwen3.6:35b" },
+        {
+          probeRuntimeModelStatus,
+          runCaptureExImpl,
+          timeoutSeconds: 30,
+          now: () => nowMs,
+        },
+      ),
+    ).toEqual({
+      kind: "skipped",
+      reason: "deadline-exhausted",
+      endpoint: `http://127.0.0.1:${OLLAMA_PORT}`,
+    });
+    expect(runCaptureExImpl).not.toHaveBeenCalled();
+  });
+
+  it("bounds the daemon probe and skips warm-up when a short timeout is consumed", () => {
+    let nowMs = 1_000;
+    const probeRuntimeModelStatus = vi.fn(() => {
+      nowMs = 3_000;
+      return unloadedStatus;
+    });
+
+    expect(
+      maybeWarmOllamaAfterDaemonRestart(
+        { provider: "ollama-local", model: "qwen3.6:35b" },
+        { probeRuntimeModelStatus, timeoutSeconds: 2, now: () => nowMs },
+      ),
+    ).toEqual({
+      kind: "skipped",
+      reason: "deadline-exhausted",
+      endpoint: `http://127.0.0.1:${OLLAMA_PORT}`,
+    });
+    expect(probeRuntimeModelStatus).toHaveBeenCalledWith(
+      "qwen3.6:35b",
+      expect.any(Function),
+      expect.any(Function),
+      2_000,
+    );
+  });
+
   it("does not treat an exit-zero Ollama error body as a successful warm-up", () => {
     expect(
       maybeWarmOllamaAfterDaemonRestart(
@@ -243,7 +325,6 @@ describe("maybeWarmOllamaAfterDaemonRestart", () => {
     ).toMatchObject({
       kind: "warmed",
       ok: false,
-      timedOut: false,
       reason: "ollama-error",
       endpoint: "http://127.0.0.1:11434",
       detail: expect.stringContaining("model not found"),
@@ -276,7 +357,11 @@ describe("maybeWarmOllamaAfterDaemonRestart", () => {
       endpoint: `http://host.docker.internal:${OLLAMA_PORT}`,
       inventoryLabel: "llama3.2:1b",
     });
-    expect(probeModelInventory).toHaveBeenCalledWith("host.docker.internal", expect.any(Function));
+    expect(probeModelInventory).toHaveBeenCalledWith(
+      "host.docker.internal",
+      expect.any(Function),
+      5_000,
+    );
   });
 
   it("keeps the warm failure when the daemon does hold the model (#9455)", () => {
@@ -296,7 +381,6 @@ describe("maybeWarmOllamaAfterDaemonRestart", () => {
     ).toMatchObject({
       kind: "warmed",
       ok: false,
-      timedOut: false,
       reason: "ollama-error",
       endpoint: "http://127.0.0.1:11434",
       detail: expect.stringContaining("runner stopped unexpectedly"),
@@ -316,7 +400,7 @@ describe("maybeWarmOllamaAfterDaemonRestart", () => {
           }),
         },
       ),
-    ).toEqual({ kind: "warmed", ok: true, timedOut: false });
+    ).toEqual({ kind: "warmed", ok: true });
   });
 
   it.each([
@@ -336,7 +420,6 @@ describe("maybeWarmOllamaAfterDaemonRestart", () => {
     ).toMatchObject({
       kind: "warmed",
       ok: false,
-      timedOut: false,
       reason: "invalid-response",
       endpoint: "http://127.0.0.1:11434",
     });
@@ -354,7 +437,6 @@ describe("maybeWarmOllamaAfterDaemonRestart", () => {
     ).toEqual({
       kind: "warmed",
       ok: false,
-      timedOut: false,
       reason: "command-failed",
       endpoint: "http://127.0.0.1:11434",
       detail: "warm-up exited 7",
@@ -374,7 +456,6 @@ describe("maybeWarmOllamaAfterDaemonRestart", () => {
     ).toEqual({
       kind: "warmed",
       ok: false,
-      timedOut: false,
       reason: "spawn-failed",
       endpoint: "http://127.0.0.1:11434",
       detail: "spawn failed",