@narumitw/pi-herdr 0.3.0 → 0.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -37,16 +37,12 @@ export interface HerdrWidgetObserver {
37
37
  shutdown(ctx: ExtensionContext): Promise<void>;
38
38
  }
39
39
 
40
- const MAX_PENDING_EVENTS = 1024;
41
-
42
40
  class HerdrTopologyChangedError extends Error {}
43
41
 
44
- function requiresResubscribe(event: HerdrPaneEvent): boolean {
45
- return event.type === "created" || event.type === "moved" || event.type === "agent_detected";
46
- }
47
-
48
42
  function isRelevantEvent(model: HerdrWidgetModel, event: HerdrPaneEvent): boolean {
49
- if (event.type === "created") return model.isCurrentWorkspace(event.pane.workspaceId);
43
+ if (event.type === "created" || event.type === "updated") {
44
+ return model.isCurrentWorkspace(event.pane.workspaceId);
45
+ }
50
46
  if (event.type === "moved") {
51
47
  return (
52
48
  model.isCurrentPane(event.previousPaneId) ||
@@ -54,7 +50,7 @@ function isRelevantEvent(model: HerdrWidgetModel, event: HerdrPaneEvent): boolea
54
50
  model.isCurrentWorkspace(event.pane.workspaceId)
55
51
  );
56
52
  }
57
- return model.isCurrentWorkspace(event.workspaceId);
53
+ return "workspaceId" in event && model.isCurrentWorkspace(event.workspaceId);
58
54
  }
59
55
 
60
56
  function subscriptionFingerprint(currentPane: HerdrPane, panes: readonly HerdrPane[]): string {
@@ -165,7 +161,13 @@ export function createHerdrWidgetObserver(options: HerdrObserverOptions): HerdrW
165
161
  ),
166
162
  ]);
167
163
  if (!owns(ctx, expectedGeneration) || signal.aborted) return undefined;
168
- const namesByPane = new Map(parseAgentListResult(agentResult).map((pane) => [pane.paneId, pane.agentName]));
164
+ const panes = parsePaneListResult(listResult);
165
+ const paneIds = new Set(panes.map((pane) => pane.paneId));
166
+ const namesByPane = new Map(
167
+ parseAgentListResult(agentResult)
168
+ .filter((pane) => pane.workspaceId === currentPane.workspaceId && paneIds.has(pane.paneId))
169
+ .map((pane) => [pane.paneId, pane.agentName]),
170
+ );
169
171
  const withAgentName = (pane: HerdrPane): HerdrPane => ({
170
172
  ...pane,
171
173
  agentName: namesByPane.get(pane.paneId) ?? pane.agentName,
@@ -176,7 +178,7 @@ export function createHerdrWidgetObserver(options: HerdrObserverOptions): HerdrW
176
178
  }
177
179
  return {
178
180
  currentPane: withAgentName(currentPane),
179
- panes: parsePaneListResult(listResult).map(withAgentName),
181
+ panes: panes.map(withAgentName),
180
182
  workspace,
181
183
  };
182
184
  };
@@ -193,62 +195,27 @@ export function createHerdrWidgetObserver(options: HerdrObserverOptions): HerdrW
193
195
  const signal = attemptController.signal;
194
196
  let attemptActive = true;
195
197
  let subscription: HerdrSubscription | undefined;
