chatroom-cli 1.55.6 → 1.55.7

package/dist/index.js

@@ -27327,6 +27327,96 @@ var init_opencode = __esm(() => {
   init_opencode_agent_service();
 });
 
+// src/infrastructure/services/remote-agents/agent-log-format.ts
+function buildAgentLogPrefix(agent, context5) {
+  const roleTag = context5.role ?? "unknown";
+  const chatroomSuffix = context5.chatroomId ? `@${context5.chatroomId.slice(-6)}` : "";
+  return `[${agent}:${roleTag}${chatroomSuffix}`;
+}
+function formatAgentLogLine(prefix, kind, payload) {
+  return payload !== undefined && payload !== "" ? `${prefix} ${kind}] ${payload}` : `${prefix} ${kind}]`;
+}
+function formatTimestampedLogLine(role, kind, payload, now) {
+  const ts = now ? now() : new Date().toISOString();
+  return `[${ts}] role:${role} ${kind}]${payload ? ` ${payload}` : ""}`;
+}
+function formatBashRunningPayload(command) {
+  return `${BASH_RUNNING_PREFIX} ${command}`;
+}
+function isBashLikeToolName(name) {
+  return /bash|shell|terminal|command/i.test(name);
+}
+function extractBashCommandFromToolInput(name, input) {
+  if (!isBashLikeToolName(name))
+    return null;
+  if (input && typeof input === "object" && "command" in input) {
+    return String(input.command);
+  }
+  if (typeof input === "string")
+    return input;
+  return null;
+}
+function resolveBashCommandForLog(name, input) {
+  if (!isBashLikeToolName(name))
+    return null;
+  const extracted = extractBashCommandFromToolInput(name, input);
+  if (extracted !== null)
+    return extracted;
+  if (input != null)
+    return JSON.stringify(input);
+  return "";
+}
+function extractBashCommandFromCursorToolCall(toolCall) {
+  if (!toolCall || typeof toolCall !== "object")
+    return null;
+  for (const [key, value] of Object.entries(toolCall)) {
+    if (!isBashLikeToolName(key) || !value || typeof value !== "object")
+      continue;
+    const args2 = value.args;
+    if (args2 && typeof args2 === "object" && "command" in args2) {
+      return String(args2.command);
+    }
+  }
+  return null;
+}
+function appendToolInputToPayload(base, input, toolName) {
+  if (!input || typeof input === "object" && Object.keys(input).length === 0) {
+    return base;
+  }
+  const inp = input;
+  if (toolName === "bash" && typeof inp.command === "string") {
+    return `${base}: ${inp.command}`;
+  }
+  const inputStr = typeof inp === "string" ? inp : JSON.stringify(inp);
+  return `${base}: ${inputStr}`;
+}
+function createAgentLogWriter(prefix, options) {
+  const target = options?.target ?? process.stdout;
+  const emitLogLine = options?.emitLogLine;
+  const writeLine = (formatted) => {
+    target.write(`${formatted}
+`);
+    emitLogLine?.(formatted);
+  };
+  return {
+    write(kind, payload) {
+      writeLine(formatAgentLogLine(prefix, kind, payload));
+    },
+    writeLine,
+    flushBufferedLines(buffer, kind) {
+      if (!buffer)
+        return buffer;
+      for (const line of buffer.split(`
+`)) {
+        if (line)
+          writeLine(formatAgentLogLine(prefix, kind, line));
+      }
+      return "";
+    }
+  };
+}
+var BASH_TOOL_KIND = "tool: bash", BASH_RUNNING_PREFIX = "running:";
+
 // src/infrastructure/services/remote-agents/pi/pi-rpc-reader.ts
 import { createInterface } from "node:readline";
 
