@hheei/pi-subagents 0.2.3 → 0.2.4

package/dist/extension.js

@@ -16,6 +16,7 @@ import { createSubagentWidget } from "./widget.js";
 const CHILD_ENV_KEYS = Object.values(BRIDGE_ENVIRONMENT_KEYS);
 /** How long startup waits for a child that survived a parent restart to reconnect its bridge. */
 const ADOPT_WINDOW_MS = 5_000;
+const START_WINDOW_MS = 20_000;
 function diagnose(message) {
     if (process.env.DEBUG || process.env.PI_SUBAGENTS_DEBUG) {
         console.error(`pi-subagents: ${message}`);
@@ -237,7 +238,7 @@ export default function piSubagentsExtension(pi) {
                         record,
                         tokens,
                         waitForBridge: (childId, signal) => server.waitForConnection(childId, {
-                            timeoutMs: ADOPT_WINDOW_MS,
+                            timeoutMs: START_WINDOW_MS,
                             ...(signal === undefined ? {} : { signal }),
                         }),
                         signal: runtime.signal,
@@ -254,7 +255,7 @@ export default function piSubagentsExtension(pi) {
                                 tokens,
                                 host: hostSelection.adapter,
                                 waitForBridge: (childId, signal) => server.waitForConnection(childId, {
-                                    timeoutMs: ADOPT_WINDOW_MS,
+                                    timeoutMs: START_WINDOW_MS,
                                     ...(signal === undefined ? {} : { signal }),
                                 }),
                                 signal: runtime.signal,

package/dist/manager.js

@@ -346,7 +346,7 @@ export class SubagentManager {
                 ...withoutRuntime,
                 intent: "stopped",
                 state: "error",
-                interrupted: "The child panel was closed while running; spawn a new child for more work",
+                interrupted: "The host reports that the child process exited while running; the cause is unknown. Spawn a new child for more work",
             };
         });
         if (retired !== undefined)
@@ -400,7 +400,9 @@ export class SubagentManager {
         this.#clearAutoReport(id);
         const timer = setTimeout(() => {
             this.#autoReportTimers.delete(id);
-            void this.#performAutoReport(id, record);
+            void this.#performAutoReport(id, record).catch((error) => {
+                diagnose(`failed to report child ${id}: ${errorMessage(error)}`);
+            });
         }, 5_000);
         timer.unref?.();
         this.#autoReportTimers.set(id, timer);
@@ -443,7 +445,10 @@ export class SubagentManager {
     async #closeSettledPanel(id) {
         await this.#mutate(id, async () => {
             const record = await this.#deps.registry.get(id);
-            if (record === undefined || record.state === "running" || record.intent === "stopped") {
+            if (record === undefined ||
+                record.state === "running" ||
+                record.intent === "stopped" ||
+                this.#working.has(id)) {
                 return;
             }
             const attachment = this.#attachments.get(id);
@@ -516,83 +521,95 @@ export class SubagentManager {
         const record = (await this.#deps.registry.get(id)) ?? _record;
         if (record.intent === "stopped" || record.state === "running")
             return;
+        const activity = this.#activity.get(id) ?? 0;
+        const workVersion = this.#workVersions.get(id) ?? 0;
         const entries = await this.#entries(id);
         const text = entries !== undefined ? extractLastAssistantText(entries) : undefined;
-        const hasError = record.state === "error" ||
-            (record.interrupted !== undefined && record.interrupted.trim() !== "");
-        const isBlocked = hasError;
-        if (!isBlocked && (text === undefined || text.trim() === "")) {
+        await this.#mutate(id, async () => {
+            const current = await this.#deps.registry.get(id);
+            if (current === undefined ||
+                current.intent === "stopped" ||
+                current.state === "running" ||
+                this.#working.has(id) ||
+                (this.#activity.get(id) ?? 0) !== activity ||
+                (this.#workVersions.get(id) ?? 0) !== workVersion)
+                return;
+            const hasError = record.state === "error" ||
+                (record.interrupted !== undefined && record.interrupted.trim() !== "");
+            const isBlocked = hasError;
+            if (!isBlocked && (text === undefined || text.trim() === "")) {
+                const projector = this.#projectors.get(id);
+                if (projector !== undefined) {
+                    projector.syncState("done");
+                }
+                await this.#update(id, (current) => {
+                    const { interrupted: _interrupted, ...clean } = current;
+                    return {
+                        ...clean,
+                        state: "done",
+                    };
+                });
+                if (this.#taskRegistry !== undefined) {
+                    this.#taskRegistry.settle(id, {
+                        status: "completed",
+                        output: "",
+                        truncated: false,
+                    });
+                }
+                return;
+            }
+            let message;
+            if (isBlocked) {
+                if (record.interrupted !== undefined && record.interrupted.trim() !== "") {
+                    message =
+                        text !== undefined && text.trim() !== ""
+                            ? `${record.interrupted}\n\n${text}`
+                            : record.interrupted;
+                }
+                else if (text !== undefined && text.trim() !== "") {
+                    message = text;
+                }
+                else {
+                    message = "Subagent became idle without completing its task (interrupted or failed).";
+                }
+            }
+            else {
+                message = text ?? "";
+            }
+            if (this.#lastDeliveredTurn.get(id) === message)
+                return;
+            this.#lastDeliveredTurn.set(id, message);
+            const reason = isBlocked ? "blocked" : "success";
+            const taskStatus = isBlocked ? "failed" : "completed";
             const projector = this.#projectors.get(id);
+            const updatedRecord = !isBlocked
+                ? await this.#update(id, (current) => {
+                    const { interrupted: _interrupted, ...clean } = current;
+                    return {
+                        ...clean,
+                        state: "done",
+                    };
+                })
+                : await this.#update(id, (current) => ({
+                    ...current,
+                    state: "blocked",
+                    interrupted: current.interrupted ?? message,
+                }));
             if (projector !== undefined) {
-                projector.syncState("done");
+                projector.syncState(isBlocked ? "blocked" : "done");
+            }
+            this.#scheduleSettledPanelClose(id);
+            if (this.#deps.channel !== undefined) {
+                await this.contactParent(id, reason, message, updatedRecord);
             }
-            await this.#update(id, (current) => {
-                const { interrupted: _interrupted, ...clean } = current;
-                return {
-                    ...clean,
-                    state: "done",
-                };
-            });
             if (this.#taskRegistry !== undefined) {
                 this.#taskRegistry.settle(id, {
-                    status: "completed",
-                    output: "",
+                    status: taskStatus,
+                    output: message,
                     truncated: false,
                 });
             }
