@d3ara1n/pi-subagent 3.0.0 → 3.2.0

package/src/spawn.ts

@@ -149,6 +149,7 @@ export function buildChildArgs(
     tools?: string[];
     excludeTools?: string[];
     systemPrompt?: string;
+    inheritConversation?: boolean;
   },
   tmpDir: string,
 ): string[] {
@@ -187,6 +188,17 @@ export function buildChildArgs(
   // does; this shapes HOW any subagent behaves when the task exceeds its
   // actual capabilities: report the gap and stop instead of improvising
   // workarounds until timeout.
+  const conversationPolicy = options.inheritConversation
+    ? [
+        "- You have an <inherited_conversation> block from the parent session.",
+        "  It is text-only background and may be compacted or truncated. If needed",
+        "  material is absent, report it as Missing — do not guess it.",
+      ]
+    : [
+        "- The task may reference material as 'discussed above' or 'the requirements'",
+        "  — you have NO prior conversation; only this prompt exists. If referenced",
+        "  material is not in this prompt, report it as Missing — do not guess it.",
+      ];
   args.push(
     "--append-system-prompt",
     [
@@ -194,11 +206,9 @@ export function buildChildArgs(
       "Before attempting the task, check it against your actual capabilities in this",
       "session — the tool list here is definitive.",
       "- If the task needs a capability you do not have (web access, bash, file",
-      "  writes, ...) or material that is not present locally or in the provided",
-      "  context/files, it is out of scope for you. Do NOT improvise workarounds.",
-      "- The task may reference material as 'discussed above' or 'the requirements'",
-      "  — you have NO prior conversation; only this prompt exists. If referenced",
-      "  material is not in this prompt, report it as Missing — do not guess it.",
+      "  writes, ...) or material that is absent from local files and the provided",
+      "  prompt channels, it is out of scope for you. Do NOT improvise workarounds.",
+      ...conversationPolicy,
       '- "Cannot complete" means a capability or material gap — not "difficult" or',
       '  "uncertain". If it is merely hard, keep working within your tools.',
       "- When you hit a genuine gap, stop early and return:",
@@ -218,14 +228,15 @@ export function buildChildArgs(
 
 /**
  * Compose the initial RPC prompt message: reference files as <file> blocks,
- * then context and task as structured tags — the same shape the child saw in
- * json mode (@file arguments wrapped by pi's processFileArguments, followed by
- * the inline message body).
+ * optional inherited conversation, then context and task as structured tags —
+ * the same shape the child saw in json mode (@file arguments wrapped by pi's
+ * processFileArguments, followed by the inline message body).
  *
  * @internal — exported for testing.
  */
 export async function composeInitialMessage(
   files: string[] | undefined,
+  inheritedConversation: string | undefined,
   context: string | undefined,
   task: string,
 ): Promise<string> {
@@ -241,6 +252,17 @@ export async function composeInitialMessage(
       parts.push(`<file name="${f}">\n${content}\n</file>`);
     }
   }
+  if (inheritedConversation !== undefined) {
+    parts.push(
+      [
+        "<inherited_conversation>",
+        "Text-only background from the parent conversation; it may be compacted or truncated. The separate task block remains authoritative.",
+        "",
+        inheritedConversation,
+        "</inherited_conversation>",
+      ].join("\n"),
+    );
+  }
   if (context?.trim()) parts.push(`<context>\n${context}\n</context>`);
   if (task.trim()) parts.push(`<task>\n${task}\n</task>`);
   return parts.join("\n\n");
@@ -268,6 +290,10 @@ export async function spawnSubagent(
     systemPrompt?: string;
     /** Extra context delivered as a separate channel from the task. */
     context?: string;
+    /** Enables the inherited-conversation policy variant. */
+    inheritConversation?: boolean;
+    /** Immutable serialized parent-conversation body injected independently from context/task. */
+    inheritedConversation?: string;
     /** Reference files injected as <file> blocks in the initial prompt (child reads them directly). */
     contextFiles?: string[];
     subagentRoles?: string[];
@@ -332,7 +358,12 @@ export async function spawnSubagent(
     // (processFileArguments). Content still never enters the parent model's
     // context; this process reads the bytes off disk and pipes them straight
     // to the child.
-    const initialMessage = await composeInitialMessage(options.contextFiles, options.context, task);
+    const initialMessage = await composeInitialMessage(
+      options.contextFiles,
+      options.inheritedConversation,
+      options.context,
+      task,
+    );
 
     // Spawn process
     const invocation = getPiInvocation(args);
@@ -384,7 +415,10 @@ export async function spawnSubagent(
     // Called after each assistant message_end (usage already accumulated).
     const checkBudget = () => {
       if (budgetExceeded || wasTimeout) return;
-      if ((maxTurns > 0 && result.usage.turns >= maxTurns) || (maxCost > 0 && result.usage.cost >= maxCost)) {
+      if (
+        (maxTurns > 0 && result.usage.turns >= maxTurns) ||
+        (maxCost > 0 && result.usage.cost >= maxCost)
+      ) {
         budgetExceeded = true;
         killProc("budget");
       }

package/src/types.ts

@@ -15,6 +15,8 @@ export interface SubagentConfig {
   /** Persist every spawned delegate run (finished/failed/aborted alike) to ~/.pi/subagent/history/{sessionId}/{toolCallId}.json for auditing. Pre-run failures that never spawned are not recorded. */
   history: SubagentHistoryConfig;
   summary: SubagentSummaryConfig;
+  /** Limits optional serialized parent-conversation inheritance. */
+  inheritance: SubagentInheritanceConfig;
   /**
    * Per-role overrides from settings.json. Keyed by role name.
    * - Override built-in roles: provide fields to merge.
@@ -32,6 +34,11 @@ export interface SubagentSummaryConfig {
   enabled: boolean;
 }
 
+export interface SubagentInheritanceConfig {
+  /** Maximum characters in the inherited-conversation body. */
+  maxChars: number;
+}
+
 export const DEFAULT_CONFIG: SubagentConfig = {
   maxConcurrency: 4,
   maxDepth: 3,
@@ -39,6 +46,7 @@ export const DEFAULT_CONFIG: SubagentConfig = {
   maxCost: 0,
   history: { enabled: true },
   summary: { role: "utility", enabled: true },
+  inheritance: { maxChars: 50_000 },
   agentOverrides: {},
 };
 
@@ -181,6 +189,12 @@ export interface SubagentResult {
   files?: string[];
   /** Extra context passed to delegate (params.context); used by the expanded view. */
   context?: string;
+  /** True when this run received a filtered parent-conversation snapshot. */
+  inheritConversation?: boolean;
+  /** Delivered inherited-conversation body size; safe metadata only, never the body itself. */
+  inheritedConversationChars?: number;
+  /** True when the inherited body was mechanically shortened to its configured limit. */
+  inheritedConversationTruncated?: boolean;
 }
 
 /** Snapshot of a failed first attempt that was retried on the fallback role. */
@@ -213,6 +227,9 @@ export interface BackgroundDelegateDetails {
   task: string;
   context?: string;
   files?: string[];
+  inheritConversation?: boolean;
+  inheritedConversationChars?: number;
+  inheritedConversationTruncated?: boolean;
 }
 
 /** One watched run inside a wait/check view. */

package/src/utils.test.ts

@@ -21,6 +21,7 @@ import {
   previewArgs,
   truncateOutput,
   formatTokens,
+  formatInheritedConversationInput,
   formatUsageStats,
   effectiveTimeout,
   elapsedSeconds,
@@ -325,6 +326,18 @@ describe("truncateOutput", () => {
   });
 });
 
+// ── inherited-conversation input metadata ──
+describe("formatInheritedConversationInput", () => {
+  test("formats delivered chars, truncation, and empty inheritance", () => {
+    assert.equal(formatInheritedConversationInput(42, false), "conversation 42 chars");
+    assert.equal(
+      formatInheritedConversationInput(50_000, true),
+      "conversation 50000 chars · truncated",
+    );
+    assert.equal(formatInheritedConversationInput(0, false), "conversation inherited · empty");
+  });
+});
+
 // ── formatTokens: boundary correctness ──
 describe("formatTokens", () => {
   test("under 1000 stays raw", () => {

package/src/utils.ts

@@ -38,6 +38,12 @@ export function formatTokens(count: number): string {
   return `${(count / 1000000).toFixed(1)}M`;
 }
 
+/** Safe TUI label for inherited-conversation input; never includes transcript text. */
+export function formatInheritedConversationInput(chars: number, truncated: boolean): string {
+  if (chars === 0) return "conversation inherited · empty";
+  return `conversation ${chars} chars${truncated ? " · truncated" : ""}`;
+}
+
 /**
  * Usage parts shared by the TUI stats line and the LLM usage footer.
  * `withCache` adds the cache-read/write and peak-context figures (TUI only —

package/src/view.ts

@@ -15,8 +15,9 @@
  *    (a "⋮ N earlier" marker appears), reaching the bottom again (or End)
  *    re-pins.
  *  - brief: the run's inputs and vitals — task and context verbatim (wrapped;
- *    head+tail elided when huge), the reference file list annotated with ✓/·
- *    for whether the child's tool calls touched each file, usage and time
+ *    head+tail elided when huge), safe inherited-conversation size/truncation
+ *    metadata, the reference file list annotated with ✓/· for whether the
+ *    child's tool calls touched each file, usage and time
  *    stats, the fallback trace, and a stderr tail on failures.
  *
  * Steer input is modal so keys never conflict with the editor: browse mode
@@ -51,6 +52,7 @@ import type { ActivityEntry } from "./types.ts";
 import {
   briefFilesUsed,
   formatFallback,
+  formatInheritedConversationInput,
   formatThinking,
   formatTimePart,
   formatToolCall,
@@ -339,7 +341,8 @@ export class SubagentViewPanel implements Component, Focusable {
   }
 
   /** Render the brief page's full content (pre-scroll): task/context verbatim,
-   *  annotated file list, stats, fallback trace, failure stderr tail. */
+   *  inherited-conversation metadata, annotated files, stats, fallback trace,
+   *  and failure stderr tail. */
   private renderBriefLines(run: RunHandle, width: number, fg: Fg): string[] {
     const snap = run.snapshot;
     const lines: string[] = [];
@@ -361,6 +364,15 @@ export class SubagentViewPanel implements Component, Focusable {
       body(run.context);
     }
 
+    if (run.inheritConversation) {
+      section(
+        formatInheritedConversationInput(
+          run.inheritedConversationChars ?? 0,
+          run.inheritedConversationTruncated === true,
+        ),
+      );
+    }
+
     if (run.files && run.files.length > 0) {
       section(`files · ${run.files.length}`);
       const used = briefFilesUsed(run.files, snap.activityLog);