@syengup/friday-channel-next 0.1.36 → 0.1.38

package/dist/index.js

@@ -33,7 +33,7 @@ function deviceIdFromToolContext(ctx) {
     }
     const sk = typeof ctx.sessionKey === "string" && ctx.sessionKey.trim()
         ? ctx.sessionKey.trim()
-        : (ctx.runId ? getOpenClawAgentRunContext(ctx.runId)?.sessionKey?.trim() : undefined) ?? "";
+        : ((ctx.runId ? getOpenClawAgentRunContext(ctx.runId)?.sessionKey?.trim() : undefined) ?? "");
     if (sk) {
         const d = resolveFridayDeviceIdForSessionKey(sk);
         if (d)

package/dist/src/agent/dispatch-bridge.d.ts

@@ -1,4 +1,4 @@
-type DispatchFn = (args: unknown) => Promise<unknown> | unknown;
+type DispatchFn = (args: unknown) => unknown;
 export declare function runFridayDispatch(args: Parameters<DispatchFn>[0]): ReturnType<DispatchFn>;
 export declare function __setMockFridayDispatchForTests(fn: DispatchFn): void;
 export declare function __resetMockFridayDispatchForTests(): void;

package/dist/src/agent/node-pairing-bridge.d.ts

@@ -1,9 +1,12 @@
-export declare function loadNodePairingModule(): Promise<{
-    listNodePairing: Function;
-    approveNodePairing: Function;
-}>;
+type ListNodePairingFn = () => Promise<any>;
+type ApproveNodePairingFn = (requestId: string, options: {
+    callerScopes?: unknown;
+}) => Promise<any>;
+type NodePairingModule = {
+    listNodePairing: ListNodePairingFn;
+    approveNodePairing: ApproveNodePairingFn;
+};
+export declare function loadNodePairingModule(): Promise<NodePairingModule>;
 /** Vitest-only: inject mock pairing functions. */
-export declare function __setMockNodePairingForTests(mock: {
-    listNodePairing: Function;
-    approveNodePairing: Function;
-}): void;
+export declare function __setMockNodePairingForTests(mock: NodePairingModule): void;
+export {};

package/dist/src/agent/node-pairing-bridge.js

@@ -16,7 +16,9 @@ function resolveOpenClawDistFromPath() {
             readdirSync(dist);
             return dist;
         }
-        catch { }
+        catch {
+            // Not a real dist dir — keep walking PATH.
+        }
     }
     return null;
 }
@@ -45,7 +47,9 @@ function resolveOpenClawDist() {
             readdirSync(root);
             return root;
         }
-        catch { }
+        catch {
+            // Candidate dir doesn't exist — try the next one.
+        }
     }
     throw new Error("OpenClaw dist directory not found. Set OPENCLAW_DIST env var.");
 }

package/dist/src/agent/operator-scope.d.ts

@@ -0,0 +1,19 @@
+type ScopeLike = {
+    client?: {
+        connect?: {
+            scopes?: unknown;
+        };
+    };
+} | null | undefined;
+/**
+ * Adds the required operator scopes to a gateway-request-scope's
+ * `client.connect.scopes` array in place. Pure and idempotent.
+ * Returns the scopes that were actually added (empty if none / no array present).
+ */
+export declare function elevateScopeForSubagentSpawn(scope: ScopeLike): string[];
+/**
+ * Fetches the live plugin gateway-request-scope and elevates it so the dispatched
+ * agent can spawn subagents. Never throws — returns the scopes added (or []).
+ */
+export declare function ensureSubagentSpawnScope(): string[];
+export {};

package/dist/src/agent/operator-scope.js