-            return;
-        }
-        let message;
-        if (isBlocked) {
-            if (record.interrupted !== undefined && record.interrupted.trim() !== "") {
-                message =
-                    text !== undefined && text.trim() !== ""
-                        ? `${record.interrupted}\n\n${text}`
-                        : record.interrupted;
-            }
-            else if (text !== undefined && text.trim() !== "") {
-                message = text;
-            }
-            else {
-                message = "Subagent became idle without completing its task (interrupted or failed).";
-            }
-        }
-        else {
-            message = text ?? "";
-        }
-        if (this.#lastDeliveredTurn.get(id) === message)
-            return;
-        this.#lastDeliveredTurn.set(id, message);
-        const reason = isBlocked ? "blocked" : "success";
-        const taskStatus = isBlocked ? "failed" : "completed";
-        const projector = this.#projectors.get(id);
-        const updatedRecord = !isBlocked
-            ? await this.#update(id, (current) => {
-                const { interrupted: _interrupted, ...clean } = current;
-                return {
-                    ...clean,
-                    state: "done",
-                };
-            })
-            : await this.#update(id, (current) => ({
-                ...current,
-                state: "blocked",
-                interrupted: current.interrupted ?? message,
-            }));
-        if (projector !== undefined) {
-            projector.syncState(isBlocked ? "blocked" : "done");
-        }
-        this.#scheduleSettledPanelClose(id);
-        if (this.#deps.channel !== undefined) {
-            await this.contactParent(id, reason, message, updatedRecord);
-        }
-        if (this.#taskRegistry !== undefined) {
-            this.#taskRegistry.settle(id, {
-                status: taskStatus,
-                output: message,
-                truncated: false,
-            });
-        }
+        });
     }
     /** Reads a child's session entries; exposed for Task completion inspection. */
     async getEntries(id) {
@@ -848,7 +865,7 @@ export class SubagentManager {
             childId = record.subagentId;
             this.#working.add(childId);
             this.#notify();
-            await withDeadline(this.#start(record), this.#deps.deadlineMs ?? 30_000);
+            await withDeadline(this.#start(record), this.#deps.deadlineMs ?? 60_000);
             try {
                 await this.#request(record.subagentId, "prompt", { message: cleanTask });
             }
@@ -904,17 +921,36 @@ export class SubagentManager {
             };
         }
         catch (error) {
-            if (childId !== undefined &&
-                !this.#runtimeStarted(childId) &&
-                !this.#unresolvedRuntimes.has(childId)) {
-                this.#working.delete(childId);
-            }
-            this.#notify();
-            return failure("spawn", errorMessage(error), undefined, undefined, [], true);
+            if (childId === undefined)
+                return failure("spawn", errorMessage(error));
+            const failedId = childId;
+            const reason = errorMessage(error);
+            const failed = await this.#mutate(failedId, async () => {
+                const record = await this.#deps.registry.get(failedId);
+                const uncertain = this.#runtimeStarted(failedId) ||
+                    this.#unresolvedRuntimes.has(failedId) ||
+                    record?.runtime !== undefined;
+                if (uncertain)
+                    this.#unresolvedRuntimes.add(failedId);
+                if (!this.#isLive(failedId))
+                    this.#working.delete(failedId);
+                await this.#update(failedId, (current) => ({
+                    ...current,
+                    state: "error",
+                    interrupted: reason,
+                }));
+                this.#projectors.get(failedId)?.syncState("error");
+                return failure("spawn", reason, failedId, "error", [
+                    "registry record persisted",
+                    ...(uncertain ? ["runtime start or cleanup unconfirmed"] : ["no runtime remains"]),
+                ], !uncertain);
+            });
+            return failed;
         }
     }
     send(id, rawMessage, mode = "auto", signal) {
         const message = stripHindsightContent(rawMessage);
+        this.#bumpActivity(id);
         this.#clearSettledPanelClose(id);
         return this.#mutate(id, async () => {
             const record = await this.#deps.registry.get(id);
@@ -958,7 +994,7 @@ export class SubagentManager {
                     this.#projectors.set(id, createStateProjector(resumedRecord.state));
                 }
                 try {
-                    await withDeadline(this.#start(resumedRecord), this.#deps.deadlineMs ?? 30_000);
+                    await withDeadline(this.#start(resumedRecord), this.#deps.deadlineMs ?? 60_000);
                     isResumed = true;
                 }
                 catch (error) {

package/dist/runtime.js

@@ -167,6 +167,10 @@ export async function launchChild(options) {
         };
     }
     options.tokens.forget(plan.runtimeIdentity);
+    await options.registry.update(record.subagentId, undefined, (current) => {
+        const { runtime: _runtime, ...rest } = current;
+        return rest;
+    }, plan.runtimeIdentity);
     return { failure: `Child ${record.subagentId} never connected to the parent bridge` };
 }
 /**
@@ -214,6 +218,10 @@ export async function openChildPanel(options) {
         };
     }
     options.tokens.forget(plan.runtimeIdentity);
+    await options.registry.update(record.subagentId, undefined, (current) => {
+        const { runtime: _runtime, ...rest } = current;
+        return rest;
+    }, plan.runtimeIdentity);
     return { failure: `Child ${record.subagentId} never connected to the parent bridge` };
 }
 /** Creates the runtime directory if needed; the socket itself is 0600 in a 0700 directory. */

package/dist/widget.js

@@ -54,7 +54,7 @@ export function renderSubagentWidget(children, width, theme, nowMs = Date.now())
         const glyphStyled = theme.fg(tone, glyph);
         const idStyled = theme.fg("dim", `#${child.id}`);
         const nameStyled = theme.fg("text", child.displayName ?? child.agent);
-        const elapsed = formatElapsed(child.createdAt, nowMs);
+        const elapsed = formatElapsed(child.createdAt, isTerminalState(child.state) ? Date.parse(child.updatedAt) : nowMs);
         const timeStyled = theme.fg("dim", elapsed === "" ? "0s" : elapsed);
         const stateStyled = theme.fg(tone, visual);
         const turnsCount = child.usage?.turns ?? 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hheei/pi-subagents",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Independent background Pi subagent sessions with durable identity and RPC control.",
   "type": "module",
   "main": "dist/index.js",
@@ -43,8 +43,8 @@
     "typebox": "*"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "1.0.0",
-    "@earendil-works/pi-tui": "1.0.0"
+    "@earendil-works/pi-coding-agent": "1.0.2",
+    "@earendil-works/pi-tui": "1.0.2"
   },
   "scripts": {
     "build": "node -e \"import { rmSync } from 'node:fs'; rmSync('dist', { recursive: true, force: true })\" && tsc -p tsconfig.build.json"