@monoes/monomindcli 2.9.22 → 2.9.24

package/dist/src/orgrt/org-memory.js

@@ -20,12 +20,14 @@ export async function orgMemoryUsable(root) {
         const want = orgMemoryDbPath(root);
         const got = bridgeGetDbPath(want);
         const { realpathSync } = await import('node:fs');
-        const real = (p) => { try {
-            return realpathSync(p);
-        }
-        catch {
-            return p;
-        } };
+        const real = (p) => {
+            try {
+                return realpathSync(p);
+            }
+            catch {
+                return p;
+            }
+        };
         return real(got) === real(want);
     }
     catch {
@@ -54,7 +56,9 @@ export async function rememberOrgMemory(root, name, def, role, content, scope, r
         });
         if (res?.duplicate)
             return `Already remembered (near-duplicate exists) — reinforced instead.`;
-        return res?.success ? `Remembered (${scope} scope).` : `Could not store memory${res?.error ? `: ${res.error}` : ''}.`;
+        return res?.success
+            ? `Remembered (${scope} scope).`
+            : `Could not store memory${res?.error ? `: ${res.error}` : ''}.`;
     }
     catch (err) {
         return `org_remember failed (${err instanceof Error ? err.message : 'error'})`;
@@ -72,19 +76,32 @@ export async function recallOrgMemory(daemon, name, def, query, role) {
         // Shared org memory plus the caller's private agent scope, merged by score.
         const [shared, priv] = await Promise.all([
             bridge.bridgeSearchEntries({
-                query, namespace: orgMemoryNamespace(name, def), limit: 5, dbPath,
+                query,
+                namespace: orgMemoryNamespace(name, def),
+                limit: 5,
+                dbPath,
             }),
-            role ? bridge.bridgeSearchEntries({
-                query, namespace: agentMemoryNamespace(name, def, role), limit: 3, dbPath,
-            }) : null,
+            role
+                ? bridge.bridgeSearchEntries({
+                    query,
+                    namespace: agentMemoryNamespace(name, def, role),
+                    limit: 3,
+                    dbPath,
+                })
+                : null,
         ]);
         const results = [
             ...(shared?.results ?? []),
-            ...(priv?.results ?? []).map(r => ({ ...r, key: `${r.key} (private)` })),
-        ].sort((a, b) => b.score - a.score).slice(0, 6);
+            ...(priv?.results ?? []).map((r) => ({ ...r, key: `${r.key} (private)` })),
+        ]
+            .sort((a, b) => b.score - a.score)
+            .slice(0, 6);
         if (!results.length)
-            return { text: 'No matching org memory found — this may be the first run covering this topic.', hits: 0 };
-        const ids = results.map(r => r.id).filter(Boolean);
+            return {
+                text: 'No matching org memory found — this may be the first run covering this topic.',
+                hits: 0,
+            };
+        const ids = results.map((r) => r.id).filter(Boolean);
         let used = daemon.recallUsage.get(name);
         if (!used) {
             used = new Set();
@@ -94,8 +111,12 @@ export async function recallOrgMemory(daemon, name, def, query, role) {
             used.add(id);
         // Frequency reinforcement is immediate; the feedback rating waits for the
         // run outcome (positive-only — see storeRunMemory).
-        bridge.bridgeRecordUsage({ entryIds: ids, dbPath }).catch(() => { });
-        let text = results.map((r, i) => `${i + 1}. [${r.key}] ${r.content.slice(0, 500)}`).join('\n\n');
+        bridge.bridgeRecordUsage({ entryIds: ids, dbPath }).catch(() => {
+            /* best effort */
+        });
+        let text = results
+            .map((r, i) => `${i + 1}. [${r.key}] ${r.content.slice(0, 500)}`)
+            .join('\n\n');
         // Structured knowledge: relationship triplets from the org KG, when any.
         try {
             const kg = await import('../memory/memory-kg.js');
@@ -103,11 +124,16 @@ export async function recallOrgMemory(daemon, name, def, query, role) {
             if (graph.context)
                 text += `\n\nKnowledge graph:\n${graph.context.slice(0, 1024)}`;
         }
-        catch { /* best effort */ }
+        catch {
+            /* best effort */
+        }
         return { text, hits: results.length };
     }
     catch (err) {
-        return { text: `org memory unavailable (${err instanceof Error ? err.message : 'error'})`, hits: 0 };
+        return {
+            text: `org memory unavailable (${err instanceof Error ? err.message : 'error'})`,
+            hits: 0,
+        };
     }
 }
 /** knowledge_search implementation for org agents: the user's Second Brain
@@ -120,11 +146,16 @@ export async function searchProjectKnowledge(root, query) {
         const excerpts = await searchKnowledge(query, { rootDir: root, limit: 3, store: 'all' });
         if (!excerpts.length)
             return { text: 'No matching documents in the Second Brain for that query.', hits: 0 };
-        const text = excerpts.map((e, i) => `${i + 1}. [${e.filePath || 'unknown'}${e.scope === 'global' ? ' · global' : ''}] (${e.similarity.toFixed(2)})\n${e.text.slice(0, 400)}`).join('\n\n');
+        const text = excerpts
+            .map((e, i) => `${i + 1}. [${e.filePath || 'unknown'}${e.scope === 'global' ? ' · global' : ''}] (${e.similarity.toFixed(2)})\n${e.text.slice(0, 400)}`)
+            .join('\n\n');
         return { text, hits: excerpts.length };
     }
     catch (err) {
-        return { text: `knowledge search unavailable (${err instanceof Error ? err.message : 'error'})`, hits: 0 };
+        return {
+            text: `knowledge search unavailable (${err instanceof Error ? err.message : 'error'})`,
+            hits: 0,
+        };
     }
 }
 /** org_learn implementation: merge coordinator-extracted entities/relations/
@@ -140,10 +171,15 @@ export async function learnOrgKnowledge(daemon, name, run, payload) {
         const graph = await kg.kgIngest({
             nodes: (payload.nodes ?? []),
             edges: (payload.edges ?? []),
-            originRef, dbPath,
+            originRef,
+            dbPath,
         });
         const rules = Array.isArray(payload.rules) && payload.rules.length
-            ? await kg.kgIngestRules({ rules: payload.rules, originRef, dbPath })
+            ? await kg.kgIngestRules({
+                rules: payload.rules,
+                originRef,
+                dbPath,
+            })
             : null;
         daemon.orgLearnedRuns.add(`${name}:${run}`);
         const parts = [
@@ -151,7 +187,7 @@ export async function learnOrgKnowledge(daemon, name, run, payload) {
             `relations: +${graph.edgesAdded} new, ${graph.edgesMerged} merged`,
         ];
         if (rules)
-            parts.push(`rules: ${rules.accepted} accepted, ${rules.verdicts.filter(v => v.verdict === 'already_known').length} already known`);
+            parts.push(`rules: ${rules.accepted} accepted, ${rules.verdicts.filter((v) => v.verdict === 'already_known').length} already known`);
         return `Recorded in org knowledge graph — ${parts.join('; ')}. Rollback ref: ${originRef}.`;
     }
     catch (err) {
@@ -194,7 +230,9 @@ export async function storeRunMemory(daemon, name, def, run, summary) {
                     await kg.kgIngest({ ...extracted, originRef: `run:${run}`, dbPath });
                 }
             }
-            catch { /* best effort */ }
+            catch {
+                /* best effort */
+            }
         }
         // Auto-rate the memories this run recalled — POSITIVE-ONLY: a failed run
         // proves nothing about the recalled memories (the failure may be entirely
