experimental-ash 0.3.0-alpha.26 → 0.3.0-alpha.28
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/dist/src/execution/await-authorization-orchestrator.d.ts +1 -1
- package/dist/src/execution/await-authorization-orchestrator.d.ts.map +1 -1
- package/dist/src/execution/await-authorization-orchestrator.js +52 -133
- package/dist/src/execution/await-authorization-orchestrator.js.map +1 -1
- package/dist/src/harness/compaction.d.ts +1 -1
- package/dist/src/harness/compaction.d.ts.map +1 -1
- package/dist/src/harness/compaction.js +2 -1
- package/dist/src/harness/compaction.js.map +1 -1
- package/dist/src/harness/tool-loop.d.ts.map +1 -1
- package/dist/src/harness/tool-loop.js +28 -1
- package/dist/src/harness/tool-loop.js.map +1 -1
- package/dist/src/internal/application/package.js +1 -1
- package/dist/src/internal/nitro/host/create-application-nitro.d.ts.map +1 -1
- package/dist/src/internal/nitro/host/create-application-nitro.js +16 -1
- package/dist/src/internal/nitro/host/create-application-nitro.js.map +1 -1
- package/dist/src/protocol/routes.d.ts +26 -0
- package/dist/src/protocol/routes.d.ts.map +1 -1
- package/dist/src/protocol/routes.js +28 -0
- package/dist/src/protocol/routes.js.map +1 -1
- package/dist/src/public/channels/auth.d.ts +107 -13
- package/dist/src/public/channels/auth.d.ts.map +1 -1
- package/dist/src/public/channels/auth.js +121 -14
- package/dist/src/public/channels/auth.js.map +1 -1
- package/dist/src/runtime/connections/authorization-complete-page.d.ts +12 -0
- package/dist/src/runtime/connections/authorization-complete-page.d.ts.map +1 -0
- package/dist/src/runtime/connections/authorization-complete-page.js +73 -0
- package/dist/src/runtime/connections/authorization-complete-page.js.map +1 -0
- package/dist/src/runtime/connections/callback-route.d.ts +57 -0
- package/dist/src/runtime/connections/callback-route.d.ts.map +1 -0
- package/dist/src/runtime/connections/callback-route.js +140 -0
- package/dist/src/runtime/connections/callback-route.js.map +1 -0
- package/dist/src/runtime/framework-channels/index.d.ts +4 -1
- package/dist/src/runtime/framework-channels/index.d.ts.map +1 -1
- package/dist/src/runtime/framework-channels/index.js +11 -2
- package/dist/src/runtime/framework-channels/index.js.map +1 -1
- package/dist/src/runtime/framework-tools/connection-search.d.ts.map +1 -1
- package/dist/src/runtime/framework-tools/connection-search.js +20 -1
- package/dist/src/runtime/framework-tools/connection-search.js.map +1 -1
- package/dist/src/runtime/governance/auth/oidc.d.ts.map +1 -1
- package/dist/src/runtime/governance/auth/oidc.js +29 -8
- package/dist/src/runtime/governance/auth/oidc.js.map +1 -1
- package/dist/src/runtime/governance/auth/types.d.ts +15 -1
- package/dist/src/runtime/governance/auth/types.d.ts.map +1 -1
- package/dist/src/runtime/governance/auth/types.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Workflow-body orchestrator for the interactive OAuth
|
|
3
3
|
* await-authorization-and-splice flow.
|
|
4
4
|
*
|
|
5
|
-
* The workflow body owns
|
|
5
|
+
* The workflow body owns hook creation and waiting; model-facing side
|
|
6
6
|
* effects stay inside durable steps.
|
|
7
7
|
*/
|
|
8
8
|
import type { HarnessSession } from "../harness/types.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"await-authorization-orchestrator.d.ts","sourceRoot":"","sources":["../../../src/execution/await-authorization-orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"await-authorization-orchestrator.d.ts","sourceRoot":"","sources":["../../../src/execution/await-authorization-orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAO1D,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,iDAAiD,CAAC;AACtG,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6DAA6D,CAAC;AAS7G;;;;;GAKG;AACH,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpD,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;CAClC;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,4BAA4B,CAAC,KAAK,EAAE;IACxD,QAAQ,CAAC,gBAAgB,EAAE,SAAS,yBAAyB,EAAE,CAAC;IAChE,QAAQ,CAAC,YAAY,EAAE,SAAS,8BAA8B,EAAE,CAAC;IACjE,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpD,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;CAClC,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAyJ3C"}
|
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
* Workflow-body orchestrator for the interactive OAuth
|
|
3
3
|
* await-authorization-and-splice flow.
|
|
4
4
|
*
|
|
5
|
-
* The workflow body owns
|
|
5
|
+
* The workflow body owns hook creation and waiting; model-facing side
|
|
6
6
|
* effects stay inside durable steps.
|
|
7
7
|
*/
|
|
8
|
-
import {
|
|
8
|
+
import { createHook, getWorkflowMetadata } from "@workflow/core";
|
|
9
9
|
import { getHarnessEmissionState } from "../harness/emission.js";
|
|
10
|
+
import { createAshConnectionCallbackRoutePath } from "../protocol/routes.js";
|
|
10
11
|
import { completeAuthorizationForConnectionStep, emitConnectionAuthorizationPendingStep, resolvePendingToolCallsStep, startAuthorizationForConnectionStep, } from "./connection-auth-steps.js";
|
|
11
12
|
/**
|
|
12
13
|
* Orchestrates one await-authorization-and-splice cycle for all
|
|
@@ -29,38 +30,48 @@ export async function awaitAuthorizationAndResolve(input) {
|
|
|
29
30
|
session: input.session,
|
|
30
31
|
};
|
|
31
32
|
}
|
|
32
|
-
// Mint
|
|
33
|
-
//
|
|
34
|
-
//
|
|
33
|
+
// Mint hooks up front so their tokens, and therefore the framework
|
|
34
|
+
// callback URLs we hand to the IdP, are stable across replays.
|
|
35
|
+
// `createHook` is a workflow-body API; calling it here (rather than
|
|
36
|
+
// inside a step) is what makes the token deterministic.
|
|
35
37
|
//
|
|
36
|
-
// The
|
|
37
|
-
//
|
|
38
|
-
//
|
|
39
|
-
//
|
|
40
|
-
//
|
|
41
|
-
//
|
|
42
|
-
//
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
38
|
+
// The framework owns the public callback URL: instead of redirecting
|
|
39
|
+
// the IdP at `@workflow/core`'s raw
|
|
40
|
+
// `/.well-known/workflow/v1/webhook/:token` endpoint, we build a
|
|
41
|
+
// namespaced Ash route at
|
|
42
|
+
// `/.well-known/ash/v1/connections/:name/callback/:token`. The
|
|
43
|
+
// matching framework route handler projects the inbound request and
|
|
44
|
+
// resumes this hook via `resumeHook(token, payload)`. Owning the
|
|
45
|
+
// callback in Ash lets the framework decide delivery policy (auth,
|
|
46
|
+
// throttling, logging) without leaking generic workflow primitives.
|
|
47
|
+
const callbackBaseUrl = trimTrailingSlash(getWorkflowMetadata().url);
|
|
48
|
+
const hooks = authsWithPendingCalls.map((auth) => {
|
|
49
|
+
const hook = createHook();
|
|
50
|
+
return {
|
|
51
|
+
connectionName: auth.connectionName,
|
|
52
|
+
hook,
|
|
53
|
+
webhookUrl: `${callbackBaseUrl}${createAshConnectionCallbackRoutePath(auth.connectionName, hook.token)}`,
|
|
54
|
+
};
|
|
55
|
+
});
|
|
47
56
|
// Run every `startAuthorization` inside its own durable step,
|
|
48
57
|
// parallelised across connections. Each step emits the matching
|
|
49
58
|
// `connection.authorization_required` event before returning.
|
|
50
|
-
const startResults = await Promise.all(
|
|
59
|
+
const startResults = await Promise.all(hooks.map(async ({ connectionName, hook, webhookUrl }) => ({
|
|
51
60
|
connectionName,
|
|
52
|
-
|
|
61
|
+
hook,
|
|
62
|
+
webhookUrl,
|
|
53
63
|
start: await startAuthorizationForConnectionStep({
|
|
54
64
|
connectionName,
|
|
55
65
|
emissionState,
|
|
56
66
|
serializedContext: input.serializedContext,
|
|
57
|
-
webhookUrl
|
|
67
|
+
webhookUrl,
|
|
58
68
|
}),
|
|
59
69
|
})));
|
|
60
70
|
const successfulStarts = startResults.flatMap((r) => r.start.ok
|
|
61
71
|
? [
|
|
62
72
|
{
|
|
63
73
|
connectionName: r.connectionName,
|
|
74
|
+
hook: r.hook,
|
|
64
75
|
principal: r.start.principal,
|
|
65
76
|
// Forward the start step's post-emit serialized ctx so the
|
|
66
77
|
// matching `completeAuthorization` step's emit sees the
|
|
@@ -68,7 +79,7 @@ export async function awaitAuthorizationAndResolve(input) {
|
|
|
68
79
|
// `connection.authorization_required` handler made.
|
|
69
80
|
serializedContext: r.start.serializedContext,
|
|
70
81
|
state: r.start.state,
|
|
71
|
-
|
|
82
|
+
webhookUrl: r.webhookUrl,
|
|
72
83
|
},
|
|
73
84
|
]
|
|
74
85
|
: []);
|
|
@@ -81,14 +92,14 @@ export async function awaitAuthorizationAndResolve(input) {
|
|
|
81
92
|
serializedContext: input.serializedContext,
|
|
82
93
|
});
|
|
83
94
|
}
|
|
84
|
-
// Suspend the workflow until each
|
|
85
|
-
// `completeAuthorization` inside a durable
|
|
86
|
-
// `
|
|
87
|
-
// `
|
|
88
|
-
|
|
95
|
+
// Suspend the workflow until each hook is resumed by the framework
|
|
96
|
+
// callback route, then run `completeAuthorization` inside a durable
|
|
97
|
+
// step per connection. `hook.dispose()` runs in a `finally` so a
|
|
98
|
+
// throw inside `awaitHookRequest` or the step does not leak the
|
|
99
|
+
// hook.
|
|
100
|
+
const completeResults = await Promise.all(successfulStarts.map(async ({ connectionName, hook, principal, serializedContext, state, webhookUrl }) => {
|
|
89
101
|
try {
|
|
90
|
-
const
|
|
91
|
-
const request = await toAuthorizationCallbackRequest(webhookRequest);
|
|
102
|
+
const request = await awaitHookRequest(hook);
|
|
92
103
|
const complete = await completeAuthorizationForConnectionStep({
|
|
93
104
|
connectionName,
|
|
94
105
|
emissionState,
|
|
@@ -96,12 +107,12 @@ export async function awaitAuthorizationAndResolve(input) {
|
|
|
96
107
|
request,
|
|
97
108
|
serializedContext,
|
|
98
109
|
state,
|
|
99
|
-
webhookUrl
|
|
110
|
+
webhookUrl,
|
|
100
111
|
});
|
|
101
112
|
return { complete, connectionName, principal };
|
|
102
113
|
}
|
|
103
114
|
finally {
|
|
104
|
-
|
|
115
|
+
hook.dispose();
|
|
105
116
|
}
|
|
106
117
|
}));
|
|
107
118
|
const tokens = {};
|
|
@@ -161,118 +172,26 @@ function filterAuthorizationsWithPendingCalls(pending, pendingCalls) {
|
|
|
161
172
|
return pending.filter((p) => targetConnectionNames.has(p.connectionName));
|
|
162
173
|
}
|
|
163
174
|
/**
|
|
164
|
-
* Awaits the first
|
|
165
|
-
* iterator. Using the iterator (rather than `await
|
|
175
|
+
* Awaits the first payload delivered to `hook` via `resumeHook`, using
|
|
176
|
+
* its async iterator. Using the iterator (rather than `await hook`
|
|
166
177
|
* directly) lets us return early once we have the request we need
|
|
167
178
|
* without relying on the `Thenable` surface that resolves to only the
|
|
168
179
|
* first payload.
|
|
180
|
+
*
|
|
181
|
+
* The framework callback route projects the inbound IdP request into
|
|
182
|
+
* an {@link AuthorizationCallbackRequest} before resuming, so this
|
|
183
|
+
* function returns that JSON-serializable shape directly; no further
|
|
184
|
+
* projection is needed.
|
|
169
185
|
*/
|
|
170
|
-
async function
|
|
171
|
-
const iterator =
|
|
186
|
+
async function awaitHookRequest(hook) {
|
|
187
|
+
const iterator = hook[Symbol.asyncIterator]();
|
|
172
188
|
const next = await iterator.next();
|
|
173
189
|
if (next.done === true || next.value === undefined) {
|
|
174
|
-
throw new Error("
|
|
190
|
+
throw new Error("Connection callback hook closed before delivering a request.");
|
|
175
191
|
}
|
|
176
192
|
return next.value;
|
|
177
193
|
}
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
* {@link AuthorizationCallbackRequest} shape so it can travel across
|
|
181
|
-
* the `"use step"` boundary into the authored `completeAuthorization`
|
|
182
|
-
* callback. Body text is captured for non-GET/HEAD methods; reading
|
|
183
|
-
* the body here consumes it on the source request.
|
|
184
|
-
*/
|
|
185
|
-
async function toAuthorizationCallbackRequest(request) {
|
|
186
|
-
const headers = {};
|
|
187
|
-
request.headers.forEach((value, key) => {
|
|
188
|
-
headers[key] = value;
|
|
189
|
-
});
|
|
190
|
-
let body = "";
|
|
191
|
-
if (request.method !== "GET" && request.method !== "HEAD") {
|
|
192
|
-
try {
|
|
193
|
-
body = await request.text();
|
|
194
|
-
}
|
|
195
|
-
catch {
|
|
196
|
-
body = "";
|
|
197
|
-
}
|
|
198
|
-
}
|
|
199
|
-
return {
|
|
200
|
-
body,
|
|
201
|
-
headers,
|
|
202
|
-
method: request.method,
|
|
203
|
-
url: request.url,
|
|
204
|
-
};
|
|
205
|
-
}
|
|
206
|
-
/**
|
|
207
|
-
* Returns a small self-contained HTML page that the user's browser
|
|
208
|
-
* lands on after completing an OAuth authorization redirect. The
|
|
209
|
-
* framework's authorization webhook endpoint would otherwise respond
|
|
210
|
-
* with an empty `202 Accepted` body, which looks broken to the user.
|
|
211
|
-
*
|
|
212
|
-
* Intentionally self-contained: no external assets, no script — this
|
|
213
|
-
* page must render identically regardless of where the workflow
|
|
214
|
-
* runtime serves the webhook from.
|
|
215
|
-
*/
|
|
216
|
-
function buildAuthorizationCompletePage() {
|
|
217
|
-
const html = `<!doctype html>
|
|
218
|
-
<html lang="en">
|
|
219
|
-
<head>
|
|
220
|
-
<meta charset="utf-8" />
|
|
221
|
-
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
|
222
|
-
<title>Authorization complete</title>
|
|
223
|
-
<style>
|
|
224
|
-
:root {
|
|
225
|
-
color-scheme: light dark;
|
|
226
|
-
--bg: #fafafa;
|
|
227
|
-
--fg: #111111;
|
|
228
|
-
--muted: #525252;
|
|
229
|
-
--card-bg: #ffffff;
|
|
230
|
-
--card-border: #e5e5e5;
|
|
231
|
-
}
|
|
232
|
-
@media (prefers-color-scheme: dark) {
|
|
233
|
-
:root {
|
|
234
|
-
--bg: #0a0a0a;
|
|
235
|
-
--fg: #fafafa;
|
|
236
|
-
--muted: #a3a3a3;
|
|
237
|
-
--card-bg: #171717;
|
|
238
|
-
--card-border: #262626;
|
|
239
|
-
}
|
|
240
|
-
}
|
|
241
|
-
body {
|
|
242
|
-
margin: 0;
|
|
243
|
-
min-height: 100vh;
|
|
244
|
-
display: grid;
|
|
245
|
-
place-items: center;
|
|
246
|
-
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
|
|
247
|
-
background: var(--bg);
|
|
248
|
-
color: var(--fg);
|
|
249
|
-
}
|
|
250
|
-
.card {
|
|
251
|
-
max-width: 28rem;
|
|
252
|
-
padding: 2rem 2.25rem;
|
|
253
|
-
border: 1px solid var(--card-border);
|
|
254
|
-
border-radius: 12px;
|
|
255
|
-
background: var(--card-bg);
|
|
256
|
-
color: var(--fg);
|
|
257
|
-
text-align: center;
|
|
258
|
-
}
|
|
259
|
-
h1 { font-size: 1.25rem; margin: 0 0 0.5rem; color: var(--fg); }
|
|
260
|
-
p { margin: 0; color: var(--muted); line-height: 1.5; }
|
|
261
|
-
</style>
|
|
262
|
-
</head>
|
|
263
|
-
<body>
|
|
264
|
-
<main class="card">
|
|
265
|
-
<h1>Authorization complete</h1>
|
|
266
|
-
<p>You can close this tab and return to your app.</p>
|
|
267
|
-
</main>
|
|
268
|
-
</body>
|
|
269
|
-
</html>`;
|
|
270
|
-
return new Response(html, {
|
|
271
|
-
headers: {
|
|
272
|
-
"cache-control": "no-store",
|
|
273
|
-
"content-type": "text/html; charset=utf-8",
|
|
274
|
-
},
|
|
275
|
-
status: 200,
|
|
276
|
-
});
|
|
194
|
+
function trimTrailingSlash(value) {
|
|
195
|
+
return value.endsWith("/") ? value.slice(0, -1) : value;
|
|
277
196
|
}
|
|
278
197
|
//# sourceMappingURL=await-authorization-orchestrator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"await-authorization-orchestrator.js","sourceRoot":"","sources":["../../../src/execution/await-authorization-orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"await-authorization-orchestrator.js","sourceRoot":"","sources":["../../../src/execution/await-authorization-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,5 +40,5 @@ export declare function resolveCompactionModel(input: {
|
|
|
40
40
|
* Compacts messages by summarizing older history and keeping only the most
|
|
41
41
|
* recent messages.
|
|
42
42
|
*/
|
|
43
|
-
export declare function compactMessages(messages: ModelMessage[], model: LanguageModel, config: CompactionConfig, providerOptions?: Parameters<typeof generateText>[0]["providerOptions"], telemetry?: TelemetryOptions): Promise<ModelMessage[]>;
|
|
43
|
+
export declare function compactMessages(messages: ModelMessage[], model: LanguageModel, config: CompactionConfig, providerOptions?: Parameters<typeof generateText>[0]["providerOptions"], telemetry?: TelemetryOptions, headers?: Record<string, string>): Promise<ModelMessage[]>;
|
|
44
44
|
//# sourceMappingURL=compaction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../src/harness/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAAE,MAAM,IAAI,CAAC;AAEhG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAyB1E;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAErD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,SAAS,YAAY,EAAE,EACjC,MAAM,EAAE,gBAAgB,GACvB,MAAM,CAeR;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,SAAS,YAAY,EAAE,EACjC,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAET;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAAC,KAAK,EAAE;IAClD,QAAQ,CAAC,wBAAwB,CAAC,EAAE,qBAAqB,CAAC;IAC1D,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,qBAAqB,CAAC;IAC/C,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;CAC9D,GAAG,OAAO,CAAC;IACV,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;CACjF,CAAC,CAWD;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,YAAY,EAAE,EACxB,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,gBAAgB,EACxB,eAAe,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,EACvE,SAAS,CAAC,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../src/harness/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAAE,MAAM,IAAI,CAAC;AAEhG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAyB1E;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAErD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,SAAS,YAAY,EAAE,EACjC,MAAM,EAAE,gBAAgB,GACvB,MAAM,CAeR;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,SAAS,YAAY,EAAE,EACjC,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAET;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAAC,KAAK,EAAE;IAClD,QAAQ,CAAC,wBAAwB,CAAC,EAAE,qBAAqB,CAAC;IAC1D,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,qBAAqB,CAAC;IAC/C,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;CAC9D,GAAG,OAAO,CAAC;IACV,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;CACjF,CAAC,CAWD;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,YAAY,EAAE,EACxB,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,gBAAgB,EACxB,eAAe,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,EACvE,SAAS,CAAC,EAAE,gBAAgB,EAC5B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,OAAO,CAAC,YAAY,EAAE,CAAC,CAmCzB"}
|
|
@@ -63,7 +63,7 @@ export async function resolveCompactionModel(input) {
|
|
|
63
63
|
* Compacts messages by summarizing older history and keeping only the most
|
|
64
64
|
* recent messages.
|
|
65
65
|
*/
|
|
66
|
-
export async function compactMessages(messages, model, config, providerOptions, telemetry) {
|
|
66
|
+
export async function compactMessages(messages, model, config, providerOptions, telemetry, headers) {
|
|
67
67
|
let keep = selectRecentWindowSize(messages, config);
|
|
68
68
|
while (true) {
|
|
69
69
|
const { older, recent } = splitMessagesForCompaction(messages, keep);
|
|
@@ -75,6 +75,7 @@ export async function compactMessages(messages, model, config, providerOptions,
|
|
|
75
75
|
role: message.role,
|
|
76
76
|
}));
|
|
77
77
|
const result = await generateText({
|
|
78
|
+
headers,
|
|
78
79
|
model,
|
|
79
80
|
prompt: formatCompactionPrompt(prunedOlder),
|
|
80
81
|
providerOptions,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../../src/harness/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAgE,MAAM,IAAI,CAAC;AAKhG,MAAM,wBAAwB,GAAG;IAC/B,oCAAoC;IACpC,6DAA6D;IAC7D,oHAAoH;IACpH,4CAA4C;IAC5C,mHAAmH;IACnH,0CAA0C;CAC3C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEZ,MAAM,iCAAiC,GAAG,KAAK,CAAC;AAChD,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAClC,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAYtC;;;;;;;;GAQG;AACH,MAAM,UAAU,cAAc,CAAC,KAAc;IAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAC1C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAChC,QAAiC,EACjC,MAAwB;IAExB,MAAM,KAAK,GAAG,MAAM,CAAC,oBAAoB,CAAC;IAC1C,MAAM,UAAU,GAAG,MAAM,CAAC,2BAA2B,CAAC;IAEtD,IACE,KAAK,KAAK,SAAS;QACnB,UAAU,KAAK,SAAS;QACxB,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC;QAC7B,UAAU,GAAG,CAAC;QACd,UAAU,GAAG,QAAQ,CAAC,MAAM,EAC5B,CAAC;QACD,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,KAAK,GAAG,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAC3B,QAAiC,EACjC,MAAwB;IAExB,OAAO,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC;AACjE,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,KAK5C;IAIC,MAAM,SAAS,GAAG,KAAK,CAAC,wBAAwB,IAAI,KAAK,CAAC,cAAc,CAAC;IACzE,MAAM,KAAK,GACT,SAAS,KAAK,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAEzF,OAAO;QACL,KAAK;QACL,eAAe,EAAE,SAAS,CAAC,eAEJ;KACxB,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAAwB,EACxB,KAAoB,EACpB,MAAwB,EACxB,eAAuE,EACvE,SAA4B;
|
|
1
|
+
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../../src/harness/compaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"AAoFA,OAAO,KAAK,EAIV,MAAM,EAGN,qBAAqB,EACtB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"AAoFA,OAAO,KAAK,EAIV,MAAM,EAGN,qBAAqB,EACtB,MAAM,YAAY,CAAC;AA6KpB,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAqS3E"}
|
|
@@ -80,6 +80,30 @@ function buildTelemetryRuntimeContext(authored, session) {
|
|
|
80
80
|
"ash.version": ashVersion,
|
|
81
81
|
};
|
|
82
82
|
}
|
|
83
|
+
/**
|
|
84
|
+
* Builds AI Gateway app attribution headers when the model is gateway-routed.
|
|
85
|
+
*
|
|
86
|
+
* Gateway routing is detected by `typeof model === "string"` — the same
|
|
87
|
+
* condition used for the `gateway-auto` cache path. Returns `undefined`
|
|
88
|
+
* for non-gateway models or when no meaningful attribution is available.
|
|
89
|
+
*/
|
|
90
|
+
function buildGatewayAttributionHeaders(model, runtimeIdentity) {
|
|
91
|
+
if (typeof model !== "string") {
|
|
92
|
+
return undefined;
|
|
93
|
+
}
|
|
94
|
+
const title = runtimeIdentity?.agentName ?? runtimeIdentity?.agentId;
|
|
95
|
+
const deploymentHost = process.env.VERCEL_PROJECT_PRODUCTION_URL || process.env.VERCEL_URL;
|
|
96
|
+
const referer = deploymentHost ? `https://${deploymentHost}` : undefined;
|
|
97
|
+
if (!title && !referer) {
|
|
98
|
+
return undefined;
|
|
99
|
+
}
|
|
100
|
+
const headers = {};
|
|
101
|
+
if (title)
|
|
102
|
+
headers["x-title"] = title;
|
|
103
|
+
if (referer)
|
|
104
|
+
headers["http-referer"] = referer;
|
|
105
|
+
return headers;
|
|
106
|
+
}
|
|
83
107
|
// ---------------------------------------------------------------------------
|
|
84
108
|
// Turn trace state — survives step boundaries via session.state
|
|
85
109
|
// ---------------------------------------------------------------------------
|
|
@@ -222,9 +246,11 @@ export function createToolLoopHarness(config) {
|
|
|
222
246
|
//
|
|
223
247
|
// Runs before `agent.stream()` so the compacted messages flow through
|
|
224
248
|
// `messages` (which the harness uses to rebuild session history).
|
|
249
|
+
const attributionHeaders = buildGatewayAttributionHeaders(model, config.runtimeIdentity);
|
|
225
250
|
({ messages, session } = await maybeCompact({
|
|
226
251
|
emit,
|
|
227
252
|
emissionState,
|
|
253
|
+
headers: attributionHeaders,
|
|
228
254
|
messages,
|
|
229
255
|
model,
|
|
230
256
|
onCompaction: config.onCompaction,
|
|
@@ -267,6 +293,7 @@ export function createToolLoopHarness(config) {
|
|
|
267
293
|
* handled by the harness catch block and emitted as stream events.
|
|
268
294
|
*/
|
|
269
295
|
const agentSettings = {
|
|
296
|
+
headers: attributionHeaders,
|
|
270
297
|
instructions: session.agent.system || undefined,
|
|
271
298
|
model,
|
|
272
299
|
onError() { },
|
|
@@ -512,7 +539,7 @@ async function maybeCompact(input) {
|
|
|
512
539
|
usageInputTokens: getInputTokenCount(messages, session.compaction),
|
|
513
540
|
}));
|
|
514
541
|
}
|
|
515
|
-
messages = await compactMessages(messages, compaction.model, session.compaction, compaction.providerOptions, input.telemetry);
|
|
542
|
+
messages = await compactMessages(messages, compaction.model, session.compaction, compaction.providerOptions, input.telemetry, input.headers);
|
|
516
543
|
if (input.onCompaction) {
|
|
517
544
|
const compacted = await input.onCompaction(session);
|
|
518
545
|
session = compacted.session;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAA+B,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChG,OAAO,EACL,WAAW,EAIX,aAAa,GAGd,MAAM,IAAI,CAAC;AAEZ,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,EACL,aAAa,EACb,YAAY,EACZ,WAAW,EACX,iBAAiB,GAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EACL,8BAA8B,EAC9B,8BAA8B,EAC9B,yBAAyB,GAC1B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,EACL,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,+BAA+B,EAAE,MAAM,gDAAgD,CAAC;AAEjG,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC/F,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,sBAAsB,EACtB,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,WAAW,EACX,cAAc,EACd,yBAAyB,EACzB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,4BAA4B,EAC5B,gCAAgC,GACjC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,wBAAwB,EACxB,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EACZ,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EACL,4BAA4B,EAC5B,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,sCAAsC,EACtC,4BAA4B,EAC5B,4BAA4B,GAC7B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,cAAc,EACd,eAAe,EAEf,iBAAiB,GAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAW3D;;GAEG;AAEH;;;;;;;;GAQG;AACH,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,SAAS,CAAC;AACtD,MAAM,UAAU,GAAG,2BAA2B,EAAE,CAAC,OAAO,CAAC;AAEzD,MAAM,GAAG,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAElC;;;;GAIG;AACH,MAAM,8BAA8B,GAAG,GAAG,CAAC;AAE3C,SAAS,eAAe,CACtB,QAA+C,EAC/C,SAA6B;IAE7B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO;QACL,UAAU,EAAE,QAAQ,CAAC,UAAU,IAAI,SAAS;QAC5C,SAAS,EAAE,IAAI;QACf,YAAY,EAAE,QAAQ,CAAC,YAAY,IAAI,IAAI;QAC3C,aAAa,EAAE,QAAQ,CAAC,aAAa,IAAI,IAAI;KAC9C,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,4BAA4B,CACnC,QAA+C,EAC/C,OAAuB;IAEvB,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO;QACL,GAAG,QAAQ,CAAC,QAAQ;QACpB,wBAAwB,EAAE,OAAO,CAAC,iBAAiB;QACnD,iBAAiB,EAAE,WAAW;QAC9B,gBAAgB,EAAE,OAAO,CAAC,SAAS;QACnC,aAAa,EAAE,UAAU;KAC1B,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,gEAAgE;AAChE,8EAA8E;AAE9E,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;AAYrD,SAAS,iBAAiB,CAAC,OAE1B;IACC,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC,oBAAoB,CAA+B,CAAC;AAC7E,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAuB,EAAE,WAAwB;IAC1E,MAAM,MAAM,GAAmB;QAC7B,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,MAAM,EAAE,WAAW,CAAC,MAAM;QAC1B,UAAU,EAAE,WAAW,CAAC,UAAU;KACnC,CAAC;IAEF,OAAO;QACL,GAAG,OAAO;QACV,KAAK,EAAE;YACL,GAAG,OAAO,CAAC,KAAK;YAChB,CAAC,oBAAoB,CAAC,EAAE,MAAM;SAC/B;KACF,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,sBAAsB,CAC7B,MAAsD,EACtD,QAA0B,EAC1B,OAA+D;IAE/D,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,QAAQ,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,CAAC;gBACnC,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,UAAU,EAAE,MAAM,CAAC,UAAU;aAC9B,CAAC,CAAC;YACH,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAA6B;IACjE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,MAAM,eAAe,GAAG,wBAAwB,EAAE,CAAC;IACnD,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAClC,qBAAqB,EAAE,CAAC;IAC1B,CAAC;IACD,MAAM,MAAM,GAAG,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClF,MAAM,SAAS,GAAG,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;IAEpD,KAAK,UAAU,OAAO,CACpB,cAA+C,EAC/C,KAAiB;QAEjB,2EAA2E;QAE3E,mEAAmE;QACnE,oEAAoE;QACpE,IAAI,QAA0B,CAAC;QAC/B,IAAI,MAAM,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,UAAU,GAAG,eAAe,EAAE,UAAU,IAAI,SAAS,CAAC;YAC5D,MAAM,UAAU,GAA2B;gBACzC,aAAa,EAAE,UAAU;gBACzB,iBAAiB,EAAE,WAAW;gBAC9B,gBAAgB,EAAE,cAAc,CAAC,SAAS;gBAC1C,wBAAwB,EAAE,cAAc,CAAC,iBAAiB;aAC3D,CAAC;YACF,IAAI,UAAU,EAAE,CAAC;gBACf,UAAU,CAAC,yBAAyB,CAAC,GAAG,UAAU,CAAC;YACrD,CAAC;YACD,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QAC7D,CAAC;QAED,kEAAkE;QAClE,iDAAiD;QACjD,MAAM,aAAa,GAAG,sBAAsB,CAAC,MAAM,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;QAC/E,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,cAAc,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAE3E,IAAI,CAAC;YACH,IAAI,aAAa,EAAE,CAAC;gBAClB,OAAO,MAAM,WAAW,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;YAC5D,CAAC;YACD,OAAO,MAAM,WAAW,EAAE,CAAC;QAC7B,CAAC;gBAAS,CAAC;YACT,QAAQ,EAAE,GAAG,EAAE,CAAC;QAClB,CAAC;IACH,CAAC;IAED,KAAK,UAAU,eAAe,CAC5B,cAA+C,EAC/C,KAAiB,EACjB,QAAe;QAEf,IAAI,OAAO,GAAG,cAAc,CAAC;QAE7B,mEAAmE;QACnE,uDAAuD;QACvD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,GAAG,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/D,CAAC;QAED,IAAI,aAAa,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;QAErD,uEAAuE;QACvE,oDAAoD;QAEpD,MAAM,SAAS,GAAG,wBAAwB,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QAC/D,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;QAE5B,MAAM,sBAAsB,GAAG,MAAM,4BAA4B,CAAC;YAChE,IAAI;YACJ,OAAO;YACP,SAAS,EAAE,SAAS,CAAC,KAAK;SAC3B,CAAC,CAAC;QACH,IAAI,sBAAsB,CAAC,OAAO,KAAK,YAAY,EAAE,CAAC;YACpD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,sBAAsB,CAAC,OAAO,EAAE,CAAC;QACjE,CAAC;QACD,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAC;QAEzC,MAAM,OAAO,GAAG,mBAAmB,CAAC;YAClC,OAAO,EAAE,sBAAsB,CAAC,QAAQ;YACxC,kBAAkB,EAAE,2BAA2B,CAAC,MAAM,CAAC,KAAK,CAAC;YAC7D,OAAO;YACP,SAAS,EAAE,SAAS,CAAC,KAAK;SAC3B,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,KAAK,YAAY,EAAE,CAAC;YACrC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;QAClD,CAAC;QAED,2EAA2E;QAE3E,IAAI,IAAI,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YAChC,aAAa,GAAG,MAAM,gBAAgB,CACpC,IAAI,EACJ,KAAK,IAAI,EAAE,EACX,aAAa,EACb,MAAM,CAAC,eAAe,CACvB,CAAC;YACF,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YAE1D,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QAED,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC1B,IAAI,QAAQ,GAAmB,OAAO,CAAC,QAAQ,CAAC;QAEhD,IAAI,SAAS,CAAC,KAAK,EAAE,OAAO,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YACvE,8DAA8D;YAC9D,4DAA4D;YAC5D,oDAAoD;YACpD,0DAA0D;YAC1D,2CAA2C;YAC3C,MAAM,OAAO,GAAG,MAAM,yBAAyB,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACzE,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3C,CAAC;QAED,2EAA2E;QAE3E,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACtE,MAAM,SAAS,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAE7F,2EAA2E;QAC3E,EAAE;QACF,sEAAsE;QACtE,kEAAkE;QAClE,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,YAAY,CAAC;YAC1C,IAAI;YACJ,aAAa;YACb,QAAQ;YACR,KAAK;YACL,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,OAAO;YACP,SAAS,EAAE,eAAe,CAAC,eAAe,EAAE,SAAS,CAAC,IAAI,SAAS;SACpE,CAAC,CAAC,CAAC;QAEJ,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,MAAM,6BAA6B,CAAC;YAChD,aAAa;YACb,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,cAAc,EAAE,OAAO,CAAC,KAAK,CAAC,cAAc;YAC5C,KAAK,EAAE,MAAM,CAAC,KAAK;SACpB,CAAC,CAAC;QAEH,qEAAqE;QACrE,gEAAgE;QAChE,MAAM,GAAG,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,QAAQ,GAAG,GAAG,EAAE,GAAG,CAAC,qBAAqB,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,GAAG,EAAE,GAAG,CAAC,4BAA4B,CAAC,CAAC;QAC1D,IAAI,QAAQ,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YACvD,MAAM,eAAe,GAAG,MAAM,+BAA+B,CAAC,QAAQ,EAAE,UAAU,EAAE;gBAClF,aAAa;gBACb,iBAAiB,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC/C,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QACxC,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,4BAA4B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAEpF,2EAA2E;QAE3E,MAAM,KAAK,GAAG,cAAc,CAAC;YAC3B,SAAS;YACT,IAAI;YACJ,aAAa;YACb,MAAM;YACN,OAAO;SACR,CAAC,CAAC;QAEH,2EAA2E;QAE3E;;;;WAIG;QACH,MAAM,aAAa,GAAG;YACpB,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,SAAS;YAC/C,KAAK;YACL,OAAO,KAAI,CAAC;YACZ,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,cAAc,EAAE,4BAA4B,CAAC,eAAe,EAAE,OAAO,CAAC;YACtE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;YACxB,SAAS,EAAE,eAAe,CAAC,eAAe,EAAE,SAAS,CAAC;YACtD,KAAK,EAAE,cAAc;SACtB,CAAC;QACF,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,aAAa,CAAC,CAAC;QAE/C,iEAAiE;QACjE,+DAA+D;QAC/D,iEAAiE;QACjE,uCAAuC;QACvC,MAAM,aAAa,GAAG,MAAM,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QAEhE,IAAI,MAAyB,CAAC;QAC9B,MAAM,gBAAgB,GAAG,KAAK,IAAgC,EAAE;YAC9D,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;gBACrE,MAAM,iBAAiB,CAAC,IAAI,EAAE,aAAa,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;gBACtE,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC;gBAC1C,MAAM,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE;oBACrD,uBAAuB,EAAE,IAAI,GAAG,CAAC,CAAC,sBAAsB,CAAC,CAAC;oBAC1D,KAAK,EAAE,MAAM,CAAC,KAAK;iBACpB,CAAC,CAAC;gBACH,OAAO,UAAU,CAAC;YACpB,CAAC;YACD,MAAM,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;YAClD,OAAO,MAAM,KAAK,CAAC,UAAU,CAAC;QAChC,CAAC,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,uBAAuB,CAAC,gBAAgB,EAAE;gBACvD,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,MAAM,EAAE,aAAa,CAAC,MAAM;aAC7B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,+DAA+D;YAC/D,4CAA4C;YAC5C,8DAA8D;YAC9D,6DAA6D;YAC7D,8DAA8D;YAC9D,+BAA+B;YAC/B,IAAI,QAAQ,EAAE,CAAC;gBACb,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YACrC,CAAC;YAED,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,gEAAgE;gBAChE,+DAA+D;gBAC/D,sDAAsD;gBACtD,MAAM,KAAK,CAAC;YACd,CAAC;YAED,MAAM,cAAc,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;YACrD,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;YAChC,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;YAC3C,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAE5C,IAAI,cAAc,KAAK,UAAU,EAAE,CAAC;gBAClC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE;oBACxC,OAAO;oBACP,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,MAAM,EAAE,aAAa,CAAC,MAAM;oBAC5B,KAAK;iBACN,CAAC,CAAC;gBACH,MAAM,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE;oBACxC,IAAI,EAAE,mBAAmB;oBACzB,OAAO;oBACP,OAAO,EAAE,YAAY;oBACrB,SAAS,EAAE,OAAO,CAAC,SAAS;iBAC7B,CAAC,CAAC;gBACH,OAAO;oBACL,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE;oBAChC,OAAO;iBACR,CAAC;YACJ,CAAC;YAED,GAAG,CAAC,KAAK,CAAC,2DAA2D,EAAE;gBACrE,OAAO;gBACP,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,MAAM,EAAE,aAAa,CAAC,MAAM;gBAC5B,KAAK;aACN,CAAC,CAAC;YACH,aAAa,GAAG,MAAM,yBAAyB,CAAC,IAAI,EAAE,aAAa,EAAE;gBACnE,IAAI,EAAE,mBAAmB;gBACzB,OAAO;gBACP,OAAO,EAAE,YAAY;aACtB,CAAC,CAAC;YACH,MAAM,aAAa,GAAG,uBAAuB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YACtE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;QAChD,CAAC;QAED,2EAA2E;QAE3E,OAAO,gBAAgB,CAAC;YACtB,MAAM;YACN,IAAI;YACJ,aAAa;YACb,cAAc,EAAE,QAAQ;YACxB,MAAM;YACN,OAAO;YACP,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,8EAA8E;AAC9E,4BAA4B;AAC5B,8EAA8E;AAE9E;;;GAGG;AACH,KAAK,UAAU,gBAAgB,CAAC,KAQ/B;IACC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAChE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAEvC,MAAM,gBAAgB,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAClD,MAAM,UAAU,GAAG,wBAAwB,CAAC,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAE3E,MAAM,gBAAgB,GAAG,gCAAgC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;IAC7F,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACjG,MAAM,gBAAgB,GAAG,4BAA4B,CAAC;QACpD,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,eAAe,EAAE,sBAAsB;KACxC,CAAC,CAAC;IACH,MAAM,aAAa,GAAmB,CAAC,GAAG,gBAAgB,EAAE,GAAG,gBAAgB,CAAC,CAAC;IAEjF,MAAM,WAAW,GAAmB;QAClC,GAAG,OAAO;QACV,UAAU,EAAE,0BAA0B,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,MAAM,CAAC;KACnF,CAAC;IACF,MAAM,qBAAqB,GAAI,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAA8B;SACjF,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;SAClD,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,aAAa,KAAK,SAAS,CAAC;SACtF,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAChB,sCAAsC,CAAC;QACrC,QAAQ;QACR,KAAK,EAAE,MAAM,CAAC,KAAK;KACpB,CAAC,CACH,CAAC;IAEJ,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrC,OAAO;YACL,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,4BAA4B,CAAC;gBACpC,OAAO,EAAE,qBAAqB;gBAC9B,KAAK,EAAE;oBACL,QAAQ,EAAE,aAAa,CAAC,QAAQ;oBAChC,SAAS,EAAE,aAAa,CAAC,SAAS;oBAClC,MAAM,EAAE,aAAa,CAAC,MAAM;iBAC7B;gBACD,gBAAgB;gBAChB,OAAO,EAAE,EAAE,GAAG,WAAW,EAAE,OAAO,EAAE,CAAC,GAAG,cAAc,CAAC,EAAE;aAC1D,CAAC;SACH,CAAC;IACJ,CAAC;IAED,6EAA6E;IAE7E,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,IAAI,aAAa,GAAG,oBAAoB,CAAC;YACvC,QAAQ,EAAE,aAAa;YACvB,gBAAgB;YAChB,OAAO,EAAE,EAAE,GAAG,WAAW,EAAE,OAAO,EAAE,CAAC,GAAG,cAAc,CAAC,EAAE;SAC1D,CAAC,CAAC;QAEH,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,IAAI,CACR,yBAAyB,CAAC;gBACxB,QAAQ,EAAE,aAAa;gBACvB,QAAQ,EAAE,aAAa,CAAC,QAAQ;gBAChC,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,MAAM,EAAE,aAAa,CAAC,MAAM;aAC7B,CAAC,CACH,CAAC;YAEF,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;gBACnC,aAAa,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;gBACzE,aAAa,GAAG,uBAAuB,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;IAChD,CAAC;IAED,6EAA6E;IAE7E,MAAM,aAAa,GAAG,gBAAgB,CAAC,cAAc,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACjF,MAAM,gBAAgB,GAAG,aAAa,KAAK,cAAc,CAAC;IAE1D,qEAAqE;IACrE,oEAAoE;IACpE,6DAA6D;IAC7D,uEAAuE;IACvE,IAAI,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC;IACxC,IAAI,gBAAgB,IAAI,UAAU,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;QACtE,UAAU,GAAG;YACX,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;YAC7C,SAAS,EAAE,UAAU,CAAC,SAAS;SAChC,CAAC;IACJ,CAAC;IAED,MAAM,cAAc,GAAmB,CAAC,GAAG,aAAa,EAAE,GAAG,gBAAgB,CAAC,CAAC;IAC/E,IAAI,WAAW,GAAmB,EAAE,GAAG,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IAE1F,MAAM,YAAY,GAChB,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,MAAM,IAAI,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAEhF,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,aAAa,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3E,CAAC;aAAM,CAAC;YACN,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;QAC7C,CAAC;QACD,WAAW,GAAG,uBAAuB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IACpE,CAAC;IAED,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IACjD,CAAC;IAED,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI;QAC9E,OAAO,EAAE,WAAW;KACrB,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CACjC,OAAyB,EACzB,cAAuC,EACvC,MAAyB;IAEzB,MAAM,IAAI,GAKN;QACF,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,CAAC;IAEF,IAAI,MAAM,CAAC,KAAK,EAAE,WAAW,KAAK,SAAS,EAAE,CAAC;QAC5C,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;QACrD,IAAI,CAAC,2BAA2B,GAAG,cAAc,CAAC,MAAM,CAAC;IAC3D,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;GAQG;AACH,KAAK,UAAU,YAAY,CAAC,KAS3B;IACC,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IACtC,IAAI,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IAC9B,IAAI,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAE5B,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACjD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,sBAAsB,CAAC;QAC9C,wBAAwB,EAAE,OAAO,CAAC,KAAK,CAAC,wBAAwB;QAChE,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,cAAc,EAAE,OAAO,CAAC,KAAK,CAAC,cAAc;QAC5C,YAAY,EAAE,KAAK,CAAC,YAAY;KACjC,CAAC,CAAC;IAEH,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,IAAI,CACR,8BAA8B,CAAC;YAC7B,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC;YACxC,QAAQ,EAAE,aAAa,CAAC,QAAQ;YAChC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,gBAAgB,EAAE,CAAC;YACnB,MAAM,EAAE,aAAa,CAAC,MAAM;YAC5B,gBAAgB,EAAE,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC;SACnE,CAAC,CACH,CAAC;IACJ,CAAC;IAED,QAAQ,GAAG,MAAM,eAAe,CAC9B,QAAQ,EACR,UAAU,CAAC,KAAK,EAChB,OAAO,CAAC,UAAU,EAClB,UAAU,CAAC,eAAe,EAC1B,KAAK,CAAC,SAAS,CAChB,CAAC;IAEF,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;QACvB,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACpD,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;QAC5B,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACrC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;IACH,CAAC;IAED,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,IAAI,CACR,8BAA8B,CAAC;YAC7B,mBAAmB,EAAE,CAAC;YACtB,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC;YACxC,QAAQ,EAAE,aAAa,CAAC,QAAQ;YAChC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,MAAM,EAAE,aAAa,CAAC,MAAM;SAC7B,CAAC,CACH,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AAC/B,CAAC;AAED,SAAS,aAAa,CAAC,KAAoB;IACzC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;AAC9C,CAAC;AAED;;;;GAIG;AACH,SAAS,2BAA2B,CAClC,KAAqB;IAErB,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,OAAO,EAAE,WAAW,KAAK,SAAS,EAAE,CAAC;YACvC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,uBAAuB,CACpC,EAAoB,EACpB,IAA6D;IAE7D,KAAK,IAAI,OAAO,GAAG,CAAC,GAAI,OAAO,EAAE,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,OAAO,MAAM,EAAE,EAAE,CAAC;QACpB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,OAAO,KAAK,uBAAuB,IAAI,sBAAsB,CAAC,KAAK,CAAC,KAAK,OAAO,EAAE,CAAC;gBACrF,MAAM,KAAK,CAAC;YACd,CAAC;YACD,MAAM,OAAO,GACX,8BAA8B,GAAG,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;YACxF,GAAG,CAAC,IAAI,CAAC,0CAA0C,EAAE;gBACnD,OAAO;gBACP,OAAO;gBACP,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK;aACN,CAAC,CAAC;YACH,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { ASH_PACKAGE_NAME } from "../../package-name.js";
|
|
|
6
6
|
let cachedPackageInfo;
|
|
7
7
|
// The package build stamps the published version into `dist` so bundled
|
|
8
8
|
// deployments can still report package metadata without resolving package.json.
|
|
9
|
-
const BUNDLED_FALLBACK_PACKAGE_VERSION = "0.3.0-alpha.
|
|
9
|
+
const BUNDLED_FALLBACK_PACKAGE_VERSION = "0.3.0-alpha.28";
|
|
10
10
|
const BUNDLED_FALLBACK_PACKAGE_VERSION_PLACEHOLDER = "__ASH_PACKAGE_VERSION_PLACEHOLDER__";
|
|
11
11
|
const WORKFLOW_MODULE_ALIASES = {
|
|
12
12
|
"workflow/api": "@workflow/core/runtime",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-application-nitro.d.ts","sourceRoot":"","sources":["../../../../../src/internal/nitro/host/create-application-nitro.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAezC,OAAO,KAAK,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"create-application-nitro.d.ts","sourceRoot":"","sources":["../../../../../src/internal/nitro/host/create-application-nitro.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAezC,OAAO,KAAK,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAse7E;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,YAAY,EAAE,uBAAuB,EACrC,GAAG,EAAE,OAAO,EACZ,OAAO,GAAE;IACP,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,iBAAiB,CAAC;CACxB,GACL,OAAO,CAAC,KAAK,CAAC,CA0IhB"}
|
|
@@ -28,6 +28,17 @@ const WORKFLOW_ALIAS_SPECIFIERS = [
|
|
|
28
28
|
];
|
|
29
29
|
const WORKFLOW_TRANSFORM_PATCHED = Symbol("ash.workflow-transform-patched");
|
|
30
30
|
const WORKFLOW_CACHE_PATH_FRAGMENT = "/.ash/workflow-cache/";
|
|
31
|
+
/**
|
|
32
|
+
* Packages Ash itself pulls into hosted application output that must stay
|
|
33
|
+
* external so Nitro/rolldown does not try to inline platform-specific
|
|
34
|
+
* `.node` binaries (which would fail with a UTF-8 decode error).
|
|
35
|
+
*
|
|
36
|
+
* `@napi-rs/keyring` reaches the hosted bundle transitively through
|
|
37
|
+
* `@vercel/oidc` → `@vercel/cli-auth` and ships native `keyring.<platform>.node`
|
|
38
|
+
* binaries. App authors should not have to know about this; the framework
|
|
39
|
+
* traces it into `server/node_modules` automatically.
|
|
40
|
+
*/
|
|
41
|
+
const FRAMEWORK_HOSTED_EXTERNAL_PACKAGES = ["@napi-rs/keyring"];
|
|
31
42
|
function resolveWorkflowAliases() {
|
|
32
43
|
const aliases = {};
|
|
33
44
|
for (const specifier of WORKFLOW_ALIAS_SPECIFIERS) {
|
|
@@ -52,7 +63,11 @@ function includesStepSurface(surface) {
|
|
|
52
63
|
}
|
|
53
64
|
function collectHostedTraceDependencies(preparedHost) {
|
|
54
65
|
const configuredBuildDependencies = preparedHost.compileResult.manifest.config.build;
|
|
55
|
-
|
|
66
|
+
const merged = new Set([
|
|
67
|
+
...FRAMEWORK_HOSTED_EXTERNAL_PACKAGES,
|
|
68
|
+
...(configuredBuildDependencies?.externalDependencies ?? []),
|
|
69
|
+
]);
|
|
70
|
+
return [...merged].filter((dependencyName) => dependencyName !== ASH_PACKAGE_NAME);
|
|
56
71
|
}
|
|
57
72
|
function normalizePath(path) {
|
|
58
73
|
return path.replaceAll("\\", "/");
|