@fitchmultz/pi-subagents 0.45.0 → 0.46.1

package/src/pi-intercom/bridge.ts

@@ -8,8 +8,9 @@ import { getBrokerSocketPath } from "./broker/paths.ts";
 import { loadConfig, sameListener, type Config, type Identity } from "./bridge-config.ts";
 import { ASK_TIMEOUT, Fault, fingerprint, log } from "./bridge-protocol.ts";
 import { Session } from "./bridge-session.ts";
-import { operationFor, routeFor } from "./bridge-routes.ts";
+import { operationFor, routeFor, type Operation } from "./bridge-routes.ts";
 import { reply } from "./bridge-http.ts";
+import { Launcher, sameIdentity } from "./bridge-launch.ts";
 
 const MAX_CONNECTIONS = 128;
 
@@ -24,6 +25,7 @@ class Bridge {
   private readonly configPath: string;
   private readonly sessions = new Map<string, Session>();
   private readonly losses = new Map<string, number>();
+  private readonly launcher = new Launcher();
   private readonly sockets = new Set<Socket>();
   private readonly connections = new Map<TLSSocket, Connection>();
   private readonly server: Server;
@@ -88,7 +90,7 @@ class Bridge {
   }
   private allowed(identity: Identity): boolean {
     const current = this.config.clients.get(identity.fingerprint256);
-    return !this.stopping && current?.name === identity.name && current.cwd === identity.cwd;
+    return !this.stopping && sameIdentity(identity, current);
   }
   private lost(fp: string, count = 1): void {
     if (count > 0 && this.config.clients.has(fp)) {
@@ -181,8 +183,9 @@ class Bridge {
       });
     });
     process.on("SIGHUP", () => this.reload());