196
- let refreshTask: Promise<void> | undefined;
198
+ let failure: Error | undefined;
199
+ let wake: (() => void) | undefined;
200
+ const wakeRefresh = () => {
201
+ const resolve = wake;
202
+ wake = undefined;
203
+ resolve?.();
204
+ };
205
+ signal.addEventListener("abort", wakeRefresh);
206
+ const failAttempt = (error: Error) => {
207
+ if (!attemptActive || signal.aborted) return;
208
+ failure = error;
209
+ if (owns(ctx, expectedGeneration)) clearWidget(ctx);
210
+ attemptController.abort(error);
211
+ };
197
212
  try {
198
213
  const discovered = await loadPaneSet(ctx, expectedGeneration, signal);
199
214
  if (!discovered) return;
200
215
  const subscribedFingerprint = subscriptionFingerprint(discovered.currentPane, discovered.panes);
201
216
  const model = new HerdrWidgetModel();
202
217
  model.reset(discovered.currentPane, discovered.panes, discovered.workspace);
203
- const pendingEvents: HerdrPaneEvent[] = [];
204
- const pendingStatusEvents: HerdrPaneEvent[] = [];
205
- let initialized = false;
206
- let topologyPending = false;
207
- let refreshingTopology = false;
208
- let refreshAgain = false;
209
- let rejectReconfigure!: (error: Error) => void;
210
- let reconfigureSettled = false;
211
- const reconfigure = new Promise<never>((_resolve, reject) => {
212
- rejectReconfigure = reject;
213
- });
214
- void reconfigure.catch(() => undefined);
215
- const failAttempt = (error: Error) => {
216
- if (reconfigureSettled) return;
217
- reconfigureSettled = true;
218
- rejectReconfigure(error);
219
- };
220
- const scheduleTopologyRefresh = () => {
221
- if (!initialized || !attemptActive || signal.aborted) return;
222
- if (refreshTask) {
223
- refreshAgain = true;
224
- return;
225
- }
226
- refreshTask = (async () => {
227
- do {
228
- refreshAgain = false;
229
- refreshingTopology = true;
230
- const refreshed = await loadPaneSet(ctx, expectedGeneration, signal);
231
- if (!refreshed || !attemptActive || signal.aborted) return;
232
- model.reset(refreshed.currentPane, refreshed.panes, refreshed.workspace);
233
- for (const event of pendingStatusEvents.splice(0)) {
234
- if (isRelevantEvent(model, event)) model.apply(event);
235
- }
236
- refreshingTopology = false;
237
- publish(ctx, model, expectedGeneration);
238
- if (subscriptionFingerprint(refreshed.currentPane, refreshed.panes) !== subscribedFingerprint) {
239
- failAttempt(new HerdrTopologyChangedError());
240
- return;
241
- }
242
- } while (refreshAgain && attemptActive && !signal.aborted);
243
- })()
244
- .catch((error) => {
245
- failAttempt(error instanceof Error ? error : new Error(String(error)));
246
- })
247
- .finally(() => {
248
- refreshingTopology = false;
249
- refreshTask = undefined;
250
- });
251
- };
218
+ let dirty = true;
252
219
 
253
220
  subscription = await subscribe(
254
221
  options.environment.socketEndpoint,
@@ -259,64 +226,51 @@ export function createHerdrWidgetObserver(options: HerdrObserverOptions): HerdrW
259
226
  },
260
227
  signal,
261
228
  (frame) => {
229
+ if (!attemptActive || !owns(ctx, expectedGeneration) || signal.aborted) return;
262
230
  const event = parseHerdrPaneEvent(frame);
263
- if (!initialized) {
264
- if (!event || !isRelevantEvent(model, event)) return;
265
- if (requiresResubscribe(event)) {
266
- topologyPending = true;
267
- return;
268
- }
269
- if (pendingEvents.length >= MAX_PENDING_EVENTS) {
270
- throw new Error("Too many Herdr events arrived during initialization");
271
- }
272
- pendingEvents.push(event);
273
- return;
274
- }
275
-
276
- if (!event || !owns(ctx, expectedGeneration) || signal.aborted || !isRelevantEvent(model, event)) {
277
- return;
278
- }
279
- if (requiresResubscribe(event)) {
280
- scheduleTopologyRefresh();
281
- return;
282
- }
283
- if (refreshingTopology) {
284
- if (pendingStatusEvents.length >= MAX_PENDING_EVENTS) {
285
- throw new Error("Too many Herdr status events arrived during refresh");
286
- }
287
- pendingStatusEvents.push(event);
288
- return;
289
- }
290
- model.apply(event);
291
- publish(ctx, model, expectedGeneration);
231
+ if (!event || !isRelevantEvent(model, event)) return;
232
+ dirty = true;
233
+ wakeRefresh();
292
234
  },
235
+ ).catch(async (error: unknown) => {
236
+ if (!owns(ctx, expectedGeneration) || signal.aborted) throw error;
237
+ // A pane can disappear between discovery and subscription acceptance.
238
+ // Verify a changed target set before exempting this from outage retries.
239
+ const latest = await loadPaneSet(ctx, expectedGeneration, signal);
240
+ if (latest && subscriptionFingerprint(latest.currentPane, latest.panes) !== subscribedFingerprint) {
241
+ throw new HerdrTopologyChangedError();
242
+ }
243
+ throw error;
244
+ });
245
+ void subscription.closed.then(
246
+ () => failAttempt(new Error("Herdr subscription ended")),
247
+ (error) => failAttempt(error instanceof Error ? error : new Error(String(error))),
293
248
  );
294
- if (!owns(ctx, expectedGeneration) || signal.aborted) return;
295
249
 
