@trim21/personal-pi-extensions 0.0.223 → 0.0.225

package/README.md

@@ -38,7 +38,7 @@
 
 ### 提权机制
 
-bash 工具注册了 `request_full_access` 和 `request_full_access_reason` 参数。模型需要全权限时须说明原因（如需要网络、写入 workspace 外部路径）。
+bash 工具（opencode 风格 `bash`、Claude Code 风格 `Bash`）注册了 `dangerouslyDisableSandbox` 参数。模型需要全权限时置为 true 并说明原因（如需要网络、写入 workspace 外部路径）。
 
 建议模型不确定时先尝试沙箱模式，若因沙箱限制失败，再以完整权限重试。
 

package/package.json

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

package/src/bash-default-timeout.ts

@@ -2,8 +2,9 @@ import { type ExtensionAPI, isToolCallEventType } from "@earendil-works/pi-codin
 
 export default function bashDefaultTimeout(pi: ExtensionAPI) {
   pi.on("tool_call", (event) => {
+    // opencode 风格 bash 的 timeout 单位是毫秒
     if (isToolCallEventType("bash", event) && event.input.timeout === undefined) {
-      event.input.timeout = 180;
+      event.input.timeout = 180_000;
     }
   });
 }

package/src/bwrap/index.ts

@@ -1,7 +1,4 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { createBashTool } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
-import { Value } from "typebox/value";
 
 import { bwrapRuntime } from "./runtime.js";
 
@@ -13,46 +10,6 @@ export {
 } from "./core.js";
 export { type EscalationDecision, resolveEscalation } from "./runtime.js";
 
-const sandboxedBashSchema = Type.Object(
-  {
-    command: Type.String({ description: "Bash command to execute" }),
-    timeout: Type.Optional(Type.Number({ description: "Timeout in seconds" })),
-    request_full_access: Type.Optional(
-      Type.Boolean({
-        description:
-          "Set true to request unsandboxed execution. The bwrap runtime will ask the user for approval.",
-      }),
-    ),
-    request_full_access_reason: Type.Optional(
-      Type.String({ description: "Explain why unsandboxed execution is required." }),
-    ),
-  },
-  { additionalProperties: false },
-);
-
 export default function bwrapExtension(pi: ExtensionAPI): void {
   bwrapRuntime.setup(pi);
-  const localBash = createBashTool(process.cwd());
-  pi.registerTool({
-    name: localBash.name,
-    label: "bash (bwrap)",
-    description:
-      localBash.description +
-      "\n\nSet request_full_access to true to request unsandboxed execution.",
-    parameters: sandboxedBashSchema,
-    prepareArguments: (args) => Value.Parse(sandboxedBashSchema, args),
-    executionMode: localBash.executionMode,
-    execute(id, params, signal, onUpdate, ctx) {
-      return bwrapRuntime.execute({
-        toolCallId: id,
-        command: params.command,
-        timeout: params.timeout,
-        requestFullAccess: params.request_full_access,
-        requestFullAccessReason: params.request_full_access_reason,
-        signal,
-        onUpdate,
-        ctx,
-      });
-    },
-  });
 }

package/src/claude-code/shell.ts

@@ -2,40 +2,17 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
 import { bwrapRuntime } from "../bwrap/runtime.js";
+import { resolveWorkdir } from "../lib/path.js";
 
 const DEFAULT_TIMEOUT_MS = 120_000;
 const MAX_TIMEOUT_MS = 600_000;
 
