pi-quiet 0.1.2 → 0.2.0

package/README.md

@@ -19,16 +19,13 @@ rendering returns in full — complete commands, full output, truncation
 warnings. Press it again to re-collapse. It's a live toggle over the whole
 transcript: work collapsed, expand when something looks off.
 
-## Display-only, by construction
+## What it owns, by construction
 
-The extension re-registers the built-in `bash` tool via pi's own
-`createBashToolDefinition` and overrides only the two render slots. Execution
-*is* the built-in tool:
+The extension re-registers the built-in `bash` tool via pi's own `createBashToolDefinition`. It is the one package on a rig that registers `bash`, and it owns three things about it:
 
-- the model receives the full, untruncated-by-us output;
-- permission systems, reviewers, and sandboxes that hook execution are
-  unaffected;
-- session logs store the full result.
+- **Rendering.** The two render slots above. Execution *is* the built-in tool: the model receives the full output, permission systems, reviewers, and sandboxes that hook execution are unaffected, and session logs store the full result.
+- **pi's shell settings.** The built-in is constructed with `shellCommandPrefix` and `shellPath` — read with the same settings pi itself would use, including pi's own project-trust decision for the current directory (`session_start` is where that decision becomes available, so that is where the tool is registered). A trusted project's `.pi/settings.json` contributes its `shellCommandPrefix` and `shellPath`; an untrusted project's are ignored, exactly as pi ignores them. Re-registration on each `session_start` means a `/reload` after editing settings picks up the new prefix.
+- **Session identity.** Every command's environment carries `AGENT_SESSION_ID`, set from pi's per-command `PI_SESSION_ID`. Tools that scope themselves to the session that ran them (muster, galley, tackle) read that neutral name. It is set per command from pi's live session, never from the extension's process environment, so an in-process subagent can never leave the parent's commands carrying a child's id.
 
 ## Install
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pi-quiet",
-  "version": "0.1.2",
-  "description": "Calm tool rendering for the pi coding agent: each bash call collapses to one line; ctrl+o brings back full built-in rendering. Display-only — execution, permissions, and model context are untouched.",
+  "version": "0.2.0",
+  "description": "This rig's bash tool for the pi coding agent: calm one-line rendering (ctrl+o expands), pi's shell settings honoured, AGENT_SESSION_ID stamped per command from PI_SESSION_ID. Execution is still pi's built-in.",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -15,10 +15,12 @@
     "pi-coding-agent",
     "tui",
     "tool-output",
-    "quiet"
+    "quiet",
+    "session-identity"
   ],
   "files": [
     "src",
+    "!src/*.test.ts",
     "README.md"
   ],
   "pi": {
@@ -27,11 +29,13 @@
     ]
   },
   "scripts": {
-    "typecheck": "tsc --noEmit -p tsconfig.json"
+    "typecheck": "tsc --noEmit -p tsconfig.json",
+    "test": "node --experimental-strip-types --test src/*.test.ts"
   },
   "devDependencies": {
     "@earendil-works/pi-coding-agent": "^0.84.3",
     "@earendil-works/pi-tui": "^0.84.3",
+    "@types/node": "^22.20.1",
     "typescript": "^5.6.0"
   }
 }

package/src/bash-options.ts