@@ -0,0 +1,54 @@
+// Operator-scope elevation for friday-next agent dispatch.
+//
+// Why this exists: friday-next registers all its routes with auth:"plugin" (it does
+// its own device-token auth, not the gateway operator token). Core's
+// createPluginRouteRuntimeScope gives auth!="gateway" routes an EMPTY operator-scope
+// set. When an agent dispatched from such a route spawns a subagent, the spawn
+// re-enters the in-process gateway `agent` method, which requires `operator.write`
+// (core-descriptors: { name:"agent", scope:"operator.write" }). With an empty ambient
+// scope the spawn fails with `{"error":"missing scope: operator.write"}`.
+//
+// The subagent spawn reads getPluginRuntimeGatewayRequestScope() at spawn time and
+// uses that scope's client for authorization. Because AsyncLocalStorage returns the
+// SAME store object reference, mutating its client.connect.scopes once — before we
+// kick off the dispatch, while still inside the route's ALS context — propagates the
+// elevated scopes to every later reader, including the subagent spawn.
+//
+// Subagent lifecycle admin methods (sessions.patch/delete) are unaffected: core pins
+// those to ADMIN_SCOPE via a synthetic client, so only the `agent` method depends on
+// this ambient operator.write. See memory: subagent-spawn-missing-operator-write.
+import { getPluginRuntimeGatewayRequestScope } from "openclaw/plugin-sdk/plugin-runtime";
+/** Operator scopes the friday-next dispatch needs so agents can spawn subagents. */
+const REQUIRED_OPERATOR_SCOPES = ["operator.write", "operator.read"];
+/**
+ * Adds the required operator scopes to a gateway-request-scope's
+ * `client.connect.scopes` array in place. Pure and idempotent.
+ * Returns the scopes that were actually added (empty if none / no array present).
+ */
+export function elevateScopeForSubagentSpawn(scope) {
+    const connect = scope?.client?.connect;
+    if (!connect || !Array.isArray(connect.scopes)) {
+        return [];
+    }
+    const scopes = connect.scopes;
+    const added = [];
+    for (const scopeName of REQUIRED_OPERATOR_SCOPES) {
+        if (!scopes.includes(scopeName)) {
+            scopes.push(scopeName);
+            added.push(scopeName);
+        }
+    }
+    return added;
+}
+/**
+ * Fetches the live plugin gateway-request-scope and elevates it so the dispatched
+ * agent can spawn subagents. Never throws — returns the scopes added (or []).
+ */
+export function ensureSubagentSpawnScope() {
+    try {
+        return elevateScopeForSubagentSpawn(getPluginRuntimeGatewayRequestScope());
+    }
+    catch {
+        return [];
+    }
+}

package/dist/src/agent/subagent-registry.js

@@ -8,9 +8,6 @@ export function registerSessionKeyForRun(sessionKey, runId) {
         return;
     sessionKeyToRunId.set(sessionKey, runId);
 }
