@syengup/friday-channel-next 0.1.20 → 0.1.21

package/dist/index.js

@@ -10,6 +10,8 @@ import { forwardAgentEventRaw, getLastRegisteredFridayDeviceId, resolveFridayDev
 import { setFridayAgentForwardRuntime } from "./src/agent-forward-runtime.js";
 import { getOpenClawAgentRunContext } from "./src/agent-run-context-bridge.js";
 import { accumulateRunUsage } from "./src/agent/run-usage-accumulator.js";
+import { createFridayNextLogger } from "./src/logging.js";
+const hookLogger = createFridayNextLogger("hook");
 export { fridayNextChannelPlugin } from "./src/channel.js";
 export { setFridayNextRuntime } from "./src/runtime.js";
 /** `api.on` returns void — register tool hooks at most once per process. */
@@ -136,8 +138,7 @@ export default defineChannelPluginEntry({
             const deviceId = deviceIdFromToolContext(ctx);
             const runId = ctx.runId ?? "(unknown)";
             const logLine = (detail) => {
-                const ts = new Date().toISOString();
-                console.error(`[Friday-HOOK] [${ts}] [TOOL_CALL] toolName=${event.toolName} runId=${runId} deviceId=${deviceId ?? "(unknown)"} detail=${detail}`);
+                hookLogger.debug(`[TOOL_CALL] toolName=${event.toolName} runId=${runId} deviceId=${deviceId ?? "(unknown)"} detail=${detail}`);
             };
             if (!deviceId) {
                 logLine("SKIP_no_deviceId");
@@ -163,8 +164,7 @@ export default defineChannelPluginEntry({
             const deviceId = deviceIdFromToolContext(ctx);
             const runId = ctx.runId ?? "(unknown)";
             const logLine = (detail) => {
-                const ts = new Date().toISOString();
-                console.error(`[Friday-HOOK] [${ts}] [TOOL_DONE] toolName=${event.toolName} runId=${runId} deviceId=${deviceId ?? "(unknown)"} detail=${detail}`);
+                hookLogger.debug(`[TOOL_DONE] toolName=${event.toolName} runId=${runId} deviceId=${deviceId ?? "(unknown)"} detail=${detail}`);
             };
             if (!deviceId) {
                 logLine("SKIP_no_deviceId");

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

@@ -180,16 +180,25 @@ 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;
         const toolResult = {
             ...(readString(record.toolCallId) ? { toolCallId: readString(record.toolCallId) } : {}),
-            ...(readString(record.toolName) ? { toolName: readString(record.toolName) } : {}),
+            ...(toolName ? { toolName } : {}),
             ...(record.isError === true ? { isError: true } : {}),
             ...(split.text ? { text: split.text } : {}),
-            ...(parsed.images.length ? { images: parsed.images } : {}),
+            ...(images.length ? { images } : {}),
         };
         message.toolResult = toolResult;
-        if (split.paths.length)
-            message.mediaPaths = split.paths;
+        if (mediaPaths.length)
+            message.mediaPaths = mediaPaths;
         return message;
     }
     const split = splitMediaLines(parsed.text);

package/index.ts

@@ -17,6 +17,9 @@ import {
 import { setFridayAgentForwardRuntime } from "./src/agent-forward-runtime.js";
 import { getOpenClawAgentRunContext } from "./src/agent-run-context-bridge.js";
 import { accumulateRunUsage } from "./src/agent/run-usage-accumulator.js";
+import { createFridayNextLogger } from "./src/logging.js";
+
+const hookLogger = createFridayNextLogger("hook");
 
 export { fridayNextChannelPlugin } from "./src/channel.js";
 export { setFridayNextRuntime } from "./src/runtime.js";
@@ -148,9 +151,8 @@ export default defineChannelPluginEntry({
       const runId = ctx.runId ?? "(unknown)";
 
       const logLine = (detail: string) => {
-        const ts = new Date().toISOString();
-        console.error(
-          `[Friday-HOOK] [${ts}] [TOOL_CALL] toolName=${event.toolName} runId=${runId} deviceId=${deviceId ?? "(unknown)"} detail=${detail}`,
+        hookLogger.debug(
+          `[TOOL_CALL] toolName=${event.toolName} runId=${runId} deviceId=${deviceId ?? "(unknown)"} detail=${detail}`,
         );
       };
 
@@ -180,9 +182,8 @@ export default defineChannelPluginEntry({
       const runId = ctx.runId ?? "(unknown)";
 
       const logLine = (detail: string) => {
-        const ts = new Date().toISOString();
-        console.error(
-          `[Friday-HOOK] [${ts}] [TOOL_DONE] toolName=${event.toolName} runId=${runId} deviceId=${deviceId ?? "(unknown)"} detail=${detail}`,
+        hookLogger.debug(
+          `[TOOL_DONE] toolName=${event.toolName} runId=${runId} deviceId=${deviceId ?? "(unknown)"} detail=${detail}`,
         );
       };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syengup/friday-channel-next",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "OpenClaw Friday Next Apple channel plugin",
   "license": "MIT",
   "type": "module",

package/src/history/normalize-message.test.ts

@@ -108,6 +108,36 @@ describe("normalizeHistoryMessage", () => {
     });
   });
 
+  it("drops base64 image blocks from a canvas snapshot toolResult (agent-only, never a chat attachment)", () => {
+    const out = normalizeHistoryMessage(
+      {
+        role: "toolResult",
+        toolCallId: "tc-canvas",
+        toolName: "canvas",
+        content: [{ type: "image", mimeType: "image/jpeg", data: "BASE64SNAPSHOT" }],
+        ...meta("entry-canvas", 5),
+      },
+      0,
+    );
+    expect(out?.role).toBe("toolResult");
+    expect(out?.toolResult).toEqual({ toolCallId: "tc-canvas", toolName: "canvas" });
+    expect(out?.toolResult?.images).toBeUndefined();
+  });
+
+  it("keeps image blocks on non-canvas toolResults", () => {
+    const out = normalizeHistoryMessage(
+      {
+        role: "toolResult",
+        toolCallId: "tc-img",
+        toolName: "image_generation",
+        content: [{ type: "image", mimeType: "image/png", data: "REALIMG" }],
+        ...meta("entry-img", 6),
+      },
+      0,
+    );
+    expect(out?.toolResult?.images).toEqual([{ mimeType: "image/png", data: "REALIMG" }]);
+  });
+
   it("strips MEDIA: lines from text into mediaPaths", () => {
     const out = normalizeHistoryMessage(
       {

package/src/history/normalize-message.ts

@@ -253,15 +253,24 @@ export function normalizeHistoryMessage(
 
   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;
     const toolResult: FridayHistoryToolResult = {
       ...(readString(record.toolCallId) ? { toolCallId: readString(record.toolCallId) } : {}),
-      ...(readString(record.toolName) ? { toolName: readString(record.toolName) } : {}),
+      ...(toolName ? { toolName } : {}),
       ...(record.isError === true ? { isError: true } : {}),
       ...(split.text ? { text: split.text } : {}),
-      ...(parsed.images.length ? { images: parsed.images } : {}),
+      ...(images.length ? { images } : {}),
     };
     message.toolResult = toolResult;
-    if (split.paths.length) message.mediaPaths = split.paths;
+    if (mediaPaths.length) message.mediaPaths = mediaPaths;
     return message;
   }