rivet-design 0.14.15 → 0.14.16
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/agent-variants/WorkerExecutorService.d.ts +12 -0
- package/dist/agent-variants/WorkerExecutorService.d.ts.map +1 -1
- package/dist/agent-variants/WorkerExecutorService.js +71 -1
- package/dist/agent-variants/WorkerExecutorService.js.map +1 -1
- package/dist/cli/commands/wait.d.ts +5 -0
- package/dist/cli/commands/wait.d.ts.map +1 -1
- package/dist/cli/commands/wait.js +33 -5
- package/dist/cli/commands/wait.js.map +1 -1
- package/dist/cli/router.d.ts +6 -0
- package/dist/cli/router.d.ts.map +1 -1
- package/dist/cli/router.js +54 -3
- package/dist/cli/router.js.map +1 -1
- package/dist/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/dist/install/channelCli.d.ts +3 -0
- package/dist/install/channelCli.d.ts.map +1 -0
- package/dist/install/channelCli.js +133 -0
- package/dist/install/channelCli.js.map +1 -0
- package/dist/install/channelManager.d.ts +79 -0
- package/dist/install/channelManager.d.ts.map +1 -0
- package/dist/install/channelManager.js +303 -0
- package/dist/install/channelManager.js.map +1 -0
- package/dist/install/harnesses.d.ts +2 -2
- package/dist/install/harnesses.d.ts.map +1 -1
- package/dist/install/harnesses.js +22 -22
- package/dist/install/harnesses.js.map +1 -1
- package/package.json +2 -1
- package/src/ui/dist/assets/{main-C39T3J6k.js → main-DEQafg4b.js} +24 -24
- package/src/ui/dist/index.html +1 -1
|
@@ -122,6 +122,8 @@ export type WorkerExecutorOptions = {
|
|
|
122
122
|
configuredWorkerModelFor?: (vendor: RunnerVendor) => string | undefined;
|
|
123
123
|
preflightTimeoutMs?: number;
|
|
124
124
|
spawnProbe?: PreflightSpawn;
|
|
125
|
+
/** Backoff before the single same-model retry on a rate-limited worker. */
|
|
126
|
+
rateLimitRetryDelayMs?: number;
|
|
125
127
|
};
|
|
126
128
|
/**
|
|
127
129
|
* M0 worker executor: runs artifact-backed implementation work items as
|
|
@@ -143,8 +145,16 @@ export declare class WorkerExecutorService {
|
|
|
143
145
|
private readonly workerTierOverridden;
|
|
144
146
|
private readonly referenceCreateTierOverridden;
|
|
145
147
|
private readonly timeoutMs;
|
|
148
|
+
private readonly rateLimitRetryDelayMs;
|
|
146
149
|
private runtimeAvailable?;
|
|
147
150
|
private readonly childrenBySession;
|
|
151
|
+
/** Sessions cancelled mid-run, so backoff waits with no live child to
|
|
152
|
+
* kill still observe the cancel instead of spawning a retry. */
|
|
153
|
+
private readonly cancelledSessions;
|
|
154
|
+
/** Wakers for in-flight backoff waits, keyed by session, so a cancel
|
|
155
|
+
* releases the held concurrency slot immediately instead of stalling
|
|
156
|
+
* the executor for the rest of the delay. */
|
|
157
|
+
private readonly backoffWakersBySession;
|
|
148
158
|
private readonly maxConcurrent;
|
|
149
159
|
private readonly spawnWorker;
|
|
150
160
|
private active;
|
|
@@ -177,6 +187,8 @@ export declare class WorkerExecutorService {
|
|
|
177
187
|
isRuntimeAvailable(): boolean;
|
|
178
188
|
/** Kill every in-flight worker for a session (cancel/teardown). */
|
|
179
189
|
cancelSession(sessionId: string): void;
|
|
190
|
+
/** Wait `ms`, waking early if the session is cancelled meanwhile. */
|
|
191
|
+
private backoff;
|
|
180
192
|
/**
|
|
181
193
|
* Run the given leased work items to terminal state. Fire-and-forget from
|
|
182
194
|
* the caller's perspective; failures surface as failed variants, never as
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkerExecutorService.d.ts","sourceRoot":"","sources":["../../src/agent-variants/WorkerExecutorService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"WorkerExecutorService.d.ts","sourceRoot":"","sources":["../../src/agent-variants/WorkerExecutorService.ts"],"names":[],"mappings":"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"}
|
|
@@ -122,8 +122,12 @@ const defaultSpawn = ({ command, args, cwd, env }) => (0, child_process_1.spawn)
|
|
|
122
122
|
// Own process group so a timeout/cancel kills the whole worker tree.
|
|
123
123
|
detached: process.platform !== 'win32',
|
|
124
124
|
});
|
|
125
|
-
|
|
125
|
+
// Successful worker runs reach ~10 minutes at p99 (fleet telemetry), so a
|
|
126
|
+
// 10-minute ceiling was killing the legitimate tail. Workers that hang do
|
|
127
|
+
// so indefinitely; a wider ceiling costs nothing when the run completes.
|
|
128
|
+
const DEFAULT_TIMEOUT_MS = 20 * 60 * 1000;
|
|
126
129
|
const DEFAULT_MAX_CONCURRENT = 3;
|
|
130
|
+
const DEFAULT_RATE_LIMIT_RETRY_DELAY_MS = 30_000;
|
|
127
131
|
const isExecutableImplementationItem = (item) => ('workspace' in item &&
|
|
128
132
|
(item.kind === 'static_preview' || item.kind === 'refine_variant') &&
|
|
129
133
|
item.workspace.kind === 'artifact_directory') ||
|
|
@@ -150,8 +154,16 @@ class WorkerExecutorService {
|
|
|
150
154
|
workerTierOverridden;
|
|
151
155
|
referenceCreateTierOverridden;
|
|
152
156
|
timeoutMs;
|
|
157
|
+
rateLimitRetryDelayMs;
|
|
153
158
|
runtimeAvailable;
|
|
154
159
|
childrenBySession = new Map();
|
|
160
|
+
/** Sessions cancelled mid-run, so backoff waits with no live child to
|
|
161
|
+
* kill still observe the cancel instead of spawning a retry. */
|
|
162
|
+
cancelledSessions = new Set();
|
|
163
|
+
/** Wakers for in-flight backoff waits, keyed by session, so a cancel
|
|
164
|
+
* releases the held concurrency slot immediately instead of stalling
|
|
165
|
+
* the executor for the rest of the delay. */
|
|
166
|
+
backoffWakersBySession = new Map();
|
|
155
167
|
maxConcurrent;
|
|
156
168
|
spawnWorker;
|
|
157
169
|
active = 0;
|
|
@@ -200,6 +212,10 @@ class WorkerExecutorService {
|
|
|
200
212
|
this.timeoutMs =
|
|
201
213
|
options.timeoutMs ??
|
|
202
214
|
Number(process.env.RIVET_EXECUTOR_TIMEOUT_MS ?? DEFAULT_TIMEOUT_MS);
|
|
215
|
+
this.rateLimitRetryDelayMs =
|
|
216
|
+
options.rateLimitRetryDelayMs ??
|
|
217
|
+
Number(process.env.RIVET_EXECUTOR_RATE_LIMIT_RETRY_DELAY_MS ??
|
|
218
|
+
DEFAULT_RATE_LIMIT_RETRY_DELAY_MS);
|
|
203
219
|
this.maxConcurrent = options.maxConcurrent ?? DEFAULT_MAX_CONCURRENT;
|
|
204
220
|
this.spawnWorker = options.spawnWorker ?? defaultSpawn;
|
|
205
221
|
this.defaultAdapter = (0, workerRuntime_1.makeClaudeAdapter)(this.workerCommand);
|
|
@@ -258,10 +274,31 @@ class WorkerExecutorService {
|
|
|
258
274
|
}
|
|
259
275
|
/** Kill every in-flight worker for a session (cancel/teardown). */
|
|
260
276
|
cancelSession(sessionId) {
|
|
277
|
+
this.cancelledSessions.add(sessionId);
|
|
261
278
|
for (const pid of this.childrenBySession.get(sessionId) ?? []) {
|
|
262
279
|
this.killTree(pid);
|
|
263
280
|
}
|
|
264
281
|
this.childrenBySession.delete(sessionId);
|
|
282
|
+
for (const wake of this.backoffWakersBySession.get(sessionId) ?? []) {
|
|
283
|
+
wake();
|
|
284
|
+
}
|
|
285
|
+
this.backoffWakersBySession.delete(sessionId);
|
|
286
|
+
}
|
|
287
|
+
/** Wait `ms`, waking early if the session is cancelled meanwhile. */
|
|
288
|
+
backoff(sessionId, ms) {
|
|
289
|
+
return new Promise((resolve) => {
|
|
290
|
+
const wakers = this.backoffWakersBySession.get(sessionId) ?? new Set();
|
|
291
|
+
this.backoffWakersBySession.set(sessionId, wakers);
|
|
292
|
+
const wake = () => {
|
|
293
|
+
clearTimeout(timer);
|
|
294
|
+
wakers.delete(wake);
|
|
295
|
+
if (wakers.size === 0)
|
|
296
|
+
this.backoffWakersBySession.delete(sessionId);
|
|
297
|
+
resolve();
|
|
298
|
+
};
|
|
299
|
+
wakers.add(wake);
|
|
300
|
+
const timer = setTimeout(wake, ms);
|
|
301
|
+
});
|
|
265
302
|
}
|
|
266
303
|
/**
|
|
267
304
|
* Run the given leased work items to terminal state. Fire-and-forget from
|
|
@@ -275,6 +312,8 @@ class WorkerExecutorService {
|
|
|
275
312
|
* config for every tier this run spawns; RIVET_EXECUTOR_MODEL env
|
|
276
313
|
* still outranks it. */
|
|
277
314
|
modelOverride) {
|
|
315
|
+
// New work for the session means it is live again.
|
|
316
|
+
this.cancelledSessions.delete(sessionId);
|
|
278
317
|
const adapter = runtime ?? this.defaultAdapter;
|
|
279
318
|
const claimed = new Set(workItemIds);
|
|
280
319
|
const claimedItems = this.orchestrator
|
|
@@ -436,6 +475,34 @@ class WorkerExecutorService {
|
|
|
436
475
|
let ranModel = tierModelLabel(tier);
|
|
437
476
|
try {
|
|
438
477
|
outcome = await this.spawnAndWait(sessionId, item, adapter, tier);
|
|
478
|
+
// Rate-limit rung (every vendor): a 429 or rate-limit grammar is
|
|
479
|
+
// transient — retry the SAME tier once after a backoff before any
|
|
480
|
+
// model downgrade, so a momentary limit does not cost the user the
|
|
481
|
+
// model they asked for. A mid-run limit after edits must fail
|
|
482
|
+
// honestly, and here pristine needs POSITIVE evidence — structured
|
|
483
|
+
// usage reporting zero output tokens. A missing result object proves
|
|
484
|
+
// nothing for vendors that omit usage on failed turns (codex), where
|
|
485
|
+
// edits may already exist in the workspace.
|
|
486
|
+
if (outcome.status === 'failed' &&
|
|
487
|
+
outcome.usage?.tokensOut === 0 &&
|
|
488
|
+
(outcome.apiErrorStatus === 429 ||
|
|
489
|
+
(outcome.message !== undefined &&
|
|
490
|
+
RATE_LIMIT_FAILURE.test(outcome.message)))) {
|
|
491
|
+
this.telemetry?.track('agent_variants.executor_worker_rate_limit_retry', {
|
|
492
|
+
source: 'mcp',
|
|
493
|
+
sessionId,
|
|
494
|
+
workItemId: item.workId,
|
|
495
|
+
vendor: adapter.vendor,
|
|
496
|
+
model: tierModelLabel(tier),
|
|
497
|
+
delayMs: this.rateLimitRetryDelayMs,
|
|
498
|
+
});
|
|
499
|
+
await this.backoff(sessionId, this.rateLimitRetryDelayMs);
|
|
500
|
+
// The backoff holds no live child for cancelSession to kill; observe
|
|
501
|
+
// a cancel that landed during the wait instead of spawning anyway.
|
|
502
|
+
if (!this.cancelledSessions.has(sessionId)) {
|
|
503
|
+
outcome = await this.spawnAndWait(sessionId, item, adapter, tier);
|
|
504
|
+
}
|
|
505
|
+
}
|
|
439
506
|
// Model-unavailable rung (claude only — the one vendor reporting
|
|
440
507
|
// structured api_error_status): an account without access to the
|
|
441
508
|
// default worker model (or a model-scoped rate limit) must degrade to
|
|
@@ -449,6 +516,9 @@ class WorkerExecutorService {
|
|
|
449
516
|
// vary/refine treat existing files as source and would corrupt.
|
|
450
517
|
const workspacePristine = (outcome.usage?.tokensOut ?? 0) === 0;
|
|
451
518
|
if (outcome.status === 'failed' &&
|
|
519
|
+
// A cancel that landed since the first spawn (killing it, or during
|
|
520
|
+
// the rate-limit backoff) must not buy the session another worker.
|
|
521
|
+
!this.cancelledSessions.has(sessionId) &&
|
|
452
522
|
adapter.supportsModelFallback &&
|
|
453
523
|
// A request-pinned model (`--worker-model`) never degrades silently:
|
|
454
524
|
// the user picked it, so a model failure fails the variant honestly
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkerExecutorService.js","sourceRoot":"","sources":["../../src/agent-variants/WorkerExecutorService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"WorkerExecutorService.js","sourceRoot":"","sources":["../../src/agent-variants/WorkerExecutorService.ts"],"names":[],"mappings":";;;AAAA,iDAAoD;AACpD,4CAA+C;AAC/C,yDAA4D;AAC5D,4DAKiC;AACjC,2CAIqB;AACrB,mDASyB;AAOzB,MAAM,GAAG,GAAG,IAAA,qBAAY,EAAC,gBAAgB,CAAC,CAAC;AAE3C,gFAAgF;AACnE,QAAA,oBAAoB,GAAG,gBAAgB,CAAC;AAkB9C,MAAM,sBAAsB,GAAG,KAAK,EACzC,QAA2C,EAC3C,IAIC,EAC2B,EAAE;IAC9B,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAClE,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IACrD,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACjC,OAAO;YACL,UAAU,EAAE,4BAAoB;YAChC,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,sEAAsE;YACtE,sEAAsE;YACtE,kEAAkE;YAClE,GAAG,CAAC,QAAQ,CAAC,aAAa;gBACxB,CAAC,CAAC,EAAE,aAAa,EAAE,QAAQ,CAAC,aAAa,EAAE;gBAC3C,CAAC,CAAC,EAAE,CAAC;YACP,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,GAAG;SAC3D,CAAC;IACJ,CAAC;IACD,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW;SACjC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;SACpD,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,OAAO;QACL,UAAU,EAAE,kBAAkB;QAC9B,OAAO,EAAE,YAAY,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,GAAG,CAAC,CAAC,CAAC,gCAAgC,EAAE;KACpF,CAAC;AACJ,CAAC,CAAC;AAhCW,QAAA,sBAAsB,0BAgCjC;AAEF;;;;;;;GAOG;AACI,MAAM,uBAAuB,GAAG,CACrC,MAAyB,OAAO,CAAC,GAAG,EAC3B,EAAE;IACX,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC7D,OAAO,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,KAAK,CAAC;AAC5D,CAAC,CAAC;AALW,QAAA,uBAAuB,2BAKlC;AA8BF,MAAM,kBAAkB,GAAG,kCAAkC,CAAC;AAC9D,6EAA6E;AAC7E,6EAA6E;AAC7E,uEAAuE;AACvE,qDAAqD;AACrD,MAAM,kBAAkB,GACtB,4aAA4a,CAAC;AAE/a;;;;;yDAKyD;AAClD,MAAM,0BAA0B,GAAG,CACxC,OAA2B,EAC3B,KAAc,EACL,EAAE;IACX,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IAClD,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IAClD,IACE,KAAK;QACL,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;QACvB,4EAA4E,CAAC,IAAI,CAC/E,OAAO,CACR,EACD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAjBW,QAAA,0BAA0B,8BAiBrC;AAEF;;sEAEsE;AAC/D,MAAM,kBAAkB,GAAG,CAChC,OAA2B,EAC3B,cAAuB,EACqB,EAAE;IAC9C,IAAI,cAAc,KAAK,GAAG;QAAE,OAAO,oBAAoB,CAAC;IACxD,IAAI,cAAc,KAAK,SAAS,IAAI,2BAA2B,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;QACpF,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IACD,OAAO,OAAO,IAAI,mCAAmC,CAAC,IAAI,CAAC,OAAO,CAAC;QACjE,CAAC,CAAC,oBAAoB;QACtB,CAAC,CAAC,mBAAmB,CAAC;AAC1B,CAAC,CAAC;AAXW,QAAA,kBAAkB,sBAW7B;AAEF;;iEAEiE;AACjE,MAAM,2BAA2B,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AAElE;4CAC4C;AAC5C,MAAM,cAAc,GAAG,CAAC,IAAwB,EAAU,EAAE,CAC1D,CAAC,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,UAAU,CAAC;AAE9D,MAAM,eAAe,GAAG,CAAC,IAAwB,EAAiB,EAAE;IAClE,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,MAAM,CAAC;IACjD,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC,eAAe,CAAC;IACzD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;4EAE4E;AAC5E,MAAM,sBAAsB,GAAG,CAC7B,OAA2B,EAC3B,cAAkC,EACzB,EAAE;IACX,IAAI,cAAc,KAAK,GAAG,IAAI,cAAc,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IAClE,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3B,OAAO,wHAAwH,CAAC,IAAI,CAClI,OAAO,CACR,CAAC;AACJ,CAAC,CAAC;AA4BF,MAAM,YAAY,GAAgB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,CAChE,IAAA,qBAAK,EAAC,OAAO,EAAE,IAAI,EAAE;IACnB,GAAG;IACH,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACvB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;IAC/B,qEAAqE;IACrE,QAAQ,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;CACvC,CAAC,CAAC;AA6BL,0EAA0E;AAC1E,0EAA0E;AAC1E,yEAAyE;AACzE,MAAM,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC1C,MAAM,sBAAsB,GAAG,CAAC,CAAC;AACjC,MAAM,iCAAiC,GAAG,MAAM,CAAC;AAEjD,MAAM,8BAA8B,GAAG,CACrC,IAAiC,EACkB,EAAE,CACrD,CAAC,WAAW,IAAI,IAAI;IAClB,CAAC,IAAI,CAAC,IAAI,KAAK,gBAAgB,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC;IAClE,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,oBAAoB,CAAC;IAC/C,CAAC,WAAW,IAAI,IAAI;QAClB,IAAI,CAAC,IAAI,KAAK,UAAU;QACxB,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC;AAE5C;;;;;;GAMG;AACH,MAAa,qBAAqB;IACf,YAAY,CAAuB;IACnC,SAAS,CAAsC;IAC/C,aAAa,CAAS;IACtB,WAAW,CAAS;IACpB,YAAY,CAAS;IACtC,4EAA4E;IAC3D,aAAa,CAAS;IACtB,oBAAoB,CAAS;IAC7B,qBAAqB,CAAS;IAC9B,oBAAoB,CAAU;IAC9B,6BAA6B,CAAU;IACvC,SAAS,CAAS;IAClB,qBAAqB,CAAS;IACvC,gBAAgB,CAAW;IAClB,iBAAiB,GAAG,IAAI,GAAG,EAAuB,CAAC;IACpE;qEACiE;IAChD,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IACvD;;kDAE8C;IAC7B,sBAAsB,GAAG,IAAI,GAAG,EAA2B,CAAC;IAC5D,aAAa,CAAS;IACtB,WAAW,CAAc;IAClC,MAAM,GAAG,CAAC,CAAC;IACF,OAAO,GAAsB,EAAE,CAAC;IACjD,wEAAwE;IACvD,QAAQ,CAAwB;IACjD;4EACwE;IACvD,cAAc,CAA0B;IACxC,wBAAwB,CAEjB;IAExB,YAAY,OAA8B;QACxC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,aAAa;YAChB,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,QAAQ,CAAC;QAC1E,mEAAmE;QACnE,kEAAkE;QAClE,IAAI,CAAC,oBAAoB,GAAG,OAAO,CACjC,OAAO,CAAC,WAAW;YACjB,OAAO,CAAC,YAAY;YACpB,OAAO,CAAC,GAAG,CAAC,oBAAoB;YAChC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CACpC,CAAC;QACF,IAAI,CAAC,6BAA6B,GAAG,OAAO,CAC1C,OAAO,CAAC,oBAAoB;YAC1B,OAAO,CAAC,qBAAqB;YAC7B,OAAO,CAAC,GAAG,CAAC,qCAAqC;YACjD,OAAO,CAAC,GAAG,CAAC,sCAAsC,CACrD,CAAC;QACF,IAAI,CAAC,WAAW;YACd,OAAO,CAAC,WAAW;gBACnB,OAAO,CAAC,GAAG,CAAC,oBAAoB;gBAChC,sCAAqB,CAAC,KAAK,CAAC;QAC9B,IAAI,CAAC,YAAY;YACf,OAAO,CAAC,YAAY;gBACpB,OAAO,CAAC,GAAG,CAAC,qBAAqB;gBACjC,sCAAqB,CAAC,MAAM,CAAC;QAC/B,IAAI,CAAC,oBAAoB;YACvB,OAAO,CAAC,oBAAoB;gBAC5B,OAAO,CAAC,GAAG,CAAC,qCAAqC;gBACjD,uDAAsC,CAAC,KAAK,CAAC;QAC/C,IAAI,CAAC,qBAAqB;YACxB,OAAO,CAAC,qBAAqB;gBAC7B,OAAO,CAAC,GAAG,CAAC,sCAAsC;gBAClD,uDAAsC,CAAC,MAAM,CAAC;QAChD,IAAI,CAAC,aAAa;YAChB,OAAO,CAAC,aAAa;gBACrB,OAAO,CAAC,GAAG,CAAC,6BAA6B;gBACzC,iBAAiB,CAAC;QACpB,IAAI,CAAC,SAAS;YACZ,OAAO,CAAC,SAAS;gBACjB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,kBAAkB,CAAC,CAAC;QACtE,IAAI,CAAC,qBAAqB;YACxB,OAAO,CAAC,qBAAqB;gBAC7B,MAAM,CACJ,OAAO,CAAC,GAAG,CAAC,wCAAwC;oBAClD,iCAAiC,CACpC,CAAC;QACJ,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,sBAAsB,CAAC;QACrE,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,YAAY,CAAC;QACvD,IAAI,CAAC,cAAc,GAAG,IAAA,iCAAiB,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC5D,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAAC,wBAAwB,CAAC;QACjE,MAAM,eAAe,GAAiC;YACpD,gBAAgB,EAAE,OAAO,CAAC,sBAAsB;YAChD,mBAAmB,EAAE,OAAO,CAAC,2BAA2B;YACxD,kBAAkB,EAAE,OAAO,CAAC,wBAAwB;YACpD,oEAAoE;YACpE,kEAAkE;YAClE,oEAAoE;YACpE,kBAAkB,EAAE;gBAClB,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa;gBACvC,0BAA0B,EAAE,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,EAAE,CACjE,2BAA2B,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,CAAC,CAAC;oBACrD,IAAA,kCAA0B,EAAC,OAAO,EAAE,KAAK,CAAC;aAC7C;YACD,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,GAAG,CAAC,OAAO,CAAC,kBAAkB,KAAK,SAAS;gBAC1C,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,kBAAkB,EAAE;gBAChD,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClE,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,qCAAqB,CAAC,eAAe,CAAC,CAAC;IAC7D,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,cAAc,CAAC,IAIpB;QACC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED;;;;;OAKG;IACH,kBAAkB;QAChB,IAAI,IAAI,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACxC,IAAI,CAAC;gBACH,IAAA,4BAAY,EAAC,IAAI,CAAC,aAAa,EAAE,CAAC,WAAW,CAAC,EAAE;oBAC9C,KAAK,EAAE,QAAQ;oBACf,OAAO,EAAE,MAAM;iBAChB,CAAC,CAAC;gBACH,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC/B,CAAC;YAAC,MAAM,CAAC;gBACP,GAAG,CAAC,IAAI,CACN,mBAAmB,IAAI,CAAC,aAAa,oDAAoD,CAC1F,CAAC;gBACF,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;YAChC,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,mEAAmE;IACnE,aAAa,CAAC,SAAiB;QAC7B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;YAC9D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;QACD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACzC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;YACpE,IAAI,EAAE,CAAC;QACT,CAAC;QACD,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;IAED,qEAAqE;IAC7D,OAAO,CAAC,SAAiB,EAAE,EAAU;QAC3C,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YACnC,MAAM,MAAM,GACV,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI,GAAG,EAAc,CAAC;YACtE,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACnD,MAAM,IAAI,GAAG,GAAS,EAAE;gBACtB,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACpB,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC;oBAAE,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBACrE,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC;YACF,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACjB,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAG,CACP,SAAiB,EACjB,WAAqB,EACrB,KAA0E,EAC1E,OAAiC;IACjC;;;6BAGyB;IACzB,aAAsB;QAEtB,mDAAmD;QACnD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC;QAC/C,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;QACrC,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY;aACnC,WAAW,CAAC,SAAS,CAAC;aACtB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAAC,8BAA8B,CAAC,CAAC;QACrE,qEAAqE;QACrE,qEAAqE;QACrE,mDAAmD;QACnD,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAClC,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,CAClE,CAAC;QACF,0EAA0E;QAC1E,yEAAyE;QACzE,uEAAuE;QACvE,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAC/B,CAAC,UAAU,EAAE,EAAE,CACb,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,CAC3D,CAAC;QACF,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACvB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,CACzE;YACD,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACvB,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE;gBAC3B,UAAU,EAAE,IAAI,CAAC,MAAM;gBACvB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,MAAM,EAAE,QAAQ;gBAChB,KAAK,EAAE;oBACL,IAAI,EAAE,2BAA2B;oBACjC,OAAO,EAAE,4BAA4B,IAAI,CAAC,IAAI,EAAE;iBACjD;aACF,CAAC,CACH;YACD,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;gBAC3B,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,GAAG,CAAC,KAAK,CACP,oBAAoB,UAAU,0HAA0H,CACzJ,CAAC;oBACF,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAC7B,CAAC;gBACD,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE;oBAClC,UAAU;oBACV,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,OAAO,EACL,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,UAAU,CAAC,EAAE,OAAO,IAAI,CAAC;oBAClE,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE;wBACL,IAAI,EAAE,sBAAsB;wBAC5B,OAAO,EACL,iEAAiE;qBACpE;iBACF,CAAC,CAAC;YACL,CAAC,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAED;;oDAEgD;IACxC,KAAK,CAAC,YAAY,CACxB,SAAiB,EACjB,IAA2C;QAE3C,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;QACxE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC7B,GAAG,CAAC,IAAI,CAAC,uCAAuC,IAAI,CAAC,UAAU,EAAE,EAAE,KAAK,CAAC,CAAC;gBAC1E,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,GAAG,CAAC,IAAI,CACN,wCAAwC,IAAI,CAAC,UAAU,sBAAsB,EAC7E,KAAK,CACN,CAAC;YACF,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC;oBAC5C,SAAS;oBACT,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE,EAAE,IAAI,EAAE,2BAA2B,EAAE,OAAO,EAAE;oBACrD,kEAAkE;oBAClE,mEAAmE;oBACnE,kCAAkC;oBAClC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACnD,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,WAAW,EAAE,CAAC;gBACrB,GAAG,CAAC,IAAI,CACN,iDAAiD,IAAI,CAAC,UAAU,EAAE,EAClE,WAAW,CACZ,CAAC;gBACF,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;4EAawE;IAChE,aAAa,CACnB,IAA+C,EAC/C,MAAoB;IACpB;;uEAEmE;IACnE,aAAsB;QAEtB,MAAM,eAAe,GAAG,OAAO,CAC7B,IAAI,CAAC,YAAY,EAAE,MAAM,IAAI,IAAI,CAAC,iBAAiB,CACpD,CAAC;QACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,eAAe,CAAC;QACpE,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YACxB,qEAAqE;YACrE,oEAAoE;YACpE,wCAAwC;YACxC,MAAM,QAAQ,GAAG,iBAAiB;gBAChC,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,IAAA,4BAAgB,EAAC,IAAI,CAAC,QAAQ,CAAC;oBAC/B,CAAC,CAAC,IAAI,CAAC,QAAQ;oBACf,CAAC,CAAC,wCAAuB,CAAC;YAC9B,MAAM,IAAI,GAAG,uCAAuB,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;YACvD,MAAM,KAAK,GACT,OAAO,CAAC,GAAG,CAAC,oBAAoB;gBAChC,aAAa;gBACb,IAAI,CAAC,wBAAwB,EAAE,CAAC,MAAM,CAAC,CAAC;YAC1C,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3C,CAAC;QACD,MAAM,UAAU,GACd,aAAa,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC7D,wEAAwE;QACxE,uEAAuE;QACvE,oEAAoE;QACpE,sEAAsE;QACtE,qEAAqE;QACrE,4BAA4B;QAC5B,MAAM,SAAS,GAAG,CAAC,WAAmB,EAAE,cAAuB,EAAU,EAAE,CACzE,aAAa;YACb,CAAC,cAAc,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,UAAU,GAAG,iBAAiB;YAClC,CAAC,CAAC,IAAI,CAAC,6BAA6B;YACpC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC;QAC9B,IAAI,CAAC,UAAU,IAAI,IAAA,4BAAgB,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,GAAG,uCAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC3D,OAAO,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5D,CAAC;QACD,IAAI,iBAAiB,EAAE,CAAC;YACtB,OAAO;gBACL,MAAM,EAAE,QAAQ;gBAChB,KAAK,EAAE,SAAS,CACd,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,6BAA6B,CACnC;gBACD,MAAM,EAAE,IAAI,CAAC,qBAA0C;aACxD,CAAC;QACJ,CAAC;QACD,OAAO;YACL,MAAM,EAAE,QAAQ;YAChB,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,oBAAoB,CAAC;YAC7D,MAAM,EAAE,IAAI,CAAC,YAAiC;SAC/C,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,MAAM,CAClB,SAAiB,EACjB,IAA+C,EAC/C,KAA2B,EAC3B,OAAgC,EAChC,aAAsB;QAEtB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QACrE,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,wCAAwC,EAAE;YAC9D,MAAM,EAAE,KAAK;YACb,SAAS;YACT,UAAU,EAAE,IAAI,CAAC,MAAM;YACvB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC;YAC3B,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC;YAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,IAAI;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;QACH,IAAI,OAKH,CAAC;QACF,IAAI,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAClE,iEAAiE;YACjE,kEAAkE;YAClE,mEAAmE;YACnE,8DAA8D;YAC9D,mEAAmE;YACnE,qEAAqE;YACrE,qEAAqE;YACrE,4CAA4C;YAC5C,IACE,OAAO,CAAC,MAAM,KAAK,QAAQ;gBAC3B,OAAO,CAAC,KAAK,EAAE,SAAS,KAAK,CAAC;gBAC9B,CAAC,OAAO,CAAC,cAAc,KAAK,GAAG;oBAC7B,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS;wBAC5B,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAC9C,CAAC;gBACD,IAAI,CAAC,SAAS,EAAE,KAAK,CACnB,iDAAiD,EACjD;oBACE,MAAM,EAAE,KAAK;oBACb,SAAS;oBACT,UAAU,EAAE,IAAI,CAAC,MAAM;oBACvB,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC;oBAC3B,OAAO,EAAE,IAAI,CAAC,qBAAqB;iBACpC,CACF,CAAC;gBACF,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBAC1D,qEAAqE;gBACrE,mEAAmE;gBACnE,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC3C,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;gBACpE,CAAC;YACH,CAAC;YACD,iEAAiE;YACjE,iEAAiE;YACjE,sEAAsE;YACtE,kEAAkE;YAClE,mEAAmE;YACnE,iEAAiE;YACjE,qEAAqE;YACrE,iEAAiE;YACjE,oEAAoE;YACpE,kEAAkE;YAClE,gEAAgE;YAChE,MAAM,iBAAiB,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC;YAChE,IACE,OAAO,CAAC,MAAM,KAAK,QAAQ;gBAC3B,oEAAoE;gBACpE,mEAAmE;gBACnE,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC;gBACtC,OAAO,CAAC,qBAAqB;gBAC7B,qEAAqE;gBACrE,oEAAoE;gBACpE,gEAAgE;gBAChE,aAAa,KAAK,SAAS;gBAC3B,IAAI,CAAC,MAAM,KAAK,QAAQ;gBACxB,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,aAAa;gBACjC,iBAAiB;gBACjB,CAAC,2BAA2B,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,IAAI,CAAC,CAAC,CAAC;oBAC5D,IAAA,kCAA0B,EAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAC1D,CAAC;gBACD,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,+CAA+C,EAAE;oBACrE,MAAM,EAAE,KAAK;oBACb,SAAS;oBACT,UAAU,EAAE,IAAI,CAAC,MAAM;oBACvB,SAAS,EAAE,IAAI,CAAC,KAAK;oBACrB,OAAO,EAAE,IAAI,CAAC,aAAa;oBAC3B,MAAM,EAAE,IAAA,0BAAkB,EAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC;iBACpE,CAAC,CAAC;gBACH,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC;gBAC9B,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE;oBAC1D,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE,IAAI,CAAC,aAAa;oBACzB,MAAM,EAAE,IAAI,CAAC,MAAM;iBACpB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,GAAG;gBACR,MAAM,EAAE,QAAQ;gBAChB,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAChE,CAAC;QACJ,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,uCAAuC,EAAE;YAC7D,MAAM,EAAE,KAAK;YACb,SAAS;YACT,UAAU,EAAE,IAAI,CAAC,MAAM;YACvB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;YAClC,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,QAAQ,EAAE,OAAO,CAAC,KAAK,EAAE,QAAQ,IAAI,IAAI;YACzC,SAAS,EAAE,OAAO,CAAC,KAAK,EAAE,SAAS,IAAI,IAAI;YAC3C,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,IAAI,IAAI;SACxC,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAChC,iEAAiE;YACjE,oEAAoE;YACpE,gDAAgD;YAChD,GAAG,CAAC,KAAK,CACP,2BAA2B,IAAI,CAAC,MAAM,aAAa,IAAI,CAAC,OAAO,IAAI;gBACjE,UAAU,OAAO,CAAC,MAAM,WAAW,QAAQ,EAAE;gBAC7C,CAAC,OAAO,CAAC,cAAc,KAAK,SAAS;oBACnC,CAAC,CAAC,eAAe,OAAO,CAAC,cAAc,EAAE;oBACzC,CAAC,CAAC,EAAE,CAAC;gBACP,MAAM,OAAO,CAAC,OAAO,IAAI,4BAA4B,EAAE,CAC1D,CAAC;YACF,kEAAkE;YAClE,qEAAqE;YACrE,6DAA6D;YAC7D,IAAI,sBAAsB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;gBACpE,IAAI,CAAC,QAAQ,CAAC,aAAa,CACzB,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,OAAO,IAAI,eAAe,CACnC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE;YAChD,UAAU,EAAE,IAAI,CAAC,MAAM;YACvB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,KAAK,SAAS;gBACvC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE;gBACtC,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,KAAK,SAAS;gBACxC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE;gBACxC,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,KAAK,SAAS;gBACtC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE;gBACpC,CAAC,CAAC,EAAE,CAAC;YACP,KAAK,EAAE,QAAQ;YACf,sEAAsE;YACtE,mDAAmD;YACnD,OAAO,EAAE;gBACP,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,KAAK,EAAE,QAAQ;gBACf,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,IAAI,CAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACrE;YACD,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,WAAW;gBAClC,IAAI,CAAC,IAAI,KAAK,UAAU;gBACxB,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,cAAc;gBACpC,CAAC,CAAC;oBACE,MAAM,EAAE;wBACN,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ;wBACrC,YAAY,EAAE,EAAE;qBACjB;iBACF;gBACH,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,QAAQ;gBAC7B,CAAC,CAAC;oBACE,KAAK,EAAE;wBACL,IAAI,EAAE,wBAAwB;wBAC9B,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,eAAe;wBAC3C,GAAG,CAAC,OAAO,CAAC,cAAc,KAAK,SAAS;4BACtC,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE;4BAC5C,CAAC,CAAC,EAAE,CAAC;qBACR;iBACF;gBACH,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,uBAAuB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACrD,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC;oBACjD,SAAS;oBACT,WAAW,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;oBAC1B,UAAU,EAAE,4BAAoB;iBACjC,CAAC,CAAC;gBACH,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY;qBAC9B,WAAW,CAAC,SAAS,CAAC;qBACtB,MAAM,CAAC,8BAA8B,CAAC;qBACtC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC;gBACzD,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,IAAI,CAAC,MAAM,CACf,SAAS,EACT,OAAO,EACP,EAAE,OAAO,EAAE,IAAI,EAAE,EACjB,OAAO,EACP,aAAa,CACd,CAAC;oBACF,OAAO;gBACT,CAAC;gBACD,gEAAgE;gBAChE,8DAA8D;gBAC9D,MAAM,cAAc,GAClB,YAAY,CAAC,eAAe,CAAC,IAAI,CAC/B,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,MAAM,CACtC,EAAE,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;gBACjC,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE;oBACjC,UAAU,EAAE,IAAI,CAAC,MAAM;oBACvB,OAAO,EAAE,YAAY,CAAC,OAAO;oBAC7B,OAAO,EAAE,cAAc;oBACvB,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE;wBACL,IAAI,EAAE,uBAAuB;wBAC7B,OAAO,EAAE,mDAAmD;qBAC7D;iBACF,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,GAAG,CAAC,IAAI,CAAC,qCAAqC,IAAI,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC;gBACpE,iEAAiE;gBACjE,kEAAkE;gBAClE,kEAAkE;gBAClE,6BAA6B;gBAC7B,IAAI,CAAC;oBACH,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC;wBACjD,SAAS;wBACT,WAAW,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;wBAC1B,UAAU,EAAE,4BAAoB;qBACjC,CAAC,CAAC;oBACH,MAAM,cAAc,GAClB,YAAY,CAAC,eAAe,CAAC,IAAI,CAC/B,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,MAAM,CACtC,EAAE,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;oBACjC,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE;wBACjC,UAAU,EAAE,IAAI,CAAC,MAAM;wBACvB,OAAO,EAAE,YAAY,CAAC,OAAO;wBAC7B,OAAO,EAAE,cAAc;wBACvB,MAAM,EAAE,QAAQ;wBAChB,KAAK,EAAE;4BACL,IAAI,EAAE,uBAAuB;4BAC7B,OAAO,EAAE,2DAA2D;yBACrE;qBACF,CAAC,CAAC;gBACL,CAAC;gBAAC,OAAO,YAAY,EAAE,CAAC;oBACtB,GAAG,CAAC,KAAK,CACP,6CAA6C,IAAI,CAAC,MAAM,4CAA4C,EACpG,YAAY,CACb,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEO,YAAY,CAClB,SAAiB,EACjB,IAA+C,EAC/C,OAAgC,EAChC,IAAwB;QAOxB,MAAM,MAAM,GAAG,IAAA,yCAAsB,EAAC,IAAI,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;QACxE,yEAAyE;QACzE,uEAAuE;QACvE,6CAA6C;QAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM;YAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC;YAC7B,OAAO,EAAE,OAAO,CAAC,MAAM;YACvB,IAAI;YACJ,GAAG,EACD,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,cAAc;gBACpC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW;gBAC5B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ;YAC7B,MAAM;YACN,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE;SACxB,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;YACd,MAAM,QAAQ,GACZ,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI,GAAG,EAAU,CAAC;YAC7D,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAChD,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAI,CAAC,CAAC,CAAC;QACvD,CAAC;QACD,IAAI,OAAO,CAAC,cAAc,KAAK,OAAO,EAAE,CAAC;YACvC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC;QACD,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC;QACnB,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACzC,UAAU,GAAG,CAAC,UAAU,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QACH,qEAAqE;QACrE,uEAAuE;QACvE,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACzC,UAAU,GAAG,CAAC,UAAU,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACzB,OAAO,CAAC;oBACN,MAAM,EAAE,QAAQ;oBAChB,OAAO,EAAE,0BAA0B,IAAI,CAAC,SAAS,IAAI;iBACtD,CAAC,CAAC;YACL,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACnB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC1B,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBACzB,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,GACzC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;gBAClC,OAAO,CACL,IAAI,KAAK,CAAC;oBACR,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;oBACtD,CAAC,CAAC;wBACE,MAAM,EAAE,QAAQ;wBAChB,OAAO,EAAE,iBAAiB,IAAI,KAAK,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GACvD,UAAU,CAAC,CAAC,CAAC,cAAc,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EACxD,EAAE;wBACF,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBAC3B,GAAG,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAC5D,CACN,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,QAAQ,CAAC,GAAuB;QACtC,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,IAAI,CAAC;YACH,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACjC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;gBAC7B,OAAO;YACT,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAChC,CAAC;QAAC,MAAM,CAAC;YACP,wEAAwE;YACxE,IAAI,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAC/B,CAAC;YAAC,MAAM,CAAC;gBACP,gBAAgB;YAClB,CAAC;QACH,CAAC;IACH,CAAC;IAEO,OAAO;QACb,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YACrC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC;YACjB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;QACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC7B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC;YACjB,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,OAAO;QACb,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC;QACjB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAClC,IAAI,IAAI;YAAE,IAAI,EAAE,CAAC;IACnB,CAAC;CACF;AArvBD,sDAqvBC"}
|
|
@@ -42,6 +42,11 @@ export declare const workStateOf: (status: StatusPayload, workId: string) => Wor
|
|
|
42
42
|
* still live (not a failure: re-issue `rivet wait` or check `rivet status`).
|
|
43
43
|
* The timeout envelope reports the honest state: `running` for leased or
|
|
44
44
|
* active work, `pending` for work merely staged in the queue.
|
|
45
|
+
*
|
|
46
|
+
* An id the server has never observed gets a grace window of polling before
|
|
47
|
+
* failing — a just-acknowledged request can lag the status surface. An id
|
|
48
|
+
* that disappears after being observed live has, by the settle contract
|
|
49
|
+
* above, stopped being queued, leased, or running: that settles.
|
|
45
50
|
*/
|
|
46
51
|
export declare const handleWait: (args: string[]) => Promise<CliCommandResult>;
|
|
47
52
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wait.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/wait.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AA0B3E,KAAK,aAAa,GAAG;IACnB,KAAK,CAAC,EAAE;QACN,MAAM,CAAC,EAAE,KAAK,CAAC;YAAE,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QACvC,MAAM,CAAC,EAAE,KAAK,CAAC;YAAE,SAAS,CAAC,EAAE,MAAM,CAAC;YAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC,CAAC;KACrE,CAAC;IACF,SAAS,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,QAAQ,CAAC,EAAE,KAAK,CAAC;YACf,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,UAAU,CAAC,EAAE;gBAAE,MAAM,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC;SAClC,CAAC,CAAC;KACJ,CAAC;CACH,CAAC;AAEF;;;;GAIG;AACH,KAAK,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;AAI/D;;;GAGG;AACH,eAAO,MAAM,WAAW,GACtB,QAAQ,aAAa,EACrB,QAAQ,MAAM,KACb,SAoCF,CAAC;AAiBF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,UAAU,GAAU,MAAM,MAAM,EAAE,KAAG,OAAO,CAAC,gBAAgB,CA6FzE,CAAC"}
|
|
@@ -6,8 +6,14 @@ const flags_1 = require("../flags");
|
|
|
6
6
|
const client_1 = require("../client");
|
|
7
7
|
const shared_1 = require("./shared");
|
|
8
8
|
const COMMAND = 'wait';
|
|
9
|
-
|
|
9
|
+
// Variant generation routinely outlives short waits (worker runs alone reach
|
|
10
|
+
// minutes at p90); the default must cover a full round so agents are not
|
|
11
|
+
// pushed into timeout-and-reissue loops.
|
|
12
|
+
const DEFAULT_WAIT_TIMEOUT_SECONDS = 600;
|
|
10
13
|
const WAIT_POLL_INTERVAL_MS = 500;
|
|
14
|
+
// A freshly acknowledged work id can lag the status surface; poll through
|
|
15
|
+
// this window before declaring the id unknown.
|
|
16
|
+
const UNKNOWN_WORK_GRACE_MS = 10_000;
|
|
11
17
|
const WAIT_FLAG_SPEC = {
|
|
12
18
|
timeout: { takesValue: true },
|
|
13
19
|
};
|
|
@@ -56,6 +62,11 @@ const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
|
56
62
|
* still live (not a failure: re-issue `rivet wait` or check `rivet status`).
|
|
57
63
|
* The timeout envelope reports the honest state: `running` for leased or
|
|
58
64
|
* active work, `pending` for work merely staged in the queue.
|
|
65
|
+
*
|
|
66
|
+
* An id the server has never observed gets a grace window of polling before
|
|
67
|
+
* failing — a just-acknowledged request can lag the status surface. An id
|
|
68
|
+
* that disappears after being observed live has, by the settle contract
|
|
69
|
+
* above, stopped being queued, leased, or running: that settles.
|
|
59
70
|
*/
|
|
60
71
|
const handleWait = async (args) => {
|
|
61
72
|
const context = (0, shared_1.parseCommandContext)(COMMAND, args, WAIT_FLAG_SPEC);
|
|
@@ -75,7 +86,9 @@ const handleWait = async (args) => {
|
|
|
75
86
|
return attached;
|
|
76
87
|
}
|
|
77
88
|
const deadline = Date.now() + timeoutSeconds * 1000;
|
|
89
|
+
const unknownGraceDeadline = Date.now() + UNKNOWN_WORK_GRACE_MS;
|
|
78
90
|
let wasObservedRunning = false;
|
|
91
|
+
let wasObservedLive = false;
|
|
79
92
|
for (;;) {
|
|
80
93
|
let status;
|
|
81
94
|
try {
|
|
@@ -97,14 +110,29 @@ const handleWait = async (args) => {
|
|
|
97
110
|
});
|
|
98
111
|
}
|
|
99
112
|
if (workState === 'unknown') {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
113
|
+
if (wasObservedLive) {
|
|
114
|
+
// No longer queued, leased, or running after being observed live —
|
|
115
|
+
// the server settled the work and pruned it from status.
|
|
116
|
+
return (0, envelope_1.okResult)(COMMAND, {
|
|
117
|
+
workId,
|
|
118
|
+
state: 'settled',
|
|
119
|
+
wasObservedRunning,
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
if (Date.now() >= unknownGraceDeadline ||
|
|
123
|
+
Date.now() >= deadline) {
|
|
124
|
+
return (0, envelope_1.errorResult)(COMMAND, 'OPERATION_FAILED', unknownWorkMessage(workId), {
|
|
125
|
+
workId,
|
|
126
|
+
state: 'unknown',
|
|
127
|
+
});
|
|
128
|
+
}
|
|
104
129
|
}
|
|
105
130
|
if (workState === 'running') {
|
|
106
131
|
wasObservedRunning = true;
|
|
107
132
|
}
|
|
133
|
+
if (workState === 'running' || workState === 'pending') {
|
|
134
|
+
wasObservedLive = true;
|
|
135
|
+
}
|
|
108
136
|
if (Date.now() >= deadline) {
|
|
109
137
|
return (0, envelope_1.errorResult)(COMMAND, 'WAIT_TIMEOUT', waitTimeoutMessage(workId, workState, timeoutSeconds), { workId, state: workState });
|
|
110
138
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../src/cli/commands/wait.ts"],"names":[],"mappings":";;;AAAA,0CAA2E;AAC3E,oCAAuC;AACvC,sCAA0C;AAC1C,qCAOkB;AAElB,MAAM,OAAO,GAAG,MAAM,CAAC;AACvB,MAAM,4BAA4B,GAAG,GAAG,CAAC;AACzC,MAAM,qBAAqB,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../../src/cli/commands/wait.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/router.d.ts
CHANGED
|
@@ -9,6 +9,12 @@ import { type CliIO } from './io';
|
|
|
9
9
|
*/
|
|
10
10
|
export { isCliControlCommand } from './commandNames';
|
|
11
11
|
export declare const splitMcpServeArgs: (rest: string[]) => string[] | null;
|
|
12
|
+
/**
|
|
13
|
+
* Serve args for a stale bare `rivet mcp` registration: drop the removed
|
|
14
|
+
* command's `--editor` attribution (not a serve flag) and carry it forward
|
|
15
|
+
* as the serve handoff's `--caller-agent`.
|
|
16
|
+
*/
|
|
17
|
+
export declare const mcpServeArgsFromStaleRegistration: (rest: string[]) => string[];
|
|
12
18
|
/**
|
|
13
19
|
* Route one control-plane subcommand to its handler. Exported for the MCP
|
|
14
20
|
* server (`rivet mcp serve`), which calls it in-process per tool call —
|
package/dist/cli/router.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/cli/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAC;AACpB,OAAO,EAA4B,KAAK,KAAK,EAAE,MAAM,MAAM,CAAC;AAO5D;;;;;;GAMG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AA6CrD,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,EAAE,KAAG,MAAM,EAAE,GAAG,IAM7D,CAAC;
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/cli/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAC;AACpB,OAAO,EAA4B,KAAK,KAAK,EAAE,MAAM,MAAM,CAAC;AAO5D;;;;;;GAMG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AA6CrD,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,EAAE,KAAG,MAAM,EAAE,GAAG,IAM7D,CAAC;AAkBF;;;;GAIG;AACH,eAAO,MAAM,iCAAiC,GAC5C,MAAM,MAAM,EAAE,KACb,MAAM,EAuBR,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,QAAQ,GACnB,SAAS,MAAM,EACf,MAAM,MAAM,EAAE,EACd,IAAI,KAAK,KACR,OAAO,CAAC,gBAAgB,CAqG1B,CAAC;AAyBF;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAC/B,MAAM,MAAM,EAAE,EACd,KAAI,KAAoB,KACvB,OAAO,CAAC,MAAM,CA2DhB,CAAC"}
|
package/dist/cli/router.js
CHANGED
|
@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.runCliControlCommand = exports.dispatch = exports.splitMcpServeArgs = exports.isCliControlCommand = void 0;
|
|
36
|
+
exports.runCliControlCommand = exports.dispatch = exports.mcpServeArgsFromStaleRegistration = exports.splitMcpServeArgs = exports.isCliControlCommand = void 0;
|
|
37
37
|
const envelope_1 = require("./envelope");
|
|
38
38
|
const io_1 = require("./io");
|
|
39
39
|
const handoff_1 = require("./handoff");
|
|
@@ -102,6 +102,44 @@ const flagValue = (args, flag) => {
|
|
|
102
102
|
const prefix = `${flag}=`;
|
|
103
103
|
return args.find((arg) => arg.startsWith(prefix))?.slice(prefix.length);
|
|
104
104
|
};
|
|
105
|
+
/** Editor ids stale registrations pass via `--editor`, mapped to the serve
|
|
106
|
+
* handoff's caller-agent grammar. Unrecognized ids carry no attribution. */
|
|
107
|
+
const CALLER_AGENT_BY_EDITOR = {
|
|
108
|
+
cursor: 'cursor',
|
|
109
|
+
claude: 'claude',
|
|
110
|
+
'claude-desktop': 'claude',
|
|
111
|
+
codex: 'codex',
|
|
112
|
+
};
|
|
113
|
+
/**
|
|
114
|
+
* Serve args for a stale bare `rivet mcp` registration: drop the removed
|
|
115
|
+
* command's `--editor` attribution (not a serve flag) and carry it forward
|
|
116
|
+
* as the serve handoff's `--caller-agent`.
|
|
117
|
+
*/
|
|
118
|
+
const mcpServeArgsFromStaleRegistration = (rest) => {
|
|
119
|
+
const args = [];
|
|
120
|
+
let editor;
|
|
121
|
+
for (let index = 0; index < rest.length; index += 1) {
|
|
122
|
+
const arg = rest[index];
|
|
123
|
+
if (arg === '--editor') {
|
|
124
|
+
editor = rest[index + 1];
|
|
125
|
+
index += 1;
|
|
126
|
+
continue;
|
|
127
|
+
}
|
|
128
|
+
if (arg.startsWith('--editor=')) {
|
|
129
|
+
editor = arg.slice('--editor='.length);
|
|
130
|
+
continue;
|
|
131
|
+
}
|
|
132
|
+
args.push(arg);
|
|
133
|
+
}
|
|
134
|
+
const callerAgent = editor
|
|
135
|
+
? CALLER_AGENT_BY_EDITOR[editor.trim().toLowerCase()]
|
|
136
|
+
: undefined;
|
|
137
|
+
if (callerAgent && !args.includes('--caller-agent')) {
|
|
138
|
+
args.push('--caller-agent', callerAgent);
|
|
139
|
+
}
|
|
140
|
+
return args;
|
|
141
|
+
};
|
|
142
|
+
exports.mcpServeArgsFromStaleRegistration = mcpServeArgsFromStaleRegistration;
|
|
105
143
|
/**
|
|
106
144
|
* Route one control-plane subcommand to its handler. Exported for the MCP
|
|
107
145
|
* server (`rivet mcp serve`), which calls it in-process per tool call —
|
|
@@ -118,8 +156,17 @@ const dispatch = async (command, rest, io) => {
|
|
|
118
156
|
// commands (or the resident `rivet mcp serve` adapter over them). A
|
|
119
157
|
// stale host registration can still spawn bare `rivet mcp`. Use its editor
|
|
120
158
|
// attribution to remove only registrations that positively match the
|
|
121
|
-
// deleted command
|
|
122
|
-
//
|
|
159
|
+
// deleted command — then keep the spawning host working: MCP hosts
|
|
160
|
+
// respawn from in-memory config until the editor restarts, so a
|
|
161
|
+
// tombstone error here loops. A host-spawned process (stdin is a pipe,
|
|
162
|
+
// never a TTY) gets the resident MCP server; a human at a terminal gets
|
|
163
|
+
// the removal envelope and guidance.
|
|
164
|
+
//
|
|
165
|
+
// Host-CLI registration cleanup shells out to `claude`/`codex`, which
|
|
166
|
+
// the host's minimal spawn PATH usually cannot resolve — enrich from the
|
|
167
|
+
// login shell first (handleMcpServe does the same for its children).
|
|
168
|
+
const { ensureLoginShellPath } = await Promise.resolve().then(() => __importStar(require('../utils/loginShellPath')));
|
|
169
|
+
ensureLoginShellPath();
|
|
123
170
|
const { cleanupRemovedMcpRegistrations } = await Promise.resolve().then(() => __importStar(require('../install/legacyMcp')));
|
|
124
171
|
const cleanup = cleanupRemovedMcpRegistrations({
|
|
125
172
|
editor: flagValue(rest, '--editor'),
|
|
@@ -129,6 +176,10 @@ const dispatch = async (command, rest, io) => {
|
|
|
129
176
|
: 'Run `npx -y rivet-design@latest install` to update your agent setup (this also removes stale MCP registrations).';
|
|
130
177
|
io.writeProgress('The Rivet MCP server has been removed. Agents drive Rivet with `rivet` CLI commands now.\n' +
|
|
131
178
|
cleanupGuidance);
|
|
179
|
+
if (!process.stdin.isTTY) {
|
|
180
|
+
const { handleMcpServe } = await Promise.resolve().then(() => __importStar(require('./commands/mcpServe')));
|
|
181
|
+
return handleMcpServe((0, exports.mcpServeArgsFromStaleRegistration)(rest), io);
|
|
182
|
+
}
|
|
132
183
|
return (0, envelope_1.errorResult)('mcp', 'MCP_REMOVED', `The Rivet MCP server has been removed. ${cleanupGuidance} Then drive Rivet with \`rivet\` CLI commands (\`rivet open\`, \`rivet variants start\`, …).`, {
|
|
133
184
|
registrationCleanup: {
|
|
134
185
|
changed: cleanup.changed,
|
package/dist/cli/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/cli/router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAIoB;AACpB,6BAA4D;AAC5D,uCAAyC;AACzC,2CAGqB;AAErB;;;;;;GAMG;AAEH,+CAAqD;AAA5C,mHAAA,mBAAmB,OAAA;AAE5B,wEAAwE;AACxE,MAAM,aAAa,GAA6B;IAC9C,IAAI,EAAE;QACJ,wJAAwJ;QACxJ,kQAAkQ;KACnQ;IACD,IAAI,EAAE,CAAC,+BAA+B,EAAE,kCAAkC,CAAC;IAC3E,MAAM,EAAE;QACN,2CAA2C;QAC3C,+DAA+D;KAChE;IACD,IAAI,EAAE;QACJ,8DAA8D;QAC9D,oDAAoD;KACrD;IACD,QAAQ,EAAE;QACR,yEAAyE;QACzE,uRAAuR;KACxR;IACD,QAAQ,EAAE;QACR,0EAA0E;QAC1E,6CAA6C;KAC9C;IACD,SAAS,EAAE;QACT,6BAA6B;QAC7B,2EAA2E;KAC5E;IACD,IAAI,EAAE,CAAC,mBAAmB,EAAE,4CAA4C,CAAC;IACzE,GAAG,EAAE;QACH,oCAAoC;QACpC,oJAAoJ;KACrJ;CACF,CAAC;AAEF;;;;;GAKG;AACH,MAAM,aAAa,GACjB,sLAAsL,CAAC;AAElL,MAAM,iBAAiB,GAAG,CAAC,IAAc,EAAmB,EAAE;IACnE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC;AACvE,CAAC,CAAC;AANW,QAAA,iBAAiB,qBAM5B;AAEF,MAAM,SAAS,GAAG,CAAC,IAAc,EAAE,IAAY,EAAsB,EAAE;IACrE,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,KAAK,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC;IAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEF;;;;GAIG;AACI,MAAM,QAAQ,GAAG,KAAK,EAC3B,OAAe,EACf,IAAc,EACd,EAAS,EACkB,EAAE;IAC7B,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;QACtB,MAAM,SAAS,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,EAAE,cAAc,EAAE,GAAG,wDAAa,qBAAqB,GAAC,CAAC;YAC/D,OAAO,cAAc,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;QACD,uEAAuE;QACvE,oEAAoE;QACpE,2EAA2E;QAC3E,qEAAqE;QACrE,
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/cli/router.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -291,7 +291,7 @@ const main = async (args = process.argv.slice(2)) => {
|
|
|
291
291
|
return;
|
|
292
292
|
}
|
|
293
293
|
if (command === 'uninstall') {
|
|
294
|
-
await handleUninstall(args
|
|
294
|
+
await handleUninstall(args.slice(1));
|
|
295
295
|
return;
|
|
296
296
|
}
|
|
297
297
|
// Control-plane subcommands (CLI-first surface): one JSON envelope on
|
|
@@ -730,7 +730,7 @@ COMMANDS:
|
|
|
730
730
|
includes the resident MCP server (rivet mcp serve) per host
|
|
731
731
|
rivet install cursor Set up Rivet for a specific agent only
|
|
732
732
|
rivet install --no-mcp Skip registering the resident MCP server
|
|
733
|
-
rivet uninstall <name
|
|
733
|
+
rivet uninstall <name…> Remove Rivet from one or more agents (claude|claude-desktop|cursor|codex)
|
|
734
734
|
rivet uninstall all Remove Rivet from all editors
|
|
735
735
|
rivet update Refresh Rivet's agent guidance and allowlists for installed editors
|
|
736
736
|
rivet signin Alias of "rivet login"
|
|
@@ -891,8 +891,8 @@ const handleInstall = async (installArgs) => {
|
|
|
891
891
|
process.exit(exitCode);
|
|
892
892
|
await promptPostInstall();
|
|
893
893
|
};
|
|
894
|
-
const handleUninstall = async (
|
|
895
|
-
const { exitCode } = (0, harnesses_1.uninstallHarnesses)(
|
|
894
|
+
const handleUninstall = async (editors) => {
|
|
895
|
+
const { exitCode } = (0, harnesses_1.uninstallHarnesses)(editors);
|
|
896
896
|
if (exitCode !== 0)
|
|
897
897
|
process.exit(exitCode);
|
|
898
898
|
};
|