@trim21/personal-pi-extensions 0.1.587 → 0.1.589

package/package.json

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

package/src/spawn-agent.ts

@@ -22,7 +22,10 @@
  * so one log entry is always exactly one rendered line. The final line is
  * always the subagent name as a code span (`` `scout` ``), followed by the
  * live usage stats when there are any; it rides outside the rolling window so
- * it is never trimmed.
+ * it is never trimmed. While the model is thinking, a transient
+ * `thinking ( N chars )` line sits between the log and the footer showing the
+ * live character count of the streamed thinking; it disappears when the
+ * thinking block ends.
  *
  * Security default: without an explicit `tools:` in the frontmatter, the
  * subagent only gets read-only tools (read/grep/find/ls) — no bash/write/edit.
@@ -52,7 +55,6 @@ import {
   SessionManager,
   SettingsManager,
   truncateTail,
-  truncateToVisualLines,
 } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
@@ -148,7 +150,7 @@ interface UsageStats {
   turns: number;
 }
 
-/** 子 agent 的一次运行结果：runAgent 的返回值，也是 details.result 的内容。 */
+/** 子 agent 的一次运行结果：runAgent 的返回值。 */
 interface SubagentResult {
   agent: string;
   task: string;
@@ -162,8 +164,6 @@ interface SubagentResult {
 }
 
 interface SubagentDetails {
-  /** 子 agent 运行结果（除 pendant 外的字段都收在这里）。 */
-  result: SubagentResult;
   /** 折叠 markdown 面板：父 agent 的 prompt 与父 agent 看到的子 agent 结果。 */
   pendant?: ToolPendant;
 }
@@ -421,6 +421,9 @@ export async function runAgent(
   // 不同名按调用顺序罗列;任何非工具行都会打断合并。
   let toolLineSegments: string[] = [];
   let toolLine: { name: string; count: number } | undefined;
+  // 思考中状态：thinking_start 打开、thinking_delta 累计字符数、thinking_end
+  // 关闭；非 undefined 时 emitUpdate 在 footer 上方插一行瞬态 thinking 状态。
+  let thinkingChars: number | undefined;
 
   const pushLogLine = (line: string) => {
     logLines.push(line);
@@ -463,9 +466,12 @@ export async function runAgent(
     const usageLine = formatUsageStats(result.usage, result.model);
     const name = sanitizeProgressLine(result.agent);
     const footer = usageLine ? `\`${name}\` ${usageLine}` : `\`${name}\``;
+    const lines = [...logLines];
+    if (thinkingChars !== undefined) lines.push(`thinking ( ${thinkingChars} chars )`);
+    lines.push(footer);
     onUpdate?.({
-      content: [{ type: "text", text: [...logLines, footer].join("\n") }],
-      details: { result: { ...result } },
+      content: [{ type: "text", text: lines.join("\n") }],
+      details: {},
     });
   };
 
@@ -473,11 +479,33 @@ export async function runAgent(
     switch (event.type) {
       case "message_update": {
         // A completed text block (text_end carries the full content) becomes a
-        // `text:` log line. Deltas/thinking are intentionally not logged.
+        // `text:` log line. Deltas are intentionally not logged; thinking
+        // deltas feed the transient `thinking ( N chars )` status line instead.
         const delta = event.assistantMessageEvent;
-        if (delta.type === "text_end") {
-          pushLogLine(`text: ${foldProgressLine(sanitizeProgressLine(delta.content))}`);
-          emitUpdate();
+        switch (delta.type) {
+          case "text_end": {
+            pushLogLine(`text: ${foldProgressLine(sanitizeProgressLine(delta.content))}`);
+            emitUpdate();
+            break;
+          }
+          case "thinking_start": {
+            // 思考横跨轮次边界：打断工具行合并，下一批工具调用另起一行。
+            toolLine = undefined;
+            thinkingChars = 0;
+            emitUpdate();
+            break;
+          }
+          case "thinking_delta": {
+            thinkingChars = (thinkingChars ?? 0) + delta.delta.length;
+            emitUpdate();
+            break;
+          }
+          case "thinking_end": {
+            thinkingChars = undefined;
+            emitUpdate();
+            break;
+          }
+          // No default
         }
 
         break;
@@ -591,20 +619,7 @@ export default function spawnAgent(pi: ExtensionAPI) {
               text: `Unknown agent "${params.agent}". Available agents: ${formatAgentList(agents)}`,
             },
           ],
-          details: {
-            result: {
-              agent: params.agent,
-              task: params.task,
-              exitCode: 1,
-              messages: [],
-              stderr: "",
-              usage: {
-                cost: 0,
-                contextTokens: 0,
-                turns: 0,
-              },
-            },
-          },
+          details: {},
           isError: true,
         };
       }
@@ -627,7 +642,6 @@ export default function spawnAgent(pi: ExtensionAPI) {
             { type: "text", text: `Subagent "${result.agent}" failed (${reason}):\n${message}` },
           ],
           details: {
-            result,
             pendant: {
               subtitle: result.agent,
               markdown: formatPendantMarkdown(params.task, message),
@@ -640,12 +654,11 @@ export default function spawnAgent(pi: ExtensionAPI) {
       const output = getFinalOutput(result.messages) || "(no output)";
       const truncation = truncateTail(output, { maxBytes: MAX_OUTPUT_BYTES });
       const text = truncation.truncated
-        ? `${truncation.content}\n\n[Output truncated to ${formatTokens(truncation.content.length)} bytes. Full result preserved in tool details.]`
+        ? `${truncation.content}\n\n[Output truncated to ${formatTokens(truncation.content.length)} bytes.]`
         : output;
       return {
         content: [{ type: "text", text }],
         details: {
-          result,
           pendant: {
             subtitle: result.agent,
             markdown: formatPendantMarkdown(params.task, text),
@@ -653,52 +666,5 @@ export default function spawnAgent(pi: ExtensionAPI) {
         },
       };
     },
-
-    renderCall(args, theme) {
-      const preview = args.task.length > 60 ? `${args.task.slice(0, 60)}...` : args.task;
-      const line =
-        theme.fg("toolTitle", theme.bold("spawn_agent ")) + theme.fg("accent", args.agent);
-      const detail = `  ${theme.fg("dim", preview)}`;
-      return {
-        render: (width: number) =>
-          truncateToVisualLines(`${line}\n${detail}`, 2, width).visualLines,
-        invalidate: (): void => undefined,
-      };
-    },
-
-    renderResult(result, { expanded }, theme) {
-      const details = result.details.result;
-      const isError =
-        details.exitCode !== 0 ||
-        details.stopReason === "error" ||
-        details.stopReason === "aborted";
-      const icon = isError ? theme.fg("error", "✗") : theme.fg("success", "✓");
-      const finalOutput = getFinalOutput(details.messages);
-      const usageStr = formatUsageStats(details.usage, details.model);
-
-      const lines: string[] = [];
-      let header = `${icon} ${theme.fg("toolTitle", theme.bold(details.agent))}`;
-      if (details.stopReason) header += ` ${theme.fg("error", `[${details.stopReason}]`)}`;
-      lines.push(header);
-      if (isError && details.errorMessage) {
-        lines.push(theme.fg("error", `Error: ${details.errorMessage}`));
-      }
-      if (expanded) {
-        lines.push("", theme.fg("muted", "─── Task ───"), theme.fg("dim", details.task));
-        if (finalOutput) {
-          lines.push("", theme.fg("muted", "─── Output ───"), finalOutput.trim());
-        }
-      } else if (finalOutput) {
-        lines.push(theme.fg("toolOutput", finalOutput.split("\n").slice(0, 5).join("\n")));
-      } else {
-        lines.push(theme.fg("muted", "(no output)"));
-      }
-      if (usageStr) lines.push(theme.fg("dim", usageStr));
-      return {
-        render: (width: number) =>
-          truncateToVisualLines(lines.join("\n"), Infinity, width).visualLines,
-        invalidate: (): void => undefined,
-      };
-    },
   });
 }