@dorokuma/herdsman 0.9.0 → 0.11.4

package/dist/src/daemon/herdr-session-watch-manager.js

@@ -1,6 +1,14 @@
-import { HerdrSocketClient } from "../herdr/socket-client.js";
+import { HERDR_TOPOLOGY_EVENT_TYPES, HerdrSocketClient } from "../herdr/socket-client.js";
 export const ACTIVE_REVISION_POLL_MS = 10_000;
 export const FULL_RESCAN_MS = 60_000;
+export const PLAN_DRAIN_GRACE_MS = 12_000;
+const VALID_AGENT_EVENT_TYPES = new Set([
+    "agent.status.changed",
+    "agent.idle",
+    "agent.done",
+    "agent.blocked",
+    "agent.failed",
+]);
 export class HerdrSessionWatchManager {
     #agents;
     #activeRevisionPollMs;
@@ -14,6 +22,7 @@ export class HerdrSessionWatchManager {
     #reconnectDelayMs;
     #refreshPublications = new WeakMap();
     #retiringWatcherLoops = new Set();
+    #inFlightPlans = new Set();
     #sessionList;
     #watchers = new Map();
     #lastFullRescanAt = 0;
@@ -58,6 +67,13 @@ export class HerdrSessionWatchManager {
         await this.#abortWatchers();
         await this.#tickInFlight?.catch(() => undefined);
         await Promise.all([...this.#retiringWatcherLoops]);
+        if (this.#inFlightPlans.size > 0) {
+            const controller = new AbortController();
+            const timeout = delay(PLAN_DRAIN_GRACE_MS, controller.signal);
+            await Promise.race([Promise.all([...this.#inFlightPlans]), timeout]).finally(() => {
+                controller.abort();
+            });
+        }
         await this.#abortWatchers();
     }
     async rescanNow() {
@@ -94,7 +110,12 @@ export class HerdrSessionWatchManager {
             return;
         }
         const workingSessions = [...this.#watchers.values()].filter(({ entry }) => this.#agents.listForHerdrSession(entry.name).some((agent) => agent.agentStatus === "working"));
-        await Promise.all(workingSessions.map(({ entry }) => this.#refresh(entry)));
+        await mapConcurrent(workingSessions, 4, async (watcher) => {
+            const agents = await this.#refresh(watcher.entry);
+            if (containsNewPaneId(agents, watcher.subscribedPaneIds)) {
+                watcher.restartSubscription?.();
+            }
+        });
     }
     async #startWatcher(entry, generation) {
         if (this.#stopping || generation !== this.#lifecycleGeneration)
@@ -106,7 +127,13 @@ export class HerdrSessionWatchManager {
         });
         const abort = new AbortController();
         const client = this.#clientFactory({ socketPath: entry.socketPath });
-        const watcher = { abort, client, entry, loop: Promise.resolve() };
+        const watcher = {
+            abort,
+            client,
+            entry,
+            loop: Promise.resolve(),
+            subscribedPaneIds: [],
+        };
         watcher.loop = this.#watch(entry, watcher, generation, abort.signal).catch(() => undefined);
         this.#watchers.set(entry.name, watcher);
         if (this.#stopping || generation !== this.#lifecycleGeneration) {
@@ -135,74 +162,84 @@ export class HerdrSessionWatchManager {
         let lastPaneIds = [];
         let lastEvent;
         let lastClosedTriggered = false;
+        let restartAgents;
         while (!signal.aborted && generation === this.#lifecycleGeneration) {
             let restart = false;
+            const subscriptionAbort = new AbortController();
+            const stopSubscription = () => subscriptionAbort.abort();
+            signal.addEventListener("abort", stopSubscription, { once: true });
+            watcher.restartSubscription = () => {
+                restart = true;
+                subscriptionAbort.abort();
+            };
             try {
-                const agents = await this.#refresh(entry);
+                if (signal.aborted)
+                    return;
+                const agents = restartAgents ?? (await this.#refresh(entry));
+                restartAgents = undefined;
                 reconnectCount = 0;
                 if (signal.aborted)
                     return;
                 const paneIds = agents.map((agent) => agent.paneId);
                 lastPaneIds = paneIds;
-                for await (const event of watcher.client.subscribeEvents({ paneIds }, { signal })) {
+                watcher.subscribedPaneIds = paneIds;
+                for await (const event of watcher.client.subscribeEvents({ paneIds }, { signal: subscriptionAbort.signal })) {
                     if (signal.aborted)
                         return;
                     const eventRecord = record(event);
                     reconnectCount = 0;
                     lastEvent = eventRecord;
                     if (eventRecord.type === "pane.agent_status_changed") {
-                        const result = await this.#index.handleHerdrEvent({
-                            event,
-                            herdrSessionName: entry.name,
-                            sessionDir: entry.sessionDir,
-                            socketPath: entry.socketPath,
-                        });
-                        this.#publishResult({
-                            agents: this.#agents.listForHerdrSession(entry.name),
-                            herdrSessionName: entry.name,
-                            ...result,
-                        });
+                        await this.#handleWatchEvent(entry, event);
                         continue;
                     }
-                    if (eventRecord.type === "pane.closed") {
-                        await this.#index.handleHerdrEvent({
-                            event,
-                            herdrSessionName: entry.name,
-                            sessionDir: entry.sessionDir,
-                            socketPath: entry.socketPath,
-                        });
+                    if (!isTopologyEvent(eventRecord.type))
+                        continue;
+                    const refreshed = await this.#refresh(entry);
+                    lastPaneIds = refreshed.map((agent) => agent.paneId);
+                    if (eventRecord.type === "pane.closed" && !closedHitsLivePane(eventRecord, refreshed)) {
+                        await this.#handleWatchEvent(entry, event);
                     }
-                    if (shouldRestartSubscription(eventRecord.type)) {
+                    if (containsNewPaneId(refreshed, watcher.subscribedPaneIds)) {
                         restart = true;
+                        restartAgents = refreshed;
                         lastClosedTriggered = eventRecord.type === "pane.closed";
-                        break;
+                        subscriptionAbort.abort();
                     }
                 }
             }
             catch (error) {
                 if (signal.aborted)
                     return;
-                reconnectCount += 1;
-                const reconnectDelayMs = Math.min(this.#reconnectDelayMs * 2 ** (reconnectCount - 1), 30_000);
-                console.warn("Herdsman Herdr subscription reconnect", {
-                    sessionName: entry.name,
-                    socketPath: entry.socketPath,
-                    paneIds: lastPaneIds,
-                    subscriptionGeneration: this.#lifecycleGeneration,
-                    eventId: lastEvent?.id ?? lastEvent?.event_id ?? null,
-                    revision: lastEvent?.revision ?? lastEvent?.pane_revision ?? null,
-                    reconnectCount,
-                    paneClosedTriggered: lastClosedTriggered,
-                    error: error instanceof Error ? error.message : String(error),
-                });
-                lastClosedTriggered = false;
-                watcher.client.close();
-                if (signal.aborted)
-                    return;
-                watcher.client = this.#clientFactory({ socketPath: entry.socketPath });
-                await delay(reconnectDelayMs, signal);
-                continue;
+                if (!restart) {
+                    reconnectCount += 1;
+                    const reconnectDelayMs = Math.min(this.#reconnectDelayMs * 2 ** (reconnectCount - 1), 30_000);
+                    console.warn("Herdsman Herdr subscription reconnect", {
+                        sessionName: entry.name,
+                        socketPath: entry.socketPath,
+                        paneIds: lastPaneIds,
+                        subscriptionGeneration: this.#lifecycleGeneration,
+                        eventId: lastEvent?.id ?? lastEvent?.event_id ?? null,
+                        revision: lastEvent?.revision ?? lastEvent?.pane_revision ?? null,
+                        reconnectCount,
+                        paneClosedTriggered: lastClosedTriggered,
+                        error: error instanceof Error ? error.message : String(error),
+                    });
+                    lastClosedTriggered = false;
+                    restartAgents = undefined;
+                    if (signal.aborted)
+                        return;
+                    this.#replaceClient(watcher, entry.socketPath);
+                    await delay(reconnectDelayMs, signal);
+                    continue;
+                }
+            }
+            finally {
+                signal.removeEventListener("abort", stopSubscription);
             }
+            if (signal.aborted)
+                return;
+            this.#replaceClient(watcher, entry.socketPath);
             if (restart) {
                 reconnectCount = 0;
                 continue;
@@ -211,22 +248,85 @@ export class HerdrSessionWatchManager {
             await delay(this.#reconnectDelayMs, signal);
         }
     }
-    #refresh(entry) {
-        const source = this.#index.refreshHerdrSession({
+    #replaceClient(watcher, socketPath) {
+        watcher.client.close();
+        watcher.client = this.#clientFactory({ socketPath });
+    }
+    async #handleWatchEvent(entry, event) {
+        const result = this.#index.handleHerdrEventFast
+            ? await this.#index.handleHerdrEventFast({
+                event,
+                herdrSessionName: entry.name,
+                sessionDir: entry.sessionDir,
+                socketPath: entry.socketPath,
+            })
+            : await this.#index.handleHerdrEvent({
+                event,
+                herdrSessionName: entry.name,
+                sessionDir: entry.sessionDir,
+                socketPath: entry.socketPath,
+            });
+        this.#publishResult({
+            agents: this.#agents.listForHerdrSession(entry.name),
             herdrSessionName: entry.name,
-            sessionDir: entry.sessionDir,
-            socketPath: entry.socketPath,
+            ...result,
         });
+        if ("statusEventPlans" in result && Array.isArray(result.statusEventPlans)) {
+            for (const plan of result.statusEventPlans) {
+                this.#submitPlan(plan);
+            }
+        }
+    }
+    #refresh(entry) {
+        const source = (this.#index.refreshHerdrSessionFast
+            ? this.#index.refreshHerdrSessionFast({
+                herdrSessionName: entry.name,
+                sessionDir: entry.sessionDir,
+                socketPath: entry.socketPath,
+            })
+            : this.#index.refreshHerdrSession({
+                herdrSessionName: entry.name,
+                sessionDir: entry.sessionDir,
+                socketPath: entry.socketPath,
+            }));
         const existing = this.#refreshPublications.get(source);
         if (existing)
             return existing;
         const publication = source.then((result) => {
             this.#publishResult({ herdrSessionName: entry.name, ...result });
+            if ("statusEventPlans" in result && Array.isArray(result.statusEventPlans)) {
+                for (const plan of result.statusEventPlans) {
+                    this.#submitPlan(plan);
+                }
+            }
             return result.agents;
         });
         this.#refreshPublications.set(source, publication);
         return publication;
     }
