@trim21/personal-pi-extensions 0.1.655 → 0.1.659

package/README.md

@@ -43,8 +43,8 @@
 - **只有脚本输出进上下文**：`text(value)` / `console.log(...)` 与 `return` 值进入工具结果，
   中间的工具调用与它们的返回内容不会（也不在会话记录里留下工具调用条目）。
 - **脚本接口**：`tools` / `ALL_TOOLS` / `text` / `image` / `exit` / `console.*` /
-  `store(key, value)` / `load(key)`；首行可选 `// @options: {"timeout_ms": 30000,
-"max_output_tokens": 10000}`。默认没有超时，靠调用方中止或 `timeout_ms` 结束。
+  `store(key, value)` / `load(key)`；首行可选 `// @options: {"max_output_tokens": 10000}`。
+  脚本没有超时：死循环由调用方中止（Esc）结束，等嵌套调用返回（含用户审批弹窗）多久都不算超时。
 - **store** 写在会话的自定义 entry 上（跟随分支），输出超过 `max_output_tokens` 时头尾
   截断并把全文落到 `$TMPDIR/pi-codemode-*.txt`。
 - **构建**：worker 入口是 esbuild 产物 `src/codemode/worker.js`（随仓库提交，

package/package.json

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

package/src/codemode/protocol.ts

@@ -3,8 +3,8 @@
  *
  * 每次执行起一个新的 worker：主线程把注册时编好的 wasm 模块连同脚本、可调用工具、
  * 初始 store 一起发过去，worker 里建 QuickJS VM 跑脚本，脚本的嵌套调用与输出回传，
- * 主线程执行工具后把结果发回去。超时/中止由主线程 `worker.terminate()` 负责，因此
- * 不需要取消消息。
+ * 主线程执行工具后把结果发回去。脚本没有超时，只有调用方的中止：中止时主线程直接
+ * `worker.terminate()`，因此不需要取消消息。
  *
  * worker 边界两侧都做 typebox 校验：worker 里跑的是模型写的代码，回传的消息同样
  * 当外部输入对待。
