openmausbot 0.1.74 → 0.1.76

package/dist-server/server/drivers/openai-chat.js

@@ -22,81 +22,104 @@ export function createOpenAIChatRuntime(options) {
         createdAt: new Date().toISOString(),
     });
     const complete = async (messages, model, stream, signal, onDelta) => {
-        const timeout = AbortSignal.timeout(options.timeoutMs);
-        const response = await fetch(`${options.apiUrl}/chat/completions`, {
-            method: "POST",
-            headers: { authorization: `Bearer ${options.apiKey}`, "content-type": "application/json" },
-            body: JSON.stringify(options.requestBody(model, messages, stream)),
-            signal: signal ? AbortSignal.any([signal, timeout]) : timeout,
-        });
-        if (!response.ok) {
-            const body = await response.text().catch(() => "");
-            throw new Error(`${options.httpErrorLabel} HTTP ${response.status}${body ? `: ${body.slice(0, 200)}` : ""}`);
-        }
-        if (!stream) {
-            const json = await response.json();
-            const message = json.choices?.[0]?.message;
-            return {
-                text: typeof message?.content === "string" ? message.content : "",
-                reasoning: options.reasoning && typeof message?.reasoning_content === "string"
-                    ? message.reasoning_content
-                    : "",
-                usage: usageFrom(json.usage),
-            };
-        }
-        if (!response.body) {
-            throw new Error(options.noBodyError ?? `${options.httpErrorLabel} returned no response body`);
-        }
-        let text = "";
-        let reasoning = "";
-        let usage = null;
-        const reader = response.body.getReader();
-        const decoder = new TextDecoder();
-        let buffer = "";
+        // Idle timer that is renewed on every received chunk during streaming
+        const timeoutController = new AbortController();
+        let idleTimer = null;
+        const resetIdleTimer = () => {
+            if (idleTimer)
+                clearTimeout(idleTimer);
+            idleTimer = setTimeout(() => {
+                timeoutController.abort(new DOMException("Streaming idle timeout elapsed", "AbortError"));
+            }, options.timeoutMs);
+        };
+        resetIdleTimer();
         try {
-            readLoop: for (;;) {
-                const { done, value } = await reader.read();
-                if (done)
-                    break;
-                buffer += decoder.decode(value, { stream: true });
-                let newline;
-                while ((newline = buffer.indexOf("\n")) !== -1) {
-                    const line = buffer.slice(0, newline).trim();
-                    buffer = buffer.slice(newline + 1);
-                    if (!line.startsWith("data:"))
-                        continue;
-                    const data = line.slice(5).trim();
-                    if (data === "[DONE]")
-                        break readLoop;
-                    let chunk;
-                    try {
-                        chunk = JSON.parse(data);
-                    }
-                    catch {
-                        continue;
-                    }
-                    const delta = chunk.choices?.[0]?.delta;
-                    const reasoningDelta = options.reasoning && typeof delta?.reasoning_content === "string"
-                        ? delta.reasoning_content
-                        : "";
-                    const contentDelta = typeof delta?.content === "string" ? delta.content : "";
-                    if (reasoningDelta) {
-                        reasoning += reasoningDelta;
-                        onDelta?.(reasoningDelta, "reasoning_text");
+            const activeSignal = signal
+                ? AbortSignal.any([signal, timeoutController.signal])
+                : timeoutController.signal;
+            const response = await fetch(`${options.apiUrl}/chat/completions`, {
+                method: "POST",
+                headers: { authorization: `Bearer ${options.apiKey}`, "content-type": "application/json" },
+                body: JSON.stringify(options.requestBody(model, messages, stream)),
+                signal: activeSignal,
+            });
+            if (!response.ok) {
+                const body = await response.text().catch(() => "");
+                throw new Error(`${options.httpErrorLabel} HTTP ${response.status}${body ? `: ${body.slice(0, 200)}` : ""}`);
+            }
+            if (!stream) {
+                const json = await response.json();
+                const message = json.choices?.[0]?.message;
+                return {
+                    text: typeof message?.content === "string" ? message.content : "",
+                    reasoning: options.reasoning && typeof message?.reasoning_content === "string"
+                        ? message.reasoning_content
+                        : "",
+                    usage: usageFrom(json.usage),
+                };
+            }
+            if (!response.body) {
+                throw new Error(options.noBodyError ?? `${options.httpErrorLabel} returned no response body`);
+            }
+            let text = "";
+            let reasoning = "";
+            let usage = null;
+            const reader = response.body.getReader();
+            const decoder = new TextDecoder();
+            let buffer = "";
+            try {
+                readLoop: for (;;) {
+                    const { done, value } = await reader.read();
+                    if (done) {
+                        if (buffer.trim() === "data: [DONE]")
+                            break;
+                        throw new DOMException("Stream ended before completion", "AbortError");
                     }
-                    if (contentDelta) {
-                        text += contentDelta;
-                        onDelta?.(contentDelta, "assistant_text");
+                    resetIdleTimer();
+                    buffer += decoder.decode(value, { stream: true });
+                    let newline;
+                    while ((newline = buffer.indexOf("\n")) !== -1) {
+                        const line = buffer.slice(0, newline).trim();
+                        buffer = buffer.slice(newline + 1);
+                        if (!line.startsWith("data:"))
+                            continue;
+                        const data = line.slice(5).trim();
+                        if (data === "[DONE]")
+                            break readLoop;
+                        let chunk;
+                        try {
+                            chunk = JSON.parse(data);
+                        }
+                        catch {
+                            continue;
+                        }
+                        const delta = chunk.choices?.[0]?.delta;
+                        const reasoningDelta = options.reasoning && typeof delta?.reasoning_content === "string"
+                            ? delta.reasoning_content
+                            : "";
+                        const contentDelta = typeof delta?.content === "string" ? delta.content : "";
+                        if (reasoningDelta) {
+                            reasoning += reasoningDelta;
+                            onDelta?.(reasoningDelta, "reasoning_text");
+                        }
+                        if (contentDelta) {
+                            text += contentDelta;
+                            onDelta?.(contentDelta, "assistant_text");
+                        }
+                        if (chunk.usage)
+                            usage = usageFrom(chunk.usage);
                     }
-                    if (chunk.usage)
-                        usage = usageFrom(chunk.usage);
                 }
             }
+            finally {
+                await reader.cancel().catch(() => { });
+            }
+            return { text, reasoning, usage };
         }
         finally {
-            await reader.cancel().catch(() => { });
+            if (idleTimer)
+                clearTimeout(idleTimer);
         }
-        return { text, reasoning, usage };
     };
     const messagesFor = (turn) => [
         ...(turn.system ? [{ role: "system", content: turn.system }] : []),

package/dist-server/server/drivers/openai-compat.js

@@ -1,5 +1,13 @@
 import { createOpenAIChatRuntime } from "./openai-chat.js";
 const DRIVER_KIND = "openai-compat";
+const DEFAULT_IDLE_TIMEOUT_MS = 180_000;
+const idleTimeoutMs = () => {
+    const raw = process.env.OPENMAUS_OPENAI_COMPAT_IDLE_TIMEOUT_MS;
+    if (!raw)
+        return DEFAULT_IDLE_TIMEOUT_MS;
+    const value = Number(raw);
+    return Number.isSafeInteger(value) && value >= 1_000 && value <= 2_147_483_647 ? value : DEFAULT_IDLE_TIMEOUT_MS;
+};
 const DEFAULT_MODELS = {
     default: "meta-llama/llama-3.3-70b-instruct",
     options: [
@@ -127,7 +135,7 @@ export const OpenAICompatDriver = {
             httpErrorLabel: "upstream",
             missingKeyError: `no API key — set ${config.apiKeyEnv} or add it to the instance config`,
             unavailableReason: `no API key — set ${config.apiKeyEnv} or add it to the instance config`,
-            timeoutMs: 120_000,
+            timeoutMs: idleTimeoutMs(),
             reasoning: true,
             billing: "metered",
             includeUsageInCompleted: true,

package/dist-server/server/drivers/pi.js

@@ -26,13 +26,14 @@ import { join } from "node:path";
 import { PROVIDER_CREDENTIAL_ENV, stripWorkspaceCredentialEnv } from "../config.js";
 import { computerProxyEnv } from "../container-computer.js";
 import { augmentedPath } from "../env-path.js";
-import { describeSpawnFailure, killCliTree, spawnCli } from "../procs.js";
+import { describeSpawnFailure, execCli, killCliTree, spawnCli } from "../procs.js";
 import { SPAWNED_PROXIES } from "../proxy-paths.js";
 import { EFFORT_LEVELS, newEventId, newId } from "../contracts.js";
 import { decodeInjectId, encodeInjectId, hostApiKey, localHost, mergeLocalInject, } from "./local-inject.js";
 import { appendNative } from "./native.js";
 const DRIVER_KIND = "piAgent";
 const PI_ARGS = ["--mode", "rpc", "--no-session"];
+const PI_MODEL_UPDATE_ARGS = ["update", "--models", "--no-approve"];
 const NODE_ENV_FLAG = { ELECTRON_RUN_AS_NODE: "1" };
 function readPiPromptImages(turn) {
     return (turn.images ?? []).map((image) => ({
@@ -317,6 +318,14 @@ export async function fetchPiModels(cli, env) {
         }
     });
 }
+/** Refresh pi's provider-owned catalog cache. This is deliberately called
+ * only by the explicit model-picker refresh action, never during app startup.
+ * Failure is non-fatal: the caller still probes the last usable cache. */
+export async function updatePiModelCatalog(cli, env) {
+    return new Promise((resolve) => {
+        execCli(cli, PI_MODEL_UPDATE_ARGS, { env, timeout: 60_000, maxBuffer: 1024 * 1024 }, (error) => resolve(!error));
+    });
+}
 function decodeConfig(raw) {
     if (raw === null || raw === undefined)
         return { cli: "pi", fullAuto: false };
@@ -364,7 +373,7 @@ export const PiDriver = {
         const { instanceId, config } = input;
         const catalogEnv = piEnvironment({ ...process.env, ...input.environment });
         let models = EMPTY;
-        const refreshModels = async () => {
+        const readModels = async () => {
             let base = models;
             try {
                 const resolved = await fetchPiModels(config.cli, catalogEnv);
@@ -384,7 +393,13 @@ export const PiDriver = {
                     models = base;
             }
         };
-        await refreshModels();
+        const refreshModels = async () => {
+            await updatePiModelCatalog(config.cli, catalogEnv);
+            await readModels();
+        };
+        // Startup stays local and fast. Only the explicit Refresh button crosses
+        // pi's model-catalog network boundary.
+        await readModels();
         const listeners = new Set();
         // one active turn per thread
         const active = new Map();

package/dist-server/server/drivers/retry.js

@@ -1,3 +1,4 @@
+import { isProviderSafetyBlock } from "../../shared/provider-safety.js";
 export const RETRY_MAX_ATTEMPTS = 3;
 /** Backoff schedule before attempt N (N is 1-based over retries): 1s / 3s / 8s. */
 export const BACKOFF_BASE_MS = [1_000, 3_000, 8_000];
@@ -42,6 +43,9 @@ const messageOf = (err) => {
  */
 export function classifyError(err) {
     const text = messageOf(err);
+    // A surrounding HTTP 5xx/429 must not replay a provider safety block.
+    if (isProviderSafetyBlock(text))
+        return { transient: false, reason: "provider_safety" };
     if (err && "exitCode" in err) {
         const { exitCode: code } = err;
         if (code !== null && code < 0)

package/dist-server/server/env-path.js

@@ -207,8 +207,8 @@ function isFile(p) {
     }
 }
 /** PATHEXT-aware `which`. A path-ish cli is probed where it points. */
-function whichWin(cli) {
-    const exts = (process.env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean);
+function whichWin(cli, env) {
+    const exts = ((env ?? process.env).PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean);
     // an extensionless name is not runnable on Windows, so PATHEXT wins over
     // the bare file — npm installs both `claude` (a sh script) and `claude.cmd`
     const probe = (base) => {
@@ -217,7 +217,8 @@ function whichWin(cli) {
     };
     if (/[\\/]/.test(cli) || /^[a-zA-Z]:/.test(cli))
         return probe(cli);
-    for (const dir of augmentedPath().split(delimiter)) {
+    const path = env ? (env.PATH ?? env.Path ?? "") : augmentedPath();
+    for (const dir of path.split(delimiter)) {
         if (!dir)
             continue;
         const hit = probe(join(dir, cli));
@@ -229,20 +230,20 @@ function whichWin(cli) {
 /** node.exe to run a script with: the one npm's shim would pick, else PATH,
  * else this executable only when it really is Node. In a packaged app,
  * process.execPath is Electron and must never be mistaken for node.exe. */
-function nodeExe(near) {
+function nodeExe(near, env) {
     const local = join(near, "node.exe");
     if (isFile(local))
         return local;
     // Ask for the executable explicitly so a custom PATHEXT ordering cannot
     // make a stray node.cmd hide the real node.exe beside it.
-    const onPath = whichWin("node.exe");
+    const onPath = whichWin("node.exe", env);
     if (onPath && extname(onPath).toLowerCase() === ".exe")
         return onPath;
     return process.versions.electron ? null : process.execPath;
 }
 /** npm/pnpm .cmd shims all spell their target as "%dp0%\..." (or
  * "%~dp0\..."). Whatever of those exists on disk is what the shim runs. */
-function parseCmdShim(shim) {
+function parseCmdShim(shim, env) {
     let text;
     try {
         text = readFileSync(shim, "utf8");
@@ -256,7 +257,7 @@ function parseCmdShim(shim) {
         .filter((p) => isFile(p) && basename(p).toLowerCase() !== "node.exe");
     const script = targets.find((p) => /\.[cm]?js$/i.test(p));
     if (script) {
-        const node = nodeExe(dir);
+        const node = nodeExe(dir, env);
         if (node)
             return { command: node, args: [script] };
     }
@@ -265,7 +266,7 @@ function parseCmdShim(shim) {
 }
 /** `#!/usr/bin/env node` → `node <script>`. Only node: nothing else has a
  * meaningful Windows equivalent worth guessing at. */
-function parseNodeShebang(file) {
+function parseNodeShebang(file, env) {
     let head = "";
     let fd = null;
     try {
@@ -289,7 +290,7 @@ function parseNodeShebang(file) {
     }
     if (!/^#!.*\bnode(\.exe)?\b/.test(head))
         return null;
-    const node = nodeExe(dirname(file));
+    const node = nodeExe(dirname(file), env);
     return node ? { command: node, args: [file] } : null;
 }
 /**
@@ -297,31 +298,31 @@ function parseNodeShebang(file) {
  * everywhere but win32 — POSIX already resolves PATH and #! itself.
  */
 /** Resolve a single command word (no tokenizer) — the platform spawn rules. */
-function resolveWord(cli, args) {
+function resolveWord(cli, args, env) {
     if (process.platform !== "win32")
         return { command: cli, args };
-    const file = whichWin(cli);
+    const file = whichWin(cli, env);
     // not found: hand back the name so spawn reports its own ENOENT
     if (!file)
         return { command: cli, args };
     const ext = extname(file).toLowerCase();
     if (ext === ".cmd" || ext === ".bat") {
-        const direct = parseCmdShim(file);
+        const direct = parseCmdShim(file, env);
         return direct ? { command: direct.command, args: [...direct.args, ...args] } : { command: file, args };
     }
     if (ext === ".exe" || ext === ".com")
         return { command: file, args };
-    const viaNode = parseNodeShebang(file);
+    const viaNode = parseNodeShebang(file, env);
     return viaNode ? { command: viaNode.command, args: [...viaNode.args, ...args] } : { command: file, args };
 }
-export function resolveCliSpawn(cli, args) {
+export function resolveCliSpawn(cli, args, env) {
     // An EXISTING FILE wins over the tokenizer: paths with spaces come from
     // our own candidate list unquoted ("/Applications/My Tools/claude"), and
     // splitting those would shred them. Only a bare word (no spaces) or an
     // explicitly-quoted/wrapper string reaches the split below.
     const trimmed = cli.trim();
     if (trimmed.includes(" ") && existsSync(trimmed))
-        return resolveWord(trimmed, args);
+        return resolveWord(trimmed, args, env);
     // A `cli` value may carry fixed leading arguments — wrapper scripts like
     // `/usr/local/bin/ag claude agp` are one string in the Engines panel. ONE
     // tokenizer pass, then resolve the head directly (never re-tokenized: a
@@ -335,7 +336,7 @@ export function resolveCliSpawn(cli, args) {
         // empty input → hand the raw string to spawn so IT reports the ENOENT
         if (!head)
             return { command: cli, args };
-        return resolveWord(head, [...fixed, ...args]);
+        return resolveWord(head, [...fixed, ...args], env);
     }
-    return resolveWord(cli, args);
+    return resolveWord(cli, args, env);
 }