@dorokuma/herdsman 0.13.5 → 0.14.0

package/dist/src/observability/agent-index-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-index-service.d.ts","sourceRoot":"","sources":["../../../src/observability/agent-index-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-index-service.d.ts","sourceRoot":"","sources":["../../../src/observability/agent-index-service.ts"],"names":[],"mappings":"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"}

package/dist/src/observability/agent-index-service.js

@@ -1,5 +1,5 @@
 import { existsSync } from "node:fs";
-import { safeAllowedSessionPath, sessionPathAllowedByShape } from "../agent-history/discovery.js";
+import { safeAllowedSessionPath, safeOfficialSessionPath, sessionPathAllowedByShape, } from "../agent-history/discovery.js";
 import { createAgentHistoryService } from "../agent-history/service.js";
 import { hasNonEmptyAssistantMessage } from "../db/agent-events.js";
 import { runSqliteTransaction } from "../db/client.js";
@@ -27,6 +27,24 @@ function isTerminalAssistant(compact) {
     return stopReason === "stop" || stopReason === "length";
 }
 export const PLAN_WAITING_HISTORY = "PLAN_WAITING_HISTORY";
+/**
+ * How many prior terminal rows the stale-baseline duplicate guard compares
+ * against, newest first. The guard used to compare only the single latest
+ * terminal row; M2 widens the accepted body set to unconfirmed rounds, so a body
+ * that was already delivered as an earlier terminal row must be recognised too.
+ * The window keeps that comparison bounded instead of scanning every terminal row
+ * the agent ever emitted (those live up to the 7-day settled TTL).
+ *
+ * Why 200: within that 7-day TTL a single agent's delivered/acked terminal rows
+ * in production top out around 250, and the body the guard cares about is always
+ * one of the most recent deliveries, so 200 covers it with margin while keeping
+ * the read to a few hundred KB of JSON.
+ *
+ * Above the window the guard stops recognising a duplicate, so an older body that
+ * resurfaces at the tail could be re-released as this round's answer once more.
+ * That is the accepted cost of bounding the scan instead of walking every row.
+ */
+const STALE_DUPLICATE_GUARD_SCAN_LIMIT = 200;
 export class PlanWaitingHistoryError extends Error {
     constructor() {
         super(PLAN_WAITING_HISTORY);
@@ -1124,11 +1142,12 @@ export class AgentIndexService {
             const overlayByPane = new Map();
             for (const pane of snapshot.panes) {
                 const value = record(pane);
-                const paneId = stringValue(value.pane_id) ?? stringValue(value.paneId);
+                // `pane.list` panes are official `PaneInfo` records: snake_case only.
+                const paneId = stringValue(value.pane_id);
                 if (!paneId)
                     continue;
                 const revision = integerValue(value.revision);
-                const terminalTitle = stringValue(value.terminal_title) ?? stringValue(value.terminalTitle);
+                const terminalTitle = stringValue(value.terminal_title);
                 if (revision === undefined && !terminalTitle)
                     continue;
                 overlayByPane.set(paneId, {
@@ -1195,7 +1214,7 @@ export class AgentIndexService {
                 const occupiedByOthers = this.#context.occupiedSessionPathsFor(agent);
                 const occupancyConflict = Boolean(cached?.historyRef?.path && occupiedByOthers.has(cached.historyRef.path));
                 const sessionReady = agent.agentSession?.kind === "path" &&
-                    safeAllowedSessionPath(agent.agentSession.value) !== null;
+                    safeOfficialSessionPath(agent.agentSession.value) !== null;
                 const sessionUnbound = sessionReady &&
                     (cached?.historyRef?.kind !== "agent_session" ||
                         cached.historyRef.path !== agent.agentSession?.value);
@@ -1442,7 +1461,7 @@ export class AgentIndexService {
         return result;
     }
     #isClosedPaneAgent(herdrSessionName, agent) {
-        const paneId = stringValue(agent.pane_id) ?? stringValue(agent.paneId);
+        const paneId = stringValue(agent.pane_id);
         if (!paneId)
             return false;
         return this.#stores.agents.isPaneClosed({
@@ -1643,6 +1662,13 @@ export class AgentIndexService {
                     // degraded (which is what made #runPlanRow run
                     // invalidateById(..., "degraded_retry") on already-written content).
                     const confirmedTerminal = turn.confirmed === true;
+                    // M2: the "trust the on-disk body" judgement is decoupled from
+                    // `confirmed`. That the turn-end signal arrived is already guaranteed by
+                    // the enclosing `if (turn?.received)`, so the deliverability judgement
+                    // below only has to decide whether the disk carries a deliverable body —
+                    // a round no longer needs a (systematically unreliable) client-side
+                    // `confirmed` to be released. `confirmedTerminal` keeps its own meaning
+                    // for the released/degraded logging and payload.
                     const degradeOrRelease = (degradedReason) => {
                         if (confirmedTerminal) {
                             // A confirmed round stays non-degraded (see above), but the reason
@@ -1701,10 +1727,27 @@ export class AgentIndexService {
                         // disk). It can also hold the answer of a *previous* round — the same
                         // frozen baseline is exactly what the daemon last delivered — so a
                         // round that writes nothing new would otherwise re-release the
-                        // previous round's body as if it were this one's. `latestTerminal` is
-                        // the latest non-invalidated terminal row read before this round's row
-                        // is written: usually the last delivery, possibly an undelivered idle.
-                        const staleBaselineDuplicate = sameTerminalAssistantContent(advanced, latestTerminal?.compactHistory, "pi");
+                        // previous round's body as if it were this one's. The guard compares
+                        // `advanced` against the prior terminal rows for this agent that can
+                        // have reached the orchestrator — a bounded window, newest first (the
+                        // `agent_events` query below). Two things changed from the single-row
+                        // guard: (i) it now looks at a window, because a body delivered before
+                        // the current latest terminal row would otherwise slip through and, now
+                        // that M2 accepts unconfirmed rounds, be re-released as this round's
+                        // answer; (ii) it only counts rows in `delivered`/`acked`, because a
+                        // never-deliverable row (`agent.idle` from a non-`working` status, per
+                        // `isDeliverableAgentEvent`; ~50% of ref-bearing `agent.idle` rows for a
+                        // given agent (47/94 in a 7-day sample) carry the same ref as a `done` row
+                        // of that agent; they are never deliverable) can sit in the window and must
+                        // not blank a deliverable round; the tightened guard is not a strict
+                        // superset of the old one (it fires only in the mismatch arm).
+                        const staleBaselineDuplicate = this.#stores.sqlite
+                            .prepare(`select compact_history_json from agent_events
+                   where agent_id = ? and herdr_session_name = ?
+                     and type in ('agent.idle', 'agent.done', 'agent.blocked')
+                     and status in ('delivered', 'acked')
+                   order by id desc limit ?`)
+                            .all(input.agent.id, input.agent.herdrSessionName, STALE_DUPLICATE_GUARD_SCAN_LIMIT).some((row) => sameTerminalAssistantContent(advanced, parseCompactHistoryJson(row.compact_history_json), "pi"));
                         // A confirmed turn carrying a non-empty terminal assistant message is
                         // trusted as-is, so `no_advance_from_input` stays reserved for rounds
                         // with genuinely no deliverable assistant text (empty or non-terminal
@@ -1729,22 +1772,30 @@ export class AgentIndexService {
                         else {
                             const advancedText = advanced.lastAssistantMessage?.text?.trim() ?? "";
                             const advancedMatchesExpected = !expectedText || advancedText.endsWith(expectedText);
-                            if (confirmedDeliverable) {
-                                // Event 50549: the extension confirmed the write, but its
-                                // `expectedText` is the extension's own guess at the final tail and
-                                // can disagree with the transcript that actually landed on disk
-                                // (the old extension treated "the file grew" as confirmation, so a
-                                // stale/escaped tail was reported as written). The disk tail is the
-                                // authoritative evidence, and it already is a terminal assistant
-                                // message with a body, so it is this round's answer: release it
-                                // as-is (see :2012-2026 for the same judgement) and keep
-                                // `degraded` off, because `degraded: true` makes #runPlanRow call
-                                // invalidateById(..., "degraded_retry") on content that is already
-                                // written. The mismatch is still recorded as a warning so the
-                                // disagreement stays diagnosable instead of being swallowed.
+                            // M2 deliverability judgement: the turn-end signal already arrived
+                            // (the enclosing `if (turn?.received)`), so only the disk matters — a
+                            // non-empty terminal assistant message that was not already delivered
+                            // (`diskDeliverable`) is this round's answer. The
+                            // client's `confirmed` flag is deliberately not a conjunct here: its
+                            // `expectedText` is only the extension's own guess at the final tail
+                            // and can systematically disagree with the transcript that landed on
+                            // disk (rewrite-type extensions and credential redaction both make
+                            // the text-level confirmation never match), while the disk tail is
+                            // the authoritative evidence. When the guess disagrees the body is
+                            // still released as-is — `degraded` stays off, because `degraded:
+                            // true` makes #runPlanRow call invalidateById(..., "degraded_retry")
+                            // on content that is already written — and the mismatch is recorded
+                            // as a warning (split by `confirmed`) so it stays diagnosable.
+                            const diskDeliverable = isTerminalAssistant(advanced) &&
+                                hasNonEmptyAssistantMessage(advanced) &&
+                                !staleBaselineDuplicate;
+                            if (diskDeliverable) {
                                 if (!advancedMatchesExpected) {
-                                    console.warn("Herdsman accepted a confirmed pi status event despite an expectedText mismatch", {
+                                    console.warn(confirmedTerminal
+                                        ? "Herdsman accepted a confirmed pi status event despite an expectedText mismatch"
+                                        : "Herdsman accepted an unconfirmed pi status event despite an expectedText mismatch", {
                                         agentId: input.agent.id,
+                                        confirmed: confirmedTerminal,
                                         degradedReason: "expected_text_mismatch",
                                         herdrSessionName: input.agent.herdrSessionName,
                                         paneId: input.agent.paneId,
@@ -1760,11 +1811,11 @@ export class AgentIndexService {
                                 payloadExtra = degradeOrRelease("expected_text_mismatch");
                             }
                             else if (!isTerminalAssistant(advanced) || !hasNonEmptyAssistantMessage(advanced)) {
-                                // `confirmedDeliverable` is false in this arm by construction (its
+                                // `diskDeliverable` is false in this arm by construction (its
                                 // terminal/non-empty conjuncts are exactly this condition's
-                                // negation), so a confirmed round never reaches it and
-                                // `non_terminal_assistant` keeps its pre-existing meaning: only a
-                                // non-terminal or empty tail is degraded.
+                                // negation), so a round with a deliverable disk body never reaches
+                                // it and `non_terminal_assistant` keeps its pre-existing meaning:
+                                // only a non-terminal or empty tail is degraded.
                                 compactHistory = { ...advanced, lastAssistantMessage: null };
                                 payloadExtra = degradeOrRelease("non_terminal_assistant");
                             }
@@ -2127,31 +2178,23 @@ export class AgentIndexService {
 }
 function withPaneRevision(agent, overlayByPane) {
     const raw = record(agent);
-    const paneId = stringValue(raw.pane_id) ?? stringValue(raw.paneId);
+    // Herdr payloads are snake_case only (`AgentInfo` / `PaneInfo`); no camelCase
+    // alias is accepted, so a Herdr rename surfaces as a missing field instead of
+    // a silent compatibility shim.
+    const paneId = stringValue(raw.pane_id);
     const overlay = paneId ? overlayByPane.get(paneId) : undefined;
     const revision = integerValue(raw.revision) ?? overlay?.revision;
-    const terminalTitle = stringValue(raw.terminal_title) ?? stringValue(raw.terminalTitle) ?? overlay?.terminalTitle;
+    const terminalTitle = stringValue(raw.terminal_title) ?? overlay?.terminalTitle;
     if (revision === undefined && !terminalTitle)
         return raw;
-    // Collapse dual keys onto herdr-canonical snake_case `terminal_title`.
-    // Incoming snapshots may carry camelCase `terminalTitle`; spreading `raw`
-    // would otherwise leave both keys on the overlay object. Downstream
-    // HerdrAgentLike readers (AgentStore.replaceForSession) still accept
-    // camelCase as fallback, and AgentIndexRecord.terminalTitle is populated
-    // later from whichever key is present.
-    const rest = { ...raw };
-    delete rest.terminalTitle;
     return {
-        ...rest,
+        ...raw,
         ...(revision === undefined ? {} : { revision }),
         ...(terminalTitle ? { terminal_title: terminalTitle } : {}),
     };
 }
 function paneGenerationOf(agent) {
-    return (stringValue(agent.pane_generation) ??
-        stringValue(agent.paneGeneration) ??
-        stringValue(agent.creation_id) ??
-        stringValue(agent.creationId));
+    return stringValue(agent.pane_generation) ?? stringValue(agent.creation_id);
 }
 function matchingPrior(agent, previousByTerminal, previousByPane) {
     const terminalMatch = agent.terminalId ? previousByTerminal.get(agent.terminalId) : undefined;
@@ -2237,7 +2280,7 @@ function record(value) {
     return typeof value === "object" && value !== null ? value : {};
 }
 function paneGenerationFromEvent(event) {
-    return stringValue(event.pane_generation) ?? stringValue(event.paneGeneration);
+    return stringValue(event.pane_generation);
 }
 function paneIdentityKey(paneId, paneGeneration) {
     return `${paneId}\0${paneGeneration ?? ""}`;
@@ -2265,6 +2308,16 @@ function sleep(ms, signal) {
         signal?.addEventListener("abort", onAbort, { once: true });
     });
 }
+function parseCompactHistoryJson(value) {
+    if (!value)
+        return null;
+    try {
+        return JSON.parse(value);
+    }
+    catch {
+        return null;
+    }
+}
 function sameTerminalAssistantContent(current, previous, agentKind) {
     const currentMsg = current?.lastAssistantMessage;
     const prevMsg = previous?.lastAssistantMessage;
@@ -2276,7 +2329,7 @@ function sameTerminalAssistantContent(current, previous, agentKind) {
         }
         return Boolean(currentMsg.text && currentMsg.text === prevMsg.text);
     }
-    // Non-agy (pi, claude, codex, grok, opencode):
+    // Non-agy (pi):
     if (currentMsg.ref !== null && prevMsg.ref !== null) {
         return currentMsg.ref === prevMsg.ref;
     }