@@ -209,7 +247,9 @@ export async function storeRunMemory(daemon, name, def, run, summary) {
                 score: 0.9,
                 ledgerKey: `org-${name}-${run}`,
                 dbPath,
-            }).catch(() => { });
+            }).catch(() => {
+                /* best effort */
+            });
         }
     }
     catch (err) {

package/dist/src/orgrt/org-memory.js.map

@@ -1 +1 @@
-{"version":3,"file":"org-memory.js","sourceRoot":"","sources":["../../../src/orgrt/org-memory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"org-memory.js","sourceRoot":"","sources":["../../../src/orgrt/org-memory.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,oFAAoF;AACpF,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAKjC,MAAM,UAAU,kBAAkB,CAAC,IAAY,EAAE,GAAW;IAC1D,OAAO,GAAG,CAAC,UAAU,CAAC,gBAAgB,IAAI,OAAO,IAAI,EAAE,CAAC;AAC1D,CAAC;AAED;;0CAE0C;AAC1C,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;AAC/C,CAAC;AAED;;;8EAG8E;AAC9E,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAY;IAChD,IAAI,CAAC;QACH,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;QACvE,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,CAAC,CAAS,EAAU,EAAE;YACjC,IAAI,CAAC;gBACH,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,CAAC;YACX,CAAC;QACH,CAAC,CAAC;QACF,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,oBAAoB,CAAC,IAAY,EAAE,GAAW,EAAE,IAAY;IAC1E,OAAO,SAAS,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;AAC1D,CAAC;AAED;2EAC2E;AAC3E,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAAY,EACZ,IAAY,EACZ,GAAW,EACX,IAAY,EACZ,OAAe,EACf,KAAsB,EACtB,GAAW;IAEX,IAAI,CAAC;QACH,IAAI,CAAC,CAAC,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;YAAE,OAAO,kDAAkD,CAAC;QAC9F,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;QACxE,MAAM,SAAS,GACb,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC5F,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC;YACjC,GAAG,EAAE,OAAO,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;YAC5C,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC;YAC/B,SAAS;YACT,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC;YAC7B,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC;YACnB,QAAQ,EAAE,EAAE,WAAW,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE;SACpD,CAAC,CAAC;QACH,IAAI,GAAG,EAAE,SAAS;YAAE,OAAO,kEAAkE,CAAC;QAC9F,OAAO,GAAG,EAAE,OAAO;YACjB,CAAC,CAAC,eAAe,KAAK,UAAU;YAChC,CAAC,CAAC,yBAAyB,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;IACrE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,wBAAwB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC;IACjF,CAAC;AACH,CAAC;AAED;;gFAEgF;AAChF,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,MAAiB,EACjB,IAAY,EACZ,GAAW,EACX,KAAa,EACb,IAAa;IAEb,IAAI,CAAC;QACH,IAAI,CAAC,CAAC,MAAM,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACvC,OAAO,EAAE,IAAI,EAAE,kDAAkD,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QAC/E,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5C,4EAA4E;QAC5E,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACvC,MAAM,CAAC,mBAAmB,CAAC;gBACzB,KAAK;gBACL,SAAS,EAAE,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC;gBACxC,KAAK,EAAE,CAAC;gBACR,MAAM;aACP,CAAC;YACF,IAAI;gBACF,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC;oBACzB,KAAK;oBACL,SAAS,EAAE,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC;oBAChD,KAAK,EAAE,CAAC;oBACR,MAAM;iBACP,CAAC;gBACJ,CAAC,CAAC,IAAI;SACT,CAAC,CAAC;QACH,MAAM,OAAO,GAAG;YACd,GAAG,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,YAAY,EAAE,CAAC,CAAC;SAC3E;aACE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;aACjC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACf,IAAI,CAAC,OAAO,CAAC,MAAM;YACjB,OAAO;gBACL,IAAI,EAAE,+EAA+E;gBACrF,IAAI,EAAE,CAAC;aACR,CAAC;QACJ,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;YACjB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACrC,CAAC;QACD,KAAK,MAAM,EAAE,IAAI,GAAG;YAAE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnC,0EAA0E;QAC1E,oDAAoD;QACpD,MAAM,CAAC,iBAAiB,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAC7D,iBAAiB;QACnB,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,GAAG,OAAO;aACf,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;aAChE,IAAI,CAAC,MAAM,CAAC,CAAC;QAChB,yEAAyE;QACzE,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;YAClD,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YAC7D,IAAI,KAAK,CAAC,OAAO;gBAAE,IAAI,IAAI,yBAAyB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;QACrF,CAAC;QAAC,MAAM,CAAC;YACP,iBAAiB;QACnB,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;IACxC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,IAAI,EAAE,2BAA2B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG;YAChF,IAAI,EAAE,CAAC;SACR,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;+CAG+C;AAC/C,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,IAAY,EACZ,KAAa;IAEb,IAAI,CAAC;QACH,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;QAC9E,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QACzF,IAAI,CAAC,QAAQ,CAAC,MAAM;YAClB,OAAO,EAAE,IAAI,EAAE,2DAA2D,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QACxF,MAAM,IAAI,GAAG,QAAQ;aAClB,GAAG,CACF,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACP,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,IAAI,SAAS,GAAG,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAC3I;aACA,IAAI,CAAC,MAAM,CAAC,CAAC;QAChB,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;IACzC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,IAAI,EAAE,iCAAiC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG;YACtF,IAAI,EAAE,CAAC;SACR,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;8EAE8E;AAC9E,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAAiB,EACjB,IAAY,EACZ,GAAW,EACX,OAAoE;IAEpE,IAAI,CAAC;QACH,IAAI,CAAC,CAAC,MAAM,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACvC,OAAO,kDAAkD,CAAC;QAC5D,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG,OAAO,GAAG,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC;YAC9B,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAmD;YAC9E,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAmD;YAC9E,SAAS;YACT,MAAM;SACP,CAAC,CAAC;QACH,MAAM,KAAK,GACT,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM;YAClD,CAAC,CAAC,MAAM,EAAE,CAAC,aAAa,CAAC;gBACrB,KAAK,EAAE,OAAO,CAAC,KAA6C;gBAC5D,SAAS;gBACT,MAAM;aACP,CAAC;YACJ,CAAC,CAAC,IAAI,CAAC;QACX,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG;YACZ,cAAc,KAAK,CAAC,UAAU,SAAS,KAAK,CAAC,WAAW,SAAS;YACjE,eAAe,KAAK,CAAC,UAAU,SAAS,KAAK,CAAC,WAAW,SAAS;SACnE,CAAC;QACF,IAAI,KAAK;YACP,KAAK,CAAC,IAAI,CACR,UAAU,KAAK,CAAC,QAAQ,cAAc,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,eAAe,CAAC,CAAC,MAAM,gBAAgB,CACzH,CAAC;QACJ,OAAO,qCAAqC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,SAAS,GAAG,CAAC;IAC9F,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,qBAAqB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC;IAC9E,CAAC;AACH,CAAC;AAED;0EAC0E;AAC1E,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAiB,EACjB,IAAY,EACZ,GAAW,EACX,GAAW,EACX,OAAmB;IAEnB,IAAI,CAAC;QACH,IAAI,CAAC,CAAC,MAAM,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAAE,OAAO;QAClD,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;QACxE,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzF,MAAM,KAAK,GAAG;YACZ,WAAW,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,YAAY,GAAG,CAAC,IAAI,EAAE;YAC/D,OAAO,CAAC,OAAO;gBACb,CAAC,CAAC,YAAY,OAAO,CAAC,OAAO,CAAC,MAAM,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE;gBACnE,CAAC,CAAC,0BAA0B,OAAO,CAAC,QAAQ,sBAAsB;YACpE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;YACzF,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,mBAAmB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;SAC9E,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAClB,MAAM,gBAAgB,CAAC;YACrB,GAAG,EAAE,OAAO,GAAG,EAAE;YACjB,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;YACvB,SAAS,EAAE,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC;YACxC,MAAM;YACN,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;QAEH,wEAAwE;QACxE,oEAAoE;QACpE,uEAAuE;QACvE,4CAA4C;QAC5C,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC;gBACH,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;gBAClD,MAAM,SAAS,GAAG,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,UAAU,EAAE,OAAO,GAAG,EAAE,EAAE,CAAC,CAAC;gBACtF,IAAI,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;oBAC3B,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,GAAG,SAAS,EAAE,SAAS,EAAE,OAAO,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;gBACvE,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,iBAAiB;YACnB,CAAC;QACH,CAAC;QAED,yEAAyE;QACzE,0EAA0E;QAC1E,uEAAuE;QACvE,gEAAgE;QAChE,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,IAAI,EAAE,IAAI,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,KAAK,UAAU,EAAE,CAAC;YACzD,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;YAC3E,MAAM,mBAAmB,CAAC;gBACxB,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC;gBACnB,KAAK,EAAE,GAAG;gBACV,SAAS,EAAE,OAAO,IAAI,IAAI,GAAG,EAAE;gBAC/B,MAAM;aACP,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;gBACZ,iBAAiB;YACnB,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc;YACjD,OAAO,CAAC,KAAK,CACX,OAAO,IAAI,4BAA4B,EACvC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CACzC,CAAC;IACN,CAAC;AACH,CAAC"}

package/dist/src/orgrt/pi-rpc-runner.d.ts

@@ -1,4 +1,4 @@
-import type { AgentRunner, AgentRunArgs, AgentMessage } from './agent-runner.js';
+import type { AgentMessage, AgentRunArgs, AgentRunner } from './agent-runner.js';
 interface PiContentBlock {
     type: string;
     text?: string;

package/dist/src/orgrt/pi-rpc-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pi-rpc-runner.d.ts","sourceRoot":"","sources":["../../../src/orgrt/pi-rpc-runner.ts"],"names":[],"mappings":"AA2DA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAUjF,UAAU,cAAc;IAAG,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAAE;AAC7I,UAAU,YAAY;IAAG,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;CAAE;AAEtD;;;;kBAIkB;AAClB,qBAAa,YAAY;IACvB,OAAO,CAAC,GAAG,CAAM;IACjB,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAW7C;CACF;AAED;uDACuD;AACvD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAE/F;AAED;;;;;mDAKmD;AACnD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CAK9D;AAED;;;;;;iEAMiE;AACjE,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE;QAAE,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAC5C,MAAM,EAAE;QAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IACxE,MAAM,EAAE;QAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IACxE,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI,CAAC;IAC5D,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;IACnD,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;CAAE,KAAK,YAAY,CAAC;AAKvI,qBAAa,gBAAiB,YAAW,WAAW;IACtC,OAAO,CAAC,KAAK,CAAC;IAAU,OAAO,CAAC,OAAO;IAAnD,YAAoB,KAAK,CAAC,EAAE,MAAM,YAAA,EAAU,OAAO,GAAE,UAA8B,EAAI;IAEhF,GAAG,CAAC,IAAI,EAAE,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC,CAqR1D;CACF"}
+{"version":3,"file":"pi-rpc-runner.d.ts","sourceRoot":"","sources":["../../../src/orgrt/pi-rpc-runner.ts"],"names":[],"mappings":"AAkEA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAkBjF,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC;AACD,UAAU,YAAY;IACpB,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;CAC5B;AAED;;;;kBAIkB;AAClB,qBAAa,YAAY;IACvB,OAAO,CAAC,GAAG,CAAM;IACjB,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAe7C;CACF;AAED;uDACuD;AACvD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAE/F;AAED;;;;;mDAKmD;AACnD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CAK9D;AAED;;;;;;iEAMiE;AACjE,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE;QAAE,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAC5C,MAAM,EAAE;QAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IACxE,MAAM,EAAE;QAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IACxE,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,GAAG,IAAI,CAAC;IAC5D,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAC;IACnD,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,MAAM,UAAU,GAAG,CACvB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;CAAE,KAC3D,YAAY,CAAC;AASlB,qBAAa,gBAAiB,YAAW,WAAW;IAEhD,OAAO,CAAC,KAAK,CAAC;IACd,OAAO,CAAC,OAAO;IAFjB,YACU,KAAK,CAAC,EAAE,MAAM,YAAA,EACd,OAAO,GAAE,UAA8B,EAC7C;IAEG,GAAG,CAAC,IAAI,EAAE,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC,CAoT1D;CACF"}

package/dist/src/orgrt/pi-rpc-runner.js

@@ -11,57 +11,65 @@
  * session, so conversational context carries naturally (no --session-dir
  * resume guessing) and there's no per-turn spawn/bootstrap cost.
  *
- * Protocol — JSON objects, one per line (LF-delimited), verified against
- * pi-mono's rpc.md doc source directly (literal JSON examples quoted below,
- * not paraphrased from prose — unlike this file's sibling runners, which
- * work from public docs that don't always show raw wire examples):
+ * Protocol — JSON objects, one per line (LF-delimited). RESOLVED against a
+ * live pi v0.73.1 install (issue #179): pi's docs (docs/rpc.md, bundled with
+ * the package) define `agent_end` — "Emitted when the agent completes.
+ * Contains all messages generated during this run." — as a distinct event
+ * from `message_end`/`turn_end`, and it's exactly the "prompt is fully done"
+ * signal this runner needs. Confirmed live with a prompt that made pi run 3
+ * of its own native tools in sequence (read → edit → bash): the run produced
+ * 4 separate turn_start/turn_end cycles and many message_end events, but
+ * EXACTLY ONE agent_end, firing only after the last turn closed. This
+ * replaces the old get_state-polling heuristic entirely — no more `isStreaming`
+ * ambiguity to worry about.
  *
  *   Client → server (this runner sends), each with an optional "id" for
  *   response correlation:
  *     {"type":"prompt","message":"<text>"}          — new/continuing turn
- *     {"type":"get_state"}                           — poll idle/streaming status
  *     {"type":"abort"}                                — not used by this runner
  *
- *   Server → client:
+ *   Server → client (only agent_end is acted on; everything else — agent_start,
+ *   turn_start/turn_end, message_start/message_update/message_end,
+ *   tool_execution_* — is drained and ignored):
  *     {"type":"response","command":"prompt","success":true}
- *     {"type":"response","command":"get_state","success":true,
- *      "data":{"isStreaming":false, ...}}
- *     {"type":"agent_start"}
- *     {"type":"message_update","usage":{"input":N,"output":N,"totalTokens":N,
- *      "cost":{"total":N}},"assistantMessageEvent":{...}}   — streaming deltas, ignored
- *     {"type":"message_end","message":{"role":"assistant","content":[
- *        {"type":"text","text":"..."},
- *        {"type":"thinking","thinking":"..."},
- *        {"type":"toolCall","id":"call_1","name":"bash","arguments":{...}}
- *      ]}}
+ *     {"type":"agent_end","messages":[
+ *        {"role":"user","content":[{"type":"text","text":"..."}]},
+ *        {"role":"assistant","content":[
+ *           {"type":"thinking","thinking":"..."},
+ *           {"type":"text","text":"..."},
+ *           {"type":"toolCall","id":"call_1","name":"bash","arguments":{...}}
+ *         ],"usage":{"input":N,"output":N,"totalTokens":N,"cost":{"total":N}}},
+ *        {"role":"toolResult","content":[{"type":"text","text":"..."}]},
+ *        ... (repeats per internal turn — one "assistant" entry per turn,
+ *             each with ITS OWN per-turn `usage`, not cumulative)
+ *      ]}
  *
- * KNOWN GAP — turn-completion detection is a best-effort HEURISTIC, not a
- * confirmed protocol contract: pi executes its own native tools (bash, file
- * edits, …) autonomously inside the RPC session, so a single `prompt` can
- * produce MULTIPLE agent_start/message_end cycles before pi is genuinely
- * done responding, and the docs don't show an explicit "fully idle" event
- * distinct from message_end. This runner sends `get_state` after every
- * message_end and treats `data.isStreaming === false` as "done" — a
- * reasonable, protocol-grounded inference (get_state IS documented), but
- * NOT independently verified against a live pi install (none was available
- * here). If pi's real behavior differs, this could end a turn early or hang
- * waiting past STARTUP_GRACE_MS. Validate against a real `pi --mode rpc`
- * session before relying on this in production; fall back to plain
- * `runtime: 'pi'` if it misbehaves.
+ * Usage accounting: `agent_end.messages` includes one `assistant` entry per
+ * internal turn, each carrying that turn's OWN `usage` (confirmed live: a
+ * 4-turn run had usage.output of 65/109/13/22 across the 4 assistant
+ * entries — small, turn-scoped numbers, not a running cumulative total).
+ * This runner sums `usage.input`/`usage.output` across every assistant
+ * entry in `agent_end.messages` to get the correct total for the prompt.
+ * The PREVIOUS implementation (overwriting from `message_update`'s running
+ * total, which only tracks the CURRENT assistant message) silently
+ * undercounted any prompt that triggered more than one internal turn —
+ * confirmed via the same live test above.
  *
  * Org tools (org_send, knowledge_search, ask_human, …) — FENCE PROTOCOL:
  *   Pi's own native tools (bash, file edits) execute autonomously inside pi
  *   itself and never reach this runner — only org tools ride the shared
- *   tool-fence protocol (tool-fence.ts), extracted from message_end's text
- *   content and fed back as a new `prompt` command in the SAME session.
+ *   tool-fence protocol (tool-fence.ts), extracted from the assistant text
+ *   in `agent_end.messages` and fed back as a new `prompt` command in the
+ *   SAME session.
  */
 import { spawn } from 'node:child_process';
 import { join } from 'node:path';
-import { buildToolProtocol, parseToolCalls, executeToolCall, formatToolResults, MAX_TOOL_ROUNDS, TOOL_CALL_RE } from './tool-fence.js';
-/** Distinct from a turn timeout — this is how long we wait for pi to settle
- *  to isStreaming:false after a message_end before giving up on the
- *  heuristic and treating the turn as complete anyway (better to risk
- *  cutting a turn slightly short than to hang forever on a wrong inference). */
+import { buildToolProtocol, executeToolCall, formatToolResults, MAX_TOOL_ROUNDS, parseToolCalls, TOOL_CALL_RE, } from './tool-fence.js';
+/** Upper bound on how long a single prompt's wait for `agent_end` may run
+ *  before the mid-session silence watchdog (below) considers pi wedged.
+ *  Distinct from a hard per-turn deadline — a long-running prompt that's
+ *  still producing events well within this window is not a hang; only
+ *  total SILENCE past this bound is. */
 const SETTLE_TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
 const STARTUP_GRACE_MS = 45_000;
 /** Pure, transport-independent JSONL line decoder — feed it raw string
@@ -83,7 +91,9 @@ export class JsonlDecoder {
             try {
                 out.push(JSON.parse(trimmed));
             }
-            catch { /* skip malformed line */ }
+            catch {
+                /* skip malformed line */
+            }
         }
         return out;
     }