-interface MarkerResult {
-  text: string;
-  cwd: string | undefined;
-}
-
-function stripCwdMarker(text: string, marker: string): MarkerResult {
-  const match = new RegExp(String.raw`${marker}([^\n]+)${marker}`).exec(text);
-  if (!match) return { text, cwd: undefined };
-  return { text: text.replace(match[0], "").trimEnd(), cwd: match[1] };
-}
-
-function wrapCommand(command: string, marker: string): string {
-  return [
-    command,
-    "__pi_cc_status=$?",
-    "wait",
-    String.raw`printf '\n${marker}%s${marker}\n' "$PWD"`,
-    "exit $__pi_cc_status",
-  ].join("\n");
-}
-
 export function registerShellTools(pi: ExtensionAPI): void {
-  let persistentCwd: string | undefined;
-
   pi.registerTool({
     name: "Bash",
     label: "Bash",
     description: [
       "Executes a given bash command synchronously and returns its output.",
-      "The working directory persists between commands, but shell state does not.",
       "timeout is in milliseconds, defaults to 120000, and may not exceed 600000.",
       "Every command runs in the foreground. Background command execution is not supported; shell jobs are waited for before the tool returns.",
     ].join("\n"),
@@ -48,6 +25,12 @@ export function registerShellTools(pi: ExtensionAPI): void {
         description: Type.Optional(
           Type.String({ description: "Clear, concise description of the command" }),
         ),
+        workdir: Type.Optional(
+          Type.String({
+            description:
+              "Working directory to execute the command in. Defaults to the current directory; relative paths resolve from there.",
+          }),
+        ),
         dangerouslyDisableSandbox: Type.Optional(
           Type.Boolean({
             description:
@@ -63,43 +46,27 @@ export function registerShellTools(pi: ExtensionAPI): void {
         throw new Error(`timeout must be between 1 and ${MAX_TIMEOUT_MS} milliseconds`);
       }
 
-      const marker = `__PI_CC_CWD_${id.replaceAll("-", "_")}_${Date.now()}__`;
+      const cwd = params.workdir ? await resolveWorkdir(params.workdir, ctx.cwd) : ctx.cwd;
+
       try {
-        const result = await bwrapRuntime.execute({
-          ctx: { ...ctx, cwd: persistentCwd ?? ctx.cwd },
+        return await bwrapRuntime.execute({
+          ctx: { ...ctx, cwd },
           toolCallId: id,
-          command: wrapCommand(params.command, marker),
+          command: params.command,
           timeout: timeout / 1000,
           requestFullAccess: params.dangerouslyDisableSandbox,
           requestFullAccessReason: params.description,
           signal,
-          onUpdate: onUpdate
-            ? (update) => {
-                const content = update.content.map((item) => {
-                  if (item.type !== "text") return item;
-                  return { ...item, text: stripCwdMarker(item.text, marker).text };
-                });
-                onUpdate({ ...update, content });
-              }
-            : undefined,
-        });
-        const content = result.content.map((item) => {
-          if (item.type !== "text") return item;
-          const cleaned = stripCwdMarker(item.text, marker);
-          if (cleaned.cwd) persistentCwd = cleaned.cwd;
-          return { ...item, text: cleaned.text || "(no output)" };
+          onUpdate,
         });
-        return { ...result, content };
       } catch (error) {
         if (!(error instanceof Error)) throw error;
-        const cleaned = stripCwdMarker(error.message, marker);
-        if (cleaned.cwd) persistentCwd = cleaned.cwd;
-        const timeoutMatch = /Command timed out after [\d.]+ seconds/.exec(cleaned.text);
+        const timeoutMatch = /Command timed out after [\d.]+ seconds/.exec(error.message);
         const message = timeoutMatch
-          ? cleaned.text.slice(0, timeoutMatch.index) +
+          ? error.message.slice(0, timeoutMatch.index) +
             `Command timed out after ${timeout} milliseconds` +
-            cleaned.text.slice(timeoutMatch.index + timeoutMatch[0].length)
-          : cleaned.text;
+            error.message.slice(timeoutMatch.index + timeoutMatch[0].length)
+          : error.message;
         throw new Error(message, { cause: error });
       }
     },

package/src/lib/path.ts

@@ -2,6 +2,7 @@
  * Shared path helpers used by multiple extensions.
  */
 
+import { stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import { isAbsolute, join, resolve } from "node:path";
 
@@ -26,3 +27,22 @@ export function resolveHomePath(p: string, baseDir: string): string {
   const expanded = expandHome(p);
   return isAbsolute(expanded) ? resolve(expanded) : resolve(baseDir, expanded);
 }
+
+/**
+ * Resolve a command `workdir` argument: absolute paths are used as-is, relative
+ * paths resolve against `baseDir`. Throws if the target does not exist or is
+ * not a directory.
+ */
+export async function resolveWorkdir(workdir: string, baseDir: string): Promise<string> {
+  const target = isAbsolute(workdir) ? workdir : resolve(baseDir, workdir);
+  let info;
+  try {
+    info = await stat(target);
+  } catch {
+    throw new Error(`Working directory does not exist: ${target}`);
+  }
+  if (!info.isDirectory()) {
+    throw new Error(`Working directory is not a directory: ${target}`);
+  }
+  return target;
+}

package/src/opencode/bash.ts

@@ -0,0 +1,71 @@
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
+
+import { bwrapRuntime } from "../bwrap/runtime.js";
+import { resolveWorkdir } from "../lib/path.js";
+
+const DEFAULT_TIMEOUT_MS = 120_000;
+const MAX_TIMEOUT_MS = 600_000;
+
+export default function opencodeBash(pi: ExtensionAPI): void {
+  pi.registerTool({
+    name: "bash",
+    label: "bash",
+    description: [
+      "Executes a given bash command synchronously and returns its output.",
+      "The default working directory is the current directory; use workdir to run elsewhere.",
+      "timeout is in milliseconds, defaults to 120000, and may not exceed 600000.",
+      "Every command runs in the foreground. Background command execution is not supported; shell jobs are waited for before the tool returns.",
+    ].join("\n"),
+    parameters: Type.Object(
+      {
+        command: Type.String({ description: "The command to execute" }),
+        workdir: Type.Optional(
+          Type.String({
+            description:
+              "Working directory to execute the command in. Defaults to the current directory; relative paths resolve from there.",
+          }),
+        ),
+        timeout: Type.Optional(
+          Type.Number({ description: "Optional timeout in milliseconds (max 600000)" }),
+        ),
+        dangerouslyDisableSandbox: Type.Optional(
+          Type.Boolean({
+            description:
+              "Request one-time unsandboxed execution. The user must approve this request.",
+          }),
+        ),
+      },
+      { additionalProperties: false },
+    ),
+    async execute(id, params, signal, onUpdate, ctx) {
+      const timeout = params.timeout ?? DEFAULT_TIMEOUT_MS;
+      if (!Number.isFinite(timeout) || timeout <= 0 || timeout > MAX_TIMEOUT_MS) {
+        throw new Error(`timeout must be between 1 and ${MAX_TIMEOUT_MS} milliseconds`);
+      }
+
+      const cwd = params.workdir ? await resolveWorkdir(params.workdir, ctx.cwd) : ctx.cwd;
+
+      try {
+        return await bwrapRuntime.execute({
+          ctx: { ...ctx, cwd },
+          toolCallId: id,
+          command: params.command,
+          timeout: timeout / 1000,
+          requestFullAccess: params.dangerouslyDisableSandbox,
+          signal,
+          onUpdate,
+        });
+      } catch (error) {
+        if (!(error instanceof Error)) throw error;
+        const timeoutMatch = /Command timed out after [\d.]+ seconds/.exec(error.message);
+        const message = timeoutMatch
+          ? error.message.slice(0, timeoutMatch.index) +
+            `Command timed out after ${timeout} milliseconds` +
+            error.message.slice(timeoutMatch.index + timeoutMatch[0].length)
+          : error.message;
+        throw new Error(message, { cause: error });
+      }
+    },
+  });
+}

package/src/opencode/index.ts

@@ -1,7 +1,7 @@
 /**
  * opencode —— 统一注册 opencode 风格工具扩展。
  *
- * 聚合 read / edit / write / todo / question 五个工具，一次加载全部注册；
+ * 聚合 read / edit / write / todo / question / bash 六个工具，一次加载全部注册；
  * 各工具的公开 API（匹配引擎、纯函数等）也从这里重新导出，方便
  * 测试与其他模块（如 workspace-guard）引用。
  *
@@ -14,12 +14,14 @@
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
+import opencodeBash from "./bash.js";
 import opencodeEdit from "./edit.js";
 import opencodeQuestion from "./question.js";
 import opencodeRead from "./read.js";
 import opencodeTodo from "./todo.js";
 import opencodeWrite from "./write.js";
 
+export { default as opencodeBash } from "./bash.js";
 export { default as opencodeEdit } from "./edit.js";
 export {
   detectLineEnding,
@@ -40,4 +42,5 @@ export default function opencode(pi: ExtensionAPI) {
   opencodeWrite(pi);
   opencodeTodo(pi);
   opencodeQuestion(pi);
+  opencodeBash(pi);
 }