@zhushanwen/pi-plan 0.3.5 → 0.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-plan",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "Lightweight plan mode for Pi coding agent",
   "type": "module",
   "main": "index.ts",
@@ -18,7 +18,7 @@
     "@earendil-works/pi-coding-agent": ">=0.73.0",
     "typebox": "*",
     "@earendil-works/pi-ai": "*",
-    "@zhushanwen/pi-goal": "0.8.2"
+    "@zhushanwen/pi-goal": "0.8.3"
   },
   "peerDependenciesMeta": {
     "@earendil-works/pi-ai": {

package/src/__tests__/templates.test.ts

@@ -1,8 +1,10 @@
 import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
 
-import { describe, expect,it } from "vitest";
+import { describe, expect, it } from "vitest";
 
-import { getBuiltinTemplateDir,listTemplates, loadTemplate } from "../templates.js";
+import { getBuiltinTemplateDir, listTemplates, loadTemplate } from "../templates.js";
 
 describe("Template system", () => {
   it("listTemplates returns builtin templates", () => {
@@ -31,4 +33,28 @@ describe("Template system", () => {
     const dir = getBuiltinTemplateDir();
     expect(fs.existsSync(dir)).toBe(true);
   });
+
+  it("TC8: PI_CODING_AGENT_DIR 隔离目录下扫到全局模板（getAgentDir 派生，不依赖 ~/.pi/agent）", () => {
+    const origEnv = process.env.PI_CODING_AGENT_DIR;
+    const isolated = fs.mkdtempSync(path.join(os.tmpdir(), "plan-tpl-"));
+    try {
+      process.env.PI_CODING_AGENT_DIR = isolated;
+      fs.mkdirSync(path.join(isolated, "plan-templates"), { recursive: true });
+      fs.writeFileSync(path.join(isolated, "plan-templates", "isolated-template.md"), "# t");
+
+      const templates = listTemplates();
+      const names = templates.map((t) => t.name);
+      expect(names).toContain("isolated-template");
+      // 隔离目录模板 source 为 global（getAgentDir 直接返回 PI_CODING_AGENT_DIR 值，无 .pi/agent 嵌套）
+      const tpl = templates.find((t) => t.name === "isolated-template");
+      expect(tpl?.source).toBe("global");
+      expect(tpl?.path.startsWith(isolated)).toBe(true);
+      // 仍能扫到 builtin 模板（最低优先级）
+      expect(names).toContain("feature-plan");
+    } finally {
+      if (origEnv === undefined) delete process.env.PI_CODING_AGENT_DIR;
+      else process.env.PI_CODING_AGENT_DIR = origEnv;
+      fs.rmSync(isolated, { recursive: true, force: true });
+    }
+  });
 });

package/src/templates.ts

@@ -1,8 +1,9 @@
 import * as fs from "node:fs";
-import * as os from "node:os";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
+
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 export interface TemplateInfo {
@@ -39,8 +40,8 @@ export function listTemplates(projectDir?: string): TemplateInfo[] {
     templates.push(...scanTemplateDir(path.join(projectDir, ".pi", "plan-templates"), "project", seen));
   }
 
-  // 2. Global templates
-  templates.push(...scanTemplateDir(path.join(os.homedir(), ".pi", "agent", "plan-templates"), "global", seen));
+  // 2. Global templates（getAgentDir 派生，实例隔离：PI_CODING_AGENT_DIR 场景读隔离目录）
+  templates.push(...scanTemplateDir(path.join(getAgentDir(), "plan-templates"), "global", seen));
 
   // 3. Builtin templates (lowest priority)
   templates.push(...scanTemplateDir(getBuiltinTemplateDir(), "builtin", seen));