@trim21/personal-pi-extensions 0.0.280 → 0.0.283

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.0.280",
+  "version": "0.0.283",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [

package/src/spawn-agent.ts

@@ -12,7 +12,10 @@
  * `onUpdate`, the same channel the built-in bash tool uses for live output.
  * Progress is a rolling log: `tool: <name>` lines for tool calls and
  * `text: <content>` lines for completed text blocks, keeping the last
- * `MAX_PROGRESS_LINES` lines.
+ * `MAX_PROGRESS_LINES` lines. Consecutive tool calls are merged into a
+ * single `tool:` line (`read x 2, glob`) and line content is capped at
+ * `MAX_PROGRESS_CHARS_PER_LINE` characters, so a burst of tool calls or a long
+ * text block does not flood the window; any text block starts a new line.
  *
  * Security default: without an explicit `tools:` in the frontmatter, the
  * subagent only gets read-only tools (read/grep/find/ls) — no bash/write/edit.
@@ -48,6 +51,8 @@ const MAX_OUTPUT_BYTES = 50 * 1024;
 const DEFAULT_TOOLS = ["read", "grep", "find", "ls"];
 /** Progress log keeps only the most recent lines (rolling window). */
 const MAX_PROGRESS_LINES = 5;
+/** Progress line content (without the `tool:` / `text:` prefix) is capped at 50 chars. */
+const MAX_PROGRESS_CHARS_PER_LINE = 50;
 
 /**
  * Tool → extension override map: when a subagent's frontmatter enables a
@@ -345,12 +350,45 @@ export async function runAgent(
     });
 
     let logLines: string[] = [];
+    // 工具调用行合并:连续的 tool_execution_start 事件合并在同一 `tool:` 行
+    // (如 `tool: read x 2, glob`),相同工具名连续出现时计为 `name x N`,
+    // 不同名按调用顺序罗列;任何非工具行都会打断合并。
+    let toolLineSegments: string[] = [];
+    let toolLine: { name: string; count: number } | undefined;
+
+    const toolSegment = (name: string, count: number) => (count > 1 ? `${name} x ${count}` : name);
 
     const pushLogLine = (line: string) => {
       logLines.push(line);
       if (logLines.length > MAX_PROGRESS_LINES) {
         logLines = logLines.slice(-MAX_PROGRESS_LINES);
       }
+      // 任何非工具行都会打断工具调用合并,下一批调用另起一行。
+      toolLine = undefined;
+    };
+
+    const appendToolLine = (name: string) => {
+      const firstInBatch = toolLine === undefined;
+      if (toolLine === undefined) {
+        toolLineSegments = [];
+        toolLine = { name, count: 1 };
+      } else if (toolLine.name === name) {
+        toolLine.count++;
+      } else {
+        toolLineSegments.push(toolSegment(toolLine.name, toolLine.count));
+        toolLine = { name, count: 1 };
+      }
+      const parts = [...toolLineSegments, toolSegment(toolLine.name, toolLine.count)].join(", ");
+      const line = `tool: ${parts.slice(0, MAX_PROGRESS_CHARS_PER_LINE)}`;
+      if (firstInBatch) {
+        logLines.push(line);
+        if (logLines.length > MAX_PROGRESS_LINES) {
+          logLines = logLines.slice(-MAX_PROGRESS_LINES);
+        }
+      } else {
+        logLines[logLines.length - 1] = line;
+      }
+      emitUpdate();
     };
 
     const emitUpdate = () => {
@@ -424,16 +462,14 @@ export async function runAgent(
           // `text:` log line. Deltas/thinking are intentionally not logged.
           const delta = event.assistantMessageEvent;
           if (delta.type === "text_end") {
-            pushLogLine(`text: ${delta.content}`);
+            pushLogLine(`text: ${delta.content.slice(0, MAX_PROGRESS_CHARS_PER_LINE)}`);
             emitUpdate();
           }
 
           break;
         }
         case "tool_execution_start": {
-          pushLogLine(`tool: ${event.toolName}`);
-          emitUpdate();
-
+          appendToolLine(event.toolName);
           break;
         }
         case "message_end": {