@botcord/daemon 0.2.75 → 0.2.77

package/dist/gateway/channels/botcord.js

@@ -57,7 +57,12 @@ function defaultClientFactory(input) {
 function isOwnerTrust(msg) {
     if (msg.room_id?.startsWith(OWNER_CHAT_PREFIX))
         return true;
-    if (msg.source_type === "dashboard_user_chat")
+    const sourceType = msg.source_type;
+    if (sourceType === "dashboard_user_chat")
+        return true;
+    // Cloud Agent run tasks are Hub-issued on the user's behalf, same
+    // trust posture as owner chat.
+    if (sourceType === "cloud_agent_run")
         return true;
     return false;
 }
@@ -89,11 +94,17 @@ function normalizeInbox(msg, options) {
         return null;
     // `message` is the normal conversational envelope; `contact_request` is
     // a lightweight inbound asking the agent to notify its owner (the
-    // composer appends the notify-owner hint). All other envelope types
-    // (notification, system, contact_added/removed, …) are still filtered
-    // out here — they belong in a separate push-notification path that
-    // daemon does not yet implement.
-    if (env.type !== "message" && env.type !== "contact_request")
+    // composer appends the notify-owner hint); `cloud_run` carries a
+    // Cloud Agent run task with embedded run_id + budget (the cloud
+    // daemon's runtime adapter reads them from `raw.envelope.payload.cloud_run`
+    // and reports usage back via /internal/cloud-agents/.../settle when the
+    // run completes). All other envelope types (notification, system,
+    // contact_added/removed, …) are still filtered out — they belong in
+    // a separate push-notification path that daemon does not yet implement.
+    const envType = env.type;
+    if (envType !== "message" &&
+        envType !== "contact_request" &&
+        envType !== "cloud_run")
         return null;
     if (!msg.room_id)
         return null;
@@ -104,7 +115,8 @@ function normalizeInbox(msg, options) {
     const text = ownerTrust ? rawText : sanitizeUntrustedContent(rawText);
     const isDm = msg.room_id.startsWith(DM_ROOM_PREFIX);
     const isOwnerChat = msg.room_id.startsWith(OWNER_CHAT_PREFIX);
-    const senderKind = ownerTrust || msg.source_type === "dashboard_human_room" ? "user" : "agent";
+    const sourceType = msg.source_type;
+    const senderKind = ownerTrust || sourceType === "dashboard_human_room" ? "user" : "agent";
     const senderName = msg.source_user_name ?? undefined;
     const threadId = msg.topic_id ?? msg.topic ?? null;
     const streamable = isOwnerChat;
@@ -348,6 +360,7 @@ export function createBotCordChannel(options) {
         let ws = null;
         let reconnectTimer = null;
         let keepaliveTimer = null;
+        let pollTimer = null;
         let reconnectAttempt = 0;
         let connectionSeq = 0;
         let consecutiveAuthFailures = 0;
@@ -371,6 +384,10 @@ export function createBotCordChannel(options) {
                 clearInterval(keepaliveTimer);
                 keepaliveTimer = null;
             }
+            if (pollTimer) {
+                clearInterval(pollTimer);
+                pollTimer = null;
+            }
         }
         function markStatus(patch) {
             statusSnapshot = { ...statusSnapshot, ...patch };
@@ -574,6 +591,17 @@ export function createBotCordChannel(options) {
                     });
                     log.info("botcord ws authenticated", { agentId: msg.agent_id });
                     void fireInbox("ws_auth_ok");
+                    const pollIntervalMs = options.pollIntervalMs ?? 30_000;
+                    if (pollTimer)
+                        clearInterval(pollTimer);
+                    if (pollIntervalMs > 0) {
+                        pollTimer = setInterval(() => {
+                            if (ws === socket && socket.readyState === WebSocket.OPEN) {
+                                void fireInbox("poll_interval");
+                            }
+                        }, pollIntervalMs);
+                        pollTimer.unref?.();
+                    }
                     if (keepaliveTimer)
                         clearInterval(keepaliveTimer);
                     keepaliveTimer = setInterval(() => {
@@ -835,55 +863,29 @@ function normalizeBlockForHub(block, seq) {
         return { kind: "assistant", seq, payload: { text } };
     }
     if (kind === "tool_use") {
-        // Claude Code: assistant message w/ content[].type === "tool_use" → {id,name,input}
-        // Codex:       item.started for command_execution, file_change, mcp_tool_call, web_search
-        const contents = Array.isArray(raw?.message?.content) ? raw.message.content : [];
-        const tu = contents.find((c) => c?.type === "tool_use");
-        if (tu) {
-            payload.name = typeof tu.name === "string" ? tu.name : "tool";
-            if (tu.input && typeof tu.input === "object")
-                payload.params = tu.input;
-            if (typeof tu.id === "string")
-                payload.id = tu.id;
-        }
-        else if (raw?.item && typeof raw.item === "object") {
-            payload.name = typeof raw.item.type === "string" ? raw.item.type : "tool";
-            const params = codexToolParams(raw.item);
-            if (Object.keys(params).length > 0)
-                payload.params = params;
-            if (typeof raw.item.id === "string")
-                payload.id = raw.item.id;
-            if (typeof raw.item.status === "string")
-                payload.status = raw.item.status;
+        // Claude Code, Codex, DeepSeek TUI, Kimi, and ACP all expose tool calls
+        // with slightly different field names. Preserve the real invocation input
+        // so the dashboard can show more than a bare "tool" label.
+        const call = extractToolCall(raw);
+        if (call) {
+            payload.name = call.name;
+            if (call.params !== undefined && !isEmptyRecord(call.params))
+                payload.params = call.params;
+            if (call.id)
+                payload.id = call.id;
+            if (call.status)
+                payload.status = call.status;
         }
         return { kind: "tool_call", seq, payload };
     }
     if (kind === "tool_result") {
-        // Claude Code: {type:"user", message:{content:[{type:"tool_result",tool_use_id,content}]}}
-        // Codex:       item.completed for command_execution, file_change, mcp_tool_call, web_search
-        const contents = Array.isArray(raw?.message?.content) ? raw.message.content : [];
-        const tr = contents.find((c) => c?.type === "tool_result");
-        if (tr) {
-            let resultStr = "";
-            if (typeof tr.content === "string") {
-                resultStr = tr.content;
-            }
-            else if (Array.isArray(tr.content)) {
-                resultStr = tr.content
-                    .map((c) => (typeof c?.text === "string" ? c.text : JSON.stringify(c)))
-                    .join("\n");
-            }
-            payload.result = resultStr;
-            if (typeof tr.tool_use_id === "string")
-                payload.tool_use_id = tr.tool_use_id;
-        }
-        else if (raw?.item && typeof raw.item === "object") {
-            payload.name = typeof raw.item.type === "string" ? raw.item.type : "tool";
-            if (typeof raw.item.id === "string")
-                payload.tool_use_id = raw.item.id;
-            const result = codexToolResult(raw.item);
-            if (result)
-                payload.result = result;
+        const result = extractToolResult(raw);
+        if (result) {
+            if (result.name)
+                payload.name = result.name;
+            payload.result = result.result;
+            if (result.id)
+                payload.tool_use_id = result.id;
         }
         return { kind: "tool_result", seq, payload };
     }
@@ -912,6 +914,15 @@ function normalizeBlockForHub(block, seq) {
         return { kind: "thinking", seq, payload };
     }
     // "other" — e.g. Claude Code `type:"result"` end-of-turn summary.
+    if (isTerminalRuntimeBlock(raw)) {
+        payload.terminal = true;
+        payload.details = formatBlockDetails(raw);
+        const event = typeof raw?.event === "string" ? raw.event : undefined;
+        const embedded = typeof raw?.payload?.event === "string" ? raw.payload.event : undefined;
+        if (event || embedded)
+            payload.event = event ?? embedded;
+        return { kind: "other", seq, payload };
+    }
     if (raw?.type === "result") {
         if (typeof raw.result === "string")
             payload.text = raw.result;
@@ -922,6 +933,177 @@ function normalizeBlockForHub(block, seq) {
     }
     return { kind: "other", seq, payload };
 }
+function isTerminalRuntimeBlock(raw) {
+    const event = typeof raw?.event === "string" ? raw.event : undefined;
+    const embedded = typeof raw?.payload?.event === "string" ? raw.payload.event : undefined;
+    const terminal = event ?? embedded;
+    return (terminal === "turn.completed" ||
+        terminal === "turn.finished" ||
+        terminal === "turn.done" ||
+        terminal === "done");
+}
+function extractToolCall(raw) {
+    const contents = Array.isArray(raw?.message?.content) ? raw.message.content : [];
+    const tu = contents.find((c) => c?.type === "tool_use");
+    if (tu) {
+        return {
+            name: stringField(tu, "name") ?? "tool",
+            params: parseMaybeJson(tu.input ?? tu.arguments),
+            id: stringField(tu, "id"),
+        };
+    }
+    const deepseek = extractDeepseekToolCall(raw);
+    if (deepseek)
+        return deepseek;
+    const item = raw?.item;
+    if (item && typeof item === "object") {
+        const params = codexToolParams(item);
+        return {
+            name: stringField(item, "type") ?? stringField(item, "name") ?? "tool",
+            params,
+            id: stringField(item, "id"),
+            status: stringField(item, "status"),
+        };
+    }
+    const toolCalls = Array.isArray(raw?.tool_calls) ? raw.tool_calls : [];
+    const toolCall = toolCalls.find((t) => t && typeof t === "object");
+    if (toolCall) {
+        const fn = toolCall.function && typeof toolCall.function === "object" ? toolCall.function : undefined;
+        return {
+            name: stringField(fn, "name") ?? stringField(toolCall, "name") ?? "tool",
+            params: parseMaybeJson(fn?.arguments ?? toolCall.arguments ?? toolCall.input ?? toolCall.rawInput),
+            id: stringField(toolCall, "id"),
+        };
+    }
+    const update = raw?.params?.update ?? raw?.update;
+    const acpTool = update?.toolCall ?? update?.tool_call ?? update?.tool;
+    if (acpTool && typeof acpTool === "object") {
+        return {
+            name: stringField(acpTool, "name") ?? stringField(update, "name") ?? "tool",
+            params: parseMaybeJson(acpTool.rawInput ??
+                acpTool.raw_input ??
+                acpTool.input ??
+                acpTool.arguments ??
+                acpTool.args ??
+                acpTool.params) ?? acpTool,
+            id: stringField(acpTool, "id") ?? stringField(update, "toolCallId"),
+        };
+    }
+    return null;
+}
+function extractToolResult(raw) {
+    const contents = Array.isArray(raw?.message?.content) ? raw.message.content : [];
+    const tr = contents.find((c) => c?.type === "tool_result");
+    if (tr) {
+        return {
+            result: stringifyToolResult(tr.content),
+            id: stringField(tr, "tool_use_id"),
+        };
+    }
+    const deepseek = extractDeepseekToolResult(raw);
+    if (deepseek)
+        return deepseek;
+    const item = raw?.item;
+    if (item && typeof item === "object") {
+        const result = codexToolResult(item);
+        return {
+            name: stringField(item, "type") ?? stringField(item, "name"),
+            result: result || stringifyToolResult(item),
+            id: stringField(item, "id"),
+        };
+    }
+    if (raw?.role === "tool") {
+        return {
+            result: stringifyToolResult(raw.content),
+            id: stringField(raw, "tool_call_id"),
+        };
+    }
+    const update = raw?.params?.update ?? raw?.update;
+    const acpTool = update?.toolCall ?? update?.tool_call ?? update?.tool;
+    if (acpTool && typeof acpTool === "object") {
+        const result = acpTool.output ??
+            acpTool.result ??
+            acpTool.content ??
+            acpTool.error ??
+            update.content ??
+            update;
+        return {
+            name: stringField(acpTool, "name") ?? stringField(update, "name"),
+            result: stringifyToolResult(result),
+            id: stringField(acpTool, "id") ?? stringField(update, "toolCallId"),
+        };
+    }
+    return null;
+}
+function extractDeepseekToolCall(raw) {
+    const payload = raw?.payload;
+    if (!payload || typeof payload !== "object")
+        return null;
+    if (raw?.event === "tool.started") {
+        const tool = payload.tool && typeof payload.tool === "object" ? payload.tool : undefined;
+        return {
+            name: stringField(payload, "name") ?? stringField(tool, "name") ?? "tool",
+            params: parseMaybeJson(payload.input ?? payload.arguments ?? payload.params ?? tool?.input ?? tool?.rawInput),
+            id: stringField(payload, "id") ?? stringField(tool, "id"),
+            status: stringField(payload, "status") ?? stringField(tool, "status"),
+        };
+    }
+    if (payload.event === "item.started") {
+        const inner = payload.payload && typeof payload.payload === "object" ? payload.payload : {};
+        const item = inner.item && typeof inner.item === "object" ? inner.item : undefined;
+        const tool = inner.tool && typeof inner.tool === "object" ? inner.tool : item?.tool;
+        return {
+            name: stringField(tool, "name") ??
+                stringField(inner, "name") ??
+                stringField(item, "name") ??
+                stringField(item, "type") ??
+                "tool",
+            params: parseMaybeJson(tool?.input ??
+                tool?.rawInput ??
+                tool?.arguments ??
+                inner.input ??
+                item?.input ??
+                item?.arguments) ?? tool ?? item,
+            id: stringField(tool, "id") ?? stringField(inner, "id") ?? stringField(item, "id"),
+            status: stringField(tool, "status") ?? stringField(inner, "status") ?? stringField(item, "status"),
+        };
+    }
+    return null;
+}
+function extractDeepseekToolResult(raw) {
+    const payload = raw?.payload;
+    if (!payload || typeof payload !== "object")
+        return null;
+    if (raw?.event === "tool.completed") {
+        const result = payload.output ?? payload.result ?? payload.content ?? payload.error ?? payload;
+        return {
+            name: stringField(payload, "name"),
+            result: stringifyToolResult(result),
+            id: stringField(payload, "id"),
+        };
+    }
+    if (payload.event === "item.completed" || payload.event === "item.failed") {
+        const inner = payload.payload && typeof payload.payload === "object" ? payload.payload : {};
+        const item = inner.item && typeof inner.item === "object" ? inner.item : undefined;
+        const result = item?.output ??
+            item?.result ??
+            item?.content ??
+            item?.detail ??
+            item?.summary ??
+            item?.error ??
+            inner.output ??
+            inner.result ??
+            inner.error ??
+            item ??
+            inner;
+        return {
+            name: stringField(item, "name") ?? stringField(item, "type") ?? stringField(inner, "name"),
+            result: stringifyToolResult(result),
+            id: stringField(item, "id") ?? stringField(inner, "id"),
+        };
+    }
+    return null;
+}
 function formatBlockDetails(raw) {
     if (!raw || typeof raw !== "object")
         return "";
@@ -991,6 +1173,52 @@ function codexToolResult(item) {
     }
     return parts.join("\n");
 }
+function stringifyToolResult(value) {
+    if (value == null)
+        return "";
+    if (typeof value === "string")
+        return value;
+    if (Array.isArray(value)) {
+        return value
+            .map((c) => {
+            if (typeof c === "string")
+                return c;
+            if (typeof c?.text === "string")
+                return c.text;
+            return stringifyToolResult(c);
+        })
+            .filter(Boolean)
+            .join("\n");
+    }
+    try {
+        return JSON.stringify(value, null, 2);
+    }
+    catch {
+        return String(value);
+    }
+}
+function parseMaybeJson(value) {
+    if (typeof value !== "string")
+        return value;
+    const trimmed = value.trim();
+    if (!trimmed)
+        return value;
+    if (!trimmed.startsWith("{") && !trimmed.startsWith("["))
+        return value;
+    try {
+        return JSON.parse(trimmed);
+    }
+    catch {
+        return value;
+    }
+}
+function isEmptyRecord(value) {
+    return !!value && typeof value === "object" && !Array.isArray(value) && Object.keys(value).length === 0;
+}
+function stringField(obj, key) {
+    const value = obj?.[key];
+    return typeof value === "string" && value.length > 0 ? value : undefined;
+}
 function extractContentText(content) {
     if (!content)
         return "";

package/dist/gateway/dispatcher.d.ts

@@ -1,7 +1,7 @@
 import type { GatewayLogger } from "./log.js";
 import { type SessionStore } from "./session-store.js";
 import { type TranscriptWriter } from "./transcript.js";
-import type { ChannelAdapter, GatewayConfig, GatewayInboundEnvelope, GatewayInboundMessage, GatewayRoute, InboundObserver, MemoryContextBuilder, OutboundObserver, RuntimeAdapter, SystemContextBuilder, TurnStatusSnapshot, UserTurnBuilder } from "./types.js";
+import type { ChannelAdapter, GatewayConfig, GatewayInboundEnvelope, GatewayInboundMessage, GatewayRoute, InboundObserver, MemoryContextBuilder, OutboundObserver, RuntimeAdapter, RuntimeRunResult, RuntimeCircuitBreakerSnapshot, SystemContextBuilder, TurnStatusSnapshot, UserTurnBuilder } from "./types.js";
 /** Factory signature for building a runtime adapter at turn dispatch time. */
 export type RuntimeFactory = (runtimeId: string, extraArgs?: string[]) => RuntimeAdapter;
 /** Constructor options for `Dispatcher`. */
@@ -12,6 +12,8 @@ export interface DispatcherOptions {
     sessionStore: SessionStore;
     log: GatewayLogger;
     turnTimeoutMs?: number;
+    runtimeAuthFailureThreshold?: number;
+    runtimeAuthFailureCooldownMs?: number;
     /**
      * Live reference to the Gateway's managed-route map. Dispatcher reads
      * `values()` on every `resolveRoute` call so hot-add/remove take effect
@@ -50,6 +52,24 @@ export interface DispatcherOptions {
      * and suppressed so observer failures never break the turn.
      */
     onOutbound?: OutboundObserver;
+    onRuntimeCircuitBreakerChange?: () => void;
+    /**
+     * Optional observer fired exactly once per turn after ``runtime.run``
+     * resolves (or throws / times out). Receives the inbound message, the
+     * raw runtime result (may be undefined on throw), the elapsed wall
+     * time in milliseconds, and any thrown error. The cloud daemon hooks
+     * this to settle ``cloud_run`` envelopes against the Hub's usage
+     * ledger; local daemons leave it unset.
+     *
+     * Errors thrown by the observer are logged and swallowed — settle
+     * failures must never break the agent reply path.
+     */
+    onTurnComplete?: (event: {
+        message: GatewayInboundMessage;
+        result?: RuntimeRunResult;
+        wallTimeMs: number;
+        error?: unknown;
+    }) => Promise<void> | void;
     /**
      * Optional attention gate (PR3, design §4.2). Resolved AFTER `onInbound`
      * runs and BEFORE the runtime turn enqueues, so working memory / activity
@@ -92,10 +112,14 @@ export declare class Dispatcher {
     private readonly sessionStore;
     private readonly log;
     private readonly turnTimeoutMs;
+    private readonly runtimeAuthFailureThreshold;
+    private readonly runtimeAuthFailureCooldownMs;
     private readonly buildSystemContext?;
     private readonly buildMemoryContext?;
     private readonly onInbound?;
     private readonly onOutbound?;
+    private readonly onTurnComplete?;
+    private readonly onRuntimeCircuitBreakerChange?;
     private readonly composeUserTurn?;
     private readonly managedRoutes?;
     private readonly attentionGate?;
@@ -103,6 +127,7 @@ export declare class Dispatcher {
     private readonly transcript;
     private readonly queues;
     private readonly deferredMultimodal;
+    private readonly runtimeAuthFailures;
     /**
      * Last `/hub/typing` ping timestamp per (accountId, conversationId).
      * Used to debounce cancel-previous bursts so we don't trip Hub's 20/min
@@ -114,10 +139,18 @@ export declare class Dispatcher {
     handle(envelope: GatewayInboundEnvelope): Promise<void>;
     /** Snapshot of currently running turns keyed by queue key. */
     turns(): Record<string, TurnStatusSnapshot>;
+    runtimeCircuitBreakers(): Record<string, RuntimeCircuitBreakerSnapshot>;
     private safeAck;
     private getQueue;
     private deferMultimodal;
     private takeDeferredMultimodal;
+    private runtimeAuthBreakerKey;
+    private openRuntimeAuthBreaker;
+    private pruneExpiredRuntimeAuthBreakers;
+    private recordRuntimeAuthFailure;
+    private clearRuntimeAuthFailures;
+    private notifyRuntimeCircuitBreakerChange;
+    private skipRuntimeForAuthBreaker;
     private runCancelPrevious;
     /**
      * Serial mode with coalesce-on-drain semantics: