@yaosu/pi-path-guard 1.1.0 → 1.2.0

package/README.md

@@ -22,7 +22,7 @@ pi install /path/to/pi-path-guard
 # Try without installing (no settings change / 临时试用，不写入 settings)
 pi -e ./pi-path-guard
 
-# npm (after publishing / 发布后): scope package
+# npm: scope package
 # pi install npm:@yaosu/pi-path-guard
 ```
 
@@ -35,7 +35,8 @@ After installing, run `/reload` or restart pi. 安装后 `/reload` 或重启 pi
 - `/guard` — interactive mode picker (title shows the full decision matrix; choices are bilingual) 交互式选择防护模式（标题展示完整判定矩阵，选项中英双语）
 - `/guard <strict|normal|loose|trusted|naked>` — quick switch (trusted requires a warning; naked requires a double warning) 快捷切换（trusted 需警告确认；naked 需两级确认）
 - Invalid argument → falls back to the interactive picker 非法参数 → 兜底弹出交互选择
-- Every new session resets to `normal` 每次新会话自动回到 `normal`
+- The active mode persists across sessions via settings.json (`pathGuard.mode`): project `.pi/settings.json` overrides global `~/.pi/agent/settings.json`, falling back to `normal`. `/guard <mode>` writes it back (project settings in a trusted project, else global). 模式跨会话持久化到 settings.json（`pathGuard.mode`）：项目 `.pi/settings.json` 优先于全局 `~/.pi/agent/settings.json`，缺省回 `normal`；`/guard <mode>` 切换时回写（受信任项目写项目配置，否则写全局）
+- The active mode is shown in the footer status bar (`🛡 <mode>`, `🛡 NAKED` in warning color) 当前模式显示在底部状态栏（`🛡 <mode>`，naked 用警示色 `🛡 NAKED`）
 
 ### Guard mode matrix / 防护模式矩阵
 
@@ -72,13 +73,13 @@ After installing, run `/reload` or restart pi. 安装后 `/reload` 或重启 pi
 
 ## Development / 开发与测试
 
-Automated tests (96 assertions) load the real extension with a mocked pi API, covering the 5 modes × protected paths / dangerous commands / truncation / git destructive matrix, plus `/guard` command interaction, trusted-mode confirmation, and naked-mode double confirmation:
+Automated tests (104 assertions) load the real extension with a mocked pi API, covering the 5 modes × protected paths / dangerous commands / truncation / git destructive matrix, plus `/guard` command interaction, trusted-mode confirmation, naked-mode double confirmation, the footer status indicator, and settings.json mode persistence:
 
 ```bash
 cd tests && node --experimental-strip-types test-pathguard.ts
 ```
 
-自动化测试（96 断言）模拟 pi API 加载真实扩展，覆盖 5 种模式 × 受保护路径 / 危险命令 / 截断 / git 破坏性等判定矩阵，以及 `/guard` 命令交互、trusted 确认与 naked 两级确认流程：
+自动化测试（104 断言）模拟 pi API 加载真实扩展，覆盖 5 种模式 × 受保护路径 / 危险命令 / 截断 / git 破坏性等判定矩阵，以及 `/guard` 命令交互、trusted 确认与 naked 两级确认、底部状态栏指示、settings.json 模式持久化等流程：
 
 ```bash
 cd tests && node --experimental-strip-types test-pathguard.ts

package/extensions/path-guard.ts