@@ -27616,9 +27706,7 @@ var init_pi_agent_service = __esm(() => {
       this.childProcesses.set(pid, childProcess);
       this.trackedSessions.set(pid, { harnessSessionId, workingDir, model });
       const entry = this.registerProcess(pid, context5);
-      const roleTag = context5.role ?? "unknown";
-      const chatroomSuffix = context5.chatroomId ? `@${context5.chatroomId.slice(-6)}` : "";
-      const logPrefix = `[pi:${roleTag}${chatroomSuffix}`;
+      const logPrefix = buildAgentLogPrefix("pi", context5);
       const outputCallbacks = [];
       const logLineCallbacks = [];
       const agentEndCallbacks = [];
@@ -27654,11 +27742,7 @@ var init_pi_agent_service = __esm(() => {
         onOutput,
         onLogLine
       };
-      const writeFormattedLogLine = (formatted) => {
-        process.stdout.write(`${formatted}
-`);
-        emitLogLine(formatted);
-      };
+      const log4 = createAgentLogWriter(logPrefix, { emitLogLine });
       const onStderrData = (chunk2) => {
         entry.lastOutputAt = Date.now();
         for (const cb of outputCallbacks)
@@ -27679,15 +27763,9 @@ var init_pi_agent_service = __esm(() => {
       let textBuffer = "";
       let thinkingBuffer = "";
       const flushBufferedLines = (buffer, kind, clear) => {
-        if (!buffer)
-          return;
-        for (const line of buffer.split(`
-`)) {
-          if (line) {
-            writeFormattedLogLine(`${logPrefix} ${kind}] ${line}`);
-          }
-        }
+        const remaining = log4.flushBufferedLines(buffer, kind);
         clear();
+        return remaining;
       };
       const flushText = () => flushBufferedLines(textBuffer, "text", () => {
         textBuffer = "";
@@ -27722,20 +27800,24 @@ var init_pi_agent_service = __esm(() => {
       reader.onAgentEnd(() => {
         flushText();
         flushThinking();
-        process.stdout.write(`${logPrefix} agent_end]
-`);
+        log4.write("agent_end");
         for (const cb of agentEndCallbacks)
           cb();
       });
       reader.onToolCall((name, toolArgs) => {
         flushText();
         flushThinking();
+        const bashCmd = resolveBashCommandForLog(name, toolArgs);
+        if (bashCmd !== null) {
+          log4.write(BASH_TOOL_KIND, formatBashRunningPayload(bashCmd));
+          return;
+        }
         const argsStr = toolArgs != null ? ` args: ${JSON.stringify(toolArgs)}` : "";
-        writeFormattedLogLine(`${logPrefix} tool: ${name}${argsStr}]`);
+        log4.write("tool", `${name}${argsStr}`);
       });
       reader.onToolResult((name, result) => {
         const resultStr = typeof result === "string" ? result : JSON.stringify(result);
-        writeFormattedLogLine(`${logPrefix} tool_result: ${name} result: ${resultStr}]`);
+        log4.write("tool_result", `${name} result: ${resultStr}`);
       });
       attachStderr(childProcess.stderr);
       return {
@@ -27941,9 +28023,7 @@ ${options.prompt}`;
       const pid = childProcess.pid;
       const context5 = options.context;
       const entry = this.registerProcess(pid, context5);
-      const roleTag = context5.role ?? "unknown";
-      const chatroomSuffix = context5.chatroomId ? `@${context5.chatroomId.slice(-6)}` : "";
-      const logPrefix = `[cursor:${roleTag}${chatroomSuffix}`;
+      const logPrefix = buildAgentLogPrefix("cursor", context5);
       const outputCallbacks = [];
       if (childProcess.stdout) {
         const reader = new CursorStreamReader(childProcess.stdout);
@@ -27954,7 +28034,7 @@ ${options.prompt}`;
           for (const line of textBuffer.split(`
 `)) {
             if (line)
-              process.stdout.write(`${logPrefix} text] ${line}
+              process.stdout.write(`${formatAgentLogLine(logPrefix, "text", line)}
 `);
           }
           textBuffer = "";
@@ -27975,17 +28055,23 @@ ${options.prompt}`;
         });
         reader.onAgentEnd(() => {
           flushText();
-          process.stdout.write(`${logPrefix} agent_end]
+          process.stdout.write(`${formatAgentLogLine(logPrefix, "agent_end")}
 `);
         });
         reader.onToolCall((callId, toolCall) => {
           flushText();
-          process.stdout.write(`${logPrefix} tool: ${callId} ${JSON.stringify(toolCall)}]
+          const bashCmd = extractBashCommandFromCursorToolCall(toolCall);
+          if (bashCmd !== null) {
+            process.stdout.write(`${formatAgentLogLine(logPrefix, BASH_TOOL_KIND, formatBashRunningPayload(bashCmd))}
+`);
+            return;
+          }
+          process.stdout.write(`${formatAgentLogLine(logPrefix, "tool", `${callId} ${JSON.stringify(toolCall)}`)}
 `);
         });
         reader.onToolResult((callId) => {
           flushText();
-          process.stdout.write(`${logPrefix} tool_result: ${callId}]
+          process.stdout.write(`${formatAgentLogLine(logPrefix, "tool_result", callId)}
 `);
         });
         if (childProcess.stderr) {
@@ -28376,9 +28462,7 @@ var init_claude_code_agent_service = __esm(() => {
       const pid = childProcess.pid;
       const context5 = options.context;
       const entry = this.registerProcess(pid, context5);
-      const roleTag = context5.role ?? "unknown";
-      const chatroomSuffix = context5.chatroomId ? `@${context5.chatroomId.slice(-6)}` : "";
-      const logPrefix = `[claude:${roleTag}${chatroomSuffix}]`;
+      const logPrefix = buildAgentLogPrefix("claude", context5);
       const outputCallbacks = [];
       if (childProcess.stdout) {
         const reader = new ClaudeStreamReader(childProcess.stdout);
@@ -28390,7 +28474,7 @@ var init_claude_code_agent_service = __esm(() => {
           for (const line of textBuffer.split(`
 `)) {
             if (line)
-              process.stdout.write(`${logPrefix} text] ${line}
+              process.stdout.write(`${formatAgentLogLine(logPrefix, "text", line)}
 `);
           }
           textBuffer = "";
@@ -28401,7 +28485,7 @@ var init_claude_code_agent_service = __esm(() => {
           for (const line of thinkingBuffer.split(`
 `)) {
             if (line)
-              process.stdout.write(`${logPrefix} thinking] ${line}
+              process.stdout.write(`${formatAgentLogLine(logPrefix, "thinking", line)}
 `);
           }
           thinkingBuffer = "";
@@ -28432,8 +28516,16 @@ var init_claude_code_agent_service = __esm(() => {
         });
         reader.onToolUse((name, input) => {
           entry.lastOutputAt = Date.now();
+          const bashCmd = extractBashCommandFromToolInput(name, input);
+          if (bashCmd !== null) {
+            process.stdout.write(`${formatAgentLogLine(logPrefix, BASH_TOOL_KIND, formatBashRunningPayload(bashCmd))}
+`);
+            for (const cb of outputCallbacks)
+              cb();
+            return;
+          }
           const inputStr = JSON.stringify(input);
-          process.stdout.write(`${logPrefix} tool] ${name}(${inputStr.slice(0, 100)}${inputStr.length > 100 ? "..." : ""})
+          process.stdout.write(`${formatAgentLogLine(logPrefix, "tool", `${name}(${inputStr.slice(0, 100)}${inputStr.length > 100 ? "..." : ""})`)}
 `);
           for (const cb of outputCallbacks)
             cb();
@@ -28826,19 +28918,25 @@ class CursorSdkStreamAdapter {
       case "assistant":
         this.handleAssistant(message);
         break;
-      case "tool_call":
+      case "tool_call": {
         this.flushText();
-        this.writeLine(`${this.logPrefix} tool: ${message.call_id} ${message.name} ${JSON.stringify({ status: message.status, args: message.args })}]`);
+        const bashCmd = extractBashCommandFromToolInput(message.name, message.args);
+        if (bashCmd !== null) {
+          this.writeLine(formatAgentLogLine(this.logPrefix, BASH_TOOL_KIND, formatBashRunningPayload(bashCmd)));
+          break;
+        }
+        this.writeLine(formatAgentLogLine(this.logPrefix, `tool: ${message.call_id} ${message.name} ${JSON.stringify({ status: message.status, args: message.args })}`));
         break;
+      }
       case "status":
-        this.writeLine(`${this.logPrefix} status: ${message.status}]`);
+        this.writeLine(formatAgentLogLine(this.logPrefix, `status: ${message.status}`));
         break;
       case "thinking":
-        this.writeLine(`${this.logPrefix} thinking] ${message.text}`);
+        this.writeLine(formatAgentLogLine(this.logPrefix, "thinking", message.text));
         break;
       case "system":
         if (message.subtype === "init") {
-          this.writeLine(`${this.logPrefix} system: init]`);
+          this.writeLine(formatAgentLogLine(this.logPrefix, "system: init"));
         }
         break;
       default:
@@ -28869,7 +28967,7 @@ class CursorSdkStreamAdapter {
     for (const line of this.textBuffer.split(`
 `)) {
       if (line)
-        this.writeLine(`${this.logPrefix} text] ${line}`);
+        this.writeLine(formatAgentLogLine(this.logPrefix, "text", line));
     }
     this.textBuffer = "";
   }
@@ -28878,7 +28976,7 @@ class CursorSdkStreamAdapter {
       return;
     this.agentEndEmitted = true;
     this.flushText();
-    this.writeLine(`${this.logPrefix} agent_end]`);
+    this.writeLine(formatAgentLogLine(this.logPrefix, "agent_end"));
     for (const cb of this.agentEndCallbacks)
       cb();
   }
@@ -28892,6 +28990,7 @@ class CursorSdkStreamAdapter {
       cb();
   }
 }
+var init_cursor_sdk_stream_adapter = () => {};
 
 // src/infrastructure/services/remote-agents/cursor-sdk/cursor-sdk-agent-service.ts
 import { randomUUID } from "node:crypto";
@@ -28951,16 +29050,11 @@ function waitForResumeOrAbort(session2) {
     })
   ]);
 }
-function buildLogPrefix(context5) {
-  const roleTag = context5.role ?? "unknown";
-  const chatroomSuffix = context5.chatroomId ? `@${context5.chatroomId.slice(-6)}` : "";
-  return `[cursor-sdk:${roleTag}${chatroomSuffix}`;
-}
 function resolveModelId(model) {
   return model ? resolveCursorSdkModel(model) : DEFAULT_MODEL;
 }
 function writeSpawnError(logPrefix, err, emitLogLine) {
-  const line = `${logPrefix} spawn-error] ${formatCursorSdkLoadError(err)}`;
+  const line = formatAgentLogLine(logPrefix, "spawn-error", formatCursorSdkLoadError(err));
   process.stderr.write(`${line}
 `);
   emitLogLine?.(line);
@@ -28972,6 +29066,7 @@ var init_cursor_sdk_agent_service = __esm(() => {
   init_base_cli_agent_service();
   init_detection_result();
   init_cursor_sdk_package();
+  init_cursor_sdk_stream_adapter();
   CursorSdkAgentService = class CursorSdkAgentService extends BaseCLIAgentService {
     id = "cursor-sdk";
     displayName = "Cursor (SDK)";
@@ -29139,7 +29234,7 @@ ${options.prompt}`;
         forceFirstTurn
       } = args2;
       const entry = this.registerProcess(pid, context5);
-      const logPrefix = buildLogPrefix(context5);
+      const logPrefix = buildAgentLogPrefix("cursor-sdk", context5);
       const session2 = {
         agent,
         keeper,
@@ -29266,7 +29361,7 @@ ${options.prompt}`;
               adapter.flushPendingOutput();
               if (result.status === "error") {
                 exitCode = 2;
-                const runErrorLine = `${logPrefix} run-error] run ${result.id} failed`;
+                const runErrorLine = formatAgentLogLine(logPrefix, "run-error", `run ${result.id} failed`);
                 process.stderr.write(`${runErrorLine}
 `);
                 emitLogLine(runErrorLine);
@@ -29362,6 +29457,7 @@ ${options.prompt}`;
 // src/infrastructure/services/remote-agents/cursor-sdk/index.ts
 var init_cursor_sdk = __esm(() => {
   init_cursor_sdk_agent_service();
+  init_cursor_sdk_stream_adapter();
 });
 
 // ../../node_modules/.pnpm/@opencode-ai+sdk@1.15.11/node_modules/@opencode-ai/sdk/dist/gen/types.gen.js
@@ -31371,8 +31467,7 @@ function selectAgent(agents) {
 
 // src/infrastructure/services/remote-agents/opencode-sdk/session-event-forwarder.ts
 function formatLogLine(options, kind, payload) {
-  const ts = options.now ? options.now() : new Date().toISOString();
-  return `[${ts}] role:${options.role} ${kind}]${payload ? ` ${payload}` : ""}`;
+  return formatTimestampedLogLine(options.role, kind, payload, options.now);
 }
 function writeLogLine(target, options, kind, payload) {
   const line = formatLogLine(options, kind, payload);
@@ -31462,25 +31557,14 @@ function startSessionEventForwarder(client4, options) {
                 writeLogLine(target, options, "thinking", chunk2);
               }
             } else if (part?.type === "tool" && part.tool) {
-              let appendInput = function(base, input, tool) {
-                if (!input || typeof input === "object" && Object.keys(input).length === 0) {
-                  return base;
-                }
-                const inp = input;
-                if (tool === "bash" && typeof inp.command === "string") {
-                  return `${base}: ${inp.command}`;
-                }
-                const inputStr = typeof inp === "string" ? inp : JSON.stringify(inp);
-                return `${base}: ${inputStr}`;
-              };
               const state = typeof props?.state === "string" ? props.state : typeof part.state?.status === "string" ? part.state.status : "started";
               let payload = state;
               if (part.state?.input) {
-                payload = appendInput(payload, part.state.input, part.tool);
+                payload = appendToolInputToPayload(payload, part.state.input, part.tool);
               }
               if (state === "completed" && part.state?.time?.start !== undefined && part.state?.time?.end !== undefined) {
                 const duration3 = ((part.state.time.end - part.state.time.start) / 1000).toFixed(1);
-                payload = appendInput(`${state} (${duration3}s)`, part.state.input, part.tool);
+                payload = appendToolInputToPayload(`${state} (${duration3}s)`, part.state.input, part.tool);
               }
               const callID = part.callID ?? "unknown";
               const seenKey = `${callID}:${state}`;
@@ -31565,6 +31649,7 @@ function startSessionEventForwarder(client4, options) {
     }
   };
 }
+var init_session_event_forwarder = () => {};
 
 // src/infrastructure/services/remote-agents/opencode-sdk/session-metadata-store.ts
 import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync3, writeFileSync } from "node:fs";
@@ -31633,6 +31718,7 @@ var init_opencode_sdk_agent_service = __esm(() => {
   init_dist();
   init_base_cli_agent_service();
   init_parse_listening_url();
+  init_session_event_forwarder();
   init_session_metadata_store();
   OpenCodeSdkAgentService = class OpenCodeSdkAgentService extends BaseCLIAgentService {
     agentEndCallbacksByPid = new Map;
@@ -92338,4 +92424,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=D908929E6EC55FCC64756E2164756E21
+//# debugId=77F10DD437D49D8264756E2164756E21