@trim21/personal-pi-extensions 0.1.20261019144232 → 0.1.20261022015401

package/package.json

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

package/src/claude-code/shell.ts

@@ -21,6 +21,7 @@ import {
   BASH_MAX_TIMEOUT_MS,
   bashStructuredSchema,
   spilledOutput,
+  systemReminder,
 } from "../lib/bash-tool.js";
 import { resolveWorkdir } from "../lib/path.js";
 import { defineStructuredTool, type ToolBus } from "../lib/tool-bus.js";
@@ -163,7 +164,9 @@ export function registerShellTools(bus: ToolBus, pi: ExtensionAPI, runtime: Bwra
             if (error.kind === "aborted") {
               // 用户取消：直接返回已捕获的输出，不抛错；时长只算命令真正运行的时间，
               // 不含审批弹窗等 UI 交互
-              const status = `Command aborted by user after ${formatElapsedSeconds(error.elapsedMs)}`;
+              const status = systemReminder(
+                `Command aborted by user after ${formatElapsedSeconds(error.elapsedMs)}`,
+              );
               return {
                 content: [
                   { type: "text" as const, text: text ? `${text}\n\n${status}` : status },
@@ -183,9 +186,8 @@ export function registerShellTools(bus: ToolBus, pi: ExtensionAPI, runtime: Bwra
                 },
               };
             }
-            const full = text
-              ? `${text}\n\nCommand timed out after ${timeout} milliseconds`
-              : `Command timed out after ${timeout} milliseconds`;
+            const status = systemReminder(`Command timed out after ${timeout} milliseconds`);
+            const full = text ? `${text}\n\n${status}` : status;
             return {
               content: [
                 { type: "text" as const, text: full },

package/src/lib/bash-tool.ts

@@ -14,6 +14,11 @@ import { Type } from "typebox";
 export const BASH_DEFAULT_TIMEOUT_MS = 120_000;
 export const BASH_MAX_TIMEOUT_MS = 7_200_000;
 
+/** 工具追加的状态行（超时、用户取消）统一包成系统提醒，避免被当成命令输出。 */
+export function systemReminder(text: string): string {
+  return `<system-reminder>\n${text}\n</system-reminder>`;
+}
+
 /**
  * `Bash` 的结构化结果：只有退出码与完整输出——命令非零退出不是失败，所以载荷里没有成败
  * 标志，脚本直接读 `exitCode` 分支；超时/中止时 `exitCode` 为 `null`（原因在模型侧文本里）。

package/src/opencode/bash.ts

@@ -16,6 +16,7 @@ import {
   BASH_MAX_TIMEOUT_MS,
   bashStructuredSchema,
   spilledOutput,
+  systemReminder,
 } from "../lib/bash-tool.js";
 import { resolveWorkdir } from "../lib/path.js";
 import { createRequestPolicy } from "../lib/request-policy.js";
@@ -127,10 +128,11 @@ export function registerBashTool(bus: ToolBus, pi: ExtensionAPI, runtime: BwrapR
               error.partial.truncation,
               error.partial.fullOutputPath,
             );
-            const status =
+            const status = systemReminder(
               error.kind === "timeout"
                 ? `Command exceeded timeout of ${timeout} ms. Retry with a larger timeout if the command is expected to take longer.`
-                : `Command aborted by user after ${formatElapsedSeconds(error.elapsedMs)}`;
+                : `Command aborted by user after ${formatElapsedSeconds(error.elapsedMs)}`,
+            );
             const full = text ? `${text}\n\n${status}` : status;
             // 对齐上游 opencode：超时与中断都不抛错，输出与状态文本一起返回；
             // 超时可能是沙箱的网络限制导致的，附加沙箱状态（用户中断与沙箱无关）