@@ -42,6 +42,11 @@
  *   checks, git destructive, truncate, outside deletes/overwrites); only system-destructive
  *   Block-group commands (mkfs/reboot/block-device writes/bulk delete) are still confirmed.
  *   Switching to naked requires a double confirmation (stronger than trusted's single warning).
+ *
+ * v3.2 adds (upgrade from v3.1): mode persistence across sessions. The active mode is read from
+ *   settings.json on session_start (project .pi/settings.json overrides the global
+ *   ~/.pi/agent/settings.json, falling back to normal) and written back when /guard switches
+ *   mode — project settings in a trusted project, otherwise global settings. Key: pathGuard.mode.
  */
 
 import type {
@@ -52,6 +57,7 @@ import type {
 	EditToolInput,
 	WriteToolInput,
 	ToolCallEventResult,
+	ExtensionUIContext,
 } from "@earendil-works/pi-coding-agent";
 import {
 	resolve,
@@ -63,7 +69,13 @@ import {
 	sep,
 } from "node:path";
 import { homedir } from "node:os";
-import { realpathSync, existsSync, statSync } from "node:fs";
+import {
+	realpathSync,
+	existsSync,
+	statSync,
+	readFileSync,
+	writeFileSync,
+} from "node:fs";
 
 // ─── Configuration ──────────────────────────────────────────────────────
 
@@ -188,6 +200,11 @@ const DEVICE_TARGETS = new Set([
 
 const HOME = homedir();
 
+/** pi project config dir name (default CONFIG_DIR_NAME is `.pi`). */
+const CONFIG_DIR = ".pi";
+/** Global settings.json path (default pi agent dir). */
+const GLOBAL_SETTINGS_PATH = join(HOME, ".pi", "agent", "settings.json");
+
 // ─── Guard Modes ─────────────────────────────────────────────────────
 
 /** Guard mode: strict (full) / normal (default) / loose (relaxed) / trusted (most permissive) / naked (no protection) */
@@ -250,16 +267,111 @@ type GuardVerdict =
 
 // ─── Entry ────────────────────────────────────────────────────────────
 
+/** Set the current guard mode and mirror it into the TUI footer status bar. */
+function setMode(mode: GuardMode, ui: ExtensionUIContext) {
+	currentMode = mode;
+	refreshModeStatus(ui);
+}
+
+/**
+ * Show the active guard mode in the footer status bar (persists across renders).
+ * naked is highlighted in warning color so the "bare" state is unmissable.
+ */
+function refreshModeStatus(ui: ExtensionUIContext) {
+	const t = ui.theme;
+	const color = currentMode === "naked" ? "warning" : "accent";
+	const label = currentMode === "naked" ? "🛡 NAKED" : `🛡 ${currentMode}`;
+	ui.setStatus("path-guard", t.fg(color, label));
+}
+
+// ─── Settings persistence (mode survives across sessions) ─────────────
+
+/** Global settings.json path (~/.pi/agent/settings.json). */
+function globalSettingsPath(): string {
+	return GLOBAL_SETTINGS_PATH;
+}
+
+/** Project settings.json path (cwd/.pi/settings.json), or undefined when no cwd. */
+function projectSettingsPath(cwd: string | undefined): string | undefined {
+	return cwd ? join(cwd, CONFIG_DIR, "settings.json") : undefined;
+}
+
+/** Read the saved guard mode from a settings.json file, or undefined if absent/invalid. */
+function readSettingsMode(filePath: string | undefined): GuardMode | undefined {
+	if (!filePath) return undefined;
+	try {
+		if (!existsSync(filePath)) return undefined;
+		const data = JSON.parse(readFileSync(filePath, "utf8")) as {
+			pathGuard?: { mode?: string };
+		};
+		const mode = data?.pathGuard?.mode;
+		return typeof mode === "string" && isGuardMode(mode) ? mode : undefined;
+	} catch {
+		return undefined;
+	}
+}
+
+/**
+ * Effective saved mode at session start: project settings override global,
+ * falling back to normal. Project-local config is only honored for trusted
+ * projects; otherwise only the global setting applies.
+ */
+function readSavedMode(cwd: string | undefined, trusted: boolean): GuardMode {
+	const proj = projectSettingsPath(cwd);
+	if (proj && trusted) {
+		const pm = readSettingsMode(proj);
+		if (pm) return pm;
+	}
+	return readSettingsMode(globalSettingsPath()) ?? "normal";
+}
+
+/**
+ * Persist a mode to settings.json. In a trusted project it writes the project
+ * settings file (cwd/.pi/settings.json); otherwise the global settings file.
+ * Requires a cwd; returns "project" | "global" | "none" (none = not persisted).
+ */
+function persistMode(
+	mode: GuardMode,
+	cwd: string | undefined,
+	trusted: boolean,
+): string {
+	if (!cwd) return "none"; // no context to persist to
+	const target = trusted ? projectSettingsPath(cwd) : globalSettingsPath();
+	if (!target) return "none";
+	try {
+		let data: Record<string, unknown> = {};
+		if (existsSync(target)) {
+			data = JSON.parse(readFileSync(target, "utf8")) as Record<string, unknown>;
+		}
+		const guard = (data.pathGuard as Record<string, unknown>) ?? {};
+		guard.mode = mode;
+		data.pathGuard = guard;
+		writeFileSync(target, JSON.stringify(data, null, 2) + "\n", "utf8");
+		return trusted ? "project" : "global";
+	} catch {
+		return "none";
+	}
+}
+
+/** Human-readable persistence note for notify messages. */
+function persistNote(where: string): string {
+	if (where === "project")
+		return "saved to project settings (.pi/settings.json)";
+	if (where === "global") return "saved to global settings";
+	return "session-only (not persisted)";
+}
+
 export default function (pi: ExtensionAPI) {
-	// Reset to normal on every new session (startup, /new, /resume all fire session_start)
-	pi.on("session_start", () => {
-		currentMode = "normal";
+	// Restore the persisted mode on every new session (startup, /new, /resume all
+	// fire session_start). Project settings override global; falls back to normal.
+	pi.on("session_start", (_event, ctx) => {
+		setMode(readSavedMode(ctx.cwd, ctx.isProjectTrusted?.() === true), ctx.ui);
 	});
 
 	// /guard slash command: view / switch guard mode
 	pi.registerCommand("guard", {
 		description:
-			"Path Guard modes: /guard shows the current mode, /guard <strict|normal|loose|trusted|naked> switches",
+			"Path Guard modes: /guard shows the current mode, /guard <strict|normal|loose|trusted|naked> switches (persisted to settings)",
 		handler: async (args, ctx) => {
 			const m = args?.trim().toLowerCase() ?? "";
 
@@ -273,8 +385,10 @@ export default function (pi: ExtensionAPI) {
 					return;
 				}
 				currentMode = m;
+				refreshModeStatus(ctx.ui);
+				const where = persistMode(m, ctx.cwd, ctx.isProjectTrusted?.() === true);
 				ctx.ui.notify(
-					`Path Guard switched to: ${m} (session-only; new sessions reset to normal)`,
+					`Path Guard switched to: ${m} (${persistNote(where)})`,
 					"info",
 				);
 				return;
@@ -309,8 +423,14 @@ export default function (pi: ExtensionAPI) {
 					return;
 				}
 				currentMode = picked;
+				refreshModeStatus(ctx.ui);
+				const where = persistMode(
+					picked,
+					ctx.cwd,
+					ctx.isProjectTrusted?.() === true,
+				);
 				ctx.ui.notify(
-					`Path Guard switched to: ${picked} (session-only; new sessions reset to normal)`,
+					`Path Guard switched to: ${picked} (${persistNote(where)})`,
 					"info",
 				);
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaosu/pi-path-guard",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "type": "module",
   "description": "Path Guard for pi — blocks destructive commands & path overwrites, protects .env/keys, with strict/normal/loose/trusted/naked guard modes (/guard). pi 防误删/防误覆盖扩展，支持 5 种防护模式。",
   "keywords": [