@@ -0,0 +1,39 @@
+import type { BashSpawnContext, BashToolOptions } from "@earendil-works/pi-coding-agent";
+
+export const SESSION_ID_VAR = "AGENT_SESSION_ID";
+
+// The two pi settings the built-in bash tool is constructed with. pi's own
+// SettingsManager satisfies this; tests pass a literal.
+export type ShellSettings = {
+  getShellCommandPrefix(): string | undefined;
+  getShellPath(): string | undefined;
+};
+
+// Stamps the harness-neutral session id on every command from pi's own
+// per-command PI_SESSION_ID, which pi injects into `context.env` before the
+// hook runs. Per command, from pi's live session manager, never from
+// process.env: an in-process child session (pi-subagents) can write
+// process.env, but it cannot change what pi puts here for THIS command.
+// When pi did not expose a session (exposeSessionEnvironment: false), an
+// inherited value is removed rather than passed through — a command never
+// carries an identity that is not its session's.
+export function identitySpawnHook(context: BashSpawnContext): BashSpawnContext {
+  const env: NodeJS.ProcessEnv = { ...context.env };
+  const id = env.PI_SESSION_ID;
+  if (id === undefined || id === "") delete env[SESSION_ID_VAR];
+  else env[SESSION_ID_VAR] = id;
+  return { ...context, env };
+}
+
+// Options for createBashToolDefinition that match what pi itself passes to
+// the built-in (settings.shellCommandPrefix and settings.shellPath) plus the
+// identity hook. Unset settings are omitted so pi's defaults apply.
+export function buildBashOptions(settings: ShellSettings): BashToolOptions {
+  const commandPrefix = settings.getShellCommandPrefix();
+  const shellPath = settings.getShellPath();
+  return {
+    ...(commandPrefix !== undefined ? { commandPrefix } : {}),
+    ...(shellPath !== undefined ? { shellPath } : {}),
+    spawnHook: identitySpawnHook,
+  };
+}

package/src/index.ts

@@ -1,23 +1,36 @@
 /**
- * quiet-tools: collapse bash tool chatter to one line per call.
+ * pi-quiet: this rig's bash tool registration.
  *
- * Re-registers the built-in bash tool (execution untouched — it IS the
- * built-in, via createBashToolDefinition) and overrides only the two render
- * slots. Collapsed (the default): the call renders as a single truncated
- * `$ command` line and the result as a single muted summary line. Expanded
- * (ctrl+o / app.tools.expand): both slots defer to the built-in renderer,
- * so the full command, streamed output, truncation warnings, and duration
- * come back exactly as stock pi shows them.
+ * Re-registers the built-in bash tool via pi's own createBashToolDefinition
+ * and owns three things about it:
  *
- * Display-only by design: permission gating, auto-review, and the sandbox
- * all hook execution, which this file never touches.
+ *  1. Rendering. Collapsed (the default): the call renders as a single
+ *     truncated `$ command` line and the result as a single muted summary
+ *     line. Expanded (ctrl+o / app.tools.expand): both slots defer to the
+ *     built-in renderer, so the full command, streamed output, truncation
+ *     warnings, and duration come back exactly as stock pi shows them.
+ *  2. pi's shell settings. The built-in is constructed with
+ *     settings.shellCommandPrefix and settings.shellPath, as pi itself does;
+ *     a re-registration that passed nothing silently dropped both. The
+ *     settings are read with pi's own project-trust decision, so a trusted
+ *     project's .pi/settings.json contributes its shellCommandPrefix and
+ *     shellPath and an untrusted one's are ignored — exactly as pi ignores
+ *     them.
+ *  3. Session identity. A spawn hook copies pi's per-command PI_SESSION_ID
+ *     into AGENT_SESSION_ID, the harness-neutral name tools read — see
+ *     bash-options.ts for why that must be per command and never process.env.
+ *
+ * Execution is still the built-in: permission gating, auto-review, and the
+ * sandbox all hook execution, which this file never replaces.
  */
 
 import {
   createBashToolDefinition,
+  SettingsManager,
   type ExtensionAPI,
 } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
