eve 0.90.0 → 0.91.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/CHANGELOG.md +34 -23
- package/dist/src/channel/auth/http-basic.js +1 -1
- package/dist/src/channel/channel-operations.d.ts +1 -1
- package/dist/src/channel/types.d.ts +2 -0
- package/dist/src/cli/dev/tui/prompt-commands.d.ts +1 -1
- package/dist/src/client/session.d.ts +1 -1
- package/dist/src/compiled/.vendor-stamp.json +1 -1
- package/dist/src/execution/dynamic-workflow/tool.js +1 -1
- package/dist/src/execution/proxied-deliver-step.js +1 -1
- package/dist/src/execution/sandbox/bash.js +2 -2
- package/dist/src/execution/session/active-turn.js +1 -1
- package/dist/src/execution/session/admission.d.ts +6 -0
- package/dist/src/execution/session/admission.js +1 -1
- package/dist/src/execution/session/delivery-facts.js +1 -1
- package/dist/src/execution/session/next-input.d.ts +2 -2
- package/dist/src/execution/session/next-input.js +1 -1
- package/dist/src/execution/session/program.js +1 -1
- package/dist/src/execution/session-inbox/inbox.d.ts +2 -2
- package/dist/src/execution/session-inbox/inbox.js +1 -1
- package/dist/src/execution/session-inbox/protocol.js +1 -1
- package/dist/src/execution/tools/agent-router-workflow.js +1 -1
- package/dist/src/harness/compaction/engine.js +2 -2
- package/dist/src/harness/current-messages.js +1 -1
- package/dist/src/harness/emission.d.ts +3 -0
- package/dist/src/harness/emission.js +1 -1
- package/dist/src/harness/facts.d.ts +5 -2
- package/dist/src/harness/facts.js +1 -1
- package/dist/src/harness/model-call/call.d.ts +7 -1
- package/dist/src/harness/model-call/call.js +3 -1
- package/dist/src/harness/provider-tool-history.d.ts +8 -0
- package/dist/src/harness/provider-tool-history.js +1 -1
- package/dist/src/harness/session-machine/transitions.d.ts +3 -2
- package/dist/src/harness/step/after-model.js +1 -1
- package/dist/src/harness/step/context.js +1 -1
- package/dist/src/harness/step/intake.js +1 -1
- package/dist/src/harness/step/prompt.js +1 -1
- package/dist/src/harness/tool-history-repair.d.ts +2 -0
- package/dist/src/harness/tool-history-repair.js +1 -1
- package/dist/src/harness/tool-loop.js +1 -1
- package/dist/src/internal/application/stamped-package-version.js +1 -1
- package/dist/src/protocol/session-events/families/delivery.d.ts +5 -3
- package/dist/src/protocol/session-events/families/delivery.js +1 -1
- package/dist/src/protocol/session-projection/fold.js +1 -1
- package/dist/src/public/channels/discord/hitl.js +1 -1
- package/dist/src/public/channels/slack/hitl.d.ts +2 -1
- package/dist/src/public/channels/slack/hitl.js +3 -3
- package/dist/src/public/channels/slack/interaction-cards.js +1 -1
- package/dist/src/public/channels/slack/request-card-render.js +1 -1
- package/dist/src/public/channels/teams/hitl.js +1 -1
- package/dist/src/public/channels/teams/verify.js +1 -1
- package/dist/src/public/definitions/hook.d.ts +90 -7
- package/dist/src/public/definitions/hook.js +1 -1
- package/dist/src/public/hooks/index.d.ts +3 -2
- package/dist/src/reactions/continuation.d.ts +19 -0
- package/dist/src/reactions/continuation.js +1 -0
- package/dist/src/reactions/intents.d.ts +10 -4
- package/dist/src/reactions/intents.js +1 -1
- package/dist/src/reactions/kinds/hook.js +1 -1
- package/dist/src/reactions/runner.js +1 -1
- package/dist/src/reactions/state.d.ts +15 -2
- package/dist/src/reactions/state.js +1 -1
- package/dist/src/runtime/resolve-connection.js +1 -1
- package/dist/src/runtime/subagents/workflow.js +1 -1
- package/dist/src/setup/primitives/open-url.js +1 -1
- package/dist/src/setup/scaffold/create/project.js +1 -1
- package/dist/src/shared/value-delta.d.ts +5 -4
- package/dist/src/shared/value-delta.js +1 -1
- package/dist/src/tools/provided/ask-question-workflow.js +1 -1
- package/dist/src/tools/provided/sleep-workflow.js +1 -1
- package/dist/src/tools/provided/web-fetch.js +1 -1
- package/docs/agent-config.md +199 -222
- package/docs/channels/chat-sdk.mdx +60 -64
- package/docs/channels/custom.mdx +264 -281
- package/docs/channels/discord.mdx +176 -123
- package/docs/channels/eve.mdx +136 -206
- package/docs/channels/github.mdx +24 -22
- package/docs/channels/linear.mdx +30 -30
- package/docs/channels/linq.mdx +25 -13
- package/docs/channels/mcp.mdx +154 -116
- package/docs/channels/overview.mdx +31 -32
- package/docs/channels/photon.mdx +32 -56
- package/docs/channels/slack.mdx +538 -375
- package/docs/channels/teams.mdx +40 -26
- package/docs/channels/telegram.mdx +13 -13
- package/docs/channels/twilio.mdx +11 -11
- package/docs/code-extension.mdx +40 -42
- package/docs/concepts/built-in-tools.md +89 -57
- package/docs/concepts/context-control.md +20 -20
- package/docs/concepts/default-harness.md +20 -36
- package/docs/concepts/execution-model-and-durability.mdx +96 -160
- package/docs/concepts/project-structure.mdx +21 -14
- package/docs/concepts/security-model.md +27 -27
- package/docs/concepts/sessions-runs-and-streaming.md +184 -198
- package/docs/concepts/state.md +7 -15
- package/docs/connections/mcp.mdx +109 -93
- package/docs/connections/openapi.mdx +57 -59
- package/docs/connections/overview.mdx +175 -170
- package/docs/evals/assertions.mdx +36 -29
- package/docs/evals/cases.mdx +38 -42
- package/docs/evals/judge.mdx +21 -29
- package/docs/evals/overview.mdx +42 -38
- package/docs/evals/reporters.mdx +54 -27
- package/docs/evals/running.mdx +15 -8
- package/docs/evals/targets.mdx +16 -19
- package/docs/evals/tool-stubs.mdx +111 -97
- package/docs/experimental/dynamic-schedules.mdx +118 -63
- package/docs/extensions.md +58 -65
- package/docs/getting-started.mdx +4 -6
- package/docs/guides/auth-and-route-protection.md +87 -70
- package/docs/guides/client/continuations.mdx +23 -26
- package/docs/guides/client/messages.mdx +47 -66
- package/docs/guides/client/output-schema.mdx +8 -8
- package/docs/guides/client/overview.mdx +45 -43
- package/docs/guides/client/streaming.mdx +62 -71
- package/docs/guides/decide.md +24 -79
- package/docs/guides/deployment/meta.json +1 -1
- package/docs/guides/deployment/overview.md +27 -18
- package/docs/guides/deployment/self-hosted-operations.md +99 -0
- package/docs/guides/deployment/self-hosting.md +63 -80
- package/docs/guides/deployment/vercel.mdx +31 -27
- package/docs/guides/deployment/workflow-worlds.md +100 -0
- package/docs/guides/dev-tui.md +48 -41
- package/docs/guides/dynamic-capabilities.md +49 -50
- package/docs/guides/frontend/nextjs.mdx +2 -2
- package/docs/guides/frontend/nuxt.mdx +11 -11
- package/docs/guides/frontend/overview.mdx +1 -1
- package/docs/guides/frontend/sveltekit.mdx +11 -11
- package/docs/guides/frontend/tanstack.mdx +16 -16
- package/docs/guides/frontend/use-eve-agent-svelte.mdx +21 -21
- package/docs/guides/frontend/use-eve-agent-vue.mdx +22 -22
- package/docs/guides/frontend/use-eve-agent.mdx +25 -25
- package/docs/guides/hooks.md +152 -106
- package/docs/guides/instrumentation/agent-runs.mdx +26 -30
- package/docs/guides/instrumentation/instrumentation.mdx +49 -76
- package/docs/guides/instrumentation/meta.json +1 -1
- package/docs/guides/instrumentation/otel.mdx +113 -179
- package/docs/guides/remote-agents.md +125 -187
- package/docs/guides/self-modification.md +18 -18
- package/docs/guides/session-context.md +16 -16
- package/docs/install-integrations.mdx +26 -24
- package/docs/instructions.mdx +37 -42
- package/docs/memory/custom-provider.md +35 -41
- package/docs/memory/file.md +93 -76
- package/docs/memory/overview.mdx +145 -156
- package/docs/patterns/durable-cross-channel-notifications.md +15 -19
- package/docs/patterns/dynamic-scheduling.md +19 -23
- package/docs/patterns/multi-tenant-approvals.md +17 -22
- package/docs/patterns/multi-tenant-auth.md +43 -42
- package/docs/patterns/multi-tenant-memory.md +39 -36
- package/docs/patterns/voice-notes.md +3 -3
- package/docs/protocols/acp.md +13 -13
- package/docs/protocols/ucp.mdx +7 -7
- package/docs/reference/agent-files.md +6 -6
- package/docs/reference/cli.md +99 -98
- package/docs/reference/telemetry.md +1 -1
- package/docs/reference/typescript-api.md +52 -53
- package/docs/responsible-use.md +2 -2
- package/docs/sandbox/custom-providers.mdx +60 -56
- package/docs/sandbox/default.mdx +23 -24
- package/docs/sandbox/docker.mdx +16 -10
- package/docs/sandbox/index.mdx +93 -61
- package/docs/sandbox/just-bash.mdx +17 -11
- package/docs/sandbox/troubleshooting.mdx +29 -23
- package/docs/sandbox/vercel.mdx +45 -52
- package/docs/schedules.mdx +65 -54
- package/docs/skills.mdx +74 -49
- package/docs/subagents/index.mdx +97 -136
- package/docs/tools/human-in-the-loop.md +160 -90
- package/docs/tools/meta.json +1 -1
- package/docs/tools/overview.mdx +229 -237
- package/docs/tools/tasks.md +118 -117
- package/docs/tools/workflows.mdx +447 -543
- package/docs/tutorial/connect-a-warehouse.mdx +11 -13
- package/docs/tutorial/first-agent.mdx +14 -16
- package/docs/tutorial/guard-the-spend.mdx +6 -8
- package/docs/tutorial/how-it-runs.mdx +8 -8
- package/docs/tutorial/query-sample-data.mdx +8 -8
- package/docs/tutorial/remember-definitions.mdx +4 -4
- package/docs/tutorial/run-analysis.mdx +20 -22
- package/docs/tutorial/ship-it.mdx +19 -19
- package/docs/tutorial/team-playbooks.mdx +9 -9
- package/docs/use-cases.mdx +13 -11
- package/package.json +1 -1
- package/docs/guides/instrumentation/migration.md +0 -96
- package/docs/tools/tasks-upgrade.md +0 -218
package/CHANGELOG.md
CHANGED
|
@@ -1,33 +1,44 @@
|
|
|
1
|
-
# eve 0.
|
|
1
|
+
# eve 0.91.0
|
|
2
2
|
|
|
3
|
-
Released 2026-10-
|
|
3
|
+
Released 2026-10-30 · [Compare with 0.90.0](https://github.com/vercel/eve/compare/eve%400.90.0...eve%400.91.0)
|
|
4
4
|
|
|
5
5
|
## Breaking Changes
|
|
6
6
|
|
|
7
|
-
- `
|
|
8
|
-
|
|
9
|
-
- Tool-stub grants on Vercel OIDC subjects move from `vercelOidc` to the new `eveVercelOidc` helper in `eve/channels/eve`.
|
|
10
|
-
`vercelOidc` and `AuthResult` from `eve/channels/auth` now carry identity only. Rename grant-bearing `vercelOidc` calls to `eveVercelOidc`; the options are unchanged. `vercelOidc` now throws when a `subjects` entry is not a string. Type custom callbacks that return `allowToolStubs` as `EveAuthFn` from `eve/channels/eve`. ([#5542](https://github.com/vercel/eve/pull/5542))
|
|
7
|
+
- `session.clear()` now cancels a running turn and every working task before it clears history, instead of waiting for the turn to finish.
|
|
8
|
+
Previously a clear sent while a turn waited on tasks didn't run until the tasks finished, and never ran if one hung. Tasks a clear stops end with `task.ended` `outcome: "cancelled"`, and no task result the cleared conversation hadn't read reaches the next turn. ([#5619](https://github.com/vercel/eve/pull/5619))
|
|
11
9
|
|
|
12
10
|
## Features
|
|
13
11
|
|
|
14
|
-
-
|
|
15
|
-
|
|
12
|
+
- Hooks can start a session's next turn with `ctx.continue()` from `turn.settled` and `*` handlers.
|
|
13
|
+
Other handlers don't receive it. It continues a completed turn, or a turn the same hook cancelled, and hooks that continue one turn share its next turn. It takes `MessageContent` with `session.send()`'s `context` and an optional `auth`, returns `{ queued }` synchronously, and yields to any other turn, cancel, clear, or reset that comes first. `delivery.admitted` records `source: { channel, hook }`. ([#5555](https://github.com/vercel/eve/pull/5555))
|
|
16
14
|
|
|
17
15
|
## Bug Fixes
|
|
18
16
|
|
|
19
|
-
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
-
|
|
27
|
-
|
|
28
|
-
-
|
|
29
|
-
|
|
30
|
-
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
17
|
+
- The `bash` tool now keeps only the last 50 KiB of each output stream while a command runs, so a verbose command no longer holds its whole stdout and stderr in memory.
|
|
18
|
+
Very large output no longer fails with `Cannot create a string longer than 0x1fffffe8 characters`. Output past the limit is noted as `earlier output omitted`, as it already was for commands left running.
|
|
19
|
+
Thanks @mrud for reporting this in #5651. ([#5653](https://github.com/vercel/eve/pull/5653))
|
|
20
|
+
- HTTP Basic auth now compares the username and password in constant time on every request, so response timing no longer reveals whether the username matched. ([#5521](https://github.com/vercel/eve/pull/5521))
|
|
21
|
+
- Anthropic agents no longer fail with a 400 when the model calls a server tool, such as `web_search` or programmatic `code_execution`, beside a local tool.
|
|
22
|
+
Anthropic runs that server tool after the local results arrive and returns its result at the start of the next response, so the next request must end on those local results. Until that result arrives, eve now holds a message that steers the turn for one model step, holds changed catalog or skill announcements, sends an empty-response retry's note as a system instruction, and keeps compaction from separating the deferred result from its call or adding a resumption message after the local results. When the result can no longer arrive, because the turn was cancelled, failed, or retried, or a new turn starts, eve answers the server call as one whose outcome is unknown, so the model reads the new message right away.
|
|
23
|
+
Thanks @jam3gw for reporting this in #4890. ([#4891](https://github.com/vercel/eve/pull/4891))
|
|
24
|
+
- A Discord `display: "select"` request with an option `id` longer than 100 characters now fails with a clear error instead of posting a select whose truncated value came back as an id the request never offered, which dropped or mismatched the user's choice. ([#5533](https://github.com/vercel/eve/pull/5533))
|
|
25
|
+
- Sessions now fail controls their eve version does not support, so the control's delivery settles `failed` instead of never settling. ([#5622](https://github.com/vercel/eve/pull/5622))
|
|
26
|
+
- A provider tool result that arrives in the response after its call, such as an Anthropic tool search the model started beside a local tool, now settles the call the earlier step introduced.
|
|
27
|
+
Previously eve published that call a second time, so with the session-event checker on (`eve dev`, `eve eval`, or `EVE_CHECK_SESSION_EVENTS=1`) the step failed with `introduced-twice`, and without it the session log recorded one call introduced twice. ([#5648](https://github.com/vercel/eve/pull/5648))
|
|
28
|
+
- A turn cancellation raised while the model is being resolved now cancels the turn instead of failing the session with `MODEL_SELECTION_FAILED`, even when it arrives before the turn's abort signal fires.
|
|
29
|
+
Thanks @burn2delete for reporting this and proposing the fix in #4273. ([#4274](https://github.com/vercel/eve/pull/4274))
|
|
30
|
+
- Session steps now return only the session projection rows they changed, instead of every row of each changed table, so a step's stored output no longer grows with the calls and parts the turn already settled.
|
|
31
|
+
Thanks @mrud for reporting this in #5635. ([#5642](https://github.com/vercel/eve/pull/5642))
|
|
32
|
+
- Slack approval and question cards now show their prompt, tool input, and answer as literal text.
|
|
33
|
+
A model-written `<!channel>` or `<url|label>` in a prompt or tool input no longer notifies the channel or hides a link's real destination from the approver. `Card(...)` rendering is unchanged. ([#5517](https://github.com/vercel/eve/pull/5517))
|
|
34
|
+
- A connection in `agent/connections/*.ts` now keeps an `approval` written as `{ request, response, prompt }`, so its tools ask for approval and run its `response` policy.
|
|
35
|
+
Previously only the function form was kept and the object form was dropped, so the connection's tools ran without asking anyone. A malformed `approval` now fails resolution instead of being ignored. ([#5632](https://github.com/vercel/eve/pull/5632))
|
|
36
|
+
- Teams approval and question cards now show the prompt, tool input, and answer as literal text.
|
|
37
|
+
A model-written `[docs](https://evil.example)` no longer renders as a link whose label hides its destination. The cards use `RichTextBlock` text runs, and the message text is sent as plain text. ([#5529](https://github.com/vercel/eve/pull/5529))
|
|
38
|
+
- Teams inbound verification now accepts only RS256-signed Bot Connector tokens, as Microsoft documents, instead of using the algorithm named in the token header. ([#5530](https://github.com/vercel/eve/pull/5530))
|
|
39
|
+
- `ctx.turn.input` keeps the turn's input after the turn pauses for an approval, a question, a sign-in, or a budget answer.
|
|
40
|
+
Dynamic values no longer see empty input after the pause, including `auto()` if its per-turn memo was invalidated. ([#5628](https://github.com/vercel/eve/pull/5628))
|
|
41
|
+
- `web_fetch` now rejects a `timeout` of zero or less as invalid tool input, instead of throwing an opaque `RangeError` or aborting the request immediately. ([#5532](https://github.com/vercel/eve/pull/5532))
|
|
42
|
+
- `eve` setup now opens browser URLs on Windows through `rundll32` instead of `cmd /c start`, so `&` or `|` in a URL is no longer interpreted by the shell. ([#5522](https://github.com/vercel/eve/pull/5522))
|
|
43
|
+
|
|
44
|
+
For an upgrade across multiple releases, review each version between the installed and target versions in the [target version's changelog](https://raw.githubusercontent.com/vercel/eve/refs/tags/eve%400.91.0/packages/eve/CHANGELOG.md).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{createHash,timingSafeEqual}from"node:crypto";function authenticateHttpBasicStrategy(e){let t=parseBasicAuthorizationHeader(e.authorization);
|
|
1
|
+
import{createHash,timingSafeEqual}from"node:crypto";function authenticateHttpBasicStrategy(e){let t=parseBasicAuthorizationHeader(e.authorization);if(t===null)return{kind:`not-authenticated`};let n=timingSafeStringEquals(normalizeCredential(t.username),normalizeCredential(e.strategy.username)),r=timingSafeStringEquals(normalizeCredential(t.password),normalizeCredential(e.strategy.password));return!n||!r?{kind:`not-authenticated`}:{kind:`authenticated`,principal:{attributes:Object.freeze({}),authenticator:`http-basic`,claims:Object.freeze({}),principalId:e.strategy.username,principalType:`user`}}}function parseBasicAuthorizationHeader(e){let t=/^Basic\s+(.+)$/i.exec(e);if(t===null)return null;let n=t[1];if(n===void 0)return null;let r;try{r=Buffer.from(n,`base64`).toString(`utf8`)}catch{return null}let i=r.indexOf(`:`);return i===-1?null:{password:r.slice(i+1),username:r.slice(0,i)}}function normalizeCredential(e){return e.normalize(`NFC`)}function timingSafeStringEquals(e,t){return timingSafeEqual(hashString(e),hashString(t))}function hashString(e){return createHash(`sha256`).update(e,`utf8`).digest()}export{authenticateHttpBasicStrategy};
|
|
@@ -53,7 +53,7 @@ export interface ChannelSource<TState = undefined> {
|
|
|
53
53
|
} & SessionControlOptions): Promise<Delivery>;
|
|
54
54
|
/** Queues context compaction without creating a session. */
|
|
55
55
|
compact(options?: SessionControlOptions): Promise<Delivery>;
|
|
56
|
-
/**
|
|
56
|
+
/** Cancels a running turn and every working task, then clears model-message history in place. */
|
|
57
57
|
clear(options?: SessionControlOptions): Promise<Delivery>;
|
|
58
58
|
/** Retires the current owner without creating a replacement. */
|
|
59
59
|
end(options?: {
|
|
@@ -103,6 +103,8 @@ export interface ChannelDeliveryMetadata {
|
|
|
103
103
|
readonly channelKind: string;
|
|
104
104
|
readonly channelName: string;
|
|
105
105
|
readonly deliveryId: string;
|
|
106
|
+
/** The hook whose `ctx.continue()` made the delivery, recorded on its `delivery.admitted`. */
|
|
107
|
+
readonly hook?: string;
|
|
106
108
|
readonly requestId?: string;
|
|
107
109
|
readonly requestTraceContext?: SessionTraceSeed;
|
|
108
110
|
}
|
|
@@ -245,7 +245,7 @@ export declare function isPromptCommandAvailableFor(name: PromptCommandExtension
|
|
|
245
245
|
/**
|
|
246
246
|
* Recognizes the slash commands the prompt accepts. `/new` (and `/reset`)
|
|
247
247
|
* starts a fresh session and transcript; `/cancel` stops the running turn;
|
|
248
|
-
* `/clear` clears context in place; `/compact` queues context compaction; `/exit` (and
|
|
248
|
+
* `/clear` stops the running turn and clears context in place; `/compact` queues context compaction; `/exit` (and
|
|
249
249
|
* `/quit`) terminate the TUI like Ctrl+C; extension commands are dispatched
|
|
250
250
|
* outside the runner. Anything else — including unknown `/text` — is a normal
|
|
251
251
|
* message.
|
|
@@ -46,7 +46,7 @@ export declare class ClientSession {
|
|
|
46
46
|
readonly signal?: AbortSignal;
|
|
47
47
|
readonly turnId?: string | null;
|
|
48
48
|
}): Promise<Delivery>;
|
|
49
|
-
/**
|
|
49
|
+
/** Cancels a running turn and every working task, then removes this session's model history. */
|
|
50
50
|
clear(options?: {
|
|
51
51
|
readonly signal?: AbortSignal;
|
|
52
52
|
}): Promise<Delivery>;
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"zod": "4.5.4",
|
|
62
62
|
"zod-validation-error": "5.0.0"
|
|
63
63
|
},
|
|
64
|
-
"scriptHash": "
|
|
64
|
+
"scriptHash": "0c44438f4c2ccda237c573eb38e4a3243c1706bac80411b4f5424f8c969f9044",
|
|
65
65
|
"toolVersions": {
|
|
66
66
|
"rolldown": "1.2.9",
|
|
67
67
|
"typescript": "7.0.2"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{runJsProgram}from"#execution/dynamic-workflow/workflow.js";async function runWorkflowProgramTask(e,t){"use workflow";return runJsProgram(e.js,t,{maxSubagents:e.maxSubagents??0})}runWorkflowProgramTask.workflowId=`workflow//eve@0.
|
|
1
|
+
import{runJsProgram}from"#execution/dynamic-workflow/workflow.js";async function runWorkflowProgramTask(e,t){"use workflow";return runJsProgram(e.js,t,{maxSubagents:e.maxSubagents??0})}runWorkflowProgramTask.workflowId=`workflow//eve@0.91.0//runWorkflowProgramTask`;export{runWorkflowProgramTask};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{activeTurn,interactionOwner,waiting}from"#protocol/session-projection/selectors.js";import{AuthKey,TurnDeliveryIdsKey}from"#context/keys.js";import{BundleKey,ChannelKey}from"#runtime/sessions/runtime-context-keys.js";import{storedProjection}from"#harness/session-machine/view.js";import{V26_INPUT_REMOTE_AGENT_PROTOCOL}from"#protocol/remote-agent-protocol.js";import{hasDelegatedSessionContext}from"#execution/delegated-session-context.js";import{resolveRemoteAgentStreamHeaders,respondToRemoteAgentSession}from"#execution/agent-sessions/remote.js";import{deserializeContext,serializeContext}from"#context/serialize.js";import{readDurableSession}from"#execution/durable-session-store.js";import{readHitlState}from"#harness/hitl/index.js";import{selectDeliveryPayloads}from"#harness/messages.js";import{resumeSessionInbox}from"#execution/session-inbox/resume.js";import{buildAdapterContext}from"#channel/adapter-context.js";import{commitSessionStep,publishSessionEvents}from"#execution/publish-session-events.js";import"#execution/session/state-delta.js";import{withSessionStateDelta}from"#execution/session/step-state-delta.js";import{routeAnswer}from"#harness/session-machine/transitions.js";import{coalesceDeliverPayloads}from"#execution/deliver-payloads.js";import{fact}from"#harness/facts.js";import{userPartsOf}from"#harness/user-parts.js";import{principalOf}from"#execution/session/delivery-facts.js";import{setChannelContext}from"#execution/channel-context.js";import{isSteeringDelivery}from"#execution/session/input-queue.js";import{continueTurnAuth,resolveTurnPrincipal}from"#execution/session/principal.js";import{routeDeliverPayload}from"#subagents/hitl-proxy.js";import{protocolTwoAnswersSettledOnForward}from"#subagents/protocol-two-callback.js";import{sendWorkflowAskAnswers}from"#execution/tools/workflow/answer.js";async function routeProxiedDeliverStep(e){"use step";return await withSessionStateDelta(e,routeProxiedDeliver)}async function routeProxiedDeliver(e){let t=readHitlState(readDurableSession(e.sessionState).state).relays,{delivery:n,serializedContext:r}=await deliverChannelAnswers({...e,routable:e=>t.has(e.interactionId)}),i=readDurableSession(e.sessionState),a=new Map,o=new Map,s,c=!hasDelegatedSessionContext(r)&&isSteeringDelivery(n,{callerCallId:void 0,principal:resolveTurnPrincipal(void 0,r)},{heldOnPerson:!0}),l=new Set,u=[],d=!1,f=storedProjection(i.state).view,p=activeTurn(f),m=p===void 0?void 0:waiting(f,p.turnId),askedTurn=e=>{let t=interactionOwner(f,e).turnId;return t!==void 0&&f.turns[t]?.status===`running`?t:m?.on===`interaction`&&m.interactions.some(t=>t.interactionId===e.interactionId)?p?.turnId:void 0},h=[],g=[];for(let[e,t]of n.payloads.entries()){let r=routeDeliverPayload({allowRoute:e=>!l.has(e),payload:t,resolveMessage:c,state:i.state});s??=r.parentAction,r.forSelf!==void 0&&a.set(e,r.forSelf);let p=(n.deliveryMetadata??[]).filter(t=>t.payloadIndex===e),m=p[0]?.deliveryId;if(r.forChildren.length>0&&m!==void 0){let e=r.forChildren.find(e=>e.message!==void 0),i=r.forChildren.flatMap(e=>e.payload.answers).map(e=>f.interactions[e.interactionId]).find(e=>e!==void 0&&askedTurn(e)!==void 0),a=i===void 0?void 0:askedTurn(i);e!==void 0&&a!==void 0&&(d=!0),r.forSelf===void 0&&a!==void 0&&u.push(...p.map(e=>e.deliveryId));for(let t of p)h.push({consumed:r.forSelf===void 0&&a!==void 0?{parts:e?.message===void 0?[]:userPartsOf(e.message),turnId:a}:void 0,continues:r.forSelf!==void 0||void 0,deliveryId:t.deliveryId,principal:principalOf(n.auth),source:t.channelKind===void 0?void 0:{channel:t.channelKind}});for(let e of r.forChildren)for(let n of e.payload.answers){let e=(t.answers??[]).indexOf(n),r={};n.optionId!==void 0&&(r.optionId=n.optionId),n.text!==void 0&&(r.text=n.text),g.push({deliveryId:m,interactionId:n.interactionId,responseId:`response_${m}_forwarded_${e===-1?`typed_0`:String(e)}`,value:r})}}for(let[t,i]of r.forChildren.entries()){if(i.workflowAsk!==void 0||i.message!==void 0)for(let{interactionId:e}of i.payload.answers)l.add(e);let a=JSON.stringify([i.childContinuationToken,i.childSessionInbox?.sessionId??``,i.remote?.sessionId??``,i.inputSource??null,i.workflowAsk?.control??null]),s=o.get(a)??{workflowAsk:i.workflowAsk,remote:i.remote,childContinuationToken:i.childContinuationToken,childSessionInbox:i.childSessionInbox,metadata:[],payloads:[]},c=s.payloads.length;if(s.payloads.push(i.payload),r.forSelf===void 0&&t===0)for(let t of n.deliveryMetadata??[])t.payloadIndex===e&&s.metadata.push({...t,payloadIndex:c});o.set(a,s)}}let _={serializedContext:joinAnswerToTurn(r,{auth:d?n.auth:void 0,deliveryIds:u}),sessionState:e.sessionState},v=!1,y=h.filter(e=>e.consumed!==void 0),b=y.length===0?_:await commitSessionStep({..._,sessionWritable:e.sessionWritable},e=>[routeAnswer(e,{deliveries:y,forwarded:[],decided:[]})],{origin:`own`,cancelTurn:()=>{v=!0}});if(v){let t=storedProjection(readDurableSession(b.sessionState).state).view,r=(n.deliveryMetadata??[]).filter(({deliveryId:e,payloadIndex:n})=>a.has(n)&&t.deliveries[e]?.status!==`settled`);if(r.length===0)return{...b,kind:`cancel-turn`};let i=await publishSessionEvents({...b,sessionWritable:e.sessionWritable},r.flatMap(({channelKind:e,deliveryId:r})=>[...t.deliveries[r]===void 0?[fact(`delivery.admitted`,{deliveryId:r,principal:principalOf(n.auth),source:e===void 0?void 0:{channel:e}})]:[],fact(`delivery.settled`,{deliveryId:r,outcome:`ignored`})]));return{kind:`cancel-turn`,serializedContext:i.serializedContext,sessionState:i.sessionState}}let x=[];for(let[e,t]of o)if(t.workflowAsk!==void 0){let e=coalesceDeliverPayloads(t.payloads).answers??[];x.push(...e.map(e=>({answer:e,outcome:`accepted`}))),await sendWorkflowAskAnswers(t.workflowAsk,e,principalOf(n.auth))}else{let i={...n,deliveryMetadata:t.metadata.length===0?void 0:t.metadata,payloads:t.payloads},a=t.remote;if(a!==void 0){let i=await deserializeContext(r),o=await resolveRemoteAgentStreamHeaders({bundle:i.require(BundleKey),name:a.name,dynamicBinding:a.dynamicBinding,resolverId:a.resolverId,url:a.url}),c=coalesceDeliverPayloads(t.payloads).answers??[];if(await respondToRemoteAgentSession({remote:a,headers:o,auth:n.auth,idempotencyKey:await answersIdempotencyKey(n,e),responses:c}),a.earlierProtocol===V26_INPUT_REMOTE_AGENT_PROTOCOL)for(let e of protocolTwoAnswersSettledOnForward({answers:c,decidedHere:s?.answer.interactionId,kindOf:e=>f.interactions[e]?.request.kind}))x.push({answer:e,outcome:`accepted`})}else await resumeSessionInbox(t.childSessionInbox??t.childContinuationToken,i)}let S=await commitSessionStep({...b,sessionWritable:e.sessionWritable},e=>[routeAnswer(e,{decided:s===void 0?x:[...x,{answer:s.answer,outcome:`declined`}],deliveries:h,forwarded:g})],{origin:`relayed`});if(s!==void 0)return{...S,kind:s.kind};let C=[...a].sort(([e],[t])=>e-t),w=C.length===0?void 0:selectDeliveryPayloads(n,C.map(([e,t])=>({index:e,payload:t})));return{...S,kind:`continue`,remainder:w}}async function answersIdempotencyKey(e,t){let n=(e.deliveryMetadata??[]).map(e=>e.deliveryId);if(n.length===0)return;let r=JSON.stringify([n,t]),i=await crypto.subtle.digest(`SHA-256`,new TextEncoder().encode(r));return`eve-answers:${Array.from(new Uint8Array(i),e=>e.toString(16).padStart(2,`0`)).join(``)}`}function joinAnswerToTurn(e,t){let n={...e};if(t.auth!==void 0&&(n[AuthKey.name]=continueTurnAuth(e[AuthKey.name],t.auth)),t.deliveryIds.length>0){let e=n[TurnDeliveryIdsKey.name]??[];n[TurnDeliveryIdsKey.name]=[...new Set([...e,...t.deliveryIds])]}return n}async function mapHeldAnswersStep(e){"use step";return await withSessionStateDelta(e,async()=>{let t=new Set(e.requestIds),n=await deliverChannelAnswers({...e,routable:e=>t.has(e.interactionId)});return n.delivery===e.delivery?{delivery:void 0}:{delivery:n.delivery,serializedContext:n.serializedContext}})}async function deliverChannelAnswers(e){let{routable:t}=e;if(!e.delivery.payloads.some(e=>e.answers?.some(e=>!t(e))===!0))return e;let n=await deserializeContext(e.serializedContext),r=n.require(ChannelKey);if(r.deliver===void 0)return e;e.delivery.auth!==void 0&&n.set(AuthKey,e.delivery.auth??null);let i=r.state??{},a=!1,o=[];for(let s of e.delivery.payloads){if(s.answers===void 0){o.push(s);continue}let e=[];for(let o of s.answers){if(t(o)){e.push(o);continue}let c=buildAdapterContext({...r,state:structuredClone(i)},n),l=(await r.deliver({...s,answers:[o],message:void 0},c))?.answers?.filter(t)??[];if(l.length===0){e.push(o);continue}a=!0,i=c.state,e.push(...l)}o.push({...s,answers:e})}if(!a)return e;let s=await deserializeContext(e.serializedContext);return setChannelContext(s,{...r,state:i}),{delivery:{...e.delivery,payloads:o},serializedContext:serializeContext(s)}}export{answersIdempotencyKey,mapHeldAnswersStep,routeProxiedDeliverStep};
|
|
1
|
+
import{activeTurn,interactionOwner,waiting}from"#protocol/session-projection/selectors.js";import{AuthKey,TurnDeliveryIdsKey}from"#context/keys.js";import{BundleKey,ChannelKey}from"#runtime/sessions/runtime-context-keys.js";import{storedProjection}from"#harness/session-machine/view.js";import{V26_INPUT_REMOTE_AGENT_PROTOCOL}from"#protocol/remote-agent-protocol.js";import{hasDelegatedSessionContext}from"#execution/delegated-session-context.js";import{resolveRemoteAgentStreamHeaders,respondToRemoteAgentSession}from"#execution/agent-sessions/remote.js";import{deserializeContext,serializeContext}from"#context/serialize.js";import{readDurableSession}from"#execution/durable-session-store.js";import{readHitlState}from"#harness/hitl/index.js";import{selectDeliveryPayloads}from"#harness/messages.js";import{resumeSessionInbox}from"#execution/session-inbox/resume.js";import{buildAdapterContext}from"#channel/adapter-context.js";import{commitSessionStep,publishSessionEvents}from"#execution/publish-session-events.js";import"#execution/session/state-delta.js";import{withSessionStateDelta}from"#execution/session/step-state-delta.js";import{routeAnswer}from"#harness/session-machine/transitions.js";import{coalesceDeliverPayloads}from"#execution/deliver-payloads.js";import{fact}from"#harness/facts.js";import{userPartsOf}from"#harness/user-parts.js";import{principalOf}from"#execution/session/delivery-facts.js";import{setChannelContext}from"#execution/channel-context.js";import{isSteeringDelivery}from"#execution/session/input-queue.js";import{continueTurnAuth,resolveTurnPrincipal}from"#execution/session/principal.js";import{routeDeliverPayload}from"#subagents/hitl-proxy.js";import{protocolTwoAnswersSettledOnForward}from"#subagents/protocol-two-callback.js";import{sendWorkflowAskAnswers}from"#execution/tools/workflow/answer.js";async function routeProxiedDeliverStep(e){"use step";return await withSessionStateDelta(e,routeProxiedDeliver)}async function routeProxiedDeliver(e){let t=readHitlState(readDurableSession(e.sessionState).state).relays,{delivery:n,serializedContext:r}=await deliverChannelAnswers({...e,routable:e=>t.has(e.interactionId)}),i=readDurableSession(e.sessionState),a=new Map,o=new Map,s,c=!hasDelegatedSessionContext(r)&&!(n.deliveryMetadata??[]).some(e=>e.hook!==void 0)&&isSteeringDelivery(n,{callerCallId:void 0,principal:resolveTurnPrincipal(void 0,r)},{heldOnPerson:!0}),l=new Set,u=[],d=!1,f=storedProjection(i.state).view,p=activeTurn(f),m=p===void 0?void 0:waiting(f,p.turnId),askedTurn=e=>{let t=interactionOwner(f,e).turnId;return t!==void 0&&f.turns[t]?.status===`running`?t:m?.on===`interaction`&&m.interactions.some(t=>t.interactionId===e.interactionId)?p?.turnId:void 0},h=[],g=[];for(let[e,t]of n.payloads.entries()){let r=routeDeliverPayload({allowRoute:e=>!l.has(e),payload:t,resolveMessage:c,state:i.state});s??=r.parentAction,r.forSelf!==void 0&&a.set(e,r.forSelf);let p=(n.deliveryMetadata??[]).filter(t=>t.payloadIndex===e),m=p[0]?.deliveryId;if(r.forChildren.length>0&&m!==void 0){let e=r.forChildren.find(e=>e.message!==void 0),i=r.forChildren.flatMap(e=>e.payload.answers).map(e=>f.interactions[e.interactionId]).find(e=>e!==void 0&&askedTurn(e)!==void 0),a=i===void 0?void 0:askedTurn(i);e!==void 0&&a!==void 0&&(d=!0),r.forSelf===void 0&&a!==void 0&&u.push(...p.map(e=>e.deliveryId));for(let t of p)h.push({consumed:r.forSelf===void 0&&a!==void 0?{parts:e?.message===void 0?[]:userPartsOf(e.message),turnId:a}:void 0,continues:r.forSelf!==void 0||void 0,deliveryId:t.deliveryId,principal:principalOf(n.auth),source:t.channelKind===void 0?void 0:{channel:t.channelKind}});for(let e of r.forChildren)for(let n of e.payload.answers){let e=(t.answers??[]).indexOf(n),r={};n.optionId!==void 0&&(r.optionId=n.optionId),n.text!==void 0&&(r.text=n.text),g.push({deliveryId:m,interactionId:n.interactionId,responseId:`response_${m}_forwarded_${e===-1?`typed_0`:String(e)}`,value:r})}}for(let[t,i]of r.forChildren.entries()){if(i.workflowAsk!==void 0||i.message!==void 0)for(let{interactionId:e}of i.payload.answers)l.add(e);let a=JSON.stringify([i.childContinuationToken,i.childSessionInbox?.sessionId??``,i.remote?.sessionId??``,i.inputSource??null,i.workflowAsk?.control??null]),s=o.get(a)??{workflowAsk:i.workflowAsk,remote:i.remote,childContinuationToken:i.childContinuationToken,childSessionInbox:i.childSessionInbox,metadata:[],payloads:[]},c=s.payloads.length;if(s.payloads.push(i.payload),r.forSelf===void 0&&t===0)for(let t of n.deliveryMetadata??[])t.payloadIndex===e&&s.metadata.push({...t,payloadIndex:c});o.set(a,s)}}let _={serializedContext:joinAnswerToTurn(r,{auth:d?n.auth:void 0,deliveryIds:u}),sessionState:e.sessionState},v=!1,y=h.filter(e=>e.consumed!==void 0),b=y.length===0?_:await commitSessionStep({..._,sessionWritable:e.sessionWritable},e=>[routeAnswer(e,{deliveries:y,forwarded:[],decided:[]})],{origin:`own`,cancelTurn:()=>{v=!0}});if(v){let t=storedProjection(readDurableSession(b.sessionState).state).view,r=(n.deliveryMetadata??[]).filter(({deliveryId:e,payloadIndex:n})=>a.has(n)&&t.deliveries[e]?.status!==`settled`);if(r.length===0)return{...b,kind:`cancel-turn`};let i=await publishSessionEvents({...b,sessionWritable:e.sessionWritable},r.flatMap(({channelKind:e,deliveryId:r})=>[...t.deliveries[r]===void 0?[fact(`delivery.admitted`,{deliveryId:r,principal:principalOf(n.auth),source:e===void 0?void 0:{channel:e}})]:[],fact(`delivery.settled`,{deliveryId:r,outcome:`ignored`})]));return{kind:`cancel-turn`,serializedContext:i.serializedContext,sessionState:i.sessionState}}let x=[];for(let[e,t]of o)if(t.workflowAsk!==void 0){let e=coalesceDeliverPayloads(t.payloads).answers??[];x.push(...e.map(e=>({answer:e,outcome:`accepted`}))),await sendWorkflowAskAnswers(t.workflowAsk,e,principalOf(n.auth))}else{let i={...n,deliveryMetadata:t.metadata.length===0?void 0:t.metadata,payloads:t.payloads},a=t.remote;if(a!==void 0){let i=await deserializeContext(r),o=await resolveRemoteAgentStreamHeaders({bundle:i.require(BundleKey),name:a.name,dynamicBinding:a.dynamicBinding,resolverId:a.resolverId,url:a.url}),c=coalesceDeliverPayloads(t.payloads).answers??[];if(await respondToRemoteAgentSession({remote:a,headers:o,auth:n.auth,idempotencyKey:await answersIdempotencyKey(n,e),responses:c}),a.earlierProtocol===V26_INPUT_REMOTE_AGENT_PROTOCOL)for(let e of protocolTwoAnswersSettledOnForward({answers:c,decidedHere:s?.answer.interactionId,kindOf:e=>f.interactions[e]?.request.kind}))x.push({answer:e,outcome:`accepted`})}else await resumeSessionInbox(t.childSessionInbox??t.childContinuationToken,i)}let S=await commitSessionStep({...b,sessionWritable:e.sessionWritable},e=>[routeAnswer(e,{decided:s===void 0?x:[...x,{answer:s.answer,outcome:`declined`}],deliveries:h,forwarded:g})],{origin:`relayed`});if(s!==void 0)return{...S,kind:s.kind};let C=[...a].sort(([e],[t])=>e-t),w=C.length===0?void 0:selectDeliveryPayloads(n,C.map(([e,t])=>({index:e,payload:t})));return{...S,kind:`continue`,remainder:w}}async function answersIdempotencyKey(e,t){let n=(e.deliveryMetadata??[]).map(e=>e.deliveryId);if(n.length===0)return;let r=JSON.stringify([n,t]),i=await crypto.subtle.digest(`SHA-256`,new TextEncoder().encode(r));return`eve-answers:${Array.from(new Uint8Array(i),e=>e.toString(16).padStart(2,`0`)).join(``)}`}function joinAnswerToTurn(e,t){let n={...e};if(t.auth!==void 0&&(n[AuthKey.name]=continueTurnAuth(e[AuthKey.name],t.auth)),t.deliveryIds.length>0){let e=n[TurnDeliveryIdsKey.name]??[];n[TurnDeliveryIdsKey.name]=[...new Set([...e,...t.deliveryIds])]}return n}async function mapHeldAnswersStep(e){"use step";return await withSessionStateDelta(e,async()=>{let t=new Set(e.requestIds),n=await deliverChannelAnswers({...e,routable:e=>t.has(e.interactionId)});return n.delivery===e.delivery?{delivery:void 0}:{delivery:n.delivery,serializedContext:n.serializedContext}})}async function deliverChannelAnswers(e){let{routable:t}=e;if(!e.delivery.payloads.some(e=>e.answers?.some(e=>!t(e))===!0))return e;let n=await deserializeContext(e.serializedContext),r=n.require(ChannelKey);if(r.deliver===void 0)return e;e.delivery.auth!==void 0&&n.set(AuthKey,e.delivery.auth??null);let i=r.state??{},a=!1,o=[];for(let s of e.delivery.payloads){if(s.answers===void 0){o.push(s);continue}let e=[];for(let o of s.answers){if(t(o)){e.push(o);continue}let c=buildAdapterContext({...r,state:structuredClone(i)},n),l=(await r.deliver({...s,answers:[o],message:void 0},c))?.answers?.filter(t)??[];if(l.length===0){e.push(o);continue}a=!0,i=c.state,e.push(...l)}o.push({...s,answers:e})}if(!a)return e;let s=await deserializeContext(e.serializedContext);return setChannelContext(s,{...r,state:i}),{delivery:{...e.delivery,payloads:o},serializedContext:serializeContext(s)}}export{answersIdempotencyKey,mapHeldAnswersStep,routeProxiedDeliverStep};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import{randomUUID}from"node:crypto";import{isEveDevEnvironment}from"#internal/application/dev-environment.js";import{shellQuote}from"#execution/sandbox/shell-quote.js";import{
|
|
1
|
+
import{randomUUID}from"node:crypto";import{isEveDevEnvironment}from"#internal/application/dev-environment.js";import{shellQuote}from"#execution/sandbox/shell-quote.js";import{MAX_OUTPUT_BYTES,truncateTail}from"#execution/sandbox/truncate-output.js";const BASH_YIELD_SECONDS=30;async function executeBashOnSandbox(e,t,n={}){let r=formatCommand(t.command);logDevelopmentSandboxCommand(`eve: starting sandbox command: ${r}`);let i=await withDevelopmentSandboxProgress(r,()=>runCommand(e,t.command,n.abortSignal));return logDevelopmentSandboxCommand(i.status===`running`?`eve: sandbox command still running as pid ${i.pid}: ${r}`:`eve: sandbox command finished (exit ${i.exitCode}): ${r}`),i}async function runCommand(e,t,n){n?.throwIfAborted();let r=randomUUID().slice(0,8),i=`/tmp/.eve/jobs/${r}`,a=new AbortController,cancel=()=>{a.abort(n?.reason),Promise.resolve(e.run({command:`kill -TERM -- -"$(cat ${shellQuote(i)}/pid 2>/dev/null)" 2>/dev/null; rm -rf ${shellQuote(i)}`})).catch(()=>{})};n?.addEventListener(`abort`,cancel,{once:!0});try{let n=await e.spawn({signal:a.signal,command:launchCommand(t,i)}),o=Promise.all([readTail(n.stdout),readTail(n.stderr),n.wait()]).then(([e,t,{exitCode:n}])=>({exitCode:n,stderr:t,stdout:e})),s=await waitUpTo(o,3e4);if(s!==void 0)return completed(s.exitCode,s);let c=await claimRunningJob(e,i,r);if(c===void 0){let e=await o;return completed(e.exitCode,e)}return o.catch(()=>{}),c}finally{n?.removeEventListener(`abort`,cancel)}}function launchCommand(e,t){return[`if command -v bash >/dev/null 2>&1 && kill -0 "$$" 2>/dev/null; then`,` set -- ${shellQuote(t)} ${shellQuote(e)}`,` eval ${shellQuote(`d=$1
|
|
2
2
|
mkdir -p "$d" 2>/dev/null || { eval "$2"; exit; }
|
|
3
3
|
trap 'exit 0' USR1
|
|
4
4
|
echo "$$" > "$d/launcher"
|
|
@@ -21,4 +21,4 @@ cat "$d/stderr" >&2
|
|
|
21
21
|
rm -rf "$d"
|
|
22
22
|
exit "$code"`)}`,`fi`,`eval ${shellQuote(e)}`].join(`
|
|
23
23
|
`)}async function claimRunningJob(e,t,n){let r=`eve-bash:${n}`,i=await e.run({command:[`cd ${shellQuote(t)} 2>/dev/null && mkdir claimed 2>/dev/null || exit 0`,`kill -USR1 "$(cat launcher)" 2>/dev/null`,`printf '%s %s %s %s\\n' ${r} "$(cat pid)" "$(($(wc -c < stdout)))" "$(($(wc -c < stderr)))"`,`tail -c ${MAX_OUTPUT_BYTES} stdout`,`tail -c ${MAX_OUTPUT_BYTES} stderr >&2`].join(`
|
|
24
|
-
`)}),a=RegExp(`(?:^|\\n)${r} (\\d+) (\\d+) (\\d+)\\n`).exec(i.stdout);if(a===null)return;let o=Number(a[1]),s=i.stdout.slice(a.index+a[0].length),c={stderr:Math.max(0,Number(a[3])-Buffer.byteLength(i.stderr)),stdout:Math.max(0,Number(a[2])-Buffer.byteLength(s))};return{...formatStreams({stderr:i.stderr,stdout:s},c),message:`The command is still running after 30 seconds as process group ${o}; stdout and stderr show its output so far. It keeps writing to ${t}/stdout and ${t}/stderr, and writes its exit code to ${t}/exit when it finishes. Check on it with later commands such as \`tail ${t}/stdout\` or \`cat ${t}/exit\`, and stop it with \`kill -- -${o}\`.`,outputDirectory:t,pid:o,status:`running`}}async function
|
|
24
|
+
`)}),a=RegExp(`(?:^|\\n)${r} (\\d+) (\\d+) (\\d+)\\n`).exec(i.stdout);if(a===null)return;let o=Number(a[1]),s=i.stdout.slice(a.index+a[0].length),c={stderr:Math.max(0,Number(a[3])-Buffer.byteLength(i.stderr)),stdout:Math.max(0,Number(a[2])-Buffer.byteLength(s))};return{...formatStreams({stderr:i.stderr,stdout:s},c),message:`The command is still running after 30 seconds as process group ${o}; stdout and stderr show its output so far. It keeps writing to ${t}/stdout and ${t}/stderr, and writes its exit code to ${t}/exit when it finishes. Check on it with later commands such as \`tail ${t}/stdout\` or \`cat ${t}/exit\`, and stop it with \`kill -- -${o}\`.`,outputDirectory:t,pid:o,status:`running`}}async function readTail(e){let t=[],n=0,r=0,keepTail=()=>{let e=Buffer.concat(t).subarray(-MAX_OUTPUT_BYTES);return r+=n-e.byteLength,t=[e],n=e.byteLength,e};for await(let r of e)t.push(r),n+=r.byteLength,n>2*MAX_OUTPUT_BYTES&&keepTail();let i=new TextDecoder().decode(keepTail());return{omittedBytes:r,text:i}}async function waitUpTo(e,t){let n;try{return await Promise.race([e,new Promise(e=>{n=setTimeout(()=>e(void 0),t)})])}finally{clearTimeout(n)}}function completed(e,{stderr:t,stdout:n}){return{...formatStreams({stderr:t.text,stdout:n.text},{stderr:t.omittedBytes,stdout:n.omittedBytes}),exitCode:e,status:`completed`}}function formatStreams(e,t){let n=formatStream(`stdout`,e.stdout,t.stdout),r=formatStream(`stderr`,e.stderr,t.stderr);return{stderr:r.output,stdout:n.output,truncated:n.truncated||r.truncated}}function formatStream(e,t,n){let r=truncateTail(t);return!r.truncated&&n===0?{output:r.output,truncated:!1}:{output:`${n===0?`[${e} truncated: showing last ${r.outputLines} of ${r.totalLines} lines]`:`[${e} truncated: showing last ${r.outputLines} lines; earlier output omitted]`}\n${r.output}`,truncated:!0}}async function withDevelopmentSandboxProgress(e,t){if(!isEveDevEnvironment())return await t();let n=Date.now(),r=setInterval(()=>{logDevelopmentSandboxCommand(`eve: waiting for sandbox command (${Math.round((Date.now()-n)/1e3)}s elapsed): ${e}`)},5e3);r.unref?.();try{return await t()}catch(t){throw logDevelopmentSandboxCommand(`eve: sandbox command failed: ${e}`),t}finally{clearInterval(r)}}function logDevelopmentSandboxCommand(e){isEveDevEnvironment()&&console.log(e)}function formatCommand(e){let t=e.replaceAll(/\s+/g,` `).trim();return t.length<=240?t:`${t.slice(0,239)}…`}export{BASH_YIELD_SECONDS,executeBashOnSandbox};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{answersDeliveryId}from"#shared/answers-delivery-id.js";import{activeTurnId,storedProjection,turnPosition}from"#harness/session-machine/view.js";import{coalesceDeliveries,selectDeliveryPayloads}from"#harness/messages.js";import{readDurableSession}from"#execution/durable-session-read.js";import{isSteeringDelivery,isSteeringMessage}from"#execution/session/input-queue.js";import{mapHeldAnswersStep}from"#execution/proxied-deliver-step.js";import{controlDeliveryOf}from"#execution/session/control-delivery.js";import{settleControlDeliveryStep}from"#execution/session/settle-control-delivery-step.js";import{routeDeliverToChildren}from"#execution/route-child-delivery.js";import{admitSessionInboxPayload}from"#execution/session/admission.js";import{routeSelectedDelivery}from"#execution/session/route-selected-delivery.js";import{createTurnControl}from"#execution/session/turn-control.js";import{decodeSessionInboxPayload}from"#execution/session-inbox/protocol.js";import{isAgentSessionMessage,runMessageBatchBudget}from"#execution/tools/workflow/messages.js";import{isAppliedRunMessage,takeLeadingAppliedRunMessages}from"#execution/session-workflow-tool-run.js";import{TurnCancelledError}from"#harness/turn-cancellation.js";var ActiveTurn=class{admitted=new Set;routedToChildren=new Set;mappedForHeldRequest=new Set;runtimeResults=[];controller;#e;#t;expectedTurnId;input;identity;unsubscribe;unsubscribeDelivery;steeringController;caller;compacted=!1;constructor(e,t,n=createTurnControl()){this.controller=n.cancellation,this.steeringController=n.steering,this.input=e,this.caller=t.caller,this.#t=t.control===!0,this.identity={callerCallId:t.caller?.callId,principal:t.principal},this.expectedTurnId=activeTurnId(turnPosition(storedProjection(readDurableSession(e.cursor.sessionState).state))),this.unsubscribe=e.inbox.onInterrupt(e=>{this.cancelsThisTurn(e)&&this.abort()}),this.unsubscribeDelivery=e.inbox.onDelivery(this.signalSteering)}signalSteering=e=>{let t;try{t=decodeSessionInboxPayload(e)}catch{return}t.kind===`deliver`&&!this.input.queue.isDuplicate(t)&&isSteeringMessage(t,this.identity)&&!this.input.cursor.sessionState.hasProxyInputRequests&&this.steeringController.abort()};get signal(){return this.controller.signal}dispose(){this.unsubscribe(),this.unsubscribeDelivery()}get steeringSignal(){return this.steeringController.signal}resetSteering(){this.steeringController.signal.aborted&&(this.unsubscribeDelivery(),this.steeringController=new AbortController,this.unsubscribeDelivery=this.input.inbox.onDelivery(this.signalSteering))}async admitBoundary(e=!1){let t=this.input.inbox.drain();for(let n of t)await this.admit(n,e)}async takeSteering(e){let t=[];for(;;){let n=this.input.queue.takeSteering(this.admitted,this.identity,e);if(n===void 0)break;for(let e of n.sequences)this.admitted.delete(e);let r=await routeSelectedDelivery(n,this.input.cursor);if(r.kind===`cancel-turn`){this.abort();break}r.kind===`turn`&&t.push(r.delivery)}if(this.resetSteering(),t.length===0)return;let n=t.length===1?t[0]:coalesceDeliveries(t);return n.caller!==void 0&&(this.caller=n.caller),n}takeBoundaryMessages(e){let t=[],n=[];for(let r of this.runtimeResults){let i=asBoundaryMessage(r);i===void 0||e!==void 0&&!e(i)?n.push(r):t.push(i)}return this.runtimeResults.splice(0,this.runtimeResults.length,...n),t}takeAppliedRunMessages(){let e=runMessageBatchBudget(),t=[];for(let n=this.runtimeResults[0];n!==void 0;n=this.runtimeResults[0]){if(n===`cancelled`||n.kind!==`workflow`||!isAppliedRunMessage(n.message)||!e(n.message))return t;t.push(n.message),this.runtimeResults.shift()}return[...t,...takeLeadingAppliedRunMessages(this.input.inbox,e)]}async nextRuntimeEvent(e){for(;;){let t=await this.routeAdmittedToChildren();if(this.signal.aborted)return`cancelled`;if(t)return{kind:`steering`};let n=this.runtimeResults.shift();if(n!==void 0)return n;let r=await this.waitForInboxOrTimer(e);if(r!==void 0)return{callId:r,kind:`timeout`};let i=await this.input.inbox.next();if(i===void 0)throw Error(`Session inbox closed before runtime actions completed.`);if(await this.admit(i))return{kind:`input`}}}async takeAnswers(e){for(let t of this.admitted){let n=this.input.queue.delivery(t);if(n===void 0)continue;let r=n.payloads.flatMap(e=>e.answers??[]);if(r.length===0)continue;if(!r.some(t=>e.has(t.interactionId))){if(this.mappedForHeldRequest.has(t))continue;this.mappedForHeldRequest.add(t);let r=n,i=await this.input.cursor.advance(t=>mapHeldAnswersStep({delivery:r,requestIds:[...e],...t}));if(i.delivery===void 0)continue;n=i.delivery}this.admitted.delete(t);let i=isSteeringDelivery(n,this.identity,{heldOnPerson:!0})?void 0:splitAnswers(n);return this.input.queue.replaceDelivery(t,i?.rest),i?.answers??n}}async waitForInboxOrTimer(e){if(e.length===0||this.input.inbox.hasPending())return;let t=this.input.inbox.whenPending().then(()=>void 0);return await Promise.race([t,...e])}cancelsThisTurn(e){return e.kind===`reset`||e.kind===`session-failure`?!0:
|
|
1
|
+
import{answersDeliveryId}from"#shared/answers-delivery-id.js";import{activeTurnId,storedProjection,turnPosition}from"#harness/session-machine/view.js";import{coalesceDeliveries,selectDeliveryPayloads}from"#harness/messages.js";import{readDurableSession}from"#execution/durable-session-read.js";import{isSteeringDelivery,isSteeringMessage}from"#execution/session/input-queue.js";import{mapHeldAnswersStep}from"#execution/proxied-deliver-step.js";import{controlDeliveryOf}from"#execution/session/control-delivery.js";import{settleControlDeliveryStep}from"#execution/session/settle-control-delivery-step.js";import{routeDeliverToChildren}from"#execution/route-child-delivery.js";import{admitSessionInboxPayload}from"#execution/session/admission.js";import{routeSelectedDelivery}from"#execution/session/route-selected-delivery.js";import{createTurnControl}from"#execution/session/turn-control.js";import{decodeSessionInboxPayload}from"#execution/session-inbox/protocol.js";import{isAgentSessionMessage,runMessageBatchBudget}from"#execution/tools/workflow/messages.js";import{isAppliedRunMessage,takeLeadingAppliedRunMessages}from"#execution/session-workflow-tool-run.js";import{TurnCancelledError}from"#harness/turn-cancellation.js";var ActiveTurn=class{admitted=new Set;routedToChildren=new Set;mappedForHeldRequest=new Set;runtimeResults=[];controller;#e;#t;expectedTurnId;input;identity;unsubscribe;unsubscribeDelivery;steeringController;caller;compacted=!1;constructor(e,t,n=createTurnControl()){this.controller=n.cancellation,this.steeringController=n.steering,this.input=e,this.caller=t.caller,this.#t=t.control===!0,this.identity={callerCallId:t.caller?.callId,principal:t.principal},this.expectedTurnId=activeTurnId(turnPosition(storedProjection(readDurableSession(e.cursor.sessionState).state))),this.unsubscribe=e.inbox.onInterrupt(e=>{this.cancelsThisTurn(e)&&this.abort()}),this.unsubscribeDelivery=e.inbox.onDelivery(this.signalSteering)}signalSteering=e=>{let t;try{t=decodeSessionInboxPayload(e)}catch{return}t.kind===`deliver`&&!this.input.queue.isDuplicate(t)&&isSteeringMessage(t,this.identity)&&!this.input.cursor.sessionState.hasProxyInputRequests&&this.steeringController.abort()};get signal(){return this.controller.signal}dispose(){this.unsubscribe(),this.unsubscribeDelivery()}get steeringSignal(){return this.steeringController.signal}resetSteering(){this.steeringController.signal.aborted&&(this.unsubscribeDelivery(),this.steeringController=new AbortController,this.unsubscribeDelivery=this.input.inbox.onDelivery(this.signalSteering))}async admitBoundary(e=!1){let t=this.input.inbox.drain();for(let n of t)await this.admit(n,e)}async takeSteering(e){let t=[];for(;;){let n=this.input.queue.takeSteering(this.admitted,this.identity,e);if(n===void 0)break;for(let e of n.sequences)this.admitted.delete(e);let r=await routeSelectedDelivery(n,this.input.cursor);if(r.kind===`cancel-turn`){this.abort();break}r.kind===`turn`&&t.push(r.delivery)}if(this.resetSteering(),t.length===0)return;let n=t.length===1?t[0]:coalesceDeliveries(t);return n.caller!==void 0&&(this.caller=n.caller),n}takeBoundaryMessages(e){let t=[],n=[];for(let r of this.runtimeResults){let i=asBoundaryMessage(r);i===void 0||e!==void 0&&!e(i)?n.push(r):t.push(i)}return this.runtimeResults.splice(0,this.runtimeResults.length,...n),t}takeAppliedRunMessages(){let e=runMessageBatchBudget(),t=[];for(let n=this.runtimeResults[0];n!==void 0;n=this.runtimeResults[0]){if(n===`cancelled`||n.kind!==`workflow`||!isAppliedRunMessage(n.message)||!e(n.message))return t;t.push(n.message),this.runtimeResults.shift()}return[...t,...takeLeadingAppliedRunMessages(this.input.inbox,e)]}async nextRuntimeEvent(e){for(;;){let t=await this.routeAdmittedToChildren();if(this.signal.aborted)return`cancelled`;if(t)return{kind:`steering`};let n=this.runtimeResults.shift();if(n!==void 0)return n;let r=await this.waitForInboxOrTimer(e);if(r!==void 0)return{callId:r,kind:`timeout`};let i=await this.input.inbox.next();if(i===void 0)throw Error(`Session inbox closed before runtime actions completed.`);if(await this.admit(i))return{kind:`input`}}}async takeAnswers(e){for(let t of this.admitted){let n=this.input.queue.delivery(t);if(n===void 0)continue;let r=n.payloads.flatMap(e=>e.answers??[]);if(r.length===0)continue;if(!r.some(t=>e.has(t.interactionId))){if(this.mappedForHeldRequest.has(t))continue;this.mappedForHeldRequest.add(t);let r=n,i=await this.input.cursor.advance(t=>mapHeldAnswersStep({delivery:r,requestIds:[...e],...t}));if(i.delivery===void 0)continue;n=i.delivery}this.admitted.delete(t);let i=isSteeringDelivery(n,this.identity,{heldOnPerson:!0})?void 0:splitAnswers(n);return this.input.queue.replaceDelivery(t,i?.rest),i?.answers??n}}async waitForInboxOrTimer(e){if(e.length===0||this.input.inbox.hasPending())return;let t=this.input.inbox.whenPending().then(()=>void 0);return await Promise.race([t,...e])}cancelsThisTurn(e){return e.kind===`reset`||e.kind===`session-failure`?!0:this.#t?!1:e.kind===`clear`?!0:e.kind===`cancel`?e.turnId===void 0||e.turnId===this.expectedTurnId:!1}async admit(e,t=!1){let n=await admitSessionInboxPayload(e,this.input);switch(n.kind){case`delivery`:return this.admitted.add(n.admission.sequence),!0;case`runtime-action-result`:return this.runtimeResults.push({kind:`runtime-action-result`,results:n.payload.results}),!1;case`workflow`:return this.runtimeResults.push({kind:`workflow`,message:n.message}),!1;case`cancel`:if((!t||e.kind!==`cancel`)&&this.cancelsThisTurn(e)&&this.#e===void 0)this.#e??=n.origin,this.abort();else if(n.origin!==void 0){let e=controlDeliveryOf(n.origin);await this.input.cursor.advance(t=>settleControlDeliveryStep({...t,settlement:{control:e,outcome:`ignored`,source:`cancel`}}))}return!1;case`unsupported`:{let{settlement:e}=n;return await this.input.cursor.advance(t=>settleControlDeliveryStep({...t,settlement:e})),!1}case`consumed`:return e.kind===`authorization-callback`}}async routeAdmittedToChildren(){let e=!1;for(let t of this.admitted){if(this.routedToChildren.has(t))continue;let n=this.input.queue.delivery(t);if(n===void 0){this.admitted.delete(t);continue}this.routedToChildren.add(t);let r=await this.input.cursor.advance(e=>routeDeliverToChildren({delivery:n,...e}));if(r.kind===`cancel-turn`)return this.input.queue.replaceDelivery(t,void 0),this.admitted.delete(t),this.abort(),!1;if(this.input.queue.replaceDelivery(t,r.remainder),r.remainder===void 0){this.admitted.delete(t);continue}isSteeringMessage(r.remainder,this.identity)&&(e=!0)}return e}get cancelledBy(){return this.#e}abort(){this.controller.signal.aborted||this.controller.abort(new TurnCancelledError)}};function asBoundaryMessage(e){if(e!==`cancelled`&&e.kind===`workflow`&&(e.message.from.taskId!==void 0||isAgentSessionMessage(e.message)))return e.message}function splitAnswers(e){let t=e.payloads.flatMap((e,t)=>e.answers===void 0?[]:[{index:t,payload:{answers:e.answers}}]),n=e.payloads.flatMap((e,t)=>{if(e.message===void 0)return[];let{answers:n,...r}=e;return[{index:t,payload:r}]}),r=selectDeliveryPayloads(e,t),i=new Set(n.map(({index:e})=>e));return{answers:{...r,deliveryMetadata:r.deliveryMetadata?.map(e=>({...e,deliveryId:i.has(t[e.payloadIndex].index)?answersDeliveryId(e.deliveryId):e.deliveryId}))},rest:n.length===0?void 0:selectDeliveryPayloads(e,n)}}export{ActiveTurn};
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { SessionStateCursor } from "#execution/session/state-cursor.js";
|
|
2
2
|
import type { RuntimeActionResultHookPayload, SessionControlIdentity } from "#channel/types.js";
|
|
3
|
+
import type { ControlSettlement } from "#harness/facts.js";
|
|
3
4
|
import type { ControlOrigin, DeliveryAdmission, SessionInputQueue } from "#execution/session/input-queue.js";
|
|
4
5
|
import { type SessionInboxPayload } from "#execution/session-inbox/inbox.js";
|
|
5
6
|
import type { WorkflowToolRunMessage } from "#execution/tools/workflow/messages.js";
|
|
@@ -12,6 +13,11 @@ type SessionAdmission = {
|
|
|
12
13
|
readonly origin?: ControlOrigin;
|
|
13
14
|
} | {
|
|
14
15
|
readonly kind: "consumed";
|
|
16
|
+
}
|
|
17
|
+
/** A control this owner cannot run: settle it failed, so its sender doesn't wait forever. */
|
|
18
|
+
| {
|
|
19
|
+
readonly kind: "unsupported";
|
|
20
|
+
readonly settlement: ControlSettlement;
|
|
15
21
|
} | {
|
|
16
22
|
readonly kind: "runtime-action-result";
|
|
17
23
|
readonly payload: RuntimeActionResultHookPayload;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{getWorkflowMetadata}from"#compiled/@workflow/core/index.js";import{isWorkflowMessage}from"#execution/session-inbox/inbox.js";import{SessionInboxPayloadError,decodeSessionInboxPayload}from"#execution/session-inbox/protocol.js";import{settleDuplicateDeliveryStep}from"#execution/session/settle-duplicate-delivery-step.js";import{reportDroppedWirePayloadStep}from"#execution/report-dropped-wire-payload-step.js";async function admitSessionInboxPayload(e,t){if(e.kind===`session-failure`)throw Error(e.error);if(e.kind===`runtime-action-result`)return{kind:`runtime-action-result`,payload:e};if(isWorkflowMessage(e))return{kind:`workflow`,message:e};if(e.kind===`authorization-callback`)return t.queue.enqueueAuthorization(e.payloads),{kind:`consumed`};if(e.kind===`subagent-interaction`)return{kind:`consumed`};let n;try{n=decodeSessionInboxPayload(e)}catch(
|
|
1
|
+
import{getWorkflowMetadata}from"#compiled/@workflow/core/index.js";import{isWorkflowMessage}from"#execution/session-inbox/inbox.js";import{controlDeliveryOf}from"#execution/session/control-delivery.js";import{SessionInboxPayloadError,decodeSessionInboxPayload}from"#execution/session-inbox/protocol.js";import{settleDuplicateDeliveryStep}from"#execution/session/settle-duplicate-delivery-step.js";import{reportDroppedWirePayloadStep}from"#execution/report-dropped-wire-payload-step.js";async function admitSessionInboxPayload(e,t){if(e.kind===`session-failure`)throw Error(e.error);if(e.kind===`runtime-action-result`)return{kind:`runtime-action-result`,payload:e};if(isWorkflowMessage(e))return{kind:`workflow`,message:e};if(e.kind===`authorization-callback`)return t.queue.enqueueAuthorization(e.payloads),{kind:`consumed`};if(e.kind===`subagent-interaction`)return{kind:`consumed`};let n;try{n=decodeSessionInboxPayload(e)}catch(t){if(!(t instanceof SessionInboxPayloadError))throw t;await reportDroppedWirePayloadStep({detail:t.message,family:`session-inbox`});let n=unsupportedControl(e,t.message);return n===void 0?{kind:`consumed`}:{kind:`unsupported`,settlement:n}}switch(n.kind){case`session-prewarm`:return n.expectedOwnerRunId===getWorkflowMetadata().workflowRunId&&t.queue.prepareOnDeployment(n.targetDeploymentId),{kind:`consumed`};case`deliver`:{let e=t.queue.enqueueDelivery(n);return e===void 0?(await t.cursor.advance(e=>settleDuplicateDeliveryStep({...e,delivery:n})),{kind:`consumed`}):{admission:e,kind:`delivery`}}case`clear`:return t.queue.enqueueControl(`clear`,controlOrigin(n)),{kind:`cancel`};case`compact`:return t.queue.enqueueControl(`compact`,controlOrigin(n)),{kind:`consumed`};case`session-timeout`:return n.ownerRunId===getWorkflowMetadata().workflowRunId&&t.queue.enqueueControl(`expired`),{kind:`consumed`};case`reset`:return t.queue.enqueueControl(`reset`,controlOrigin(n)),{kind:`cancel`};case`cancel`:{let e=controlOrigin(n);return e===void 0?{kind:`cancel`}:{kind:`cancel`,origin:e}}}}function controlOrigin(e){return e.auth===void 0?{deliveryId:e.deliveryId}:{auth:e.auth,deliveryId:e.deliveryId}}function unsupportedControl(e,t){let{auth:n,deliveryId:r,kind:i}=e;return typeof r!=`string`||r.length===0?void 0:{control:controlDeliveryOf(typeof n==`object`&&n?{auth:n,deliveryId:r}:{deliveryId:r}),outcome:`failed`,reason:t,source:typeof i==`string`&&i.length>0?i:`unknown`}}export{admitSessionInboxPayload,controlOrigin};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{defined,fact}from"#harness/facts.js";import{userPartsOf}from"#harness/user-parts.js";function admitDeliveries(e){let{delivery:t}=e,n=[],r=[],i=principalOf(t.auth);for(let{input:a,payload:o}of e.payloads){let s=t.payloads.indexOf(o),c=t.deliveryMetadata?.find(e=>e.payloadIndex===s);if(c===void 0)throw Error(`Session delivery has no identity. Assign delivery metadata at dispatch before admission.`);let l=c.deliveryId,u=defined({channel:c.channelKind??e.channelKind,scheduleId:t.schedule?.definition}),d=e.status?.(l);if(d===void 0&&n.push(fact(`delivery.admitted`,{deliveryId:l,principal:i,source:u})),a===void 0){d!==`settled`&&n.push(fact(`delivery.settled`,{deliveryId:l,outcome:`ignored`}));continue}let f=defined({deliveryId:l,history:(a.history?.length??0)>0?a.history:void 0,parts:a.message===void 0?[]:userPartsOf(a.message)}),{answers:p,...m}=a;r.push(p===void 0||p.length===0?{...m,deliveries:[f]}:{...m,answers:p.map((e,t)=>defined({interactionId:e.interactionId,optionId:e.optionId,text:e.text,deliveryId:l,responseId:`response_${l}_${String(t)}`})),deliveries:[f]})}return{facts:n,inputs:r}}function principalOf(e){if(e!=null)return defined({id:e.principalId,issuer:e.issuer,type:e.principalType})}export{admitDeliveries,principalOf};
|
|
1
|
+
import{defined,fact}from"#harness/facts.js";import{userPartsOf}from"#harness/user-parts.js";function admitDeliveries(e){let{delivery:t}=e,n=[],r=[],i=principalOf(t.auth);for(let{input:a,payload:o}of e.payloads){let s=t.payloads.indexOf(o),c=t.deliveryMetadata?.find(e=>e.payloadIndex===s);if(c===void 0)throw Error(`Session delivery has no identity. Assign delivery metadata at dispatch before admission.`);let l=c.deliveryId,u=defined({channel:c.channelKind??e.channelKind,hook:c.hook,scheduleId:t.schedule?.definition}),d=e.status?.(l);if(d===void 0&&n.push(fact(`delivery.admitted`,{deliveryId:l,principal:i,source:u})),a===void 0){d!==`settled`&&n.push(fact(`delivery.settled`,{deliveryId:l,outcome:`ignored`}));continue}let f=defined({deliveryId:l,history:(a.history?.length??0)>0?a.history:void 0,parts:a.message===void 0?[]:userPartsOf(a.message)}),{answers:p,...m}=a;r.push(p===void 0||p.length===0?{...m,deliveries:[f]}:{...m,answers:p.map((e,t)=>defined({interactionId:e.interactionId,optionId:e.optionId,text:e.text,deliveryId:l,responseId:`response_${l}_${String(t)}`})),deliveries:[f]})}return{facts:n,inputs:r}}function principalOf(e){if(e!=null)return defined({id:e.principalId,issuer:e.issuer,type:e.principalType})}export{admitDeliveries,principalOf};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ControlSettlement } from "#harness/facts.js";
|
|
2
2
|
import type { ControlOrigin, SessionControl, SessionInputQueue, TurnSelection } from "#execution/session/input-queue.js";
|
|
3
|
-
import type { SessionInboxReader } from "#execution/session-inbox/inbox.js";
|
|
3
|
+
import type { SessionInboxHandle, SessionInboxReader } from "#execution/session-inbox/inbox.js";
|
|
4
4
|
import type { SessionStateCursor } from "#execution/session/state-cursor.js";
|
|
5
5
|
import type { WorkflowToolRunMessage } from "#execution/tools/workflow/messages.js";
|
|
6
6
|
export type NextTurnInstruction = {
|
|
@@ -28,7 +28,7 @@ export type NextTurnInstruction = {
|
|
|
28
28
|
* descendant deliveries leave nothing for the parent, so the wait continues.
|
|
29
29
|
*/
|
|
30
30
|
export declare function nextTurnDelivery(input: {
|
|
31
|
-
readonly inbox: SessionInboxReader
|
|
31
|
+
readonly inbox: SessionInboxReader & Pick<SessionInboxHandle, "awaitingHandover" | "whenHandoverSettled">;
|
|
32
32
|
readonly cursor: SessionStateCursor;
|
|
33
33
|
readonly hasWorkingTasks: () => boolean;
|
|
34
34
|
readonly queue: SessionInputQueue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{openRequests}from"#protocol/session-projection/reader.js";import{storedProjection}from"#harness/session-machine/view.js";import{readDurableSession}from"#execution/durable-session-read.js";import{activeTurnIdOf}from"#protocol/session-projection.js";import{controlDeliveryOf}from"#execution/session/control-delivery.js";import{admitSessionInboxPayload}from"#execution/session/admission.js";import{routeSelectedDelivery}from"#execution/session/route-selected-delivery.js";async function nextTurnDelivery(e){let{inbox:t,cursor:n,queue:r}=e,i;for(;;){let a=r.takeNext({freshSequence:t.hasPending()?void 0:i});if(a?.kind===`control`)return a.origin===void 0?{kind:a.control}:{kind:a.control,origin:a.origin};if(a?.kind===`turn`){let e=await routeSelectedDelivery(a,n);if(e.kind===`cancel-turn`)return e;if(e.kind===`consumed`)continue;return e}if(!t.hasPending()){let e=r.takePrewarmDeployment();if(e!==void 0)return{kind:`prewarm`,targetDeploymentId:e}}let o=r.pendingCount===0,s=await t.next();if(s===void 0)return{kind:`closed`};let c=await admitSessionInboxPayload(s,e);if(i=o&&c.kind===`delivery`?c.admission.sequence:void 0,c.kind===`workflow`)return{kind:`workflow`,message:c.message};if(c.kind!==`cancel`)continue;let l=storedProjection(readDurableSession(n.sessionState).state),u=l.view,d=s.kind===`cancel`&&s.turnId!==void 0&&s.turnId!==activeTurnIdOf(l);if(!d&&openRequests(u).some(e=>e.request.kind===`budget`))return{kind:`cancel-turn`,origin:c.origin};if(!d&&e.hasWorkingTasks())return{kind:`cancel-working-tasks`,origin:c.origin};c.origin!==void 0&&await e.ignore({control:controlDeliveryOf(c.origin),outcome:`ignored`,source:`cancel`})}}export{nextTurnDelivery};
|
|
1
|
+
import{openRequests}from"#protocol/session-projection/reader.js";import{storedProjection}from"#harness/session-machine/view.js";import{readDurableSession}from"#execution/durable-session-read.js";import{activeTurnIdOf,latestTurnIdOf}from"#protocol/session-projection.js";import{controlDeliveryOf}from"#execution/session/control-delivery.js";import{admitSessionInboxPayload}from"#execution/session/admission.js";import{routeSelectedDelivery}from"#execution/session/route-selected-delivery.js";import{pendingContinuation}from"#reactions/continuation.js";async function nextTurnDelivery(e){let{inbox:t,cursor:n,queue:r}=e,i;for(;;){let a=r.takeNext({freshSequence:t.hasPending()?void 0:i});if(a?.kind===`control`)return a.origin===void 0?{kind:a.control}:{kind:a.control,origin:a.origin};if(a?.kind===`turn`){let e=await routeSelectedDelivery(a,n);if(e.kind===`cancel-turn`)return e;if(e.kind===`consumed`)continue;return e}if(r.pendingCount===0&&!t.hasPending()){let e=pendingContinuation(n.serializedContext,latestTurnIdOf(storedProjection(readDurableSession(n.sessionState).state)));if(e!==void 0){if(t.awaitingHandover){await t.whenHandoverSettled();continue}if(r.enqueueDelivery(e)!==void 0)continue}}if(!t.hasPending()){let e=r.takePrewarmDeployment();if(e!==void 0)return{kind:`prewarm`,targetDeploymentId:e}}let o=r.pendingCount===0,s=await t.next();if(s===void 0)return{kind:`closed`};let c=await admitSessionInboxPayload(s,e);if(i=o&&c.kind===`delivery`?c.admission.sequence:void 0,c.kind===`workflow`)return{kind:`workflow`,message:c.message};if(c.kind===`unsupported`){await e.ignore(c.settlement);continue}if(c.kind!==`cancel`)continue;let l=storedProjection(readDurableSession(n.sessionState).state),u=l.view,d=s.kind===`cancel`&&s.turnId!==void 0&&s.turnId!==activeTurnIdOf(l);if(!d&&openRequests(u).some(e=>e.request.kind===`budget`))return{kind:`cancel-turn`,origin:c.origin};if(!d&&e.hasWorkingTasks())return{kind:`cancel-working-tasks`,origin:c.origin};c.origin!==void 0&&await e.ignore({control:controlDeliveryOf(c.origin),outcome:`ignored`,source:`cancel`})}}export{nextTurnDelivery};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{STUB_CONTEXT_KEY}from"#tool-stubs/types.js";import{storedProjection}from"#harness/session-machine/view.js";import{workingTasks}from"#execution/tasks/table.js";import{settleCancelledTurnStep}from"#execution/settle-cancelled-turn-step.js";import{turnCoordinates}from"#protocol/session-projection.js";import"#execution/session-inbox/inbox.js";import{signalSessionAnchorStep}from"#execution/session/handoff-steps.js";import{SessionInputQueue}from"#execution/session/input-queue.js";import{controlDeliveryOf}from"#execution/session/control-delivery.js";import{settleControlDeliveryStep}from"#execution/session/settle-control-delivery-step.js";import{createTurnControl}from"#execution/session/turn-control.js";import{SessionHandoff,sessionAnchorToken}from"#execution/session/handoff.js";import{notifyCancelledTaskCallerStep,notifyTurnCallerStep,resolveInitialTurnCallerStep}from"#subagents/parent-notification.js";import{withStubPlayback}from"#execution/tool-stubs/playback.js";import{nextTurnDelivery}from"#execution/session/next-input.js";import{SessionExecution}from"#execution/session/turn.js";import{SessionStateCursor}from"#execution/session/state-cursor.js";import{cancelWorkingTasks,sessionTaskTable}from"#execution/tasks/session.js";import{finalizeSession}from"#execution/session/finalization.js";import{prewarmSessionStep}from"#execution/session/prewarm-step.js";function createSafeOuterWorkflowError(){let e=Error(`Agent workflow failed. Inspect the private session trace for details.`);return e.name=`EveWorkflowFailure`,e}async function runPreparedSession(e,t){let n=e.serializedContext[STUB_CONTEXT_KEY];n!==void 0&&n.rootSessionId===void 0&&(e.serializedContext[STUB_CONTEXT_KEY]={...n,rootSessionId:e.sessionId});let r=new SessionStateCursor({history:e.history,inbox:t,sessionWritable:e.sessionWritable,serializedContext:e.serializedContext,sessionState:e.sessionState}),i={caller:e.caller},a=new SessionHandoff({checkpoint:{capabilities:e.capabilities,retention:e.retention,sessionTimeoutMs:e.sessionTimeoutMs},deploymentId:e.deploymentId,inbox:t,isInitialOwner:e.anchor.kind===`self`,sessionId:e.sessionId,sessionWritable:e.sessionWritable}),o={output:``,isError:!0},s,c=!1;try{return o=await withStubPlayback(n,e.sessionId,async()=>{try{s=await runSessionLoop(e,{cursor:r,handoff:a,inbox:t,progress:i})}finally{await t.dispose()}return s.kind===`transferred`?e.anchor.kind===`self`?(o=await a.awaitAnchoredResult(),o):{output:``}:(c=!0,o=await finalizeSession(s.outcome,{caller:i.caller,cursor:r,sessionWritable:e.sessionWritable}),o)}),o}catch(t){throw c||await finalizeSession({error:t,kind:`failed`,turnId:i.turnId},{caller:i.caller,cursor:r,sessionWritable:e.sessionWritable}),createSafeOuterWorkflowError()}finally{await t.dispose(),await reportResultToAnchor(e,o,a,s)}}async function failSession(e){let t;try{t=await resolveInitialTurnCallerStep({serializedContext:e.serializedContext})}catch{}throw await finalizeSession({error:e.error,kind:`failed`},{caller:t,cursor:{serializedContext:e.serializedContext,sessionState:e.sessionState},sessionWritable:e.sessionWritable}),createSafeOuterWorkflowError()}async function reportResultToAnchor(e,t,n,r){switch(e.anchor.kind){case`self`:await n.disposeAnchor(),await e.anchor.notify?.(t);return;case`successor`:if(r?.kind===`transferred`)return;await signalSessionAnchorStep({result:t,token:sessionAnchorToken(e.sessionId)});return}}async function runSessionLoop(e,t){let{cursor:n,handoff:r,inbox:i,progress:a}=t,o=new SessionInputQueue(e.admittedDeliveryKeys),s=new SessionExecution({capabilities:e.capabilities,cursor:n,inbox:i,queue:o,sessionId:e.sessionId}),c=e.sessionTimeoutControl,l=Promise.resolve(),u=!0,d=!1,f=[],started=()=>storedProjection(n.sessionState.snapshot.session.state).view.session.status!==`new`,ignore=async e=>{if(!started()){f.push(e);return}await n.advance(t=>settleControlDeliveryStep({...t,settlement:e}))},settleUnstarted=async()=>{if(started())for(let e of f.splice(0))await n.advance(t=>settleControlDeliveryStep({...t,settlement:e}))},expired=e=>({kind:`expired`,...e&&{control:e},...f.length>0&&{settles:f.splice(0)}}),nextParkedActivity=async()=>{for(;;){let e=await nextTurnDelivery({cursor:n,hasWorkingTasks:()=>workingTasks(sessionTaskTable(n)).length>0,ignore,inbox:i,queue:o});if(e.kind===`prewarm`){if(u&&a.caller===void 0&&workingTasks(sessionTaskTable(n)).length===0&&o.pendingCount===0&&!i.hasPending()){let t=c?.getDeadline(),n=await r.tryPrewarmTransfer(transferState(),e.targetDeploymentId,t);if(n.kind===`transferred`)return n}continue}if(e.kind===`workflow`){await s.handleWorkflowMessage(e.message);continue}if(e.kind===`cancel-working-tasks`){if(await cancelWorkingTasks(n,`turn-cancelled`),e.origin!==void 0){let t=controlDeliveryOf(e.origin);await n.advance(e=>settleControlDeliveryStep({...e,settlement:{control:t,outcome:`applied`,source:`cancel`}}))}continue}if(!(e.kind===`expired`&&c!==void 0&&((o.pendingCount>0||i.hasPending())&&c.recordActivity(),await c.handleTimerElapsed()===`extended`)))return e}},p=e.initialTurnControl??(e.anchor.kind===`self`?createTurnControl():void 0),m=!1,runTurn=async e=>{let t=a.caller,r=p;p=void 0,a.turnId=e?.control===void 0?turnCoordinates(storedProjection(n.sessionState.snapshot.session.state)).turnId:void 0;let i=await s.runTurn(e,{caller:t,control:r});return a.turnId=void 0,c?.recordActivity(),i.caller!==void 0&&(a.caller=i.caller),i.compacted===!0&&(m=!0),i},transferState=()=>({admittedDeliveryKeys:o.admittedDeliveryKeys,history:n.history,serializedContext:n.serializedContext,sessionState:n.sessionState}),compactionHandoffReady=()=>m&&a.caller===void 0&&workingTasks(sessionTaskTable(n)).length===0,tryCompactionHandoff=async()=>{if(!compactionHandoffReady()||o.pendingCount>0||i.hasPending())return;let e=await r.tryCompactionTransfer(transferState());return e.kind===`transferred`?e:void 0},runDeliveredTurn=async e=>{let t=await r.tryTransfer(e,transferState());return t.kind===`transferred`?t:(e.delivery.caller!==void 0&&(a.caller=e.delivery.caller),{action:await runTurn({delivery:e.delivery}),kind:`action`})},settleCancelledTurn=async(e,t)=>{let r=await n.advanceWithHistory(n=>settleCancelledTurnStep({...n,control:t,reportUsage:e}));return a.caller=void 0,r},awaitPrewarmedAction=async()=>{for(;;){let e=await nextParkedActivity();switch(d=!1,e.kind){case`reset`:return{kind:`terminal`,outcome:expired(e.origin&&controlDeliveryOf(e.origin))};case`closed`:return i.takenOver?await r.adoptTakeover():{kind:`terminal`,outcome:expired()};case`transferred`:return e;case`expired`:return{kind:`terminal`,outcome:expired()};case`clear`:case`compact`:e.origin!==void 0&&await ignore({control:controlDeliveryOf(e.origin),outcome:`ignored`,source:e.kind});continue;case`turn`:return await runDeliveredTurn(e);case`cancel-turn`:continue}}},runInitialAction=async()=>{switch(e.compactFirst===!0&&(await runTurn({control:`compact`}),m=!1),e.start.kind){case`first-message`:return d=!0,u=!1,l=n.advanceBeside(({serializedContext:e,sessionState:t})=>prewarmSessionStep({serializedContext:e,sessionState:t}),()=>d).then(()=>void 0,()=>void 0).finally(()=>{u=!0}),await awaitPrewarmedAction();case`parked`:return{action:{kind:`park`},kind:`action`};case`turn`:{let{input:t}=e.start;return{action:await runTurn(t===void 0?void 0:{delivery:t}),kind:`action`}}}};try{let[t,
|
|
1
|
+
import{STUB_CONTEXT_KEY}from"#tool-stubs/types.js";import{storedProjection}from"#harness/session-machine/view.js";import{workingTasks}from"#execution/tasks/table.js";import{settleCancelledTurnStep}from"#execution/settle-cancelled-turn-step.js";import{turnCoordinates}from"#protocol/session-projection.js";import"#execution/session-inbox/inbox.js";import{signalSessionAnchorStep}from"#execution/session/handoff-steps.js";import{SessionInputQueue}from"#execution/session/input-queue.js";import{controlDeliveryOf}from"#execution/session/control-delivery.js";import{settleControlDeliveryStep}from"#execution/session/settle-control-delivery-step.js";import{createTurnControl}from"#execution/session/turn-control.js";import{SessionHandoff,sessionAnchorToken}from"#execution/session/handoff.js";import{notifyCancelledTaskCallerStep,notifyTurnCallerStep,resolveInitialTurnCallerStep}from"#subagents/parent-notification.js";import{withStubPlayback}from"#execution/tool-stubs/playback.js";import{nextTurnDelivery}from"#execution/session/next-input.js";import{SessionExecution}from"#execution/session/turn.js";import{SessionStateCursor}from"#execution/session/state-cursor.js";import{cancelWorkingTasks,sessionTaskTable}from"#execution/tasks/session.js";import{finalizeSession}from"#execution/session/finalization.js";import{prewarmSessionStep}from"#execution/session/prewarm-step.js";function createSafeOuterWorkflowError(){let e=Error(`Agent workflow failed. Inspect the private session trace for details.`);return e.name=`EveWorkflowFailure`,e}async function runPreparedSession(e,t){let n=e.serializedContext[STUB_CONTEXT_KEY];n!==void 0&&n.rootSessionId===void 0&&(e.serializedContext[STUB_CONTEXT_KEY]={...n,rootSessionId:e.sessionId});let r=new SessionStateCursor({history:e.history,inbox:t,sessionWritable:e.sessionWritable,serializedContext:e.serializedContext,sessionState:e.sessionState}),i={caller:e.caller},a=new SessionHandoff({checkpoint:{capabilities:e.capabilities,retention:e.retention,sessionTimeoutMs:e.sessionTimeoutMs},deploymentId:e.deploymentId,inbox:t,isInitialOwner:e.anchor.kind===`self`,sessionId:e.sessionId,sessionWritable:e.sessionWritable}),o={output:``,isError:!0},s,c=!1;try{return o=await withStubPlayback(n,e.sessionId,async()=>{try{s=await runSessionLoop(e,{cursor:r,handoff:a,inbox:t,progress:i})}finally{await t.dispose()}return s.kind===`transferred`?e.anchor.kind===`self`?(o=await a.awaitAnchoredResult(),o):{output:``}:(c=!0,o=await finalizeSession(s.outcome,{caller:i.caller,cursor:r,sessionWritable:e.sessionWritable}),o)}),o}catch(t){throw c||await finalizeSession({error:t,kind:`failed`,turnId:i.turnId},{caller:i.caller,cursor:r,sessionWritable:e.sessionWritable}),createSafeOuterWorkflowError()}finally{await t.dispose(),await reportResultToAnchor(e,o,a,s)}}async function failSession(e){let t;try{t=await resolveInitialTurnCallerStep({serializedContext:e.serializedContext})}catch{}throw await finalizeSession({error:e.error,kind:`failed`},{caller:t,cursor:{serializedContext:e.serializedContext,sessionState:e.sessionState},sessionWritable:e.sessionWritable}),createSafeOuterWorkflowError()}async function reportResultToAnchor(e,t,n,r){switch(e.anchor.kind){case`self`:await n.disposeAnchor(),await e.anchor.notify?.(t);return;case`successor`:if(r?.kind===`transferred`)return;await signalSessionAnchorStep({result:t,token:sessionAnchorToken(e.sessionId)});return}}async function runSessionLoop(e,t){let{cursor:n,handoff:r,inbox:i,progress:a}=t,o=new SessionInputQueue(e.admittedDeliveryKeys),s=new SessionExecution({capabilities:e.capabilities,cursor:n,inbox:i,queue:o,sessionId:e.sessionId}),c=e.sessionTimeoutControl,l=Promise.resolve(),u=!0,d=!1,f=[],started=()=>storedProjection(n.sessionState.snapshot.session.state).view.session.status!==`new`,ignore=async e=>{if(!started()){f.push(e);return}await n.advance(t=>settleControlDeliveryStep({...t,settlement:e}))},settleUnstarted=async()=>{if(started())for(let e of f.splice(0))await n.advance(t=>settleControlDeliveryStep({...t,settlement:e}))},expired=e=>({kind:`expired`,...e&&{control:e},...f.length>0&&{settles:f.splice(0)}}),nextParkedActivity=async()=>{for(;;){let e=await nextTurnDelivery({cursor:n,hasWorkingTasks:()=>workingTasks(sessionTaskTable(n)).length>0,ignore,inbox:i,queue:o});if(e.kind===`prewarm`){if(u&&a.caller===void 0&&workingTasks(sessionTaskTable(n)).length===0&&o.pendingCount===0&&!i.hasPending()){let t=c?.getDeadline(),n=await r.tryPrewarmTransfer(transferState(),e.targetDeploymentId,t);if(n.kind===`transferred`)return n}continue}if(e.kind===`workflow`){await s.handleWorkflowMessage(e.message);continue}if(e.kind===`cancel-working-tasks`){if(await cancelWorkingTasks(n,`turn-cancelled`),e.origin!==void 0){let t=controlDeliveryOf(e.origin);await n.advance(e=>settleControlDeliveryStep({...e,settlement:{control:t,outcome:`applied`,source:`cancel`}}))}continue}if(!(e.kind===`expired`&&c!==void 0&&((o.pendingCount>0||i.hasPending())&&c.recordActivity(),await c.handleTimerElapsed()===`extended`)))return e}},p=e.initialTurnControl??(e.anchor.kind===`self`?createTurnControl():void 0),m=!1,runTurn=async e=>{let t=a.caller,r=p;p=void 0,a.turnId=e?.control===void 0?turnCoordinates(storedProjection(n.sessionState.snapshot.session.state)).turnId:void 0;let i=await s.runTurn(e,{caller:t,control:r});return a.turnId=void 0,c?.recordActivity(),i.caller!==void 0&&(a.caller=i.caller),i.compacted===!0&&(m=!0),i},transferState=()=>({admittedDeliveryKeys:o.admittedDeliveryKeys,history:n.history,serializedContext:n.serializedContext,sessionState:n.sessionState}),compactionHandoffReady=()=>m&&a.caller===void 0&&workingTasks(sessionTaskTable(n)).length===0,tryCompactionHandoff=async()=>{if(!compactionHandoffReady()||o.pendingCount>0||i.hasPending())return;let e=await r.tryCompactionTransfer(transferState());return e.kind===`transferred`?e:void 0},runDeliveredTurn=async e=>{let t=await r.tryTransfer(e,transferState());return t.kind===`transferred`?t:(e.delivery.caller!==void 0&&(a.caller=e.delivery.caller),{action:await runTurn({delivery:e.delivery}),kind:`action`})},settleCancelledTurn=async(e,t)=>{let r=await n.advanceWithHistory(n=>settleCancelledTurnStep({...n,control:t,reportUsage:e}));return a.caller=void 0,r},awaitPrewarmedAction=async()=>{for(;;){let e=await nextParkedActivity();switch(d=!1,e.kind){case`reset`:return{kind:`terminal`,outcome:expired(e.origin&&controlDeliveryOf(e.origin))};case`closed`:return i.takenOver?await r.adoptTakeover():{kind:`terminal`,outcome:expired()};case`transferred`:return e;case`expired`:return{kind:`terminal`,outcome:expired()};case`clear`:case`compact`:e.origin!==void 0&&await ignore({control:controlDeliveryOf(e.origin),outcome:`ignored`,source:e.kind});continue;case`turn`:return await runDeliveredTurn(e);case`cancel-turn`:continue}}},runInitialAction=async()=>{switch(e.compactFirst===!0&&(await runTurn({control:`compact`}),m=!1),e.start.kind){case`first-message`:return d=!0,u=!1,l=n.advanceBeside(({serializedContext:e,sessionState:t})=>prewarmSessionStep({serializedContext:e,sessionState:t}),()=>d).then(()=>void 0,()=>void 0).finally(()=>{u=!0}),await awaitPrewarmedAction();case`parked`:return{action:{kind:`park`},kind:`action`};case`turn`:{let{input:t}=e.start;return{action:await runTurn(t===void 0?void 0:{delivery:t}),kind:`action`}}}};try{let[t,o]=await Promise.allSettled([runInitialAction(),c?.start()]);if(o.status===`rejected`)throw o.reason;if(t.status===`rejected`)throw t.reason;let l=t.value;if(l.kind!==`action`)return l;let u=l.action;for(;;){if(u.kind===`done`)return{kind:`terminal`,outcome:{action:u,kind:`done`}};if(await settleUnstarted(),u.cancelled===!0){let{caller:t}=a,n=await settleCancelledTurn(t!==void 0,u.cancelledBy);if(t!==void 0){let r={caller:t,sessionId:e.sessionId};await notifyCancelledTaskCallerStep(n.usage===void 0?r:{...r,usage:n.usage})}}else u.settled!==void 0&&(a.caller!==void 0&&await notifyTurnCallerStep({caller:a.caller,lifecycle:`parked`,sessionId:e.sessionId,settled:u.settled}),a.caller=void 0);let t=await tryCompactionHandoff();if(t!==void 0)return t;p??=createTurnControl();let o=await nextParkedActivity();switch(o.kind){case`reset`:return{kind:`terminal`,outcome:resetOutcome(o.origin)};case`closed`:return i.takenOver?await r.adoptTakeover():{kind:`terminal`,outcome:{kind:`expired`}};case`transferred`:return o;case`expired`:return{kind:`terminal`,outcome:{kind:`expired`}};case`clear`:case`compact`:o.kind===`clear`&&await cancelWorkingTasks(n,`turn-cancelled`,{turnCalls:!0}),u=await runTurn(o.origin===void 0?{control:o.kind}:{control:o.kind,controlDelivery:controlDeliveryOf(o.origin)});continue;case`cancel-turn`:await s.cancelTurnWork(),await settleCancelledTurn(!1,o.origin===void 0?void 0:controlDeliveryOf(o.origin)),c?.recordActivity(),u={...u,settled:void 0};continue;case`turn`:{let e=await runDeliveredTurn(o);if(e.kind!==`action`)return e;u=e.action;continue}}}}finally{d=!1,await l,await c?.dispose()}}function resetOutcome(e){return e===void 0?{kind:`expired`}:{control:controlDeliveryOf(e),kind:`expired`}}export{failSession,runPreparedSession};
|
|
@@ -55,8 +55,8 @@ export interface SessionInboxReader {
|
|
|
55
55
|
/** Resolves once a payload is ready or the inbox closes, without consuming anything. */
|
|
56
56
|
whenPending(): Promise<void>;
|
|
57
57
|
/**
|
|
58
|
-
* Called from the pump the moment an interrupt (`cancel`, `
|
|
59
|
-
* `session-timeout`) is accepted, ahead of any consumer read. Handlers must
|
|
58
|
+
* Called from the pump the moment an interrupt (`cancel`, `clear`,
|
|
59
|
+
* `reset`, `session-timeout`) is accepted, ahead of any consumer read. Handlers must
|
|
60
60
|
* be synchronous and idempotent. The payload stays in the queue so the
|
|
61
61
|
* consumer still processes it in order.
|
|
62
62
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{SESSION_INBOX_SESSION_ID_METADATA_KEY,sessionInboxHookToken}from"#execution/session-inbox/address.js";import{createHook,getWorkflowMetadata}from"#compiled/@workflow/core/index.js";import{claimHookOwnership,disposeHook,isHookForceClaimedError}from"#execution/hook-ownership.js";import{releaseSessionHooksStep}from"#execution/session-inbox/release-step.js";function isInterrupt(e){return e.kind===`cancel`||e.kind===`reset`||e.kind===`session-timeout`||e.kind===`session-failure`}function isDelivery(e){return e.kind===`send`||e.kind===`deliver`}function createSessionInbox(e){let t=[],n=[],r=new Set,i=new Set,a=new Set,o,s,c,l=new Set,u=new Set,d=!1,f=!1,notify=()=>{for(let e of r)e();r.clear()},wait=()=>new Promise(e=>r.add(e)),closed=()=>t.every(e=>e.closed||e.stopping),gated=()=>s!==void 0&&t.length>0,hasReadable=()=>!gated()&&n.length>0,throwIfFailed=()=>{if(o!==void 0)throw o.error},observe=(e,t,n)=>{for(let r of t)if(n(r))for(let t of e)t(r)},openHandover=()=>{s=void 0,observe(a,n,isDelivery),notify()},blockedOnHandover=()=>{if(gated()){for(let e of l)e();l.clear()}},acceptHandover=e=>{let t=s;if(t===void 0||e.attemptKey!==t.attemptKey||e.index<t.nextPart||t.parts.has(e.index))return;t.parts.set(e.index,e);let r=[];for(;;){let e=t.parts.get(t.nextPart);if(e===void 0)break;if(e.final===!0){c={attemptKey:t.attemptKey,payloadCount:t.nextPart,appliedAtMs:Date.now()},observe(i,r,isInterrupt),openHandover();return}t.parts.delete(t.nextPart),t.nextPart+=1,n.splice(t.index,0,...e.payloads),t.index+=e.payloads.length,r.push(...e.payloads)}observe(i,r,isInterrupt),notify()},pump=async e=>{let r=e.hook[Symbol.asyncIterator]();try{for(;!e.stopping;){let e=await r.next();if(e.done)break;let t=e.value;for(let e of u)e();if(u.clear(),t.kind===`workflow-batch`){n.push(...t.messages),notify();continue}if(t.kind===`handover`){acceptHandover(t);continue}n.push(t),gated()||observe(a,[t],isDelivery),observe(i,[t],isInterrupt),notify()}}catch(n){if(e.stopping||e.replaced)return;isHookForceClaimedError(n)?(t.splice(t.indexOf(e),1),d=!0):o={error:n}}finally{e.closed=!0,notify()}},stop=async()=>{let e=t.splice(0);s=void 0,d=!1,f=!0;for(let t of e)t.stopping=!0;notify(),await Promise.all(e.map(({hook:e})=>disposeHook(e)));let r=n.splice(0);return notify(),r},claimSessionHook=async(n,r={})=>{if(!n)throw Error(`A session alias requires a nonempty continuation token.`);let i=r.force===!0,a=t.find(e=>e.token===n);if(a!==void 0&&!i)return await a.registered;if(a===void 0&&t.length>=256)throw Error(`A session may claim at most 256 addresses.`);let o={token:n,hook:createHook({token:sessionInboxHookToken(n),metadata:{[SESSION_INBOX_SESSION_ID_METADATA_KEY]:e},...i&&{experimental_force:!0}}),stopping:!1,closed:!1,replaced:!1};a===void 0?t.push(o):(a.replaced=!0,t.splice(t.indexOf(a),1,o)),f=!1;try{let confirm=()=>claimHookOwnership(o.hook);o.registered=r.confirmAfter?.then(confirm,confirm)??confirm(),await o.registered,d=!1,pump(o)}catch(e){throw a===void 0||a.closed?t.splice(t.indexOf(o),1):(a.replaced=!1,t.splice(t.indexOf(o),1,a)),e}};return{get handoverObservation(){return c},get claimedTokens(){return t.map(({token:e})=>e)},get awaitingHandover(){return s!==void 0},async whenHandoverSettled(){for(;s!==void 0;)await wait()},abandonHandover(e){s?.attemptKey===e&&openHandover()},whenBlockedOnHandover(){return new Promise(e=>l.add(e))},whenArrival(){return new Promise(e=>u.add(e))},get takenOver(){return d&&t.length===0},claimSessionHook,async claimSessionHooks(e,t={}){t.handover!==void 0&&(s={attemptKey:t.handover,index:n.length,nextPart:0,parts:new Map});let r=await Promise.allSettled([...new Set(e)].map(e=>claimSessionHook(e,t)));for(let e of r)if(e.status===`rejected`)throw e.reason},async whenTakenOver(e){for(e?.addEventListener(`abort`,notify,{once:!0});t.length>0||!d;){if(throwIfFailed(),f)throw Error(`The session inbox was released before a takeover.`);if(e?.aborted===!0)throw e.reason;await wait()}},async next(){for(;;){if(throwIfFailed(),hasReadable())return n.shift();if(closed())return;blockedOnHandover(),await wait()}},drain(){return throwIfFailed(),gated()?[]:n.splice(0)},takeLeading(e){throwIfFailed();let t=[];if(gated())return t;for(let r=n[0];r!==void 0&&e(r);r=n[0])t.push(r),n.shift();return t},hasPending(){return throwIfFailed(),hasReadable()},async whenPending(){for(;o===void 0&&!hasReadable()&&!closed();)blockedOnHandover(),await wait()},onInterrupt(e){return i.add(e),()=>i.delete(e)},onDelivery(e){if(a.add(e),!gated())for(let t of n)isDelivery(t)&&e(t);return()=>a.delete(e)},restore(e){if(t.length===0)throw Error(`Cannot restore session commands before reclaiming the session hooks.`);n.unshift(...e),s!==void 0&&(s.index+=e.length),notify()},async dispose(){await stop()},async release(){return t.length>0&&await releaseSessionHooksStep({ownerRunId:getWorkflowMetadata().workflowRunId,tokens:t.map(({hook:e})=>e.token)}),await stop()}}}function isWorkflowMessage(e){return e.kind===`agent-started`||e.kind===`agent-sent`||e.kind===`started`||e.kind===`report`||e.kind===`reply`||e.kind===`request`||e.kind===`withdraw`||e.kind===`usage`||e.kind===`outcome`}export{createSessionInbox,isInterrupt,isWorkflowMessage};
|
|
1
|
+
import{SESSION_INBOX_SESSION_ID_METADATA_KEY,sessionInboxHookToken}from"#execution/session-inbox/address.js";import{createHook,getWorkflowMetadata}from"#compiled/@workflow/core/index.js";import{claimHookOwnership,disposeHook,isHookForceClaimedError}from"#execution/hook-ownership.js";import{releaseSessionHooksStep}from"#execution/session-inbox/release-step.js";function isInterrupt(e){return e.kind===`cancel`||e.kind===`clear`||e.kind===`reset`||e.kind===`session-timeout`||e.kind===`session-failure`}function isDelivery(e){return e.kind===`send`||e.kind===`deliver`}function createSessionInbox(e){let t=[],n=[],r=new Set,i=new Set,a=new Set,o,s,c,l=new Set,u=new Set,d=!1,f=!1,notify=()=>{for(let e of r)e();r.clear()},wait=()=>new Promise(e=>r.add(e)),closed=()=>t.every(e=>e.closed||e.stopping),gated=()=>s!==void 0&&t.length>0,hasReadable=()=>!gated()&&n.length>0,throwIfFailed=()=>{if(o!==void 0)throw o.error},observe=(e,t,n)=>{for(let r of t)if(n(r))for(let t of e)t(r)},openHandover=()=>{s=void 0,observe(a,n,isDelivery),notify()},blockedOnHandover=()=>{if(gated()){for(let e of l)e();l.clear()}},acceptHandover=e=>{let t=s;if(t===void 0||e.attemptKey!==t.attemptKey||e.index<t.nextPart||t.parts.has(e.index))return;t.parts.set(e.index,e);let r=[];for(;;){let e=t.parts.get(t.nextPart);if(e===void 0)break;if(e.final===!0){c={attemptKey:t.attemptKey,payloadCount:t.nextPart,appliedAtMs:Date.now()},observe(i,r,isInterrupt),openHandover();return}t.parts.delete(t.nextPart),t.nextPart+=1,n.splice(t.index,0,...e.payloads),t.index+=e.payloads.length,r.push(...e.payloads)}observe(i,r,isInterrupt),notify()},pump=async e=>{let r=e.hook[Symbol.asyncIterator]();try{for(;!e.stopping;){let e=await r.next();if(e.done)break;let t=e.value;for(let e of u)e();if(u.clear(),t.kind===`workflow-batch`){n.push(...t.messages),notify();continue}if(t.kind===`handover`){acceptHandover(t);continue}n.push(t),gated()||observe(a,[t],isDelivery),observe(i,[t],isInterrupt),notify()}}catch(n){if(e.stopping||e.replaced)return;isHookForceClaimedError(n)?(t.splice(t.indexOf(e),1),d=!0):o={error:n}}finally{e.closed=!0,notify()}},stop=async()=>{let e=t.splice(0);s=void 0,d=!1,f=!0;for(let t of e)t.stopping=!0;notify(),await Promise.all(e.map(({hook:e})=>disposeHook(e)));let r=n.splice(0);return notify(),r},claimSessionHook=async(n,r={})=>{if(!n)throw Error(`A session alias requires a nonempty continuation token.`);let i=r.force===!0,a=t.find(e=>e.token===n);if(a!==void 0&&!i)return await a.registered;if(a===void 0&&t.length>=256)throw Error(`A session may claim at most 256 addresses.`);let o={token:n,hook:createHook({token:sessionInboxHookToken(n),metadata:{[SESSION_INBOX_SESSION_ID_METADATA_KEY]:e},...i&&{experimental_force:!0}}),stopping:!1,closed:!1,replaced:!1};a===void 0?t.push(o):(a.replaced=!0,t.splice(t.indexOf(a),1,o)),f=!1;try{let confirm=()=>claimHookOwnership(o.hook);o.registered=r.confirmAfter?.then(confirm,confirm)??confirm(),await o.registered,d=!1,pump(o)}catch(e){throw a===void 0||a.closed?t.splice(t.indexOf(o),1):(a.replaced=!1,t.splice(t.indexOf(o),1,a)),e}};return{get handoverObservation(){return c},get claimedTokens(){return t.map(({token:e})=>e)},get awaitingHandover(){return s!==void 0},async whenHandoverSettled(){for(;s!==void 0;)await wait()},abandonHandover(e){s?.attemptKey===e&&openHandover()},whenBlockedOnHandover(){return new Promise(e=>l.add(e))},whenArrival(){return new Promise(e=>u.add(e))},get takenOver(){return d&&t.length===0},claimSessionHook,async claimSessionHooks(e,t={}){t.handover!==void 0&&(s={attemptKey:t.handover,index:n.length,nextPart:0,parts:new Map});let r=await Promise.allSettled([...new Set(e)].map(e=>claimSessionHook(e,t)));for(let e of r)if(e.status===`rejected`)throw e.reason},async whenTakenOver(e){for(e?.addEventListener(`abort`,notify,{once:!0});t.length>0||!d;){if(throwIfFailed(),f)throw Error(`The session inbox was released before a takeover.`);if(e?.aborted===!0)throw e.reason;await wait()}},async next(){for(;;){if(throwIfFailed(),hasReadable())return n.shift();if(closed())return;blockedOnHandover(),await wait()}},drain(){return throwIfFailed(),gated()?[]:n.splice(0)},takeLeading(e){throwIfFailed();let t=[];if(gated())return t;for(let r=n[0];r!==void 0&&e(r);r=n[0])t.push(r),n.shift();return t},hasPending(){return throwIfFailed(),hasReadable()},async whenPending(){for(;o===void 0&&!hasReadable()&&!closed();)blockedOnHandover(),await wait()},onInterrupt(e){return i.add(e),()=>i.delete(e)},onDelivery(e){if(a.add(e),!gated())for(let t of n)isDelivery(t)&&e(t);return()=>a.delete(e)},restore(e){if(t.length===0)throw Error(`Cannot restore session commands before reclaiming the session hooks.`);n.unshift(...e),s!==void 0&&(s.index+=e.length),notify()},async dispose(){await stop()},async release(){return t.length>0&&await releaseSessionHooksStep({ownerRunId:getWorkflowMetadata().workflowRunId,tokens:t.map(({hook:e})=>e.token)}),await stop()}}}function isWorkflowMessage(e){return e.kind===`agent-started`||e.kind===`agent-sent`||e.kind===`started`||e.kind===`report`||e.kind===`reply`||e.kind===`request`||e.kind===`withdraw`||e.kind===`usage`||e.kind===`outcome`}export{createSessionInbox,isInterrupt,isWorkflowMessage};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{validateDeliveryIdempotencyKey}from"#channel/delivery-idempotency.js";import{withoutPreV27Answers}from"#execution/session-inbox/pre-v27.js";var SessionInboxPayloadError=class extends Error{constructor(e){super(e),this.name=`SessionInboxPayloadError`}};function decodeSessionInboxPayload(e){if(typeof e!=`object`||!e||!(`kind`in e))throw new SessionInboxPayloadError(`Session inbox payload must be an object with a kind.`);let t=e;if(t.kind===`send`||t.kind===`deliver`)try{validateDeliveryIdempotencyKey(t.idempotencyKey)}catch(e){throw new SessionInboxPayloadError(e.message)}switch(t.kind){case`send`:{if(t.payload===null||typeof t.payload!=`object`)throw new SessionInboxPayloadError(`Session send payload must be an object.`);let n=e;return{idempotencyKey:n.idempotencyKey,auth:n.auth,schedule:n.schedule,title:n.title,caller:n.caller,deliveryMetadata:n.delivery===void 0?void 0:[{...n.delivery,payloadIndex:0}],kind:`deliver`,payloads:[withoutPreV27Answers(n.payload)],requestId:n.requestId,turnPolicy:n.turnPolicy}}case`deliver`:{if(!Array.isArray(t.payloads))throw new SessionInboxPayloadError(`Session delivery payloads must be an array.`);let n=e;return{...n,payloads:n.payloads.map(withoutPreV27Answers)}}case`session-prewarm`:if(typeof t.expectedOwnerRunId!=`string`||typeof t.targetDeploymentId!=`string`||t.targetDeploymentId.length===0||t.targetDeploymentId===`latest`)throw new SessionInboxPayloadError(`Invalid session prewarm hint.`);return e;case`cancel`:case`clear`:case`compact`:case`reset`:if(typeof t.deliveryId!=`string`||t.deliveryId.length===0)throw new SessionInboxPayloadError(`Session controls require a nonempty deliveryId.`);return e;case`session-timeout`:return e;default:throw new SessionInboxPayloadError(`
|
|
1
|
+
import{validateDeliveryIdempotencyKey}from"#channel/delivery-idempotency.js";import{withoutPreV27Answers}from"#execution/session-inbox/pre-v27.js";var SessionInboxPayloadError=class extends Error{constructor(e){super(e),this.name=`SessionInboxPayloadError`}};function decodeSessionInboxPayload(e){if(typeof e!=`object`||!e||!(`kind`in e))throw new SessionInboxPayloadError(`Session inbox payload must be an object with a kind.`);let t=e;if(t.kind===`send`||t.kind===`deliver`)try{validateDeliveryIdempotencyKey(t.idempotencyKey)}catch(e){throw new SessionInboxPayloadError(e.message)}switch(t.kind){case`send`:{if(t.payload===null||typeof t.payload!=`object`)throw new SessionInboxPayloadError(`Session send payload must be an object.`);let n=e;return{idempotencyKey:n.idempotencyKey,auth:n.auth,schedule:n.schedule,title:n.title,caller:n.caller,deliveryMetadata:n.delivery===void 0?void 0:[{...n.delivery,payloadIndex:0}],kind:`deliver`,payloads:[withoutPreV27Answers(n.payload)],requestId:n.requestId,turnPolicy:n.turnPolicy}}case`deliver`:{if(!Array.isArray(t.payloads))throw new SessionInboxPayloadError(`Session delivery payloads must be an array.`);let n=e;return{...n,payloads:n.payloads.map(withoutPreV27Answers)}}case`session-prewarm`:if(typeof t.expectedOwnerRunId!=`string`||typeof t.targetDeploymentId!=`string`||t.targetDeploymentId.length===0||t.targetDeploymentId===`latest`)throw new SessionInboxPayloadError(`Invalid session prewarm hint.`);return e;case`cancel`:case`clear`:case`compact`:case`reset`:if(typeof t.deliveryId!=`string`||t.deliveryId.length===0)throw new SessionInboxPayloadError(`Session controls require a nonempty deliveryId.`);return e;case`session-timeout`:return e;default:throw new SessionInboxPayloadError(`This session does not support the ${JSON.stringify(t.kind)} command.`)}}export{SessionInboxPayloadError,decodeSessionInboxPayload};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{decide}from"#ai/decide.js";async function runAgentRouterTask(e,t){"use workflow";let n=await chooseTarget(e.message,descriptions(t),t.abortSignal),{reply:r,status:i}=await(await t.agent(n).send(e.message,{signal:t.abortSignal})).result();if(i===`failed`)throw Error(`Agent "${n}" failed to handle the task.`);return r??null}async function chooseTarget(e,t,n){"use step";let r=Object.keys(t);if(r.length===0)throw Error(`agentRouter requires at least one available agent with a description.`);return r.length===1?r[0]:(await decide({signal:n,state:{message:e},questions:{route:{type:`choice`,instructions:`Which subagent should handle this task?`,criteria:t}}})).answers.route.choice}function descriptions(e){return Object.fromEntries(Object.entries(e.agents).flatMap(([e,t])=>{let n=t.description.trim();return n.length===0?[]:[[e,n]]}))}runAgentRouterTask.workflowId=`workflow//eve@0.
|
|
1
|
+
import{decide}from"#ai/decide.js";async function runAgentRouterTask(e,t){"use workflow";let n=await chooseTarget(e.message,descriptions(t),t.abortSignal),{reply:r,status:i}=await(await t.agent(n).send(e.message,{signal:t.abortSignal})).result();if(i===`failed`)throw Error(`Agent "${n}" failed to handle the task.`);return r??null}async function chooseTarget(e,t,n){"use step";let r=Object.keys(t);if(r.length===0)throw Error(`agentRouter requires at least one available agent with a description.`);return r.length===1?r[0]:(await decide({signal:n,state:{message:e},questions:{route:{type:`choice`,instructions:`Which subagent should handle this task?`,criteria:t}}})).answers.route.choice}function descriptions(e){return Object.fromEntries(Object.entries(e.agents).flatMap(([e,t])=>{let n=t.description.trim();return n.length===0?[]:[[e,n]]}))}runAgentRouterTask.workflowId=`workflow//eve@0.91.0//runAgentRouterTask`;export{runAgentRouterTask};
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import{createFrameworkUserMessage,isFrameworkUserMessage}from"#harness/messages.js";import{COMPACTION_CHECKPOINT_MARKER,COMPACTION_PROMPT_ENVELOPE,COMPACTION_RESUMPTION_MESSAGE,TRANSCRIPT_PAYLOAD_LIMIT,clipMiddleUtf16Safe,createCompactionPrompt,serializeToolResultOutput,sliceUtf16Safe,stubContentOutputFileParts}from"#harness/compaction/prompt.js";import{CompactionOverLimitError}from"#harness/compaction/over-limit-error.js";import{estimateTokens}from"#harness/token-estimate.js";const COMPACTION_PROMPT_OVERHEAD_TOKENS=estimateTokens([{content:COMPACTION_PROMPT_ENVELOPE.system,role:`system`},createFrameworkUserMessage(`context.compaction`,COMPACTION_PROMPT_ENVELOPE.prompt)]);function getInputTokenCount(e,t,n=0,r=0){let i=t.lastKnownInputTokens,a=t.lastKnownPromptMessageCount;if(i===void 0||a===void 0||!Number.isInteger(a)||a<0||a>e.length)return estimateTokens(e)+n;let o=e.slice(a);return i+(o.length===0?0:estimateTokens(o))+Math.max(0,n-r)}function withoutPromptMeasurement(e){let{lastKnownInputTokens:t,lastKnownPromptMessageCount:n,...r}=e;return r}function withPromptMeasurement(e,t){let{requestEnvelopeTokens:n,...r}=withoutPromptMeasurement(e);return t.inputTokens===void 0||t.promptMessageCount===void 0?r:{...r,lastKnownInputTokens:t.inputTokens,lastKnownPromptMessageCount:t.promptMessageCount,...t.requestEnvelopeTokens!==void 0&&{requestEnvelopeTokens:t.requestEnvelopeTokens}}}function shouldCompact(e,t,n=0,r=0){return e.length>0&&getInputTokenCount(e,t,n,r)+COMPACTION_PROMPT_OVERHEAD_TOKENS>t.threshold}const COMPACTION_HEURISTICS=[toolResultCapHeuristic];function toolResultCapHeuristic(e){let t=withResumptionGuard([...e.previousCheckpoint===void 0?[]:[createFrameworkUserMessage(`context.compaction`,COMPACTION_CHECKPOINT_MARKER),{content:e.previousCheckpoint,role:`assistant`}],...capToolResults(e.older),...e.recent],e.replay,e.config.threshold);return evaluateThreshold(t,e.config,`should-compact`,e.tokenEstimateAdjustment).type===`within-limit`?{messages:t,type:`within-limit`}:{type:`insufficient`}}function evaluateThreshold(e,t,n,r=0){let i=n===`should-compact`?COMPACTION_PROMPT_OVERHEAD_TOKENS:0,a=estimateTokens(e)+i+r;return{estimatedTokens:a,type:a<=t.threshold?`within-limit`:`over-limit`}}async function compactMessages(e,t,n,r=!1,i){let{conversation:a,previousCheckpoint:o}=extractPreviousCheckpoint(e),s=keptTailBudget(t),c=r?{...t,recentWindowSize:1}:t,planTail=e=>{let t=findLastRealUserIndex(e),n=e[t],r=n===void 0?void 0:fitCurrentMessage(n,s),i=r?.replay??n,a=selectRecentWindowSize(e,c,s);return i!==void 0&&t<e.length-a&&(a=selectRecentWindowSize(e,c,Math.max(0,s-estimateTokens([i])))),{currentIndex:t,fit:r,keep:a,replay:i}},l=planTail(a);if(!r&&l.fit===void 0){let{older:n,recent:r}=splitMessagesForCompaction(a,l.keep);if(n.length===0&&o===void 0)return keepNonToolResultMessages(r);let s=Math.max(0,(i??getInputTokenCount(e,t))-estimateTokens(e));for(let e of COMPACTION_HEURISTICS){let i=e({config:t,older:n,previousCheckpoint:o,recent:r,replay:l.replay,tokenEstimateAdjustment:s});if(i.type===`within-limit`)return i.messages}}let u=capToolResults(a),{currentIndex:d,fit:f,keep:p,replay:m}=planTail(u),h=d<0?void 0:u[d],g=h===void 0?void 0:omitFiles(h),_=g===void 0?void 0:fitCurrentMessage(g,1)?.replay,v=g!==void 0&&_!==void 0&&estimateTokens([_])<estimateTokens([g])?_:g;if(evaluateThreshold(withResumptionGuard(checkpointHead(``),v,1/0),t,`estimate`).type===`over-limit`)throw new CompactionOverLimitError(`The agent's system prompt, tools and memory leave only ~${t.threshold} tokens for the conversation, too few to compact it.`);let{older:y,recent:b}=splitMessagesForCompaction(u,p),x=createCompactionPrompt({messages:f===void 0?y:y.map((e,t)=>t===d?f.cut:e),previousCheckpoint:o,transcriptBudgetTokens:t.threshold}),S=await n({messages:[createFrameworkUserMessage(`context.compaction`,x.prompt)],system:x.system}),fits=e=>evaluateThreshold(e,t,`estimate`).type===`within-limit`,C=withResumptionGuard([...checkpointHead(S),...b],m,t.threshold);if(fits(C))return C;let w=keepNonToolResultMessages(b),T=withResumptionGuard([...checkpointHead(S),...w],m,t.threshold);if(fits(T))return T;let E=withResumptionGuard(checkpointHead(S),m,t.threshold);if(fits(E))return E;let withClippedSummary=e=>{let build=n=>withResumptionGuard(checkpointHead(n<MIN_CLIP_CHARS?sliceUtf16Safe(S,n):clipMiddleUtf16Safe(S,n)),e,t.threshold);if(!fits(build(0)))return;let n=0,r=S.length;for(;n<r;){let e=Math.ceil((n+r)/2);fits(build(e))?n=e:r=e-1}return build(n)},D=withClippedSummary(m);if(D!==void 0)return D;let O=t.threshold-estimateTokens(withResumptionGuard(checkpointHead(``),void 0,t.threshold)),k=withClippedSummary(g===void 0?void 0:fitCurrentMessage(g,O)?.replay??g);if(k===void 0)throw new CompactionOverLimitError(`The agent's system prompt, tools and memory leave only ~${t.threshold} tokens for the conversation, too few to compact it.`);return k}function capToolResults(e){return e.map(e=>{if(e.role!==`tool`||typeof e.content==`string`)return e;let t=!1,n=e.content.map(e=>{if(e.type!==`tool-result`)return e;let n=stubContentOutputFileParts(e.output),r=serializeToolResultOutput(n);return r.length<=TRANSCRIPT_PAYLOAD_LIMIT?n===e.output?e:(t=!0,{...e,output:n}):(t=!0,{...e,output:{type:`text`,value:`[Truncated by eve: tool result reduced during context compaction. Re-run the tool if you need the full output.]
|
|
1
|
+
import{createFrameworkUserMessage,isFrameworkUserMessage}from"#harness/messages.js";import{COMPACTION_CHECKPOINT_MARKER,COMPACTION_PROMPT_ENVELOPE,COMPACTION_RESUMPTION_MESSAGE,TRANSCRIPT_PAYLOAD_LIMIT,clipMiddleUtf16Safe,createCompactionPrompt,serializeToolResultOutput,sliceUtf16Safe,stubContentOutputFileParts}from"#harness/compaction/prompt.js";import{CompactionOverLimitError}from"#harness/compaction/over-limit-error.js";import{awaitsProviderToolResult}from"#harness/provider-tool-history.js";import{estimateTokens}from"#harness/token-estimate.js";const COMPACTION_PROMPT_OVERHEAD_TOKENS=estimateTokens([{content:COMPACTION_PROMPT_ENVELOPE.system,role:`system`},createFrameworkUserMessage(`context.compaction`,COMPACTION_PROMPT_ENVELOPE.prompt)]);function getInputTokenCount(e,t,n=0,r=0){let i=t.lastKnownInputTokens,a=t.lastKnownPromptMessageCount;if(i===void 0||a===void 0||!Number.isInteger(a)||a<0||a>e.length)return estimateTokens(e)+n;let o=e.slice(a);return i+(o.length===0?0:estimateTokens(o))+Math.max(0,n-r)}function withoutPromptMeasurement(e){let{lastKnownInputTokens:t,lastKnownPromptMessageCount:n,...r}=e;return r}function withPromptMeasurement(e,t){let{requestEnvelopeTokens:n,...r}=withoutPromptMeasurement(e);return t.inputTokens===void 0||t.promptMessageCount===void 0?r:{...r,lastKnownInputTokens:t.inputTokens,lastKnownPromptMessageCount:t.promptMessageCount,...t.requestEnvelopeTokens!==void 0&&{requestEnvelopeTokens:t.requestEnvelopeTokens}}}function shouldCompact(e,t,n=0,r=0){return e.length>0&&getInputTokenCount(e,t,n,r)+COMPACTION_PROMPT_OVERHEAD_TOKENS>t.threshold}const COMPACTION_HEURISTICS=[toolResultCapHeuristic];function toolResultCapHeuristic(e){let t=withResumptionGuard([...e.previousCheckpoint===void 0?[]:[createFrameworkUserMessage(`context.compaction`,COMPACTION_CHECKPOINT_MARKER),{content:e.previousCheckpoint,role:`assistant`}],...capToolResults(e.older),...e.recent],e.replay,e.config.threshold);return evaluateThreshold(t,e.config,`should-compact`,e.tokenEstimateAdjustment).type===`within-limit`?{messages:t,type:`within-limit`}:{type:`insufficient`}}function evaluateThreshold(e,t,n,r=0){let i=n===`should-compact`?COMPACTION_PROMPT_OVERHEAD_TOKENS:0,a=estimateTokens(e)+i+r;return{estimatedTokens:a,type:a<=t.threshold?`within-limit`:`over-limit`}}async function compactMessages(e,t,n,r=!1,i){let{conversation:a,previousCheckpoint:o}=extractPreviousCheckpoint(e),s=keptTailBudget(t),c=r?{...t,recentWindowSize:1}:t,planTail=e=>{let t=findLastRealUserIndex(e),n=e[t],r=n===void 0?void 0:fitCurrentMessage(n,s),i=r?.replay??n,a=selectRecentWindowSize(e,c,s);return i!==void 0&&t<e.length-a&&(a=selectRecentWindowSize(e,c,Math.max(0,s-estimateTokens([i])))),{currentIndex:t,fit:r,keep:a,replay:i}},l=planTail(a);if(!r&&l.fit===void 0){let{older:n,recent:r}=splitMessagesForCompaction(a,l.keep);if(n.length===0&&o===void 0)return keepNonToolResultMessages(r);let s=Math.max(0,(i??getInputTokenCount(e,t))-estimateTokens(e));for(let e of COMPACTION_HEURISTICS){let i=e({config:t,older:n,previousCheckpoint:o,recent:r,replay:l.replay,tokenEstimateAdjustment:s});if(i.type===`within-limit`)return i.messages}}let u=capToolResults(a),{currentIndex:d,fit:f,keep:p,replay:m}=planTail(u),h=d<0?void 0:u[d],g=h===void 0?void 0:omitFiles(h),_=g===void 0?void 0:fitCurrentMessage(g,1)?.replay,v=g!==void 0&&_!==void 0&&estimateTokens([_])<estimateTokens([g])?_:g;if(evaluateThreshold(withResumptionGuard(checkpointHead(``),v,1/0),t,`estimate`).type===`over-limit`)throw new CompactionOverLimitError(`The agent's system prompt, tools and memory leave only ~${t.threshold} tokens for the conversation, too few to compact it.`);let{older:y,recent:b}=splitMessagesForCompaction(u,p),x=createCompactionPrompt({messages:f===void 0?y:y.map((e,t)=>t===d?f.cut:e),previousCheckpoint:o,transcriptBudgetTokens:t.threshold}),S=await n({messages:[createFrameworkUserMessage(`context.compaction`,x.prompt)],system:x.system}),fits=e=>evaluateThreshold(e,t,`estimate`).type===`within-limit`,C=withResumptionGuard([...checkpointHead(S),...b],m,t.threshold);if(fits(C))return C;let w=keepNonToolResultMessages(b),T=withResumptionGuard([...checkpointHead(S),...w],m,t.threshold);if(fits(T))return T;let E=withResumptionGuard(checkpointHead(S),m,t.threshold);if(fits(E))return E;let withClippedSummary=e=>{let build=n=>withResumptionGuard(checkpointHead(n<MIN_CLIP_CHARS?sliceUtf16Safe(S,n):clipMiddleUtf16Safe(S,n)),e,t.threshold);if(!fits(build(0)))return;let n=0,r=S.length;for(;n<r;){let e=Math.ceil((n+r)/2);fits(build(e))?n=e:r=e-1}return build(n)},D=withClippedSummary(m);if(D!==void 0)return D;let O=t.threshold-estimateTokens(withResumptionGuard(checkpointHead(``),void 0,t.threshold)),k=withClippedSummary(g===void 0?void 0:fitCurrentMessage(g,O)?.replay??g);if(k===void 0)throw new CompactionOverLimitError(`The agent's system prompt, tools and memory leave only ~${t.threshold} tokens for the conversation, too few to compact it.`);return k}function capToolResults(e){return e.map(e=>{if(e.role!==`tool`||typeof e.content==`string`)return e;let t=!1,n=e.content.map(e=>{if(e.type!==`tool-result`)return e;let n=stubContentOutputFileParts(e.output),r=serializeToolResultOutput(n);return r.length<=TRANSCRIPT_PAYLOAD_LIMIT?n===e.output?e:(t=!0,{...e,output:n}):(t=!0,{...e,output:{type:`text`,value:`[Truncated by eve: tool result reduced during context compaction. Re-run the tool if you need the full output.]
|
|
2
2
|
|
|
3
|
-
${clipMiddleUtf16Safe(r,TRANSCRIPT_PAYLOAD_LIMIT-113)}`}})});return t?{...e,content:n}:e})}function withResumptionGuard(e,t,n){let r=e.at(-1)?.role,i=t!==void 0&&e.some(e=>e.role===`user`&&e.content===t.content);return r!==void 0&&r!==`assistant`?r===`tool`&&t!==void 0&&!i&&estimateTokens([t])<=n?[...e,t]:e:[...e,t!==void 0&&!i?t:createFrameworkUserMessage(`execution.continuation`,COMPACTION_RESUMPTION_MESSAGE)]}function fitCurrentMessage(e,t){let n=messageText(e);if(n===void 0||t<=0||estimateTokens([e])<=t)return;let note=e=>`\n\n[eve: ${e} characters from the middle of this message were cut during context compaction to fit the context window.]\n\n`,split=(t,n)=>splitMessageText(e,t,n,note(n-t)),r=Math.floor(t*4);for(;r>0;){r=Math.min(r,n.length);let e=Math.floor(r*.2),i=sliceUtf16Safe(n,e).length,a=n.length-(r-e),o=n.charCodeAt(a);if(o>=56320&&o<=57343&&(a+=1),i<a){let e=split(i,a);if(estimateTokens([e.replay])<=t)return e}r=Math.floor(r*.9)-1}return split(0,n.length)}const MIN_CLIP_CHARS=40;function checkpointHead(e){return[createFrameworkUserMessage(`context.compaction`,COMPACTION_CHECKPOINT_MARKER),{content:e,role:`assistant`}]}function omitFiles(e){if(typeof e.content==`string`)return e;let t=[],n=!1;for(let r of e.content)r.type===`text`?t.push(r):n||(n=!0,t.push({type:`text`,text:`[eve: a file in this message was omitted during context compaction: it is too large for the context window.]`}));return n?{...e,content:t}:e}function messageText(e){if(typeof e.content==`string`)return e.content;let t=e.content.flatMap(e=>e.type===`text`?[e.text]:[]);return t.length===0?void 0:t.join(``)}function splitMessageText(e,t,n,r){if(typeof e.content==`string`)return{cut:{...e,content:e.content.slice(t,n)},replay:{...e,content:`${e.content.slice(0,t)}${r}${e.content.slice(n)}`}};let i=0,a=!1,o=[],s=[];for(let c of e.content){if(c.type!==`text`){o.push(c),s.push(c);continue}let e=Math.max(0,Math.min(c.text.length,t-i)),l=Math.max(e,Math.min(c.text.length,n-i));i+=c.text.length,l>e&&o.push({...c,text:c.text.slice(e,l)});let u=c.text.slice(0,e),d=c.text.slice(l),f=l>e&&!a;f&&(a=!0);let p=`${u}${f?r:``}${d}`;p.length>0&&s.push({...c,text:p})}return a||s.push({type:`text`,text:r}),{cut:{...e,content:o},replay:{...e,content:s}}}function findLastRealUserIndex(e){for(let t=e.length-1;t>=0;--t){let n=e[t];if(n?.role===`user`&&!isFrameworkUserMessage(n))return t}return-1}function extractPreviousCheckpoint(e){let t=e[0],n=e[1];return t?.role!==`user`||t.content!==COMPACTION_CHECKPOINT_MARKER||n?.role!==`assistant`?{conversation:[...e],previousCheckpoint:void 0}:{conversation:e.slice(2),previousCheckpoint:assistantMessageText(n)}}function keepNonToolResultMessages(e){let t=[];for(let n of e)if(n.role!==`tool`){if(n.role===`assistant`){let e=assistantMessageText(n);e.length>0&&t.push({content:e,role:`assistant`});continue}t.push(n)}return t}function assistantMessageText(e){return typeof e.content==`string`?e.content.trim():e.content.filter(e=>e.type===`text`).map(e=>e.text).join(``).trim()}function keptTailBudget(e){return Math.min(2e4,Math.floor(e.threshold/2))}function selectRecentWindowSize(e,t,n){let r=Math.min(t.recentWindowSize,Math.max(e.length-1,0)),i=0,a=0;for(let t=e.length-1;t>=0&&i<r;--t){let r=e[t];if(r===void 0)continue;let o=estimateTokens([r]);if(a+o>n)break;a+=o,i+=1}return i}function splitMessagesForCompaction(e,t){if(t<=0)return{older:[...e],recent:[]};let n=e.length-t;for(;n<e.length&&e[n]
|
|
3
|
+
${clipMiddleUtf16Safe(r,TRANSCRIPT_PAYLOAD_LIMIT-113)}`}})});return t?{...e,content:n}:e})}function withResumptionGuard(e,t,n){let r=e.at(-1)?.role,i=t!==void 0&&e.some(e=>e.role===`user`&&e.content===t.content);return r!==void 0&&r!==`assistant`?r===`tool`&&t!==void 0&&!i&&estimateTokens([t])<=n&&!awaitsProviderToolResult(e)?[...e,t]:e:[...e,t!==void 0&&!i?t:createFrameworkUserMessage(`execution.continuation`,COMPACTION_RESUMPTION_MESSAGE)]}function fitCurrentMessage(e,t){let n=messageText(e);if(n===void 0||t<=0||estimateTokens([e])<=t)return;let note=e=>`\n\n[eve: ${e} characters from the middle of this message were cut during context compaction to fit the context window.]\n\n`,split=(t,n)=>splitMessageText(e,t,n,note(n-t)),r=Math.floor(t*4);for(;r>0;){r=Math.min(r,n.length);let e=Math.floor(r*.2),i=sliceUtf16Safe(n,e).length,a=n.length-(r-e),o=n.charCodeAt(a);if(o>=56320&&o<=57343&&(a+=1),i<a){let e=split(i,a);if(estimateTokens([e.replay])<=t)return e}r=Math.floor(r*.9)-1}return split(0,n.length)}const MIN_CLIP_CHARS=40;function checkpointHead(e){return[createFrameworkUserMessage(`context.compaction`,COMPACTION_CHECKPOINT_MARKER),{content:e,role:`assistant`}]}function omitFiles(e){if(typeof e.content==`string`)return e;let t=[],n=!1;for(let r of e.content)r.type===`text`?t.push(r):n||(n=!0,t.push({type:`text`,text:`[eve: a file in this message was omitted during context compaction: it is too large for the context window.]`}));return n?{...e,content:t}:e}function messageText(e){if(typeof e.content==`string`)return e.content;let t=e.content.flatMap(e=>e.type===`text`?[e.text]:[]);return t.length===0?void 0:t.join(``)}function splitMessageText(e,t,n,r){if(typeof e.content==`string`)return{cut:{...e,content:e.content.slice(t,n)},replay:{...e,content:`${e.content.slice(0,t)}${r}${e.content.slice(n)}`}};let i=0,a=!1,o=[],s=[];for(let c of e.content){if(c.type!==`text`){o.push(c),s.push(c);continue}let e=Math.max(0,Math.min(c.text.length,t-i)),l=Math.max(e,Math.min(c.text.length,n-i));i+=c.text.length,l>e&&o.push({...c,text:c.text.slice(e,l)});let u=c.text.slice(0,e),d=c.text.slice(l),f=l>e&&!a;f&&(a=!0);let p=`${u}${f?r:``}${d}`;p.length>0&&s.push({...c,text:p})}return a||s.push({type:`text`,text:r}),{cut:{...e,content:o},replay:{...e,content:s}}}function findLastRealUserIndex(e){for(let t=e.length-1;t>=0;--t){let n=e[t];if(n?.role===`user`&&!isFrameworkUserMessage(n))return t}return-1}function extractPreviousCheckpoint(e){let t=e[0],n=e[1];return t?.role!==`user`||t.content!==COMPACTION_CHECKPOINT_MARKER||n?.role!==`assistant`?{conversation:[...e],previousCheckpoint:void 0}:{conversation:e.slice(2),previousCheckpoint:assistantMessageText(n)}}function keepNonToolResultMessages(e){let t=[];for(let n of e)if(n.role!==`tool`){if(n.role===`assistant`){let e=assistantMessageText(n);e.length>0&&t.push({content:e,role:`assistant`});continue}t.push(n)}return t}function assistantMessageText(e){return typeof e.content==`string`?e.content.trim():e.content.filter(e=>e.type===`text`).map(e=>e.text).join(``).trim()}function keptTailBudget(e){return Math.min(2e4,Math.floor(e.threshold/2))}function selectRecentWindowSize(e,t,n){let r=Math.min(t.recentWindowSize,Math.max(e.length-1,0)),i=0,a=0;for(let t=e.length-1;t>=0&&i<r;--t){let r=e[t];if(r===void 0)continue;let o=estimateTokens([r]);if(a+o>n)break;a+=o,i+=1}return i}function splitMessagesForCompaction(e,t){if(t<=0)return{older:[...e],recent:[]};let n=e.length-t;for(;n<e.length&&opensWithEarlierResult(e[n]);)n+=1;return{older:e.slice(0,n),recent:e.slice(n)}}function opensWithEarlierResult(e){if(e.role===`tool`)return!0;if(e.role!==`assistant`||!Array.isArray(e.content))return!1;let t=new Set(e.content.flatMap(e=>e.type===`tool-call`?[e.toolCallId]:[]));return e.content.some(e=>e.type===`tool-result`&&!t.has(e.toolCallId))}export{compactMessages,getInputTokenCount,shouldCompact,withPromptMeasurement,withoutPromptMeasurement};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{createFrameworkUserMessage,turnAnchorOf}from"#harness/messages.js";function createCurrentMessages(e,t={}){let n=[...e],r={...t.historyState},i=[],a=[],o=new Set(t.currentTurnMessages),s;for(let n of t.projectedMessages??e)s===void 0&&o.has(n)&&(s=a.length),n.role===`system`?i.push(n):a.push(n);let c=s??a.length,l=e.findIndex(e=>o.has(e)),u=l===-1?e.length:l;function appendUserMessage(e,t){let r=createFrameworkUserMessage(t,e);a.splice(c,0,r),n.splice(u,0,r),c+=1,u+=1}function add(e,t,{cacheFriendly:n=!0}={}){if(n){appendUserMessage(e,t);return}i.push({role:`system`,content:e})}return{add,addAnchored(e,t){if(e.length===0)return;let n=new Map;a.forEach((e,t)=>{let r=turnAnchorOf(e);r!==void 0&&!n.has(r)&&n.set(r,t)});let r=checkpointLength(a),i=e.map(({turnId:e})=>n.get(e)??r),o=[],s=0;for(let n=0;n<=a.length;n+=1)e.forEach((e,r)=>{i[r]===n&&(o.push(createFrameworkUserMessage(t,e.content)),n<=c&&(s+=1))}),n<a.length&&o.push(a[n]);a.splice(0,a.length,...o),c+=s},addAnnouncements(e){for(let t of Object.keys(e).sort()){let n=e[t],i=r.announcements?.[t];i!==n.value&&(appendUserMessage(n.render(i),`context.state`),r.announcements={...r.announcements,[t]:n.value})}},addSystem(e){i.push(...Array.isArray(e)?e:[e])},get nonSystemMessages(){return[...a]},get history(){return[...n]},get historyState(){return{...r}},get systemMessages(){return[...i]}}}function checkpointLength(e){let[t,n]=e;return t?.role===`user`&&t.kind===`context.compaction`&&n?.role===`assistant`?2:0}export{createCurrentMessages};
|
|
1
|
+
import{createFrameworkUserMessage,turnAnchorOf}from"#harness/messages.js";import{awaitsProviderToolResult}from"#harness/provider-tool-history.js";function createCurrentMessages(e,t={}){let n=[...e],r={...t.historyState},i=[],a=[],o=new Set(t.currentTurnMessages),s;for(let n of t.projectedMessages??e)s===void 0&&o.has(n)&&(s=a.length),n.role===`system`?i.push(n):a.push(n);let c=s??a.length,l=e.findIndex(e=>o.has(e)),u=l===-1?e.length:l;function appendUserMessage(e,t){let r=createFrameworkUserMessage(t,e);a.splice(c,0,r),n.splice(u,0,r),c+=1,u+=1}function add(e,t,{cacheFriendly:n=!0}={}){if(n){appendUserMessage(e,t);return}i.push({role:`system`,content:e})}return{add,addAnchored(e,t){if(e.length===0)return;let n=new Map;a.forEach((e,t)=>{let r=turnAnchorOf(e);r!==void 0&&!n.has(r)&&n.set(r,t)});let r=checkpointLength(a),i=e.map(({turnId:e})=>n.get(e)??r),o=[],s=0;for(let n=0;n<=a.length;n+=1)e.forEach((e,r)=>{i[r]===n&&(o.push(createFrameworkUserMessage(t,e.content)),n<=c&&(s+=1))}),n<a.length&&o.push(a[n]);a.splice(0,a.length,...o),c+=s},addAnnouncements(e){if(!awaitsProviderToolResult(a))for(let t of Object.keys(e).sort()){let n=e[t],i=r.announcements?.[t];i!==n.value&&(appendUserMessage(n.render(i),`context.state`),r.announcements={...r.announcements,[t]:n.value})}},addSystem(e){i.push(...Array.isArray(e)?e:[e])},get nonSystemMessages(){return[...a]},get history(){return[...n]},get historyState(){return{...r}},get systemMessages(){return[...i]}}}function checkpointLength(e){let[t,n]=e;return t?.role===`user`&&t.kind===`context.compaction`&&n?.role===`assistant`?2:0}export{createCurrentMessages};
|
|
@@ -5,6 +5,7 @@ type ToolResponsePart = Extract<ModelMessage, {
|
|
|
5
5
|
type InlineToolResultPart = Extract<ToolResponsePart, {
|
|
6
6
|
type: "tool-result";
|
|
7
7
|
}>;
|
|
8
|
+
import type { CallRow } from "#protocol/session-projection/tables.js";
|
|
8
9
|
import type { TurnPosition } from "#harness/session-machine/view.js";
|
|
9
10
|
import type { HarnessEmitFn, HarnessToolLookup } from "#harness/types.js";
|
|
10
11
|
/** The calls of one step's `fullStream` whose input was invalid, and their results. */
|
|
@@ -21,6 +22,8 @@ interface StreamActionEmissionOptions {
|
|
|
21
22
|
readonly held?: boolean;
|
|
22
23
|
/** A child or schedule's caller reads only the final reply, including at an explicit task wait. */
|
|
23
24
|
readonly finalReplyOnly?: boolean;
|
|
25
|
+
/** The session's call with this id, as its view holds it now. */
|
|
26
|
+
readonly sessionCall: (callId: string) => CallRow | undefined;
|
|
24
27
|
readonly tools: HarnessToolLookup;
|
|
25
28
|
/** A deliberate turn cancel or steering interrupt, not a provider failure/retry. */
|
|
26
29
|
readonly interruptSignal?: AbortSignal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{TASK_WAIT_TOOL_NAME}from"#protocol/task-tools.js";import{announcedKind,callRequested,callSettledFrom}from"#harness/call-facts.js";import{createRuntimeToolResultFromStepResult,createRuntimeToolResultFromToolError,createToolResultMessagePartFromToolError}from"#harness/action-result-helpers.js";import{createInvalidToolCallInputError,isInvalidToolCall,resolveProviderToolCallRequest}from"#harness/tool-call-input-errors.js";import{createPresentedRuntimeActionRequestFromToolCall,projectToolLabel}from"#harness/action-presentation.js";import{normalizeModelStreamError}from"#harness/model-call/errors.js";import{createProviderStreamActionBatch}from"#harness/stream-actions.js";import{createOrderedStreamEmitter}from"#harness/ordered-stream-emitter.js";import{interruptStreamOnFailure}from"#harness/interruptible-stream.js";import{normalizeAssistantStepFinishReason}from"#harness/finish-reason.js";async function emitStreamContent(e,t,n,r){let i=createOrderedStreamEmitter(e),a=createProviderStreamActionBatch({emitFn:i.emit,state:t});try{return await consumeStreamContent(i.emit,t,interruptStreamOnFailure(n,i.failureSignal),a,r)}finally{try{await a.cancel()}finally{await i.closeAndDrain()}}}function finalPhase(e,t){return e===`tool-calls`||t&&e===`stop`?`narration`:`reply`}function textPhaseBefore(e,t){return e===TASK_WAIT_TOOL_NAME&&!t?`reply`:`narration`}async function consumeStreamContent(e,t,n,r,i){let a=t.runId??`${t.turnId}.run`,o={runId:a,turnId:t.turnId},s=0,nextPartId=()=>`${a}.${String(s++)}`,c=``,l,u=``,d,f=`stop`,p,m=new Set,h=new Set,g=new Set,_=new Set,v=[],y=new Map,b=new Map,completePart=async(t,n,r,i)=>{await e({data:{kind:n,partId:t,phase:i,runId:a,value:r},type:`content.completed`})},flushCurrentMessage=async(e=`narration`)=>{u.length!==0&&d!==void 0&&(await completePart(d,`text`,u,e),u=``,d=void 0)},flushCurrentReasoning=async()=>{c.trim().length>0&&l!==void 0&&await completePart(l,`reasoning`,c,`narration`),c=``,l=void 0},emitActionInput=async(t,n)=>{let r=b.get(t);if(r===void 0)return;let a=r.announced?{data:{callId:t,delta:n},type:`call.input`}:{data:{callId:t,delta:n,kind:announcedKind(r.toolName,i?.tools.get(r.toolName)),name:r.toolName},scope:o,type:`call.input`};r.announced=!0,await e(a)},emitActionRequest=async t=>{let{action:n}=t;m.has(n.callId)||(u.trim().length>0&&await flushCurrentMessage(n.kind===`tool-call`?textPhaseBefore(n.toolName,i?.finalReplyOnly===!0):`narration`),m.add(n.callId),y.set(n.callId,n.input),await e(callRequested({action:n,owner:{runId:a},label:t.presentationLabel})))},collectProviderToolCall=async e=>{if(g.has(e.toolCallId)||(g.add(e.toolCallId),m.has(e.toolCallId)))return;m.add(e.toolCallId),u.trim().length>0&&await flushCurrentMessage();let t=resolveProviderToolCallRequest(e,i?.tools??new Map);if(t.toolError!==void 0){_.add(e.toolCallId),await emitInvalidCall({callId:e.toolCallId,input:{},kind:`tool-call`,toolName:e.toolName},createRuntimeToolResultFromToolError(t.toolError)),v.push(createToolResultMessagePartFromToolError(t.toolError));return}y.set(t.request.action.callId,t.request.action.input),r.observe(t.request)},emitInvalidCall=async(t,n)=>{m.add(t.callId);let r=typeof n.output==`string`?n.output:JSON.stringify(n.output??null);await e(callRequested({action:t,inputError:{code:`INVALID_TOOL_INPUT`,message:r},owner:{runId:a}})),await emitActionResult(n)},emitActionResult=async t=>{if(h.has(t.callId))return;h.add(t.callId);let n=t.isError===!0?void 0:projectToolLabel(i?.tools.get(t.toolName),`complete`,y.get(t.callId),t.output);await e(callSettledFrom(t,{label:n}))},emitToolCall=async e=>{if(isInvalidToolCall(e)){_.add(e.toolCallId);return}if(!(i===void 0||i.excludedActionToolNames.has(e.toolName)))try{await emitActionRequest(createPresentedRuntimeActionRequestFromToolCall({toolCall:e,tools:i.tools}))}catch(t){if(t instanceof TypeError){let n=createInvalidToolCallInputError({error:t,toolCall:e});_.add(e.toolCallId),u.trim().length>0&&await flushCurrentMessage(),await emitInvalidCall({callId:e.toolCallId,input:{},kind:`tool-call`,toolName:e.toolName},createRuntimeToolResultFromToolError(n)),v.push(createToolResultMessagePartFromToolError(n));return}throw t}};try{for await(let t of n)if(p===void 0)switch(t.type){case`reasoning-delta`:{await r.flush(),c+=t.text;let n=l===void 0;l??=nextPartId(),await e(n?{data:{delta:t.text,kind:`reasoning`,partId:l},scope:o,type:`content.delta`}:{data:{delta:t.text,partId:l},type:`content.delta`});break}case`text-delta`:{await r.flush(),await flushCurrentReasoning(),u+=t.text;let n=d===void 0;d??=nextPartId(),await e(n?{data:{delta:t.text,kind:`text`,partId:d},scope:o,type:`content.delta`}:{data:{delta:t.text,partId:d},type:`content.delta`});break}case`tool-input-start`:if(i===void 0||t.providerExecuted===!0||i.tools.get(t.toolName)?.behavior?.handling?.kind===`provider-tool`||i.excludedActionToolNames.has(t.toolName)){b.delete(t.id);break}await r.flush(),u.trim().length>0&&await flushCurrentMessage(textPhaseBefore(t.toolName,i.finalReplyOnly===!0)),b.set(t.id,{announced:!1,toolName:t.toolName});break;case`tool-input-delta`:if(!b.has(t.id))break;await r.flush(),await emitActionInput(t.id,t.delta);break;case`tool-input-end`:b.delete(t.id);break;case`tool-call`:{let e=t;b.delete(e.toolCallId),e.providerExecuted===!0?await collectProviderToolCall(e):(await r.flush(),await emitToolCall(e));break}case`tool-result`:{let e=t;if(e.providerExecuted!==!0||e.preliminary===!0)break;await
|
|
1
|
+
import{TASK_WAIT_TOOL_NAME}from"#protocol/task-tools.js";import{announcedKind,callRequested,callSettledFrom}from"#harness/call-facts.js";import{createRuntimeToolResultFromStepResult,createRuntimeToolResultFromToolError,createToolResultMessagePartFromToolError}from"#harness/action-result-helpers.js";import{createInvalidToolCallInputError,isInvalidToolCall,resolveProviderToolCallRequest}from"#harness/tool-call-input-errors.js";import{createPresentedRuntimeActionRequestFromToolCall,projectToolLabel}from"#harness/action-presentation.js";import{normalizeModelStreamError}from"#harness/model-call/errors.js";import{createProviderStreamActionBatch}from"#harness/stream-actions.js";import{createOrderedStreamEmitter}from"#harness/ordered-stream-emitter.js";import{interruptStreamOnFailure}from"#harness/interruptible-stream.js";import{normalizeAssistantStepFinishReason}from"#harness/finish-reason.js";async function emitStreamContent(e,t,n,r){let i=createOrderedStreamEmitter(e),a=createProviderStreamActionBatch({emitFn:i.emit,state:t});try{return await consumeStreamContent(i.emit,t,interruptStreamOnFailure(n,i.failureSignal),a,r)}finally{try{await a.cancel()}finally{await i.closeAndDrain()}}}function finalPhase(e,t){return e===`tool-calls`||t&&e===`stop`?`narration`:`reply`}function textPhaseBefore(e,t){return e===TASK_WAIT_TOOL_NAME&&!t?`reply`:`narration`}async function consumeStreamContent(e,t,n,r,i){let a=t.runId??`${t.turnId}.run`,o={runId:a,turnId:t.turnId},s=0,nextPartId=()=>`${a}.${String(s++)}`,c=``,l,u=``,d,f=`stop`,p,m=new Set,h=new Set,g=new Set,_=new Set,v=[],y=new Map,b=new Map,completePart=async(t,n,r,i)=>{await e({data:{kind:n,partId:t,phase:i,runId:a,value:r},type:`content.completed`})},flushCurrentMessage=async(e=`narration`)=>{u.length!==0&&d!==void 0&&(await completePart(d,`text`,u,e),u=``,d=void 0)},flushCurrentReasoning=async()=>{c.trim().length>0&&l!==void 0&&await completePart(l,`reasoning`,c,`narration`),c=``,l=void 0},emitActionInput=async(t,n)=>{let r=b.get(t);if(r===void 0)return;let a=r.announced?{data:{callId:t,delta:n},type:`call.input`}:{data:{callId:t,delta:n,kind:announcedKind(r.toolName,i?.tools.get(r.toolName)),name:r.toolName},scope:o,type:`call.input`};r.announced=!0,await e(a)},emitActionRequest=async t=>{let{action:n}=t;m.has(n.callId)||(u.trim().length>0&&await flushCurrentMessage(n.kind===`tool-call`?textPhaseBefore(n.toolName,i?.finalReplyOnly===!0):`narration`),m.add(n.callId),y.set(n.callId,n.input),await e(callRequested({action:n,owner:{runId:a},label:t.presentationLabel})))},collectProviderToolCall=async e=>{if(g.has(e.toolCallId)||(g.add(e.toolCallId),m.has(e.toolCallId)))return;m.add(e.toolCallId),u.trim().length>0&&await flushCurrentMessage();let t=resolveProviderToolCallRequest(e,i?.tools??new Map);if(t.toolError!==void 0){_.add(e.toolCallId),await emitInvalidCall({callId:e.toolCallId,input:{},kind:`tool-call`,toolName:e.toolName},createRuntimeToolResultFromToolError(t.toolError)),v.push(createToolResultMessagePartFromToolError(t.toolError));return}y.set(t.request.action.callId,t.request.action.input),r.observe(t.request)},settleProviderCall=async(e,t)=>{let n=i?.sessionCall(e.toolCallId);n?.status!==`settled`&&(n===void 0&&await collectProviderToolCall(e),await r.flush(),await emitActionResult(t))},emitInvalidCall=async(t,n)=>{m.add(t.callId);let r=typeof n.output==`string`?n.output:JSON.stringify(n.output??null);await e(callRequested({action:t,inputError:{code:`INVALID_TOOL_INPUT`,message:r},owner:{runId:a}})),await emitActionResult(n)},emitActionResult=async t=>{if(h.has(t.callId))return;h.add(t.callId);let n=t.isError===!0?void 0:projectToolLabel(i?.tools.get(t.toolName),`complete`,y.get(t.callId),t.output);await e(callSettledFrom(t,{label:n}))},emitToolCall=async e=>{if(isInvalidToolCall(e)){_.add(e.toolCallId);return}if(!(i===void 0||i.excludedActionToolNames.has(e.toolName)))try{await emitActionRequest(createPresentedRuntimeActionRequestFromToolCall({toolCall:e,tools:i.tools}))}catch(t){if(t instanceof TypeError){let n=createInvalidToolCallInputError({error:t,toolCall:e});_.add(e.toolCallId),u.trim().length>0&&await flushCurrentMessage(),await emitInvalidCall({callId:e.toolCallId,input:{},kind:`tool-call`,toolName:e.toolName},createRuntimeToolResultFromToolError(n)),v.push(createToolResultMessagePartFromToolError(n));return}throw t}};try{for await(let t of n)if(p===void 0)switch(t.type){case`reasoning-delta`:{await r.flush(),c+=t.text;let n=l===void 0;l??=nextPartId(),await e(n?{data:{delta:t.text,kind:`reasoning`,partId:l},scope:o,type:`content.delta`}:{data:{delta:t.text,partId:l},type:`content.delta`});break}case`text-delta`:{await r.flush(),await flushCurrentReasoning(),u+=t.text;let n=d===void 0;d??=nextPartId(),await e(n?{data:{delta:t.text,kind:`text`,partId:d},scope:o,type:`content.delta`}:{data:{delta:t.text,partId:d},type:`content.delta`});break}case`tool-input-start`:if(i===void 0||t.providerExecuted===!0||i.tools.get(t.toolName)?.behavior?.handling?.kind===`provider-tool`||i.excludedActionToolNames.has(t.toolName)){b.delete(t.id);break}await r.flush(),u.trim().length>0&&await flushCurrentMessage(textPhaseBefore(t.toolName,i.finalReplyOnly===!0)),b.set(t.id,{announced:!1,toolName:t.toolName});break;case`tool-input-delta`:if(!b.has(t.id))break;await r.flush(),await emitActionInput(t.id,t.delta);break;case`tool-input-end`:b.delete(t.id);break;case`tool-call`:{let e=t;b.delete(e.toolCallId),e.providerExecuted===!0?await collectProviderToolCall(e):(await r.flush(),await emitToolCall(e));break}case`tool-result`:{let e=t;if(e.providerExecuted!==!0||e.preliminary===!0)break;await settleProviderCall({input:`input`in e?e.input:void 0,toolCallId:e.toolCallId,toolName:e.toolName},createRuntimeToolResultFromStepResult(e));break}case`tool-error`:{let e=t;if(e.providerExecuted!==!0)break;await settleProviderCall(e,createRuntimeToolResultFromToolError(e));break}case`finish-step`:f=normalizeAssistantStepFinishReason(t.finishReason),await r.flush();break;case`error`:p=normalizeModelStreamError(t.error);break;case`abort`:throw new DOMException(t.reason??`The model stream was aborted.`,`AbortError`)}}catch(t){if(i?.interruptSignal?.aborted===!0){let t=[];l!==void 0&&c.length>0&&t.push({type:`content.completed`,data:{partId:l,runId:a,kind:`reasoning`,phase:`narration`,value:c,interrupted:!0}}),d!==void 0&&u.length>0&&t.push({type:`content.completed`,data:{partId:d,runId:a,kind:`text`,phase:`narration`,value:u,interrupted:!0}}),t.length>0&&await e(t)}throw t}if(await r.flush(),p!==void 0)throw p;return await flushCurrentReasoning(),f!==`content-filter`&&u.trim().length>0&&d!==void 0&&await completePart(d,`text`,u,finalPhase(f,i?.held===!0)),{invalidInputToolCallIds:_,trailingInlineToolResultParts:v}}export{emitStreamContent};
|