296
- const reconciled = await loadPaneSet(ctx, expectedGeneration, signal);
297
- if (!reconciled) return;
298
- model.reset(reconciled.currentPane, reconciled.panes, reconciled.workspace);
299
- for (const event of pendingEvents.splice(0)) {
300
- if (isRelevantEvent(model, event)) model.apply(event);
301
- }
302
- if (subscriptionFingerprint(reconciled.currentPane, reconciled.panes) !== subscribedFingerprint) {
303
- throw new HerdrTopologyChangedError();
250
+ while (owns(ctx, expectedGeneration) && !signal.aborted) {
251
+ dirty = false;
252
+ const refreshed = await loadPaneSet(ctx, expectedGeneration, signal);
253
+ if (!refreshed || signal.aborted) break;
254
+ // Events and reads have no common sequence boundary. Never replay event
255
+ // payloads over a read, or publish a read invalidated while in flight.
256
+ if (dirty) continue;
257
+ if (subscriptionFingerprint(refreshed.currentPane, refreshed.panes) !== subscribedFingerprint) {
258
+ throw new HerdrTopologyChangedError();
259
+ }
260
+ model.reset(refreshed.currentPane, refreshed.panes, refreshed.workspace);
261
+ publish(ctx, model, expectedGeneration);
262
+ await new Promise<void>((resolve) => {
263
+ wake = resolve;
264
+ if (dirty || signal.aborted) wakeRefresh();
265
+ });
304
266
  }
305
- initialized = true;
306
- publish(ctx, model, expectedGeneration);
307
- if (topologyPending) scheduleTopologyRefresh();
308
- await Promise.race([
309
- subscription.closed.then(() => {
310
- if (!signal.aborted) throw new Error("Herdr subscription ended");
311
- }),
312
- reconfigure,
313
- ]);
267
+ if (failure) throw failure;
314
268
  } finally {
315
269
  attemptActive = false;
316
270
  attemptController.abort(new DOMException("Herdr widget attempt ended", "AbortError"));
271
+ signal.removeEventListener("abort", wakeRefresh);
317
272
  sessionSignal.removeEventListener("abort", abortAttempt);
318
273
  subscription?.close();
319
- await Promise.allSettled(refreshTask ? [refreshTask] : []);
320
274
  }
321
275
  };
322
276
 
@@ -25,35 +25,24 @@ export interface HerdrWorkspace {
25
25
  }
26
26
 
27
27
  export type HerdrPaneEvent =
28
- | { type: "created"; pane: HerdrPane }
29
- | { type: "closed" | "exited"; paneId: string; workspaceId: string }
28
+ | { type: "created" | "updated"; pane: HerdrPane }
30
29
  | {
31
- type: "moved";
32
- pane: HerdrPane;
33
- previousPaneId: string;
34
- previousWorkspaceId: string;
35
- }
36
- | {
37
- type: "agent_detected";
30
+ type: "closed" | "exited" | "agent_detected" | "agent_status_changed";
38
31
  paneId: string;
39
32
  workspaceId: string;
40
- agent?: string;
41
- finalStatus?: HerdrAgentStatus;
42
- released: boolean;
43
33
  }
34
+ | { type: "workspace_renamed"; workspaceId: string }
44
35
  | {
45
- type: "agent_status_changed";
46
- paneId: string;
47
- workspaceId: string;
48
- agent?: string;
49
- agentStatus: HerdrAgentStatus;
50
- displayAgent?: string;
51
- stateLabels?: Record<string, string>;
52
- title?: string;
36
+ type: "moved";
37
+ pane: HerdrPane;
38
+ previousPaneId: string;
39
+ previousWorkspaceId: string;
53
40
  };
54
41
 
55
42
  const HERDR_WIDGET_TOPOLOGY_SUBSCRIPTIONS = [
56
43
  { type: "pane.created" },
44
+ { type: "pane.updated" },
45
+ { type: "workspace.renamed" },
57
46
  { type: "pane.closed" },
58
47
  { type: "pane.moved" },
59
48
  { type: "pane.exited" },
@@ -178,7 +167,13 @@ export function parseHerdrPaneEvent(value: unknown): HerdrPaneEvent | undefined
178
167
  }
179
168
  const data = value.data;
180
169
 
181
- if (value.event === "pane.agent_status_changed") {
170
+ if (value.event === "workspace_renamed") {
171
+ const workspaceId = requiredString(data.workspace_id);
172
+ if (!workspaceId || typeof data.label !== "string") return undefined;
173
+ return { type: "workspace_renamed", workspaceId };
174
+ }
175
+
176
+ if (value.event === "pane.agent_status_changed" || value.event === "pane_agent_status_changed") {
182
177
  const paneId = requiredString(data.pane_id);
183
178
  const workspaceId = requiredString(data.workspace_id);
184
179
  const status = agentStatus(data.agent_status);
@@ -187,17 +182,12 @@ export function parseHerdrPaneEvent(value: unknown): HerdrPaneEvent | undefined
187
182
  type: "agent_status_changed",
188
183
  paneId,
189
184
  workspaceId,
190
- agent: optionalString(data.agent),
191
- agentStatus: status,
192
- displayAgent: optionalString(data.display_agent),
193
- stateLabels: stringRecord(data.state_labels),
194
- title: optionalString(data.title),
195
185
  };
196
186
  }
197
187
 
