@herbertgao/pi-subagents 0.18.1 → 0.18.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.18.2
+
+### Patch Changes
+
+- [#227](https://github.com/HerbertGao/pi-extensions/pull/227) [`d052f3f`](https://github.com/HerbertGao/pi-extensions/commit/d052f3f3c81e9b6a74d344e9de0f83b8d28341d3) Thanks [@HerbertGao](https://github.com/HerbertGao)! - Retain completed subagent results until they are consumed, including when cleanup runs after ten minutes.
+
+  Fix a separate Pi 0.87 compatibility issue in mention clones: restore history through SessionManager and provide the live prompt through the before_agent_start hook instead of writing getter-only agent state.
+
 ## 0.18.1
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/pi-subagents",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "description": "Claude Code-style autonomous subagents and workflow orchestration for Pi, with HerbertGao-maintained UI extensions.",
   "keywords": [
     "agent",

package/src/agent-manager.ts

@@ -440,8 +440,8 @@ export class AgentManager {
 
   /**
    * Evicted agents that can still be reached by name, keyed by handle. Outlives
-   * the 10-minute record cleanup — that timer exists to bound memory, not to
-   * expire a conversation the user might still want — and is cleared alongside
+   * the 10-minute record cleanup — that timer bounds memory after results are
+   * consumed — and is cleared alongside
    * completed records on session start/switch.
    */
   private tombstones = new Map<string, AgentTombstone>()
@@ -483,7 +483,7 @@ export class AgentManager {
     this.onCompact = onCompact
     this.onUsage = onUsage
     this.maxConcurrent = maxConcurrent
-    // Cleanup completed agents after 10 minutes (but keep sessions for resume)
+    // Cleanup consumed completed agents after 10 minutes
     this.cleanupInterval = setInterval(() => this.cleanup(), 60_000)
     this.cleanupInterval.unref()
   }
@@ -1640,6 +1640,7 @@ export class AgentManager {
     for (const [id, record] of this.agents) {
       if (record.status === "running" || record.status === "queued") continue
       if ((record.completedAt ?? 0) >= cutoff) continue
+      if (!record.resultConsumed) continue
       this.removeRecord(id, record)
     }
   }
@@ -1648,7 +1649,7 @@ export class AgentManager {
    * Remove all completed/stopped/errored records immediately.
    * Called on session start/switch so tasks from a prior session don't persist.
    * Pass skipUnconsumed=true to preserve records the LLM hasn't read yet
-   * (resultConsumed=false) — they will be evicted by the 10-minute cleanup timer instead.
+   * (resultConsumed=false). The cleanup timer only evicts consumed results.
    */
   clearCompleted(skipUnconsumed = false): void {
     for (const [id, record] of this.agents) {

package/src/mention-clone.ts

@@ -64,8 +64,11 @@
 import type { Model } from "@earendil-works/pi-ai"
 import {
   buildSessionContext,
+  convertToLlm,
   createAgentSession,
+  DefaultResourceLoader,
   type ExtensionContext,
+  getAgentDir,
   SessionManager,
   type ToolDefinition,
 } from "@earendil-works/pi-coding-agent"
@@ -163,12 +166,43 @@ export async function runMentionClone(
     // `/think` is on anyway. Same shim shape as `modelRuntime` below.
     const thinkingLevel = (ctx as { thinkingLevel?: ThinkingLevel })
       .thinkingLevel
-    const created = await runInChildSessionContext(() =>
-      createAgentSession({
+    const sessionManager = SessionManager.inMemory(ctx.cwd)
+    for (const entry of conversation.messages) {
+      // The live prompt is copied below. Do not replay the parent's system
+      // messages: newer Pi also stores its tool declarations there.
+      if ((entry.role as string) === "system") continue
+      // Summary messages are projections, not appendable session entries.
+      // Preserve exactly the user message Pi would send for each summary.
+      if (
+        entry.role === "compactionSummary" ||
+        entry.role === "branchSummary"
+      ) {
+        for (const message of convertToLlm([entry]))
+          sessionManager.appendMessage(message)
+      } else {
+        sessionManager.appendMessage(entry)
+      }
+    }
+    const systemPrompt = ctx.getSystemPrompt?.()
+    const created = await runInChildSessionContext(async () => {
+      const resourceLoader = new DefaultResourceLoader({
+        cwd: ctx.cwd,
+        agentDir: getAgentDir(),
+        extensionFactories: [
+          (pi) => {
+            pi.on("before_agent_start", () =>
+              systemPrompt ? { systemPrompt } : undefined,
+            )
+          },
+        ],
+      })
+      await resourceLoader.reload()
+      return createAgentSession({
         cwd: ctx.cwd,
         // Nothing about the copy is worth persisting, and an in-memory manager
         // is also what keeps the real session untouched.
-        sessionManager: SessionManager.inMemory(ctx.cwd),
+        sessionManager,
+        resourceLoader,
         model: ctx.model as Model<never> | undefined,
         ...(thinkingLevel && { thinkingLevel }),
         modelRegistry: ctx.modelRegistry,
@@ -185,21 +219,10 @@ export async function runMentionClone(
         // agent-runner's `tools: sessionTools` beside its nested `customTools`.
         tools: [cloneAgentTool.name],
         customTools: [cloneAgentTool],
-      } as Parameters<typeof createAgentSession>[0]),
-    )
+      } as Parameters<typeof createAgentSession>[0])
+    })
     session = created.session
 
-    // The clone rebuilds a system prompt from cwd and agentDir, which is close
-    // but not the live one — extensions contribute to it per turn. Copy the
-    // real thing, so the copy reasons under the instructions the user's model
-    // is actually working under.
-    const systemPrompt = ctx.getSystemPrompt?.()
-    if (systemPrompt) session.agent.state.systemPrompt = systemPrompt
-
-    // The conversation itself. Pushed rather than assigned so the array the
-    // session was built around stays the one it goes on using.
-    session.agent.state.messages.push(...conversation.messages)
-
     // User text first, reminder after — the order Claude Code's attachment
     // renderer produces, where the reminder trails the message it is about.
     await session.prompt(`${message}\n\n${agentMentionReminder(type)}`)