@usine/agents 0.3.0 → 0.4.0
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/README.md +92 -30
- package/dist/child-host/child-host.d.ts +60 -0
- package/dist/child-host/child-host.d.ts.map +1 -0
- package/dist/child-host/child-host.js +84 -0
- package/dist/child-host/child-host.js.map +1 -0
- package/dist/child-host/command.d.ts +11 -0
- package/dist/child-host/command.d.ts.map +1 -0
- package/dist/child-host/command.js +26 -0
- package/dist/child-host/command.js.map +1 -0
- package/dist/pi/authentication.d.ts +11 -2
- package/dist/pi/authentication.d.ts.map +1 -1
- package/dist/pi/authentication.js +15 -2
- package/dist/pi/authentication.js.map +1 -1
- package/dist/pi/children.d.ts +1 -4
- package/dist/pi/children.d.ts.map +1 -1
- package/dist/pi/children.js +1 -4
- package/dist/pi/children.js.map +1 -1
- package/dist/pi/claude.d.ts +8 -9
- package/dist/pi/claude.d.ts.map +1 -1
- package/dist/pi/claude.js +366 -50
- package/dist/pi/claude.js.map +1 -1
- package/dist/pi/codex/account.d.ts +3 -3
- package/dist/pi/codex/account.d.ts.map +1 -1
- package/dist/pi/codex/account.js +5 -5
- package/dist/pi/codex/account.js.map +1 -1
- package/dist/pi/codex/app-server.d.ts +19 -7
- package/dist/pi/codex/app-server.d.ts.map +1 -1
- package/dist/pi/codex/app-server.js +41 -36
- package/dist/pi/codex/app-server.js.map +1 -1
- package/dist/pi/codex/codec.d.ts +35 -13
- package/dist/pi/codex/codec.d.ts.map +1 -1
- package/dist/pi/codex/codec.js +42 -15
- package/dist/pi/codex/codec.js.map +1 -1
- package/dist/pi/codex/codex.d.ts +0 -1
- package/dist/pi/codex/codex.d.ts.map +1 -1
- package/dist/pi/codex/codex.js +75 -14
- package/dist/pi/codex/codex.js.map +1 -1
- package/dist/pi/conversation.d.ts +29 -12
- package/dist/pi/conversation.d.ts.map +1 -1
- package/dist/pi/conversation.js +54 -18
- package/dist/pi/conversation.js.map +1 -1
- package/dist/pi/pi.d.ts +1 -4
- package/dist/pi/pi.d.ts.map +1 -1
- package/dist/pi/pi.js +24 -175
- package/dist/pi/pi.js.map +1 -1
- package/dist/pi/sdk.d.ts +11 -15
- package/dist/pi/sdk.d.ts.map +1 -1
- package/dist/pi/sdk.js +35 -53
- package/dist/pi/sdk.js.map +1 -1
- package/dist/pi/session.d.ts +13 -14
- package/dist/pi/session.d.ts.map +1 -1
- package/dist/pi/session.js +63 -24
- package/dist/pi/session.js.map +1 -1
- package/dist/pi/turns.d.ts +7 -7
- package/dist/pi/turns.d.ts.map +1 -1
- package/dist/pi/turns.js +22 -9
- package/dist/pi/turns.js.map +1 -1
- package/dist/pi/usage.d.ts +29 -15
- package/dist/pi/usage.d.ts.map +1 -1
- package/dist/pi/usage.js +48 -24
- package/dist/pi/usage.js.map +1 -1
- package/dist/preflight/command.d.ts +16 -3
- package/dist/preflight/command.d.ts.map +1 -1
- package/dist/preflight/command.js +30 -17
- package/dist/preflight/command.js.map +1 -1
- package/dist/preflight/preflight.d.ts +10 -5
- package/dist/preflight/preflight.d.ts.map +1 -1
- package/dist/preflight/preflight.js +52 -25
- package/dist/preflight/preflight.js.map +1 -1
- package/dist/prompt.d.ts +12 -9
- package/dist/prompt.d.ts.map +1 -1
- package/dist/prompt.js +33 -4
- package/dist/prompt.js.map +1 -1
- package/dist/protocol/codex.d.ts +4 -7
- package/dist/protocol/codex.d.ts.map +1 -1
- package/dist/protocol/codex.js +1 -1
- package/dist/protocol/codex.js.map +1 -1
- package/dist/runtime.d.ts +100 -55
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +108 -27
- package/dist/runtime.js.map +1 -1
- package/package.json +22 -10
- package/dist/pi/live.d.ts +0 -4
- package/dist/pi/live.d.ts.map +0 -1
- package/dist/pi/live.js +0 -11
- package/dist/pi/live.js.map +0 -1
- package/dist/pi/subagents.d.ts +0 -29
- package/dist/pi/subagents.d.ts.map +0 -1
- package/dist/pi/subagents.js +0 -120
- package/dist/pi/subagents.js.map +0 -1
- package/dist/pi/thinking.d.ts +0 -8
- package/dist/pi/thinking.d.ts.map +0 -1
- package/dist/pi/thinking.js +0 -15
- package/dist/pi/thinking.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codec.js","sourceRoot":"","sources":["../../../src/pi/codex/codec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,eAAe,IAAI,mBAAmB,GACvC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAQ1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAoB,cAAc,EAAE,MAAM,iBAAiB,CAAC;AASnE,
|
|
1
|
+
{"version":3,"file":"codec.js","sourceRoot":"","sources":["../../../src/pi/codex/codec.ts"],"names":[],"mappings":"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"}
|
package/dist/pi/codex/codex.d.ts
CHANGED
|
@@ -2,6 +2,5 @@ import { Layer } from "effect";
|
|
|
2
2
|
import { CodexChildBackend } from "../../runtime.ts";
|
|
3
3
|
import { CodexAppServer } from "./app-server.ts";
|
|
4
4
|
export { CodexAppServer, codexAppServerLive, type CodexConnection } from "./app-server.ts";
|
|
5
|
-
/** Provides Codex coding sessions for tasks delegated by a parent. */
|
|
6
5
|
export declare const codexChildBackendLayer: Layer.Layer<CodexChildBackend, never, CodexAppServer>;
|
|
7
6
|
//# sourceMappingURL=codex.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/pi/codex/codex.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../../src/pi/codex/codex.ts"],"names":[],"mappings":"AAeA,OAAO,EAAoB,KAAK,EAA0B,MAAM,QAAQ,CAAC;AAuBzE,OAAO,EAGL,iBAAiB,EAIlB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,cAAc,EAAoC,MAAM,iBAAiB,CAAC;AAGnF,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAgf3F,eAAO,MAAM,sBAAsB,uDAAkD,CAAC"}
|
package/dist/pi/codex/codex.js
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { BrainSpec, ModelId } from "@usine/core/agent/brain";
|
|
2
|
-
import { ChildSession, PoolRateLimitsUpdated, RateLimitsSnapshot, SessionStarted, HarnessSession, SessionTokensUpdated, TextOutput, ToolFinished, ToolStarted, } from "@usine/core/agent/session";
|
|
2
|
+
import { ChildSession, PoolRateLimitsUpdated, ProviderRecovered, ProviderRetries, ProviderRetrying, RateLimitsSnapshot, SessionStarted, HarnessSession, SessionTokensUpdated, TextOutput, ToolFinished, ToolStarted, } from "@usine/core/agent/session";
|
|
3
3
|
import { Deferred, Effect, Layer, Option, Schema, Stream } from "effect";
|
|
4
4
|
import { AccountUpdated } from "../../protocol/codex.js";
|
|
5
|
-
import { json, ModelListResponse, ThreadStartResponse, TurnStartResponse, ItemNotification, AgentMessageItem, ToolItem, TurnCompleted, RateLimitsUpdated, decodeResponse, decodeNotification, toolName, rateLimitWindow, } from "./codec.js";
|
|
5
|
+
import { json, ModelListResponse, ThreadStartResponse, TurnStartResponse, ItemNotification, AgentMessageItem, ToolItem, TurnCompleted, UserMessageItem, userMessageText, RateLimitsUpdated, ErrorNotification, TurnActivity, decodeResponse, decodeNotification, providerRetryMessage, toolName, rateLimitWindow, } from "./codec.js";
|
|
6
6
|
import { AgentResultError, CodexChildBackend, UnknownModelError, UnsupportedEffortError, } from "../../runtime.js";
|
|
7
7
|
import { sessionChannel } from "../session.js";
|
|
8
8
|
import { sessionConversation } from "../conversation.js";
|
|
9
|
-
import { CodexTokenUsage } from "../usage.js";
|
|
9
|
+
import { CodexTokenUsage, codexThreadTokens } from "../usage.js";
|
|
10
10
|
import { CodexAppServer, operationError } from "./app-server.js";
|
|
11
11
|
import { codexPoolUnavailable, initializeCodex, verifyCodexAccount } from "./account.js";
|
|
12
12
|
export { CodexAppServer, codexAppServerLive } from "./app-server.js";
|
|
13
|
-
/**
|
|
13
|
+
/** The server notification methods with no session event equivalent; they are only logged. */
|
|
14
14
|
const DIAGNOSTIC_METHODS = new Set([
|
|
15
15
|
"error",
|
|
16
16
|
"warning",
|
|
@@ -19,6 +19,8 @@ const DIAGNOSTIC_METHODS = new Set([
|
|
|
19
19
|
"guardianWarning",
|
|
20
20
|
"model/rerouted",
|
|
21
21
|
]);
|
|
22
|
+
const decodeRetry = Schema.decodeUnknownOption(ErrorNotification);
|
|
23
|
+
const isTurnActivity = Schema.is(TurnActivity);
|
|
22
24
|
const makeCodexChild = Effect.gen(function* () {
|
|
23
25
|
const appServer = yield* CodexAppServer;
|
|
24
26
|
const launch = Effect.fn("CodexChildBackend.launch")(function* (request) {
|
|
@@ -31,7 +33,12 @@ const makeCodexChild = Effect.gen(function* () {
|
|
|
31
33
|
sessionId: request.session.id,
|
|
32
34
|
});
|
|
33
35
|
yield* Effect.logInfo("Launching Codex child session");
|
|
34
|
-
const client = {
|
|
36
|
+
const client = {
|
|
37
|
+
cwd: request.cwd,
|
|
38
|
+
sessionId: Option.some(request.session.id),
|
|
39
|
+
environment: request.environment,
|
|
40
|
+
host: request.host,
|
|
41
|
+
};
|
|
35
42
|
const connection = yield* appServer.open(client);
|
|
36
43
|
yield* initializeCodex(connection);
|
|
37
44
|
const pool = yield* verifyCodexAccount(connection, request.session.brain.model);
|
|
@@ -51,7 +58,7 @@ const makeCodexChild = Effect.gen(function* () {
|
|
|
51
58
|
return yield* new UnknownModelError({
|
|
52
59
|
harness: "codex",
|
|
53
60
|
model: requestedModel,
|
|
54
|
-
message: `Codex
|
|
61
|
+
message: `Codex has no model "${requestedModel}"`,
|
|
55
62
|
});
|
|
56
63
|
}
|
|
57
64
|
const effort = request.session.brain.effort === "off" ? "none" : request.session.brain.effort;
|
|
@@ -68,7 +75,7 @@ const makeCodexChild = Effect.gen(function* () {
|
|
|
68
75
|
harness: "codex",
|
|
69
76
|
model: requestedModel,
|
|
70
77
|
effort: request.session.brain.effort,
|
|
71
|
-
message: `Codex model ${requestedModel}
|
|
78
|
+
message: `Codex model "${requestedModel}" doesn't support effort ${effort}`,
|
|
72
79
|
});
|
|
73
80
|
}
|
|
74
81
|
const threadParams = {
|
|
@@ -96,6 +103,7 @@ const makeCodexChild = Effect.gen(function* () {
|
|
|
96
103
|
model: ModelId.make(thread.model),
|
|
97
104
|
effort: request.session.brain.effort,
|
|
98
105
|
}),
|
|
106
|
+
gatewayCredential: request.session.gatewayCredential,
|
|
99
107
|
});
|
|
100
108
|
const channel = yield* sessionChannel({
|
|
101
109
|
label: "Codex child session",
|
|
@@ -124,6 +132,9 @@ const makeCodexChild = Effect.gen(function* () {
|
|
|
124
132
|
const pendingMessages = [];
|
|
125
133
|
let lastText;
|
|
126
134
|
let finalText;
|
|
135
|
+
// Provider retries reported for the current turn, and whether the last retry is unresolved.
|
|
136
|
+
let retries = 0;
|
|
137
|
+
let retrying = false;
|
|
127
138
|
const startTurn = Effect.fn("CodexChildBackend.startTurn")(function* (message) {
|
|
128
139
|
yield* Effect.annotateCurrentSpan({ sessionId: session.id });
|
|
129
140
|
const response = yield* connection.request("stream", "turn/start", json({ ...turnParams, input: [{ type: "text", text: message, text_elements: [] }] }));
|
|
@@ -132,6 +143,37 @@ const makeCodexChild = Effect.gen(function* () {
|
|
|
132
143
|
turnActive = true;
|
|
133
144
|
lastText = undefined;
|
|
134
145
|
finalText = undefined;
|
|
146
|
+
retries = 0;
|
|
147
|
+
retrying = false;
|
|
148
|
+
});
|
|
149
|
+
const reportRetry = Effect.fn("CodexChildBackend.reportRetry")(function* (notification) {
|
|
150
|
+
yield* Effect.annotateCurrentSpan({ sessionId: session.id, turnId });
|
|
151
|
+
if (notification.turnId !== turnId) {
|
|
152
|
+
return yield* Effect.logDebug("Skipping a provider retry of another Codex turn", {
|
|
153
|
+
sessionId: session.id,
|
|
154
|
+
turnId: notification.turnId,
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
retries += 1;
|
|
158
|
+
retrying = true;
|
|
159
|
+
const message = providerRetryMessage(notification.error);
|
|
160
|
+
yield* Effect.logWarning("Codex child cannot reach its provider and will retry", {
|
|
161
|
+
sessionId: session.id,
|
|
162
|
+
turnId,
|
|
163
|
+
retries,
|
|
164
|
+
message,
|
|
165
|
+
});
|
|
166
|
+
yield* channel.emit(new ProviderRetrying({ session, message, retries: ProviderRetries.make(retries) }));
|
|
167
|
+
});
|
|
168
|
+
const reportRecovery = Effect.fn("CodexChildBackend.reportRecovery")(function* () {
|
|
169
|
+
yield* Effect.annotateCurrentSpan({ sessionId: session.id, turnId });
|
|
170
|
+
retrying = false;
|
|
171
|
+
yield* Effect.logInfo("Codex child reached its provider again", {
|
|
172
|
+
sessionId: session.id,
|
|
173
|
+
turnId,
|
|
174
|
+
retries,
|
|
175
|
+
});
|
|
176
|
+
yield* channel.emit(new ProviderRecovered({ session, retries: ProviderRetries.make(retries) }));
|
|
135
177
|
});
|
|
136
178
|
const interruptTurn = Effect.fn("CodexChildBackend.interruptTurn")(function* () {
|
|
137
179
|
yield* Effect.annotateCurrentSpan({ sessionId: session.id });
|
|
@@ -148,15 +190,19 @@ const makeCodexChild = Effect.gen(function* () {
|
|
|
148
190
|
yield* Effect.annotateCurrentSpan({ sessionId: session.id });
|
|
149
191
|
if (interrupting) {
|
|
150
192
|
pendingMessages.push(message);
|
|
151
|
-
return;
|
|
193
|
+
return "queued";
|
|
194
|
+
}
|
|
195
|
+
if (!turnActive) {
|
|
196
|
+
yield* startTurn(message);
|
|
197
|
+
return "read";
|
|
152
198
|
}
|
|
153
|
-
|
|
154
|
-
return yield* startTurn(message);
|
|
199
|
+
// Codex records steered input as a user message once the running turn reads it.
|
|
155
200
|
yield* connection.request("steer", "turn/steer", json({
|
|
156
201
|
threadId: thread.thread.id,
|
|
157
202
|
expectedTurnId: turnId,
|
|
158
203
|
input: [{ type: "text", text: message, text_elements: [] }],
|
|
159
204
|
}));
|
|
205
|
+
return "queued";
|
|
160
206
|
});
|
|
161
207
|
const conversation = yield* sessionConversation({
|
|
162
208
|
session,
|
|
@@ -174,12 +220,20 @@ const makeCodexChild = Effect.gen(function* () {
|
|
|
174
220
|
yield* channel.fail(error);
|
|
175
221
|
});
|
|
176
222
|
const consume = connection.notifications.pipe(Stream.runForEach(({ method, params }) => Effect.gen(function* () {
|
|
223
|
+
if (method === "error") {
|
|
224
|
+
const retry = decodeRetry(params);
|
|
225
|
+
if (Option.isSome(retry) && retry.value.willRetry)
|
|
226
|
+
return yield* reportRetry(retry.value);
|
|
227
|
+
}
|
|
228
|
+
else if (retrying && isTurnActivity(params) && params.turnId === turnId) {
|
|
229
|
+
yield* reportRecovery();
|
|
230
|
+
}
|
|
177
231
|
if (method === "thread/tokenUsage/updated") {
|
|
178
232
|
const usage = yield* decodeNotification(CodexTokenUsage, "token usage", session.id, params);
|
|
179
233
|
if (Option.isSome(usage) && usage.value.threadId === thread.thread.id) {
|
|
180
234
|
yield* channel.emit(new SessionTokensUpdated({
|
|
181
235
|
session,
|
|
182
|
-
totalTokens: usage.value.tokenUsage.total
|
|
236
|
+
totalTokens: codexThreadTokens(usage.value.tokenUsage.total),
|
|
183
237
|
}));
|
|
184
238
|
}
|
|
185
239
|
return;
|
|
@@ -188,6 +242,11 @@ const makeCodexChild = Effect.gen(function* () {
|
|
|
188
242
|
const notification = yield* decodeNotification(ItemNotification, "item notification", session.id, params);
|
|
189
243
|
if (Option.isNone(notification))
|
|
190
244
|
return;
|
|
245
|
+
const item = notification.value.item;
|
|
246
|
+
if (Schema.is(UserMessageItem)(item)) {
|
|
247
|
+
const text = userMessageText(item);
|
|
248
|
+
return yield* conversation.read((queued) => queued.indexOf(text) + 1);
|
|
249
|
+
}
|
|
191
250
|
if (notification.value.turnId !== turnId) {
|
|
192
251
|
return yield* Effect.logDebug("Skipping a Codex item from another turn", {
|
|
193
252
|
sessionId: session.id,
|
|
@@ -276,6 +335,8 @@ const makeCodexChild = Effect.gen(function* () {
|
|
|
276
335
|
turnId: completed.turn.id,
|
|
277
336
|
});
|
|
278
337
|
}
|
|
338
|
+
if (retrying && completed.turn.status === "completed")
|
|
339
|
+
yield* reportRecovery();
|
|
279
340
|
turnActive = false;
|
|
280
341
|
const wasInterrupted = interrupting;
|
|
281
342
|
interrupting = false;
|
|
@@ -287,6 +348,7 @@ const makeCodexChild = Effect.gen(function* () {
|
|
|
287
348
|
const nextMessage = pendingMessages.shift();
|
|
288
349
|
if (nextMessage !== undefined) {
|
|
289
350
|
yield* startTurn(nextMessage);
|
|
351
|
+
yield* conversation.read((queued) => queued.indexOf(nextMessage) + 1);
|
|
290
352
|
for (const message of pendingMessages.splice(0))
|
|
291
353
|
yield* steer(message);
|
|
292
354
|
return;
|
|
@@ -309,7 +371,7 @@ const makeCodexChild = Effect.gen(function* () {
|
|
|
309
371
|
sessionId: session.id,
|
|
310
372
|
});
|
|
311
373
|
}
|
|
312
|
-
// Streaming deltas
|
|
374
|
+
// Streaming deltas duplicate the content of completed items.
|
|
313
375
|
if (method.toLowerCase().includes("delta"))
|
|
314
376
|
return;
|
|
315
377
|
yield* Effect.logDebug("Ignoring an unhandled Codex notification", {
|
|
@@ -326,12 +388,11 @@ const makeCodexChild = Effect.gen(function* () {
|
|
|
326
388
|
events: Stream.fromQueue(channel.events),
|
|
327
389
|
interrupt,
|
|
328
390
|
result: Deferred.await(channel.result),
|
|
329
|
-
steer,
|
|
391
|
+
steer: (message) => steer(message).pipe(Effect.asVoid),
|
|
330
392
|
intervene: conversation.intervene,
|
|
331
393
|
};
|
|
332
394
|
});
|
|
333
395
|
return CodexChildBackend.of({ launch });
|
|
334
396
|
});
|
|
335
|
-
/** Provides Codex coding sessions for tasks delegated by a parent. */
|
|
336
397
|
export const codexChildBackendLayer = Layer.effect(CodexChildBackend, makeCodexChild);
|
|
337
398
|
//# sourceMappingURL=codex.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/pi/codex/codex.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../src/pi/codex/codex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,43 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ChildSession } from "@usine/core/agent/session";
|
|
2
2
|
import { InterventionState } from "@usine/core/attempt/channel";
|
|
3
3
|
import { Effect } from "effect";
|
|
4
|
-
import { type AgentSessionError, SessionOperationError } from "../runtime.ts";
|
|
4
|
+
import { type AgentSessionError, type OnDelivery, SessionOperationError } from "../runtime.ts";
|
|
5
5
|
import type { SessionChannel } from "./session.ts";
|
|
6
|
+
/**
|
|
7
|
+
* How the harness accepted an operator message: `read` if it starts the next turn of an idle session
|
|
8
|
+
* or joins the running turn immediately, `queued` if the harness reads it at its next boundary.
|
|
9
|
+
*/
|
|
10
|
+
export type MessageTaken = "read" | "queued";
|
|
6
11
|
interface ConversationOptions {
|
|
7
|
-
readonly session:
|
|
12
|
+
readonly session: ChildSession;
|
|
8
13
|
readonly channel: SessionChannel;
|
|
9
|
-
/**
|
|
10
|
-
|
|
11
|
-
|
|
14
|
+
/**
|
|
15
|
+
* Queues a message during a turn, or starts another turn in an idle session. If it returns
|
|
16
|
+
* `queued`, the harness reports the read later through `read`.
|
|
17
|
+
*/
|
|
18
|
+
readonly send: (message: string, activity: "running" | "idle") => Effect.Effect<MessageTaken, AgentSessionError>;
|
|
19
|
+
/** Requests a pause at the harness's next boundary. */
|
|
12
20
|
readonly pause: Effect.Effect<void, AgentSessionError>;
|
|
13
|
-
/** Releases harness resources only
|
|
21
|
+
/** Releases harness resources; runs only when the session is about to return. */
|
|
14
22
|
readonly beforeFinish: Effect.Effect<void, AgentSessionError>;
|
|
15
23
|
}
|
|
16
|
-
/**
|
|
24
|
+
/**
|
|
25
|
+
* Keeps an idle child addressable while on Hold, and keeps an interrupted session waiting until
|
|
26
|
+
* guidance arrives. Queued operator messages are reported as read when the harness reads them or the
|
|
27
|
+
* turn ends, and as unread if the scope closes first.
|
|
28
|
+
*/
|
|
17
29
|
export declare const sessionConversation: (options: ConversationOptions) => Effect.Effect<{
|
|
18
|
-
finish: (message: string) => Effect.Effect<void, import("../runtime.ts").AgentResultError | import("../runtime.ts").ChildSessionBudgetExceededError | import("../runtime.ts").PoolUnavailableError | SessionOperationError | import("../runtime.ts").UnknownModelError | import("../runtime.ts").UnsupportedEffortError, never>;
|
|
19
|
-
intervene: (action: import("@usine/core/attempt/channel").Interrupt | import("@usine/core/attempt/channel").OperatorMessage | import("@usine/core/attempt/channel").Release | import("@usine/core/attempt/channel").Steer) => Effect.Effect<InterventionState, import("../runtime.ts").AgentResultError | import("../runtime.ts").ChildSessionBudgetExceededError | import("../runtime.ts").PoolUnavailableError | SessionOperationError | import("../runtime.ts").UnknownModelError | import("../runtime.ts").UnsupportedEffortError, never>;
|
|
20
|
-
/**
|
|
30
|
+
finish: (message: string) => Effect.Effect<void, import("../runtime.ts").AgentBlockedError | import("../runtime.ts").AgentQuestionError | import("../runtime.ts").AgentResultError | import("../runtime.ts").ChildSessionBudgetExceededError | import("../runtime.ts").PoolUnavailableError | SessionOperationError | import("../runtime.ts").UnknownModelError | import("../runtime.ts").UnsupportedEffortError, never>;
|
|
31
|
+
intervene: (action: import("@usine/core/attempt/channel").Interrupt | import("@usine/core/attempt/channel").OperatorMessage | import("@usine/core/attempt/channel").Release | import("@usine/core/attempt/channel").Steer, onDelivery: OnDelivery) => Effect.Effect<InterventionState, import("../runtime.ts").AgentBlockedError | import("../runtime.ts").AgentQuestionError | import("../runtime.ts").AgentResultError | import("../runtime.ts").ChildSessionBudgetExceededError | import("../runtime.ts").PoolUnavailableError | SessionOperationError | import("../runtime.ts").UnknownModelError | import("../runtime.ts").UnsupportedEffortError, never>;
|
|
32
|
+
/**
|
|
33
|
+
* Reports queued operator messages as read; `count` receives the queued messages oldest first and
|
|
34
|
+
* returns how many of the oldest were read.
|
|
35
|
+
*/
|
|
36
|
+
read: (count: (messages: ReadonlyArray<string>) => number) => Effect.Effect<void, never, never>;
|
|
37
|
+
/** Waits until the session is not paused; harness hooks run it before each tool call or model request. */
|
|
21
38
|
awaitUnpaused: Effect.Effect<void, never, never>;
|
|
22
39
|
isPaused: Effect.Effect<boolean, never, never>;
|
|
23
40
|
isClosing: Effect.Effect<boolean, never, never>;
|
|
24
|
-
}, never,
|
|
41
|
+
}, never, import("effect/Scope").Scope>;
|
|
25
42
|
export {};
|
|
26
43
|
//# sourceMappingURL=conversation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../src/pi/conversation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA+B,MAAM,2BAA2B,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAuB,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAAY,MAAM,EAAqB,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,KAAK,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../src/pi/conversation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA+B,MAAM,2BAA2B,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAuB,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAAY,MAAM,EAAqB,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,UAAU,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAC/F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,QAAQ,CAAC;AAE7C,UAAU,mBAAmB;IAC3B,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,CACb,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,SAAS,GAAG,MAAM,KACzB,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IACpD,uDAAuD;IACvD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IACvD,iFAAiF;IACjF,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;CAC/D;AAQD;;;;GAIG;AACH,eAAO,MAAM,mBAAmB;sBAyHV,MAAM;;IAExB;;;OAGG;kBACW,CAAC,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,KAAK,MAAM;IAIzD,0GAA0G;;;;uCAK5G,CAAC"}
|
package/dist/pi/conversation.js
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ChildSession, SessionIdle, SessionResumed } from "@usine/core/agent/session";
|
|
2
2
|
import { InterventionState } from "@usine/core/attempt/channel";
|
|
3
3
|
import { Deferred, Effect, Option, Semaphore } from "effect";
|
|
4
4
|
import { SessionOperationError } from "../runtime.js";
|
|
5
|
-
/**
|
|
5
|
+
/**
|
|
6
|
+
* Keeps an idle child addressable while on Hold, and keeps an interrupted session waiting until
|
|
7
|
+
* guidance arrives. Queued operator messages are reported as read when the harness reads them or the
|
|
8
|
+
* turn ends, and as unread if the scope closes first.
|
|
9
|
+
*/
|
|
6
10
|
export const sessionConversation = Effect.fn("SessionConversation.make")(function* (options) {
|
|
7
11
|
const { session, channel } = options;
|
|
8
12
|
const mutex = yield* Semaphore.make(1);
|
|
@@ -11,10 +15,39 @@ export const sessionConversation = Effect.fn("SessionConversation.make")(functio
|
|
|
11
15
|
let idle = Option.none();
|
|
12
16
|
let closing = false;
|
|
13
17
|
let resume = yield* Deferred.make();
|
|
18
|
+
const queued = [];
|
|
19
|
+
/** Reports the oldest `count` queued messages as read, with the current session state. */
|
|
20
|
+
const deliver = (count) => Effect.suspend(() => {
|
|
21
|
+
const read = queued.splice(0, Math.max(0, count));
|
|
22
|
+
if (read.length === 0)
|
|
23
|
+
return Effect.void;
|
|
24
|
+
const state = new InterventionState({ held, paused });
|
|
25
|
+
return Effect.logInfo("The session read queued operator messages", {
|
|
26
|
+
sessionId: session.id,
|
|
27
|
+
read: read.length,
|
|
28
|
+
stillQueued: queued.length,
|
|
29
|
+
}).pipe(Effect.andThen(Effect.forEach(read, ({ onDelivery }) => onDelivery(Option.some(state)), {
|
|
30
|
+
discard: true,
|
|
31
|
+
})));
|
|
32
|
+
});
|
|
33
|
+
yield* Effect.addFinalizer(() => Effect.suspend(() => {
|
|
34
|
+
const unread = queued.splice(0);
|
|
35
|
+
if (unread.length === 0)
|
|
36
|
+
return Effect.void;
|
|
37
|
+
return Effect.logWarning("The session stopped before it read queued operator messages", {
|
|
38
|
+
sessionId: session.id,
|
|
39
|
+
unread: unread.length,
|
|
40
|
+
}).pipe(Effect.andThen(Effect.forEach(unread, ({ onDelivery }) => onDelivery(Option.none()), {
|
|
41
|
+
discard: true,
|
|
42
|
+
})));
|
|
43
|
+
}));
|
|
14
44
|
const finish = Effect.fn("SessionConversation.finish")(function* (message) {
|
|
15
45
|
yield* Effect.annotateCurrentSpan({ sessionId: session.id });
|
|
16
46
|
if (yield* channel.isTerminal)
|
|
17
47
|
return;
|
|
48
|
+
// A completed turn has read every message queued into it; an interrupted turn may drop them.
|
|
49
|
+
if (!paused)
|
|
50
|
+
yield* deliver(queued.length);
|
|
18
51
|
if (held || paused) {
|
|
19
52
|
idle = Option.some(message);
|
|
20
53
|
yield* channel.emit(new SessionIdle({ session }));
|
|
@@ -29,7 +62,7 @@ export const sessionConversation = Effect.fn("SessionConversation.make")(functio
|
|
|
29
62
|
yield* options.beforeFinish.pipe(Effect.tapError(channel.fail));
|
|
30
63
|
yield* channel.finish(session, message);
|
|
31
64
|
});
|
|
32
|
-
const intervene = Effect.fn("SessionConversation.intervene")(function* (action) {
|
|
65
|
+
const intervene = Effect.fn("SessionConversation.intervene")(function* (action, onDelivery) {
|
|
33
66
|
yield* Effect.annotateCurrentSpan({ sessionId: session.id, action: action._tag });
|
|
34
67
|
if (yield* channel.isTerminal) {
|
|
35
68
|
return yield* new SessionOperationError({
|
|
@@ -39,15 +72,8 @@ export const sessionConversation = Effect.fn("SessionConversation.make")(functio
|
|
|
39
72
|
cause: new Error("session closed"),
|
|
40
73
|
});
|
|
41
74
|
}
|
|
75
|
+
let taken = "read";
|
|
42
76
|
if (action._tag === "Release") {
|
|
43
|
-
if (session._tag === "ParentSession") {
|
|
44
|
-
return yield* new SessionOperationError({
|
|
45
|
-
operation: "steer",
|
|
46
|
-
sessionId: Option.some(session.id),
|
|
47
|
-
message: "Only a child session can be released",
|
|
48
|
-
cause: new Error("parent has no Hold"),
|
|
49
|
-
});
|
|
50
|
-
}
|
|
51
77
|
held = false;
|
|
52
78
|
if (Option.isSome(idle) && !paused)
|
|
53
79
|
yield* finish(idle.value);
|
|
@@ -61,30 +87,40 @@ export const sessionConversation = Effect.fn("SessionConversation.make")(functio
|
|
|
61
87
|
}
|
|
62
88
|
}
|
|
63
89
|
else {
|
|
90
|
+
const stopped = Option.isSome(idle) || paused;
|
|
64
91
|
const activity = Option.isSome(idle) ? "idle" : "running";
|
|
65
|
-
// Completion
|
|
66
|
-
//
|
|
67
|
-
yield* options.send(action.message, activity);
|
|
68
|
-
if (action._tag === "OperatorMessage"
|
|
92
|
+
// Completion takes the same lock, so an accepted message sets the Hold before a running turn
|
|
93
|
+
// can return; a rejected message changes no state.
|
|
94
|
+
taken = yield* options.send(action.message, activity);
|
|
95
|
+
if (action._tag === "OperatorMessage")
|
|
69
96
|
held = true;
|
|
70
97
|
paused = false;
|
|
71
98
|
idle = Option.none();
|
|
72
99
|
yield* Deferred.succeed(resume, undefined);
|
|
73
100
|
resume = yield* Deferred.make();
|
|
74
|
-
|
|
101
|
+
if (taken === "queued")
|
|
102
|
+
queued.push({ message: action.message, onDelivery });
|
|
103
|
+
if (stopped)
|
|
104
|
+
yield* channel.emit(new SessionResumed({ session }));
|
|
75
105
|
}
|
|
76
106
|
yield* Effect.logInfo("Session intervention applied", {
|
|
77
107
|
sessionId: session.id,
|
|
78
108
|
action: action._tag,
|
|
79
109
|
held,
|
|
80
110
|
paused,
|
|
111
|
+
queued: taken === "queued",
|
|
81
112
|
});
|
|
82
|
-
return new InterventionState({ held, paused });
|
|
113
|
+
return new InterventionState({ held, paused, queued: taken === "queued" });
|
|
83
114
|
}, mutex.withPermits(1));
|
|
84
115
|
return {
|
|
85
116
|
finish: (message) => mutex.withPermits(1)(finish(message)),
|
|
86
117
|
intervene,
|
|
87
|
-
/**
|
|
118
|
+
/**
|
|
119
|
+
* Reports queued operator messages as read; `count` receives the queued messages oldest first and
|
|
120
|
+
* returns how many of the oldest were read.
|
|
121
|
+
*/
|
|
122
|
+
read: (count) => mutex.withPermits(1)(Effect.suspend(() => deliver(count(queued.map(({ message }) => message))))),
|
|
123
|
+
/** Waits until the session is not paused; harness hooks run it before each tool call or model request. */
|
|
88
124
|
awaitUnpaused: Effect.suspend(() => (paused ? Deferred.await(resume) : Effect.void)),
|
|
89
125
|
isPaused: Effect.sync(() => paused),
|
|
90
126
|
isClosing: Effect.sync(() => closing),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation.js","sourceRoot":"","sources":["../../src/pi/conversation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAuB,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,
|
|
1
|
+
{"version":3,"file":"conversation.js","sourceRoot":"","sources":["../../src/pi/conversation.ts"],"names":[],"mappings":"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"}
|
package/dist/pi/pi.d.ts
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import { Layer } from "effect";
|
|
2
|
-
import {
|
|
2
|
+
import { PiChildBackend } from "../runtime.ts";
|
|
3
3
|
import { PiSdk } from "./sdk.ts";
|
|
4
4
|
export { PiSdk, piSdkLive, type PiSession, type PiSessionEvent, type PiStartOptions, type PiStartResult, } from "./sdk.ts";
|
|
5
|
-
/** Provides the coordinating Pi parent; supply the child backend that will perform its delegated coding work. */
|
|
6
|
-
export declare const piParentLayer: Layer.Layer<AgentRuntime, never, ChildBackend | PiSdk>;
|
|
7
|
-
/** Provides Pi coding sessions for tasks delegated by a parent. */
|
|
8
5
|
export declare const piChildBackendLayer: Layer.Layer<PiChildBackend, never, PiSdk>;
|
|
9
6
|
//# sourceMappingURL=pi.d.ts.map
|
package/dist/pi/pi.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../../src/pi/pi.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pi.d.ts","sourceRoot":"","sources":["../../src/pi/pi.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,EAAkB,MAAM,QAAQ,CAAC;AACjE,OAAO,EAGL,cAAc,EAMf,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,KAAK,EAAkC,MAAM,UAAU,CAAC;AAGjE,OAAO,EACL,KAAK,EACL,SAAS,EACT,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,aAAa,GACnB,MAAM,UAAU,CAAC;AAsKlB,eAAO,MAAM,mBAAmB,2CAA4C,CAAC"}
|