@@ -91,7 +101,7 @@ export class JsonlDecoder {
 /** Encode a client→server RPC command as one LF-terminated JSON line.
  *  Exported for unit testing the exact wire format. */
 export function encodePiRpcCommand(cmd) {
-    return JSON.stringify(cmd) + '\n';
+    return `${JSON.stringify(cmd)}\n`;
 }
 /** Extract assistant-visible text and org tool_call fences from a
  *  message_end event's `message.content` array. `thinking` blocks are
@@ -105,7 +115,11 @@ export function extractPiRpcText(message) {
         .map((b) => b.text)
         .join('\n');
 }
-const defaultSpawnPiRpc = (bin, args, opts) => spawn(bin, args, { cwd: opts.cwd, env: opts.env, stdio: ['pipe', 'pipe', 'pipe'] });
+const defaultSpawnPiRpc = (bin, args, opts) => spawn(bin, args, {
+    cwd: opts.cwd,
+    env: opts.env,
+    stdio: ['pipe', 'pipe', 'pipe'],
+});
 export class PiRpcAgentRunner {
     piBin;
     spawnFn;
@@ -116,7 +130,13 @@ export class PiRpcAgentRunner {
     async *run(args) {
         const bin = this.piBin || process.env.PI_CLI_BIN || 'pi';
         const sessionDir = join(args.cwd, '.monomind-pi-session');
-        const cliArgs = ['--mode', 'rpc', '--approve', '--session-dir', sessionDir];
+        // No --approve: confirmed against a live v0.73.1 install that pi rejects
+        // it outright ("Unknown option: --approve") — no such flag exists.
+        // Confirmed unnecessary too: built-in tools (read/edit/bash) execute
+        // autonomously in --mode rpc with zero confirmation gating (a live
+        // multi-tool prompt — read, edit, bash — ran end-to-end with no prompt
+        // or block). See #179.
+        const cliArgs = ['--mode', 'rpc', '--session-dir', sessionDir];
         if (args.model)
             cliArgs.push('--model', args.model);
         const child = this.spawnFn(bin, cliArgs, {
@@ -124,7 +144,9 @@ export class PiRpcAgentRunner {
             env: { ...process.env, PI_TELEMETRY: '0', PI_SKIP_VERSION_CHECK: '1', ...args.env },
         });
         let stderrTail = '';
-        child.stderr?.on('data', (c) => { stderrTail = (stderrTail + c.toString()).slice(-4000); });
+        child.stderr?.on('data', (c) => {
+            stderrTail = (stderrTail + c.toString()).slice(-4000);
+        });
         const decoder = new JsonlDecoder();
         const eventQueue = [];
         const waiters = [];
@@ -143,14 +165,25 @@ export class PiRpcAgentRunner {
                     eventQueue.push(ev);
             }
         };
-        child.stdout?.on('data', (c) => { lastEventAt = Date.now(); pushEvents(decoder.feed(c.toString())); });
+        child.stdout?.on('data', (c) => {
+            lastEventAt = Date.now();
+            pushEvents(decoder.feed(c.toString()));
+        });
         // Distinct from `closed` (which WE set to stop routing new commands, e.g.
         // as soon as a hang is suspected) — this is only true once the OS
         // confirms the process actually exited. The finally block below uses it
         // to decide whether a pending SIGKILL escalation is still needed.
         let processExited = false;
-        child.on('close', (code) => { closed = true; processExited = true; closeCode = code; pushEvents([{ type: '__closed__', code }]); });
-        child.on('error', (err) => { closed = true; pushEvents([{ type: '__error__', error: err }]); });
+        child.on('close', (code) => {
+            closed = true;
+            processExited = true;
+            closeCode = code;
+            pushEvents([{ type: '__closed__', code }]);
+        });
+        child.on('error', (err) => {
+            closed = true;
+            pushEvents([{ type: '__error__', error: err }]);
+        });
         const nextEvent = () => {
             const queued = eventQueue.shift();
             if (queued)
@@ -171,11 +204,17 @@ export class PiRpcAgentRunner {
             try {
                 child.kill('SIGTERM');
             }
-            catch { /* already gone */ }
-            killTimer = setTimeout(() => { try {
-                child.kill('SIGKILL');
+            catch {
+                /* already gone */
             }
-            catch { /* already gone */ } }, KILL_GRACE_MS);
+            killTimer = setTimeout(() => {
+                try {
+                    child.kill('SIGKILL');
+                }
+                catch {
+                    /* already gone */
+                }
+            }, KILL_GRACE_MS);
             killTimer.unref?.();
         };
         // Startup-hang detection — same rationale as the other subprocess