-    process.once("SIGINT", () => this.stop());
-    process.once("SIGTERM", () => this.stop());
+    // Retain listeners during dispatch: selected SDK dependencies use signal-exit's listener check.
+    process.on("SIGINT", () => this.stop());
+    process.on("SIGTERM", () => this.stop());
   }
   private reload(): void {
     if (this.stopping) {
@@ -195,9 +198,13 @@ class Bridge {
       }
       this.config = next;
       this.revokeRemoved();
+      this.launcher.revoke(next.clients).catch(() => log("launch_cleanup", { result: "failed" }));
       log("allowlist_reloaded", { result: "accepted", clients: next.clients.size });
     } catch {
       this.config = { ...this.config, clients: new Map() };
+      this.launcher
+        .revoke(this.config.clients)
+        .catch(() => log("launch_cleanup", { result: "failed" }));
       for (const session of this.sessions.values()) {
         session.close(
           new Fault(
@@ -253,7 +260,11 @@ class Bridge {
     for (const socket of this.sockets) {
       socket.destroy();
     }
-    await Promise.all([...this.handlers, ...sessions.map((session) => session.settled())]);
+    await Promise.all([
+      ...this.handlers,
+      ...sessions.map((session) => session.settled()),
+      this.launcher.shutdown(),
+    ]);
     log("shutdown", { result: "closed" });
   }
   private admission(req: IncomingMessage): {
@@ -317,14 +328,16 @@ class Bridge {
       const signal = controller.signal;
       req.once("aborted", abort);
       res.once("close", onClose);
-      setDeadline(route === "POST /v1/ask" ? ASK_TIMEOUT + 15000 : 15000);
+      const duration = route === "POST /v1/ask" ? ASK_TIMEOUT + 15000 : 15000;
+      setDeadline(route === "POST /v1/start" ? 75000 : duration);
       const operation = await operationFor(req, route, signal);
       if (operation.route === "POST /v1/ask") {
         setDeadline(operation.timeoutMs + 15000);
       }
-      const data = await session.execute(operation, {
+      const data = await this.execute(operation, session, {
         signal,
         requestId,
+        expires,
         onPeer: (id) => {
           peer = id;
         },
@@ -351,6 +364,38 @@ class Bridge {
       }
     }
   }
+  private async execute(
+    operation: Operation,
+    session: Readonly<Session>,
+    context: {
+      readonly signal: AbortSignal;
+      readonly requestId: string;
+      readonly expires: number;
+      readonly onPeer: (id: string) => void;
+    },
+  ) {
+    switch (operation.route) {
+      case "POST /v1/start":
+        return this.launcher.start(operation.name, {
+          identity: session.identity,
+          expires: context.expires,
+          signal: context.signal,
+          peers: (signal) => session.connectedPeers(signal),
+        });
+      case "GET /v1/sessions":
+        return this.launcher.list(session.identity);
+      case "POST /v1/stop":
+        return this.launcher.stop(session.identity, operation.sessionId);
+      case "GET /v1/list":
+      case "GET /v1/inbox":
+      case "POST /v1/register":
+      case "POST /v1/ask":
+      case "POST /v1/send":
+      case "POST /v1/reply":
+      case "POST /v1/ack":
+        return session.execute(operation, context);
+    }
+  }
 }
 
 function main(): void {
@@ -371,7 +416,7 @@ function main(): void {
     new Bridge(loadConfig(path), path).start();
   } catch {
     process.stderr.write(
-      "Bridge startup failed: check config schema, file ownership/mode 0600, absolute TLS/cwd paths, and TLS credentials.\n",
+      "Bridge startup failed: check config schema, file ownership/mode 0600, absolute TLS/cwd paths, TLS credentials, and launch policy (0700 sessionDir, Pi packageRoot, extension paths).\n",
     );
     process.exitCode = 1;
   }

package/src/runs/background/runner-step-output.ts

@@ -110,9 +110,7 @@ export function publishStepOutput(
     originalPath.length > 0 &&
     step.outputMode !== "file-only" &&
     step.outputPathFromAgentDefault === true;
-  const cleanup = shouldConsume
-    ? cleanupSingleOutputFile(originalPath, output, undefined)
-    : undefined;
+  const cleanup = shouldConsume ? cleanupSingleOutputFile(originalPath, output) : undefined;
   const savedPath = relocateOutput(ctx, originalPath, cleanup);
   const reference = outputReference(savedPath, state.resolvedOutput.fullOutput, cleanup);
   const displayOutput = finalizeSingleOutput({

package/src/runs/shared/acceptance-finalization.ts

@@ -402,7 +402,7 @@ export function formatAcceptanceFinalizationPrompt(input: {
   return lines.join("\n");
 }
 
-export function createFinalizationTurn(input: {
+function createFinalizationTurn(input: {
   readonly turn: number;
   readonly prompt: string;
   readonly rawOutput: string;
@@ -447,7 +447,7 @@ export function createFinalizationProcessFailureTurn(input: {
   };
 }
 
-export function attachFinalizationToLedger(input: {
+function attachFinalizationToLedger(input: {
   readonly initialLedger: AcceptanceLedger;
   readonly authoritativeLedger: AcceptanceLedger;
   readonly turns: readonly AcceptanceFinalizationTurn[];

package/src/runs/shared/acceptance.ts

@@ -18,10 +18,8 @@ export {
   evaluateAcceptanceReport,
 } from "./acceptance-evaluation.ts";
 export {
-  attachFinalizationToLedger,
   buildFinalizationProcessFailureLedger,
   createFinalizationProcessFailureTurn,
-  createFinalizationTurn,
   createFinalizationReportRuntime,
   type FinalizationReportSubmission,
   readFinalizationReport,

package/src/runs/shared/model-fallback.ts

@@ -154,6 +154,9 @@ const SAME_MODEL_RECOVERY_PATTERNS = [
   /socket/i,
   /connection/i,
   /fetch failed/i,
+  // Node fetch reports a response body cut off mid-stream as bare "terminated"; Pi retries it too.
+  // Match the whole message: process failures embed stderr and paths that can contain the word.
+  /^\s*terminated\s*$/i,
   /network/i,
   /http idle/i,
   /timed? out/i,

package/src/runs/shared/parallel-utils.ts

@@ -44,8 +44,6 @@ export function flattenSteps(
   return flat;
 }
 
-export { mapConcurrent } from "../../shared/concurrency.ts";
-
 export interface ParallelTaskResult {
   agent: string;
   taskIndex?: number;
@@ -54,8 +52,6 @@ export interface ParallelTaskResult {
   error?: string;
   model?: string;
   attemptedModels?: string[];
-  outputTargetPath?: string;
-  outputTargetExists?: boolean;
 }
 
 function parallelResultStatus(
@@ -63,30 +59,10 @@ function parallelResultStatus(
   hasOutput: boolean,
 ): string {
   const error = result.error ?? "";
-  const suffix = error.length > 0 ? `: ${error}` : "";
-  if (result.exitCode === -1) {
-    return `SKIPPED${suffix}`;
-  }
-  if (result.exitCode !== 0 && result.exitCode !== null) {
-    return `FAILED (exit code ${result.exitCode})${suffix}`;
-  }
   if (error.length > 0) {
     return `WARNING: ${error}`;
   }
-  return emptyOutputStatus(result, hasOutput);
-}
-
-function emptyOutputStatus(result: ReadonlyInput<ParallelTaskResult>, hasOutput: boolean): string {
-  if (hasOutput) {
-    return "";
-  }
-  const target = result.outputTargetPath ?? "";
-  if (target.length === 0) {
-    return "EMPTY OUTPUT (no textual response returned)";
-  }
-  return result.outputTargetExists === false
-    ? `EMPTY OUTPUT (expected output file missing: ${target})`
-    : "";
+  return hasOutput ? "" : "EMPTY OUTPUT (no textual response returned)";
 }
 
 export function aggregateParallelOutputs(

package/src/runs/shared/single-output.ts

@@ -325,7 +325,6 @@ function unchangedOutputIdentity(fd: number, outputPath: string, stat: fs.Stats)
 export function cleanupSingleOutputFile(
   outputPath: string | undefined,
   fullOutput: string,
-  beforeRun: SingleOutputSnapshot | undefined,
 ): SingleOutputCleanupResult | undefined {
   if (!nonempty(outputPath)) {
     return undefined;
@@ -345,9 +344,6 @@ export function cleanupSingleOutputFile(
     if (!equal) {
       return { path: absolutePath, action: "skipped", reason: "file changed after capture" };
     }
-    if (matchesSnapshot(stat, beforeRun)) {
-      return { path: absolutePath, action: "skipped", reason: "file preexisted and was unchanged" };
-    }
     fs.unlinkSync(outputPath);
     return { path: absolutePath, action: "deleted" };
   } catch (error) {

package/src/runs/shared/subagent-prompt-runtime.ts

@@ -24,7 +24,7 @@ const STRUCTURED_OUTPUT_INSTRUCTIONS = [
   "Do not rely on prose-only completion; if you do not call `structured_output`, the parent will fail this step.",
 ].join("\n");
 
-export const CHILD_SUBAGENT_BOUNDARY_INSTRUCTIONS = [
+const CHILD_SUBAGENT_BOUNDARY_INSTRUCTIONS = [
   "You are a child subagent, not the parent orchestrator.",
   "The parent session owns delegation, orchestration, review fanout, and follow-up worker launches.",
   "Ignore prior parent-only orchestration instructions in inherited conversation history.",
@@ -32,7 +32,7 @@ export const CHILD_SUBAGENT_BOUNDARY_INSTRUCTIONS = [
   "If you need to edit files, call the actual edit/write tools. Do not print tool-call syntax, patches, or pseudo-tool calls as text.",
 ].join("\n");
 
-export const CHILD_FANOUT_BOUNDARY_INSTRUCTIONS = [
+const CHILD_FANOUT_BOUNDARY_INSTRUCTIONS = [
   "You are a child subagent with delegation enabled for your assigned task.",
   "You may delegate useful helper work within that task when it saves time or improves quality, using the available delegation tools.",
   "You remain responsible for your assigned result. The original parent owns integration, review synthesis, and final delivery.",

package/src/runs/shared/workflow-policy.ts

@@ -1,4 +1,5 @@
 import { errorMessage } from "../../shared/unknown.ts";
+import { mapConcurrent } from "../../shared/concurrency.ts";
 import type { DynamicParallelStep } from "../../shared/types/workflow.ts";
 import type {
   AcceptanceLedger,
@@ -17,7 +18,6 @@ import {
 import {
   aggregateParallelOutputs,
   FAIL_FAST_REASON,
-  mapConcurrent,
   type ParallelTaskResult,
 } from "./parallel-utils.ts";
 

package/src/shared/native-session-loader.ts

@@ -0,0 +1,13 @@
+import * as path from "node:path";
+import { pathToFileURL } from "node:url";
+import type * as NativeSession from "@earendil-works/pi-coding-agent";
+
+export async function loadNativeSession(packageRoot: string): Promise<typeof NativeSession> {
+  // The trusted selected Pi package supplies this exact SDK declaration contract.
+  // A computed URL is required: Jiti rewrites literal SDK imports to its own host graph.
+  // oxlint-disable-next-line typescript/no-unsafe-assignment
+  const sessionModule: typeof NativeSession = await import(
+    pathToFileURL(path.join(packageRoot, "dist/index.js")).href
+  );
+  return sessionModule;
+}

package/src/shared/native-session.ts

@@ -1,13 +1,6 @@
-import * as path from "node:path";
-import { pathToFileURL } from "node:url";
-import type * as NativeSession from "@earendil-works/pi-coding-agent";
 import { requirePiPackageRoot } from "../runs/shared/pi-spawn.ts";
+import { loadNativeSession } from "./native-session-loader.ts";
 
 // Detached Node runners do not get Pi's extension-loader package aliases.
-const selectedSessionURL = pathToFileURL(path.join(requirePiPackageRoot(), "dist/index.js")).href;
-// The trusted selected Pi package supplies this exact SDK declaration contract.
-// A computed URL is required: Jiti rewrites literal SDK imports to its own host graph.
-// oxlint-disable-next-line typescript/no-unsafe-assignment
-const sessionModule: typeof NativeSession = await import(selectedSessionURL);
 export const { buildSessionContext, parseSessionEntries, migrateSessionEntries, SessionManager } =
-  sessionModule;
+  await loadNativeSession(requirePiPackageRoot());

package/src/shared/settings.ts

@@ -126,7 +126,7 @@ export function resolveStepBehavior(
 function resolveChainPath(filePath: string, chainDir: string): string {
   return path.isAbsolute(filePath) ? filePath : path.join(chainDir, filePath);
 }
-/** Prepend read/output paths so task prose cannot accidentally override the chosen destination. */
+/** Compose read paths and progress instructions for a chain child. */
 export function buildChainInstructions(
   behavior: ResolvedStepBehavior,
   chainDir: string,
@@ -139,9 +139,6 @@ export function buildChainInstructions(
       `[Read from: ${behavior.reads.map((file) => resolveChainPath(file, chainDir)).join(", ")}]`,
     );
   }
-  if (behavior.output !== false && behavior.output.length > 0) {
-    prefixParts.push(`[Write to: ${resolveChainPath(behavior.output, chainDir)}]`);
-  }
   if (behavior.progress) {
     const progressPath = path.join(chainDir, "progress.md");
     suffixParts.push(