@dorokuma/herdsman 0.9.0 → 0.11.5

package/dist/src/db/status-event-plans.js

@@ -0,0 +1,147 @@
+export const STATUS_PLAN_MAX_ATTEMPTS = 8;
+function mapStatusEventPlan(row) {
+    let compactHistory;
+    if (row.compact_history_json) {
+        try {
+            compactHistory = JSON.parse(row.compact_history_json);
+        }
+        catch {
+            compactHistory = undefined;
+        }
+    }
+    return {
+        agentId: row.agent_id,
+        attempts: row.attempts,
+        ...(compactHistory ? { compactHistory } : {}),
+        createdAt: new Date(row.created_at),
+        fromStatus: row.from_status,
+        herdrEventKey: row.herdr_event_key,
+        herdrSessionName: row.herdr_session_name,
+        id: row.id,
+        lastError: row.last_error,
+        paneGeneration: row.pane_generation,
+        paneId: row.pane_id,
+        status: row.status,
+        toStatus: row.to_status,
+        updatedAt: new Date(row.updated_at),
+    };
+}
+export class StatusEventPlanStore {
+    #sqlite;
+    constructor(sqlite) {
+        this.#sqlite = sqlite;
+    }
+    insertPending(plan) {
+        const herdrSessionName = plan.herdrSessionName ?? plan.agent?.herdrSessionName;
+        const agentId = plan.agentId ?? plan.agent?.id;
+        const paneId = plan.paneId ?? plan.agent?.paneId;
+        const paneGeneration = plan.paneGeneration ?? plan.agent?.paneGeneration ?? null;
+        const fromStatus = plan.fromStatus ?? plan.from;
+        const toStatus = plan.toStatus ?? plan.to;
+        const herdrEventKey = plan.herdrEventKey ?? null;
+        if (!herdrSessionName || !agentId || !paneId || !fromStatus || !toStatus) {
+            throw new Error("Missing required fields for status event plan");
+        }
+        if (herdrEventKey) {
+            const existing = this.#sqlite
+                .prepare("select * from status_event_plans where herdr_session_name = ? and herdr_event_key = ?")
+                .get(herdrSessionName, herdrEventKey);
+            if (existing) {
+                return mapStatusEventPlan(existing);
+            }
+        }
+        const now = Date.now();
+        const compactHistoryJson = plan.compactHistory ? JSON.stringify(plan.compactHistory) : null;
+        try {
+            const result = this.#sqlite
+                .prepare(`insert into status_event_plans
+           (agent_id, attempts, compact_history_json, created_at, from_status, herdr_event_key, herdr_session_name, last_error, pane_generation, pane_id, status, to_status, updated_at)
+           values (?, 0, ?, ?, ?, ?, ?, null, ?, ?, 'pending', ?, ?)`)
+                .run(agentId, compactHistoryJson, now, fromStatus, herdrEventKey, herdrSessionName, paneGeneration, paneId, toStatus, now);
+            return this.get(Number(result.lastInsertRowid));
+        }
+        catch (error) {
+            if (herdrEventKey) {
+                const existing = this.#sqlite
+                    .prepare("select * from status_event_plans where herdr_session_name = ? and herdr_event_key = ?")
+                    .get(herdrSessionName, herdrEventKey);
+                if (existing)
+                    return mapStatusEventPlan(existing);
+            }
+            throw error;
+        }
+    }
+    get(id) {
+        const row = this.#sqlite.prepare("select * from status_event_plans where id = ?").get(id);
+        if (!row)
+            throw new Error(`StatusEventPlan with id ${id} not found`);
+        return mapStatusEventPlan(row);
+    }
+    listUnfinished() {
+        const rows = this.#sqlite
+            .prepare("select * from status_event_plans where status in ('pending', 'running') order by id asc")
+            .all();
+        return rows.map(mapStatusEventPlan);
+    }
+    listFailed() {
+        const rows = this.#sqlite
+            .prepare("select * from status_event_plans where status = 'failed' order by id asc")
+            .all();
+        return rows.map(mapStatusEventPlan);
+    }
+    listWaitingHistory() {
+        const rows = this.#sqlite
+            .prepare("select * from status_event_plans where status = 'pending' and last_error = 'PLAN_WAITING_HISTORY' order by id asc")
+            .all();
+        return rows.map(mapStatusEventPlan);
+    }
+    resetRunningToPending() {
+        const now = Date.now();
+        const result = this.#sqlite
+            .prepare("update status_event_plans set status = 'pending', updated_at = ? where status = 'running'")
+            .run(now);
+        return Number(result.changes);
+    }
+    markRunning(id) {
+        const now = Date.now();
+        this.#sqlite
+            .prepare("update status_event_plans set status = 'running', updated_at = ? where id = ?")
+            .run(now, id);
+    }
+    markCompleted(id) {
+        const now = Date.now();
+        this.#sqlite
+            .prepare("update status_event_plans set status = 'completed', updated_at = ? where id = ?")
+            .run(now, id);
+    }
+    markCancelled(id) {
+        const now = Date.now();
+        this.#sqlite
+            .prepare("update status_event_plans set status = 'cancelled', updated_at = ? where id = ?")
+            .run(now, id);
+    }
+    markRetry(id, error) {
+        const now = Date.now();
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        const current = this.get(id);
+        const attempts = current.attempts + 1;
+        const newStatus = attempts >= STATUS_PLAN_MAX_ATTEMPTS ? "failed" : "pending";
+        this.#sqlite
+            .prepare("update status_event_plans set attempts = ?, status = ?, last_error = ?, updated_at = ? where id = ?")
+            .run(attempts, newStatus, errorMessage, now, id);
+    }
+    /**
+     * Purges settled plans (completed/cancelled/failed) whose updated_at is
+     * older than ageMs. Pending and running rows are never touched: they are
+     * still owned by the drain/retry cycle.
+     */
+    deleteSettledOlderThan(ageMs) {
+        const cutoff = Date.now() - ageMs;
+        const result = this.#sqlite
+            .prepare(`delete from status_event_plans
+         where status in ('completed', 'cancelled', 'failed') and updated_at < ?`)
+            .run(cutoff);
+        return Number(result.changes);
+    }
+}
+//# sourceMappingURL=status-event-plans.js.map

