@trim21/personal-pi-extensions 0.1.661 → 0.1.664

package/README.md

@@ -43,10 +43,12 @@
 - **只有脚本输出进上下文**：`text(value)` / `console.log(...)` 与 `return` 值进入工具结果，
   中间的工具调用与它们的返回内容不会（也不在会话记录里留下工具调用条目）。
 - **脚本接口**：`tools` / `ALL_TOOLS` / `text` / `image` / `exit` / `console.*` /
-  `store(key, value)` / `load(key)`；首行可选 `// @options: {"max_output_tokens": 10000}`。
+  `store.set` / `store.get` / `store.list`（会话内持久的键值表）；首行可选
+  `// @options: {"max_output_tokens": 10000}`。
   脚本没有超时：死循环由调用方中止（Esc）结束，等嵌套调用返回（含用户审批弹窗）多久都不算超时。
-- **store** 写在会话的自定义 entry 上（跟随分支），输出超过 `max_output_tokens` 时头尾
-  截断并把全文落到 `$TMPDIR/pi-codemode-*.txt`。
+- **store** 记在每次成功调用工具结果的 `details.store` 上（与 `src/lib/file-reads.ts` 的
+  已读记账同一套做法），下一次调用从当前分支的 toolResult 重放；输出超过 `max_output_tokens`
+  时头尾截断并把全文落到 `$TMPDIR/pi-codemode-*.txt`。
 - **构建**：worker 入口是 esbuild 产物 `src/codemode/worker.js`（随仓库提交，
   `pnpm run build:codemode-worker` 重新生成，pre-commit 会自动跑）；`quickjs-wasi` 的
   wasm 在注册工具时编译一次，之后每次执行复用。

package/package.json

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

package/src/codemode/declarations.ts

@@ -97,7 +97,6 @@ export function renderDeclarations(tools: readonly ToolLike[]): string {
     "declare function text(value: unknown): void;",
     "declare function image(value: unknown): void;",
     "declare function exit(): void;",
-    "declare function store(key: string, value: unknown): void;",
-    "declare function load(key: string): unknown;",
+    "declare const store: { set(key: string, value: unknown): void; get(key: string): unknown; list(): string[] };",
   ].join("\n");
 }

package/src/codemode/prelude.ts

@@ -1,7 +1,7 @@
 /**
  * codemode 脚本侧的 prelude：在 QuickJS VM 里先于脚本求值，构建脚本能看到的全部
- * 能力（`tools` / `ALL_TOOLS` / `text` / `image` / `exit` / `console` / `store` /
- * `load`），并把宿主桥接封在闭包里——脚本拿不到 `bridge` 本身。
+ * 能力（`tools` / `ALL_TOOLS` / `text` / `image` / `exit` / `console` / `store`），
+ * 并把宿主桥接封在闭包里——脚本拿不到 `bridge` 本身。
  *
  * 值与参数过桥时都是 JSON 文本，本侧负责 parse/stringify；异步调用用一个 pending
  * 表把 id 映射到 promise，由宿主在结果到达时 settle。
@@ -13,7 +13,7 @@
  * - `"done"`（ok, valueJsonOrErrorJson, writesJson）
  */
 
-/** `store()` 单个值的 JSON 上限（字符数）。 */
+/** `store.set()` 单个值的 JSON 上限（字符数）。 */
 export const MAX_STORE_VALUE_CHARS = 256 * 1024;
 /** 全部 store 值的 JSON 上限（字符数）。 */
 export const MAX_STORE_TOTAL_CHARS = 1024 * 1024;
