@dorokuma/herdsman-pi 0.6.0 → 0.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dorokuma/herdsman-pi",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Pi extension bridge for Herdsman agent history. Forked from @ryonakae/shepherd.",
   "type": "module",
   "keywords": [
@@ -10,7 +10,8 @@
   ],
   "license": "MIT",
   "files": [
-    "src"
+    "src",
+    "../LICENSE"
   ],
   "publishConfig": {
     "access": "public"

package/src/index.ts

@@ -16,7 +16,6 @@ import {
 } from "./agent-update-ui.js";
 import {
   projectAgentOutcomes,
-  createAgentOutcomeProjector,
   formatAgentOutcomeUpdates,
   WAKE_SETTLE_MS,
 } from "./wake.js";
@@ -76,6 +75,7 @@ type LaunchIdentity = {
 type DeliveredBatch = {
   assistantFinalSucceeded: boolean;
   events: AgentEventWireRecord[];
+  hasSubstantiveWork: boolean;
   invalidated: boolean;
   ownerTerminalId: string;
   herdsmanTriggered: boolean;
@@ -162,8 +162,6 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
   return function herdsmanPiExtension(pi: PiApi): void {
     pi.registerMessageRenderer?.("herdsman-wake", renderAgentUpdateMessage);
 
-    const projector = createAgentOutcomeProjector();
-
     const state: HerdsmanState = {
       client: undefined,
       connected: false,
@@ -301,18 +299,21 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
             return;
           }
 
-          const current = projectAgentOutcomes(state.pendingEvents).outcomes.filter(
+          const batchEvents = [...state.pendingEvents].sort((left, right) => left.id - right.id);
+          const batchOutcomes = projectAgentOutcomes(batchEvents).outcomes.filter(
             (outcome) => outcome.eventId > state.failedWakeThroughEventId,
           );
-          if (current.length === 0) {
+          if (batchOutcomes.length === 0) {
             state.wakeTimer = undefined;
             return;
           }
-          const batchEvents = [...state.pendingEvents].sort((left, right) => left.id - right.id);
-          const batchOutcomes = projector(batchEvents).outcomes;
+          const current = batchOutcomes;
           state.deliveredBatch = {
             assistantFinalSucceeded: false,
-            events: batchEvents,
+            events: batchEvents.filter((event) =>
+              batchOutcomes.some((outcome) => outcome.eventId === event.id),
+            ),
+            hasSubstantiveWork: false,
             invalidated: false,
             ownerTerminalId,
             herdsmanTriggered: true,
@@ -348,7 +349,7 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
       }, WAKE_SETTLE_MS);
     };
 
-    const loseRole = (ctx: PiContext | undefined) => {
+    const loseRole = (ctx: PiContext | undefined, options: { abort?: boolean } = {}) => {
       if (state.deliveredBatch) {
         state.deliveredBatch.invalidated = true;
         const lastEventId = state.deliveredBatch.events.at(-1)?.id;
@@ -358,7 +359,13 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
             lastEventId,
           );
         }
-        if (state.deliveredBatch.herdsmanTriggered) ctx?.abort?.();
+        if (
+          options.abort &&
+          state.deliveredBatch.herdsmanTriggered &&
+          !state.deliveredBatch.hasSubstantiveWork
+        ) {
+          ctx?.abort?.();
+        }
       }
       if (state.wakeRequestedThroughEventId > 0) {
         state.failedWakeThroughEventId = Math.max(
@@ -376,14 +383,21 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
 
     const markDisconnected = (ctx: PiContext | undefined) => {
       const reconnectingFromOn = state.reconnectingFromOn || state.isOrchestrator;
-      loseRole(ctx);
+      loseRole(ctx, { abort: false });
       state.reconnectingFromOn = reconnectingFromOn;
       setHerdsmanUi(ctx);
     };
 
     const resetForScopeChange = (ctx: PiContext | undefined) => {
       clearAgentContext();
-      if (state.deliveredBatch?.herdsmanTriggered) ctx?.abort?.();
+      if (
+        state.deliveredBatch?.herdsmanTriggered &&
+        !state.deliveredBatch.hasSubstantiveWork
+      ) {
+        // Scope changes invalidate the batch; an in-flight wake is only aborted
+        // when it is still the pure, empty Herdsman wake turn.
+        ctx?.abort?.();
+      }
       if (state.deliveredBatch) state.deliveredBatch.invalidated = true;
       state.deliveredBatch = undefined;
       cancelWake();
@@ -488,7 +502,7 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
         terminalId,
         workspaceId: change.current.workspaceId,
       };
-      loseRole(ctx);
+      loseRole(ctx, { abort: true });
       if (!state.roleMutationInFlight) {
         ctx?.ui.notify?.(
           change.current.owner
@@ -643,9 +657,24 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
       if (state.deliveredBatch) {
         state.deliveredBatch.assistantFinalSucceeded =
           stopReason === "stop" || stopReason === "length";
+        if (
+          message.content !== undefined &&
+          ((typeof message.content === "string" && message.content.length > 0) ||
+            (Array.isArray(message.content) && message.content.length > 0))
+        ) {
+          state.deliveredBatch.hasSubstantiveWork = true;
+        }
       }
     });
 
+    pi.on("tool_execution_start", () => {
+      if (state.deliveredBatch) state.deliveredBatch.hasSubstantiveWork = true;
+    });
+
+    pi.on("tool_result", () => {
+      if (state.deliveredBatch) state.deliveredBatch.hasSubstantiveWork = true;
+    });
+
     pi.on("agent_start", () => {
       if (state.runActive) return;
       state.runActive = true;
@@ -731,6 +760,11 @@ 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,
+          );
           break;
         }
       }