@zhushanwen/pi-system-prompt 1.1.4 → 1.1.6

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@zhushanwen/pi-system-prompt",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "System prompt injection extension for Pi — reads config and appends to system prompt",
   "type": "module",
   "main": "src/index.ts",
-  "xyz-agent": {
+  "taiji": {
     "role": "taiji"
   },
   "pi": {
@@ -32,7 +32,7 @@
     "vitest": "^4.1.8"
   },
   "dependencies": {
-    "@zhushanwen/pi-extension-logger": "0.4.1"
+    "@zhushanwen/pi-extension-logger": "0.6.1"
   },
   "scripts": {
     "typecheck": "npx tsc --noEmit",

package/src/__tests__/system-prompt.test.ts

@@ -36,8 +36,8 @@ vi.mock('node:fs', () => ({
   statSync: vi.fn(),
 }))
 
-const DATA_DIR = '/xyz-test/data'
-const GLOBAL_DIR = '/xyz-test/global-agents'
+const DATA_DIR = '/taiji-test/data'
+const GLOBAL_DIR = '/taiji-test/global-agents'
 const CONFIG_PATH = path.join(DATA_DIR, 'system-prompt.json')
 
 /** hook 注册表桩（参照 msg-id-mapper harness 模式） */
@@ -114,15 +114,15 @@ function setupFs(setup: FsSetup = {}): void {
   })
 }
 
-const ENV_KEYS = ['XYZ_AGENT_DATA_DIR', 'XYZ_GLOBAL_AGENTS_DIR', 'PI_CODING_AGENT_DIR'] as const
+const ENV_KEYS = ['TAIJI_AGENT_DATA_DIR', 'TAIJI_GLOBAL_AGENTS_DIR', 'PI_CODING_AGENT_DIR'] as const
 const savedEnv: Record<string, string | undefined> = {}
 const savedArgv = process.argv
 
 beforeEach(() => {
   vi.clearAllMocks() // 清跨用例的 fs mock 调用记录（「守卫不触发」类断言依赖零计数）
   for (const k of ENV_KEYS) savedEnv[k] = process.env[k]
-  process.env.XYZ_AGENT_DATA_DIR = DATA_DIR
-  process.env.XYZ_GLOBAL_AGENTS_DIR = GLOBAL_DIR
+  process.env.TAIJI_AGENT_DATA_DIR = DATA_DIR
+  process.env.TAIJI_GLOBAL_AGENTS_DIR = GLOBAL_DIR
   delete process.env.PI_CODING_AGENT_DIR
   setupFs()
 })

package/src/index.ts

@@ -14,7 +14,7 @@
  *     targets the global agents directory and never picks up override files.
  *     Opt-in by file existence: no file → no injection. Skipped when
  *     pi was spawned with `--no-context-files` (consistent with pi's native
- *     context-file opt-out). `XYZ_GLOBAL_AGENTS_DIR` overrides the global
+ *     context-file opt-out). `TAIJI_GLOBAL_AGENTS_DIR` overrides the global
  *     directory (test hook / escape hatch).
  *
  * Injection order per turn: base prompt → global instructions → append config
@@ -30,7 +30,7 @@ import { readFileSync, readdirSync, statSync } from 'node:fs'
 import type { ExtensionAPI, BeforeAgentStartEvent } from '@earendil-works/pi-coding-agent'
 import { getLogger } from '@zhushanwen/pi-extension-logger'
 
-const logger = getLogger('xyz-system-prompt-extension')
+const logger = getLogger('taiji-system-prompt-extension')
 
 const CONFIG_FILE = 'system-prompt.json'
 
