@trim21/personal-pi-extensions 0.0.194 → 0.0.195

package/README.md

@@ -256,10 +256,12 @@ sqlite 文件路径按优先级取第一个可用值：
 2. global `~/.pi/agent/settings.json` 里的 `talk.db_path`
 3. 默认 `~/.pi/agent/talk.db`
 
+`db_path` 支持 `~` 展开（`~/…` → 用户主目录），相对路径相对 `~/.pi/agent` 解析；绝对路径原样使用。
+
 ```jsonc
 // ~/.pi/agent/settings.json
 {
-  "talk": { "db_path": "/path/to/talk.db" },
+  "talk": { "db_path": "~/data/talk.db" },
 }
 ```
 

package/package.json

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

package/src/bwrap/index.ts

@@ -67,6 +67,8 @@ import { type BashOperations, createBashTool, getAgentDir } from "@earendil-work
 import { Type } from "typebox";
 import { Value } from "typebox/value";
 
+import { expandHome } from "../lib/path.js";
+
 const SANDBOX_PROMPT = `
 ## Command Execution
 You are running inside a sandbox.
@@ -232,17 +234,8 @@ function deepMerge(base: BwrapConfig, overrides: Partial<BwrapConfig>): BwrapCon
   };
 }
 
-function expandPath(p: string): string {
-  if (p.startsWith("~/")) {
-    const home = process.env.HOME;
-    if (home === undefined) return p;
-    return join(home, p.slice(2));
-  }
-  return p;
-}
-
 function resolvePath(p: string, cwd: string): string {
-  const expanded = expandPath(p);
+  const expanded = expandHome(p);
   if (expanded === ".") return cwd;
   return expanded;
 }

package/src/lib/path.ts

@@ -0,0 +1,28 @@
+/**
+ * Shared path helpers used by multiple extensions.
+ */
+
+import { homedir } from "node:os";
+import { isAbsolute, join, resolve } from "node:path";
+
+/**
+ * Expand a leading `~` to the user's home directory.
+ * - `~` → home
+ * - `~/rest` → `home/rest`
+ * - anything else (including `~user`) is left untouched.
+ */
+export function expandHome(p: string): string {
+  if (p === "~") return homedir();
+  if (p.startsWith("~/")) return join(homedir(), p.slice(2));
+  return p;
+}
+
+/**
+ * Resolve a path that may start with `~` (expanded to home) and may be
+ * relative (resolved against `baseDir`). Absolute paths are returned
+ * normalized.
+ */
+export function resolveHomePath(p: string, baseDir: string): string {
+  const expanded = expandHome(p);
+  return isAbsolute(expanded) ? resolve(expanded) : resolve(baseDir, expanded);
+}

package/src/talk/index.ts

@@ -17,6 +17,7 @@ import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import { Box, Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 
+import { resolveHomePath } from "../lib/path.js";
 import { TalkCore } from "./core.js";
 import { formatDelivery } from "./format.js";
 import type { Letter } from "./mailbox.js";
@@ -117,8 +118,10 @@ function readDbPathFromSettings(): string | undefined {
 }
 
 export default function talk(pi: ExtensionAPI) {
-  const dbPath =
-    process.env.PI_TALK_DB ?? readDbPathFromSettings() ?? path.join(getAgentDir(), "talk.db");
+  const configured = process.env.PI_TALK_DB ?? readDbPathFromSettings();
+  const dbPath = configured
+    ? resolveHomePath(configured, getAgentDir())
+    : path.join(getAgentDir(), "talk.db");
   const storage = new SqliteTalkStorage(dbPath);
 
   let self: SessionRecord | undefined;

package/src/workspace-guard.ts

@@ -13,8 +13,7 @@
  */
 
 import { readFile } from "node:fs/promises";
-import { homedir } from "node:os";
-import { basename, isAbsolute, join, relative, resolve, sep } from "node:path";
+import { basename, isAbsolute, relative, sep } from "node:path";
 
 import {
   type ExtensionAPI,
@@ -22,6 +21,7 @@ import {
   type ToolCallEvent,
 } from "@earendil-works/pi-coding-agent";
 
+import { resolveHomePath } from "./lib/path.js";
 import { normalizeForEdit, replace } from "./opencode-edit-engine.js";
 
 const WRITE_TOOLS = new Set(["write", "edit"]);
@@ -37,17 +37,6 @@ export function getWriteTarget(input: ToolCallEvent["input"]): string | undefine
   return undefined;
 }
 
-function resolvePath(filePath: string, cwd: string): string {
-  let p = filePath;
-  if (p.startsWith("~")) {
-    const rest = p.slice(1);
-    if (rest === "" || rest.startsWith("/")) {
-      p = join(homedir(), rest.slice(1));
-    }
-  }
-  return isAbsolute(p) ? resolve(p) : resolve(cwd, p);
-}
-
 function isInside(dir: string, filePath: string): boolean {
   const rel = relative(dir, filePath);
   return rel === "" || (rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute(rel));
@@ -57,7 +46,7 @@ function isPathAllowed(resolvedPath: string, cwd: string): boolean {
   if (isInside(cwd, resolvedPath)) return true;
 
   for (const allowed of ALWAYS_ALLOW) {
-    const resolvedAllowed = resolvePath(allowed, cwd);
+    const resolvedAllowed = resolveHomePath(allowed, cwd);
     if (isInside(resolvedAllowed, resolvedPath)) return true;
   }
 
@@ -214,7 +203,7 @@ export default function workspaceGuard(pi: ExtensionAPI) {
     const rawPath = getWriteTarget(event.input);
     if (!rawPath) return;
 
-    const resolved = resolvePath(rawPath, ctx.cwd);
+    const resolved = resolveHomePath(rawPath, ctx.cwd);
 
     if (isPathAllowed(resolved, ctx.cwd)) return;