Improve cursor logging

agents/cursor.ts

@@ -83,58 +83,6 @@ type CursorEvent =
   | CursorToolCallEvent
   | CursorResultEvent;
 
-const messageHandlers = {
-  system: (_event: CursorSystemEvent) => {
-    // system init events - no logging needed
-  },
-  user: (_event: CursorUserEvent) => {
-    // user messages already logged in prompt box
-  },
-  thinking: (_event: CursorThinkingEvent) => {
-    // thinking events are internal - no logging needed
-  },
-  assistant: (event: CursorAssistantEvent) => {
-    // only log finalized messages (ones with model_call_id)
-    // cursor emits each message twice: once without model_call_id, then again with it
-    if (event.model_call_id) {
-      const text = event.message?.content?.[0]?.text;
-      if (text?.trim()) {
-        log.box(text.trim(), { title: "Cursor" });
-      }
-    }
-  },
-  tool_call: (event: CursorToolCallEvent) => {
-    if (event.subtype === "started") {
-      // handle both MCP tools and built-in tools (bash, WebFetch, etc)
-      const mcpToolCall = event.tool_call?.mcpToolCall;
-      const builtinToolCall = (event.tool_call as any)?.builtinToolCall;
-
-      if (mcpToolCall?.args?.toolName && mcpToolCall?.args?.args) {
-        log.toolCall({
-          toolName: mcpToolCall.args.toolName,
-          input: mcpToolCall.args.args,
-        });
-      } else if (builtinToolCall?.args?.name && builtinToolCall?.args?.args) {
-        log.toolCall({
-          toolName: builtinToolCall.args.name,
-          input: builtinToolCall.args.args,
-        });
-      }
-    } else if (event.subtype === "completed") {
-      const isError = event.tool_call?.mcpToolCall?.result?.success?.isError;
-      if (isError) {
-        log.warning("Tool call failed");
-      }
-    }
-  },
-  result: async (event: CursorResultEvent) => {
-    if (event.subtype === "success" && event.duration_ms) {
-      const durationSec = (event.duration_ms / 1000).toFixed(1);
-      log.debug(`Cursor completed in ${durationSec}s`);
-    }
-  },
-};
-
 export const cursor = agent({
   name: "cursor",
   install: async () => {
@@ -146,6 +94,76 @@ export const cursor = agent({
   run: async ({ payload, apiKey, cliPath, mcpServers }) => {
     configureCursorMcpServers({ mcpServers, cliPath });
 
+    // track logged model_call_ids to avoid duplicates
+    // cursor emits each assistant message twice: once without model_call_id, then again with it
+    const loggedModelCallIds = new Set<string>();
+
+    const messageHandlers = {
+      system: (_event: CursorSystemEvent) => {
+        // system init events - no logging needed
+      },
+      user: (_event: CursorUserEvent) => {
+        // user messages already logged in prompt box
+      },
+      thinking: (_event: CursorThinkingEvent) => {
+        // thinking events are internal - no logging needed
+      },
+      assistant: (event: CursorAssistantEvent) => {
+        const text = event.message?.content?.[0]?.text?.trim();
+        if (!text) return;
+
+        if (event.model_call_id) {
+          // complete message with model_call_id - log it if we haven't seen this id before
+          // cursor emits each message twice: first without model_call_id, then with it
+          // we deduplicate by model_call_id to avoid logging the same message twice
+          if (!loggedModelCallIds.has(event.model_call_id)) {
+            loggedModelCallIds.add(event.model_call_id);
+            log.box(text, { title: "Cursor" });
+          }
+        } else {
+          // message without model_call_id - log it immediately
+          // this handles cases where:
+          // 1. the final summary message might only be emitted without model_call_id
+          // 2. messages that don't get re-emitted with model_call_id
+          // without this, the final comprehensive summary wouldn't print (as we discovered)
+          log.box(text, { title: "Cursor" });
+        }
+      },
+      tool_call: (event: CursorToolCallEvent) => {
+        if (event.subtype === "started") {
+          // handle both MCP tools and built-in tools (bash, WebFetch, etc)
+          const mcpToolCall = event.tool_call?.mcpToolCall;
+          const builtinToolCall = (event.tool_call as any)?.builtinToolCall;
+
+          if (mcpToolCall?.args?.toolName && mcpToolCall?.args?.args) {
+            log.toolCall({
+              toolName: mcpToolCall.args.toolName,
+              input: mcpToolCall.args.args,
+            });
+          } else if (builtinToolCall?.args?.name && builtinToolCall?.args?.args) {
+            log.toolCall({
+              toolName: builtinToolCall.args.name,
+              input: builtinToolCall.args.args,
+            });
+          }
+        } else if (event.subtype === "completed") {
+          const isError = event.tool_call?.mcpToolCall?.result?.success?.isError;
+          if (isError) {
+            log.warning("Tool call failed");
+          }
+        }
+      },
+      result: async (event: CursorResultEvent) => {
+        if (event.subtype === "success" && event.duration_ms) {
+          const durationSec = (event.duration_ms / 1000).toFixed(1);
+          log.debug(`Cursor completed in ${durationSec}s`);
+          // note: we don't log event.result here because it contains the full conversation
+          // concatenated together, which would duplicate all the individual assistant
+          // messages we've already logged. the individual assistant events are sufficient.
+        }
+      },
+    };
+
     try {
       const fullPrompt = addInstructions(payload);
 
@@ -161,7 +179,7 @@ export const cursor = agent({
             fullPrompt,
             "--output-format",
             "stream-json",
-            "--stream-partial-output",
+            // "--stream-partial-output",
             "--approve-mcps",
             "--force",
           ],
@@ -188,14 +206,16 @@ export const cursor = agent({
           try {
             const event = JSON.parse(text) as CursorEvent;
 
+            // skip empty thinking deltas
+            if (event.type === "thinking" && event.subtype === "delta" && !event.text) {
+              return;
+            }
+
             // route to appropriate handler
             const handler = messageHandlers[event.type as keyof typeof messageHandlers];
             if (handler) {
               await handler(event as never);
             }
-
-            // debug: log all events
-            log.debug(`[cursor event] ${JSON.stringify(event, null, 2)}`);
           } catch {
             // ignore parse errors - might be formatted tool call logs from cursor cli
             // our handlers log tool calls instead, so we don't need to display these

agents/instructions.ts

@@ -70,7 +70,7 @@ Before starting any work, you must first determine which mode to use by examinin
 
 Available modes:
 
-${[...modes, ...payload.modes].map((w) => `    - "${w.name}": ${w.description}`).join("\n")}
+${(payload.modes.length > 0 ? payload.modes : modes).map((w) => `    - "${w.name}": ${w.description}`).join("\n")}
 
 **IMPORTANT**: The first thing you must do is:
 1. Examine the user's request/prompt carefully

entry

@@ -83859,7 +83859,7 @@ function query({
 // package.json
 var package_default = {
   name: "@pullfrog/action",
-  version: "0.0.118",
+  version: "0.0.120",
   type: "module",
   files: [
     "index.js",
@@ -92367,7 +92367,7 @@ Before starting any work, you must first determine which mode to use by examinin
 
 Available modes:
 
-${[...modes, ...payload.modes].map((w) => `    - "${w.name}": ${w.description}`).join("\n")}
+${(payload.modes.length > 0 ? payload.modes : modes).map((w) => `    - "${w.name}": ${w.description}`).join("\n")}
 
 **IMPORTANT**: The first thing you must do is:
 1. Examine the user's request/prompt carefully
@@ -93390,50 +93390,6 @@ import { spawn as spawn3 } from "node:child_process";
 import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync2 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { join as join6 } from "node:path";
-var messageHandlers3 = {
-  system: (_event) => {
-  },
-  user: (_event) => {
-  },
-  thinking: (_event) => {
-  },
-  assistant: (event) => {
-    if (event.model_call_id) {
-      const text = event.message?.content?.[0]?.text;
-      if (text?.trim()) {
-        log.box(text.trim(), { title: "Cursor" });
-      }
-    }
-  },
-  tool_call: (event) => {
-    if (event.subtype === "started") {
-      const mcpToolCall = event.tool_call?.mcpToolCall;
-      const builtinToolCall = event.tool_call?.builtinToolCall;
-      if (mcpToolCall?.args?.toolName && mcpToolCall?.args?.args) {
-        log.toolCall({
-          toolName: mcpToolCall.args.toolName,
-          input: mcpToolCall.args.args
-        });
-      } else if (builtinToolCall?.args?.name && builtinToolCall?.args?.args) {
-        log.toolCall({
-          toolName: builtinToolCall.args.name,
-          input: builtinToolCall.args.args
-        });
-      }
-    } else if (event.subtype === "completed") {
-      const isError = event.tool_call?.mcpToolCall?.result?.success?.isError;
-      if (isError) {
-        log.warning("Tool call failed");
-      }
-    }
-  },
-  result: async (event) => {
-    if (event.subtype === "success" && event.duration_ms) {
-      const durationSec = (event.duration_ms / 1e3).toFixed(1);
-      log.debug(`Cursor completed in ${durationSec}s`);
-    }
-  }
-};
 var cursor = agent({
   name: "cursor",
   install: async () => {
@@ -93444,6 +93400,55 @@ var cursor = agent({
   },
   run: async ({ payload, apiKey, cliPath, mcpServers }) => {
     configureCursorMcpServers({ mcpServers, cliPath });
+    const loggedModelCallIds = /* @__PURE__ */ new Set();
+    const messageHandlers4 = {
+      system: (_event) => {
+      },
+      user: (_event) => {
+      },
+      thinking: (_event) => {
+      },
+      assistant: (event) => {
+        const text = event.message?.content?.[0]?.text?.trim();
+        if (!text) return;
+        if (event.model_call_id) {
+          if (!loggedModelCallIds.has(event.model_call_id)) {
+            loggedModelCallIds.add(event.model_call_id);
+            log.box(text, { title: "Cursor" });
+          }
+        } else {
+          log.box(text, { title: "Cursor" });
+        }
+      },
+      tool_call: (event) => {
+        if (event.subtype === "started") {
+          const mcpToolCall = event.tool_call?.mcpToolCall;
+          const builtinToolCall = event.tool_call?.builtinToolCall;
+          if (mcpToolCall?.args?.toolName && mcpToolCall?.args?.args) {
+            log.toolCall({
+              toolName: mcpToolCall.args.toolName,
+              input: mcpToolCall.args.args
+            });
+          } else if (builtinToolCall?.args?.name && builtinToolCall?.args?.args) {
+            log.toolCall({
+              toolName: builtinToolCall.args.name,
+              input: builtinToolCall.args.args
+            });
+          }
+        } else if (event.subtype === "completed") {
+          const isError = event.tool_call?.mcpToolCall?.result?.success?.isError;
+          if (isError) {
+            log.warning("Tool call failed");
+          }
+        }
+      },
+      result: async (event) => {
+        if (event.subtype === "success" && event.duration_ms) {
+          const durationSec = (event.duration_ms / 1e3).toFixed(1);
+          log.debug(`Cursor completed in ${durationSec}s`);
+        }
+      }
+    };
     try {
       const fullPrompt = addInstructions(payload);
       log.info("Running Cursor CLI...");
@@ -93456,7 +93461,7 @@ var cursor = agent({
             fullPrompt,
             "--output-format",
             "stream-json",
-            "--stream-partial-output",
+            // "--stream-partial-output",
             "--approve-mcps",
             "--force"
           ],
@@ -93479,11 +93484,13 @@ var cursor = agent({
           stdout += text;
           try {
             const event = JSON.parse(text);
-            const handler2 = messageHandlers3[event.type];
+            if (event.type === "thinking" && event.subtype === "delta" && !event.text) {
+              return;
+            }
+            const handler2 = messageHandlers4[event.type];
             if (handler2) {
               await handler2(event);
             }
-            log.debug(`[cursor event] ${JSON.stringify(event, null, 2)}`);
           } catch {
           }
         });
@@ -93640,7 +93647,7 @@ async function spawn4(options) {
 
 // agents/gemini.ts
 var assistantMessageBuffer = "";
-var messageHandlers4 = {
+var messageHandlers3 = {
   init: (_event) => {
     assistantMessageBuffer = "";
   },
@@ -93740,7 +93747,7 @@ var gemini = agent({
             log.debug(`[gemini stdout] ${trimmed}`);
             try {
               const event = JSON.parse(trimmed);
-              const handler2 = messageHandlers4[event.type];
+              const handler2 = messageHandlers3[event.type];
               if (handler2) {
                 await handler2(event);
               }
@@ -122737,7 +122744,7 @@ function parsePayload(inputs) {
       agent: null,
       prompt: inputs.prompt,
       event: {
-        trigger: "workflow_dispatch"
+        trigger: "unknown"
       },
       modes
     };

external.ts

@@ -135,6 +135,10 @@ export type PayloadEvent =
   | {
       trigger: "workflow_dispatch";
       [key: string]: any;
+    }
+  | {
+      trigger: "unknown";
+      [key: string]: any;
     };
 
 // payload type for agent execution

main.ts

@@ -263,7 +263,7 @@ function parsePayload(inputs: Inputs): Payload {
       agent: null,
       prompt: inputs.prompt,
       event: {
-        trigger: "workflow_dispatch",
+        trigger: "unknown",
       },
       modes,
     };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pullfrog/action",
-  "version": "0.0.118",
+  "version": "0.0.120",
   "type": "module",
   "files": [
     "index.js",