@howaboua/pi-shepherdr 0.2.16 → 0.2.18
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.
- package/CHANGELOG.md +14 -0
- package/README.md +39 -7
- package/index.ts +1 -1
- package/package.json +3 -3
- package/src/agent-identity.ts +17 -0
- package/src/agents-contract.ts +38 -28
- package/src/agents-discovery.ts +9 -6
- package/src/agents-reply.ts +68 -0
- package/src/agents-spawn.ts +1 -10
- package/src/agents-tool.ts +23 -44
- package/src/agents-work.ts +22 -18
- package/src/controller.ts +1 -1
- package/src/extension-reply.ts +35 -0
- package/src/herdr-client.ts +29 -1
- package/src/messages.ts +82 -129
- package/src/{monitor-questions.ts → monitor-extension-messages.ts} +37 -111
- package/src/monitor-record.ts +19 -6
- package/src/monitor-state.ts +71 -25
- package/src/monitor.ts +20 -24
- package/src/peer-commands.ts +29 -15
- package/src/peer-inbox.ts +54 -1
- package/src/remote/shepherdr-channel.mjs +0 -1
- package/src/remote/shepherdr-peer.mjs +101 -18
- package/src/remote/shepherdr-session.mjs +106 -190
- package/src/remote/shepherdr.mjs +12 -2
- package/src/remote-client.ts +22 -1
- package/src/session-reader.ts +3 -364
- package/src/settlement.ts +41 -23
- package/src/types.ts +20 -16
- package/src/agents-answer.ts +0 -130
- package/src/ask-answer.ts +0 -377
package/src/agents-work.ts
CHANGED
|
@@ -3,10 +3,10 @@ import { activityTask } from "./activity.js";
|
|
|
3
3
|
import type { ConnectedMachine } from "./fleet.js";
|
|
4
4
|
import { getSnapshot } from "./herdr.js";
|
|
5
5
|
import { isDispatchRejected } from "./herdr-client.js";
|
|
6
|
-
import { agentSource
|
|
6
|
+
import { agentSource } from "./messages.js";
|
|
7
7
|
import type { WorkAttempt } from "./monitor-state.js";
|
|
8
8
|
import type { ClaimedSettlement } from "./settlement.js";
|
|
9
|
-
import type { PaneInfo, PeerDelivery } from "./types.js";
|
|
9
|
+
import type { ExtensionReply, PaneInfo, PeerDelivery } from "./types.js";
|
|
10
10
|
|
|
11
11
|
export function toolResult(value: Record<string, unknown>, warning?: string) {
|
|
12
12
|
if (warning) value = { ...value, next: warning };
|
|
@@ -81,15 +81,15 @@ export function settlementResult(
|
|
|
81
81
|
status: settlement.status,
|
|
82
82
|
...(workerError ? { worker_error: workerError } : {}),
|
|
83
83
|
...(settlement.reply ? { reply: settlement.reply.text } : {}),
|
|
84
|
-
...(settlement.
|
|
85
|
-
? {
|
|
86
|
-
ask: modelAsk(settlement.ask),
|
|
87
|
-
}
|
|
84
|
+
...(settlement.extensionMessages
|
|
85
|
+
? { extensionMessages: settlement.extensionMessages }
|
|
88
86
|
: {}),
|
|
89
87
|
...(settlement.blockedMessage
|
|
90
88
|
? { blocked_on: settlement.blockedMessage }
|
|
91
89
|
: {}),
|
|
92
|
-
...(settlement.status === "done" &&
|
|
90
|
+
...(settlement.status === "done" &&
|
|
91
|
+
!settlement.reply &&
|
|
92
|
+
!settlement.extensionMessages?.length
|
|
93
93
|
? { completed: true }
|
|
94
94
|
: {}),
|
|
95
95
|
};
|
|
@@ -103,7 +103,7 @@ export async function dispatchAgentWork(
|
|
|
103
103
|
signal: AbortSignal,
|
|
104
104
|
onUpdate: AgentToolUpdateCallback<Record<string, unknown>>,
|
|
105
105
|
send: () => Promise<PeerDelivery | void>,
|
|
106
|
-
options: { expectUserMessage?: boolean;
|
|
106
|
+
options: { expectUserMessage?: boolean; replyingTo?: ExtensionReply } = {},
|
|
107
107
|
): Promise<{
|
|
108
108
|
settlement?: ClaimedSettlement;
|
|
109
109
|
command?: true;
|
|
@@ -133,14 +133,14 @@ export async function dispatchAgentWork(
|
|
|
133
133
|
);
|
|
134
134
|
if (!attempt) throw new Error(`${panel.pane_id} is not monitored`);
|
|
135
135
|
settlement = blocking
|
|
136
|
-
? runtime.monitor.claimWork(attempt, signal, options.
|
|
136
|
+
? runtime.monitor.claimWork(attempt, signal, options.replyingTo)
|
|
137
137
|
: undefined;
|
|
138
138
|
void settlement?.catch(() => undefined);
|
|
139
139
|
signal.throwIfAborted();
|
|
140
140
|
sendStarted = true;
|
|
141
141
|
receipt = await send();
|
|
142
142
|
} catch (error) {
|
|
143
|
-
runtime.monitor.releaseWorkClaim(attempt, error);
|
|
143
|
+
if (settlement) runtime.monitor.releaseWorkClaim(attempt, error);
|
|
144
144
|
if (sendStarted) await runtime.monitor.handleWorkFailure(attempt, error);
|
|
145
145
|
else runtime.monitor.rejectWork(attempt);
|
|
146
146
|
if (addedWatch && (!sendStarted || isDispatchRejected(error))) {
|
|
@@ -162,10 +162,11 @@ export async function dispatchAgentWork(
|
|
|
162
162
|
}
|
|
163
163
|
try {
|
|
164
164
|
if (receipt?.command) {
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
165
|
+
if (settlement)
|
|
166
|
+
runtime.monitor.releaseWorkClaim(
|
|
167
|
+
attempt,
|
|
168
|
+
new Error("Command submitted without task waiting"),
|
|
169
|
+
);
|
|
169
170
|
runtime.monitor.rejectWork(attempt);
|
|
170
171
|
if (addedWatch) {
|
|
171
172
|
const record = runtime.monitor
|
|
@@ -174,21 +175,24 @@ export async function dispatchAgentWork(
|
|
|
174
175
|
if (record?.scope === "task" && !activityTask(record.activity))
|
|
175
176
|
await runtime.monitor.unwatch(record.paneId);
|
|
176
177
|
}
|
|
177
|
-
} else
|
|
178
|
+
} else {
|
|
179
|
+
runtime.monitor.acceptWork(attempt);
|
|
180
|
+
runtime.monitor.noteMessage(panel.pane_id, task);
|
|
181
|
+
}
|
|
178
182
|
await runtime.monitor.reconcileNow();
|
|
179
183
|
} catch (error) {
|
|
180
|
-
runtime.monitor.releaseWorkClaim(attempt, error);
|
|
184
|
+
if (settlement) runtime.monitor.releaseWorkClaim(attempt, error);
|
|
181
185
|
return {
|
|
182
186
|
...(receipt?.command ? { command: true } : {}),
|
|
183
187
|
warning: `Submitted, but monitoring refresh failed: ${error instanceof Error ? error.message : String(error)}. Inspect the target before resubmitting`,
|
|
184
188
|
};
|
|
185
189
|
}
|
|
186
190
|
if (receipt?.command) return { command: true };
|
|
187
|
-
if (!
|
|
191
|
+
if (!settlement) return {};
|
|
188
192
|
reportProgress(onUpdate, `Waiting for ${panel.name ?? panel.pane_id}`, {
|
|
189
193
|
machine: runtime.machine,
|
|
190
194
|
target: panel.pane_id,
|
|
191
195
|
status: "working",
|
|
192
196
|
});
|
|
193
|
-
return { settlement: await settlement
|
|
197
|
+
return { settlement: await settlement };
|
|
194
198
|
}
|
package/src/controller.ts
CHANGED
|
@@ -108,7 +108,7 @@ export function registerAgentController(
|
|
|
108
108
|
registerContextBriefing(
|
|
109
109
|
pi,
|
|
110
110
|
"active agents",
|
|
111
|
-
() => fleet.list().
|
|
111
|
+
() => fleet.list().length > 0,
|
|
112
112
|
async (ctx, windowId) => {
|
|
113
113
|
if (!hasContextRollover(ctx)) return;
|
|
114
114
|
const key = JSON.stringify([
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
|
|
2
|
+
import type { ExtensionReply } from "./types.js";
|
|
3
|
+
|
|
4
|
+
const EXTENSION_REPLY_EVENT = "@howaboua/pi-shepherdr/extension-reply/v1";
|
|
5
|
+
|
|
6
|
+
/** Producers claim synchronously and resolve only after semantic delivery/persistence. */
|
|
7
|
+
export async function dispatchExtensionReply(
|
|
8
|
+
pi: ExtensionAPI,
|
|
9
|
+
reply: ExtensionReply,
|
|
10
|
+
): Promise<string> {
|
|
11
|
+
let claimed: Promise<string> | undefined;
|
|
12
|
+
let accepting = true;
|
|
13
|
+
try {
|
|
14
|
+
pi.events.emit(EXTENSION_REPLY_EVENT, {
|
|
15
|
+
...reply,
|
|
16
|
+
respond(result: Promise<string> | string) {
|
|
17
|
+
if (!accepting || claimed)
|
|
18
|
+
throw new Error("Extension reply already claimed or dispatch ended");
|
|
19
|
+
claimed = Promise.resolve(result);
|
|
20
|
+
},
|
|
21
|
+
});
|
|
22
|
+
} finally {
|
|
23
|
+
accepting = false;
|
|
24
|
+
}
|
|
25
|
+
if (!claimed)
|
|
26
|
+
throw new Error(
|
|
27
|
+
`Reply handler for ${JSON.stringify(reply.extension)} is unavailable; reload that extension in the target session`,
|
|
28
|
+
);
|
|
29
|
+
const result = await claimed;
|
|
30
|
+
if (typeof result !== "string")
|
|
31
|
+
throw new Error(
|
|
32
|
+
"Extension reply handler returned an invalid receipt; inspect the target before retrying",
|
|
33
|
+
);
|
|
34
|
+
return result;
|
|
35
|
+
}
|
package/src/herdr-client.ts
CHANGED
|
@@ -2,13 +2,19 @@ import { createConnection } from "node:net";
|
|
|
2
2
|
import { hostname } from "node:os";
|
|
3
3
|
import { openPeerChannel } from "./remote/shepherdr-channel.mjs";
|
|
4
4
|
import { requestContext } from "./remote/shepherdr-context.mjs";
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
sendPeerCommands,
|
|
7
|
+
sendPeerExtensionReply,
|
|
8
|
+
sendPeerFocus,
|
|
9
|
+
sendPeerMessage,
|
|
10
|
+
} from "./remote/shepherdr-peer.mjs";
|
|
6
11
|
import type {
|
|
7
12
|
FocusRequest,
|
|
8
13
|
HerdrEvent,
|
|
9
14
|
MachineIdentity,
|
|
10
15
|
PaneInfo,
|
|
11
16
|
PeerChannel,
|
|
17
|
+
PeerCommand,
|
|
12
18
|
PeerDelivery,
|
|
13
19
|
PeerMessage,
|
|
14
20
|
} from "./types.js";
|
|
@@ -61,6 +67,10 @@ export function isHerdrErrorCode(error: unknown, code: string): boolean {
|
|
|
61
67
|
}
|
|
62
68
|
|
|
63
69
|
export interface HerdrConnection {
|
|
70
|
+
replyExtension(
|
|
71
|
+
agent: PaneInfo,
|
|
72
|
+
reply: import("./types.js").ExtensionReply,
|
|
73
|
+
): Promise<string>;
|
|
64
74
|
machineIdentity(): Promise<MachineIdentity>;
|
|
65
75
|
focus(agent: PaneInfo, request: FocusRequest): Promise<unknown>;
|
|
66
76
|
openFocusChannel(
|
|
@@ -75,6 +85,7 @@ export interface HerdrConnection {
|
|
|
75
85
|
contextRelayPath(): string;
|
|
76
86
|
request<T>(method: string, params?: object, timeoutMs?: number): Promise<T>;
|
|
77
87
|
sendMessage(agent: PaneInfo, message: PeerMessage): Promise<PeerDelivery>;
|
|
88
|
+
commands(agent: PaneInfo): Promise<PeerCommand[]>;
|
|
78
89
|
subscribe(
|
|
79
90
|
subscriptions: object[],
|
|
80
91
|
onEvent: (event: HerdrEvent) => void,
|
|
@@ -85,6 +96,16 @@ export interface HerdrConnection {
|
|
|
85
96
|
|
|
86
97
|
export class HerdrClient implements HerdrConnection {
|
|
87
98
|
readonly socketPath: string;
|
|
99
|
+
replyExtension(
|
|
100
|
+
agent: PaneInfo,
|
|
101
|
+
reply: import("./types.js").ExtensionReply,
|
|
102
|
+
): Promise<string> {
|
|
103
|
+
return sendPeerExtensionReply(
|
|
104
|
+
(method, params) => this.request(method, params),
|
|
105
|
+
agent,
|
|
106
|
+
reply,
|
|
107
|
+
);
|
|
108
|
+
}
|
|
88
109
|
openFocusChannel(
|
|
89
110
|
agent: PaneInfo,
|
|
90
111
|
request: FocusRequest,
|
|
@@ -136,6 +157,13 @@ export class HerdrClient implements HerdrConnection {
|
|
|
136
157
|
);
|
|
137
158
|
}
|
|
138
159
|
|
|
160
|
+
commands(agent: PaneInfo): Promise<PeerCommand[]> {
|
|
161
|
+
return sendPeerCommands(
|
|
162
|
+
(method, params) => this.request(method, params),
|
|
163
|
+
agent,
|
|
164
|
+
);
|
|
165
|
+
}
|
|
166
|
+
|
|
139
167
|
request<T>(
|
|
140
168
|
method: string,
|
|
141
169
|
params: object = {},
|
package/src/messages.ts
CHANGED
|
@@ -10,14 +10,15 @@ import { activityTask } from "./activity.js";
|
|
|
10
10
|
import { sendPolicyMessage, startPreparedIdleTurn } from "./delivery.js";
|
|
11
11
|
import { getCurrentPane, getSnapshot } from "./herdr.js";
|
|
12
12
|
import type { HerdrConnection } from "./herdr-client.js";
|
|
13
|
+
import { readExtensionMessage } from "./remote/shepherdr-session.mjs";
|
|
13
14
|
import type {
|
|
15
|
+
ExtensionMessage,
|
|
14
16
|
FocusRequest,
|
|
15
17
|
LatestAssistant,
|
|
16
18
|
MachineStatus,
|
|
17
19
|
MonitoredAgent,
|
|
18
20
|
PaneInfo,
|
|
19
21
|
PeerMessage,
|
|
20
|
-
PendingAsk,
|
|
21
22
|
ScopedMonitoredAgent,
|
|
22
23
|
SettledAgentStatus,
|
|
23
24
|
} from "./types.js";
|
|
@@ -79,22 +80,24 @@ export function activeAgentsBriefing(
|
|
|
79
80
|
agents: ScopedMonitoredAgent[],
|
|
80
81
|
machines: MachineStatus[],
|
|
81
82
|
): string | undefined {
|
|
82
|
-
|
|
83
|
-
if (!active.length) return;
|
|
83
|
+
if (!agents.length) return;
|
|
84
84
|
return [
|
|
85
|
-
"
|
|
85
|
+
"Supervised agents after context rollover. Do not duplicate running work. Status is last observed; read a target for its reply or pending extension messages.",
|
|
86
86
|
JSON.stringify(
|
|
87
|
-
|
|
87
|
+
agents.map((agent) => ({
|
|
88
88
|
machine: agent.machine,
|
|
89
89
|
target: agent.paneId,
|
|
90
90
|
...(agent.name ? { name: agent.name } : {}),
|
|
91
|
-
status:
|
|
91
|
+
status:
|
|
92
|
+
agent.activity.phase === "settled"
|
|
93
|
+
? agent.activity.status
|
|
94
|
+
: agent.activity.phase,
|
|
92
95
|
connection:
|
|
93
96
|
machines.find((machine) => machine.id === agent.machine)?.status ??
|
|
94
97
|
"unavailable",
|
|
95
98
|
...(agent.cwd ? { cwd: agent.cwd } : {}),
|
|
96
|
-
...(activityTask(agent.activity)
|
|
97
|
-
? {
|
|
99
|
+
...((agent.instructions ?? activityTask(agent.activity))
|
|
100
|
+
? { instructions: agent.instructions ?? activityTask(agent.activity) }
|
|
98
101
|
: {}),
|
|
99
102
|
})),
|
|
100
103
|
),
|
|
@@ -236,7 +239,8 @@ export async function attributeAgentPrompt(
|
|
|
236
239
|
interface AgentEventOptions {
|
|
237
240
|
agent: PaneInfo;
|
|
238
241
|
agentToolName: string;
|
|
239
|
-
|
|
242
|
+
codeMode?: boolean;
|
|
243
|
+
extensionMessages?: ExtensionMessage[];
|
|
240
244
|
blockedMessage?: string;
|
|
241
245
|
labels: AgentEventLabels;
|
|
242
246
|
machine: string;
|
|
@@ -244,20 +248,11 @@ interface AgentEventOptions {
|
|
|
244
248
|
operatorPrefix: string;
|
|
245
249
|
record: MonitoredAgent;
|
|
246
250
|
reply?: LatestAssistant;
|
|
247
|
-
status: SettledAgentStatus | "
|
|
248
|
-
}
|
|
249
|
-
|
|
250
|
-
export function modelAsk(ask: PendingAsk) {
|
|
251
|
-
return {
|
|
252
|
-
ask_id: ask.toolCallId,
|
|
253
|
-
...(ask.delivery ? { delivery: ask.delivery } : {}),
|
|
254
|
-
handoff: ask.handoff,
|
|
255
|
-
prompts: ask.prompts,
|
|
256
|
-
};
|
|
251
|
+
status: SettledAgentStatus | "extension-message";
|
|
257
252
|
}
|
|
258
253
|
|
|
259
254
|
interface AgentEventDetails {
|
|
260
|
-
|
|
255
|
+
extensionMessages?: ExtensionMessage[];
|
|
261
256
|
blockedOn?: string;
|
|
262
257
|
cwd?: string;
|
|
263
258
|
machine: string;
|
|
@@ -265,59 +260,23 @@ interface AgentEventDetails {
|
|
|
265
260
|
name?: string;
|
|
266
261
|
paneId: string;
|
|
267
262
|
response?: string;
|
|
268
|
-
state: "blocked" | "failed" | "finished" | "
|
|
263
|
+
state: "blocked" | "failed" | "finished" | "extension-message";
|
|
269
264
|
tab?: string;
|
|
270
265
|
task?: string;
|
|
271
266
|
workspace?: string;
|
|
272
267
|
}
|
|
273
268
|
|
|
274
|
-
function
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
if (
|
|
278
|
-
|
|
279
|
-
typeof
|
|
280
|
-
|
|
281
|
-
)
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
for (const value of record["prompts"]) {
|
|
286
|
-
if (typeof value !== "object" || value === null) return undefined;
|
|
287
|
-
const prompt = value as Record<string, unknown>;
|
|
288
|
-
if (
|
|
289
|
-
typeof prompt["title"] !== "string" ||
|
|
290
|
-
typeof prompt["multiple"] !== "boolean" ||
|
|
291
|
-
!Array.isArray(prompt["choices"])
|
|
292
|
-
) {
|
|
293
|
-
return undefined;
|
|
294
|
-
}
|
|
295
|
-
const choices: PendingAsk["prompts"][number]["choices"] = [];
|
|
296
|
-
for (const value of prompt["choices"]) {
|
|
297
|
-
if (typeof value !== "object" || value === null) return undefined;
|
|
298
|
-
const choice = value as Record<string, unknown>;
|
|
299
|
-
if (typeof choice["label"] !== "string") return undefined;
|
|
300
|
-
choices.push({
|
|
301
|
-
label: choice["label"],
|
|
302
|
-
...(typeof choice["description"] === "string"
|
|
303
|
-
? { description: choice["description"] }
|
|
304
|
-
: {}),
|
|
305
|
-
});
|
|
306
|
-
}
|
|
307
|
-
prompts.push({
|
|
308
|
-
title: prompt["title"],
|
|
309
|
-
multiple: prompt["multiple"],
|
|
310
|
-
choices,
|
|
311
|
-
...(typeof prompt["body"] === "string" ? { body: prompt["body"] } : {}),
|
|
312
|
-
});
|
|
313
|
-
}
|
|
314
|
-
if (prompts.length === 0) return undefined;
|
|
315
|
-
return {
|
|
316
|
-
toolCallId: record["toolCallId"],
|
|
317
|
-
...(record["delivery"] === "steer" ? { delivery: "steer" as const } : {}),
|
|
318
|
-
handoff: record["handoff"],
|
|
319
|
-
prompts,
|
|
320
|
-
};
|
|
269
|
+
function eventExtensionMessages(
|
|
270
|
+
value: unknown,
|
|
271
|
+
): ExtensionMessage[] | undefined {
|
|
272
|
+
if (!Array.isArray(value)) return undefined;
|
|
273
|
+
const messages = value.map((message) => {
|
|
274
|
+
if (typeof message !== "object" || message === null) return undefined;
|
|
275
|
+
return readExtensionMessage({ ...message, version: 1, state: "pending" });
|
|
276
|
+
});
|
|
277
|
+
return messages.every((message) => message !== undefined)
|
|
278
|
+
? messages
|
|
279
|
+
: undefined;
|
|
321
280
|
}
|
|
322
281
|
|
|
323
282
|
function boundedVoicePrompt(prompt: string): string {
|
|
@@ -337,18 +296,17 @@ function agentVoicePrompt(details: AgentEventDetails): string {
|
|
|
337
296
|
];
|
|
338
297
|
if (details.task?.trim()) lines.push(`Task:\n${details.task.trim()}`);
|
|
339
298
|
let instruction: string;
|
|
340
|
-
if (details.state === "blocked" || details.state === "
|
|
299
|
+
if (details.state === "blocked" || details.state === "extension-message") {
|
|
341
300
|
instruction =
|
|
342
|
-
details.state === "
|
|
343
|
-
? "Briefly tell the user what this worker
|
|
301
|
+
details.state === "extension-message"
|
|
302
|
+
? "Briefly tell the user what this worker reports."
|
|
344
303
|
: "Briefly tell the user why this monitored worker is blocked and what attention may be required.";
|
|
345
304
|
if (details.blockedOn?.trim())
|
|
346
305
|
lines.push(`Reason:\n${details.blockedOn.trim()}`);
|
|
347
|
-
if (details.
|
|
306
|
+
if (details.extensionMessages)
|
|
348
307
|
lines.push(
|
|
349
|
-
|
|
308
|
+
...details.extensionMessages.map((message) => message.message),
|
|
350
309
|
);
|
|
351
|
-
}
|
|
352
310
|
} else {
|
|
353
311
|
instruction =
|
|
354
312
|
details.state === "failed"
|
|
@@ -423,7 +381,7 @@ function eventDetails(value: unknown): AgentEventDetails | undefined {
|
|
|
423
381
|
(details["machine"] !== undefined &&
|
|
424
382
|
typeof details["machine"] !== "string") ||
|
|
425
383
|
(details["state"] !== "blocked" &&
|
|
426
|
-
details["state"] !== "
|
|
384
|
+
details["state"] !== "extension-message" &&
|
|
427
385
|
details["state"] !== "failed" &&
|
|
428
386
|
details["state"] !== "finished")
|
|
429
387
|
) {
|
|
@@ -433,13 +391,15 @@ function eventDetails(value: unknown): AgentEventDetails | undefined {
|
|
|
433
391
|
typeof details[field] === "string"
|
|
434
392
|
? { [field]: details[field] as string }
|
|
435
393
|
: {};
|
|
436
|
-
const
|
|
394
|
+
const extensionMessages = eventExtensionMessages(
|
|
395
|
+
details["extensionMessages"],
|
|
396
|
+
);
|
|
437
397
|
return {
|
|
438
398
|
machine:
|
|
439
399
|
typeof details["machine"] === "string" ? details["machine"] : "local",
|
|
440
400
|
paneId: details["paneId"],
|
|
441
401
|
state: details["state"],
|
|
442
|
-
...(
|
|
402
|
+
...(extensionMessages ? { extensionMessages } : {}),
|
|
443
403
|
...optional("blockedOn"),
|
|
444
404
|
...optional("cwd"),
|
|
445
405
|
...optional("machineLabel"),
|
|
@@ -458,7 +418,8 @@ function agentEvent(options: AgentEventOptions): {
|
|
|
458
418
|
const {
|
|
459
419
|
agent,
|
|
460
420
|
agentToolName,
|
|
461
|
-
|
|
421
|
+
codeMode,
|
|
422
|
+
extensionMessages,
|
|
462
423
|
blockedMessage,
|
|
463
424
|
labels,
|
|
464
425
|
machine,
|
|
@@ -470,11 +431,11 @@ function agentEvent(options: AgentEventOptions): {
|
|
|
470
431
|
} = options;
|
|
471
432
|
const task = activityTask(record.activity);
|
|
472
433
|
const blocked = status === "blocked";
|
|
473
|
-
const
|
|
434
|
+
const notification = status === "extension-message";
|
|
474
435
|
const failed = !blocked && reply?.stopReason === "error";
|
|
475
436
|
const cwd = agent.foreground_cwd ?? agent.cwd ?? record.cwd;
|
|
476
|
-
const tag =
|
|
477
|
-
? "
|
|
437
|
+
const tag = notification
|
|
438
|
+
? "herdr_agent_extension_message"
|
|
478
439
|
: blocked
|
|
479
440
|
? "herdr_agent_blocked"
|
|
480
441
|
: failed
|
|
@@ -488,23 +449,32 @@ function agentEvent(options: AgentEventOptions): {
|
|
|
488
449
|
directory: cwd,
|
|
489
450
|
});
|
|
490
451
|
const lines = [`<${tag} ${attributes}>`];
|
|
491
|
-
if (task) lines.push(`<task>${xml(task)}</task>`);
|
|
452
|
+
if (task && !notification) lines.push(`<task>${xml(task)}</task>`);
|
|
492
453
|
if (blockedMessage) {
|
|
493
454
|
lines.push(`<blocked_on>${xml(blockedMessage)}</blocked_on>`);
|
|
494
455
|
}
|
|
495
|
-
|
|
496
|
-
lines.push(
|
|
456
|
+
for (const message of extensionMessages ?? []) {
|
|
457
|
+
lines.push(message.message);
|
|
458
|
+
if (message.reply !== undefined) {
|
|
459
|
+
const request = {
|
|
460
|
+
action: "reply",
|
|
461
|
+
machine,
|
|
462
|
+
target: agent.pane_id,
|
|
463
|
+
extension: message.extension,
|
|
464
|
+
id: message.id,
|
|
465
|
+
message: message.reply,
|
|
466
|
+
};
|
|
467
|
+
const call = codeMode
|
|
468
|
+
? `await tools.${agentToolName}(${JSON.stringify(request)})`
|
|
469
|
+
: `${agentToolName} ${JSON.stringify(request)}`;
|
|
470
|
+
lines.push(`Reply: ${call}`);
|
|
471
|
+
}
|
|
497
472
|
}
|
|
498
473
|
if (blocked) {
|
|
499
474
|
lines.push(
|
|
500
475
|
`<operator_hint>${xml(blockedOperatorHint(agentToolName, machine, operatorPrefix, agent.pane_id))}</operator_hint>`,
|
|
501
476
|
);
|
|
502
477
|
}
|
|
503
|
-
if (question && ask) {
|
|
504
|
-
lines.push(
|
|
505
|
-
`<operator_hint>${xml(`Worker continues. Answer via ${agentToolName} action=answer machine=${JSON.stringify(machine)} target=${JSON.stringify(agent.pane_id)} ask_id=${JSON.stringify(ask.toolCallId)} answers=[...]`)}</operator_hint>`,
|
|
506
|
-
);
|
|
507
|
-
}
|
|
508
478
|
if (failed) {
|
|
509
479
|
lines.push(
|
|
510
480
|
`<operator_hint>${xml(failedOperatorHint(agentToolName, machine, operatorPrefix, agent.pane_id))}</operator_hint>`,
|
|
@@ -519,19 +489,19 @@ function agentEvent(options: AgentEventOptions): {
|
|
|
519
489
|
machine,
|
|
520
490
|
machineLabel,
|
|
521
491
|
paneId: agent.pane_id,
|
|
522
|
-
state:
|
|
523
|
-
? "
|
|
492
|
+
state: notification
|
|
493
|
+
? "extension-message"
|
|
524
494
|
: blocked
|
|
525
495
|
? "blocked"
|
|
526
496
|
: failed
|
|
527
497
|
? "failed"
|
|
528
498
|
: "finished",
|
|
529
|
-
...(
|
|
499
|
+
...(extensionMessages ? { extensionMessages } : {}),
|
|
530
500
|
...(agent.name || record.name ? { name: agent.name || record.name } : {}),
|
|
531
501
|
...(cwd ? { cwd } : {}),
|
|
532
502
|
...(labels.workspace ? { workspace: labels.workspace } : {}),
|
|
533
503
|
...(labels.tab ? { tab: labels.tab } : {}),
|
|
534
|
-
...(task ? { task } : {}),
|
|
504
|
+
...(task && !notification ? { task } : {}),
|
|
535
505
|
...(blockedMessage ? { blockedOn: blockedMessage } : {}),
|
|
536
506
|
...(reply ? { response: reply.text } : {}),
|
|
537
507
|
},
|
|
@@ -543,7 +513,14 @@ export function injectAgentEvent(
|
|
|
543
513
|
ctx: ExtensionContext,
|
|
544
514
|
options: AgentEventOptions,
|
|
545
515
|
): void {
|
|
546
|
-
const
|
|
516
|
+
const tools = pi.getActiveTools();
|
|
517
|
+
const message = agentEvent({
|
|
518
|
+
...options,
|
|
519
|
+
codeMode:
|
|
520
|
+
tools.includes("exec") ||
|
|
521
|
+
tools.includes("code") ||
|
|
522
|
+
tools.includes("notebook"),
|
|
523
|
+
});
|
|
547
524
|
const idle = ctx.isIdle();
|
|
548
525
|
const delivery = idle
|
|
549
526
|
? { triggerTurn: false, deliverAs: "nextTurn" as const }
|
|
@@ -588,14 +565,14 @@ export function registerAgentEventRenderer(pi: ExtensionAPI): void {
|
|
|
588
565
|
}
|
|
589
566
|
const blocked = details?.state === "blocked";
|
|
590
567
|
const failed = details?.state === "failed";
|
|
591
|
-
const
|
|
568
|
+
const notification = details.state === "extension-message";
|
|
592
569
|
const agentIdentity = details?.name
|
|
593
570
|
? `${details.name} (${details.paneId})`
|
|
594
571
|
: (details?.paneId ?? "unknown");
|
|
595
572
|
const identity = `${details.machineLabel ?? details.machine} / ${agentIdentity}`;
|
|
596
573
|
const title = theme.fg(
|
|
597
574
|
blocked || failed ? "error" : "success",
|
|
598
|
-
`Herdr agent ${identity} · ${
|
|
575
|
+
`Herdr agent ${identity} · ${notification ? "extension message pending" : blocked ? "blocked" : failed ? "failed" : "finished"}`,
|
|
599
576
|
);
|
|
600
577
|
const location = [details?.workspace, details?.tab]
|
|
601
578
|
.filter(Boolean)
|
|
@@ -606,51 +583,27 @@ export function registerAgentEventRenderer(pi: ExtensionAPI): void {
|
|
|
606
583
|
);
|
|
607
584
|
box.addChild(new Text(title, 0, 0));
|
|
608
585
|
if (metadata) box.addChild(new Text(theme.fg("dim", metadata), 0, 0));
|
|
609
|
-
if (blocked ||
|
|
586
|
+
if (blocked || notification) {
|
|
610
587
|
box.addChild(new Spacer(1));
|
|
611
588
|
box.addChild(
|
|
612
589
|
new Text(
|
|
613
590
|
theme.fg(
|
|
614
591
|
"warning",
|
|
615
592
|
details?.blockedOn ??
|
|
616
|
-
(
|
|
617
|
-
? "
|
|
593
|
+
(notification
|
|
594
|
+
? "Extension message pending"
|
|
618
595
|
: "Agent needs input or approval"),
|
|
619
596
|
),
|
|
620
597
|
0,
|
|
621
598
|
0,
|
|
622
599
|
),
|
|
623
600
|
);
|
|
624
|
-
if (details.
|
|
625
|
-
|
|
626
|
-
new
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
),
|
|
631
|
-
0,
|
|
632
|
-
0,
|
|
633
|
-
),
|
|
634
|
-
);
|
|
635
|
-
if (expanded) {
|
|
636
|
-
for (const prompt of details.ask.prompts) {
|
|
637
|
-
box.addChild(new Spacer(1));
|
|
638
|
-
box.addChild(new Text(theme.fg("muted", prompt.title), 0, 0));
|
|
639
|
-
if (prompt.body) {
|
|
640
|
-
box.addChild(
|
|
641
|
-
new Markdown(prompt.body, 0, 0, getMarkdownTheme()),
|
|
642
|
-
);
|
|
643
|
-
}
|
|
644
|
-
if (prompt.choices.length > 0) {
|
|
645
|
-
box.addChild(
|
|
646
|
-
new Text(
|
|
647
|
-
`Choices: ${prompt.choices.map((choice) => choice.label).join(", ")}`,
|
|
648
|
-
0,
|
|
649
|
-
0,
|
|
650
|
-
),
|
|
651
|
-
);
|
|
652
|
-
}
|
|
653
|
-
}
|
|
601
|
+
if (details.extensionMessages && expanded) {
|
|
602
|
+
for (const message of details.extensionMessages) {
|
|
603
|
+
box.addChild(new Spacer(1));
|
|
604
|
+
box.addChild(
|
|
605
|
+
new Markdown(message.message, 0, 0, getMarkdownTheme()),
|
|
606
|
+
);
|
|
654
607
|
}
|
|
655
608
|
}
|
|
656
609
|
}
|