-function resolveRunIdForSessionKey(sessionKey) {
-    return sessionKeyToRunId.get(sessionKey);
-}
 /**
  * Parse OpenClaw announce compound runId:
  *   announce:v<version>:<sessionKey>:<bareRunId>

package/dist/src/channel-actions.js

@@ -52,7 +52,9 @@ async function readMediaFile(mediaPath, ctx) {
                 return { buffer, mimeType: guessMimeType(mediaPath) };
             }
         }
-        catch { /* fall through */ }
+        catch {
+            /* fall through */
+        }
     }
     try {
         const buffer = fs.readFileSync(mediaPath);

package/dist/src/channel.js

@@ -183,7 +183,6 @@ export const fridayNextChannelPlugin = createChatChannelPlugin({
             const runId = runIdFromCtx ?? sseEmitter.getLastRunIdForDevice(deviceId) ?? undefined;
             const sessionKey = resolveOutboundSessionKey(deviceId, runId, rawCtx);
             const conn = sseEmitter.getConnection(deviceId);
-            const ts = new Date().toISOString();
             logger.info(`[SEND_TEXT] to=${deviceId} runId=${runId ?? "(none)"} sessionKey=${sessionKey ?? "(none)"} textLen=${text.length} online=${!!conn}`);
             if (conn) {
                 sseEmitter.broadcast({
@@ -267,7 +266,6 @@ export const fridayNextChannelPlugin = createChatChannelPlugin({
                     const resolved = resolveMediaAttachment(fileUrl);
                     const publicUrl = resolved ? resolved.url : fileUrl;
                     const conn = sseEmitter.getConnection(deviceId);
-                    const ts = new Date().toISOString();
                     logger.info(`[SEND_MEDIA] to=${deviceId} runId=${runId ?? "(none)"} sessionKey=${sessionKey ?? "(none)"} audioAsVoice=${audioAsVoice} url=${publicUrl} online=${!!conn}`);
                     if (conn) {
                         sseEmitter.broadcast({

package/dist/src/collect-message-media-paths.js

@@ -63,7 +63,16 @@ export function collectMediaPathsFromToolResult(raw, acc) {
         const filePath = o.filePath;
         if (typeof filePath === "string")
             add(filePath);
-        for (const k of ["details", "result", "content", "text", "body", "message", "arguments", "args"]) {
+        for (const k of [
+            "details",
+            "result",
+            "content",
+            "text",
+            "body",
+            "message",
+            "arguments",
+            "args",
+        ]) {
             if (o[k] !== undefined)
                 visit(o[k]);
         }

package/dist/src/friday-session.js

@@ -37,7 +37,7 @@ export function deviceIdFromSessionKey(sessionKey) {
     if (m1)
         return m1[1] ?? null;
     const m2 = sessionKey.match(/^agent:main:friday-next-(.+)$/i);
-    return m2 ? m2[1] ?? null : null;
+    return m2 ? (m2[1] ?? null) : null;
 }
 /**
  * When the app uses a plain `sessionKey` (e.g. `main` → `agent:main:main` in the gateway),
@@ -52,7 +52,8 @@ const deviceIdToLatestHistorySessionKey = new Map();
 /** Last device that called POST /friday-next/messages (same gateway process). Used for cron/outbound when `to` is placeholder and the app is offline (no SSE). */
 let lastRegisteredFridayDeviceId;
 function normalizeFridaySessionKeyCase(sk) {
-    return /^friday-next-|^agent:main:friday-next-/i.test(sk) || /^agent:main:friday-next:direct:/i.test(sk)
+    return /^friday-next-|^agent:main:friday-next-/i.test(sk) ||
+        /^agent:main:friday-next:direct:/i.test(sk)
         ? sk.toLowerCase()
         : sk;
 }
@@ -126,7 +127,9 @@ function mergeRunMetadataIntoLifecycleEnd(runId, base) {
     if (typeof meta.modelName === "string" && meta.modelName.trim()) {
         extra.modelName = meta.modelName.trim();
     }
-    if (typeof meta.totalTokens === "number" && Number.isFinite(meta.totalTokens) && meta.totalTokens > 0) {
+    if (typeof meta.totalTokens === "number" &&
+        Number.isFinite(meta.totalTokens) &&
+        meta.totalTokens > 0) {
         extra.totalTokens = Math.floor(meta.totalTokens);
     }
     if (typeof meta.contextTokensUsed === "number" &&
@@ -242,6 +245,26 @@ export function resolveFridayDeviceIdForOutbound(to, rawCtx) {
         return lastRegisteredFridayDeviceId;
     return trimmed || "friday-next";
 }
+/**
+ * Stringify a subagent error payload for the wire. `evt.data.error` comes from an
+ * in-process SDK callback, so it can be a real Error, a plain object, or a value
+ * that JSON.stringify would throw on (circular/BigInt) — keep this total and
+ * never-throwing, since it runs on the error path that emits `subagent ended`.
+ */
+function stringifySubagentError(raw) {
+    if (raw == null)
+        return "unknown";
+    if (typeof raw === "string")
+        return raw;
+    if (raw instanceof Error)
+        return raw.message || raw.name || "error";
+    try {
+        return JSON.stringify(raw) ?? "unknown";
+    }
+    catch {
+        return "unstringifiable error";
+    }
+}
 /**
  * Forward global OpenClaw agent events to the Friday SSE connection (transparent).
  *
@@ -272,8 +295,7 @@ export function forwardAgentEventRaw(evt) {
     if (!deviceIdRaw)
         return;
     if (!sk) {
-        sk =
-            latestHistorySessionKeyForDeviceId(deviceIdRaw) ?? `friday-next-${deviceIdRaw}`;
+        sk = latestHistorySessionKeyForDeviceId(deviceIdRaw) ?? `friday-next-${deviceIdRaw}`;
     }
     openClawRunIdToDeviceId.set(evt.runId, deviceIdRaw.toUpperCase());
     // Register sessionKey → runId so we can resolve parentRunId
@@ -317,9 +339,7 @@ export function forwardAgentEventRaw(evt) {
             const intent = toolCallId ? consumeSpawnIntent(toolCallId) : undefined;
             const label = details.taskName ||
                 intent?.label ||
-                (typeof evt.data.meta === "string"
-                    ? evt.data.meta
-                    : undefined);
+                (typeof evt.data.meta === "string" ? evt.data.meta : undefined);
             const entry = ensureSubagentFromSpawnTool({
                 childSessionKey: details.childSessionKey,
                 bareRunId: details.runId,
@@ -351,7 +371,11 @@ export function forwardAgentEventRaw(evt) {
     // share the announce runId but have a different sessionKey.
     const isSubagentOwnEvent = subagentEntry && sk && subagentEntry.childSessionKey === sk;
     const subagentMeta = isSubagentOwnEvent
-        ? { label: subagentEntry.label, parentRunId: subagentEntry.parentRunId, depth: subagentEntry.depth }
+        ? {
+            label: subagentEntry.label,
+            parentRunId: subagentEntry.parentRunId,
+            depth: subagentEntry.depth,
+        }
         : undefined;
     let outgoingData = { ...evt.data };
     if (evt.stream === "thinking") {
@@ -381,7 +405,7 @@ export function forwardAgentEventRaw(evt) {
     // Emit subagent ended SSE when a subagent run terminates
     if (isTerminalLifecycle && isSubagentOwnEvent && subagentEntry.status !== "ended") {
         const outcome = lifecyclePhase === "error" ? "error" : "ok";
-        const errorStr = lifecyclePhase === "error" ? String(evt.data.error ?? "unknown") : undefined;
+        const errorStr = lifecyclePhase === "error" ? stringifySubagentError(evt.data.error) : undefined;
         const ended = registerSubagentEnded({ runId: evt.runId, outcome, error: errorStr });
         if (ended) {
             sseEmitter.broadcast({

package/dist/src/history/normalize-message.js

@@ -46,6 +46,16 @@ function splitMediaLines(text) {
         .trim();
     return { text: cleaned, paths };
 }
+/**
+ * Tools whose `toolResult` carries a user-facing PRODUCED image, which stays a
+ * chat attachment. Every OTHER tool's inline image block is the agent's visual
+ * INPUT — a file the `read` tool fed to the model, a `canvas` snapshot, a
+ * browser screenshot — and must NOT surface as an attachment on history rebuild
+ * (it spawns phantom, often-corrupt bubbles for turns where the agent never
+ * sent a file). Keep this a whitelist so any new image-CONSUMING tool is safe by
+ * default; add new image-PRODUCING tools here explicitly.
+ */
+const IMAGE_PRODUCING_TOOLS = new Set(["image_generation"]);
 const MEDIA_MARKER_RE = /\[media attached:\s*([^\]]+)\]/gi;
 /** Pull `[media attached: <url>]` markers out of free text into image refs. */
 function extractMediaMarkers(text) {
@@ -181,14 +191,18 @@ export function normalizeHistoryMessage(raw, index) {
     if (role === "toolResult") {
         const split = splitMediaLines(parsed.text);
         const toolName = readString(record.toolName);
-        // Canvas snapshots come back as base64 image blocks on the `canvas` tool result so the *agent*
-        // can "see" the rendered page — they must never surface as chat attachments on history rebuild.
-        // The streaming deliver path already drops the temp-file form (see isCanvasSnapshotMediaPath in
-        // http/handlers/messages.ts); this is the transcript-rebuild counterpart. The canvas tool has no
-        // other image-returning action, so all images on a canvas result are snapshots.
-        const isCanvasResult = toolName === "canvas";
-        const images = isCanvasResult ? [] : parsed.images;
-        const mediaPaths = isCanvasResult ? [] : split.paths;
+        // Inline image blocks on a toolResult are almost always the agent's visual
+        // INPUT — a file the `read` tool fed to the model, a `canvas` snapshot (so the
+        // agent can "see" the rendered page), a browser screenshot — NOT a user-facing
+        // attachment. Surfacing them spawns phantom, often-corrupt attachment bubbles on
+        // history rebuild for turns where the agent never sent a file. Only tools that
+        // PRODUCE a user-facing image keep their blocks. (This was a `canvas`-only
+        // blacklist, which still leaked `read`/screenshot images.) The streaming deliver
+        // path drops the canvas temp-file form separately (isCanvasSnapshotMediaPath in
+        // http/handlers/messages.ts); this is the transcript-rebuild counterpart.
+        const keepInlineImages = toolName ? IMAGE_PRODUCING_TOOLS.has(toolName) : false;
+        const images = keepInlineImages ? parsed.images : [];
+        const mediaPaths = toolName === "canvas" ? [] : split.paths;
         const toolResult = {
             ...(readString(record.toolCallId) ? { toolCallId: readString(record.toolCallId) } : {}),
             ...(toolName ? { toolName } : {}),

package/dist/src/http/handlers/agent-config.js

@@ -36,7 +36,9 @@ function readString(value) {
 function readStringArray(value) {
     if (!Array.isArray(value))
         return undefined;
-    const out = value.filter((v) => typeof v === "string" && v.trim().length > 0).map((v) => v.trim());
+    const out = value
+        .filter((v) => typeof v === "string" && v.trim().length > 0)
+        .map((v) => v.trim());
     return out;
 }
 function readToolsConfig(value) {
@@ -109,7 +111,7 @@ function coerceTools(raw) {
 }
 /** Skills: array (incl. empty = disable all) only; non-arrays are rejected upstream. */
 function coerceSkills(raw) {
-    return Array.isArray(raw) ? readStringArray(raw) ?? [] : undefined;
+    return Array.isArray(raw) ? (readStringArray(raw) ?? []) : undefined;
 }
 // --- handler -----------------------------------------------------------------
 export async function handleAgentConfig(req, res, rawAgentId) {
@@ -132,10 +134,14 @@ export async function handleAgentConfig(req, res, rawAgentId) {
     const tools = readPatch(body, "tools", coerceTools);
     const skills = readPatch(body, "skills", coerceSkills);
     if ("skills" in body && body.skills !== null && !Array.isArray(body.skills)) {
-        return json(res, 400, { error: "skills must be an array of skill ids, [] to disable all, or null to inherit defaults" });
+        return json(res, 400, {
+            error: "skills must be an array of skill ids, [] to disable all, or null to inherit defaults",
+        });
     }
     if (!model.sent && !thinkingDefault.sent && !tools.sent && !skills.sent) {
-        return json(res, 400, { error: "No editable fields provided (model, thinkingDefault, tools, skills)" });
+        return json(res, 400, {
+            error: "No editable fields provided (model, thinkingDefault, tools, skills)",
+        });
     }
     const upgrade = getUpgradeRuntime();
     if (!upgrade)

package/dist/src/http/handlers/cancel.js

@@ -22,14 +22,16 @@ export async function handleCancel(req, res) {
     // sessionKey is the primary identifier (one active run per session); runId is a
     // back-compat fallback for older apps — resolve it to a sessionKey via the run route.
     const sessionKey = (typeof body?.sessionKey === "string" ? body.sessionKey.trim() : "") ||
-        (runId ? getRunRoute(runId)?.sessionKey?.trim() ?? "" : "");
+        (runId ? (getRunRoute(runId)?.sessionKey?.trim() ?? "") : "");
     if (!sessionKey && !runId) {
         res.statusCode = 400;
         res.setHeader("Content-Type", "application/json");
         res.end(JSON.stringify({ error: "Missing sessionKey or runId" }));
         return true;
     }
-    const result = sessionKey ? await abortRunForSessionKey(sessionKey) : { aborted: false, drained: false };
+    const result = sessionKey
+        ? await abortRunForSessionKey(sessionKey)
+        : { aborted: false, drained: false };
     if (runId)
         sseEmitter.untrackRun(runId);
     res.statusCode = 200;

package/dist/src/http/handlers/device-approve.js

@@ -92,7 +92,9 @@ export async function handleDeviceApprove(req, res) {
     if (approved.status === "forbidden") {
         res.statusCode = 403;
         res.setHeader("Content-Type", "application/json");
-        res.end(JSON.stringify({ error: `Device approval forbidden: ${approved.reason ?? "unknown"}` }));
+        res.end(JSON.stringify({
+            error: `Device approval forbidden: ${approved.reason ?? "unknown"}`,
+        }));
         return true;
     }
     res.statusCode = 200;

package/dist/src/http/handlers/files-download.js

@@ -51,7 +51,10 @@ function tryDecodeURIComponent(segment) {
  * Safe Content-Disposition: strip CR/LF/quotes from basename; add RFC 5987 filename* for Unicode.
  */
 function contentDispositionInline(filename) {
-    const base = path.basename(filename).replace(/[\r\n"]/g, "_").replace(/\\/g, "_") || "file";
+    const base = path
+        .basename(filename)
+        .replace(/[\r\n"]/g, "_")
+        .replace(/\\/g, "_") || "file";
     const ascii = /^[\x20-\x7E]*$/.test(base) ? base : "file";
     return `inline; filename="${ascii}"; filename*=UTF-8''${encodeURIComponent(base)}`;
 }
@@ -62,9 +65,7 @@ function sendBuffer(req, res, buffer, mimeType, filename) {
     const total = buffer.length;
     const disposition = contentDispositionInline(filename);
     const rangeRaw = req.headers.range;
-    const range = typeof rangeRaw === "string" && /^bytes=/i.test(rangeRaw.trim())
-        ? rangeRaw.trim()
-        : undefined;
+    const range = typeof rangeRaw === "string" && /^bytes=/i.test(rangeRaw.trim()) ? rangeRaw.trim() : undefined;
     res.setHeader("Accept-Ranges", "bytes");
     res.setHeader("Cache-Control", "private, max-age=3600");
     res.setHeader("Content-Type", mimeType);
@@ -178,10 +179,7 @@ export async function handleFilesDownload(req, res) {
         // fileId may include an extension (e.g. "uuid.png") — strip it to get the base id
         const baseId = fileToken.replace(/\.[^.]+$/, "");
         const mediaDir = path.join(os.homedir(), ".openclaw", "media", "inbound");
-        const candidates = [
-            path.join(mediaDir, baseId),
-            path.join(mediaDir, fileToken),
-        ];
+        const candidates = [path.join(mediaDir, baseId), path.join(mediaDir, fileToken)];
         for (const filePath of candidates) {
             if (fs.existsSync(filePath)) {
                 try {

package/dist/src/http/handlers/files.js

@@ -214,7 +214,7 @@ export function storeFile(buffer, filename, mimeType) {
         fs.writeFileSync(storedPath, buffer);
     }
     catch (err) {
-        throw new Error(`Failed to store file: ${String(err)}`);
+        throw new Error(`Failed to store file: ${String(err)}`, { cause: err });
     }
     const file = {
         id,

package/dist/src/http/handlers/health.js

@@ -43,7 +43,10 @@ export async function handleHealth(req, res) {
     if (nodeDeviceId) {
         result.nodePairing = await checkNodePairing(nodeDeviceId, selfHeal, result, log);
     }
-    result.ok = !result.nodePairing || (result.nodePairing.status === "ok" || result.nodePairing.status === "pending");
+    result.ok =
+        !result.nodePairing ||
+            result.nodePairing.status === "ok" ||
+            result.nodePairing.status === "pending";
     res.statusCode = 200;
     res.setHeader("Content-Type", "application/json");
     res.end(JSON.stringify(result));
@@ -108,9 +111,16 @@ async function checkNodePairing(nodeDeviceId, selfHeal, result, log) {
     const pendingMatch = pendingNodes.find((entry) => entry.nodeId?.trim().toUpperCase() === normalizedNodeId);
     if (pendingMatch && selfHeal) {
         try {
-            const callerScopes = ["operator.admin", "operator.pairing", "operator.read", "operator.write"];
+            const callerScopes = [
+                "operator.admin",
+                "operator.pairing",
+                "operator.read",
+                "operator.write",
+            ];
             const approved = await approveNodePairing(pendingMatch.requestId, { callerScopes });
-            const succeeded = approved != null && !("status" in approved && approved.status === "forbidden") && "requestId" in approved;
+            const succeeded = approved != null &&
+                !("status" in approved && approved.status === "forbidden") &&
+                "requestId" in approved;
             (result.repairActions ??= []).push({
                 component: "nodePairing",
                 action: "approveNodePairing",
@@ -142,5 +152,9 @@ async function checkNodePairing(nodeDeviceId, selfHeal, result, log) {
     if (pendingMatch) {
         return { status: "pending", detail: "Node is pending approval", nodePaired: false };
     }
-    return { status: "not_found", detail: `Node ${normalizedNodeId} not registered`, nodePaired: false };
+    return {
+        status: "not_found",
+        detail: `Node ${normalizedNodeId} not registered`,
+        nodePaired: false,
+    };
 }

package/dist/src/http/handlers/history-messages.js

@@ -13,7 +13,7 @@ import { fileURLToPath } from "node:url";
 import { getFridayNextRuntime } from "../../runtime.js";
 import { extractBearerToken } from "../middleware/auth.js";
 import { normalizeHistoryMessages } from "../../history/normalize-message.js";
-import { readSessionTranscriptRawMessages, resolveSessionId } from "../../history/read-transcript.js";
+import { readSessionTranscriptRawMessages, resolveSessionId, } from "../../history/read-transcript.js";
 import { resolveMediaAttachment } from "./files.js";
 import { readSessionUsageSnapshotFromStore } from "../../session-usage-store.js";
 const DEFAULT_LIMIT = 200;

package/dist/src/http/handlers/history-sessions.js

@@ -126,12 +126,14 @@ function readAgentSessions(agentId) {
             sessionKey: canonicalKey,
             agentId,
             ...(readString(entry.sessionId) ? { sessionId: readString(entry.sessionId) } : {}),
-            ...(readNumber(entry.updatedAt) !== undefined ? { updatedAt: readNumber(entry.updatedAt) } : {}),
-            ...(readString(entry.model) ?? readString(entry.modelOverride)
+            ...(readNumber(entry.updatedAt) !== undefined
+                ? { updatedAt: readNumber(entry.updatedAt) }
+                : {}),
+            ...((readString(entry.model) ?? readString(entry.modelOverride))
                 ? { model: readString(entry.model) ?? readString(entry.modelOverride) }
                 : {}),
             // Server-side session display name (matches OpenClaw's resolution order).
-            ...(readString(entry.displayName) ?? readString(entry.label)
+            ...((readString(entry.displayName) ?? readString(entry.label))
                 ? { title: readString(entry.displayName) ?? readString(entry.label) }
                 : {}),
         });

package/dist/src/http/handlers/messages.js

@@ -21,6 +21,7 @@ import { registerFridaySessionDeviceMapping } from "../../friday-session.js";
 import { touchFridayInbound } from "../../friday-inbound-stats.js";
 import { fridayAttachmentLookupKey, fridayFilesPublicUrl, readFile, rememberInboundMediaName, resolveMediaAttachment, resolveMediaUrl, } from "./files.js";
 import { runFridayDispatch } from "../../agent/dispatch-bridge.js";
+import { ensureSubagentSpawnScope } from "../../agent/operator-scope.js";
 import { saveInboundMediaBuffer } from "../../agent/media-bridge.js";
 import { contextTokensFromUsageRecord, getRunMetadata, getRunRoute, hasRunFinalDelivered, markRunFinalDelivered, registerRunRoute, setRunMetadata, } from "../../run-metadata.js";
 import { createFridayNextLogger, setFridayNextLogLevel } from "../../logging.js";
@@ -148,7 +149,9 @@ export function translateDeliverPayload(pl, kind, meta) {
     if (typeof meta?.modelName === "string" && meta.modelName.trim()) {
         nextFridayNext.modelName = meta.modelName.trim();
     }
-    if (typeof meta?.totalTokens === "number" && Number.isFinite(meta.totalTokens) && meta.totalTokens > 0) {
+    if (typeof meta?.totalTokens === "number" &&
+        Number.isFinite(meta.totalTokens) &&
+        meta.totalTokens > 0) {
         nextFridayNext.totalTokens = Math.floor(meta.totalTokens);
     }
     if (typeof meta?.contextTokensUsed === "number" &&
@@ -221,10 +224,16 @@ function pickMetadataFromMessageLike(message) {
         ? usage.totalTokens
         : undefined) ??
         (typeof usage?.total === "number" && Number.isFinite(usage.total) ? usage.total : undefined) ??
-        (typeof usage?.total_tokens === "number" && Number.isFinite(usage.total_tokens) ? usage.total_tokens : undefined);
-    const totalFromMessage = (typeof m.totalTokens === "number" && Number.isFinite(m.totalTokens) ? m.totalTokens : undefined) ??
-        (typeof m.total_tokens === "number" && Number.isFinite(m.total_tokens) ? m.total_tokens : undefined);
-    const totalTokens = Math.floor((totalFromUsage ?? totalFromMessage ?? 0));
+        (typeof usage?.total_tokens === "number" && Number.isFinite(usage.total_tokens)
+            ? usage.total_tokens
+            : undefined);
+    const totalFromMessage = (typeof m.totalTokens === "number" && Number.isFinite(m.totalTokens)
+        ? m.totalTokens
+        : undefined) ??
+        (typeof m.total_tokens === "number" && Number.isFinite(m.total_tokens)
+            ? m.total_tokens
+            : undefined);
+    const totalTokens = Math.floor(totalFromUsage ?? totalFromMessage ?? 0);
     let contextTokensUsed;
     if (usage) {
         const ctx = contextTokensFromUsageRecord(usage);
@@ -232,8 +241,12 @@ function pickMetadataFromMessageLike(message) {
             contextTokensUsed = ctx;
         }
     }
-    const ctxMaxRaw = (typeof m.contextWindow === "number" && Number.isFinite(m.contextWindow) ? m.contextWindow : undefined) ??
-        (typeof m.maxContextTokens === "number" && Number.isFinite(m.maxContextTokens) ? m.maxContextTokens : undefined);
+    const ctxMaxRaw = (typeof m.contextWindow === "number" && Number.isFinite(m.contextWindow)
+        ? m.contextWindow
+        : undefined) ??
+        (typeof m.maxContextTokens === "number" && Number.isFinite(m.maxContextTokens)
+            ? m.maxContextTokens
+            : undefined);
     const contextWindowMax = typeof ctxMaxRaw === "number" && ctxMaxRaw > 0 ? Math.floor(ctxMaxRaw) : undefined;
     if (!modelName && !(totalTokens > 0) && !contextTokensUsed && !contextWindowMax)
         return null;
@@ -407,7 +420,8 @@ export async function handleMessages(req, res) {
                 dispatcherOptions: {
                     deliver: async (pl, info) => {
                         let meta = getRunMetadata(runId);
-                        if (info.kind.toLowerCase() === "final" && !(meta?.modelName || typeof meta?.totalTokens === "number")) {
+                        if (info.kind.toLowerCase() === "final" &&
+                            !(meta?.modelName || typeof meta?.totalTokens === "number")) {
                             const resolved = await resolveRunMetadataFromRuntimeSession(runtime, baseSessionKey);
                             if (resolved) {
                                 setRunMetadata(runId, resolved);
@@ -462,9 +476,10 @@ export async function handleMessages(req, res) {
                     // OpenClaw `pi-embedded-subscribe` gates `streamReasoning` on `typeof onReasoningStream === "function"`.
                     // Without this, `emitReasoningStream` never runs and Friday SSE never sees `stream: "thinking"`.
                     onReasoningStream: async (pl) => {
-                        const text = typeof pl === "object" && pl !== null && "text" in pl
-                            ? String(pl.text ?? "")
-                            : "";
+                        const rawText = typeof pl === "object" && pl !== null && "text" in pl
+                            ? pl.text
+                            : undefined;
+                        const text = typeof rawText === "string" ? rawText : "";
                         log("REASONING_STREAM", normalizedDeviceId, runId, `textLen=${text.length}`);
                     },
                     onReasoningEnd: async () => {
@@ -492,6 +507,14 @@ export async function handleMessages(req, res) {
             sseEmitter.untrackRun(runId);
         }
     };
+    // Elevate the route's (empty) operator scope so the dispatched agent can spawn
+    // subagents. Must run here, synchronously inside the route's AsyncLocalStorage
+    // context, so the live scope object the subagent spawn later reads carries
+    // operator.write. See agent/operator-scope.ts.
+    const elevatedScopes = ensureSubagentSpawnScope();
+    if (elevatedScopes.length > 0) {
+        log("SCOPE_ELEVATED", normalizedDeviceId, runId, elevatedScopes.join(","));
+    }
     runAgent().catch((err) => {
         log("RUN_ERROR", normalizedDeviceId, runId, String(err), "error");
         sseEmitter.untrackRun(runId);

package/dist/src/http/handlers/models-list.js

@@ -22,7 +22,7 @@ function resolveConfiguredModels() {
             seen.add(modelKey);
             entries.push({
                 id: modelKey,
-                name: typeof info?.alias === "string" ? info.alias : meta?.name ?? split.modelId,
+                name: typeof info?.alias === "string" ? info.alias : (meta?.name ?? split.modelId),
                 provider: split.provider,
                 reasoning: meta?.reasoning,
                 contextWindow: meta?.contextWindow,