@bermudi/pi-delegate 0.1.11 → 0.1.13

package/format.ts

@@ -2,6 +2,7 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { renderOutputForLLM } from "./spill.ts";
+import { getOutputSpillThreshold, getOutputSpillTail } from "./config.ts";
 import type {
   ResolvedTask,
   TaskProgress,
@@ -355,7 +356,13 @@ function isResumableSessionFile(sessionFile: string): boolean {
  * notice instead of a retry hint — so the parent model is told to re-dispatch
  * fresh rather than left to fabricate a path or chase a dead resume.
  */
-export function formatFailedTask(r: TaskResult, cwd?: string): string[] {
+export function formatFailedTask(
+  r: TaskResult,
+  cwd?: string,
+  /** Dispatch-scoped snapshot for output-spill bounds; falls back to live
+   *  config when unset (direct callers, legacy tests). */
+  config?: import("./config.ts").DelegateConfig,
+): string[] {
   const parts: string[] = [];
   const isAbort = r.error === "Aborted";
   // Empty string is falsy but not nullish — `||` covers both undefined and "".
@@ -366,8 +373,16 @@ export function formatFailedTask(r: TaskResult, cwd?: string): string[] {
   parts.push(`[${isAbort ? "ABORTED" : "FAILED"}: ${failParts.join(" · ")}]`);
 
   // Surface partial assistant output even when the task did not complete.
+  // Pass the dispatch-scoped spill bounds so a mid-task config change cannot
+  // widen (or narrow) the partial output the parent sees — the bounds captured
+  // when the task started are the ones the caller committed to.
   if (r.output && r.output !== "(no output)") {
-    parts.push(renderOutputForLLM(r.output, r.agent));
+    parts.push(
+      renderOutputForLLM(r.output, r.agent, {
+        thresholdChars: getOutputSpillThreshold(config),
+        tailChars: getOutputSpillTail(config),
+      }),
+    );
   }
 
   if (r.sessionFile && isResumableSessionFile(r.sessionFile)) {
@@ -414,6 +429,8 @@ export function formatFailedTask(r: TaskResult, cwd?: string): string[] {
 export function formatCompletedTask(
   task: ResolvedTask,
   result: TaskResult,
+  /** Dispatch-scoped snapshot for output-spill bounds. */
+  config?: import("./config.ts").DelegateConfig,
 ): string[] {
   const parts: string[] = [];
   // `|| task.sessionAction` covers action-only tasks (close/list/...) where prompt is
@@ -425,7 +442,7 @@ export function formatCompletedTask(
     for (const w of task.warnings) parts.push(`[WARNING: ${w}]`);
   }
   if (result.error) {
-    parts.push(...formatFailedTask(result, task.cwd));
+    parts.push(...formatFailedTask(result, task.cwd, config));
   } else {
     const meta = [
       `OK | ${fmtDuration(result.durationMs)} | ${fmtTokens(result.tokens)} tokens`,
@@ -434,8 +451,37 @@ export function formatCompletedTask(
     const touched = relativeTouchedSummary(result.touchedFiles, task.cwd);
     if (touched) meta.push(`touched (best-effort): ${touched}`);
     parts.push(
-      `[${meta.join(" · ")}]\n\n${renderOutputForLLM(result.output, result.agent)}`,
+      `[${meta.join(" · ")}]\n\n${renderOutputForLLM(
+        result.output,
+        result.agent,
+        {
+          thresholdChars: getOutputSpillThreshold(config),
+          tailChars: getOutputSpillTail(config),
+        },
+      )}`,
+    );
+  }
+  if (result.integration) {
+    const integration = result.integration;
+    parts.push(
+      `[INTEGRATION: ${integration.status} · proposed ${integration.proposedFiles.length} file(s) · applied ${integration.appliedFiles.length} file(s)]`,
     );
+    if (integration.baselineRef)
+      parts.push(`baseline ref: ${integration.baselineRef}`);
+    if (integration.proposalRef)
+      parts.push(`proposal ref: ${integration.proposalRef}`);
+    if (integration.patchPath)
+      parts.push(`full patch: ${integration.patchPath}`);
+    if (integration.worktreePath)
+      parts.push(`conflict worktree: ${integration.worktreePath}`);
+    for (const conflict of integration.conflicts ?? []) {
+      parts.push(`conflict: ${conflict.path}: ${conflict.reason}`);
+    }
+    if (integration.status === "applied_unverified") {
+      parts.push(
+        'Changes were applied but not verified. Suggested next call: delegate({ tasks: [{ agent: "reviewer", workspace: "scratch", prompt: "Review the applied isolated changes and run the relevant tests." }] })',
+      );
+    }
   }
   return parts;
 }

package/host.ts

@@ -89,6 +89,8 @@ export interface HostDepsOptions {
    * tasks (no named agent) pass undefined to use the discovered prompt.
    */
   systemPrompt?: string;
+  /** Dispatch-scoped delegate.json snapshot for the provider-extension allowlist. */
+  delegateConfig?: import("./config.ts").DelegateConfig;
 }
 
 const hostDepsCache = new GenerationCache<HostDeps>();
@@ -163,6 +165,7 @@ export async function getHostDeps(options: HostDepsOptions): Promise<HostDeps> {
       options.modelProvider,
       options.cwd,
       agentDir,
+      options.delegateConfig,
     );
 
   // Provider configs may contain functions (custom stream/OAuth handlers), so a
@@ -199,7 +202,9 @@ export async function getHostDeps(options: HostDepsOptions): Promise<HostDeps> {
  * allowlist, since editing it changes what a subsequent build would inject.
  */
 function hostDepsCacheKey(options: HostDepsOptions, agentDir: string): string {
-  const providerExtensions = getSubagentProviderExtensionMap();
+  const providerExtensions = getSubagentProviderExtensionMap(
+    options.delegateConfig,
+  );
   return JSON.stringify({
     agentDir,
     cwd: options.cwd,