+import { buildBashOptions } from "./bash-options.ts";
 
 function firstLine(command: string): { line: string; more: number } {
   const lines = command.split("\n");
@@ -32,45 +45,60 @@ function resultText(result: { content?: { type: string; text?: string }[] }): st
 }
 
 export default function quietTools(pi: ExtensionAPI) {
-  const builtin = createBashToolDefinition(process.cwd());
+  // Registration happens at session_start, not at load: that is the first
+  // point where pi's own project-trust decision for this cwd is available on
+  // the context. Reading settings with that flag makes the tool identical to
+  // the one pi would have built — a trusted project's shellCommandPrefix and
+  // shellPath apply, an untrusted project's are ignored. session_start also
+  // fires for reload/new/resume/fork, and re-registering under the same name
+  // each time is the point: a `/reload` after editing settings picks up the
+  // new prefix.
+  pi.on("session_start", (_event, ctx) => {
+    const cwd = ctx.cwd ?? process.cwd();
+    // Fail closed on an older pi that does not expose the decision.
+    const projectTrusted =
+      typeof ctx.isProjectTrusted === "function" ? ctx.isProjectTrusted() : false;
+    const settings = SettingsManager.create(cwd, undefined, { projectTrusted });
+    const builtin = createBashToolDefinition(cwd, buildBashOptions(settings));
 
-  pi.registerTool({
-    ...builtin,
+    pi.registerTool({
+      ...builtin,
 
-    renderCall(args: any, theme: any, context: any) {
-      if (context.expanded && builtin.renderCall) {
-        return builtin.renderCall(args, theme, context);
-      }
-      const command = typeof args?.command === "string" ? args.command : "...";
-      const { line, more } = firstLine(command.trim());
-      const suffix = more > 0 ? theme.fg("muted", ` (+${more} lines)`) : "";
-      // Text handles width truncation; keep the line itself short anyway so
-      // narrow panes stay one visual row.
-      const shown = line.length > 200 ? `${line.slice(0, 200)}…` : line;
-      return new Text(
-        theme.fg("toolTitle", theme.bold(`$ ${shown}`)) + suffix,
-        0,
-        0,
-      );
-    },
+      renderCall(args: any, theme: any, context: any) {
+        if (context.expanded && builtin.renderCall) {
+          return builtin.renderCall(args, theme, context);
+        }
+        const command = typeof args?.command === "string" ? args.command : "...";
+        const { line, more } = firstLine(command.trim());
+        const suffix = more > 0 ? theme.fg("muted", ` (+${more} lines)`) : "";
+        // Text handles width truncation; keep the line itself short anyway so
+        // narrow panes stay one visual row.
+        const shown = line.length > 200 ? `${line.slice(0, 200)}…` : line;
+        return new Text(
+          theme.fg("toolTitle", theme.bold(`$ ${shown}`)) + suffix,
+          0,
+          0,
+        );
+      },
 
-    renderResult(result: any, options: any, theme: any, context: any) {
-      if (options.expanded && builtin.renderResult) {
-        return builtin.renderResult(result, options, theme, context);
-      }
-      if (options.isPartial) {
-        return new Text(theme.fg("muted", "  … running"), 0, 0);
-      }
-      const text = resultText(result).trim();
-      const lineCount = text ? text.split("\n").length : 0;
-      const status = result.isError ? theme.fg("error", "error") : "ok";
-      const tail = text ? text.split("\n").at(-1) ?? "" : "";
-      const tailShown = tail.length > 120 ? `${tail.slice(0, 120)}…` : tail;
-      const summary =
-        lineCount <= 1
-          ? `  → ${status}${tailShown ? theme.fg("toolOutput", ` · ${tailShown}`) : ""}`
-          : `  → ${status} · ${lineCount} lines${tailShown ? theme.fg("toolOutput", ` · … ${tailShown}`) : ""}`;
-      return new Text(theme.fg("muted", summary), 0, 0);
-    },
+      renderResult(result: any, options: any, theme: any, context: any) {
+        if (options.expanded && builtin.renderResult) {
+          return builtin.renderResult(result, options, theme, context);
+        }
+        if (options.isPartial) {
+          return new Text(theme.fg("muted", "  … running"), 0, 0);
+        }
+        const text = resultText(result).trim();
+        const lineCount = text ? text.split("\n").length : 0;
+        const status = result.isError ? theme.fg("error", "error") : "ok";
+        const tail = text ? text.split("\n").at(-1) ?? "" : "";
+        const tailShown = tail.length > 120 ? `${tail.slice(0, 120)}…` : tail;
+        const summary =
+          lineCount <= 1
+            ? `  → ${status}${tailShown ? theme.fg("toolOutput", ` · ${tailShown}`) : ""}`
+            : `  → ${status} · ${lineCount} lines${tailShown ? theme.fg("toolOutput", ` · … ${tailShown}`) : ""}`;
+        return new Text(theme.fg("muted", summary), 0, 0);
+      },
+    });
   });
 }