@cat-factory/server 0.266.0 → 0.268.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agents/ContainerAgentExecutor.d.ts +0 -13
- package/dist/agents/ContainerAgentExecutor.d.ts.map +1 -1
- package/dist/agents/ContainerAgentExecutor.js +11 -40
- package/dist/agents/ContainerAgentExecutor.js.map +1 -1
- package/dist/agents/ModelRouter.d.ts +18 -0
- package/dist/agents/ModelRouter.d.ts.map +1 -1
- package/dist/agents/ModelRouter.js +25 -1
- package/dist/agents/ModelRouter.js.map +1 -1
- package/dist/agents/containerAgentBody.d.ts +29 -6
- package/dist/agents/containerAgentBody.d.ts.map +1 -1
- package/dist/agents/containerAgentBody.js +147 -48
- package/dist/agents/containerAgentBody.js.map +1 -1
- package/dist/agents/containerAgentResult.js +3 -3
- package/dist/agents/containerAgentResult.js.map +1 -1
- package/dist/agents/contextFiles.d.ts +10 -0
- package/dist/agents/contextFiles.d.ts.map +1 -1
- package/dist/agents/contextFiles.js +15 -0
- package/dist/agents/contextFiles.js.map +1 -1
- package/dist/agents/harnessContract.d.ts +2 -0
- package/dist/agents/harnessContract.d.ts.map +1 -1
- package/dist/agents/harnessContract.js +3 -1
- package/dist/agents/harnessContract.js.map +1 -1
- package/dist/agents/jobBody.d.ts +8 -2
- package/dist/agents/jobBody.d.ts.map +1 -1
- package/dist/agents/jobBody.js +15 -4
- package/dist/agents/jobBody.js.map +1 -1
- package/dist/github/GitHubMergeabilityProvider.d.ts.map +1 -1
- package/dist/github/GitHubMergeabilityProvider.js +6 -2
- package/dist/github/GitHubMergeabilityProvider.js.map +1 -1
- package/dist/github/GitHubPrReportPublisher.d.ts +17 -6
- package/dist/github/GitHubPrReportPublisher.d.ts.map +1 -1
- package/dist/github/GitHubPrReportPublisher.js +65 -36
- package/dist/github/GitHubPrReportPublisher.js.map +1 -1
- package/dist/modules/llmProxy/LlmProxyController.d.ts +16 -0
- package/dist/modules/llmProxy/LlmProxyController.d.ts.map +1 -1
- package/dist/modules/llmProxy/LlmProxyController.js +32 -6
- package/dist/modules/llmProxy/LlmProxyController.js.map +1 -1
- package/dist/modules/publicApi/openapiDocument.generated.d.ts +1 -1
- package/dist/modules/publicApi/openapiDocument.generated.d.ts.map +1 -1
- package/dist/modules/publicApi/openapiDocument.generated.js +1 -1
- package/dist/modules/publicApi/openapiDocument.generated.js.map +1 -1
- package/package.json +8 -8
|
@@ -433,19 +433,6 @@ export declare class ContainerAgentExecutor implements AsyncAgentExecutor {
|
|
|
433
433
|
* named gap for a silent one.
|
|
434
434
|
*/
|
|
435
435
|
private resolveJobSecretEnv;
|
|
436
|
-
/**
|
|
437
|
-
* The model this dispatch runs and the harness that will run it, resolved together because
|
|
438
|
-
* the second is a property of the first. "Subscriptions always win": a subscription-only model
|
|
439
|
-
* carries its harness; a dual-mode GLM/Kimi step pinned to its Cloudflare base is auto-routed
|
|
440
|
-
* to Claude Code when the workspace has a pooled token for the vendor. Shared with
|
|
441
|
-
* `isQuotaBased` so the dispatch and the spend gate agree on what the step runs.
|
|
442
|
-
*
|
|
443
|
-
* The Pi harness reaches models through the LLM proxy, so its model must be a provider the
|
|
444
|
-
* proxy can serve; locking it here stops the container choosing another. The subscription
|
|
445
|
-
* harnesses (Claude Code / Codex) talk direct to the vendor with a pooled token, so the
|
|
446
|
-
* proxyable guard does not apply to them.
|
|
447
|
-
*/
|
|
448
|
-
private resolveDispatchModel;
|
|
449
436
|
/**
|
|
450
437
|
* Resolve the per-job auth the harness carries: the proxy session token for Pi, or a
|
|
451
438
|
* leased subscription token for Claude Code / Codex. Spread into every job body
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContainerAgentExecutor.d.ts","sourceRoot":"","sources":["../../src/agents/ContainerAgentExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EAEvB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,MAAM,EACX,KAAK,WAAW,EAChB,KAAK,QAAQ,EACb,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EAMvB,KAAK,qBAAqB,EAC1B,KAAK,uBAAuB,EAC5B,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC3B,MAAM,qBAAqB,CAAA;AAU5B,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,YAAY,
|
|
1
|
+
{"version":3,"file":"ContainerAgentExecutor.d.ts","sourceRoot":"","sources":["../../src/agents/ContainerAgentExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import {} from '@cat-factory/kernel';
|
|
2
2
|
import { ConflictError, CredentialRequiredError, VCS_DOC_URLS, SUBSCRIPTION_VENDORS, isIndividualVendor, isSubscriptionVendor, } from '@cat-factory/kernel';
|
|
3
3
|
import { resolveAprioriWorkingBranch, resolveInstanceTypeId } from '@cat-factory/contracts';
|
|
4
|
-
import { agentTuningFor, withComplexityAllowance, defaultAgentKindRegistry,
|
|
4
|
+
import { agentTuningFor, withComplexityAllowance, defaultAgentKindRegistry, isReadOnlyAgentKind, webResearchGuidanceFor, } from '@cat-factory/agents';
|
|
5
5
|
import { ModelRouter } from './ModelRouter.js';
|
|
6
|
-
import {
|
|
6
|
+
import { buildDispatchContextFiles, renderSkillsForHarness } from './contextFiles.js';
|
|
7
7
|
import { dispatchToolServerDeps, resolveDispatchToolServers, stepToolServerRecord, } from './toolServers.js';
|
|
8
8
|
import { resolveBinaryGeneratorSecrets } from './binaryGenerators.js';
|
|
9
9
|
import { buildDoneUpdate, buildFailureMeta, buildRunningUpdate, toRunResult, } from './containerAgentResult.js';
|
|
@@ -14,7 +14,7 @@ import { recordAgentContextSnapshot } from './agentContextRecord.js';
|
|
|
14
14
|
import { drainToolCalls } from './toolTrajectory.js';
|
|
15
15
|
import { isTesterKind } from '@cat-factory/orchestration';
|
|
16
16
|
import { RunnerJobClient } from './RunnerJobClient.js';
|
|
17
|
-
import { buildCommonBody, buildRepoSpec, githubRepoOrigin, resolveAuxiliaryRepos, } from './containerAgentBody.js';
|
|
17
|
+
import { buildCommonBody, dispatchDesignImageDelivery, buildRepoSpec, githubRepoOrigin, resolveAuxiliaryRepos, } from './containerAgentBody.js';
|
|
18
18
|
import { jobTokenRepoIds } from './repoTargeting.js';
|
|
19
19
|
export { jobTokenRepoIds } from './repoTargeting.js';
|
|
20
20
|
/**
|
|
@@ -547,7 +547,7 @@ export class ContainerAgentExecutor {
|
|
|
547
547
|
// per RE-dispatch round (the dispatch epoch) so a Tester re-test / fixer round never
|
|
548
548
|
// re-attaches to the prior round's completed job on a container-reusing transport.
|
|
549
549
|
const jobId = stepJobId(executionId, context.agentKind, context.dispatchEpoch);
|
|
550
|
-
const { ref, harness, subscriptionVendor } = await this.
|
|
550
|
+
const { ref, harness, subscriptionVendor } = await this.modelRouter.resolveDispatchRef(context, workspaceId);
|
|
551
551
|
const repo = await this.deps.resolveRepoTarget(workspaceId, blockId);
|
|
552
552
|
if (!repo) {
|
|
553
553
|
throw new ConflictError(`No connected GitHub repository found for workspace '${workspaceId}'. Connect the workspace to GitHub and link a repository to this service before running an agent (Settings → GitHub). See ${VCS_DOC_URLS.githubIntegration}.`, 'github_not_connected');
|
|
@@ -612,18 +612,7 @@ export class ContainerAgentExecutor {
|
|
|
612
612
|
// Linked-context bodies are materialised into the checkout (under CONTEXT_DIR) so a
|
|
613
613
|
// container agent can read what it needs on demand; the prompt only lists them. The
|
|
614
614
|
// harness can't reach Jira/GitHub itself, so everything is prepared here, up front.
|
|
615
|
-
const
|
|
616
|
-
// Files a registered kind's preOp prepared for the agent to read up front (e.g. the
|
|
617
|
-
// `pr-reviewer` diff) — materialised into `.cat-context/` alongside the linked-doc files.
|
|
618
|
-
// The preOp already bounded their size; the agent's own prompt names the paths, so they need
|
|
619
|
-
// no linked-doc index entry (which is why they aren't fed through `buildContextFiles`).
|
|
620
|
-
for (const injected of context.injectedContextFiles ?? [])
|
|
621
|
-
contextFiles.push({
|
|
622
|
-
path: injected.path,
|
|
623
|
-
title: injected.path,
|
|
624
|
-
url: '',
|
|
625
|
-
content: injected.content,
|
|
626
|
-
});
|
|
615
|
+
const contextFiles = buildDispatchContextFiles(context);
|
|
627
616
|
// The dispatch's resolved skills (a `skill` step's pick and/or the running kind's declared
|
|
628
617
|
// playbooks), rendered harness-aware: the payload travels as the top-level `skills` job-body
|
|
629
618
|
// field (the harness materialises them — natively for claude-code, under
|
|
@@ -654,6 +643,7 @@ export class ContainerAgentExecutor {
|
|
|
654
643
|
// Resolve the repo origin once so both the harness `RepoSpec` and the diagnostics repo
|
|
655
644
|
// summary (returned below) agree on the VCS provider.
|
|
656
645
|
const origin = (this.deps.resolveRepoOrigin ?? githubRepoOrigin)(repo);
|
|
646
|
+
const designImageDelivery = dispatchDesignImageDelivery(context, harness, ref);
|
|
657
647
|
const common = buildCommonBody(context, {
|
|
658
648
|
jobId,
|
|
659
649
|
model: ref.model,
|
|
@@ -669,6 +659,10 @@ export class ContainerAgentExecutor {
|
|
|
669
659
|
// prior estimator step produced one (absent ⇒ the kind's tuning / harness default
|
|
670
660
|
// stands — only absolute spiralling is caught). Loosen-only; see `withComplexityAllowance`.
|
|
671
661
|
guardLimits: withComplexityAllowance(tuning?.guardLimits, context.block.estimate?.complexity),
|
|
662
|
+
// Only a dispatch that can actually show them sends a manifest: a harness with no image
|
|
663
|
+
// input would download the frames into a directory nothing ever opens, and its prompt
|
|
664
|
+
// already says (from the same verdict) that the pictures could not be delivered.
|
|
665
|
+
...(designImageDelivery?.attached ? { designImages: context.designImages } : {}),
|
|
672
666
|
}, this.deps, this.agentKindRegistry);
|
|
673
667
|
// The prompt's linked-context summary index is rendered from the block's own docs/tasks: every
|
|
674
668
|
// one of them was materialised, because `buildContextFiles` refuses a corpus that would not fit
|
|
@@ -683,6 +677,7 @@ export class ContainerAgentExecutor {
|
|
|
683
677
|
...(tools.unavailableToolServers.length
|
|
684
678
|
? { unavailableToolServers: tools.unavailableToolServers }
|
|
685
679
|
: {}),
|
|
680
|
+
...(designImageDelivery ? { designImageDelivery } : {}),
|
|
686
681
|
};
|
|
687
682
|
// The proxy-backed web-tools nudge + switch, shared by the kinds that allow web access
|
|
688
683
|
// (coder/mocker/ci-fixer/fixer/tester/read-only). `search` was resolved in the wave above;
|
|
@@ -756,30 +751,6 @@ export class ContainerAgentExecutor {
|
|
|
756
751
|
generatorSecrets,
|
|
757
752
|
};
|
|
758
753
|
}
|
|
759
|
-
/**
|
|
760
|
-
* The model this dispatch runs and the harness that will run it, resolved together because
|
|
761
|
-
* the second is a property of the first. "Subscriptions always win": a subscription-only model
|
|
762
|
-
* carries its harness; a dual-mode GLM/Kimi step pinned to its Cloudflare base is auto-routed
|
|
763
|
-
* to Claude Code when the workspace has a pooled token for the vendor. Shared with
|
|
764
|
-
* `isQuotaBased` so the dispatch and the spend gate agree on what the step runs.
|
|
765
|
-
*
|
|
766
|
-
* The Pi harness reaches models through the LLM proxy, so its model must be a provider the
|
|
767
|
-
* proxy can serve; locking it here stops the container choosing another. The subscription
|
|
768
|
-
* harnesses (Claude Code / Codex) talk direct to the vendor with a pooled token, so the
|
|
769
|
-
* proxyable guard does not apply to them.
|
|
770
|
-
*/
|
|
771
|
-
async resolveDispatchModel(context, workspaceId) {
|
|
772
|
-
const { ref, subscriptionVendor } = await this.modelRouter.resolveEffectiveRef(context, workspaceId);
|
|
773
|
-
const harness = ref.harness ?? 'pi';
|
|
774
|
-
if (harness === 'pi' && !isProxyableProvider(ref.provider)) {
|
|
775
|
-
throw new Error(`Container implementation needs a model the LLM proxy can serve ` +
|
|
776
|
-
`(Workers AI, a direct OpenAI-compatible provider, or a local runner); ` +
|
|
777
|
-
`'${ref.provider}' is not supported. Pick a Workers AI model, configure a ` +
|
|
778
|
-
`provider key (QWEN_API_KEY / DEEPSEEK_API_KEY / MOONSHOT_API_KEY), or add a local ` +
|
|
779
|
-
`runner (Ollama / LM Studio / …) and pick that model.`);
|
|
780
|
-
}
|
|
781
|
-
return { ref, harness, ...(subscriptionVendor ? { subscriptionVendor } : {}) };
|
|
782
|
-
}
|
|
783
754
|
/**
|
|
784
755
|
* Resolve the per-job auth the harness carries: the proxy session token for Pi, or a
|
|
785
756
|
* leased subscription token for Claude Code / Codex. Spread into every job body
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContainerAgentExecutor.js","sourceRoot":"","sources":["../../src/agents/ContainerAgentExecutor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ContainerAgentExecutor.js","sourceRoot":"","sources":["../../src/agents/ContainerAgentExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,EA0BN,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACL,aAAa,EACb,uBAAuB,EACvB,YAAY,EACZ,oBAAoB,EACpB,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,2BAA2B,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC3F,OAAO,EAGL,cAAc,EACd,uBAAuB,EACvB,wBAAwB,EACxB,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AACrF,OAAO,EACL,sBAAsB,EACtB,0BAA0B,EAC1B,oBAAoB,GAErB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAA;AACrE,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,WAAW,GACZ,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAA;AACpE,OAAO,EAAwB,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAC1E,OAAO,EAAE,YAAY,EAAgC,MAAM,4BAA4B,CAAA;AAEvF,OAAO,EAAE,eAAe,EAA+B,MAAM,sBAAsB,CAAA;AAEnF,OAAO,EACL,eAAe,EACf,2BAA2B,EAC3B,aAAa,EACb,gBAAgB,EAChB,qBAAqB,GACtB,MAAM,yBAAyB,CAAA;AAehC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAUpD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAuDpD;;;;;GAKG;AACH;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAS,SAAS,CAAC,WAAmB,EAAE,SAAiB,EAAE,aAAa,GAAG,CAAC;IAC1E,MAAM,IAAI,GAAG,GAAG,WAAW,IAAI,SAAS,EAAE,CAAA;IAC1C,OAAO,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,aAAa,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAC9D,CAAC;AAED,6GAA6G;AAC7G,SAAS,UAAU,CAAC,KAAyB;IAC3C,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAA;IAC5B,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAChC,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;AAClD,CAAC;AAED;;;;GAIG;AACH,SAAS,YAAY,CAAC,MAAsB;IAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAA;AACrE,CAAC;AAqMD,0GAA0G;AAC1G,MAAM,oBAAoB,GAAG,KAAK,CAAA;AAElC;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAO,sBAAsB;IAqDJ,IAAI;IApDjC,uFAAuF;IACtE,IAAI,CAAiB;IAEtC;;;;;;;;;OASG;IACc,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAA;IAEtD;;;;;OAKG;IACc,sBAAsB,GAAG,IAAI,GAAG,EAAU,CAAA;IAE3D;;;;;;;;;;;;OAYG;IACc,gBAAgB,GAAG,IAAI,GAAG,EAAuB,CAAA;IAElE;;;;;OAKG;IACc,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAA;IAEtD,gFAAgF;IAC/D,WAAW,CAAa;IAEzC,iGAAiG;IAChF,iBAAiB,CAAmB;IAErD,YAA6B,IAAwC;oBAAxC,IAAI;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QACtD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,IAAI,wBAAwB,EAAE,CAAA;QAC7E,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC;YACjC,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,4BAA4B,EAAE,IAAI,CAAC,4BAA4B;YAC/D,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;SACtD,CAAC,CAAA;IACJ,CAAC;IAED,qFAAqF;IACrF,SAAS,CAAC,QAAyB;QACjC,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,QAAQ,CAAC,OAAwB;QACrC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QAC7D,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAC1F,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;QAClC,mFAAmF;QACnF,kFAAkF;QAClF,oFAAoF;QACpF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAe,CAAA;QAClC,MAAM,GAAG,GAAiB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAA;QACvD,MAAM,MAAM,GAAG,eAAe,CAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,EAChB,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,EACjE,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAC7B,CAAA;QACD,6FAA6F;QAC7F,kEAAkE;QAClE,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QAC7C,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;QACxC,MAAM,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;QAC9F,2FAA2F;QAC3F,+FAA+F;QAC/F,sFAAsF;QACtF,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAA;QAC1D,yFAAyF;QACzF,8FAA8F;QAC9F,2FAA2F;QAC3F,uCAAuC;QACvC,MAAM,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE;YACnF,OAAO;YACP,IAAI;YACJ,KAAK;YACL,WAAW;YACX,WAAW;YACX,WAAW,EAAE,gBAAgB;SAC9B,CAAC,CAAA;QACF,kFAAkF;QAClF,8EAA8E;QAC9E,gFAAgF;QAChF,sDAAsD;QACtD,OAAO;YACL,KAAK;YACL,KAAK,EAAE,WAAW;YAClB,KAAK;YACL,QAAQ;YACR,WAAW;YACX,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,MAAM;YACN,IAAI,EAAE,WAAW;YACjB,mFAAmF;YACnF,gEAAgE;YAChE,WAAW,EAAE,gBAAgB;YAC7B,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvD,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACvF,CAAA;IACH,CAAC;IAED,mFAAmF;IACnF,KAAK,CAAC,OAAO,CAAC,MAAsB;QAClC,MAAM,MAAM,GAAG,eAAe,CAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,EAChB;YACE,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,WAAW,EAAE,MAAM,CAAC,KAAK;YACzB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B,EACD,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAC7B,CAAA;QACD,4FAA4F;QAC5F,8FAA8F;QAC9F,oDAAoD;QACpD,IAAI,IAAmB,CAAA;QACvB,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAA;QACvE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;YACxB,MAAM,KAAK,CAAA;QACb,CAAC;QACD,0FAA0F;QAC1F,uFAAuF;QACvF,qFAAqF;QACrF,gFAAgF;QAChF,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;QAClE,yFAAyF;QACzF,wFAAwF;QACxF,0FAA0F;QAC1F,4FAA4F;QAC5F,yDAAyD;QACzD,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QACvD,yFAAyF;QACzF,yFAAyF;QACzF,8EAA8E;QAC9E,MAAM,iBAAiB,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3D,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,EAAE;YACtB,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACrE,CAAC,CAAC,CAAA;QACH,MAAM,SAAS,GAAG,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACtF,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;YAC5C,OAAO,kBAAkB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAC5C,CAAC;QACD,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;QAC1C,iFAAiF;QACjF,gFAAgF;QAChF,oFAAoF;QACpF,mDAAmD;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,CAAA;QAChC,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACjD,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;YACpF,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,2BAA2B,EAAE,GAAG,WAAW,EAAE,CAAA;QAC9F,CAAC;QACD,2FAA2F;QAC3F,uFAAuF;QACvF,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YAC9E,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,0BAA0B,MAAM,CAAC,KAAK,EAAE,EAAE,GAAG,WAAW,EAAE,CAAA;QAC7F,CAAC;QACD,8FAA8F;QAC9F,wFAAwF;QACxF,6FAA6F;QAC7F,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACtD,MAAM,IAAI,CAAC,gCAAgC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAC3D,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAA;QAC/E,iFAAiF;QACjF,0FAA0F;QAC1F,4FAA4F;QAC5F,4FAA4F;QAC5F,2FAA2F;QAC3F,IAAI,MAAM,CAAC,KAAK;YAAE,SAAS,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;QAChD,uFAAuF;QACvF,uFAAuF;QACvF,qFAAqF;QACrF,wFAAwF;QACxF,oFAAoF;QACpF,uFAAuF;QACvF,qFAAqF;QACrF,IAAI,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACxE,SAAS,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;YAC9B,SAAS,CAAC,YAAY,GAAG,cAAc,CAAA;YACvC,SAAS,CAAC,WAAW,GAAG,MAAM,CAAC,QAAQ,IAAI,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACrE,CAAC;QACD,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QAC/C,OAAO,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;IACpD,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACK,KAAK,CAAC,kBAAkB,CAC9B,MAAsB,EACtB,KAAsC;QAEtC,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACzF,OAAM;QACR,CAAC;QACD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC;gBACjC,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,WAAW,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI;gBACjC,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,OAAO;gBACtC,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC;gBACrD,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE;gBACzB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,KAAK;aACN,CAAC,CAAA;YACF,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;QAChD,CAAC;QAAC,MAAM,CAAC;YACP,4EAA4E;YAC5E,mBAAmB;QACrB,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,oBAAoB,CAAC,KAAa,EAAE,KAA0B;QACpE,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAiB,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC,CAAA;QACtF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAM;QAC7B,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,IAAI,MAAM;YAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAA;QACvE,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,GAAG,EAAU,CAAA;QACnE,KAAK,MAAM,GAAG,IAAI,IAAI;YAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACtC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IACzC,CAAC;IAED;;;;;;;;;;;OAWG;IACK,KAAK,CAAC,sBAAsB,CAClC,MAAsB,EACtB,MAA6C;QAE7C,IAAI,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;YAAE,OAAM;QACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACxD,MAAM,OAAO,GAAG,QAAQ;YACtB,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAChF,CAAC,CAAC,MAAM,CAAC,WAAW,CAAA;QACtB,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9C,IAAI,IAAI,CAAC,sBAAsB,CAAC,IAAI,IAAI,MAAM;YAAE,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,CAAA;QACnF,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC7C,sFAAsF;QACtF,wDAAwD;QACxD,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC5C,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,2BAA2B,CACvC,MAAsB,EACtB,MAAuB;QAEvB,IACE,MAAM,CAAC,mBAAmB;YAC1B,MAAM,CAAC,WAAW;YAClB,MAAM,CAAC,KAAK;YACZ,IAAI,CAAC,IAAI,CAAC,uBAAuB;YACjC,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EACzC,CAAC;YACD,MAAM,IAAI,CAAC,IAAI,CAAC,uBAAuB,CACrC,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,mBAAmB,EAC1B,MAAM,CAAC,KAAK,CACb,CAAA;YACD,8EAA8E;YAC9E,6EAA6E;YAC7E,yEAAyE;YACzE,IAAI,IAAI,CAAC,iBAAiB,CAAC,IAAI,IAAI,MAAM;gBAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAA;YACzE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC1C,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,gCAAgC,CAC5C,MAAsB,EACtB,MAAuB;QAEvB,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,IAAI,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC/D,IACE,MAAM,CAAC,WAAW;YAClB,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;YAC7B,MAAM,CAAC,KAAK;YACZ,IAAI,CAAC,IAAI,CAAC,4BAA4B;YACtC,oBAAoB,CAAC,WAAW,CAAC;YACjC,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EACzC,CAAC;YACD,MAAM,MAAM,GAAmC,MAAM,CAAC,mBAAmB;gBACvE,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,mBAAmB,EAAE,MAAM,EAAE,WAAW,EAAE;gBAC/E,CAAC,CAAC,MAAM,CAAC,iBAAiB;oBACxB,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE;oBAC3E,CAAC,CAAC,IAAI,CAAA;YACV,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;gBAClE,IAAI,IAAI,CAAC,iBAAiB,CAAC,IAAI,IAAI,MAAM;oBAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAA;gBACzE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,CAAC,MAAsB;QAClC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAA;IACnE,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,GAAG,CAAC,OAAwB;QAChC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAC3C,SAAS,CAAC;YACR,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YACzC,IAAI,MAAM,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;gBAC5B,kFAAkF;gBAClF,OAAO,MAAM,CAAC,MAAM,CAAA;YACtB,CAAC;YACD,IAAI,MAAM,CAAC,KAAK,KAAK,QAAQ;gBAAE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAC5D,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAA;QAC3E,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,YAAY,CAAC,OAAwB;QACzC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QACtD,OAAO,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,KAAK,EAAE,CAAA;IACvC,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,YAAY,CAAC,OAAwB;QACzC,IAAI,CAAC,OAAO,CAAC,WAAW;YAAE,OAAO,KAAK,CAAA;QACtC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;QACxF,OAAO,GAAG,CAAC,OAAO,KAAK,aAAa,IAAI,GAAG,CAAC,OAAO,KAAK,OAAO,CAAA;IACjE,CAAC;IAED;;;;;;OAMG;IACK,eAAe,CAAC,OAAwB;QAC9C,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,EAAE,aAAa,CAAA;QAC/C,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,YAAY,CAAA;QAC1C,4EAA4E;QAC5E,wFAAwF;QACxF,wCAAwC;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,KAAK,CAAA;QACxE,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK;YAAE,OAAO,SAAS,CAAA;QAClD,OAAO;YACL,GAAG,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtF,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjC,6EAA6E;YAC7E,6EAA6E;YAC7E,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC5B,CAAA;IACH,CAAC;IAED,uFAAuF;IAC/E,UAAU,CAAC,OAAwB;QAKzC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;QAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,CAAA;QAChC,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAA;QAC1F,CAAC;QACD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,CAAA;IAC9C,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACK,KAAK,CAAC,sBAAsB,CAClC,IAAgB,EAChB,UAAkB,EAClB,WAA+B,EAC/B,OAAwB;QAExB,IAAI,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,MAAM,KAAK,UAAU,EAAE,CAAC;YACrD,OAAO,IAAI,CAAA;QACb,CAAC;QACD,IAAI,WAAW,EAAE,CAAC;YAChB,oFAAoF;YACpF,sFAAsF;YACtF,+EAA+E;YAC/E,yFAAyF;YACzF,IAAI,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;gBACpF,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,MAAM,IAAI,KAAK,CACb,2BAA2B,UAAU,sBAAsB;wBACzD,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,oCAAoC;wBAC9D,iDAAiD,CACpD,CAAA;gBACH,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB;YAC/B,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,UAAU,EAAE;gBACjD,MAAM,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC;aAChD,CAAC;YACJ,CAAC,CAAC,KAAK,CAAA;IACX,CAAC;IAED,qFAAqF;IAC7E,KAAK,CAAC,YAAY,CAAC,OAAwB;QAiBjD,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QACtE,kFAAkF;QAClF,mFAAmF;QACnF,qFAAqF;QACrF,mFAAmF;QACnF,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,CAAA;QAE9E,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CACpF,OAAO,EACP,WAAW,CACZ,CAAA;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QACpE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,aAAa,CACrB,uDAAuD,WAAW,6HAA6H,YAAY,CAAC,iBAAiB,GAAG,EAChO,sBAAsB,CACvB,CAAA;QACH,CAAC;QAED,4FAA4F;QAC5F,6FAA6F;QAC7F,MAAM,WAAW,GAAG,2BAA2B,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;QACzF,MAAM,UAAU,GAAG,WAAW,IAAI,eAAe,OAAO,EAAE,CAAA;QAE1D,0FAA0F;QAC1F,uFAAuF;QACvF,qFAAqF;QACrF,yFAAyF;QACzF,4FAA4F;QAC5F,2FAA2F;QAC3F,wFAAwF;QACxF,gBAAgB;QAChB,MAAM,CAAC,eAAe,EAAE,GAAG,EAAE,UAAU,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,CAAC,GACtF,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC;YACnE,mFAAmF;YACnF,0FAA0F;YAC1F,wFAAwF;YACxF,iFAAiF;YACjF,qBAAqB,CACnB,OAAO,EACP,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,EAC1C,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,iBAAiB,CACvB;YACD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE;gBACxB,OAAO;gBACP,GAAG;gBACH,kBAAkB;gBAClB,WAAW;gBACX,WAAW;aACZ,CAAC;YACF,iFAAiF;YACjF,4EAA4E;YAC5E,IAAI,CAAC,IAAI,CAAC,wBAAwB;gBAChC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,WAAW,CAAC;gBACjD,CAAC,CAAC,OAAO,CAAC,OAAO,CAA2B,EAAE,CAAC;YACjD,oFAAoF;YACpF,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,kBAAkB;gBAC7D,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,OAAO,CAAC;gBACpD,CAAC,CAAC,OAAO,CAAC,OAAO,CAAoB,EAAE,CAAC;YAC1C,uFAAuF;YACvF,gFAAgF;YAChF,IAAI,CAAC,IAAI,CAAC,4BAA4B;gBACpC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC,WAAW,CAAC;gBACrD,CAAC,CAAC,OAAO,CAAC,OAAO,CAAwB,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;SACjF,CAAC,CAAA;QACJ,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,GAAG,UAAU,CAAA;QAEhD,4FAA4F;QAC5F,6FAA6F;QAC7F,2FAA2F;QAC3F,0FAA0F;QAC1F,6FAA6F;QAC7F,0FAA0F;QAC1F,mFAAmF;QACnF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,cAAc,EAAE;YACzE,WAAW;YACX,WAAW;YACX,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChF,OAAO,EAAE,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,WAAW,CAAC;SAChD,CAAC,CAAA;QAEF,+EAA+E;QAC/E,wEAAwE;QACxE,oFAAoF;QACpF,oFAAoF;QACpF,oFAAoF;QACpF,MAAM,YAAY,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAA;QACvD,2FAA2F;QAC3F,6FAA6F;QAC7F,yEAAyE;QACzE,4FAA4F;QAC5F,+FAA+F;QAC/F,oFAAoF;QACpF,MAAM,WAAW,GAAG,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC,CAAA;QAC9F,gGAAgG;QAChG,gGAAgG;QAChG,+FAA+F;QAC/F,iGAAiG;QACjG,4EAA4E;QAC5E,MAAM,KAAK,GAAG,MAAM,0BAA0B,CAC5C,sBAAsB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,EACzD,OAAO,EACP;YACE,OAAO;YACP,WAAW,EAAE,IAAI,CAAC,WAAW,KAAK,IAAI;YACtC,WAAW;YACX,OAAO;SACR,CACF,CAAA;QACD,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE;YAClF,WAAW;YACX,OAAO;YACP,mBAAmB;SACpB,CAAC,CAAA;QACF,mFAAmF;QACnF,iFAAiF;QACjF,oFAAoF;QACpF,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAA;QACxE,uFAAuF;QACvF,sDAAsD;QACtD,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAA;QACtE,MAAM,mBAAmB,GAAG,2BAA2B,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAA;QAC9E,MAAM,MAAM,GAAG,eAAe,CAC5B,OAAO,EACP;YACE,KAAK;YACL,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,IAAI;YACJ,OAAO;YACP,iBAAiB;YACjB,QAAQ,EAAE,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC;YACrC,YAAY;YACZ,UAAU,EAAE,WAAW,CAAC,IAAI;YAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,gBAAgB;YAChB,qFAAqF;YACrF,kFAAkF;YAClF,4FAA4F;YAC5F,WAAW,EAAE,uBAAuB,CAClC,MAAM,EAAE,WAAW,EACnB,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,UAAU,CACnC;YACD,wFAAwF;YACxF,sFAAsF;YACtF,iFAAiF;YACjF,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACjF,EACD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,iBAAiB,CACvB,CAAA;QACD,+FAA+F;QAC/F,gGAAgG;QAChG,8FAA8F;QAC9F,4BAA4B;QAC5B,wFAAwF;QACxF,+FAA+F;QAC/F,uEAAuE;QACvE,MAAM,aAAa,GAAoB;YACrC,GAAG,OAAO;YACV,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM;gBACrC,CAAC,CAAC,EAAE,sBAAsB,EAAE,KAAK,CAAC,sBAAsB,EAAE;gBAC1D,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACxD,CAAA;QACD,uFAAuF;QACvF,2FAA2F;QAC3F,6FAA6F;QAC7F,MAAM,QAAQ,GAAG;YACf,gBAAgB,EAAE,sBAAsB,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE;gBAClF,KAAK,EAAE,IAAI;aACZ,CAAC;YACF,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACjD,CAAA;QAED,MAAM,EACJ,SAAS,EACT,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,wBAAwB,GACzB,GAAG,GAAG,CAAA;QACP,2FAA2F;QAC3F,0FAA0F;QAC1F,6FAA6F;QAC7F,MAAM,aAAa,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,MAAM,CAAA;QAEvF,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAClC,aAAa,EACb;YACE,MAAM,EAAE,aAAa;YACrB,QAAQ;YACR,IAAI,EAAE,WAAW;YACjB,UAAU;YACV,eAAe;YACf,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClD,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjD,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7C,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnD,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,wBAAwB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjE,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtE,EACD,IAAI,CAAC,iBAAiB,CACvB,CAAA;QACD,OAAO;YACL,mBAAmB;YACnB,IAAI;YACJ,KAAK,EAAE,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,KAAK,EAAE;YACrC,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,IAAI;YACJ,MAAM;YACN,WAAW,EAAE;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3D,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B;YACD,WAAW,EAAE,KAAK;SACnB,CAAA;IACH,CAAC;IAED;;;;;;;;;;;;;OAaG;IACK,KAAK,CAAC,mBAAmB,CAC/B,OAAwB,EACxB,IAIC;QAKD,MAAM,gBAAgB,GAAG,MAAM,6BAA6B,CAAC;YAC3D,OAAO;YACP,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7F,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1D,CAAC,CAAA;QACF,OAAO;YACL,aAAa,EAAE,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;YACpF,gBAAgB;SACjB,CAAA;IACH,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,WAAW,CACvB,OAAwB,EACxB,IAMC;QAED,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,kBAAkB,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,IAAI,CAAA;QAC3E,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACrB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB;gBAC1C,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC;gBAC/C,CAAC,CAAC,SAAS,CAAA;YACb,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;gBACvD,WAAW;gBACX,SAAS,EAAE,SAAS,IAAI,SAAS;gBACjC,MAAM,EAAE,OAAO,CAAC,iBAAiB;gBACjC,WAAW;gBACX,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,KAAK,EAAE,GAAG,CAAC,KAAK;aACjB,CAAC,CAAA;YACF,uFAAuF;YACvF,wFAAwF;YACxF,yFAAyF;YACzF,sFAAsF;YACtF,oFAAoF;YACpF,yFAAyF;YACzF,uFAAuF;YACvF,OAAO;gBACL,IAAI,EAAE;oBACJ,OAAO;oBACP,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;oBACpC,cAAc,EAAE,IAAI;oBACpB,YAAY;iBACb;aACF,CAAA;QACH,CAAC;QACD,oFAAoF;QACpF,wFAAwF;QACxF,mFAAmF;QACnF,kFAAkF;QAClF,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,OAAO,EAAE,kBAAkB,CAAC,EAAE,CAAC;YAC/D,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,CAAA;QACjD,CAAC;QACD,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CACb,OAAO,OAAO,2DAA2D;gBACvE,+CAA+C,CAClD,CAAA;QACH,CAAC;QACD,kFAAkF;QAClF,gFAAgF;QAChF,gFAAgF;QAChF,+CAA+C;QAC/C,IAAI,MAAc,CAAA;QAClB,IAAI,mBAAuC,CAAA;QAC3C,IAAI,kBAAkB,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,8BAA8B,EAAE,CAAC;gBAC9C,MAAM,IAAI,KAAK,CACb,YAAY,kBAAkB,4CAA4C;oBACxE,yDAAyD,CAC5D,CAAA;YACH,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;gBAC/B,yEAAyE;gBACzE,4EAA4E;gBAC5E,MAAM,IAAI,uBAAuB,CAC/B,aAAa,kBAAkB,gEAAgE,EAC/F,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAC1D,CAAA;YACH,CAAC;YACD,6EAA6E;YAC7E,4EAA4E;YAC5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,8BAA8B,CAC3D,WAAW,EACX,OAAO,CAAC,iBAAiB,EACzB,kBAAkB,CACnB,CAAA;YACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QACxB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBACtC,MAAM,IAAI,KAAK,CACb,OAAO,OAAO,2DAA2D;oBACvE,+CAA+C,CAClD,CAAA;YACH,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAA;YACtF,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAA;YACpC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QACxB,CAAC;QACD,iFAAiF;QACjF,iFAAiF;QACjF,gFAAgF;QAChF,4EAA4E;QAC5E,gFAAgF;QAChF,6EAA6E;QAC7E,iFAAiF;QACjF,iEAAiE;QACjE,8EAA8E;QAC9E,wFAAwF;QACxF,MAAM,OAAO,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAA;QAChE,OAAO;YACL,IAAI,EAAE;gBACJ,OAAO;gBACP,iBAAiB,EAAE,MAAM;gBACzB,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACrD;YACD,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACxD,CAAA;IACH,CAAC;CACF"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { AgentRunContext, ModelFlavor, ModelRef, SubscriptionVendor } from '@cat-factory/kernel';
|
|
2
|
+
import type { HarnessKind } from '@cat-factory/kernel';
|
|
2
3
|
import { type AgentRouting } from '@cat-factory/agents';
|
|
3
4
|
/** The collaborators {@link ModelRouter} needs to resolve a step's model + subscription path. */
|
|
4
5
|
export interface ModelRouterDependencies {
|
|
@@ -65,5 +66,22 @@ export declare class ModelRouter {
|
|
|
65
66
|
ref: ModelRef;
|
|
66
67
|
subscriptionVendor?: SubscriptionVendor;
|
|
67
68
|
}>;
|
|
69
|
+
/**
|
|
70
|
+
* The model this dispatch runs and the harness that will run it, resolved together because
|
|
71
|
+
* the second is a property of the first. "Subscriptions always win": a subscription-only model
|
|
72
|
+
* carries its harness; a dual-mode GLM/Kimi step pinned to its Cloudflare base is auto-routed
|
|
73
|
+
* to Claude Code when the workspace has a pooled token for the vendor. Shared with
|
|
74
|
+
* `isQuotaBased` so the dispatch and the spend gate agree on what the step runs.
|
|
75
|
+
*
|
|
76
|
+
* The Pi harness reaches models through the LLM proxy, so its model must be a provider the
|
|
77
|
+
* proxy can serve; locking it here stops the container choosing another. The subscription
|
|
78
|
+
* harnesses (Claude Code / Codex) talk direct to the vendor with a pooled token, so the
|
|
79
|
+
* proxyable guard does not apply to them.
|
|
80
|
+
*/
|
|
81
|
+
resolveDispatchRef(context: AgentRunContext, workspaceId: string): Promise<{
|
|
82
|
+
ref: ModelRef;
|
|
83
|
+
harness: HarnessKind;
|
|
84
|
+
subscriptionVendor?: SubscriptionVendor;
|
|
85
|
+
}>;
|
|
68
86
|
}
|
|
69
87
|
//# sourceMappingURL=ModelRouter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelRouter.d.ts","sourceRoot":"","sources":["../../src/agents/ModelRouter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,QAAQ,EACR,kBAAkB,EACnB,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"ModelRouter.d.ts","sourceRoot":"","sources":["../../src/agents/ModelRouter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,WAAW,EACX,QAAQ,EACR,kBAAkB,EACnB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEtD,OAAO,EAAE,KAAK,YAAY,EAA4C,MAAM,qBAAqB,CAAA;AAEjG,iGAAiG;AACjG,MAAM,WAAW,uBAAuB;IACtC,yEAAyE;IACzE,YAAY,EAAE,YAAY,CAAA;IAC1B,2FAA2F;IAC3F,iBAAiB,EAAE,CACjB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,kBAAkB,CAAC,EAAE,SAAS,WAAW,EAAE,KACxC,QAAQ,GAAG,SAAS,CAAA;IACzB;;;OAGG;IACH,4BAA4B,CAAC,EAAE,CAC7B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,MAAM,KACnB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAChC;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;IAC5F;;;;;;OAMG;IACH,uBAAuB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC3F;AAED;;;;;;GAMG;AACH,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,uBAAuB,EAAI;IAE9D;;;;OAIG;IACH,UAAU,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC,CAkBtD;IAED;;;;;OAKG;YACW,uBAAuB;IAcrC;;;;;;;;;;OAUG;IACG,mBAAmB,CACvB,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;QAAE,GAAG,EAAE,QAAQ,CAAC;QAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;KAAE,CAAC,CA2BrE;IAED;;;;;;;;;;;OAWG;IACG,kBAAkB,CACtB,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;QAAE,GAAG,EAAE,QAAQ,CAAC;QAAC,OAAO,EAAE,WAAW,CAAC;QAAC,kBAAkB,CAAC,EAAE,kBAAkB,CAAA;KAAE,CAAC,CAa3F;CACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isIndividualVendor, subscriptionOptionFor } from '@cat-factory/kernel';
|
|
2
|
-
import { resolveStepModelRef } from '@cat-factory/agents';
|
|
2
|
+
import { isProxyableProvider, resolveStepModelRef } from '@cat-factory/agents';
|
|
3
3
|
/**
|
|
4
4
|
* Resolves which model — and which subscription path — a pipeline step runs on,
|
|
5
5
|
* decoupling routing POLICY from the container executor's job dispatch. Holds the one
|
|
@@ -84,5 +84,29 @@ export class ModelRouter {
|
|
|
84
84
|
}
|
|
85
85
|
return { ref, ...(subscriptionVendor ? { subscriptionVendor } : {}) };
|
|
86
86
|
}
|
|
87
|
+
/**
|
|
88
|
+
* The model this dispatch runs and the harness that will run it, resolved together because
|
|
89
|
+
* the second is a property of the first. "Subscriptions always win": a subscription-only model
|
|
90
|
+
* carries its harness; a dual-mode GLM/Kimi step pinned to its Cloudflare base is auto-routed
|
|
91
|
+
* to Claude Code when the workspace has a pooled token for the vendor. Shared with
|
|
92
|
+
* `isQuotaBased` so the dispatch and the spend gate agree on what the step runs.
|
|
93
|
+
*
|
|
94
|
+
* The Pi harness reaches models through the LLM proxy, so its model must be a provider the
|
|
95
|
+
* proxy can serve; locking it here stops the container choosing another. The subscription
|
|
96
|
+
* harnesses (Claude Code / Codex) talk direct to the vendor with a pooled token, so the
|
|
97
|
+
* proxyable guard does not apply to them.
|
|
98
|
+
*/
|
|
99
|
+
async resolveDispatchRef(context, workspaceId) {
|
|
100
|
+
const { ref, subscriptionVendor } = await this.resolveEffectiveRef(context, workspaceId);
|
|
101
|
+
const harness = ref.harness ?? 'pi';
|
|
102
|
+
if (harness === 'pi' && !isProxyableProvider(ref.provider)) {
|
|
103
|
+
throw new Error(`Container implementation needs a model the LLM proxy can serve ` +
|
|
104
|
+
`(Workers AI, a direct OpenAI-compatible provider, or a local runner); ` +
|
|
105
|
+
`'${ref.provider}' is not supported. Pick a Workers AI model, configure a ` +
|
|
106
|
+
`provider key (QWEN_API_KEY / DEEPSEEK_API_KEY / MOONSHOT_API_KEY), or add a local ` +
|
|
107
|
+
`runner (Ollama / LM Studio / …) and pick that model.`);
|
|
108
|
+
}
|
|
109
|
+
return { ref, harness, ...(subscriptionVendor ? { subscriptionVendor } : {}) };
|
|
110
|
+
}
|
|
87
111
|
}
|
|
88
112
|
//# sourceMappingURL=ModelRouter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelRouter.js","sourceRoot":"","sources":["../../src/agents/ModelRouter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ModelRouter.js","sourceRoot":"","sources":["../../src/agents/ModelRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AgentRunContext } from '@cat-factory/kernel';
|
|
1
|
+
import type { AgentRunContext, DesignImageDelivery, DesignImageSet, HarnessKind, ModelRef } from '@cat-factory/kernel';
|
|
2
2
|
import type { AgentKindRegistry } from '@cat-factory/agents';
|
|
3
3
|
import type { McpServerJobSpec } from './toolServers.js';
|
|
4
4
|
import type { GeneratorSecretJobSpec } from './binaryGenerators.js';
|
|
@@ -21,6 +21,15 @@ export declare function buildRepoSpec(repo: RepoTarget, origin: RepoOrigin): {
|
|
|
21
21
|
provider: "github" | "gitlab";
|
|
22
22
|
serviceDirectory?: string | undefined;
|
|
23
23
|
};
|
|
24
|
+
/**
|
|
25
|
+
* What THIS dispatch can do with the task's design pictures, or `undefined` when it holds none.
|
|
26
|
+
*
|
|
27
|
+
* A DISPATCH fact for the same reason the tool servers are: it takes the resolved harness AND the
|
|
28
|
+
* resolved model, neither of which the engine knows while it is building the context. Resolved even
|
|
29
|
+
* when the answer is no, because the prompt has to STATE a withheld picture rather than leave the
|
|
30
|
+
* agent reading the textual design description as everything the platform had.
|
|
31
|
+
*/
|
|
32
|
+
export declare function dispatchDesignImageDelivery(context: AgentRunContext, harness: HarnessKind, ref: Pick<ModelRef, 'acceptsImages'>): DesignImageDelivery | undefined;
|
|
24
33
|
/**
|
|
25
34
|
* Assemble the fields EVERY harness job body carries (`common`), built once so the per-kind
|
|
26
35
|
* bodies can't drift on which jobId/model/auth/repo/proxy fields they forward. Extracted from
|
|
@@ -43,6 +52,7 @@ export declare function buildCommonBody(context: AgentRunContext, args: {
|
|
|
43
52
|
mcpServers?: McpServerJobSpec[];
|
|
44
53
|
generatorSecrets?: GeneratorSecretJobSpec[];
|
|
45
54
|
guardLimits?: unknown;
|
|
55
|
+
designImages?: DesignImageSet;
|
|
46
56
|
}, deps: ContainerAgentExecutorDependencies, agentKindRegistry: AgentKindRegistry): Record<string, unknown>;
|
|
47
57
|
/**
|
|
48
58
|
* Multi-repo coding (service-connections phases 3–4): when the implementer OR the ci-fixer runs
|
|
@@ -67,7 +77,7 @@ export declare function resolveMultiRepoFanout(context: AgentRunContext, args: {
|
|
|
67
77
|
}, deps: ContainerAgentExecutorDependencies, agentKindRegistry: AgentKindRegistry): Promise<{
|
|
68
78
|
peerRepos?: {
|
|
69
79
|
repo: Record<string, unknown>;
|
|
70
|
-
|
|
80
|
+
frameIds?: string[];
|
|
71
81
|
cloneBranch?: string;
|
|
72
82
|
}[];
|
|
73
83
|
multiRepoSection?: string;
|
|
@@ -80,9 +90,13 @@ export declare function resolveMultiRepoFanout(context: AgentRunContext, args: {
|
|
|
80
90
|
* `context.conflictTarget`. Point the (single-repo) resolver at that PEER repo — resolve its
|
|
81
91
|
* target and swap `repo`/`common.repo` — instead of the task's own service. The resolver clones
|
|
82
92
|
* the peer's PR (work) branch and merges the peer's base in (jobBody pins the branch to the shared
|
|
83
|
-
* work branch and reads `mergeBase` off this swapped target).
|
|
84
|
-
* `frameId`, so this returns `undefined` and the resolver targets the own service. Extracted from
|
|
93
|
+
* work branch and reads `mergeBase` off this swapped target). Extracted from
|
|
85
94
|
* `ContainerAgentExecutor.resolveAuxiliaryRepos` to keep it under the complexity ceiling.
|
|
95
|
+
*
|
|
96
|
+
* Own or peer is decided by the target's REPO, the same field that addresses the checkout, and
|
|
97
|
+
* never by whether the gate managed to tag a frame beside it: the frame is attribution, it comes
|
|
98
|
+
* off a recorded pull request, and a record carrying none would otherwise read as an own-repo
|
|
99
|
+
* conflict and send the resolver at a repo that does not conflict.
|
|
86
100
|
*/
|
|
87
101
|
export declare function resolveConflictResolverPeer(context: AgentRunContext, args: {
|
|
88
102
|
workspaceId: string;
|
|
@@ -102,6 +116,15 @@ export declare function resolveConflictResolverPeer(context: AgentRunContext, ar
|
|
|
102
116
|
* own PR branch to check out, plus a section naming the sibling diff commands. Returns `undefined`
|
|
103
117
|
* (leaving the fan-out result to stand) when it doesn't fire. Extracted from
|
|
104
118
|
* `ContainerAgentExecutor.resolveAuxiliaryRepos` to keep it under the complexity ceiling.
|
|
119
|
+
*
|
|
120
|
+
* A recorded peer PR is addressed by its REPO, never by its frame attribution, which is the same
|
|
121
|
+
* split the conflict gate makes (`conflictTarget.frameId` addresses, `frameIds` attributes). The
|
|
122
|
+
* repo is what a checkout is, and it is the one field every recorded peer PR carries: keying the
|
|
123
|
+
* lookup on the attribution instead made a record whose frames were absent resolve to NOTHING, so
|
|
124
|
+
* the merger fell back to scoring the own-service diff alone and auto-merged a cross-repo change
|
|
125
|
+
* on a third of the evidence, with nothing to tell that apart from a genuine single-repo run.
|
|
126
|
+
* `resolveRepoTargets` is what CONFIRMS the repo (it is harness-reported), so a peer outside the
|
|
127
|
+
* resolved checkout set is dropped LOUDLY: named to the merger in the section, and logged.
|
|
105
128
|
*/
|
|
106
129
|
export declare function resolveMergerCombinedDiff(context: AgentRunContext, args: {
|
|
107
130
|
workspaceId: string;
|
|
@@ -111,7 +134,7 @@ export declare function resolveMergerCombinedDiff(context: AgentRunContext, args
|
|
|
111
134
|
}, deps: ContainerAgentExecutorDependencies): Promise<{
|
|
112
135
|
peerRepos: {
|
|
113
136
|
repo: Record<string, unknown>;
|
|
114
|
-
|
|
137
|
+
frameIds?: string[];
|
|
115
138
|
cloneBranch?: string;
|
|
116
139
|
}[];
|
|
117
140
|
multiRepoSection: string;
|
|
@@ -176,7 +199,7 @@ export declare function resolveAuxiliaryRepos(context: AgentRunContext, args: {
|
|
|
176
199
|
}, deps: ContainerAgentExecutorDependencies, agentKindRegistry: AgentKindRegistry): Promise<{
|
|
177
200
|
peerRepos?: {
|
|
178
201
|
repo: Record<string, unknown>;
|
|
179
|
-
|
|
202
|
+
frameIds?: string[];
|
|
180
203
|
cloneBranch?: string;
|
|
181
204
|
}[];
|
|
182
205
|
multiRepoSection?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"containerAgentBody.d.ts","sourceRoot":"","sources":["../../src/agents/containerAgentBody.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"containerAgentBody.d.ts","sourceRoot":"","sources":["../../src/agents/containerAgentBody.ts"],"names":[],"mappings":"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"}
|