@@ -60,12 +60,7 @@ const outputSchema = Type.Object({
 });
 
 const scriptErrorSchema = Type.Object({
-  kind: Type.Union([
-    Type.Literal("script"),
-    Type.Literal("timeout"),
-    Type.Literal("aborted"),
-    Type.Literal("sandbox"),
-  ]),
+  kind: Type.Union([Type.Literal("script"), Type.Literal("aborted"), Type.Literal("sandbox")]),
   name: Type.Optional(Type.String()),
   message: Type.String(),
   stack: Type.Optional(Type.String()),
@@ -104,7 +99,7 @@ export interface WorkerBootstrap {
 export type CodemodeOutputItem =
   { type: "text"; text: string } | { type: "image"; data: string; mimeType: string };
 
-export type ScriptErrorKind = "script" | "timeout" | "aborted" | "sandbox";
+export type ScriptErrorKind = "script" | "aborted" | "sandbox";
 
 export interface ScriptError {
   kind: ScriptErrorKind;

package/src/codemode/sandbox.ts

@@ -42,7 +42,7 @@ export interface SandboxRunOptions {
   code: string;
   tools: readonly ScriptTool[];
   store: Record<string, unknown>;
-  timeoutMs: number;
+  /** 调用方中止本次执行；脚本没有自己的超时，死循环只能靠它结束。 */
   signal?: AbortSignal;
   /** 每次嵌套调用：由调用方执行工具并把结果回给脚本。 */
   onCall(request: { id: number; name: string; args: unknown }): Promise<SandboxCallOutcome>;
@@ -84,7 +84,6 @@ function runInWorker(wasm: object, options: SandboxRunOptions): Promise<SandboxO
     const calls: ScriptCall[] = [];
     const started = new Map<number, { name: string; at: number }>();
     let settled = false;
-    let deadline: NodeJS.Timeout | undefined;
 
     const finish = (
       body:
@@ -95,9 +94,6 @@ function runInWorker(wasm: object, options: SandboxRunOptions): Promise<SandboxO
         return;
       }
       settled = true;
-      if (deadline) {
-        clearTimeout(deadline);
-      }
       void worker.terminate();
       resolve({ ...body, output, calls });
     };
@@ -106,14 +102,6 @@ function runInWorker(wasm: object, options: SandboxRunOptions): Promise<SandboxO
       finish({ ok: false, error: { kind, message }, writes: NO_WRITES });
     };
 
-    // 默认没有超时（Infinity）：setTimeout 会把 Infinity 当成 1ms，必须显式判断
-    if (Number.isFinite(options.timeoutMs)) {
-      deadline = setTimeout(() => {
-        fail(`the script exceeded its ${options.timeoutMs}ms deadline`, "timeout");
-      }, options.timeoutMs);
-      deadline.unref();
-    }
-
     if (options.signal) {
       if (options.signal.aborted) {
         fail("codemode execution was aborted", "aborted");

package/src/codemode/source.ts

@@ -1,19 +1,14 @@
 /**
- * codemode 脚本源码的解析：首行可选的 `// @options: {"max_output_tokens":…, "timeout_ms":…}`。
+ * codemode 脚本源码的解析：首行可选的 `// @options: {"max_output_tokens":…}`。
  *
  * 选项行与脚本首行共用一行，解析后原样保留为空行，脚本里报错的行号因此与用户写的
  * 一致。解析失败（空输入、JSON 非法、未知字段、只有选项行没有代码）直接报错。
  */
 
 const OPTIONS_PREFIX = "// @options:";
-const SUPPORTED_FIELDS = ["max_output_tokens", "timeout_ms"] as const;
+const SUPPORTED_FIELDS = ["max_output_tokens"] as const;
 
 export const DEFAULT_OUTPUT_TOKENS = 10_000;
-/**
- * 脚本默认没有超时：编排一批工具调用本来就可能跑几分钟（例如批量读大文件）。
- * 调用方中止与 `// @options: {"timeout_ms": …}` 都能提前结束。
- */
-export const DEFAULT_TIMEOUT_MS = Infinity;
 
 export class CodemodeSourceError extends Error {
   constructor(message: string) {
@@ -24,7 +19,6 @@ export class CodemodeSourceError extends Error {
 
 export interface CodemodeSourceOptions {
   maxOutputTokens: number;
-  timeoutMs: number;
 }
 
 export interface ParsedCodemodeSource {
@@ -54,11 +48,7 @@ function parseOptions(json: string): Partial<CodemodeSourceOptions> {
     if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) {
       throw new CodemodeSourceError(`${OPTIONS_PREFIX} ${key} must be a positive number`);
     }
-    if (key === "max_output_tokens") {
-      options.maxOutputTokens = value;
-    } else {
-      options.timeoutMs = value;
-    }
+    options.maxOutputTokens = value;
   }
   return options;
 }

package/src/codemode/tool.ts

@@ -22,12 +22,7 @@ import { type ToolBus, toolResultText } from "../lib/tool-bus.js";
 import { renderDeclarations, toScriptTools } from "./declarations.js";
 import type { CodemodeOutputItem, ScriptError, StoreWrites } from "./protocol.js";
 import { type CodemodeSandbox, createCodemodeSandbox, type ScriptCall } from "./sandbox.js";
-import {
-  CODEMODE_SOURCE_GRAMMAR,
-  DEFAULT_OUTPUT_TOKENS,
-  DEFAULT_TIMEOUT_MS,
-  parseCodemodeSource,
-} from "./source.js";
+import { CODEMODE_SOURCE_GRAMMAR, DEFAULT_OUTPUT_TOKENS, parseCodemodeSource } from "./source.js";
 
 export const CODEMODE_TOOL_NAME = "codemode";
 
@@ -230,7 +225,7 @@ export function createCodemodeTools(pi: ExtensionAPI): CodemodeTools {
         parameters: Type.Object({
           code: Type.String({
             description:
-              'Raw JavaScript source. Top-level await and return work. May start with a `// @options: {"timeout_ms": 30000}` line.',
+              'Raw JavaScript source. Top-level await and return work. May start with a `// @options: {"max_output_tokens": 10000}` line.',
           }),
         }),
         constrainedSampling: {
@@ -241,12 +236,10 @@ export function createCodemodeTools(pi: ExtensionAPI): CodemodeTools {
 
         async execute(_toolCallId, params, signal, onUpdate, ctx) {
           let code: string;
-          let timeoutMs = DEFAULT_TIMEOUT_MS;
           let maxOutputTokens = DEFAULT_OUTPUT_TOKENS;
           try {
             const parsed = parseCodemodeSource(params.code);
             code = parsed.code;
-            timeoutMs = parsed.options.timeoutMs ?? timeoutMs;
             maxOutputTokens = parsed.options.maxOutputTokens ?? maxOutputTokens;
           } catch (error) {
             const message = error instanceof Error ? error.message : String(error);
@@ -264,7 +257,6 @@ export function createCodemodeTools(pi: ExtensionAPI): CodemodeTools {
             code,
             tools: scriptTools,
             store: readStore(ctx),
-            timeoutMs,
             signal,
             onOutput: (items) => {
               const text = textOf(items);

package/src/codemode/worker.js

@@ -5,8 +5,7 @@ import { JSException, MAX_STACK_SIZE, QuickJS } from "quickjs-wasi";
 // src/codemode/prelude.ts
 var MAX_STORE_VALUE_CHARS = 256 * 1024;
 var MAX_STORE_TOTAL_CHARS = 1024 * 1024;
-var IMAGE_HELPER_EXPECTS =
-  "image expects a non-empty image URL string, an object with image_url, or a raw MCP image block";
+var IMAGE_HELPER_EXPECTS = "image expects a non-empty image URL string, an object with image_url, or a raw MCP image block";
 var PRELUDE_SOURCE = String.raw`(function (bridge, toolsJson, storeJson) {
 	"use strict";
 	const stringify = JSON.stringify;
@@ -288,70 +287,65 @@ import { Type } from "typebox";
 import { Value } from "typebox/value";
 var outputItemSchema = Type.Union([
   Type.Object({ type: Type.Literal("text"), text: Type.String() }),
-  Type.Object({ type: Type.Literal("image"), data: Type.String(), mimeType: Type.String() }),
+  Type.Object({ type: Type.Literal("image"), data: Type.String(), mimeType: Type.String() })
 ]);
 var toolDeclSchema = Type.Object({
   name: Type.String(),
-  description: Type.Optional(Type.String()),
+  description: Type.Optional(Type.String())
 });
 var startSchema = Type.Object({
   t: Type.Literal("start"),
   code: Type.String(),
   tools: Type.Array(toolDeclSchema),
-  store: Type.Record(Type.String(), Type.Unknown()),
+  store: Type.Record(Type.String(), Type.Unknown())
 });
 var resultSchema = Type.Union([
   Type.Object({
     t: Type.Literal("result"),
     id: Type.Number(),
     ok: Type.Literal(true),
-    value: Type.Unknown(),
+    value: Type.Unknown()
   }),
   Type.Object({
     t: Type.Literal("result"),
     id: Type.Number(),
     ok: Type.Literal(false),
-    error: Type.String(),
-  }),
+    error: Type.String()
+  })
 ]);
 var callSchema = Type.Object({
   t: Type.Literal("call"),
   id: Type.Number(),
   name: Type.String(),
-  args: Type.Unknown(),
+  args: Type.Unknown()
 });
 var outputSchema = Type.Object({
   t: Type.Literal("output"),
-  items: Type.Array(outputItemSchema),
+  items: Type.Array(outputItemSchema)
 });
 var scriptErrorSchema = Type.Object({
-  kind: Type.Union([
-    Type.Literal("script"),
-    Type.Literal("timeout"),
-    Type.Literal("aborted"),
-    Type.Literal("sandbox"),
-  ]),
+  kind: Type.Union([Type.Literal("script"), Type.Literal("aborted"), Type.Literal("sandbox")]),
   name: Type.Optional(Type.String()),
   message: Type.String(),
-  stack: Type.Optional(Type.String()),
+  stack: Type.Optional(Type.String())
 });
 var storeWritesSchema = Type.Object({
   set: Type.Record(Type.String(), Type.Unknown()),
-  delete: Type.Array(Type.String()),
+  delete: Type.Array(Type.String())
 });
 var doneSchema = Type.Union([
   Type.Object({
     t: Type.Literal("done"),
     ok: Type.Literal(true),
     value: Type.Unknown(),
-    writes: storeWritesSchema,
+    writes: storeWritesSchema
   }),
   Type.Object({
     t: Type.Literal("done"),
     ok: Type.Literal(false),
     error: scriptErrorSchema,
-    writes: storeWritesSchema,
-  }),
+    writes: storeWritesSchema
+  })
 ]);
 var hostMessageSchema = Type.Union([startSchema, resultSchema]);
 var workerMessageSchema = Type.Union([callSchema, outputSchema, doneSchema]);
@@ -369,7 +363,7 @@ function decodeHostMessage(value) {
 // src/codemode/worker.ts
 var MEMORY_LIMIT_BYTES = 512 * 1024 * 1024;
 function toScriptIdentifier(name) {
-  return name.replaceAll(/[^A-Za-z0-9_$]/g, "_").replaceAll(/^(\d)/, "_$1");
+  return name.replaceAll(/[^A-Za-z0-9_$]/g, "_").replaceAll(/^\d/g, "_");
 }
 function discardOutput(memory) {
   return {
@@ -381,7 +375,7 @@ function discardOutput(memory) {
       }
       view.setUint32(nwrittenPtr, written, true);
       return 0;
-    },
+    }
   };
 }
 function post(message) {
@@ -427,61 +421,60 @@ async function runScript(wasm, start) {
     memoryLimit: MEMORY_LIMIT_BYTES,
     // 没有这个上限时深递归会打穿 wasm 栈变成 trap，而不是脚本里可捕获的 RangeError
     maxStackSize: MAX_STACK_SIZE,
-    wasi: discardOutput,
+    wasi: discardOutput
   });
-  const bridge = vm.newFunction("bridge", (kind, a, b, c) => {
-    const stringOr = (value, fallback) =>
-      value === void 0 || value.isUndefined ? fallback : value.toString();
-    switch (kind.toString()) {
-      case "call": {
-        post({
-          t: "call",
-          id: a.toNumber(),
-          name: stringOr(b, ""),
-          args: c === void 0 || c.isUndefined ? void 0 : JSON.parse(c.toString()),
-        });
-        break;
-      }
-      case "output": {
-        post({
-          t: "output",
-          items:
-            a.toString() === "image"
-              ? [
-                  {
-                    type: "image",
-                    data: stringOr(b, ""),
-                    mimeType: stringOr(c, "application/octet-stream"),
-                  },
-                ]
-              : [{ type: "text", text: stringOr(b, "") }],
-        });
-        break;
-      }
-      case "done": {
-        const writes = c === void 0 || c.isUndefined ? emptyWrites() : parseWrites(c.toString());
-        if (a.toBoolean()) {
+  const bridge = vm.newFunction(
+    "bridge",
+    (kind, a, b, c) => {
+      const stringOr = (value, fallback) => value === void 0 || value.isUndefined ? fallback : value.toString();
+      switch (kind.toString()) {
+        case "call": {
           post({
-            t: "done",
-            ok: true,
-            value: b === void 0 || b.isUndefined ? void 0 : JSON.parse(b.toString()),
-            writes,
+            t: "call",
+            id: a.toNumber(),
+            name: stringOr(b, ""),
+            args: c === void 0 || c.isUndefined ? void 0 : JSON.parse(c.toString())
           });
-        } else {
+          break;
+        }
+        case "output": {
           post({
-            t: "done",
-            ok: false,
-            error: scriptError(b === void 0 ? void 0 : b.toString(), "script"),
-            writes,
+            t: "output",
+            items: a.toString() === "image" ? [
+              {
+                type: "image",
+                data: stringOr(b, ""),
+                mimeType: stringOr(c, "application/octet-stream")
+              }
+            ] : [{ type: "text", text: stringOr(b, "") }]
           });
+          break;
+        }
+        case "done": {
+          const writes = c === void 0 || c.isUndefined ? emptyWrites() : parseWrites(c.toString());
+          if (a.toBoolean()) {
+            post({
+              t: "done",
+              ok: true,
+              value: b === void 0 || b.isUndefined ? void 0 : JSON.parse(b.toString()),
+              writes
+            });
+          } else {
+            post({
+              t: "done",
+              ok: false,
+              error: scriptError(b === void 0 ? void 0 : b.toString(), "script"),
+              writes
+            });
+          }
+          break;
         }
-        break;
       }
+      return vm.undefined;
     }
-    return vm.undefined;
-  });
-  const api = vm.withScope((scope) =>
-    scope.escape(
+  );
+  const api = vm.withScope(
+    (scope) => scope.escape(
       vm.callFunction(
         vm.evalCode(PRELUDE_SOURCE, "codemode-prelude.js"),
         vm.undefined,
@@ -491,13 +484,13 @@ async function runScript(wasm, start) {
             start.tools.map((tool) => ({
               name: tool.name,
               jsName: toScriptIdentifier(tool.name),
-              description: tool.description,
-            })),
-          ),
+              description: tool.description
+            }))
+          )
         ),
-        vm.newString(JSON.stringify(start.store)),
-      ),
-    ),
+        vm.newString(JSON.stringify(start.store))
+      )
+    )
   );
   const settle = api.getProp("settle");
   const run = api.getProp("run");
@@ -519,21 +512,18 @@ async function runScript(wasm, start) {
           api,
           vm.newNumber(result.id),
           result.ok ? vm.true : vm.false,
-          result.ok
-            ? result.value === void 0
-              ? vm.undefined
-              : vm.newString(JSON.stringify(result.value))
-            : vm.newString(result.error),
+          result.ok ? result.value === void 0 ? vm.undefined : vm.newString(JSON.stringify(result.value)) : vm.newString(result.error)
         );
       });
-    } catch {}
+    } catch {
+    }
     drain();
   });
   try {
     const fn = vm.evalCode(
       `(async (tools, console) => {${start.code}
 })`,
-      "codemode.js",
+      "codemode.js"
     );
     vm.callFunction(run, api, fn).dispose();
     fn.dispose();
@@ -545,16 +535,16 @@ async function runScript(wasm, start) {
         ok: false,
         error: scriptError(
           JSON.stringify({ name: error.name, message: error.message, stack: error.stack }),
-          "script",
+          "script"
         ),
-        writes: emptyWrites(),
+        writes: emptyWrites()
       });
     } else {
       post({
         t: "done",
         ok: false,
         error: { kind: "sandbox", message: error instanceof Error ? error.message : String(error) },
-        writes: emptyWrites(),
+        writes: emptyWrites()
       });
     }
   }
@@ -572,7 +562,7 @@ function main() {
         t: "done",
         ok: false,
         error: { kind: "sandbox", message: "codemode worker: expected a start message first" },
-        writes: emptyWrites(),
+        writes: emptyWrites()
       });
       return;
     }
@@ -580,4 +570,6 @@ function main() {
   });
 }
 main();
-export { toScriptIdentifier };
+export {
+  toScriptIdentifier
+};

package/src/codemode/worker.ts

@@ -28,7 +28,7 @@ const MEMORY_LIMIT_BYTES = 512 * 1024 * 1024;
 
 /** 工具名到脚本标识符的归一化：非法字符换成 `_`，数字开头补 `_`。 */
 export function toScriptIdentifier(name: string): string {
-  return name.replaceAll(/[^A-Za-z0-9_$]/g, "_").replaceAll(/^(\d)/, "_$1");
+  return name.replaceAll(/[^A-Za-z0-9_$]/g, "_").replaceAll(/^\d/g, "_");
 }
 
 /**