@dorokuma/herdsman-pi 0.6.3 → 0.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dorokuma/herdsman-pi",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Pi extension bridge for Herdsman agent history. Forked from @ryonakae/shepherd.",
   "type": "module",
   "keywords": [

package/src/daemon-client.ts

@@ -1,4 +1,5 @@
 import { createConnection, type Socket } from "node:net";
+import { JsonLineDecoder } from "@/shared/json-lines.js";
 
 export type AgentEventWireRecord = {
   agentId?: string | null;
@@ -99,8 +100,9 @@ export class ReconnectingDaemonClient {
   readonly #pending = new Map<string, PendingRequest>();
   readonly #reconnectDelaysMs: readonly number[];
   readonly #socketPath: string;
-  #buffer = "";
+  #decoder = new JsonLineDecoder();
   #generation = 0;
+  #incompatible = false;
   #nextId = 1;
   #reconnectAttempt = 0;
   #reconnectTimer: ReturnType<typeof setTimeout> | undefined;
@@ -116,6 +118,13 @@ export class ReconnectingDaemonClient {
     queueMicrotask(() => this.#connect());
   }
 
+  resetForSession(): void {
+    if (this.#state === "closed") return;
+    this.#incompatible = false;
+    this.#reconnectAttempt = 0;
+    this.#connect();
+  }
+
   close(): void {
     if (this.#state === "closed") return;
     this.#state = "closed";
@@ -143,11 +152,11 @@ export class ReconnectingDaemonClient {
   }
 
   #connect(): void {
-    if (this.#state === "closed" || this.#state === "connecting") return;
+    if (this.#state === "closed" || this.#incompatible) return;
     this.#state = "connecting";
     this.#generation += 1;
     const generation = this.#generation;
-    this.#buffer = "";
+    this.#decoder = new JsonLineDecoder();
     const socket = createConnection(this.#socketPath);
     this.#socket = socket;
     let disconnected = false;
@@ -177,11 +186,12 @@ export class ReconnectingDaemonClient {
   }
 
   #handleDisconnect(error: Error, generation: number): void {
-    if (generation !== this.#generation || this.#state === "closed") return;
+    if (this.#state === "closed" || this.#incompatible) return;
     this.#state = "idle";
     this.#socket = undefined;
     this.#rejectAll(error);
     this.onDisconnected?.(error);
+    if (this.#incompatible) return;
     const delay =
       this.#reconnectDelaysMs[
         Math.min(this.#reconnectAttempt, this.#reconnectDelaysMs.length - 1)
@@ -194,31 +204,39 @@ export class ReconnectingDaemonClient {
   }
 
   #handleData(chunk: string): void {
-    this.#buffer += chunk;
-    let newline = this.#buffer.indexOf("\n");
-    while (newline >= 0) {
-      const line = this.#buffer.slice(0, newline).trim();
-      this.#buffer = this.#buffer.slice(newline + 1);
-      newline = this.#buffer.indexOf("\n");
-      if (!line) continue;
-      const message = JSON.parse(line) as RpcMessage;
-      if (
-        message.method === "agent.event" ||
-        message.method === "agent.context.changed" ||
-        message.method === "agent.orchestrator.changed"
-      ) {
-        this.onStreamMessage?.(message as DaemonStreamMessage);
-        continue;
-      }
-      if (message.id === undefined) continue;
-      const pending = this.#pending.get(String(message.id));
-      if (!pending) continue;
-      this.#pending.delete(String(message.id));
-      if (message.error) pending.reject(new Error(message.error.message ?? "Herdsman RPC failed"));
-      else pending.resolve(message.result);
+    for (const message of this.#decoder.push(chunk)) {
+      this.#handleMessage(message as RpcMessage);
     }
   }
 
+  #handleMessage(message: RpcMessage): void {
+    if (
+      message.method === "agent.event" ||
+      message.method === "agent.context.changed" ||
+      message.method === "agent.orchestrator.changed"
+    ) {
+      this.onStreamMessage?.(message as DaemonStreamMessage);
+      return;
+    }
+    if (message.id === undefined) return;
+    const pending = this.#pending.get(String(message.id));
+    if (!pending) return;
+    this.#pending.delete(String(message.id));
+    if (message.error) {
+      const error = new Error(message.error.message ?? "Herdsman RPC failed");
+      pending.reject(error);
+      if (/unknown|not found|unsupported|method/i.test(error.message)) {
+        const incompatible = new Error("Herdsman daemon version is incompatible; restart the session");
+        this.#incompatible = true;
+        this.#state = "idle";
+        this.#socket?.destroy();
+        this.#socket = undefined;
+        this.#rejectAll(incompatible);
+        this.onDisconnected?.(incompatible);
+      }
+    } else pending.resolve(message.result);
+  }
+
   #rejectAll(error: Error): void {
     for (const pending of this.#pending.values()) pending.reject(error);
     this.#pending.clear();

package/src/index.ts

@@ -56,6 +56,7 @@ export type HerdsmanDaemonClient = {
   onConnected: (() => Promise<void> | void) | undefined;
   onDisconnected: ((error: Error) => void) | undefined;
   onStreamMessage: ((message: DaemonStreamMessage) => void) | undefined;
+  resetForSession?(): void;
   request(method: string, params: unknown): Promise<unknown>;
 };
 
@@ -352,11 +353,10 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
     const loseRole = (ctx: PiContext | undefined, options: { abort?: boolean } = {}) => {
       if (state.deliveredBatch) {
         state.deliveredBatch.invalidated = true;
-        const lastEventId = state.deliveredBatch.events.at(-1)?.id;
-        if (lastEventId !== undefined) {
+    if (options.abort) {
           state.failedWakeThroughEventId = Math.max(
             state.failedWakeThroughEventId,
-            lastEventId,
+            ...state.deliveredBatch.events.map((event) => event.id),
           );
         }
         if (
@@ -571,6 +571,11 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
         })
         .catch((error) => {
           state.connected = false;
+          const incompatibleMessage =
+            error instanceof Error && /incompatible/i.test(error.message)
+              ? error.message
+              : undefined;
+          if (incompatibleMessage) ctx.ui.notify?.(incompatibleMessage, "error");
           markDisconnected(ctx);
           throw error;
         })
@@ -645,6 +650,7 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
       }
       state.client?.close();
       const client = options.clientFactory?.() ?? new ReconnectingDaemonClient({ socketPath: defaultSocketPath() });
+      client.resetForSession?.();
       state.client = client;
       client.onConnected = () => registerPresence(ctx);
       client.onDisconnected = () => {
@@ -731,13 +737,6 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
       const stillOwner =
         state.isOrchestrator && state.currentScope?.terminalId === batch.ownerTerminalId;
       const failBatch = () => {
-        const lastEventId = batch.events.at(-1)?.id;
-        if (lastEventId !== undefined) {
-          state.failedWakeThroughEventId = Math.max(
-            state.failedWakeThroughEventId,
-            lastEventId,
-          );
-        }
         ctx.ui.notify?.(
           "Herdsman couldn’t acknowledge agent updates · updates remain pending",
           "warning",
@@ -773,11 +772,9 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
             "Herdsman couldn’t acknowledge agent updates · updates remain pending",
             "warning",
           );
-          const failedEventId = event.id;
-          state.failedWakeThroughEventId = Math.max(
-            state.failedWakeThroughEventId,
-            failedEventId,
-          );
+          // Keep the event pending so a later delivery can retry it. A server-side
+          // rejection may mean the pane was invalidated; advancing the wake cursor
+          // here would make a reconnect skip a still-pending event.
           break;
         }
       }