@dorokuma/herdsman-pi 0.14.9 → 0.15.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dorokuma/herdsman-pi",
-  "version": "0.14.9",
+  "version": "0.15.1",
   "description": "Pi extension bridge for Herdsman agent history.",
   "type": "module",
   "keywords": [
@@ -21,6 +21,9 @@
     "url": "git+https://github.com/dorokuma/herdsman.git",
     "directory": "packages/herdsman-pi"
   },
+  "scripts": {
+    "typecheck": "tsc --noEmit -p tsconfig.json"
+  },
   "pi": {
     "extensions": [
       "./src/index.ts"
@@ -34,8 +37,5 @@
   "bugs": {
     "url": "https://github.com/dorokuma/herdsman/issues"
   },
-  "homepage": "https://github.com/dorokuma/herdsman#readme",
-  "scripts": {
-    "typecheck": "tsc --noEmit -p tsconfig.json"
-  }
-}
+  "homepage": "https://github.com/dorokuma/herdsman#readme"
+}

package/src/index.ts

@@ -97,6 +97,7 @@ type DeliveredBatch = {
 };
 
 type HerdsmanState = {
+  autoClaimAttempted: boolean;
   client: HerdsmanDaemonClient | undefined;
   connected: boolean;
   currentScope: CurrentScope | undefined;
@@ -450,6 +451,7 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
     const wakeFilter = options.wakeFilter ?? loadWakeFilterConfig();
 
     const state: HerdsmanState = {
+      autoClaimAttempted: false,
       client: undefined,
       connected: false,
       currentScope: undefined,
@@ -2021,10 +2023,32 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
           subscriberKind: "pi",
           workspaceId: state.currentScope?.workspaceId ?? launchIdentity.workspaceId,
         })