package/dist/src/db/status-event-plans.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"status-event-plans.js","sourceRoot":"","sources":["../../../src/db/status-event-plans.ts"],"names":[],"mappings":"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"}

package/dist/src/herdr/pane-identity-resolver.d.ts

@@ -3,6 +3,10 @@ export type HerdrPaneIdentity = {
     paneId: string;
     terminalId: string;
     workspaceId: string;
+    agent?: string;
+    cwd?: string;
+    foregroundCwd?: string;
+    tabId?: string;
 };
 type PaneClient = Pick<HerdrSocketClient, "close" | "getPane">;
 export declare function resolveHerdrPaneIdentity(input: {

package/dist/src/herdr/pane-identity-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pane-identity-resolver.d.ts","sourceRoot":"","sources":["../../../src/herdr/pane-identity-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,KAAK,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;AAE/D,wBAAsB,wBAAwB,CAAC,KAAK,EAAE;IACpD,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,UAAU,CAAC;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAiB7B"}
+{"version":3,"file":"pane-identity-resolver.d.ts","sourceRoot":"","sources":["../../../src/herdr/pane-identity-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;AAE/D,wBAAsB,wBAAwB,CAAC,KAAK,EAAE;IACpD,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,UAAU,CAAC;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA6B7B"}

package/dist/src/herdr/pane-identity-resolver.js

@@ -12,7 +12,19 @@ export async function resolveHerdrPaneIdentity(input) {
         if (!paneId || !terminalId || !workspaceId) {
             throw new Error("Herdr pane response has no terminal identity");
         }
-        return { paneId, terminalId, workspaceId };
+        const agent = stringField(pane, "agent", "agent");
+        const cwd = stringField(pane, "cwd", "cwd");
+        const foregroundCwd = stringField(pane, "foreground_cwd", "foregroundCwd");
+        const tabId = stringField(pane, "tab_id", "tabId");
+        return {
+            paneId,
+            terminalId,
+            workspaceId,
+            ...(agent ? { agent } : {}),
+            ...(cwd ? { cwd } : {}),
+            ...(foregroundCwd ? { foregroundCwd } : {}),
+            ...(tabId ? { tabId } : {}),
+        };
     }
     finally {
         client.close();

package/dist/src/herdr/pane-identity-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"pane-identity-resolver.js","sourceRoot":"","sources":["../../../src/herdr/pane-identity-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAU7D,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,KAI9C;IACC,MAAM,MAAM,GAAG,KAAK,CAAC,aAAa;QAChC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC;QACvC,CAAC,CAAC,IAAI,iBAAiB,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;IAC5D,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;QACrE,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,IAAI,CAAC,WAAW,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC;IAC7C,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IAChC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACrE,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IACxB,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AACvC,CAAC;AAED,SAAS,WAAW,CAClB,KAA8B,EAC9B,SAAiB,EACjB,SAAiB;IAEjB,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;IACnD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3E,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACrD,CAAC"}
+{"version":3,"file":"pane-identity-resolver.js","sourceRoot":"","sources":["../../../src/herdr/pane-identity-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAc7D,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,KAI9C;IACC,MAAM,MAAM,GAAG,KAAK,CAAC,aAAa;QAChC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC;QACvC,CAAC,CAAC,IAAI,iBAAiB,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;IAC5D,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;QACrE,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,IAAI,CAAC,WAAW,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAClE,CAAC;QACD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAClD,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC5C,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,EAAE,gBAAgB,EAAE,eAAe,CAAC,CAAC;QAC3E,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QACnD,OAAO;YACL,MAAM;YACN,UAAU;YACV,WAAW;YACX,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3B,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvB,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3C,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC5B,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IAChC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACrE,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IACxB,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AACvC,CAAC;AAED,SAAS,WAAW,CAClB,KAA8B,EAC9B,SAAiB,EACjB,SAAiB;IAEjB,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;IACnD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3E,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACrD,CAAC"}

package/dist/src/herdr/socket-client.d.ts

@@ -2,6 +2,8 @@ export type HerdrRequestId = string;
 export type HerdrSocketClientOptions = {
     socketPath: string;
 };
+/** Session-wide topology events that must be subscribed even when no pane ids are known yet. */
+export declare const HERDR_TOPOLOGY_EVENT_TYPES: readonly ["pane.created", "pane.closed", "pane.moved", "pane.agent_detected", "workspace.closed"];
 export declare class HerdrSocketClient {
     #private;
     constructor(options: HerdrSocketClientOptions);

package/dist/src/herdr/socket-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket-client.d.ts","sourceRoot":"","sources":["../../../src/herdr/socket-client.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAsBF,qBAAa,iBAAiB;;gBAQhB,OAAO,EAAE,wBAAwB;IAQ7C,KAAK,IAAI,IAAI;IAcb,OAAO,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAIhD,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAgClC,eAAe,CACpB,MAAM,GAAE;QAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;KAAO,EACnC,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAO,GACrC,aAAa,CAAC,OAAO,CAAC;CA2H1B"}
+{"version":3,"file":"socket-client.d.ts","sourceRoot":"","sources":["../../../src/herdr/socket-client.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAsBF,gGAAgG;AAChG,eAAO,MAAM,0BAA0B,mGAM7B,CAAC;AAEX,qBAAa,iBAAiB;;gBAShB,OAAO,EAAE,wBAAwB;IAQ7C,KAAK,IAAI,IAAI;IAgCb,OAAO,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAIhD,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAgClC,eAAe,CACpB,MAAM,GAAE;QAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;KAAO,EACnC,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAO,GACrC,aAAa,CAAC,OAAO,CAAC;CA8I1B"}

package/dist/src/herdr/socket-client.js

@@ -1,11 +1,20 @@
 import { createConnection } from "node:net";
 import { encodeJsonLine, JsonLineDecoder } from "../shared/json-lines.js";
+/** Session-wide topology events that must be subscribed even when no pane ids are known yet. */
+export const HERDR_TOPOLOGY_EVENT_TYPES = [
+    "pane.created",
+    "pane.closed",
+    "pane.moved",
+    "pane.agent_detected",
+    "workspace.closed",
+];
 export class HerdrSocketClient {
     #decoder = new JsonLineDecoder();
     #pending = new Map();
     #subscribers = new Set();
     #socket;
     #socketPath;
+    #eventsSubscribed = false;
     #nextId = 1;
     constructor(options) {
         this.#socketPath = options.socketPath;
@@ -17,11 +26,30 @@ export class HerdrSocketClient {
     close() {
         this.#socket.destroy();
     }
-    #request(method, params = {}) {
+    #request(method, params = {}, signal) {
+        if (signal?.aborted) {
+            return Promise.reject(new Error("Herdr request aborted"));
+        }
         const id = `herdsman-${this.#nextId}`;
         this.#nextId += 1;
         return new Promise((resolve, reject) => {
-            this.#pending.set(id, { reject, resolve });
+            const onAbort = () => {
+                if (!this.#pending.has(id))
+                    return;
+                this.#pending.delete(id);
+                reject(new Error("Herdr request aborted"));
+            };
+            this.#pending.set(id, {
+                reject: (error) => {
+                    signal?.removeEventListener("abort", onAbort);
+                    reject(error);
+                },
+                resolve: (value) => {
+                    signal?.removeEventListener("abort", onAbort);
+                    resolve(value);
+                },
+            });
+            signal?.addEventListener("abort", onAbort, { once: true });
             this.#socket.write(encodeJsonLine({ id, method, params }));
         });
     }
@@ -59,6 +87,11 @@ export class HerdrSocketClient {
         };
     }
     async *subscribeEvents(params = {}, options = {}) {
+        // Herdr 0.9 / protocol 22 ACKs the first events.subscribe, then resets the
+        // socket if the same connection sends it again. Never re-subscribe here.
+        if (this.#eventsSubscribed) {
+            throw new Error("Herdr connection already has an events.subscribe");
+        }
         const queue = [];
         let failure;
         let wake;
@@ -76,30 +109,41 @@ export class HerdrSocketClient {
         };
         if (options.signal?.aborted)
             return;
+        this.#eventsSubscribed = true;
         this.#subscribers.add(subscriber);
         try {
-            await this.#request("events.subscribe", {
-                subscriptions: (params.paneIds ?? []).map((pane_id) => ({
-                    pane_id,
-                    type: "pane.agent_status_changed",
-                })),
-            });
-            if (options.signal?.aborted)
-                return;
-            while (!options.signal?.aborted) {
-                if (failure)
-                    throw failure;
-                if (queue.length === 0) {
-                    await new Promise((resolve) => {
-                        wake = resolve;
-                        options.signal?.addEventListener("abort", () => resolve(), { once: true });
-                    });
-                }
+            try {
+                await this.#request("events.subscribe", {
+                    subscriptions: [
+                        ...HERDR_TOPOLOGY_EVENT_TYPES.map((type) => ({ type })),
+                        ...(params.paneIds ?? []).map((pane_id) => ({
+                            pane_id,
+                            type: "pane.agent_status_changed",
+                        })),
+                    ],
+                }, options.signal);
+            }
+            catch (error) {
+                if (!options.signal?.aborted)
+                    throw error;
+            }
+            // Drain events already queued before honoring abort so a restart does
+            // not drop status already received for panes this connection subscribed
+            // to. New panes are not visible here: herdr only emits
+            // pane.agent_status_changed for pane-specific subscriptions.
+            while (true) {
                 if (failure)
                     throw failure;
-                while (queue.length > 0) {
+                if (queue.length > 0) {
                     yield queue.shift();
+                    continue;
                 }
+                if (options.signal?.aborted)
+                    return;
+                await new Promise((resolve) => {
+                    wake = resolve;
+                    options.signal?.addEventListener("abort", () => resolve(), { once: true });
+                });
             }
         }
         finally {

package/dist/src/herdr/socket-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"socket-client.js","sourceRoot":"","sources":["../../../src/herdr/socket-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"socket-client.js","sourceRoot":"","sources":["../../../src/herdr/socket-client.ts"],"names":[],"mappings":"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"}

package/dist/src/observability/agent-context-service.d.ts

@@ -1,7 +1,7 @@
 import type { AgentHistoryService } from "../agent-history/service.js";
 import type { AgentContextSnapshotStore } from "../db/agent-context-snapshots.js";
 import type { AgentStore } from "../db/agents.js";
-import type { AgentContextSnapshotRecord, AgentIndexRecord, AgentListItem, AgentQueryScope, AgentScope, AgentWorkspaceContextSnapshot } from "./contracts.js";
+import type { AgentContextSnapshotRecord, AgentHistoryRef, AgentIndexRecord, AgentListItem, AgentQueryScope, AgentScope, AgentWorkspaceContextSnapshot } from "./contracts.js";
 export type RefreshAgentContextInput = {
     agent: AgentIndexRecord;
     identityChanged: boolean;
@@ -21,6 +21,9 @@ export declare class AgentContextService {
             agents: AgentStore;
         };
     });
+    occupiedSessionPathsFor(agent: AgentIndexRecord): ReadonlySet<string>;
+    historyLookupInput(agent: AgentIndexRecord, occupiedSessionPaths?: ReadonlySet<string>): ReturnType<typeof historyLookup>;
+    preferredHistoryRef(agent: AgentIndexRecord): Promise<AgentHistoryRef | null>;
     refreshAgent(input: RefreshAgentContextInput): Promise<RefreshAgentContextResult>;
     getAgentSnapshot(agentId: string): AgentContextSnapshotRecord | undefined;
     listAgents(scope: AgentQueryScope): AgentListItem[];
@@ -28,4 +31,17 @@ export declare class AgentContextService {
         excludeTerminalId: string;
     }): AgentWorkspaceContextSnapshot | null;
 }
+export declare function occupiedForAgent(agent: AgentIndexRecord, agents: AgentStore, snapshots: AgentContextSnapshotStore): ReadonlySet<string>;
+declare function historyLookup(agent: AgentIndexRecord, agents: AgentStore, snapshots: AgentContextSnapshotStore, occupiedSessionPaths?: ReadonlySet<string>): {
+    occupiedSessionPaths: ReadonlySet<string>;
+    terminalTitle?: string;
+    grokHome?: string;
+    agent: string | null;
+    agentSession: import("./contracts.js").AgentSessionRef | null;
+    cwd: string | null;
+    firstSeenAtMs: number;
+    foregroundCwd: string | null;
+    herdrSessionName: string;
+};
+export {};
 //# sourceMappingURL=agent-context-service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"agent-context-service.d.ts","sourceRoot":"","sources":["../../../src/observability/agent-context-service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EACV,0BAA0B,EAG1B,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,UAAU,EACV,6BAA6B,EAE9B,MAAM,gBAAgB,CAAC;AAExB,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,gBAAgB,CAAC;IACxB,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,oBAAoB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,0BAA0B,CAAC;CACtC,CAAC;AAEF,qBAAa,mBAAmB;;gBAQlB,OAAO,EAAE;QACnB,OAAO,EAAE,mBAAmB,CAAC;QAC7B,MAAM,EAAE;YACN,qBAAqB,EAAE,yBAAyB,CAAC;YACjD,MAAM,EAAE,UAAU,CAAC;SACpB,CAAC;KACH;IAKK,YAAY,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,yBAAyB,CAAC;IA+CvF,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,0BAA0B,GAAG,SAAS;IAIzE,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,aAAa,EAAE;IAUnD,iBAAiB,CACf,KAAK,EAAE,UAAU,GAAG;QAAE,iBAAiB,EAAE,MAAM,CAAA;KAAE,GAChD,6BAA6B,GAAG,IAAI;CAsBxC"}
+{"version":3,"file":"agent-context-service.d.ts","sourceRoot":"","sources":["../../../src/observability/agent-context-service.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGtE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EACV,0BAA0B,EAC1B,eAAe,EAEf,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,UAAU,EACV,6BAA6B,EAE9B,MAAM,gBAAgB,CAAC;AAExB,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,gBAAgB,CAAC;IACxB,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,oBAAoB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,0BAA0B,CAAC;CACtC,CAAC;AAEF,qBAAa,mBAAmB;;gBAQlB,OAAO,EAAE;QACnB,OAAO,EAAE,mBAAmB,CAAC;QAC7B,MAAM,EAAE;YACN,qBAAqB,EAAE,yBAAyB,CAAC;YACjD,MAAM,EAAE,UAAU,CAAC;SACpB,CAAC;KACH;IAKD,uBAAuB,CAAC,KAAK,EAAE,gBAAgB,GAAG,WAAW,CAAC,MAAM,CAAC;IAIrE,kBAAkB,CAChB,KAAK,EAAE,gBAAgB,EACvB,oBAAoB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,GACzC,UAAU,CAAC,OAAO,aAAa,CAAC;IAS7B,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAoB7E,YAAY,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAmDvF,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,0BAA0B,GAAG,SAAS;IAIzE,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,aAAa,EAAE;IAUnD,iBAAiB,CACf,KAAK,EAAE,UAAU,GAAG;QAAE,iBAAiB,EAAE,MAAM,CAAA;KAAE,GAChD,6BAA6B,GAAG,IAAI;CAsBxC;AAuGD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,gBAAgB,EACvB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,yBAAyB,GACnC,WAAW,CAAC,MAAM,CAAC,CAYrB;AAMD,iBAAS,aAAa,CACpB,KAAK,EAAE,gBAAgB,EACvB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,yBAAyB,EACpC,oBAAoB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC;;;;;;;;;;EAe3C"}

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

@@ -1,6 +1,6 @@
-import { stat } from "node:fs/promises";
-import { historySourceFromSessionRef } from "../agent-history/discovery.js";
+import { discoveryRecencyGraceMs, historySourceFromSessionRef, safeAllowedSessionPath, } from "../agent-history/discovery.js";
 import { emptyCompactHistory } from "../agent-history/service.js";
+import { statSourceFingerprint } from "../agent-history/source-fingerprint.js";
 export class AgentContextService {
     #history;
     #stores;
@@ -9,26 +9,52 @@ export class AgentContextService {
         this.#history = options.history;
         this.#stores = options.stores;
     }
+    occupiedSessionPathsFor(agent) {
+        return occupiedForAgent(agent, this.#stores.agents, this.#stores.agentContextSnapshots);
+    }
+    historyLookupInput(agent, occupiedSessionPaths) {
+        return historyLookup(agent, this.#stores.agents, this.#stores.agentContextSnapshots, occupiedSessionPaths);
+    }
+    async preferredHistoryRef(agent) {
+        const previous = this.#stores.agentContextSnapshots.get(agent.id);
+        const occupiedSessionPaths = occupiedForAgent(agent, this.#stores.agents, this.#stores.agentContextSnapshots);
+        const occupiedFingerprint = fingerprintOccupied(occupiedSessionPaths);
+        const priorOccupiedFingerprint = this.#occupiedFingerprintByAgent.get(agent.id);
+        const occupiedChanged = priorOccupiedFingerprint !== undefined && priorOccupiedFingerprint !== occupiedFingerprint;
+        return selectPreferredRef({
+            agent,
+            identityChanged: occupiedChanged,
+            occupiedChanged,
+            occupiedSessionPaths,
+            previous,
+        });
+    }
     async refreshAgent(input) {
         const previous = this.#stores.agentContextSnapshots.get(input.agent.id);
-        const directAuthoritativeRef = pathHistoryRefFromAgent(input.agent);
-        const preferredRef = directAuthoritativeRef ??
-            matchingAuthoritativeIdRef(input.agent, previous?.historyRef ?? null) ??
-            (input.agent.agentSession ? null : (previous?.historyRef ?? null));
-        const occupiedSessionPaths = input.occupiedSessionPaths ?? occupiedForAgent(input.agent, this.#stores.agents);
+        const occupiedSessionPaths = new Set([
+            ...(input.occupiedSessionPaths ?? []),
+            ...occupiedForAgent(input.agent, this.#stores.agents, this.#stores.agentContextSnapshots),
+        ]);
         const occupiedFingerprint = fingerprintOccupied(occupiedSessionPaths);
         const priorOccupiedFingerprint = this.#occupiedFingerprintByAgent.get(input.agent.id);
         const occupiedChanged = priorOccupiedFingerprint !== undefined && priorOccupiedFingerprint !== occupiedFingerprint;
         this.#occupiedFingerprintByAgent.set(input.agent.id, occupiedFingerprint);
+        const preferredRef = await selectPreferredRef({
+            agent: input.agent,
+            identityChanged: input.identityChanged || occupiedChanged,
+            occupiedChanged,
+            occupiedSessionPaths,
+            previous,
+        });
         const forceDiscovery = input.forceRefresh ||
             (await shouldForceDiscovery({
                 agent: input.agent,
-                directAuthoritativeRef,
+                directAuthoritativeRef: pathHistoryRefFromAgent(input.agent),
                 identityChanged: input.identityChanged || occupiedChanged,
                 preferredRef,
                 previous,
             }));
-        const resolved = bindAuthoritativeId(input.agent, await this.#history.resolveCompactHistory(historyLookup(input.agent, this.#stores.agents, occupiedSessionPaths), {
+        const resolved = bindAuthoritativeId(input.agent, await this.#history.resolveCompactHistory(this.historyLookupInput(input.agent, occupiedSessionPaths), {
             forceDiscovery,
             ...(input.forceRefresh === undefined ? {} : { forceRefresh: input.forceRefresh }),
             ...(preferredRef ? { preferredRef } : {}),
@@ -89,15 +115,18 @@ async function shouldForceDiscovery(input) {
     const fingerprint = input.previous.sourceFingerprint;
     if (!fingerprint)
         return true;
-    const current = await sourceFingerprint(fingerprint.path);
+    const current = await statSourceFingerprint(fingerprint.path);
     return !current || sameFingerprint(fingerprint, current);
 }
 function pathHistoryRefFromAgent(agent) {
     if (agent.agentSession?.kind !== "path")
         return null;
+    const path = safeAllowedSessionPath(agent.agentSession.value);
+    if (!path)
+        return null;
     return {
         kind: "agent_session",
-        path: agent.agentSession.value,
+        path,
         source: historySourceFromSessionRef(agent.agentSession),
         value: agent.agentSession.value,
     };
@@ -129,32 +158,67 @@ function bindAuthoritativeId(agent, resolved) {
         historyRef,
     };
 }
-function occupiedForAgent(agent, agents) {
-    return new Set(agents
+async function selectPreferredRef(input) {
+    const previousRef = input.previous?.historyRef ?? null;
+    const directAuthoritativeRef = pathHistoryRefFromAgent(input.agent);
+    if (directAuthoritativeRef)
+        return directAuthoritativeRef;
+    const matchingId = matchingAuthoritativeIdRef(input.agent, previousRef);
+    if (matchingId)
+        return matchingId;
+    if (previousRef?.kind === "discovered_file") {
+        const path = previousRef.path ?? previousRef.value;
+        if (input.identityChanged || input.occupiedChanged || input.occupiedSessionPaths.has(path)) {
+            return null;
+        }
+        if (!(await discoveredFileStillRecent(input.agent, path)))
+            return null;
+        return previousRef;
+    }
+    if (input.agent.agentSession)
+        return null;
+    return previousRef;
+}
+async function discoveredFileStillRecent(agent, path) {
+    const fingerprint = await statSourceFingerprint(path);
+    if (!fingerprint)
+        return false;
+    const graceMs = discoveryRecencyGraceMs({
+        agent: agent.agent,
+        agentSession: agent.agentSession,
+        ...(agent.terminalTitle ? { terminalTitle: agent.terminalTitle } : {}),
+    });
+    return fingerprint.mtimeMs >= agent.firstSeenAt.getTime() - graceMs;
+}
+export function occupiedForAgent(agent, agents, snapshots) {
+    const others = agents
         .listForHerdrSession(agent.herdrSessionName)
-        .filter((candidate) => candidate.id !== agent.id)
-        .flatMap((candidate) => candidate.agentSession?.kind === "path" ? [candidate.agentSession.value] : []));
+        .filter((candidate) => candidate.id !== agent.id);
+    return new Set([
+        ...others.flatMap((candidate) => candidate.agentSession?.kind === "path" ? [candidate.agentSession.value] : []),
+        ...snapshots
+            .listByAgentIds(others.map((candidate) => candidate.id))
+            .flatMap((snapshot) => (snapshot.historyRef?.path ? [snapshot.historyRef.path] : [])),
+    ]);
 }
 function fingerprintOccupied(paths) {
     return [...paths].sort().join("\0");
 }
-function historyLookup(agent, agents, occupiedSessionPaths) {
+function historyLookup(agent, agents, snapshots, occupiedSessionPaths) {
     return {
         agent: agent.agent,
         agentSession: agent.agentSession,
         cwd: agent.cwd,
         firstSeenAtMs: agent.firstSeenAt.getTime(),
         foregroundCwd: agent.foregroundCwd,
+        herdrSessionName: agent.herdrSessionName,
         ...(agent.agent?.toLowerCase() === "grok" && agent.grokHome
             ? { grokHome: agent.grokHome }
             : {}),
-        occupiedSessionPaths: occupiedSessionPaths ?? occupiedForAgent(agent, agents),
+        ...(agent.terminalTitle ? { terminalTitle: agent.terminalTitle } : {}),
+        occupiedSessionPaths: occupiedSessionPaths ?? occupiedForAgent(agent, agents, snapshots),
     };
 }
-async function sourceFingerprint(path) {
-    const source = await stat(path).catch(() => null);
-    return source ? { mtimeMs: Math.trunc(source.mtimeMs), path, size: source.size } : null;
-}
 function paneRevisionIncreased(current, previous) {
     return current !== null && previous !== null && current > previous;
 }