@@ -118,41 +118,47 @@ export const PRELUDE_SOURCE = String.raw`(function (bridge, toolsJson, storeJson
 		if (typeof key !== "string") throw new TypeErrorCtor(name + "() key must be a string");
 	}
 
-	function store(key, value) {
-		checkKey("store", key);
-		const previous = stored.has(key) ? key.length + stored.get(key).length : 0;
-		if (value === undefined) {
-			stored.delete(key);
-			storedChars -= previous;
-			writes.set(key, undefined);
-			return;
-		}
-		let json;
-		try {
-			json = stringify(value);
-		} catch (error) {
-			throw new TypeErrorCtor("store(" + stringify(key) + ") value is not JSON-serializable: " + format(error));
-		}
-		if (json === undefined) {
-			throw new TypeErrorCtor("store(" + stringify(key) + ") value is not JSON-serializable");
-		}
-		if (json.length > ${MAX_STORE_VALUE_CHARS}) {
-			throw new RangeError("store(" + stringify(key) + ") value exceeds ${MAX_STORE_VALUE_CHARS} characters of JSON");
-		}
-		const next = storedChars - previous + key.length + json.length;
-		if (next > ${MAX_STORE_TOTAL_CHARS}) {
-			throw new RangeError("store is full: stored values would exceed ${MAX_STORE_TOTAL_CHARS} characters of JSON");
-		}
-		stored.set(key, json);
-		storedChars = next;
-		writes.set(key, json);
-	}
-
-	function load(key) {
-		checkKey("load", key);
-		const json = stored.get(key);
-		return json === undefined ? undefined : parse(json);
-	}
+	// 脚本侧是一个键值表：store.set / store.get / store.list，数据本身留在闭包里
+	const store = Object.freeze({
+		set(key, value) {
+			checkKey("store.set", key);
+			const previous = stored.has(key) ? key.length + stored.get(key).length : 0;
+			if (value === undefined) {
+				stored.delete(key);
+				storedChars -= previous;
+				writes.set(key, undefined);
+				return;
+			}
+			let json;
+			try {
+				json = stringify(value);
+			} catch (error) {
+				throw new TypeErrorCtor("store.set(" + stringify(key) + ") value is not JSON-serializable: " + format(error));
+			}
+			if (json === undefined) {
+				throw new TypeErrorCtor("store.set(" + stringify(key) + ") value is not JSON-serializable");
+			}
+			if (json.length > ${MAX_STORE_VALUE_CHARS}) {
+				throw new RangeError("store.set(" + stringify(key) + ") value exceeds ${MAX_STORE_VALUE_CHARS} characters of JSON");
+			}
+			const next = storedChars - previous + key.length + json.length;
+			if (next > ${MAX_STORE_TOTAL_CHARS}) {
+				throw new RangeError("store is full: stored values would exceed ${MAX_STORE_TOTAL_CHARS} characters of JSON");
+			}
+			stored.set(key, json);
+			storedChars = next;
+			writes.set(key, json);
+		},
+		get(key) {
+			checkKey("store.get", key);
+			const json = stored.get(key);
+			return json === undefined ? undefined : parse(json);
+		},
+		// 升序返回当前键：上下文压缩后模型可以靠它找回自己写过的名字
+		list() {
+			return Array.from(stored.keys()).sort();
+		},
+	});
 
 	function serializeWrites() {
 		const entries = [];
@@ -161,7 +167,6 @@ export const PRELUDE_SOURCE = String.raw`(function (bridge, toolsJson, storeJson
 	}
 
 	Object.defineProperty(globalThis, "store", { value: store, enumerable: true });
-	Object.defineProperty(globalThis, "load", { value: load, enumerable: true });
 
 	// 原始值转字符串，其余 JSON 化
 	function outputText(value) {

package/src/codemode/tool.ts

@@ -26,9 +26,6 @@ import { CODEMODE_SOURCE_GRAMMAR, DEFAULT_OUTPUT_TOKENS, parseCodemodeSource } f
 
 export const CODEMODE_TOOL_NAME = "codemode";
 
-/** store 落在 session 的自定义 entry 上：随分支保存与恢复。 */
-const STORE_ENTRY_TYPE = "codemode-store";
-
 /** 估计 token 用的字符数（与 pi 一致）。 */
 const CHARS_PER_TOKEN = 4;
 
@@ -76,7 +73,8 @@ function buildDescription(tools: readonly CallableTool[]): string {
     "  and a failing tool rejects with an `Error` you can catch.",
     "- Only what the script passes to `text(value)` / `console.log(...)` and its `return` value enter",
     "  this conversation; nested calls and their results stay out of it.",
-    "- `store(key, value)` and `load(key)` keep values across codemode calls in this session.",
+    "- `store.set(key, value)`, `store.get(key)` and `store.list()` are a small key/value store that",
+    "  persists across codemode calls in this session; `store.set(key, undefined)` removes a key.",
     "- The sandbox has no file system, network, timers or Node APIs: calling tools is its only",
     "  capability. Tool calls still go through each tool's own approvals, so a call that needs the",
     "  user's consent will ask for it.",
@@ -89,17 +87,29 @@ function buildDescription(tools: readonly CallableTool[]): string {
   ].join("\n");
 }
 
+/**
+ * store 的恢复：把当前分支上每次 codemode 调用记在工具结果 `details.store` 里的写入
+ * 按顺序重放（与 `src/lib/file-reads.ts` 从 toolResult 的 details 重放已读同一套做法）。
+ * 只认分支上的结果，所以 rewind / fork / resume 后 store 跟着分支走。
+ */
 function readStore(ctx: ExtensionContext): Record<string, unknown> {
   const store = new Map<string, unknown>();
   for (const entry of ctx.sessionManager.getBranch()) {
-    if (entry.type !== "custom" || entry.customType !== STORE_ENTRY_TYPE) {
+    if (entry.type !== "message" || entry.message.role !== "toolResult") {
+      continue;
+    }
+    if (entry.message.toolName !== CODEMODE_TOOL_NAME) {
+      continue;
+    }
+    const details = entry.message.details;
+    if (typeof details !== "object" || details === null) {
       continue;
     }
-    const data = (entry as { data?: unknown }).data;
-    if (typeof data !== "object" || data === null) {
+    const record = (details as { store?: unknown }).store;
+    if (typeof record !== "object" || record === null || Array.isArray(record)) {
       continue;
     }
-    const writes = data as Partial<StoreWrites>;
+    const writes = record as Partial<StoreWrites>;
     for (const key of writes.delete ?? []) {
       store.delete(key);
     }
@@ -294,9 +304,7 @@ export function createCodemodeTools(pi: ExtensionAPI): CodemodeTools {
           const images = imagesOf(outcome.output);
           if (outcome.ok) {
             const writes = outcome.writes;
-            if (Object.keys(writes.set).length > 0 || writes.delete.length > 0) {
-              pi.appendEntry(STORE_ENTRY_TYPE, writes);
-            }
+            const hasWrites = Object.keys(writes.set).length > 0 || writes.delete.length > 0;
             const value =
               outcome.value === undefined ? "" : `\n\n${JSON.stringify(outcome.value, null, 2)}`;
             const truncated = await truncateOutput(
@@ -315,6 +323,8 @@ export function createCodemodeTools(pi: ExtensionAPI): CodemodeTools {
               ],
               details: {
                 calls: outcome.calls,
+                // store 的写入随工具结果持久化，下一次调用从这里重放恢复
+                ...(hasWrites && { store: writes }),
                 pendant: scriptPendant(code, `${outcome.calls.length} tool call(s)`),
                 ...(truncated.fullOutputPath && { fullOutputPath: truncated.fullOutputPath }),
               },

package/src/codemode/worker.js

@@ -103,41 +103,47 @@ var PRELUDE_SOURCE = String.raw`(function (bridge, toolsJson, storeJson) {
 		if (typeof key !== "string") throw new TypeErrorCtor(name + "() key must be a string");
 	}
 
-	function store(key, value) {
-		checkKey("store", key);
-		const previous = stored.has(key) ? key.length + stored.get(key).length : 0;
-		if (value === undefined) {
-			stored.delete(key);
-			storedChars -= previous;
-			writes.set(key, undefined);
-			return;
-		}
-		let json;
-		try {
-			json = stringify(value);
-		} catch (error) {
-			throw new TypeErrorCtor("store(" + stringify(key) + ") value is not JSON-serializable: " + format(error));
-		}
-		if (json === undefined) {
-			throw new TypeErrorCtor("store(" + stringify(key) + ") value is not JSON-serializable");
-		}
-		if (json.length > ${MAX_STORE_VALUE_CHARS}) {
-			throw new RangeError("store(" + stringify(key) + ") value exceeds ${MAX_STORE_VALUE_CHARS} characters of JSON");
-		}
-		const next = storedChars - previous + key.length + json.length;
-		if (next > ${MAX_STORE_TOTAL_CHARS}) {
-			throw new RangeError("store is full: stored values would exceed ${MAX_STORE_TOTAL_CHARS} characters of JSON");
-		}
-		stored.set(key, json);
-		storedChars = next;
-		writes.set(key, json);
-	}
-
-	function load(key) {
-		checkKey("load", key);
-		const json = stored.get(key);
-		return json === undefined ? undefined : parse(json);
-	}
+	// 脚本侧是一个键值表：store.set / store.get / store.list，数据本身留在闭包里
+	const store = Object.freeze({
+		set(key, value) {
+			checkKey("store.set", key);
+			const previous = stored.has(key) ? key.length + stored.get(key).length : 0;
+			if (value === undefined) {
+				stored.delete(key);
+				storedChars -= previous;
+				writes.set(key, undefined);
+				return;
+			}
+			let json;
+			try {
+				json = stringify(value);
+			} catch (error) {
+				throw new TypeErrorCtor("store.set(" + stringify(key) + ") value is not JSON-serializable: " + format(error));
+			}
+			if (json === undefined) {
+				throw new TypeErrorCtor("store.set(" + stringify(key) + ") value is not JSON-serializable");
+			}
+			if (json.length > ${MAX_STORE_VALUE_CHARS}) {
+				throw new RangeError("store.set(" + stringify(key) + ") value exceeds ${MAX_STORE_VALUE_CHARS} characters of JSON");
+			}
+			const next = storedChars - previous + key.length + json.length;
+			if (next > ${MAX_STORE_TOTAL_CHARS}) {
+				throw new RangeError("store is full: stored values would exceed ${MAX_STORE_TOTAL_CHARS} characters of JSON");
+			}
+			stored.set(key, json);
+			storedChars = next;
+			writes.set(key, json);
+		},
+		get(key) {
+			checkKey("store.get", key);
+			const json = stored.get(key);
+			return json === undefined ? undefined : parse(json);
+		},
+		// 升序返回当前键：上下文压缩后模型可以靠它找回自己写过的名字
+		list() {
+			return Array.from(stored.keys()).sort();
+		},
+	});
 
 	function serializeWrites() {
 		const entries = [];
@@ -146,7 +152,6 @@ var PRELUDE_SOURCE = String.raw`(function (bridge, toolsJson, storeJson) {
 	}
 
 	Object.defineProperty(globalThis, "store", { value: store, enumerable: true });
-	Object.defineProperty(globalThis, "load", { value: load, enumerable: true });
 
 	// 原始值转字符串，其余 JSON 化
 	function outputText(value) {