@pi-harness/pi-harness 0.1.13 → 0.1.14

package/packages/core/src/plugins/auto-mode.ts

@@ -10,9 +10,46 @@ const maxArgs = 32;
 const maxArgBytes = 4096;
 const maxOutputBytes = 128 * 1024;
 const defaultTimeoutMs = 30_000;
-const shellWrappers = new Set(["sh", "bash", "zsh", "fish", "cmd", "powershell", "pwsh"]);
-const riskyCommands = new Set(["rm", "rmdir", "del", "sudo", "su", "chmod", "chown", "kill", "pkill", "dd", "mkfs"]);
-const riskyWords = new Set(["reset", "clean", "push", "publish", "curl", "wget", "ssh", "scp"]);
+const shellWrappers = new Set([
+  "sh",
+  "bash",
+  "zsh",
+  "fish",
+  "cmd",
+  "powershell",
+  "pwsh",
+  "env",
+  "sudo",
+  "su",
+  "nice",
+  "nohup",
+  "time",
+  "timeout",
+  "stdbuf",
+  "xargs",
+]);
+const safeCommands = new Set([
+  "basename",
+  "cat",
+  "cmp",
+  "diff",
+  "dirname",
+  "echo",
+  "file",
+  "grep",
+  "head",
+  "id",
+  "ls",
+  "printf",
+  "pwd",
+  "stat",
+  "tail",
+  "uname",
+  "wc",
+  "which",
+  "whoami",
+]);
+const safeGitSubcommands = new Set(["blame", "cat-file", "describe", "diff", "grep", "log", "ls-files", "ls-tree", "rev-parse", "show", "status"]);
 type AutoModeResult = { command: string[]; allowed: boolean; confirmed: boolean; exitCode: number | null; stdout: string; stderr: string; durationMs: number };
 
 export interface AutoModePluginConfig {
@@ -24,17 +61,31 @@ export const Config: z<AutoModePluginConfig> = z.object({
   timeoutMs: z.number().default(defaultTimeoutMs),
 });
 
-function validateCommand(command: string[]): void {
-  if (command.length === 0 || command.length > maxArgs) throw new Error(`Auto mode command must contain between 1 and ${maxArgs} arguments`);
-  if (command.some((part) => part.length === 0 || Buffer.byteLength(part, "utf8") > maxArgBytes))
+function commandName(value: string): string {
+  return value
+    .split(/[\\/]/u)
+    .at(-1)!
+    .toLowerCase()
+    .replace(/\.(?:exe|cmd|bat|com)$/u, "");
+}
+
+function validateCommand(command: unknown): asserts command is string[] {
+  if (!Array.isArray(command)) throw new Error("Auto mode command must be an array");
+  const parts: unknown[] = command;
+  if (parts.length === 0 || parts.length > maxArgs) throw new Error(`Auto mode command must contain between 1 and ${maxArgs} arguments`);
+  if (!parts.every((part): part is string => typeof part === "string")) throw new Error("Auto mode command arguments must be strings");
+  if (parts.some((part) => part.length === 0 || Buffer.byteLength(part, "utf8") > maxArgBytes))
     throw new Error("Auto mode command contains an invalid argument");
-  if (shellWrappers.has((command[0] ?? "").split("/").at(-1)!.toLowerCase()))
-    throw new Error("Auto mode rejects shell wrappers; pass an executable argv directly");
+  if (shellWrappers.has(commandName(parts[0] ?? ""))) throw new Error("Auto mode rejects shell wrappers; pass an executable argv directly");
 }
 
 function isRisky(command: string[]): boolean {
-  const executable = (command[0] ?? "").split("/").at(-1)!.toLowerCase();
-  return riskyCommands.has(executable) || command.slice(1).some((part) => riskyWords.has(part.toLowerCase()));
+  if (/[\\/]/u.test(command[0] ?? "")) return true;
+  const executable = commandName(command[0] ?? "");
+  if (safeCommands.has(executable)) return false;
+  if (executable !== "git") return true;
+  const subcommand = command[1]?.toLowerCase();
+  return subcommand !== "--version" && subcommand !== "version" && !safeGitSubcommands.has(subcommand ?? "");
 }
 
 export default {
@@ -43,17 +94,21 @@ export default {
   Config,
   apply(context: Context, config: AutoModePluginConfig) {
     const mode = config.mode === "confirm" ? "confirm" : "safe";
-    const timeoutMs = Math.max(1_000, Math.min(120_000, Math.trunc(config.timeoutMs ?? defaultTimeoutMs)));
+    const configuredTimeoutMs = config.timeoutMs ?? defaultTimeoutMs;
+    const timeoutMs = Number.isFinite(configuredTimeoutMs) ? Math.max(1_000, Math.min(120_000, Math.trunc(configuredTimeoutMs))) : defaultTimeoutMs;
+    const lifecycle = new AbortController();
     let blocked = 0;
     let last: AutoModeResult | undefined;
-    const execute = async (command: string[], confirm: boolean): Promise<AutoModeResult> => {
+    const execute = async (command: string[], confirm: boolean, signal?: AbortSignal): Promise<AutoModeResult> => {
+      signal?.throwIfAborted();
       try {
         validateCommand(command);
       } catch (error) {
         blocked += 1;
         throw error;
       }
-      const risky = isRisky(command);
+      const argv = [...command];
+      const risky = isRisky(argv);
       if (risky && !confirm) {
         blocked += 1;
         throw new Error("Auto mode blocked a risky command; retry with confirm=true");
@@ -64,9 +119,14 @@ export default {
       }
       const started = Date.now();
       try {
-        const result = await execFileAsync(command[0]!, command.slice(1), { cwd: context.piHarnessLaunch.cwd, timeout: timeoutMs, maxBuffer: maxOutputBytes });
+        const result = await execFileAsync(argv[0]!, argv.slice(1), {
+          cwd: context.piHarnessLaunch.cwd,
+          timeout: timeoutMs,
+          maxBuffer: maxOutputBytes,
+          signal,
+        });
         last = {
-          command: [...command],
+          command: argv,
           allowed: true,
           confirmed: confirm,
           exitCode: 0,
@@ -75,9 +135,10 @@ export default {
           durationMs: Date.now() - started,
         };
       } catch (error) {
+        signal?.throwIfAborted();
         const failure = error as { code?: number | string; stdout?: string; stderr?: string; message?: string };
         last = {
-          command: [...command],
+          command: argv,
           allowed: true,
           confirmed: confirm,
           exitCode: typeof failure.code === "number" ? failure.code : 1,
@@ -94,15 +155,20 @@ export default {
         label: "Auto mode exec",
         description: "Execute an argv command under the configured safe/confirmation policy without a shell.",
         promptSnippet: "run a command through the safe auto-mode policy",
-        parameters: Type.Object({
-          command: Type.Array(Type.String()),
-          confirm: Type.Optional(Type.Boolean({ description: "Confirm a risky or confirmation-mode command" })),
-        }),
-        async execute(_toolCallId, params): Promise<AgentToolResult<AutoModeResult>> {
-          const result = await execute(params.command, params.confirm === true);
+        parameters: Type.Object(
+          {
+            command: Type.Array(Type.String({ minLength: 1, maxLength: maxArgBytes }), { minItems: 1, maxItems: maxArgs }),
+            confirm: Type.Optional(Type.Boolean({ description: "Confirm a risky or confirmation-mode command" })),
+          },
+          { additionalProperties: false },
+        ),
+        executionMode: "sequential",
+        async execute(_toolCallId, params, signal): Promise<AgentToolResult<AutoModeResult>> {
+          const executionSignal = signal === undefined ? lifecycle.signal : AbortSignal.any([signal, lifecycle.signal]);
+          const result = await execute(params.command, params.confirm === true, executionSignal);
           return {
             content: [{ type: "text", text: `${result.command.join(" ")} exited with ${result.exitCode ?? "unknown"}.\n${result.stdout}${result.stderr}` }],
-            details: result,
+            details: structuredClone(result),
           };
         },
       }),
@@ -113,9 +179,10 @@ export default {
       title: "Auto Mode",
       description: "按安全策略执行 argv 命令，风险操作需要确认。",
       icon: "◈",
-      read: () => ({ mode, timeoutMs, blocked, last: last ?? null }),
+      read: () => ({ mode, timeoutMs, blocked, last: last === undefined ? null : structuredClone(last) }),
     });
     context.effect(() => () => {
+      lifecycle.abort(new Error("Auto mode plugin disposed"));
       unregisterTool();
       disposePanel();
     });

package/packages/core/src/plugins/better-sidebar.ts

@@ -2,6 +2,9 @@ import type { Context } from "@deepseek-ai/cordis";
 import { Type } from "@earendil-works/pi-ai";
 import { defineTool, type AgentToolResult } from "@earendil-works/pi-coding-agent";
 import { listWorkspaceNodes, readWorkspaceGitStatus, type WorkspaceGitStatus, type WorkspaceNodeReport } from "./workspace-navigator.js";
+import { EmptyConfig } from "../config.js";
+
+const maxChangedFiles = 12;
 
 export interface SidebarOverviewInput {
   readonly cwd: string;
@@ -25,7 +28,13 @@ export function summarizeSidebar(input: SidebarOverviewInput): SidebarOverview {
   const summary = !input.gitAvailable
     ? `非 Git 工作区 · ${changedCount > 0 ? `${changedCount} 个变更` : "无变更"}`
     : `${input.branch ?? "detached HEAD"} · ${changedCount > 0 ? `${changedCount} 个变更` : "clean"}`;
-  return { ...input, changedFiles: input.changedFiles.slice(0, 12), changedCount, summary };
+  return {
+    ...input,
+    changedFiles: input.changedFiles.slice(0, maxChangedFiles),
+    changedCount,
+    truncated: input.truncated || changedCount > maxChangedFiles,
+    summary,
+  };
 }
 
 export function createSidebarInspector(input: {
@@ -83,6 +92,7 @@ function textSummary(report: SidebarOverview): string {
 export default {
   name: "pi-better-sidebar",
   inject: ["piHarnessLaunch", "piSession", "piPluginUi", "piTools"],
+  Config: EmptyConfig,
   apply(context: Context) {
     const inspect = createSidebarInspector({
       cwd: context.piHarnessLaunch.cwd,
@@ -94,10 +104,11 @@ export default {
         label: "Sidebar overview",
         description: "Read a compact workspace and Git overview for the current session without modifying files.",
         promptSnippet: "inspect the workspace overview shown in the sidebar",
-        parameters: Type.Object({}),
+        parameters: Type.Object({}, { additionalProperties: false }),
+        executionMode: "sequential",
         async execute(): Promise<AgentToolResult<SidebarOverview>> {
           const report = await inspect();
-          return { content: [{ type: "text", text: textSummary(report) }], details: report };
+          return { content: [{ type: "text", text: textSummary(report) }], details: structuredClone(report) };
         },
       }),
     );
@@ -107,7 +118,7 @@ export default {
       title: "Better Sidebar",
       description: "在会话旁显示当前工作区、Git 变更和文件概览。",
       icon: "▤",
-      read: inspect,
+      read: async () => structuredClone(await inspect()),
     });
     context.effect(() => () => {
       unregisterTool();