+    #submitPlan(plan) {
+        const execute = this.#index.executeStatusEventPlan?.(plan);
+        if (!execute)
+            return;
+        const task = Promise.resolve(execute)
+            .then((planEvent) => {
+            if (planEvent && VALID_AGENT_EVENT_TYPES.has(planEvent.type)) {
+                this.#onAgentEvent(planEvent);
+            }
+        })
+            .catch((error) => {
+            console.warn("Herdsman status event plan failed", {
+                agentId: plan.agent.id,
+                error,
+                from: plan.from,
+                to: plan.to,
+            });
+        })
+            .finally(() => {
+            this.#inFlightPlans.delete(task);
+        });
+        this.#inFlightPlans.add(task);
+    }
     #publishResult(input) {
         this.#onAgentIndexRefreshed({ agents: input.agents, herdrSessionName: input.herdrSessionName });
         for (const scope of input.contextChangedScopes)
@@ -246,14 +346,35 @@ async function delay(ms, signal) {
         }, { once: true });
     });
 }
-function shouldRestartSubscription(type) {
-    return (type === "pane.agent_detected" ||
-        type === "pane.closed" ||
-        type === "pane.created" ||
-        type === "pane.moved" ||
-        type === "workspace.closed");
+function isTopologyEvent(type) {
+    return HERDR_TOPOLOGY_EVENT_TYPES.includes(type);
+}
+function closedHitsLivePane(event, agents) {
+    const paneId = stringValue(event.pane_id) ?? stringValue(event.paneId);
+    if (!paneId)
+        return false;
+    const generation = stringValue(event.pane_generation) ?? stringValue(event.paneGeneration);
+    return agents.some((agent) => agent.paneId === paneId && (generation == null || agent.paneGeneration === generation));
+}
+function stringValue(value) {
+    return typeof value === "string" && value.length > 0 ? value : null;
+}
+function containsNewPaneId(agents, subscribedPaneIds) {
+    if (agents.length === 0)
+        return false;
+    const subscribed = new Set(subscribedPaneIds);
+    return agents.some((agent) => !subscribed.has(agent.paneId));
 }
 function record(value) {
     return typeof value === "object" && value !== null ? value : {};
 }
+async function mapConcurrent(items, limit, fn) {
+    const results = [];
+    for (let i = 0; i < items.length; i += limit) {
+        const chunk = items.slice(i, i + limit);
+        const chunkResults = await Promise.all(chunk.map(fn));
+        results.push(...chunkResults);
+    }
+    return results;
+}
 //# sourceMappingURL=herdr-session-watch-manager.js.map

package/dist/src/daemon/herdr-session-watch-manager.js.map

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

package/dist/src/daemon/observability-server.d.ts

@@ -1,3 +1,4 @@
+import { type Socket } from "node:net";
 import type { AgentHistoryService } from "../agent-history/service.js";
 import type { AgentEventStore } from "../db/agent-events.js";
 import type { AgentStore } from "../db/agents.js";
@@ -32,6 +33,7 @@ export declare class ObservabilityRpcServer {
         clearInterval?: (handle: IntervalHandle) => void;
         setInterval?: (callback: () => void, delay: number) => IntervalHandle;
         clearTimeout?: (handle: TimerHandle) => void;
+        connectSocket?: (socketPath: string) => Promise<boolean>;
         context: AgentContextService;
         disconnectGraceMs?: number;
         heartbeatScanIntervalMs?: number;
@@ -39,6 +41,7 @@ export declare class ObservabilityRpcServer {
         history: AgentHistoryService;
         now?: () => number;
         orchestrator: AgentOrchestratorService;
+        peerPidOf?: (socket: Socket) => number | undefined;
         registerPiSessionRef?: (input: {
             herdrSessionName: string;
             sessionRef: PiPresenceRegistration["sessionRef"];

package/dist/src/daemon/observability-server.d.ts.map

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

package/dist/src/daemon/observability-server.js

@@ -1,11 +1,13 @@
 import { chmodSync, existsSync, unlinkSync } from "node:fs";
 import { createServer } from "node:net";
 import { Value } from "@sinclair/typebox/value";
+import { defaultConnectSocket } from "../daemon/process-manager.js";
 import { resolveHerdrPaneIdentity, } from "../herdr/pane-identity-resolver.js";
 import { OrchestratorAckError } from "../observability/errors.js";
 import { agentEventsInputSchema, agentGetInputSchema, agentListInputSchema, agentOrchestratorAckInputSchema, agentOrchestratorGetInputSchema, agentOrchestratorRegisterInputSchema, agentOrchestratorSetInputSchema, agentReadInputSchema, agentTurnCompletedInputSchema, } from "../observability/schemas.js";
 import { TurnCompletionRegistry } from "../observability/turn-completion.js";
 import { encodeJsonLine, JsonLineDecoder, JsonLineFrameTooLargeError, } from "../shared/json-lines.js";
+import { linuxPeerPid, peerBoundToPaneCwd } from "../shared/unix-peercred.js";
 export const DISCONNECT_GRACE_MS = 5_000;
 export const STARTUP_RECONNECT_GRACE_MS = 10_000;
 export const TERMINAL_HEARTBEAT_TIMEOUT_MS = 90_000;
@@ -14,6 +16,7 @@ export class ObservabilityRpcServer {
     #clearInterval;
     #setInterval;
     #clearTimeout;
+    #connectSocket;
     #context;
     #connectionOrderBySocket = new Map();
     #publishedContextFingerprintByScope = new Map();
@@ -26,6 +29,7 @@ export class ObservabilityRpcServer {
     #heartbeatTimer;
     #now;
     #orchestrator;
+    #peerPidOf;
     #piPresenceBySocket = new Map();
     #socketsByTerminal = new Map();
     #registerPiSessionRef;
@@ -44,6 +48,7 @@ export class ObservabilityRpcServer {
         this.#clearInterval = options.clearInterval ?? clearInterval;
         this.#setInterval = options.setInterval ?? setInterval;
         this.#clearTimeout = options.clearTimeout ?? clearTimeout;
+        this.#connectSocket = options.connectSocket ?? defaultConnectSocket;
         this.#context = options.context;
         this.#disconnectGraceMs = options.disconnectGraceMs ?? DISCONNECT_GRACE_MS;
         this.#heartbeatScanIntervalMs =
@@ -52,6 +57,7 @@ export class ObservabilityRpcServer {
         this.#history = options.history;
         this.#now = options.now ?? Date.now;
         this.#orchestrator = options.orchestrator;
+        this.#peerPidOf = options.peerPidOf ?? linuxPeerPid;
         this.#registerPiSessionRef =
             options.registerPiSessionRef ?? (async () => ({ contextChangedScopes: [] }));
         this.#resolvePaneIdentity = options.resolvePaneIdentity ?? resolveHerdrPaneIdentity;
@@ -64,8 +70,12 @@ export class ObservabilityRpcServer {
     }
     async start() {
         this.#stopping = false;
-        if (existsSync(this.#socketPath))
+        if (existsSync(this.#socketPath)) {
+            if (await this.#connectSocket(this.#socketPath)) {
+                throw new Error(`Herdsman daemon socket is already reachable: ${this.#socketPath}`);
+            }
             unlinkSync(this.#socketPath);
+        }
         process.umask(0o077);
         await new Promise((resolve, reject) => {
             this.#server.once("error", reject);
@@ -92,14 +102,15 @@ export class ObservabilityRpcServer {
         this.#piPresenceBySocket.clear();
         this.#socketsByTerminal.clear();
         this.#connectionOrderBySocket.clear();
+        const wasListening = this.#server.listening;
         await new Promise((resolve, reject) => {
-            if (!this.#server.listening) {
+            if (!wasListening) {
                 resolve();
                 return;
             }
             this.#server.close((error) => (error ? reject(error) : resolve()));
         });
-        if (existsSync(this.#socketPath))
+        if (wasListening && existsSync(this.#socketPath))
             unlinkSync(this.#socketPath);
     }
     publishAgentContext(scope) {
@@ -129,6 +140,9 @@ export class ObservabilityRpcServer {
         // Status changes are persisted for history but never routed as worker wake events.
         if (event.type === "agent.status.changed")
             return;
+        if ((event.status !== "pending" && event.status !== "delivered") || event.deliverable !== 1) {
+            return;
+        }
         const scope = { herdrSessionName: event.herdrSessionName, workspaceId: event.workspaceId };
         const owner = this.#orchestrator.status(scope)?.owner;
         if (!owner || event.terminalId === owner.terminalId)
@@ -270,7 +284,7 @@ export class ObservabilityRpcServer {
             case "agent.orchestrator.register": {
                 assertSchema(agentOrchestratorRegisterInputSchema, params);
                 const previous = this.#piPresenceBySocket.get(socket);
-                const presence = await this.#resolvePiPresence(params);
+                const presence = await this.#resolvePiPresence(socket, params);
                 if (previous)
                     this.#unregisterTerminalSocket(socket, previous);
                 this.#piPresenceBySocket.set(socket, presence);
@@ -345,7 +359,7 @@ export class ObservabilityRpcServer {
                 throw new Error(`Unknown method: ${method}`);
         }
     }
-    async #resolvePiPresence(input) {
+    async #resolvePiPresence(socket, input) {
         const session = this.#stores.herdrSessions.findRunningBySocketPath(input.herdrSocketPath);
         if (!session)
             throw new Error("Herdr socket is not registered as a running session");
@@ -354,7 +368,7 @@ export class ObservabilityRpcServer {
             paneId: input.paneId,
         });
         if (indexed?.workspaceId === input.workspaceId && indexed.terminalId) {
-            return {
+            const presence = {
                 connectedAt: this.#now(),
                 herdrSessionName: session.name,
                 paneId: indexed.paneId,
@@ -362,13 +376,15 @@ export class ObservabilityRpcServer {
                 terminalId: indexed.terminalId,
                 workspaceId: indexed.workspaceId,
             };
+            this.#assertConnectorBoundToPane(socket, await this.#tryPaneIdentity(session.socketPath, input.paneId));
+            return presence;
         }
         try {
             const live = await this.#resolvePaneIdentity({
                 paneId: input.paneId,
                 socketPath: session.socketPath,
             });
-            return {
+            const presence = {
                 connectedAt: this.#now(),
                 herdrSessionName: session.name,
                 paneId: live.paneId,
@@ -376,8 +392,12 @@ export class ObservabilityRpcServer {
                 terminalId: live.terminalId,
                 workspaceId: live.workspaceId,
             };
+            this.#assertConnectorBoundToPane(socket, live);
+            return presence;
         }
-        catch {
+        catch (error) {
+            if (error instanceof ConnectorPaneMismatchError)
+                throw error;
             if (!indexed)
                 throw new Error("Herdr pane is not indexed yet");
             if (indexed.workspaceId !== input.workspaceId) {
@@ -386,6 +406,31 @@ export class ObservabilityRpcServer {
             throw new Error("Herdr pane has no terminal identity");
         }
     }
+    async #tryPaneIdentity(socketPath, paneId) {
+        try {
+            return await this.#resolvePaneIdentity({ paneId, socketPath });
+        }
+        catch {
+            return undefined;
+        }
+    }
+    #assertConnectorBoundToPane(socket, pane) {
+        const paneCwd = pane?.cwd ?? pane?.foregroundCwd;
+        if (!pane || !paneCwd) {
+            console.warn("Herdsman could not resolve Herdr pane cwd for connector binding");
+            return;
+        }
+        const peerPid = this.#peerPidOf(socket);
+        if (peerPid === undefined) {
+            console.warn("Herdsman could not read UDS peer pid for pane binding");
+            return;
+        }
+        const bound = (pane.cwd !== undefined && peerBoundToPaneCwd(peerPid, pane.cwd)) ||
+            (pane.foregroundCwd !== undefined && peerBoundToPaneCwd(peerPid, pane.foregroundCwd));
+        if (!bound) {
+            throw new ConnectorPaneMismatchError();
+        }
+    }
     #connectionState(presence) {
         const state = this.#orchestrator.status(presence);
         const context = state?.owner?.terminalId === presence.terminalId
@@ -393,7 +438,10 @@ export class ObservabilityRpcServer {
             : null;
         return {
             context,
-            events: this.#orchestrator.pending({ ...presence, limit: 100 }),
+            events: this.#orchestrator.pending({
+                ...presence,
+                limit: 100,
+            }),
             presence,
             state: state ? toWireState(state) : null,
         };
@@ -572,6 +620,12 @@ export class ObservabilityRpcServer {
         throw new Error("agent scope requires current Herdr workspace, --workspace, --session, or --all");
     }
 }
+class ConnectorPaneMismatchError extends Error {
+    constructor() {
+        super("Connector process does not match Herdr pane");
+        this.name = "ConnectorPaneMismatchError";
+    }
+}
 function historyInput(agent) {
     return {
         agent: agent.agent,
@@ -579,6 +633,7 @@ function historyInput(agent) {
         cwd: agent.cwd,
         firstSeenAtMs: agent.firstSeenAt.getTime(),
         foregroundCwd: agent.foregroundCwd,
+        herdrSessionName: agent.herdrSessionName,
     };
 }
 function assertSchema(schema, value) {