@trim21/personal-pi-extensions 0.1.472 → 0.1.474

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.1.472",
+  "version": "0.1.474",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [
@@ -94,7 +94,7 @@
   },
   "packageManager": "pnpm@11.24.0",
   "engines": {
-    "node": ">=24"
+    "node": ">=24.14"
   },
   "dependencies": {
     "@cortexkit/aft-bridge": "0.54.0",

package/src/lib/lsp/watcher.ts

@@ -8,13 +8,16 @@
  * - 尾部去抖（缺省 300ms）合并短时洪峰，最长 flushMs（缺省 1s）强制清批；
  * - 内置忽略 `node_modules` / `.git` / `dist` / `build` / `.venv` / `venv` /
  *   `target` / `coverage`，配置可追加；
+ * - 忽略列表同时下传给 `fs.watch` 的 `ignore` 选项做内核层排除（Node >= 24.14 /
+ *   26 的 recursive watch 对命中路径不创建 inotify watch，避免大型 `.git` 等
+ *   子树耗尽 watch 配额导致 ENOSPC 崩溃）；运行环境不支持时静默回退为事件层过滤；
  * - 单批超过 maxBatch（缺省 500）截断并回调 onTruncated 提示一次；
  * - 目录事件默认丢弃；目录被删除时上报（isDirectory: true），由上层对其中
  *   的驻留文档补 deleted 事件。监听器启动或运行期失败时调用 onError 降级，
  *   不抛错。
  */
 
-import { lstat, watch } from "node:fs/promises";
+import { lstat, watch, type WatchOptions as FsWatchOptions } from "node:fs/promises";
 import { join, normalize, relative, sep } from "node:path";
 
 import { minimatch } from "minimatch";
@@ -65,6 +68,34 @@ function isIgnored(path: string, dir: string, patterns: string[]): boolean {
   return patterns.some((pattern) => minimatch(candidate, pattern));
 }
 
+/**
+ * 为内核层 `fs.watch` 的 `ignore` 选项派生 pattern：为每条「目录内容」形态的
+ * glob（尾部为通配目录段）追加「目录本身」形态并去重——Node 内部按相对路径
+ * 对每个子项逐一匹配，只给内容形态时忽略目录本身仍会建 watch。
+ *
+ * 与事件层 minimatch 的语义差异（Node 内部 matcher 固定 `matchBase: true`、
+ * `nonegate: true`）：无斜杠 pattern 按 basename 匹配任意层级，`!` 否定在
+ * 内核层不生效。内核层只会少产生事件，差异部分仍由事件层兜底。
+ */
+function kernelIgnorePatterns(patterns: readonly string[]): string[] {
+  const derived = new Set<string>();
+  for (const pattern of patterns) {
+    derived.add(pattern);
+    if (pattern.endsWith("/**")) derived.add(pattern.slice(0, -3));
+  }
+  return [...derived];
+}
+
+/**
+ * `ignore` 选项的运行时支持始于 Node 24.14 / 26，@types/node 24.x 尚未声明；
+ * 同时需剔除 fs 模块 WatchOptions.encoding 中的 "buffer" 字面量，否则不可赋给
+ * fs/promises watch 返回 string filename 的重载。
+ */
+type FsWatchOptionsWithIgnore = Omit<FsWatchOptions, "encoding"> & {
+  encoding?: BufferEncoding;
+  ignore?: readonly string[];
+};
+
 /**
  * 启动对 dir 的递归监听。onBatch 收到去抖合并后的批次；stop 后不再回调。
  * 返回的 promise 只在监听器无法建立（目录不存在等）时 reject——运行期
@@ -78,7 +109,7 @@ export function watchWorkspace(
   const debounceMs = options?.debounceMs ?? 300;
   const flushMs = options?.flushMs ?? 1_000;
   const maxBatch = options?.maxBatch ?? 500;
-  const ignorePatterns = [...DEFAULT_IGNORE, ...(options?.ignore ?? [])];
+  const ignorePatterns = kernelIgnorePatterns([...DEFAULT_IGNORE, ...(options?.ignore ?? [])]);
   const abort = new AbortController();
 
   // 从 stat 成功事件学习已知目录，目录被删除时据此标记 isDirectory
@@ -143,7 +174,12 @@ export function watchWorkspace(
 
   const consumer = (async () => {
     try {
-      const iterator = watch(dir, { recursive: true, signal: abort.signal });
+      const watchOptions: FsWatchOptionsWithIgnore = {
+        recursive: true,
+        signal: abort.signal,
+        ignore: ignorePatterns,
+      };
+      const iterator = watch(dir, watchOptions);
       for await (const event of iterator) {
         if (!event.filename) continue;
         const change = await classify(

package/src/system-prompt/index.ts

@@ -61,8 +61,9 @@ export function formatTools(
   selectedTools: string[] | undefined,
   toolSnippets: Record<string, string> | undefined,
 ): string {
+  const names = (selectedTools ?? []).toSorted((a, b) => a.localeCompare(b));
   const lines: string[] = [];
-  for (const name of selectedTools ?? []) {
+  for (const name of names) {
     const snippet = toolSnippets?.[name];
     if (snippet) {
       lines.push(`- ${name}: ${snippet}`);
@@ -73,7 +74,10 @@ export function formatTools(
 
 /** 渲染工具特定 guideline 块；为空时整个块（含标题）省略。guide 本身是 md 文档，直接拼接。 */
 export function formatGuidelines(promptGuidelines: string[] | undefined): string {
-  const items = (promptGuidelines ?? []).map((g) => g.trim()).filter((g) => g.length > 0);
+  const items = (promptGuidelines ?? [])
+    .map((g) => g.trim())
+    .filter((g) => g.length > 0)
+    .toSorted((a, b) => a.localeCompare(b));
   if (items.length === 0) return "";
   return `## Guidelines\n\n${items.join("\n\n")}`;
 }
@@ -84,6 +88,7 @@ export function formatContextFiles(
 ): string {
   if (!contextFiles || contextFiles.length === 0) return "";
   const inner = contextFiles
+    .toSorted((a, b) => a.path.localeCompare(b.path))
     .map(
       ({ path, content }) =>
         `<project_instructions path="${path}">\n${content}\n</project_instructions>`,
@@ -97,7 +102,9 @@ export function formatContextFiles(
  * 一致；disableModelInvocation 的 skill 不展示；为空时省略。
  */
 export function formatSkills(skills: SkillLike[] | undefined): string {
-  const visible = (skills ?? []).filter((skill) => !skill.disableModelInvocation);
+  const visible = (skills ?? [])
+    .filter((skill) => !skill.disableModelInvocation)
+    .toSorted((a, b) => a.name.localeCompare(b.name) || a.filePath.localeCompare(b.filePath));
   if (visible.length === 0) return "";
   const lines = [
     "\n\nThe following skills provide specialized instructions for specific tasks.",