@fitchmultz/pi-subagents 0.46.1 → 0.46.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.46.2] - 2026-10-12
+
+### Changed
+
+- Keep parent execution, history and UI imports behind the child-mode guard. Skip empty streaming-spool replay/truncation and right-size copy buffers while preserving exact native wire logs and completed-text output.
+- Reuse a bounded set of SQLite statements, prune through indexed source lookups and publish small indexed records in one transaction. Bound pending-human reply lookup and improve relevance search without changing global scores, attempt boundaries or pagination.
+- Avoid irrelevant completion discovery and duplicate profile reads when listing agents. Reuse unchanged native history cards while retaining fresh detail validation, expanded state and source/theme invalidation.
+- Assemble fragmented Intercom frames and restore topic snapshots incrementally. Encode socket payloads once and keep legacy lists identity-only without reconstructing discarded topic arrays; encoded limits and validation-before-commit remain unchanged.
+- Aggregate workflow activity on tool transitions and coalesced status publication rather than every streaming delta. Preserve all observer updates and scheduling requests.
+- Right-size saved-owner JSON scratch buffers and share supplemental-owner reads across recovery. Filter validated embedded question owners before reading foreign answer/delivery/revival/cancellation state, preserving full archive discovery, selected validation and fresh publication.
+- Record reproducible operation-count baselines and qualified startup measurements in the performance guide.
+
+### Fixed
+
+- Clear stale top-level tool/path activity when a parallel child exits or fails without a tool-end event, while retaining activity until a resistant process actually exits.
+
 ## [0.46.1] - 2026-10-11
 
 ### Fixed

package/dist/agents/agent-management.js

@@ -1,4 +1,5 @@
-import { discoverAgents, discoverAgentsAll } from "./agents.js";
+import { discoverAgentsAll } from "./agents.js";
+import { mergeAgents } from "./agent-selection.js";
 import { formatAgentGroups, formatAgentDetail, formatChainDetail } from "./management-format.js";
 import { handleCreate, handleUpdate, handleDelete } from "./management-persistence.js";
 import { result, normalizeListScope, discoveryOptions, findEffectiveAgents, findChains, availableNamesText, } from "./management-targets.js";
@@ -9,7 +10,12 @@ export function handleList(params, ctx) {
         return result("agentScope must be 'user', 'project', or 'both'.", true);
     }
     const discovery = discoverAgentsAll(ctx.cwd, discoveryOptions(ctx), scope);
-    const agents = discoverAgents(ctx.cwd, scope, discoveryOptions(ctx)).agents.sort((a, b) => a.name.localeCompare(b.name));
+    const agents = mergeAgents(discovery.user, discovery.project, [
+        ...discovery.builtin,
+        ...discovery.package,
+    ])
+        .filter((agent) => agent.disabled !== true)
+        .sort((a, b) => a.name.localeCompare(b.name));
     const chains = discovery.chains
         .filter((chain) => scope === "both" || chain.source === scope)
         .sort((a, b) => a.name.localeCompare(b.name));

package/dist/agents/agents.js

@@ -59,10 +59,14 @@ function loadChainsFromDir(dir, source) {
     }
     return { chains, diagnostics };
 }
