@cat-factory/server 0.292.0 → 0.294.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 +5 -5
- package/dist/agents/ContainerAgentExecutor.js +10 -10
- package/dist/agents/ContainerAgentExecutor.js.map +1 -1
- package/dist/agents/agentContextRecord.d.ts.map +1 -1
- package/dist/agents/agentContextRecord.js +10 -0
- package/dist/agents/agentContextRecord.js.map +1 -1
- package/dist/agents/capabilitySecrets.d.ts +61 -0
- package/dist/agents/capabilitySecrets.d.ts.map +1 -0
- package/dist/agents/{binaryGenerators.js → capabilitySecrets.js} +98 -62
- package/dist/agents/capabilitySecrets.js.map +1 -0
- package/dist/agents/containerAgentBody.d.ts +2 -2
- package/dist/agents/containerAgentBody.d.ts.map +1 -1
- package/dist/agents/containerAgentBody.js +11 -10
- package/dist/agents/containerAgentBody.js.map +1 -1
- package/dist/agents/modelProviderResolver.js +4 -3
- package/dist/agents/modelProviderResolver.js.map +1 -1
- package/dist/agents/providerCapabilities.d.ts +2 -2
- package/dist/agents/providerErrors.d.ts +4 -4
- package/dist/agents/providerErrors.d.ts.map +1 -1
- package/dist/agents/providerErrors.js +24 -11
- package/dist/agents/providerErrors.js.map +1 -1
- package/dist/http/env.d.ts +1 -1
- package/dist/modules/capabilityCredentials/CapabilityCredentialsController.d.ts.map +1 -1
- package/dist/modules/capabilityCredentials/CapabilityCredentialsController.js +1 -0
- package/dist/modules/capabilityCredentials/CapabilityCredentialsController.js.map +1 -1
- package/dist/modules/capabilityCredentials/declaredCredentials.d.ts +21 -7
- package/dist/modules/capabilityCredentials/declaredCredentials.d.ts.map +1 -1
- package/dist/modules/capabilityCredentials/declaredCredentials.js +18 -2
- package/dist/modules/capabilityCredentials/declaredCredentials.js.map +1 -1
- package/dist/modules/llmProxy/LlmProxyController.d.ts.map +1 -1
- package/dist/modules/llmProxy/LlmProxyController.js +66 -27
- package/dist/modules/llmProxy/LlmProxyController.js.map +1 -1
- package/dist/runtime/gateways.d.ts +23 -8
- package/dist/runtime/gateways.d.ts.map +1 -1
- package/package.json +7 -7
- package/dist/agents/binaryGenerators.d.ts +0 -40
- package/dist/agents/binaryGenerators.d.ts.map +0 -1
- package/dist/agents/binaryGenerators.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"containerAgentBody.d.ts","sourceRoot":"","sources":["../../src/agents/containerAgentBody.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACnB,cAAc,EACd,WAAW,EACX,QAAQ,EACT,MAAM,qBAAqB,CAAA;AAM5B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAO5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AACxD,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"containerAgentBody.d.ts","sourceRoot":"","sources":["../../src/agents/containerAgentBody.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { dispatchNeedsHarnessGeneration, noopLogger, resolveDesignImageDelivery, } from '@cat-factory/kernel';
|
|
2
2
|
import { CONFLICT_RESOLVER_AGENT_KIND, MERGER_AGENT_KIND, SPEC_WRITER_AGENT_KIND, } from '@cat-factory/orchestration';
|
|
3
3
|
import { DOC_WRITER_KIND, READ_ONLY_AGENT_KINDS } from '@cat-factory/agents';
|
|
4
|
-
import {
|
|
4
|
+
import { aprioriReferenceBranches, storesThroughPlatformAssets } from '@cat-factory/contracts';
|
|
5
5
|
import { renderMergerMultiRepoSection, renderMultiRepoWorkspaceSection, renderReferenceBranchesSection, renderReferenceReposSection, } from './jobBody.js';
|
|
6
6
|
/**
|
|
7
7
|
* Job-body assembly helpers for {@link ContainerAgentExecutor}, extracted verbatim from
|
|
@@ -132,7 +132,7 @@ function artifactUploadFor(context, auth, agentKindRegistry) {
|
|
|
132
132
|
const { proxyBaseUrl, sessionToken } = auth;
|
|
133
133
|
if (typeof proxyBaseUrl !== 'string' || typeof sessionToken !== 'string')
|
|
134
134
|
return undefined;
|
|
135
|
-
if (context.binaryStorageServiceId
|
|
135
|
+
if (storesThroughPlatformAssets(context.binaryStorageServiceId)) {
|
|
136
136
|
return { url: `${proxyBaseUrl}/assets/ingest`, token: sessionToken };
|
|
137
137
|
}
|
|
138
138
|
if (agentKindRegistry.agentStep(context.agentKind)?.image === 'ui') {
|
|
@@ -147,7 +147,7 @@ function artifactUploadFor(context, auth, agentKindRegistry) {
|
|
|
147
147
|
*/
|
|
148
148
|
export function buildCommonBody(context, args, deps, agentKindRegistry) {
|
|
149
149
|
const { jobId, model, auth, ghToken, packageRegistries, repoSpec, contextFiles } = args;
|
|
150
|
-
const { skillsBody, mcpServers,
|
|
150
|
+
const { skillsBody, mcpServers, capabilitySecrets, guardLimits } = args;
|
|
151
151
|
// Where this job sends the bytes it produces, if it produces any. See {@link artifactUploadFor}.
|
|
152
152
|
const artifactUpload = artifactUploadFor(context, auth, agentKindRegistry);
|
|
153
153
|
// The other direction of the same seam: the images the engine resolved for this task, as
|
|
@@ -190,13 +190,14 @@ export function buildCommonBody(context, args, deps, agentKindRegistry) {
|
|
|
190
190
|
// credentials. Also a dedicated top-level field the agent-context snapshot allow-list omits —
|
|
191
191
|
// the prompt-facing (non-secret) projection rides `context.toolServers` instead.
|
|
192
192
|
...(mcpServers?.length ? { mcpServers } : {}),
|
|
193
|
-
// The resolved credentials of this step's
|
|
194
|
-
//
|
|
195
|
-
//
|
|
196
|
-
//
|
|
197
|
-
// the
|
|
198
|
-
//
|
|
199
|
-
|
|
193
|
+
// The resolved credentials of this step's registered CAPABILITIES (its generative binary
|
|
194
|
+
// integrations, and the foundational services it was briefed to read and store through), as
|
|
195
|
+
// `{ key, value }` env pairs the harness injects into the agent's own process — the same
|
|
196
|
+
// channel and the same secrecy contract as the tester's `testSecrets`, and likewise omitted by
|
|
197
|
+
// the agent-context snapshot's allow-list. On the BASE body (not a per-kind one) because the
|
|
198
|
+
// kinds that carry these traits are a deployment's own, and gating this on a built-in kind
|
|
199
|
+
// list is exactly the coupling the traits exist to avoid.
|
|
200
|
+
...(capabilitySecrets?.length ? { capabilitySecrets } : {}),
|
|
200
201
|
// Switch on the agent CLI's OWN generation tool when this step selected a harness-served
|
|
201
202
|
// integration. Keyed off the TRANSPORT, never off a CLI name: which tool that is belongs to
|
|
202
203
|
// the harness, and admission has already refused a step whose model resolves to a CLI that
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"containerAgentBody.js","sourceRoot":"","sources":["../../src/agents/containerAgentBody.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"containerAgentBody.js","sourceRoot":"","sources":["../../src/agents/containerAgentBody.ts"],"names":[],"mappings":"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"}
|
|
@@ -135,9 +135,10 @@ function buildDirectResolver(provider, apiKey, baseURL) {
|
|
|
135
135
|
return openAiResolver({ apiKey, baseURL });
|
|
136
136
|
if (provider === 'anthropic')
|
|
137
137
|
return anthropicResolver({ apiKey, baseURL });
|
|
138
|
-
// qwen / deepseek / moonshot / openrouter / litellm expose an OpenAI-compatible
|
|
139
|
-
// base URL.
|
|
140
|
-
// unset" case
|
|
138
|
+
// qwen / deepseek / moonshot / xai / openrouter / bifrost / litellm expose an OpenAI-compatible
|
|
139
|
+
// API and need a base URL. The operator-hosted gateways have no public default, so this is the
|
|
140
|
+
// common "key pooled, `${PROVIDER}_BASE_URL` unset" case, and openAiCompatibleBaseUrlError names
|
|
141
|
+
// each of them specifically.
|
|
141
142
|
if (!baseURL) {
|
|
142
143
|
throw new Error(openAiCompatibleBaseUrlError(provider));
|
|
143
144
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelProviderResolver.js","sourceRoot":"","sources":["../../src/agents/modelProviderResolver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"modelProviderResolver.js","sourceRoot":"","sources":["../../src/agents/modelProviderResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,8 +19,8 @@ export interface CapabilityServices {
|
|
|
19
19
|
* The deployment's base-URL resolver (the same one the model-provider resolver uses).
|
|
20
20
|
* OpenAI-compatible providers (everything but `openai`/`anthropic`) cannot resolve
|
|
21
21
|
* without a base URL — most carry a built-in default, but an operator-hosted gateway
|
|
22
|
-
*
|
|
23
|
-
* configured key for such a provider is treated as selectable ONLY once its base URL
|
|
22
|
+
* (Bifrost, LiteLLM) has none until its own `${PROVIDER}_BASE_URL` is set. When this resolver is
|
|
23
|
+
* wired, a configured key for such a provider is treated as selectable ONLY once its base URL
|
|
24
24
|
* resolves, so the catalog + start guard don't offer a model that fails at dispatch.
|
|
25
25
|
*/
|
|
26
26
|
baseUrlFor?: (provider: string) => string | null | undefined;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* The remedy for an OpenAI-compatible provider selected without a resolvable base URL.
|
|
3
|
-
* gets a dedicated message naming `
|
|
4
|
-
* provider names
|
|
5
|
-
* pooled key for it is inert until the base URL is set.
|
|
2
|
+
* The remedy for an OpenAI-compatible provider selected without a resolvable base URL. An
|
|
3
|
+
* operator-hosted gateway gets a dedicated message naming its own `${PROVIDER}_BASE_URL` (there is
|
|
4
|
+
* no public endpoint to default to); every other provider names that override and points at the
|
|
5
|
+
* workspace key pool, since a pooled key for it is inert until the base URL is set.
|
|
6
6
|
*/
|
|
7
7
|
export declare function openAiCompatibleBaseUrlError(provider: string): string;
|
|
8
8
|
//# sourceMappingURL=providerErrors.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providerErrors.d.ts","sourceRoot":"","sources":["../../src/agents/providerErrors.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"providerErrors.d.ts","sourceRoot":"","sources":["../../src/agents/providerErrors.ts"],"names":[],"mappings":"AAwBA;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAmBrE"}
|
|
@@ -1,27 +1,40 @@
|
|
|
1
|
+
import { isOperatorHostedGateway } from '@cat-factory/agents';
|
|
1
2
|
import { DOCS, ENV_VARS_ANCHORS } from '../config/docs.js';
|
|
2
3
|
// Remedies for the OpenAI-compatible providers that resolve only once a base URL is configured.
|
|
3
4
|
// Two failure classes share this wording so the inline model provider and the container LLM proxy
|
|
4
5
|
// explain the same condition identically:
|
|
5
6
|
// - a UI-pooled key exists but the provider has no resolvable base URL (the inline resolver), and
|
|
6
7
|
// - a container agent's locked provider resolves to no upstream (the proxy).
|
|
7
|
-
// LiteLLM
|
|
8
|
-
// base URL MUST come from
|
|
9
|
-
// the one thing an operator needs to know
|
|
8
|
+
// The operator-hosted gateways (Bifrost, LiteLLM) are called out specially: they are self-hosted
|
|
9
|
+
// software with NO public endpoint, so the base URL MUST come from their `${PROVIDER}_BASE_URL`:
|
|
10
|
+
// the generic wording buries the one thing an operator needs to know behind "the provider's
|
|
11
|
+
// OpenAI-compatible endpoint", which for a gateway they run themselves reads as nothing at all.
|
|
10
12
|
/**
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
*
|
|
13
|
+
* How each operator-hosted gateway is spelled to a human. An exhaustive `Record` over the union
|
|
14
|
+
* {@link OperatorHostedGateway}, which is itself DERIVED from the endpoint table, so adding an
|
|
15
|
+
* endpoint-less gateway there fails to compile until its remedy can name it, rather than
|
|
16
|
+
* degrading to the generic message that tells its operator nothing.
|
|
17
|
+
*/
|
|
18
|
+
const OPERATOR_HOSTED_GATEWAY_LABELS = {
|
|
19
|
+
bifrost: 'Bifrost',
|
|
20
|
+
litellm: 'LiteLLM',
|
|
21
|
+
};
|
|
22
|
+
/**
|
|
23
|
+
* The remedy for an OpenAI-compatible provider selected without a resolvable base URL. An
|
|
24
|
+
* operator-hosted gateway gets a dedicated message naming its own `${PROVIDER}_BASE_URL` (there is
|
|
25
|
+
* no public endpoint to default to); every other provider names that override and points at the
|
|
26
|
+
* workspace key pool, since a pooled key for it is inert until the base URL is set.
|
|
15
27
|
*/
|
|
16
28
|
export function openAiCompatibleBaseUrlError(provider) {
|
|
17
|
-
|
|
18
|
-
|
|
29
|
+
const envVar = `${provider.toUpperCase()}_BASE_URL`;
|
|
30
|
+
if (isOperatorHostedGateway(provider)) {
|
|
31
|
+
const label = OPERATOR_HOSTED_GATEWAY_LABELS[provider];
|
|
32
|
+
return (`${label} is selected but its base URL is not configured. ${label} is an operator-hosted ` +
|
|
19
33
|
`gateway with no public endpoint, so its base URL must be set explicitly. ` +
|
|
20
|
-
`Fix: set
|
|
34
|
+
`Fix: set ${envVar} to your ${label} gateway URL and restart. A ${label} key added ` +
|
|
21
35
|
`to the workspace AI provider key pool stays unselectable until it is set. ` +
|
|
22
36
|
`See ${DOCS.envVars(ENV_VARS_ANCHORS.modelProviders)}`);
|
|
23
37
|
}
|
|
24
|
-
const envVar = `${provider.toUpperCase()}_BASE_URL`;
|
|
25
38
|
return (`Provider '${provider}' uses an OpenAI-compatible API and needs a base URL, but none is ` +
|
|
26
39
|
`configured. Fix: set ${envVar} to the provider's OpenAI-compatible endpoint and restart. ` +
|
|
27
40
|
`If you added this provider's API key to the workspace AI provider key pool ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providerErrors.js","sourceRoot":"","sources":["../../src/agents/providerErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,gGAAgG;AAChG,kGAAkG;AAClG,0CAA0C;AAC1C,oGAAoG;AACpG,+EAA+E;AAC/E,
|
|
1
|
+
{"version":3,"file":"providerErrors.js","sourceRoot":"","sources":["../../src/agents/providerErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAA8B,MAAM,qBAAqB,CAAA;AACzF,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,gGAAgG;AAChG,kGAAkG;AAClG,0CAA0C;AAC1C,oGAAoG;AACpG,+EAA+E;AAC/E,iGAAiG;AACjG,iGAAiG;AACjG,4FAA4F;AAC5F,gGAAgG;AAEhG;;;;;GAKG;AACH,MAAM,8BAA8B,GAA0C;IAC5E,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;CACnB,CAAA;AAED;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAAC,QAAgB;IAC3D,MAAM,MAAM,GAAG,GAAG,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAA;IACnD,IAAI,uBAAuB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtC,MAAM,KAAK,GAAG,8BAA8B,CAAC,QAAQ,CAAC,CAAA;QACtD,OAAO,CACL,GAAG,KAAK,oDAAoD,KAAK,yBAAyB;YAC1F,2EAA2E;YAC3E,YAAY,MAAM,YAAY,KAAK,+BAA+B,KAAK,aAAa;YACpF,4EAA4E;YAC5E,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,EAAE,CACvD,CAAA;IACH,CAAC;IACD,OAAO,CACL,aAAa,QAAQ,oEAAoE;QACzF,wBAAwB,MAAM,6DAA6D;QAC3F,6EAA6E;QAC7E,0EAA0E;QAC1E,OAAO,IAAI,CAAC,YAAY,EAAE,EAAE,CAC7B,CAAA;AACH,CAAC"}
|
package/dist/http/env.d.ts
CHANGED
|
@@ -251,7 +251,7 @@ export interface ServerContainer extends Core {
|
|
|
251
251
|
bedrockModels?: Set<string>;
|
|
252
252
|
/**
|
|
253
253
|
* The deployment's direct-provider base-URL resolver (env override → built-in default,
|
|
254
|
-
* or null when none
|
|
254
|
+
* or null when none, e.g. an unconfigured operator-hosted gateway, Bifrost or LiteLLM). The model
|
|
255
255
|
* catalog uses it to gate selectability: an OpenAI-compatible provider is only
|
|
256
256
|
* selectable once its base URL resolves, mirroring what the dispatch path requires.
|
|
257
257
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CapabilityCredentialsController.d.ts","sourceRoot":"","sources":["../../../src/modules/capabilityCredentials/CapabilityCredentialsController.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAG3B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"CapabilityCredentialsController.d.ts","sourceRoot":"","sources":["../../../src/modules/capabilityCredentials/CapabilityCredentialsController.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAG3B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAkD/C;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,+BAA+B,IAAI,IAAI,CAAC,MAAM,CAAC,CAoC9D"}
|
|
@@ -19,6 +19,7 @@ async function viewFor(container, stored) {
|
|
|
19
19
|
const declarations = await collectDeclaredCapabilityCredentials({
|
|
20
20
|
agentKindRegistry: container.agentKindRegistry,
|
|
21
21
|
binaryGenerators: container.binaryGenerators,
|
|
22
|
+
foundationalBuiltins: container.foundationalBuiltins,
|
|
22
23
|
logger,
|
|
23
24
|
});
|
|
24
25
|
return buildCapabilityCredentialsView({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CapabilityCredentialsController.js","sourceRoot":"","sources":["../../../src/modules/capabilityCredentials/CapabilityCredentialsController.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"CapabilityCredentialsController.js","sourceRoot":"","sources":["../../../src/modules/capabilityCredentials/CapabilityCredentialsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import type { BinaryGeneratorSource, Logger } from '@cat-factory/kernel';
|
|
1
|
+
import type { BinaryGeneratorSource, FoundationalBuiltinSource, Logger } from '@cat-factory/kernel';
|
|
2
2
|
import type { AgentKindRegistry } from '@cat-factory/agents';
|
|
3
3
|
import type { CapabilityCredentialRef, CapabilityCredentialsView } from '@cat-factory/contracts';
|
|
4
4
|
/** One capability's declaration of a credential it needs, flattened for the join below. */
|
|
5
5
|
export interface DeclaredCapabilityCredential {
|
|
6
|
-
subject: 'tool-server' | 'binary-generator';
|
|
6
|
+
subject: 'tool-server' | 'binary-generator' | 'foundational-service';
|
|
7
7
|
id: string;
|
|
8
8
|
label: string;
|
|
9
9
|
key: string;
|
|
@@ -14,10 +14,13 @@ export interface DeclaredCapabilityCredential {
|
|
|
14
14
|
export interface DeclaredCapabilityCredentials {
|
|
15
15
|
declared: DeclaredCapabilityCredential[];
|
|
16
16
|
/**
|
|
17
|
-
* True when
|
|
18
|
-
* answering an empty set when
|
|
19
|
-
*
|
|
20
|
-
* workspace snapshot's picker applies to the
|
|
17
|
+
* True when either REMOTE-CAPABLE half could not be read. `BinaryGeneratorSource` and
|
|
18
|
+
* `FoundationalBuiltinSource` both throw rather than answering an empty set when they cannot
|
|
19
|
+
* reach the mothership, and this surface must not turn that outage into "nothing needs a
|
|
20
|
+
* credential" — the same "absent ≠ zero" rule the workspace snapshot's picker applies to the
|
|
21
|
+
* same reads. One flag rather than one per half, because what it changes downstream is a single
|
|
22
|
+
* judgement (whether a stored key with no declarer may be called orphaned), and that judgement
|
|
23
|
+
* is unsafe if EITHER half is short.
|
|
21
24
|
*/
|
|
22
25
|
incomplete: boolean;
|
|
23
26
|
}
|
|
@@ -25,9 +28,20 @@ export interface CollectDeclaredCredentialsInput {
|
|
|
25
28
|
agentKindRegistry: AgentKindRegistry;
|
|
26
29
|
/** The set a RUN resolves against — this process's registry, or the mothership's. */
|
|
27
30
|
binaryGenerators: BinaryGeneratorSource;
|
|
31
|
+
/**
|
|
32
|
+
* The catalog's `builtin` tier, read through the SOURCE for the reason the generators are:
|
|
33
|
+
* on a mothership-mode node the estate is the mothership's, and a checklist built from this
|
|
34
|
+
* process's own registry would ask an operator for keys no run resolves against.
|
|
35
|
+
*
|
|
36
|
+
* Only this tier appears, because only a code-registered service may declare a credential
|
|
37
|
+
* (`storedTierMayNotDeclareCredentials`): the resolver reads a declared key off the
|
|
38
|
+
* deployment's own environment, so a stored row naming one would be a workspace admin asking
|
|
39
|
+
* the platform to read deployment-level secret state into an agent process.
|
|
40
|
+
*/
|
|
41
|
+
foundationalBuiltins: FoundationalBuiltinSource;
|
|
28
42
|
logger?: Logger;
|
|
29
43
|
}
|
|
30
|
-
/** Every credential a registered tool server
|
|
44
|
+
/** Every credential a registered tool server, generative integration or catalog service declares. */
|
|
31
45
|
export declare function collectDeclaredCapabilityCredentials(input: CollectDeclaredCredentialsInput): Promise<DeclaredCapabilityCredentials>;
|
|
32
46
|
/**
|
|
33
47
|
* Join what the deployment DECLARES to what the workspace has STORED.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declaredCredentials.d.ts","sourceRoot":"","sources":["../../../src/modules/capabilityCredentials/declaredCredentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"declaredCredentials.d.ts","sourceRoot":"","sources":["../../../src/modules/capabilityCredentials/declaredCredentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAEnG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAC5D,OAAO,KAAK,EACV,uBAAuB,EAEvB,yBAAyB,EAC1B,MAAM,wBAAwB,CAAA;AAkB/B,2FAA2F;AAC3F,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE,aAAa,GAAG,kBAAkB,GAAG,sBAAsB,CAAA;IACpE,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,qFAAqF;IACrF,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,4BAA4B,EAAE,CAAA;IACxC;;;;;;;;OAQG;IACH,UAAU,EAAE,OAAO,CAAA;CACpB;AAED,MAAM,WAAW,+BAA+B;IAC9C,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,qFAAqF;IACrF,gBAAgB,EAAE,qBAAqB,CAAA;IACvC;;;;;;;;;OASG;IACH,oBAAoB,EAAE,yBAAyB,CAAA;IAC/C,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,qGAAqG;AACrG,wBAAsB,oCAAoC,CACxD,KAAK,EAAE,+BAA+B,GACrC,OAAO,CAAC,6BAA6B,CAAC,CAwFxC;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAAC,KAAK,EAAE;IACpD,YAAY,EAAE,6BAA6B,CAAA;IAC3C,MAAM,EAAE,uBAAuB,EAAE,CAAA;IACjC;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,GAAG,yBAAyB,CA0C5B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { noopLogger, runBestEffort } from '@cat-factory/kernel';
|
|
2
|
-
/** Every credential a registered tool server
|
|
2
|
+
/** Every credential a registered tool server, generative integration or catalog service declares. */
|
|
3
3
|
export async function collectDeclaredCapabilityCredentials(input) {
|
|
4
4
|
const declared = [];
|
|
5
5
|
const seen = new Set();
|
|
@@ -62,7 +62,23 @@ export async function collectDeclaredCapabilityCredentials(input) {
|
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
|
-
|
|
65
|
+
// The third declarer, read on the same terms as the generators above and folded into the same
|
|
66
|
+
// `incomplete` flag: a service whose credential the operator never fills in is a step that
|
|
67
|
+
// generates fine and cannot store a byte.
|
|
68
|
+
const services = await runBestEffort(input.logger ?? noopLogger, 'read foundational services for the credential checklist', () => input.foundationalBuiltins.entries());
|
|
69
|
+
for (const service of services ?? []) {
|
|
70
|
+
for (const credential of service.credentials ?? []) {
|
|
71
|
+
push({
|
|
72
|
+
subject: 'foundational-service',
|
|
73
|
+
id: service.id,
|
|
74
|
+
label: service.name,
|
|
75
|
+
key: credential.key,
|
|
76
|
+
...(credential.usage ? { usage: credential.usage } : {}),
|
|
77
|
+
required: credential.required !== false,
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return { declared, incomplete: views === undefined || services === undefined };
|
|
66
82
|
}
|
|
67
83
|
/**
|
|
68
84
|
* Join what the deployment DECLARES to what the workspace has STORED.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"declaredCredentials.js","sourceRoot":"","sources":["../../../src/modules/capabilityCredentials/declaredCredentials.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"declaredCredentials.js","sourceRoot":"","sources":["../../../src/modules/capabilityCredentials/declaredCredentials.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LlmProxyController.d.ts","sourceRoot":"","sources":["../../../src/modules/llmProxy/LlmProxyController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,IAAI,EAAE,MAAM,MAAM,CAAA;AAqBzC,OAAO,KAAK,EAAE,MAAM,EAAmB,MAAM,mBAAmB,CAAA;AAoDhE;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IAC3C,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,UAAU,EAAE,MAAM,CAAA;CACnB,GAAG,MAAM,CAQT;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAI5E;
|
|
1
|
+
{"version":3,"file":"LlmProxyController.d.ts","sourceRoot":"","sources":["../../../src/modules/llmProxy/LlmProxyController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,IAAI,EAAE,MAAM,MAAM,CAAA;AAqBzC,OAAO,KAAK,EAAE,MAAM,EAAmB,MAAM,mBAAmB,CAAA;AAoDhE;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IAC3C,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,UAAU,EAAE,MAAM,CAAA;CACnB,GAAG,MAAM,CAQT;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAI5E;AAg0BD,wBAAgB,kBAAkB,IAAI,IAAI,CAAC,MAAM,CAAC,CAcjD"}
|
|
@@ -116,12 +116,13 @@ function applyWorkersAiCeiling(session, payload, current) {
|
|
|
116
116
|
return floored;
|
|
117
117
|
}
|
|
118
118
|
/**
|
|
119
|
-
*
|
|
120
|
-
*
|
|
121
|
-
*
|
|
119
|
+
* Run a binding-reached provider in-process via the facade's gateway, which owns the model timing
|
|
120
|
+
* and reports its own observation via `recordMetric`. Returns null when this runtime has no
|
|
121
|
+
* in-process path at all, leaving the caller to try the forward path; we only observe here when
|
|
122
|
+
* the dispatch itself throws.
|
|
122
123
|
*/
|
|
123
|
-
|
|
124
|
-
const { session, payload, streaming, gateways,
|
|
124
|
+
function dispatchInProcess(c, ctx) {
|
|
125
|
+
const { session, payload, streaming, gateways, observe, record, waitUntil, log } = ctx;
|
|
125
126
|
const dispatchAt = Date.now();
|
|
126
127
|
const inProcess = gateways.llmUpstream.runInProcess({
|
|
127
128
|
model: session.model,
|
|
@@ -132,24 +133,40 @@ async function dispatchInProcess(c, ctx) {
|
|
|
132
133
|
waitUntil,
|
|
133
134
|
log,
|
|
134
135
|
});
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
}
|
|
152
|
-
|
|
136
|
+
return inProcess ? awaitInProcess(c, ctx, inProcess, dispatchAt) : null;
|
|
137
|
+
}
|
|
138
|
+
/**
|
|
139
|
+
* Neither route exists in this runtime for a provider that needs one of them: no binding to run
|
|
140
|
+
* in-process and no OpenAI-compatible upstream to forward to. Reported as unavailable rather than
|
|
141
|
+
* as an upstream failure, because nothing was dialled.
|
|
142
|
+
*/
|
|
143
|
+
function inProcessUnavailable(c, ctx) {
|
|
144
|
+
const { session, log, observe } = ctx;
|
|
145
|
+
log.error('llm proxy: provider has neither an in-process nor a forwardable route here');
|
|
146
|
+
observe({
|
|
147
|
+
usage: null,
|
|
148
|
+
finishReason: null,
|
|
149
|
+
responseText: '',
|
|
150
|
+
ok: false,
|
|
151
|
+
httpStatus: 502,
|
|
152
|
+
errorMessage: `Provider '${session.provider}' is not available`,
|
|
153
|
+
upstreamMs: 0,
|
|
154
|
+
});
|
|
155
|
+
return c.json({
|
|
156
|
+
error: {
|
|
157
|
+
code: 'upstream_unavailable',
|
|
158
|
+
message: `Provider '${session.provider}' is not available`,
|
|
159
|
+
},
|
|
160
|
+
}, 502);
|
|
161
|
+
}
|
|
162
|
+
/**
|
|
163
|
+
* Await an in-process dispatch, mapping a throw onto the same observed 502 the forward path
|
|
164
|
+
* reports. Split from {@link dispatchInProcess} so that helper can answer "no in-process route
|
|
165
|
+
* here" SYNCHRONOUSLY (a null, not a rejected promise) and its caller can try the forward path
|
|
166
|
+
* without having to distinguish the two failures after the fact.
|
|
167
|
+
*/
|
|
168
|
+
async function awaitInProcess(c, ctx, inProcess, dispatchAt) {
|
|
169
|
+
const { session, log, observe } = ctx;
|
|
153
170
|
try {
|
|
154
171
|
return await inProcess;
|
|
155
172
|
}
|
|
@@ -262,6 +279,18 @@ async function resolveUpstreamTarget(c, ctx) {
|
|
|
262
279
|
failure: c.json({ error: { code: 'upstream_error', message: 'Upstream provider request failed' } }, 502),
|
|
263
280
|
};
|
|
264
281
|
}
|
|
282
|
+
// An upstream that carries its OWN bearer has no pool to lease from: its provider is outside
|
|
283
|
+
// the `ApiKeyProvider` vocabulary and its credential is a deployment-level fact (Cloudflare
|
|
284
|
+
// Workers AI over REST). Skip the lease rather than failing on an empty pool, and attribute no
|
|
285
|
+
// key id to the spend row, exactly as the local-runner branch does.
|
|
286
|
+
if (upstream.apiKey) {
|
|
287
|
+
return {
|
|
288
|
+
upstreamUrl: `${upstream.baseURL}/chat/completions`,
|
|
289
|
+
apiKey: upstream.apiKey,
|
|
290
|
+
leasedApiKeyId: null,
|
|
291
|
+
fetchRunner: null,
|
|
292
|
+
};
|
|
293
|
+
}
|
|
265
294
|
// Lease the API key for this provider from the DB-backed pool (workspace + owning account + the
|
|
266
295
|
// run initiator), scoped from the signed session claims. Keys are no longer env-baked: an empty
|
|
267
296
|
// pool means the provider is not configured.
|
|
@@ -699,10 +728,20 @@ async function handleChatCompletion(c) {
|
|
|
699
728
|
observe,
|
|
700
729
|
record,
|
|
701
730
|
};
|
|
702
|
-
// Workers AI
|
|
703
|
-
//
|
|
704
|
-
|
|
705
|
-
|
|
731
|
+
// Workers AI is reached through the in-process Cloudflare `AI` BINDING on a runtime that has one
|
|
732
|
+
// (the Worker) and over Cloudflare's OpenAI-compatible REST endpoint on one that does not (Node,
|
|
733
|
+
// local). Prefer the binding, then fall through to the shared forward path, and report the
|
|
734
|
+
// provider unavailable only when NEITHER route resolves: `isProxyableProvider` admits
|
|
735
|
+
// `workers-ai` at dispatch on every facade, so a facade that can serve it must not refuse it
|
|
736
|
+
// here (that mismatch is what killed an xai-pinned run mid-flight before the shared table).
|
|
737
|
+
if (session.provider === 'workers-ai') {
|
|
738
|
+
const inProcess = dispatchInProcess(c, ctx);
|
|
739
|
+
if (inProcess)
|
|
740
|
+
return inProcess;
|
|
741
|
+
if (!gateways.llmUpstream.resolveOpenAiCompatible(session.provider)) {
|
|
742
|
+
return inProcessUnavailable(c, ctx);
|
|
743
|
+
}
|
|
744
|
+
}
|
|
706
745
|
// Resolve the upstream base URL + bearer key (local runner vs the DB-backed key pool), then
|
|
707
746
|
// forward + meter. A failure is already observed and returned ready-to-send.
|
|
708
747
|
const target = await resolveUpstreamTarget(c, ctx);
|