pi-better-harness 0.35.0 → 0.35.1

package/node_modules/pi-better-subagents/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-subagents",
-  "version": "0.23.0",
+  "version": "0.23.1",
   "description": "Pi extension for detached, sandboxed subagent runs that keep the foreground session free.",
   "license": "MIT",
   "type": "module",

package/node_modules/pi-better-subagents/task-guard.ts

@@ -7,6 +7,8 @@ import { SANDBOX_POLICY_CHANNEL, SANDBOX_POLICY_REQUEST_CHANNEL } from "./permis
 import { failureDispositionTool, intentBashDefinition } from "./child-incidents.ts";
 import { DISPOSITION_TOOL } from "./incident-model.ts";
 import { SandboxDiagnostics, diagnosticPackageVersion } from "./shared-sandbox-diagnostics.ts";
+import { fileURLToPath } from "node:url";
+import { claimTaskToolOwner } from "./task-tool-owner.ts";
 
 const TRUSTED_INLINE_SOURCE = "<inline:task-sandbox>";
 
@@ -31,7 +33,7 @@ export function trustedToolRefusal(policy: TaskPolicy, name: string, sourcePath:
     return undefined;
 }
 
-export default function taskGuard(pi: ExtensionAPI, input: unknown, fatal: (error: unknown) => never): void {
+export default function taskGuard(pi: ExtensionAPI, input: unknown, fatal: (error: unknown) => never, ownedTools = false): void {
     const policy = parseTaskPolicy(input);
     const support = describeSandboxSupport();
     if (!support.supported) throw new Error(`Task sandbox unavailable: ${support.reason}`);
@@ -54,9 +56,10 @@ export default function taskGuard(pi: ExtensionAPI, input: unknown, fatal: (erro
             diagnosticsWarned = true;
         },
     });
-    const boundary = installTaskTools(pi, { controller, cwd: process.cwd(), shellPath: () => shellPath,
+    const toolApi = ownedTools ? { ...pi, registerTool: claimTaskToolOwner(pi) } : pi;
+    const installBoundary = () => installTaskTools(toolApi, { controller, cwd: process.cwd(), shellPath: () => shellPath,
         diagnostics,
-        trustedSources: [TRUSTED_INLINE_SOURCE],
+        trustedSources: [ownedTools ? fileURLToPath(new URL("./task-tool-owner.ts", import.meta.url)) : TRUSTED_INLINE_SOURCE],
         // Structured command intent (#315): validated before the confined command runs.
         bashDefinition: (cwd, operations) => intentBashDefinition(cwd, operations) as any,
         applyPatch: policy.applyPatch,
@@ -66,6 +69,9 @@ export default function taskGuard(pi: ExtensionAPI, input: unknown, fatal: (erro
         admitExtensionTool: (name, _input, sourcePath) => (name === DISPOSITION_TOOL && sourcePath === TRUSTED_INLINE_SOURCE) ||
             trustedToolRefusal(policy, name, sourcePath) === undefined,
     });
+    // Defer owned registrations until after SDK duplicate-name diagnostics.
+    // The final session_start handler still installs and verifies them before activation.
+    let boundary = ownedTools ? undefined : installBoundary();
     pi.registerTool(failureDispositionTool(() => currentCwd) as any);
     const profile = Object.freeze({ enabled: true, ...policy.permissions });
     const status = Object.freeze({
@@ -80,6 +86,7 @@ export default function taskGuard(pi: ExtensionAPI, input: unknown, fatal: (erro
         try {
             shellPath = SettingsManager.create(ctx.cwd, policy.agentDir, { projectTrusted: false }).getShellPath();
             currentCwd = ctx.cwd;
+            boundary ??= installBoundary();
             boundary.register(ctx.cwd);
             const builtins: readonly string[] = policy.applyPatch ? [...TASK_BUILTINS, ...GUARDED_TASK_TOOLS] : TASK_BUILTINS;
             const known = new Set<string>(builtins);

package/node_modules/pi-better-subagents/task-runtime.mjs

@@ -29,9 +29,12 @@ try {
   const guard = await load.import(fileURLToPath(new URL("./task-guard.ts", import.meta.url)), { default: true });
   if (typeof guard !== "function") throw new Error("Task guard has no extension factory.");
   const { main } = await import(pathToFileURL(join(dirname(sdkEntry), "main.js")).href);
-  await main(args, {
+  // SDK tool names belong to the first extension registering them. Reserve a
+  // source before provider/trusted packages, but keep activation in the final guard.
+  const ownerPath = fileURLToPath(new URL("./task-tool-owner.ts", import.meta.url));
+  await main(["--extension", ownerPath, ...args], {
     extensionFactories: [{ name: "task-sandbox", factory: async (pi) => {
-      try { await guard(pi, policy, fail); } catch (error) { fail(error); }
+      try { await guard(pi, policy, fail, true); } catch (error) { fail(error); }
     } }],
   });
 } catch (error) {

package/node_modules/pi-better-subagents/task-tool-owner.ts

@@ -0,0 +1,21 @@
+/** Loaded before third-party extensions so guarded tools win SDK name resolution. */
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+
+const CLAIM_CHANNEL = "pi-better-subagents:claim-task-tool-owner";
+type RegisterTool = ExtensionAPI["registerTool"];
+
+export default function taskToolOwner(pi: ExtensionAPI): void {
+    const unsubscribe = pi.events.on(CLAIM_CHANNEL, (claim) => {
+        if (typeof claim !== "function") return;
+        unsubscribe();
+        claim(pi.registerTool.bind(pi));
+    });
+}
+
+/** Hand registration to the final guard without changing the SDK's source attribution. */
+export function claimTaskToolOwner(pi: ExtensionAPI): RegisterTool {
+    let register: RegisterTool | undefined;
+    pi.events.emit(CLAIM_CHANNEL, (owner: RegisterTool) => { register = owner; });
+    if (!register) throw new Error("Task tool owner was not installed before extension loading.");
+    return register;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-harness",
-  "version": "0.35.0",
+  "version": "0.35.1",
   "description": "Pi extension bundle for a write sandbox, subagents, background tasks, SSH, goals, and Outcome & Todo.",
   "license": "MIT",
   "type": "module",
@@ -58,7 +58,7 @@
     "pi-better-goal": "0.10.3",
     "pi-better-sandbox": "0.14.0",
     "pi-better-ssh": "0.1.3",
-    "pi-better-subagents": "0.23.0",
+    "pi-better-subagents": "0.23.1",
     "proper-lockfile": "^4.1.2",
     "shell-quote": "1.12.0",
     "smol-toml": "1.9.0",