openmausbot 0.1.89 → 0.1.90

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

@@ -64,7 +64,7 @@ export function createOpenAIChatRuntime(options) {
         turnId,
         createdAt: new Date().toISOString(),
     });
-    const complete = async (messages, model, stream, signal, onDelta, tools = []) => {
+    const complete = async (messages, model, stream, signal, onDelta, tools = [], onUsage) => {
         // Idle timer that is renewed on every received chunk during streaming
         const timeoutController = new AbortController();
         let idleTimer = null;
@@ -99,6 +99,17 @@ export function createOpenAIChatRuntime(options) {
             }
             if (!stream || response.headers.get("content-type")?.includes("application/json")) {
                 const json = await response.json();
+                if (onUsage) {
+                    activeSignal.throwIfAborted();
+                    const count = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : undefined;
+                    onUsage({
+                        model: typeof json.model === "string" && json.model.trim() ? json.model : model,
+                        input: count(json.usage?.prompt_tokens),
+                        output: count(json.usage?.completion_tokens),
+                        cachedInput: count(json.usage?.prompt_tokens_details?.cached_tokens),
+                        costUsd: count(json.usage?.cost),
+                    });
+                }
                 const bodyError = providerError(json);
                 if (bodyError)
                     throw new ChatProtocolError(`provider returned a completion error: ${bodyError.slice(0, 200)}`);
@@ -619,7 +630,7 @@ export function createOpenAIChatRuntime(options) {
             provider: options.driverKind,
             capabilities: { ...(options.computerUse ? { computerMcp: options.tools !== false,
                     // Same gate as cloudComputerMcp: with tools off the runtime cannot
-                    // mount the leased Box descriptor either. The fleet invariant test
+                    // mount the leased Boat descriptor either. The fleet invariant test
                     // pins usesCloudComputer === (remoteAgent || cloudComputerMcp).
                     usesCloudComputer: options.tools !== false, cloudComputerMcp: options.tools !== false, localComputerMcp: options.tools !== false,
                     browserMcp: options.tools !== false, nativeImageInput: true, images: true } : {}),
@@ -661,9 +672,9 @@ export function createOpenAIChatRuntime(options) {
                 return () => listeners.delete(listener);
             },
         },
-        generateText: async (prompt, { signal } = {}) => {
+        generateText: async (prompt, { signal, onUsage } = {}) => {
             const model = options.generateModel?.() ?? options.models().default;
-            const { text, reasoning, toolCalls } = await complete([{ role: "user", content: prompt }], model, false, signal);
+            const { text, reasoning, toolCalls } = await complete([{ role: "user", content: prompt }], model, false, signal, undefined, [], onUsage);
             if (toolCalls.length)
                 throw new ChatProtocolError("provider returned tool calls to a text-only helper");
             return text.trim() ? text : reasoning;

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

@@ -465,7 +465,7 @@ export const PiDriver = {
                 ensurePiInjectModel(turn.model, { ...process.env, ...input.environment });
             }
             // integrations → stdio MCP servers for the pi-mcp-extension. The config
-            // carries credentials (box token, composio key, comms token), so it goes
+            // carries credentials (boat token, composio key, comms token), so it goes
             // into a 0600 temp file removed when the turn settles — never on argv.
             const mcpServers = buildMcpServers(turn);
             let mcpTempDir = null;
@@ -476,7 +476,7 @@ export const PiDriver = {
                 }
                 catch (err) {
                     // A failed write must not leave the temp dir behind — a partial file
-                    // could still hold the box token / composio key / comms token.
+                    // could still hold the boat token / composio key / comms token.
                     try {
                         rmSync(mcpTempDir, { recursive: true, force: true });
                     }
@@ -488,7 +488,7 @@ export const PiDriver = {
             }
             const childArgs = mcpServers ? [...PI_ARGS, "-e", SPAWNED_PROXIES.piMcpExtension] : PI_ARGS;
             // spawnCli can throw synchronously (unresolvable CLI); if it does, the
-            // 0600 temp file with the box token / composio key / comms token must
+            // 0600 temp file with the boat token / composio key / comms token must
             // not be left on disk — settle() never runs because no child existed.
             const child = (() => {
                 try {

package/dist-server/server/hosted-models.js

@@ -2,6 +2,7 @@ import { existsSync, lstatSync, mkdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { z } from "zod";
 import { writeFileAtomic } from "./atomic.js";
+import { cloudHomeConfigured } from "./cloud-home.js";
 import { hostedWorkspaceConfiguration } from "./enterprise.js";
 export const HOSTED_MODEL_POLICY_HEADER = "X-Omb-Hosted-Model-Policy";
 export const HOSTED_MODEL_SETUP_ERROR = "No company models are assigned to this workspace. Ask your administrator to enable model access in Admin.";
@@ -15,10 +16,14 @@ const catalogSchema = z.object({
 }).strict();
 const providerFor = { claude: "anthropic", codex: "openai", opencode: "openrouter" };
 /** Operator-only policy. An ordinary desktop has neither input and keeps its
- * personal providers. Partial policy configuration must never enable them. */
+ * personal providers. Partial policy configuration must never enable them.
+ * A Cloud home never routes to a model gateway: it ignores both inputs
+ * (cloud-home.ts), and its person signs in with their own engines. */
 export function hostedModelPolicy(dataDirectory, env = process.env) {
     if (env.OMB_HOSTED_MODELS === undefined && env.OMB_HOSTED_MODEL_TOKEN === undefined)
         return null;
+    if (cloudHomeConfigured(env))
+        return null;
     const hosted = hostedWorkspaceConfiguration(env);
     if (!hosted?.portalMembership || env.OMB_DESKTOP_PARENT === "1" || !/^omb_workspace_[A-Za-z0-9_-]{43}$/.test(env.OMB_HOSTED_MODEL_TOKEN ?? "")) {
         throw new Error("Hosted model access requires complete portal-managed configuration.");