-function discoverChains(userDir, projectDirs, scope) {
-    const projectChains = (scope === "user" ? [] : projectDirs).map((dir) => loadChainsFromDir(dir, "project"));
-    const userChains = scope === "project" ? { chains: [], diagnostics: [] } : loadChainsFromDir(userDir, "user");
+export function discoverChains(cwd, options = {}, scope = "both") {
+    const userChainDir = path.join(getAgentDir(), "chains");
+    const project = resolveNearestProjectChainDirs(cwd, options);
+    const projectChains = (scope === "user" ? [] : project.readDirs).map((dir) => loadChainsFromDir(dir, "project"));
+    const userChains = scope === "project" ? { chains: [], diagnostics: [] } : loadChainsFromDir(userChainDir, "user");
     return {
+        userChainDir,
+        projectChainDir: project.preferredDir,
         chains: [...userChains.chains, ...projectChains.flatMap((entry) => entry.chains)],
         chainDiagnostics: [
             ...userChains.diagnostics,
@@ -88,10 +92,8 @@ export function discoverAgents(cwd, scope, options = {}) {
 }
 export function discoverAgentsAll(cwd, options = {}, scope = "both") {
     const paths = profilePaths(cwd, options);
-    const userChainDir = path.join(getAgentDir(), "chains");
-    const projectChainPaths = resolveNearestProjectChainDirs(cwd, options);
     const profiles = discoverLocalProfiles(paths, scope);
-    const chains = discoverChains(userChainDir, projectChainPaths.readDirs, scope);
+    const chains = discoverChains(cwd, options, scope);
     const packages = loadConfiguredPackageAgents(cwd, scope, options);
     return {
         ...profiles,
@@ -103,8 +105,6 @@ export function discoverAgentsAll(cwd, options = {}, scope = "both") {
         ],
         userDir: paths.userDirs.at(0) ?? path.join(getAgentDir(), "agents"),
         projectDir: paths.projectDir,
-        userChainDir,
-        projectChainDir: projectChainPaths.preferredDir,
         userSettingsPath: paths.userSettingsPath,
         projectSettingsPath: paths.projectSettingsPath,
     };

package/dist/extension/build-info.js

@@ -1 +1 @@
-export const EXTENSION_BUILD = Object.freeze({"version":"0.46.1","sha256":"c04a71cfa57811b1a2d45d43b71aa2edd0f47cd86f3b8ca91730a87ffe854304"});
+export const EXTENSION_BUILD = Object.freeze({"version":"0.46.2","sha256":"3d48e9cb92ee79f898e74db19a38eecf8e61c126587a6a3d7958acfad4ee487e"});

package/dist/extension/index.js

@@ -1,15 +1,21 @@
-import { SUBAGENT_CHILD_ENV } from "../runs/shared/pi-args.js";
-import { ensureTempRoot } from "../shared/temp-root.js";
+// Keep deferred imports on Pi's host-peer mapping path in production-only installs.
+// oxlint-disable-next-line import/no-unassigned-import
+import "@earendil-works/pi-coding-agent";
+import { SUBAGENT_CHILD_ENV } from "../runs/shared/child-route-env.js";
 import { errorMessage } from "../shared/unknown.js";
 import { loadConfig } from "./config.js";
-import { ParentSubagentRuntime } from "./parent-runtime.js";
-import { cleanupStaleRuntime } from "./runtime-reload.js";
 export { loadConfig } from "./config.js";
-export default function registerSubagentExtension(pi) {
+export default async function registerSubagentExtension(pi) {
     if (process.env[SUBAGENT_CHILD_ENV] === "1") {
         // Explicit fanout-child owns nested delegation; globally discovered parent code remains inert.
         return;
     }
+    // Children discover this entry too; keep the parent execution/history/UI graph behind the guard.
+    const [{ ensureTempRoot }, { ParentSubagentRuntime }, { cleanupStaleRuntime }] = await Promise.all([
+        import("../shared/temp-root.js"),
+        import("./parent-runtime.js"),
+        import("./runtime-reload.js"),
+    ]);
     try {
         ensureTempRoot();
     }

package/dist/extension/result-snapshot.js

@@ -1,21 +1,3 @@
-/** A new result owns its progress buffers; native messages and accounting stay shared snapshots. */
-export function copyProgress(progress) {
-    return {
-        ...progress,
-        recentTools: progress.recentTools.map((tool) => ({ ...tool })),
-        recentOutput: [...progress.recentOutput],
-    };
-}
-export function copyResult(result) {
-    return { ...result, progress: result.progress ? copyProgress(result.progress) : undefined };
-}
-export function copyDetails(details) {
-    return {
-        ...details,
-        results: details.results.map(copyResult),
-        progress: details.progress?.map(copyProgress),
-    };
-}
 /** Preserve the native result envelope while giving the receiving tool its own content array. */
 export function copyExecutionResult(result) {
     return { ...result, content: [...result.content] };

package/dist/history/ingest.js

@@ -147,7 +147,6 @@ export class SourceIngest {
             });
             return;
         }
-        this.stagedEntry = stageEntry(this.store, this.source, record);
         this.textCursor = 0;
         this.phase = "text";
     }
@@ -197,41 +196,51 @@ export class SourceIngest {
     }
     indexText() {
         const record = this.record;
-        const rowid = this.stagedEntry;
-        if (!record || rowid === undefined) {
-            throw new HistoryIndexError("CORRUPT", "Missing staged entry.");
+        if (!record) {
+            throw new HistoryIndexError("CORRUPT", "Missing ingestion record.");
         }
-        const chunks = this.store.all("SELECT rowid,* FROM pending_text WHERE rowid>? ORDER BY rowid LIMIT 32", this.textCursor);
-        if (chunks.length > 0) {
-            this.store.transaction(() => {
-                for (const chunk of chunks) {
-                    if (!allowed(record.value, text(chunk, "field"))) {
-                        continue;
-                    }
-                    const body = safeText(text(chunk, "text"), 1_048_576);
-                    const id = this.store.run("INSERT INTO documents(entry_rowid,field,text_start,text_end,preview) VALUES (?,?,?,?,?)", rowid, text(chunk, "field"), number(chunk, "position"), number(chunk, "end_position"), safeText(body, 512)).lastInsertRowid;
-                    this.store.run("INSERT INTO corpus(rowid,text) VALUES (?,?)", id, body);
-                }
-            });
-            const last = chunks.at(-1);
-            if (last) {
-                this.textCursor = number(last, "rowid");
+        const chunks = this.store.all("SELECT rowid,* FROM pending_text WHERE rowid>? ORDER BY rowid LIMIT 33", this.textCursor);
+        const complete = chunks.length <= 32;
+        const batch = chunks.slice(0, 32);
+        let rowid;
+        const write = () => {
+            rowid = this.stagedEntry ?? stageEntry(this.store, this.source, record);
+            this.indexChunks(rowid, record, batch);
+            if (complete) {
+                this.publishEntry(rowid, record);
             }
-            return;
+        };
+        if (complete) {
+            this.published(record.end, write);
+            this.stagedEntry = undefined;
+            this.phase = "read";
+        }
+        else {
+            this.store.transaction(write);
+            this.stagedEntry = rowid;
+            this.textCursor = number(batch[31], "rowid");
+        }
+    }
+    indexChunks(rowid, record, chunks) {
+        for (const chunk of chunks) {
+            if (!allowed(record.value, text(chunk, "field"))) {
+                continue;
+            }
+            const body = safeText(text(chunk, "text"), 1_048_576);
+            const id = this.store.run("INSERT INTO documents(entry_rowid,field,text_start,text_end,preview) VALUES (?,?,?,?,?)", rowid, text(chunk, "field"), number(chunk, "position"), number(chunk, "end_position"), safeText(body, 512)).lastInsertRowid;
+            this.store.run("INSERT INTO corpus(rowid,text) VALUES (?,?)", id, body);
         }
+    }
+    publishEntry(rowid, record) {
         const value = record.value;
         const answers = this.answerTexts.fingerprints(value, typeof value.id === "string" ? value.id : `legacy-${record.start}`);
-        this.published(record.end, () => {
-            if (this.store.run("UPDATE entries SET published=1 WHERE rowid=? AND source_id=? AND generation=? AND published=0", rowid, this.id, this.source.generation).changes !== 1) {
-                throw new HistoryIndexError("SOURCE_CHANGED", "Staged entry disappeared before publication; reconcile before advancing the source.");
-            }
-            for (const [digest, item] of answers) {
-                this.store.run("INSERT OR IGNORE INTO answers VALUES (?,?,?)", rowid, digest, item);
-            }
-            publishTools(this.store, this.source, rowid, value);
-        });
-        this.stagedEntry = undefined;
-        this.phase = "read";
+        if (this.store.run("UPDATE entries SET published=1 WHERE rowid=? AND source_id=? AND generation=? AND published=0", rowid, this.id, this.source.generation).changes !== 1) {
+            throw new HistoryIndexError("SOURCE_CHANGED", "Staged entry disappeared before publication; reconcile before advancing the source.");
+        }
+        for (const [digest, item] of answers) {
+            this.store.run("INSERT OR IGNORE INTO answers VALUES (?,?,?)", rowid, digest, item);
+        }
+        publishTools(this.store, this.source, rowid, value);
     }
     /** Each pump reads <=64 KiB or indexes <=32 chunks, then returns to the IPC event loop. */
     step() {

package/dist/history/prune.js

@@ -17,7 +17,7 @@ export function pruneHistory(store, runs, previousSources, release) {
     }
     return store.transaction(() => {
         let removed = previousSources === undefined && pruneRuns(store, runs);
-        for (const source of store.all(`SELECT id,path FROM sources WHERE id NOT IN (SELECT source_id FROM children WHERE source_id IS NOT NULL)${previousSources ? ` AND id IN (${previousSources.map(() => "?").join(",")})` : ""}`, ...(previousSources ?? []))) {
+        for (const source of store.all(`SELECT id,path FROM sources WHERE NOT EXISTS (SELECT 1 FROM children WHERE children.source_id=sources.id)${previousSources ? ` AND id IN (${previousSources.map(() => "?").join(",")})` : ""}`, ...(previousSources ?? []))) {
             const id = text(source, "id");
             release(id, text(source, "path"));
             store.deleteDocuments(id);

package/dist/history/run-projection.js

@@ -123,8 +123,7 @@ export function compactView(view) {
 /** Canonical owner/filesystem projection. Native transcript presence never establishes completion. */
 export function projectRun(run, ownerSessionId, runs, foreground) {
     const state = { ownedRuns: runs, foregroundRuns: foreground };
-    const questions = listRunQuestions(getRunMetadataDir(run.runId)).filter((question) => question.ownerSessionId === ownerSessionId &&
-        ["awaiting_input", "answer_pending"].includes(question.state));
+    const questions = listRunQuestions(getRunMetadataDir(run.runId), ownerSessionId).filter((question) => ["awaiting_input", "answer_pending"].includes(question.state));
     return {
         ...ownedRunView(run, state, {
             pendingInput: questions.length > 0,

package/dist/history/search-queries.js

@@ -64,7 +64,8 @@ function plan(input, expression, cursor, score) {
         clauses.push("c.agent=?");
         params.push(input.agent);
     }
-    // Scope physical records once before aggregation; bm25 still uses the whole corpus.
+    // Materialized IDs reject common out-of-scope postings without per-hit entry lookups.
+    // Each source is scoped once; bm25 still uses the whole corpus.
     const eligible = hasText(input.runId) || hasText(input.agent)
         ? `eligible AS MATERIALIZED (SELECT e.rowid FROM entries e JOIN sources s ON s.id=e.source_id WHERE e.published=1 AND e.generation=s.generation AND e.source_id IN (SELECT c.source_id FROM children c WHERE ${clauses.slice(4).join(" AND ")})),`
         : "";
@@ -122,13 +123,18 @@ export class SearchQueries {
     }
     rows(expression, filter, score, limit) {
         // Match every token across a record's visible windows; a quoted phrase cannot span fields.
+        // Relevance benefits from hit-driven attribution. Newest keeps the native join order:
+        // forcing hit order regresses newest sorting across many shared attempts.
+        const joined = score === "matched.score"
+            ? "FROM matched CROSS JOIN entries e ON e.rowid=matched.entry_rowid CROSS JOIN sources s ON s.id=e.source_id CROSS JOIN children c ON c.source_id=s.id JOIN excerpts ON excerpts.entry_rowid=matched.entry_rowid AND excerpts.choice=1 JOIN documents d ON d.id=excerpts.id"
+            : "FROM matched JOIN excerpts ON excerpts.entry_rowid=matched.entry_rowid AND excerpts.choice=1 JOIN documents d ON d.id=excerpts.id JOIN entries e ON e.rowid=matched.entry_rowid JOIN sources s ON s.id=e.source_id JOIN children c ON c.source_id=s.id";
         // Ranking/filters precede LIMIT. The parent owns the hard deadline for a costly FTS scan.
         return this.scope.store.all(`WITH ${filter.eligible} hits AS MATERIALIZED (
       ${expression.map((_term, index) => `SELECT d.id,d.entry_rowid,bm25(corpus) AS score,${index} AS term FROM corpus JOIN documents d ON d.id=corpus.rowid WHERE corpus MATCH ?${filter.eligible.length > 0 ? " AND d.entry_rowid IN (SELECT rowid FROM eligible)" : ""}`).join(" UNION ALL ")}
     ), terms AS (SELECT entry_rowid,term,MIN(score) AS score FROM hits GROUP BY entry_rowid,term),
     matched AS (SELECT entry_rowid,SUM(score) AS score FROM terms GROUP BY entry_rowid HAVING COUNT(*)=${expression.length}),
     excerpts AS (SELECT id,entry_rowid,ROW_NUMBER() OVER (PARTITION BY entry_rowid ORDER BY score,id) AS choice FROM hits)
-    SELECT d.*,${score} AS score,e.*,d.id AS document_id,s.path,s.session_id,c.run_id,c.child_index,c.agent,d.preview AS document_preview FROM matched JOIN excerpts ON excerpts.entry_rowid=matched.entry_rowid AND excerpts.choice=1 JOIN documents d ON d.id=excerpts.id JOIN entries e ON e.rowid=matched.entry_rowid JOIN sources s ON s.id=e.source_id JOIN children c ON c.source_id=s.id LEFT JOIN entries terminal ON terminal.source_id=s.id AND terminal.generation=s.generation AND terminal.id=c.terminal_entry_id AND terminal.published=1 WHERE ${filter.clauses.join(" AND ")} ORDER BY score,d.id,c.run_id,c.child_index LIMIT ?`, ...filter.eligibleParams, ...filter.params, limit + 1);
+    SELECT d.*,${score} AS score,e.*,d.id AS document_id,s.path,s.session_id,c.run_id,c.child_index,c.agent,d.preview AS document_preview ${joined} LEFT JOIN entries terminal ON terminal.source_id=s.id AND terminal.generation=s.generation AND terminal.id=c.terminal_entry_id AND terminal.published=1 WHERE ${filter.clauses.join(" AND ")} ORDER BY score,d.id,c.run_id,c.child_index LIMIT ?`, ...filter.eligibleParams, ...filter.params, limit + 1);
     }
     search(input) {
         const expression = searchGrammar(input.query);

package/dist/history/store.js

@@ -26,6 +26,7 @@ export class HistoryStore {
         this.counters[operation] += amount;
     }
     ingestLock;
+    statements = new Map();
     outputDigests = new OutputDigests();
     constructor(agentDir, owner) {
         this.owner = owner;
@@ -49,17 +50,31 @@ export class HistoryStore {
         return row;
     }
     get(sql, ...params) {
-        const row = this.db.prepare(sql).get(...params);
+        const row = this.statement(sql).get(...params);
         return row === undefined ? undefined : indexRow(row);
     }
     all(sql, ...params) {
-        return this.db
-            .prepare(sql)
+        return this.statement(sql)
             .all(...params)
             .map(indexRow);
     }
     run(sql, ...params) {
-        return this.db.prepare(sql).run(...params);
+        return this.statement(sql).run(...params);
+    }
+    statement(sql) {
+        let statement = this.statements.get(sql);
+        if (!statement) {
+            statement = this.db.prepare(sql);
+            // Dynamic browse/filter shapes cannot grow this connection's cache indefinitely.
+            if (this.statements.size >= 128) {
+                const oldest = this.statements.keys().next().value;
+                if (oldest !== undefined) {
+                    this.statements.delete(oldest);
+                }
+            }
+            this.statements.set(sql, statement);
+        }
+        return statement;
     }
     deleteDocuments(sourceId, unpublishedOnly = false) {
         const where = `entry_rowid IN (SELECT rowid FROM entries WHERE source_id=?${unpublishedOnly ? " AND published=0" : ""})`;
@@ -194,6 +209,7 @@ export class HistoryStore {
         }
     }
     close() {
+        this.statements.clear();
         this.ingestLock?.close();
         this.db.close();
     }

package/dist/history/text-chunks.js

@@ -159,9 +159,8 @@ export class TextChunks {
             this.fields.clear();
         }
         if (this.staged.length > 0) {
-            const insert = store.db.prepare("INSERT INTO pending_text VALUES (?,?,?,?)");
             for (const item of this.staged) {
-                insert.run(item.field, item.start, item.end, item.text);
+                store.run("INSERT INTO pending_text VALUES (?,?,?,?)", item.field, item.start, item.end, item.text);
             }
             this.staged = [];
         }

package/dist/history/transcript-queries.js

@@ -51,18 +51,24 @@ export class TranscriptQueries {
         this.scope = scope;
     }
     delivered(boundary, ids) {
-        const delivered = [];
+        const humans = [];
         const where = boundary.clauses.join(" AND ");
         for (const id of new Set(ids)) {
             const human = this.scope.store.get(`SELECT start FROM entries WHERE ${where} AND human_id=? ORDER BY start DESC LIMIT 1`, ...boundary.params, id);
             if (human) {
-                delivered.push([
-                    id,
-                    this.scope.store.get(`SELECT rowid FROM entries WHERE ${where} AND start>? AND assistant_text=1 LIMIT 1`, ...boundary.params, number(human, "start")) !== undefined,
-                ]);
+                humans.push([id, number(human, "start")]);
             }
         }
-        return delivered;
+        if (humans.length === 0) {
+            return [];
+        }
+        // One tail lookup answers every ID, without scanning before the earliest requested human.
+        const assistant = this.scope.store.get(`SELECT start FROM entries WHERE ${where} AND start>? AND assistant_text=1 ORDER BY start DESC LIMIT 1`, ...boundary.params, Math.min(...humans.map(([, start]) => start)));
+        const assistantStart = assistant ? number(assistant, "start") : undefined;
+        return humans.map(([id, start]) => [
+            id,
+            assistantStart !== undefined && start < assistantStart,
+        ]);
     }
     readMetadata(boundary, readThrough) {
         const where = boundary.clauses.join(" AND ");

package/dist/intercom/result-intercom.js

@@ -1,4 +1,3 @@
-import { copyDetails, copyResult } from "../extension/result-snapshot.js";
 import { compactNestedResultChildren, formatNestedResultLines } from "./nested-result-tree.js";
 export { compactNestedResultChildren, attachNestedChildrenToResultChildren, } from "./nested-result-tree.js";
 export { deliverSubagentResultIntercomEvent, deliverSubagentIntercomMessageEvent, } from "./result-delivery.js";
@@ -215,76 +214,3 @@ export function buildSubagentResultIntercomPayload(input) {
     };
     return { ...payload, message: formatSubagentResultIntercomMessage(payload) };
 }
-function stripSingleResultOutputs(result) {
-    return {
-        ...copyResult(result),
-        messages: undefined,
-        finalOutput: undefined,
-        truncation: undefined,
-    };
-}
-export function stripDetailsOutputsForIntercomReceipt(details, delivery) {
-    return {
-        ...copyDetails(details),
-        results: details.results.map(stripSingleResultOutputs),
-        ...(delivery ? { intercomDelivery: delivery } : {}),
-    };
-}
-function compactReceiptSummary(summary) {
-    const withoutOutput = summary.split(/\n\nOutput:\n|\sOutput:\s/)[0] ?? summary;
-    const normalized = withoutOutput.replace(/\s+/g, " ").trim();
-    return normalized.length > 240 ? `${normalized.slice(0, 239)}…` : normalized;
-}
-function formatChildReferences(children, field, heading) {
-    const lines = [];
-    for (const child of children) {
-        const value = child[field];
-        if (typeof value === "string") {
-            lines.push(`- ${child.agent} [${child.status}]: ${value}`);
-        }
-    }
-    return lines.length > 0 ? [heading, ...lines] : [];
-}
-function formatReceiptReferences(payload) {
-    const lines = [];
-    if (hasText(payload.resultPath)) {
-        lines.push(`Saved result (acceptance details when configured): ${payload.resultPath}`);
-    }
-    for (const child of payload.children) {
-        if (hasText(child.metadataPath)) {
-            lines.push(`Result metadata (${child.agent}; acceptance details when configured): ${child.metadataPath}${fs.existsSync(child.metadataPath) ? "" : " (missing)"}`);
-        }
-    }
-    lines.push(...formatChildReferences(payload.children, "artifactPath", "Artifacts:"), ...formatChildReferences(payload.children, "intercomTarget", "Run intercom targets (may be inactive after completion):"), ...formatChildReferences(payload.children, "sessionPath", "Sessions:"));
-    const nonCompleted = payload.children.filter((child) => child.status !== "completed");
-    if (nonCompleted.length > 0) {
-        lines.push("Non-completed children:");
-        for (const child of nonCompleted) {
-            lines.push(`- ${child.agent} [${child.status}]: ${compactReceiptSummary(child.summary)}`);
-        }
-    }
-    return lines;
-}
-export function formatSubagentResultReceipt(input) {
-    const counts = countStatuses(input.payload.children);
-    const modeLabel = {
-        single: "single subagent result",
-        parallel: "parallel subagent results",
-        chain: "chain subagent results",
-    }[input.mode];
-    const lines = [
-        `Delivered ${modeLabel} via intercom.`,
-        "Delivery: succeeded",
-        `Run: ${input.runId}`,
-        `Child outcome: ${input.payload.status}`,
-        `Children: ${formatStatusCounts(counts)}`,
-        ...(hasText(input.payload.error)
-            ? [
-                `Workflow ${input.payload.status === "paused" ? "paused" : "error"}: ${input.payload.error}`,
-            ]
-            : []),
-    ];
-    lines.push(...formatReceiptReferences(input.payload));
-    lines.push("Full grouped output was sent over intercom.");
-    return lines.join("\n");
-}

package/dist/pi-intercom/broker/broker.js

@@ -8,7 +8,7 @@ import { prepareBrokerSocketPath } from "./paths.js";
 import { brokerPidRecord } from "./pid.js";
 import { compactTopicMessage, isSessionRegistration, normalizeMessage, normalizeSessionInfo, } from "../types.js";
 import { errorMessage, isRecord } from "../../shared/unknown.js";
-import { messageSender, snapshotFrames, prepareTopicChange, publicationMessage, deliveryAcknowledgement, shouldReplaceDelivery, } from "./snapshots.js";
+import { messageSender, snapshotFrames, TopicSnapshot, publicationMessage, deliveryAcknowledgement, shouldReplaceDelivery, } from "./snapshots.js";
 const INTERCOM_DIR = join(getPiAgentDir(), "intercom");
 const PID_PATH = join(INTERCOM_DIR, "broker.pid");
 const REPLACE_DELIVERY_DELAY_MS = 1500;
@@ -124,7 +124,12 @@ class IntercomBroker {
         const info = { ...msg.session, id, lastSeen: msg.session.lastSeen ?? Date.now() };
         snapshotFrames(randomUUID(), [info], true);
         const topicFrames = msg.topicFrames === true;
-        this.sessions.set(id, { socket, info, topicFrames });
+        this.sessions.set(id, {
+            socket,
+            info: messageSender(info),
+            topics: new TopicSnapshot(info),
+            topicFrames,
+        });
         setId(id);
         if (this.shutdownTimer) {
             clearTimeout(this.shutdownTimer);
@@ -148,7 +153,7 @@ class IntercomBroker {
             return deliveries;
         }
         for (const target of this.sessions.values()) {
-            const subscription = target.info.subscriptions?.find((entry) => entry.topic === publication.topic);
+            const subscription = target.topics.subscription(publication.topic);
             if (target.info.id === fromId || !subscription) {
                 continue;
             }
@@ -171,22 +176,28 @@ class IntercomBroker {
             if (!session) {
                 throw new Error("Sender session not found");
             }
-            const prepared = prepareTopicChange(session.info, msg.change, session.topicFrames);
-            const nextInfo = prepared.info;
+            const prepared = session.topics.prepare(msg.change, session.topicFrames);
+            const nextInfo = prepared.restore
+                ? session.info
+                : session.topics.snapshot(session.info, prepared);
             const from = messageSender(nextInfo);
             const deliveries = this.planPublications(currentId, from, prepared.publication);
-            const restore = prepared.restore;
-            const infos = [...this.sessions.values()].map((entry) => entry === session ? nextInfo : entry.info);
             // Validate every frame before committing state or delivering publications.
-            if (restore) {
-                snapshotFrames(requestId, [nextInfo], true);
+            if (prepared.restore) {
+                session.topics.validateRestore(session.info, prepared, requestId);
             }
-            const frames = snapshotFrames(requestId, restore ? [] : infos, msg.stream === true);
+            const infos = prepared.restore
+                ? []
+                : [...this.sessions.values()].map((entry) => {
+                    if (entry === session) {
+                        return nextInfo;
+                    }
+                    return msg.stream === true ? entry.topics.snapshot(entry.info) : entry.info;
+                });
+            const frames = snapshotFrames(requestId, infos, msg.stream === true);
             const last = frames.pop();
-            if (!last) {
-                throw new Error("Missing final snapshot frame");
-            }
-            session.info = nextInfo;
+            session.topics.commit(prepared);
+            session.info = messageSender(nextInfo);
             const receipts = [];
             for (const { to, message } of deliveries) {
                 receipts.push({ to, ...this.sendToSession(currentId, to, from, message) });
@@ -254,7 +265,10 @@ class IntercomBroker {
         if (!session) {
             return;
         }
-        const update = { ...session.info, lastSeen: Date.now() };
+        const update = {
+            ...session.topics.snapshot(session.info),
+            lastSeen: Date.now(),
+        };
         for (const key of [
             "name",
             "status",
@@ -274,7 +288,10 @@ class IntercomBroker {
             throw new Error("Invalid presence update");
         }
         snapshotFrames(randomUUID(), [nextInfo], true);
-        session.info = nextInfo;
+        if (msg.topics !== undefined || msg.subscriptions !== undefined) {
+            session.topics = new TopicSnapshot(nextInfo);
+        }
+        session.info = messageSender(nextInfo);
     }
     sendToSession(fromId, toId, from, message) {
         const target = this.sessions.get(toId);