198
- if (value.event === "pane_created") {
188
+ if (value.event === "pane_created" || value.event === "pane_updated") {
199
189
  const pane = parseHerdrPane(data.pane);
200
- return pane ? { type: "created", pane } : undefined;
190
+ return pane ? { type: value.event === "pane_created" ? "created" : "updated", pane } : undefined;
201
191
  }
202
192
  if (value.event === "pane_closed" || value.event === "pane_exited") {
203
193
  const paneId = requiredString(data.pane_id);
@@ -219,16 +209,15 @@ export function parseHerdrPaneEvent(value: unknown): HerdrPaneEvent | undefined
219
209
  if (value.event === "pane_agent_detected") {
220
210
  const paneId = requiredString(data.pane_id);
221
211
  const workspaceId = requiredString(data.workspace_id);
222
- if (!paneId || !workspaceId || typeof data.released !== "boolean") return undefined;
212
+ if (!paneId || !workspaceId || (data.released !== undefined && typeof data.released !== "boolean")) {
213
+ return undefined;
214
+ }
223
215
  const finalStatus = data.final_status === null ? undefined : agentStatus(data.final_status);
224
216
  if (data.final_status !== undefined && data.final_status !== null && !finalStatus) return undefined;
225
217
  return {
226
218
  type: "agent_detected",
227
219
  paneId,
228
220
  workspaceId,
229
- agent: optionalString(data.agent),
230
- finalStatus,
231
- released: data.released,
232
221
  };
233
222
  }
234
223
  return undefined;
@@ -1,7 +1,7 @@
1
1
  import type { Theme } from "@earendil-works/pi-coding-agent";
2
2
  import { EditorStatusWidget } from "@narumitw/pi-tui-kit/editor-status-widget";
3
3
  import { sanitizeTerminalText } from "@narumitw/pi-tui-kit/terminal-text";
4
- import type { HerdrAgentStatus, HerdrPane, HerdrPaneEvent, HerdrWorkspace } from "./herdr-protocol.js";
4
+ import type { HerdrAgentStatus, HerdrPane, HerdrWorkspace } from "./herdr-protocol.js";
5
5
 
6
6
  export const HERDR_WIDGET_KEY = "herdr:agents";
7
7
  export const MAX_HERDR_WIDGET_AGENTS = 5;
@@ -136,60 +136,6 @@ export class HerdrWidgetModel {
136
136
  return this.currentWorkspaceId === workspaceId;
137
137
  }
138
138
 
139
- apply(event: HerdrPaneEvent): void {
140
- if (event.type === "created") {
141
- this.panes.set(event.pane.paneId, observedPane(event.pane));
142
- return;
143
- }
144
- if (event.type === "closed" || event.type === "exited") {
145
- this.panes.delete(event.paneId);
146
- return;
147
- }
148
- if (event.type === "moved") {
149
- this.panes.delete(event.previousPaneId);
150
- this.panes.set(event.pane.paneId, observedPane(event.pane));
151
- if (this.currentPaneId === event.previousPaneId) {
152
- this.currentPaneId = event.pane.paneId;
153
- this.currentWorkspaceId = event.pane.workspaceId;
154
- this.workspace = { workspaceId: event.pane.workspaceId };
155
- }
156
- return;
157
- }
158
-
159
- const existing = this.panes.get(event.paneId);
160
- if (event.type === "agent_detected") {
161
- if (event.released || !event.agent) {
162
- if (existing) this.panes.set(event.paneId, { ...existing, agent: undefined });
163
- return;
164
- }
165
- this.panes.set(event.paneId, {
166
- ...(existing ?? {
167
- paneId: event.paneId,
168
- workspaceId: event.workspaceId,
169
- agentStatus: event.finalStatus ?? "unknown",
170
- stateLabels: {},
171
- }),
172
- agent: event.agent,
173
- agentStatus: event.finalStatus ?? existing?.agentStatus ?? "unknown",
174
- });
175
- return;
176
- }
177
- if (event.type !== "agent_status_changed") return;
178
-
179
- this.panes.set(event.paneId, {
180
- ...(existing ?? {
181
- paneId: event.paneId,
182
- workspaceId: event.workspaceId,
183
- stateLabels: {},
184
- }),
185
- agent: event.agent ?? existing?.agent,
186
- agentStatus: event.agentStatus,
187
- displayAgent: event.displayAgent ?? existing?.displayAgent,
188
- stateLabels: event.stateLabels ?? existing?.stateLabels ?? {},
189
- title: event.title ?? existing?.title,
190
- });
191
- }
192
-
193
139
  snapshot(): HerdrWidgetSnapshot | undefined {
194
140
  if (!this.currentPaneId || !this.currentWorkspaceId || !this.workspace) return undefined;
195
141
  const rows = [...this.panes.values()]