@@ -189,13 +228,15 @@ export class PiRpcAgentRunner {
                 pushEvents([{ type: '__hang__' }]);
             }
         }, STARTUP_GRACE_MS);
-        const disarmHang = () => { if (!sawAnyEvent) {
-            sawAnyEvent = true;
-            if (hangTimer) {
-                clearTimeout(hangTimer);
-                hangTimer = undefined;
+        const disarmHang = () => {
+            if (!sawAnyEvent) {
+                sawAnyEvent = true;
+                if (hangTimer) {
+                    clearTimeout(hangTimer);
+                    hangTimer = undefined;
+                }
             }
-        } };
+        };
         // Rolling watchdog — catches a hang AFTER the startup check has already
         // passed (e.g. pi wedges mid-session on turn 5), which the one-shot
         // startup timer above can't see since it disarms itself on the first
@@ -216,7 +257,7 @@ export class PiRpcAgentRunner {
         // the check entirely for the duration is the correct fix in both cases.
         let toolCallInFlight = false;
         let turnInFlight = false;
-        const MID_SESSION_SILENCE_MS = SETTLE_TIMEOUT_MS; // reuse the same bound the settle-heuristic gives up at
+        const MID_SESSION_SILENCE_MS = SETTLE_TIMEOUT_MS; // reuse the same bound as the ceiling for total event silence
         const silenceWatchdog = setInterval(() => {
             if (closed || toolCallInFlight || !turnInFlight)
                 return;
@@ -231,7 +272,9 @@ export class PiRpcAgentRunner {
             let first = true;
             for await (const p of args.prompt) {
                 const text = typeof p === 'string' ? p : (p?.message?.content ?? String(p ?? ''));
-                let nextMessage = first ? `${args.systemPrompt}${buildToolProtocol(args.tools)}\n\n---\n\n${text}` : text;
+                let nextMessage = first
+                    ? `${args.systemPrompt}${buildToolProtocol(args.tools)}\n\n---\n\n${text}`
+                    : text;
                 first = false;
                 let turnInputTokens = 0;
                 let turnOutputTokens = 0;
@@ -243,22 +286,13 @@ export class PiRpcAgentRunner {
                 // the session.
                 turnInFlight = true;
                 try {
-                    turnLoop: for (;;) {
+                    for (;;) {
                         send({ type: 'prompt', message: nextMessage });
-                        const collectedText = [];
-                        const settleDeadline = Date.now() + SETTLE_TIMEOUT_MS;
-                        let sawMessageEnd = false;
+                        let agentEndMessages;
                         for (;;) {
                             const ev = await nextEvent();
                             disarmHang();
                             const kind = ev.type;
-                            // Checked on EVERY event, not only get_state responses — a
-                            // stream of message_update/message_end events with pi never
-                            // actually answering get_state (e.g. it doesn't recognize the
-                            // command, or a response gets lost) would otherwise never hit
-                            // the deadline check below and could wait past it indefinitely.
-                            if (sawMessageEnd && Date.now() > settleDeadline)
-                                break;
                             if (kind === '__closed__' || kind === '__error__' || kind === '__hang__') {
                                 if (kind === '__error__') {
                                     // Rethrow the ORIGINAL spawn error (not a fresh generic one)
@@ -276,53 +310,36 @@ export class PiRpcAgentRunner {
                                     : `PiRpcAgentRunner: pi rpc process ended unexpectedly (${kind})` +
                                         (stderrTail ? `\nstderr: ${stderrTail.slice(-500)}` : ''));
                             }
-                            if (kind === 'message_update') {
-                                // Overwrite (not accumulate) — the confirmed example in this
-                                // file's header shows `usage` as a running total FOR THE
-                                // CURRENT RESPONSE, so the latest value read during a turn is
-                                // that turn's correct total. UNCONFIRMED: whether it's scoped
-                                // to the current prompt or to the whole (session-lifetime) rpc
-                                // process. If it turns out to be session-cumulative, every
-                                // turn after the first would over-report by including prior
-                                // turns' tokens — inflating org budget consumption. Validate
-                                // against a live pi install before relying on this for tight
-                                // budget enforcement; this is exactly the kind of gap opt-in
-                                // 'pi-rpc' (vs. default 'pi') is meant to warn callers about.
-                                const usage = ev.usage;
-                                if (usage) {
-                                    turnInputTokens = usage.input ?? turnInputTokens;
-                                    turnOutputTokens = usage.output ?? turnOutputTokens;
-                                }
-                                continue;
-                            }
-                            if (kind === 'message_end') {
-                                sawMessageEnd = true;
-                                const message = ev.message;
-                                if (message) {
-                                    const text2 = extractPiRpcText(message);
-                                    if (text2)
-                                        collectedText.push(text2);
-                                }
-                                // See file header: get_state is the documented, best-effort
-                                // signal for "pi is done responding to this prompt", since a
-                                // single prompt can trigger multiple internal tool-use cycles.
-                                send({ type: 'get_state' });
-                                continue;
+                            if (kind === 'agent_end') {
+                                // See file header: agent_end is pi's own, confirmed-live,
+                                // single unambiguous "this prompt is fully done" signal —
+                                // fires exactly once even across multiple internal
+                                // turn_start/turn_end cycles from pi's own native tool use.
+                                agentEndMessages = ev.messages;
+                                break;
                             }
-                            if (kind === 'response' && ev.command === 'get_state') {
-                                const data = ev.data;
-                                if (data?.isStreaming === false)
-                                    break; // turn settled — fall through to tool-fence handling below
-                                if (Date.now() > settleDeadline)
-                                    break; // heuristic gave up — proceed rather than hang forever
-                                continue; // still streaming — keep waiting for more message_end cycles
+                            // agent_start, turn_start/turn_end, message_start/message_update/
+                            // message_end, tool_execution_* (pi's own native tools), other
+                            // response acks — all drained and ignored; agent_end alone
+                            // carries everything this runner needs (final text + usage).
+                        }
+                        if (!agentEndMessages)
+                            break; // process closed before agent_end — nothing to extract this round
+                        const assistantMessages = agentEndMessages.filter((m) => m.role === 'assistant');
+                        for (const m of assistantMessages) {
+                            // Summed, not overwritten: each assistant entry carries ITS OWN
+                            // per-turn usage (confirmed live — see file header), so summing
+                            // across every internal turn in this agent_end is the correct
+                            // total for the prompt just sent.
+                            if (m.usage) {
+                                turnInputTokens += m.usage.input ?? 0;
+                                turnOutputTokens += m.usage.output ?? 0;
                             }
-                            // agent_start, other response acks, tool_execution_* (pi's own
-                            // native tools — nothing for this runner to do) — ignored.
                         }
-                        if (!sawMessageEnd)
-                            break turnLoop; // nothing to extract this round — avoid an infinite loop on an empty settle
-                        const rawText = collectedText.join('\n');
+                        const rawText = assistantMessages
+                            .map((m) => extractPiRpcText(m))
+                            .filter(Boolean)
+                            .join('\n');
                         const visibleText = rawText.replace(TOOL_CALL_RE, '').trim();
                         if (visibleText)
                             yield { type: 'assistant', text: visibleText };
@@ -331,11 +348,14 @@ export class PiRpcAgentRunner {
                         for (const note of malformed)
                             yield { type: 'assistant', text: note };
                         if (calls.length === 0)
-                            break turnLoop;
+                            break;
                         round += 1;
                         if (round > MAX_TOOL_ROUNDS) {
-                            yield { type: 'assistant', text: `[monomind] tool-call round cap (${MAX_TOOL_ROUNDS}) reached — dropping ${calls.length} pending tool call(s)` };
-                            break turnLoop;
+                            yield {
+                                type: 'assistant',
+                                text: `[monomind] tool-call round cap (${MAX_TOOL_ROUNDS}) reached — dropping ${calls.length} pending tool call(s)`,
+                            };
+                            break;
                         }
                         // Pause the silence watchdog for the duration — see its
                         // declaration above for why a call like ask_human blocking on a