-        .then((response) => {
+        .then(async (rawResponse) => {
           state.connected = true;
           startKeepalive(client);
-          applyConnectionStateResponse(response as ConnectionStateResponse, ctx, {
+          let response = rawResponse as ConnectionStateResponse;
+          const currentPaneId = state.currentScope?.paneId ?? launchIdentity.paneId;
+          if (
+            process.env.HERDSMAN_AUTO_ON === "1" &&
+            !state.autoClaimAttempted &&
+            isMainOrchestratorPane(currentPaneId) &&
+            !isDispatchedRoleSession(sessionRef.value, process.env)
+          ) {
+            state.autoClaimAttempted = true;
+            if (!isLocalOwner(response) && !response.state?.owner) {
+              try {
+                state.roleMutationInFlight = true;
+                response = (await client.request("agent.orchestrator.set", {
+                  enabled: true,
+                })) as ConnectionStateResponse;
+              } catch {
+                // Ignore race if another terminal claimed the workspace concurrently.
+              } finally {
+                state.roleMutationInFlight = false;
+              }
+            }
+          }
+          applyConnectionStateResponse(response, ctx, {
             notifyReconnectLoss: true,
           });
         })
@@ -2095,6 +2119,7 @@ export function createHerdsmanPiExtension(options: ExtensionOptions = {}) {
 
     pi.on("session_start", (_event: unknown, ctx: PiContext) => {
       activeContext = ctx;
+      state.autoClaimAttempted = false;
       state.subscriberId = ctx.sessionManager.getSessionId();
       state.sessionRef = {
         agent: "pi",
@@ -2438,6 +2463,17 @@ function herdrLaunchIdentity(environment: NodeJS.ProcessEnv): LaunchIdentity | u
   return { herdrSocketPath, paneId, workspaceId };
 }
 
+function isMainOrchestratorPane(paneId: string): boolean {
+  return paneId.trim().endsWith(":p1");
+}
+
+function isDispatchedRoleSession(sessionPath: string, environment: NodeJS.ProcessEnv): boolean {
+  if (typeof environment.CTXMODE_ROLE === "string" && environment.CTXMODE_ROLE.trim().length > 0) {
+    return true;
+  }
+  return sessionPath.startsWith("/tmp/herdr-role-sessions/");
+}
+
 
 function stringValue(value: unknown): string | null {
   return typeof value === "string" && value.length > 0 ? value : null;

package/src/wake.ts

@@ -7,15 +7,19 @@ import { DEFAULT_WAKE_FILTER_CONFIG, isUpstreamModelError, type WakeFilterConfig
 // next microtask (0ms timer) instead of waiting out a settle window. Delivery
 // latency is owned by the bounded deferral in the extension, not by this delay.
 export const WAKE_SETTLE_MS = 0;
-// Mirrors `PLAN_WAITING_HISTORY` in `src/observability/contracts.ts` (the string
-// value is the contract; duplicated here because `@dorokuma/herdsman-pi` ships
-// standalone `src/` without root `src/`).
+// Mirrors the `STALLED_PLAN_ERRORS` set in `src/observability/contracts.ts`
+// (`PLAN_WAITING_HISTORY` / `PLAN_STALLED` / `DEGRADED_PLAN_ERROR`, the last one
+// spelled `"degraded"` inline below) and the copy in `src/agy/hook.ts`: the
+// string value is the contract, and the reason is duplicated here because
+// `@dorokuma/herdsman-pi` ships standalone `src/` without root `src/`. All three
+// places must change together.
 export const PLAN_WAITING_HISTORY = "PLAN_WAITING_HISTORY";
+export const PLAN_STALLED = "PLAN_STALLED";
 
 export type AgentOutcome = {
   agent: string;
   eventId: number;
-  kind: "blocked" | "completed" | "failed";
+  kind: "blocked" | "completed" | "failed" | "stalled";
   name?: string | null;
   paneId: string | null;
   reason?: string;
@@ -93,8 +97,31 @@ function outcomeKind(event: AgentEventWireRecord): AgentOutcome["kind"] | undefi
     return "failed";
   }
   if (event.type === "agent.discarded") {
-    // 观察者放弃等待也是终态失败：结果永远不会到达，必须能在编排者对话里被唤醒。
-    // 压制/死信语义保持既有实现（上游错误抑制、pane 级 fallback 压制、seen 去重）。
+    const payload = asRecord(event.payload);
+    const agent = stringValue(payload.agent);
+    const isAgyOrEmpty = agent === undefined || agent === "agy";
+    if (isAgyOrEmpty) {
+      const reason = stringValue(payload.reason);
+      // A stalled plan has *settled*, which makes it unlike PLAN_WAITING_HISTORY
+      // / degraded ("still waiting, nothing happened yet"): the round's outcome is
+      // gone and the orchestrator has to see that. With the fallback marker it
+      // projects as the self-readable `stalled`; a legacy row written before the
+      // marker existed still wakes as a plain `failed` rather than vanishing.
+      // A `pi` discard never enters this branch (`agent === "pi"` fails
+      // `isAgyOrEmpty`), so pi's own PLAN_STALLED handling is unchanged.
+      if (reason === PLAN_STALLED) {
+        if (payload.fallbackOutcome === true) {
+          return "stalled";
+        }
+        return "failed";
+      }
+      if (reason === PLAN_WAITING_HISTORY || reason === "degraded") {
+        if (payload.fallbackOutcome === true) {
+          return "stalled";
+        }
+        return undefined;
+      }
+    }
     return "failed";
   }
   const payload = asRecord(event.payload);
@@ -169,7 +196,8 @@ function project(
     }
 
     const text = normalizeExcerpt(event.compactHistory?.lastAssistantMessage?.text);
-    const reason = kind === "failed" ? normalizeExcerpt(payload.reason) : undefined;
+    const reason =
+      kind === "failed" || kind === "stalled" ? normalizeExcerpt(payload.reason) : undefined;
     // Upstream model errors are transient provider failures, not agent results:
     // they are dropped from the wake projection without an outcome (and without
     // being consumed into `seen`, so they stay visible as raw evidence).
@@ -243,6 +271,12 @@ export function formatAgentOutcomeUpdates(outcomes: AgentOutcome[]): string {
         outcome.text.length > 0 ? `\n  last assistant (pre-round): ${outcome.text}` : "";
       return `- failed ${identity} ${pane}\n  reason: ${reason}${body}`;
     }
+    if (outcome.kind === "stalled") {
+      const reason = outcome.reason && outcome.reason.length > 0 ? outcome.reason : "(unknown)";
+      const body =
+        outcome.text.length > 0 ? `\n  last assistant (pre-round): ${outcome.text}` : "";
+      return `- stalled ${identity} ${pane}\n  reason: ${reason} (结果未取到，需自读 pane)${body}`;
+    }
     const excerpt = outcome.text.length > 0 ? outcome.text : "(no assistant message)";
     return `- ${outcome.kind} ${identity} ${pane}\n  last assistant: ${excerpt}\n  event: ${outcome.eventId}`;
   }).join("\n");