@@ -72,33 +72,42 @@ const GLOBAL_AGENTS_CANDIDATES = ['AGENTS.md', 'AGENTS.MD', 'CLAUDE.md', 'CLAUDE
  * Resolve the data directory from the environment.
  *
  * Priority:
- *  1. `process.env.XYZ_AGENT_DATA_DIR` (explicit)
- *  2. `path.resolve(process.env.PI_CODING_AGENT_DIR ?? '', '..', '..')`
- *     (PI_CODING_AGENT_DIR == <dataDir>/pi/agent, two levels up == dataDir)
+ *  1. `process.env.TAIJI_AGENT_DATA_DIR` (explicit)
+ *  2. `path.resolve(process.env.PI_CODING_AGENT_DIR ?? '', '..')`
+ *     (PI_CODING_AGENT_DIR == <dataDir>/agent, one level up == dataDir)
+ *
+ * Layout trade-off (session-root-discovery plan B, 2026-09): only the NEW
+ * layout shape is handled — one level up. An OLD-layout value
+ * (`<dataDir>/pi/agent`, pre-migration) would resolve to `<dataDir>/pi`,
+ * accepted here on purpose: in every shipped scenario the runtime injects
+ * TAIJI_AGENT_DATA_DIR (priority 1 covers it), so priority 2 only serves
+ * standalone hosts already on the new layout. session-reader's
+ * discovery/env.ts strips both shapes for its diagnostics; this resolver
+ * deliberately stays single-shape (registered divergence, not a bug).
  *
  * Re-read on every handler invocation so env changes between turns/sessions
  * take effect without reloading the extension.
  */
 function resolveDataDir(): string {
-  if (process.env.XYZ_AGENT_DATA_DIR) {
-    return process.env.XYZ_AGENT_DATA_DIR
+  if (process.env.TAIJI_AGENT_DATA_DIR) {
+    return process.env.TAIJI_AGENT_DATA_DIR
   }
-  return path.resolve(process.env.PI_CODING_AGENT_DIR ?? '', '..', '..')
+  return path.resolve(process.env.PI_CODING_AGENT_DIR ?? '', '..')
 }
 
 /**
  * Resolve the global agents directory.
  *
  * Priority:
- *  1. `process.env.XYZ_GLOBAL_AGENTS_DIR` (explicit override; tests / escape
+ *  1. `process.env.TAIJI_GLOBAL_AGENTS_DIR` (explicit override; tests / escape
  *     hatch)
  *  2. `~/.agents` (the user-global agents dir that also hosts skills/templates)
  *
  * Re-read on every handler invocation so env changes take effect.
  */
 function resolveGlobalAgentsDir(): string {
-  if (process.env.XYZ_GLOBAL_AGENTS_DIR) {
-    return process.env.XYZ_GLOBAL_AGENTS_DIR
+  if (process.env.TAIJI_GLOBAL_AGENTS_DIR) {
+    return process.env.TAIJI_GLOBAL_AGENTS_DIR
   }
   return path.join(homedir(), '.agents')
 }
@@ -233,7 +242,7 @@ function buildSystemPrompt(event: BeforeAgentStartEvent): { systemPrompt: string
  * 落盘诊断，不泄露配置内容。
  *
  * 通道：extension-logger 的 error → appendEntry 写入 session JSONL（需 setPiHandle
- * 注入 pi handle 后生效）；XYZ_AGENT_DEBUG=1 时另落文件日志。仅当 logger 自身抛错
+ * 注入 pi handle 后生效）；TAIJI_AGENT_DEBUG=1 时另落文件日志。仅当 logger 自身抛错
  * 时才兜底 process.stderr.write（下方 catch），不外泄到 agent loop。
  */
 function logHookFailure(err: unknown): void {
@@ -243,7 +252,7 @@ function logHookFailure(err: unknown): void {
   } catch (nestedErr) {
     // best-effort：logger 抛错时的终极兜底 process.stderr.write——其内部吞错不会抛，仍不外泄到 agent loop。
     try {
-      process.stderr.write(`[xyz-system-prompt-extension] logHookFailure also failed: ${String(nestedErr)}\n`)
+      process.stderr.write(`[taiji-system-prompt-extension] logHookFailure also failed: ${String(nestedErr)}\n`)
     } catch (finalErr) {
       /* 完全静默：两层兜底都失败时无处可写 */
       void finalErr