@xrkseek/harness-cli 0.0.2 → 0.0.4
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/README.md +5 -0
- package/dist/commands/restart.d.ts +3 -0
- package/dist/commands/restart.d.ts.map +1 -0
- package/dist/commands/restart.js +32 -0
- package/dist/commands/restart.js.map +1 -0
- package/dist/commands/serve.d.ts.map +1 -1
- package/dist/commands/serve.js +38 -19
- package/dist/commands/serve.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/log.d.ts +19 -0
- package/dist/log.d.ts.map +1 -0
- package/dist/log.js +52 -0
- package/dist/log.js.map +1 -0
- package/dist/parse-args.d.ts +5 -1
- package/dist/parse-args.d.ts.map +1 -1
- package/dist/parse-args.js +37 -4
- package/dist/parse-args.js.map +1 -1
- package/dist/port.d.ts +9 -0
- package/dist/port.d.ts.map +1 -0
- package/dist/port.js +86 -0
- package/dist/port.js.map +1 -0
- package/node_modules/@xrkseek/core-agent/dist/index.d.ts +2 -0
- package/node_modules/@xrkseek/core-agent/dist/index.d.ts.map +1 -1
- package/node_modules/@xrkseek/core-agent/dist/index.js +3 -0
- package/node_modules/@xrkseek/core-agent/dist/index.js.map +1 -1
- package/node_modules/@xrkseek/core-agent-loop/dist/index.d.ts +5 -0
- package/node_modules/@xrkseek/core-agent-loop/dist/index.d.ts.map +1 -1
- package/node_modules/@xrkseek/core-agent-loop/dist/index.js +3 -0
- package/node_modules/@xrkseek/core-agent-loop/dist/index.js.map +1 -1
- package/node_modules/@xrkseek/core-agent-loop/dist/settle-batch.d.ts +5 -0
- package/node_modules/@xrkseek/core-agent-loop/dist/settle-batch.d.ts.map +1 -1
- package/node_modules/@xrkseek/core-agent-loop/dist/settle-batch.js +22 -2
- package/node_modules/@xrkseek/core-agent-loop/dist/settle-batch.js.map +1 -1
- package/node_modules/@xrkseek/core-session/dist/compaction.d.ts.map +1 -1
- package/node_modules/@xrkseek/core-session/dist/compaction.js.map +1 -1
- package/node_modules/@xrkseek/exec-shell/dist/index.d.ts +4 -1
- package/node_modules/@xrkseek/exec-shell/dist/index.d.ts.map +1 -1
- package/node_modules/@xrkseek/exec-shell/dist/index.js +18 -2
- package/node_modules/@xrkseek/exec-shell/dist/index.js.map +1 -1
- package/node_modules/@xrkseek/exec-web/dist/fetch-http.js +1 -1
- package/node_modules/@xrkseek/exec-web/dist/index.d.ts +9 -2
- package/node_modules/@xrkseek/exec-web/dist/index.d.ts.map +1 -1
- package/node_modules/@xrkseek/exec-web/dist/index.js +10 -7
- package/node_modules/@xrkseek/exec-web/dist/index.js.map +1 -1
- package/node_modules/@xrkseek/exec-web/dist/search-duckduckgo.d.ts +14 -0
- package/node_modules/@xrkseek/exec-web/dist/search-duckduckgo.d.ts.map +1 -0
- package/node_modules/@xrkseek/exec-web/dist/search-duckduckgo.js +139 -0
- package/node_modules/@xrkseek/exec-web/dist/search-duckduckgo.js.map +1 -0
- package/node_modules/@xrkseek/exec-web/dist/search-mcp-client.d.ts +21 -0
- package/node_modules/@xrkseek/exec-web/dist/search-mcp-client.d.ts.map +1 -0
- package/node_modules/@xrkseek/exec-web/dist/search-mcp-client.js +175 -0
- package/node_modules/@xrkseek/exec-web/dist/search-mcp-client.js.map +1 -0
- package/node_modules/@xrkseek/exec-web/dist/search-parallel-free.d.ts +12 -0
- package/node_modules/@xrkseek/exec-web/dist/search-parallel-free.d.ts.map +1 -0
- package/node_modules/@xrkseek/exec-web/dist/search-parallel-free.js +105 -0
- package/node_modules/@xrkseek/exec-web/dist/search-parallel-free.js.map +1 -0
- package/node_modules/@xrkseek/exec-web/dist/search-providers.d.ts +28 -3
- package/node_modules/@xrkseek/exec-web/dist/search-providers.d.ts.map +1 -1
- package/node_modules/@xrkseek/exec-web/dist/search-providers.js +150 -23
- package/node_modules/@xrkseek/exec-web/dist/search-providers.js.map +1 -1
- package/node_modules/@xrkseek/mcp/dist/client.d.ts.map +1 -1
- package/node_modules/@xrkseek/mcp/dist/client.js.map +1 -1
- package/node_modules/@xrkseek/mcp/dist/project-content.js +1 -1
- package/node_modules/@xrkseek/mcp/dist/project-content.js.map +1 -1
- package/node_modules/@xrkseek/preset-harness/dist/preset.d.ts +11 -0
- package/node_modules/@xrkseek/preset-harness/dist/preset.d.ts.map +1 -1
- package/node_modules/@xrkseek/preset-harness/dist/preset.js +12 -2
- package/node_modules/@xrkseek/preset-harness/dist/preset.js.map +1 -1
- package/node_modules/@xrkseek/preset-harness/dist/tsconfig.tsbuildinfo +1 -1
- package/node_modules/@xrkseek/preset-minimal/dist/tsconfig.tsbuildinfo +1 -1
- package/node_modules/@xrkseek/preset-server/dist/preset.d.ts.map +1 -1
- package/node_modules/@xrkseek/preset-server/dist/preset.js +4 -1
- package/node_modules/@xrkseek/preset-server/dist/preset.js.map +1 -1
- package/node_modules/@xrkseek/preset-server/dist/tsconfig.tsbuildinfo +1 -1
- package/node_modules/@xrkseek/protocol/dist/token-usage.d.ts +7 -1
- package/node_modules/@xrkseek/protocol/dist/token-usage.d.ts.map +1 -1
- package/node_modules/@xrkseek/protocol/dist/token-usage.js +49 -24
- package/node_modules/@xrkseek/protocol/dist/token-usage.js.map +1 -1
- package/node_modules/@xrkseek/server-config/dist/index.js +1 -1
- package/node_modules/@xrkseek/server-face/dist/context.d.ts +6 -5
- package/node_modules/@xrkseek/server-face/dist/context.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/context.js +1 -3
- package/node_modules/@xrkseek/server-face/dist/context.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/dispatch.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/dispatch.js +4 -2
- package/node_modules/@xrkseek/server-face/dist/dispatch.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/face-schema.d.ts +3 -2
- package/node_modules/@xrkseek/server-face/dist/face-schema.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/face-schema.js +16 -4
- package/node_modules/@xrkseek/server-face/dist/face-schema.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/handlers/catalog.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/handlers/catalog.js +26 -12
- package/node_modules/@xrkseek/server-face/dist/handlers/catalog.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/handlers/session-added.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/handlers/session-added.js +3 -2
- package/node_modules/@xrkseek/server-face/dist/handlers/session-added.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/handlers/session.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/handlers/session.js +24 -27
- package/node_modules/@xrkseek/server-face/dist/handlers/session.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/index.d.ts +4 -3
- package/node_modules/@xrkseek/server-face/dist/index.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/index.js +4 -3
- package/node_modules/@xrkseek/server-face/dist/index.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/llm-provider-context.d.ts +44 -6
- package/node_modules/@xrkseek/server-face/dist/llm-provider-context.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/llm-provider-context.js +220 -34
- package/node_modules/@xrkseek/server-face/dist/llm-provider-context.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/llm-resolve.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/llm-resolve.js +4 -7
- package/node_modules/@xrkseek/server-face/dist/llm-resolve.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/model-catalog.d.ts +1 -1
- package/node_modules/@xrkseek/server-face/dist/model-catalog.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/model-catalog.js +23 -26
- package/node_modules/@xrkseek/server-face/dist/model-catalog.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/presets-catalog.d.ts +13 -1
- package/node_modules/@xrkseek/server-face/dist/presets-catalog.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/presets-catalog.js +24 -9
- package/node_modules/@xrkseek/server-face/dist/presets-catalog.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/session-cwd.d.ts +3 -0
- package/node_modules/@xrkseek/server-face/dist/session-cwd.d.ts.map +1 -0
- package/node_modules/@xrkseek/server-face/dist/session-cwd.js +19 -0
- package/node_modules/@xrkseek/server-face/dist/session-cwd.js.map +1 -0
- package/node_modules/@xrkseek/server-face/dist/settings-credentials.d.ts +1 -1
- package/node_modules/@xrkseek/server-face/dist/settings-credentials.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/settings-credentials.js +116 -14
- package/node_modules/@xrkseek/server-face/dist/settings-credentials.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/settings-document.d.ts +1 -1
- package/node_modules/@xrkseek/server-face/dist/settings-document.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/settings-document.js +25 -22
- package/node_modules/@xrkseek/server-face/dist/settings-document.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/settings-layers.d.ts +3 -0
- package/node_modules/@xrkseek/server-face/dist/settings-layers.d.ts.map +1 -0
- package/node_modules/@xrkseek/server-face/dist/settings-layers.js +19 -0
- package/node_modules/@xrkseek/server-face/dist/settings-layers.js.map +1 -0
- package/node_modules/@xrkseek/server-face/dist/settings-schemas.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/settings-schemas.js +18 -11
- package/node_modules/@xrkseek/server-face/dist/settings-schemas.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/workspace-face.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/workspace-face.js +26 -9
- package/node_modules/@xrkseek/server-face/dist/workspace-face.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/workspace-registry.d.ts +6 -0
- package/node_modules/@xrkseek/server-face/dist/workspace-registry.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/workspace-registry.js +39 -1
- package/node_modules/@xrkseek/server-face/dist/workspace-registry.js.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/workspace-store.d.ts +4 -0
- package/node_modules/@xrkseek/server-face/dist/workspace-store.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-face/dist/workspace-store.js +43 -1
- package/node_modules/@xrkseek/server-face/dist/workspace-store.js.map +1 -1
- package/node_modules/@xrkseek/server-host/dist/index.d.ts +19 -2
- package/node_modules/@xrkseek/server-host/dist/index.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-host/dist/index.js +150 -23
- package/node_modules/@xrkseek/server-host/dist/index.js.map +1 -1
- package/node_modules/@xrkseek/server-host/dist/log.d.ts +14 -0
- package/node_modules/@xrkseek/server-host/dist/log.d.ts.map +1 -0
- package/node_modules/@xrkseek/server-host/dist/log.js +6 -0
- package/node_modules/@xrkseek/server-host/dist/log.js.map +1 -0
- package/node_modules/@xrkseek/server-host/dist/mcp-wire.d.ts +9 -4
- package/node_modules/@xrkseek/server-host/dist/mcp-wire.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-host/dist/mcp-wire.js +42 -7
- package/node_modules/@xrkseek/server-host/dist/mcp-wire.js.map +1 -1
- package/node_modules/@xrkseek/server-host/dist/standing-tools.js +2 -2
- package/node_modules/@xrkseek/server-host/dist/standing-tools.js.map +1 -1
- package/node_modules/@xrkseek/server-http/dist/index.d.ts +9 -0
- package/node_modules/@xrkseek/server-http/dist/index.d.ts.map +1 -1
- package/node_modules/@xrkseek/server-http/dist/index.js +9 -0
- package/node_modules/@xrkseek/server-http/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/product-web/boot.json +1 -1
- package/product-web/plugins/@xrkseek/client-locale/client.js +3 -3
- package/product-web/plugins/@xrkseek/client-ui-agent-preset/client.js +33 -33
- package/product-web/plugins/@xrkseek/client-ui-commands/client.js +7 -7
- package/product-web/plugins/@xrkseek/client-ui-conversation/client.js +156 -156
- package/product-web/plugins/@xrkseek/client-ui-deliverables/client.js +5 -5
- package/product-web/plugins/@xrkseek/client-ui-directory-picker-browse/client.js +29 -29
- package/product-web/plugins/@xrkseek/client-ui-goal/client.js +6 -6
- package/product-web/plugins/@xrkseek/client-ui-input-trigger/client.js +5 -5
- package/product-web/plugins/@xrkseek/client-ui-jobs/client.js +10 -10
- package/product-web/plugins/@xrkseek/client-ui-layout/client.js +4 -4
- package/product-web/plugins/@xrkseek/client-ui-message-feedback/client.js +4 -4
- package/product-web/plugins/@xrkseek/client-ui-model-selection/client.js +19 -19
- package/product-web/plugins/@xrkseek/client-ui-permission-presets/client.js +4 -4
- package/product-web/plugins/@xrkseek/client-ui-plan/client.js +1 -1
- package/product-web/plugins/@xrkseek/client-ui-settings/client.js +7 -1
- package/product-web/plugins/@xrkseek/client-ui-settings-general/client.js +16 -16
- package/product-web/plugins/@xrkseek/client-ui-settings-models/client.js +53 -53
- package/product-web/plugins/@xrkseek/client-ui-settings-plugin-inventory/client.js +12 -12
- package/product-web/plugins/@xrkseek/client-ui-settings-plugins/client.js +615 -548
- package/product-web/plugins/@xrkseek/client-ui-sidebar/client.js +14 -14
- package/product-web/plugins/@xrkseek/client-ui-skill/client.js +9 -9
- package/product-web/plugins/@xrkseek/client-ui-subagent/client.js +16 -16
- package/product-web/plugins/@xrkseek/client-ui-theme/client.js +3 -3
- package/product-web/plugins/@xrkseek/client-ui-tool/client.js +37 -37
- package/product-web/plugins/@xrkseek/client-ui-trajectory/client.js +144 -144
- package/product-web/plugins/@xrkseek/client-ui-user-questions/client.js +30 -30
- package/product-web/plugins/@xrkseek/client-ui-workflow-run/client.js +11 -11
- package/product-web/plugins/@xrkseek/client-ui-workspace/client.js +53 -53
|
@@ -1,50 +1,175 @@
|
|
|
1
|
-
import { normalizeProtocolId } from "@xrkseek/llm-registry";
|
|
2
|
-
import { mergeLayers } from "./settings-
|
|
1
|
+
import { defaultPathForProtocol, factoryKindForProtocol, normalizeProtocolId, REGISTRY_FALLBACK_MODEL, } from "@xrkseek/llm-registry";
|
|
2
|
+
import { mergeLayers } from "./settings-layers.js";
|
|
3
3
|
import { normalizeApiKey, apiKeyRefForProvider } from "./llm-api-key.js";
|
|
4
4
|
function mergedNamespace(runtime, ns) {
|
|
5
5
|
const slot = runtime.settingsNamespaces.ensure(ns);
|
|
6
6
|
return mergeLayers(slot.base, slot.user);
|
|
7
7
|
}
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
/**
|
|
9
|
+
* Endpoint URL from a settings profile.
|
|
10
|
+
* Prefer schema `baseURL`; keep `baseUrl` as wire/legacy alias (do not drop).
|
|
11
|
+
*/
|
|
12
|
+
function settingsBaseURL(obj) {
|
|
13
|
+
const url = obj.baseURL ?? obj.baseUrl;
|
|
14
|
+
if (typeof url !== "string" || !url.trim())
|
|
15
|
+
return undefined;
|
|
16
|
+
return url.trim().replace(/\/+$/, "");
|
|
17
|
+
}
|
|
18
|
+
function piAiProvidersDict(runtime) {
|
|
19
|
+
const providers = mergedNamespace(runtime, "llm-pi-ai").providers;
|
|
11
20
|
if (!providers || typeof providers !== "object" || Array.isArray(providers)) {
|
|
12
21
|
return undefined;
|
|
13
22
|
}
|
|
14
|
-
const
|
|
15
|
-
|
|
23
|
+
const out = {};
|
|
24
|
+
for (const [id, raw] of Object.entries(providers)) {
|
|
25
|
+
if (!raw || typeof raw !== "object" || Array.isArray(raw))
|
|
26
|
+
continue;
|
|
27
|
+
out[id] = raw;
|
|
28
|
+
}
|
|
29
|
+
return out;
|
|
30
|
+
}
|
|
31
|
+
/** Case-insensitive lookup into `llm-pi-ai.providers`. */
|
|
32
|
+
export function piAiProviderProfile(runtime, provider) {
|
|
33
|
+
const key = provider.trim();
|
|
34
|
+
if (!key)
|
|
35
|
+
return undefined;
|
|
36
|
+
const dict = piAiProvidersDict(runtime);
|
|
37
|
+
if (!dict)
|
|
16
38
|
return undefined;
|
|
39
|
+
if (dict[key])
|
|
40
|
+
return dict[key];
|
|
41
|
+
const lower = key.toLowerCase();
|
|
42
|
+
for (const [id, profile] of Object.entries(dict)) {
|
|
43
|
+
if (id.toLowerCase() === lower)
|
|
44
|
+
return profile;
|
|
17
45
|
}
|
|
18
|
-
return
|
|
46
|
+
return undefined;
|
|
19
47
|
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
if (
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
48
|
+
function profileModels(profile) {
|
|
49
|
+
const modelsRaw = profile.models;
|
|
50
|
+
if (!Array.isArray(modelsRaw))
|
|
51
|
+
return [];
|
|
52
|
+
const models = [];
|
|
53
|
+
for (const row of modelsRaw) {
|
|
54
|
+
if (!row || typeof row !== "object" || Array.isArray(row))
|
|
55
|
+
continue;
|
|
56
|
+
const mid = row.id;
|
|
57
|
+
if (typeof mid !== "string" || !mid.trim())
|
|
58
|
+
continue;
|
|
59
|
+
const name = row.name;
|
|
60
|
+
models.push({
|
|
61
|
+
id: mid.trim(),
|
|
62
|
+
...(typeof name === "string" && name.trim()
|
|
63
|
+
? { name: name.trim() }
|
|
28
64
|
: {}),
|
|
29
|
-
};
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
return models;
|
|
68
|
+
}
|
|
69
|
+
function registryKnowsProvider(runtime, provider) {
|
|
70
|
+
const key = provider.trim().toLowerCase();
|
|
71
|
+
if (!key)
|
|
72
|
+
return false;
|
|
73
|
+
return runtime.registry.listBrands().some((b) => b.id === key);
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* Effective credential env name: brand → deepseek settings → pi-ai profile.
|
|
77
|
+
*/
|
|
78
|
+
export function providerApiKeyEnv(runtime, provider) {
|
|
79
|
+
const key = provider.trim().toLowerCase();
|
|
80
|
+
const brand = runtime.registry.listBrands().find((b) => b.id === key);
|
|
81
|
+
if (brand?.apiKeyEnv?.trim())
|
|
82
|
+
return brand.apiKeyEnv.trim();
|
|
83
|
+
if (key === "deepseek") {
|
|
84
|
+
const ref = mergedNamespace(runtime, "llm-deepseek").apiKeyEnv;
|
|
85
|
+
if (typeof ref === "string" && ref.trim())
|
|
86
|
+
return ref.trim();
|
|
87
|
+
}
|
|
88
|
+
const profile = piAiProviderProfile(runtime, provider);
|
|
89
|
+
const ref = profile?.apiKeyEnv;
|
|
90
|
+
if (typeof ref === "string" && ref.trim())
|
|
91
|
+
return ref.trim();
|
|
92
|
+
return undefined;
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* Settings-declared providers that name an `apiKeyEnv` (credential slots).
|
|
96
|
+
*/
|
|
97
|
+
export function listSettingsProviderCredentialRefs(runtime) {
|
|
98
|
+
const out = [];
|
|
99
|
+
const seen = new Set();
|
|
100
|
+
const push = (providerId, apiKeyEnv) => {
|
|
101
|
+
const id = providerId.trim();
|
|
102
|
+
const env = apiKeyEnv.trim();
|
|
103
|
+
if (!id || !env || seen.has(id))
|
|
104
|
+
return;
|
|
105
|
+
seen.add(id);
|
|
106
|
+
out.push({ providerId: id, apiKeyEnv: env });
|
|
107
|
+
};
|
|
108
|
+
const deepseek = mergedNamespace(runtime, "llm-deepseek");
|
|
109
|
+
if (typeof deepseek.apiKeyEnv === "string" && deepseek.apiKeyEnv.trim()) {
|
|
110
|
+
push("deepseek", deepseek.apiKeyEnv);
|
|
111
|
+
}
|
|
112
|
+
const dict = piAiProvidersDict(runtime);
|
|
113
|
+
if (dict) {
|
|
114
|
+
for (const [id, profile] of Object.entries(dict)) {
|
|
115
|
+
const ref = profile.apiKeyEnv;
|
|
116
|
+
if (typeof ref === "string" && ref.trim())
|
|
117
|
+
push(id, ref);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
return out;
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* Settings-only routes (Custom provider card). Excludes Registry brands.
|
|
124
|
+
*/
|
|
125
|
+
export function listDeclaredPiAiProviders(runtime) {
|
|
126
|
+
const brandIds = new Set(runtime.registry.listBrands().map((b) => b.id));
|
|
127
|
+
const out = [];
|
|
128
|
+
const dict = piAiProvidersDict(runtime);
|
|
129
|
+
if (!dict)
|
|
130
|
+
return out;
|
|
131
|
+
for (const [id, profile] of Object.entries(dict)) {
|
|
132
|
+
const key = id.trim();
|
|
133
|
+
if (!key || brandIds.has(key.toLowerCase()))
|
|
134
|
+
continue;
|
|
135
|
+
const displayName = typeof profile.displayName === "string" && profile.displayName.trim()
|
|
136
|
+
? profile.displayName.trim()
|
|
137
|
+
: key;
|
|
138
|
+
const baseUrl = settingsBaseURL(profile);
|
|
139
|
+
const api = typeof profile.api === "string" ? profile.api.trim() : "";
|
|
140
|
+
out.push({
|
|
141
|
+
id: key,
|
|
142
|
+
displayName,
|
|
143
|
+
...(baseUrl ? { baseUrl } : {}),
|
|
144
|
+
...(api ? { api } : {}),
|
|
145
|
+
models: profileModels(profile),
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
return out;
|
|
149
|
+
}
|
|
150
|
+
/** Effective route overrides from `llm-deepseek` / `llm-pi-ai`. */
|
|
151
|
+
export function readProviderRoute(runtime, provider) {
|
|
152
|
+
if (provider.trim().toLowerCase() === "deepseek") {
|
|
153
|
+
const baseUrl = settingsBaseURL(mergedNamespace(runtime, "llm-deepseek"));
|
|
154
|
+
return baseUrl ? { baseUrl } : {};
|
|
30
155
|
}
|
|
31
156
|
const profile = piAiProviderProfile(runtime, provider);
|
|
32
157
|
if (!profile)
|
|
33
158
|
return {};
|
|
34
|
-
const
|
|
159
|
+
const baseUrl = settingsBaseURL(profile);
|
|
35
160
|
const protocol = normalizeProtocolId(profile.api);
|
|
36
161
|
return {
|
|
37
|
-
...(
|
|
162
|
+
...(baseUrl ? { baseUrl } : {}),
|
|
38
163
|
...(protocol ? { protocol } : {}),
|
|
39
164
|
};
|
|
40
165
|
}
|
|
41
|
-
/** Credential precedence: typed probe → vault → env
|
|
166
|
+
/** Credential precedence: typed probe → vault → env. */
|
|
42
167
|
export function readProviderApiKey(runtime, provider, typed) {
|
|
43
168
|
const trimmed = typed?.trim();
|
|
44
169
|
if (trimmed) {
|
|
45
170
|
const checked = normalizeApiKey(trimmed);
|
|
46
171
|
if (!checked.ok) {
|
|
47
|
-
const ref = apiKeyRefForProvider(runtime
|
|
172
|
+
const ref = apiKeyRefForProvider(providerApiKeyEnv(runtime, provider));
|
|
48
173
|
throw new Error(checked.reason === "empty"
|
|
49
174
|
? `API key for ${provider} is blank`
|
|
50
175
|
: `API key for ${provider} (${ref}) contains characters no HTTP header can carry`);
|
|
@@ -59,8 +184,7 @@ export function readProviderApiKey(runtime, provider, typed) {
|
|
|
59
184
|
}
|
|
60
185
|
return { apiKey: checked.value, source: "vault" };
|
|
61
186
|
}
|
|
62
|
-
const
|
|
63
|
-
const envName = brand?.apiKeyEnv;
|
|
187
|
+
const envName = providerApiKeyEnv(runtime, provider);
|
|
64
188
|
if (envName) {
|
|
65
189
|
const fromEnv = process.env[envName]?.trim();
|
|
66
190
|
if (fromEnv) {
|
|
@@ -79,21 +203,83 @@ export function providerHasUsableCredential(runtime, provider) {
|
|
|
79
203
|
const cred = readProviderApiKey(runtime, provider);
|
|
80
204
|
if (cred.apiKey)
|
|
81
205
|
return true;
|
|
82
|
-
const
|
|
83
|
-
return
|
|
206
|
+
const envName = providerApiKeyEnv(runtime, provider);
|
|
207
|
+
return envName === undefined;
|
|
84
208
|
}
|
|
85
209
|
catch {
|
|
86
210
|
return false;
|
|
87
211
|
}
|
|
88
212
|
}
|
|
89
|
-
|
|
90
|
-
const
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
213
|
+
function synthesizeDeclaredBinding(runtime, provider, model, route) {
|
|
214
|
+
const key = provider.trim().toLowerCase();
|
|
215
|
+
if (!key || registryKnowsProvider(runtime, key))
|
|
216
|
+
return undefined;
|
|
217
|
+
const profile = piAiProviderProfile(runtime, provider);
|
|
218
|
+
if (!profile)
|
|
219
|
+
return undefined;
|
|
220
|
+
const protocol = route.protocol ?? normalizeProtocolId(profile.api);
|
|
221
|
+
const baseUrl = route.baseUrl ?? settingsBaseURL(profile);
|
|
222
|
+
if (!protocol || !baseUrl)
|
|
223
|
+
return undefined;
|
|
224
|
+
const displayName = typeof profile.displayName === "string" && profile.displayName.trim()
|
|
225
|
+
? profile.displayName.trim()
|
|
226
|
+
: key;
|
|
227
|
+
const pathRaw = route.path?.trim() || defaultPathForProtocol(protocol);
|
|
228
|
+
const path = pathRaw.startsWith("/") ? pathRaw : `/${pathRaw}`;
|
|
229
|
+
const authMode = route.authMode ??
|
|
230
|
+
(protocol === "anthropic-messages" || protocol === "gemini-generate"
|
|
231
|
+
? "api-key"
|
|
232
|
+
: "bearer");
|
|
233
|
+
const apiKeyEnv = providerApiKeyEnv(runtime, key);
|
|
234
|
+
const models = profileModels(profile);
|
|
235
|
+
const modelTrim = model.trim();
|
|
236
|
+
const fallbackModel = models[0]?.id ?? REGISTRY_FALLBACK_MODEL;
|
|
237
|
+
return {
|
|
238
|
+
provider: key,
|
|
239
|
+
protocol,
|
|
240
|
+
factoryKind: factoryKindForProtocol(protocol),
|
|
241
|
+
model: modelTrim || fallbackModel,
|
|
242
|
+
baseUrl,
|
|
243
|
+
path,
|
|
244
|
+
authMode,
|
|
245
|
+
displayName,
|
|
246
|
+
...(apiKeyEnv ? { apiKeyEnv } : {}),
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
/**
|
|
250
|
+
* Resolve Registry brand, or synthesize from `llm-pi-ai.providers.<id>`.
|
|
251
|
+
* Optional `route` overlays settings (e.g. discovery draft `baseURL`).
|
|
252
|
+
*/
|
|
253
|
+
export function resolveProviderBinding(runtime, input) {
|
|
254
|
+
const route = {
|
|
255
|
+
...readProviderRoute(runtime, input.provider),
|
|
256
|
+
...input.route,
|
|
257
|
+
};
|
|
258
|
+
if (registryKnowsProvider(runtime, input.provider)) {
|
|
259
|
+
return runtime.registry.resolve({
|
|
260
|
+
provider: input.provider,
|
|
261
|
+
model: input.model,
|
|
262
|
+
...(route.baseUrl ? { baseUrl: route.baseUrl } : {}),
|
|
263
|
+
...(route.path ? { path: route.path } : {}),
|
|
264
|
+
...(route.protocol ? { protocol: route.protocol } : {}),
|
|
265
|
+
});
|
|
266
|
+
}
|
|
267
|
+
const synthesized = synthesizeDeclaredBinding(runtime, input.provider, input.model, route);
|
|
268
|
+
if (synthesized)
|
|
269
|
+
return synthesized;
|
|
270
|
+
throw new Error(`llm-registry: unknown provider: ${input.provider.trim().toLowerCase() || input.provider}`);
|
|
271
|
+
}
|
|
272
|
+
/** Whether a provider id can resolve to a live binding (not API-key gated). */
|
|
273
|
+
export function providerRouteServed(runtime, provider) {
|
|
274
|
+
const id = provider.trim();
|
|
275
|
+
if (!id)
|
|
276
|
+
return false;
|
|
277
|
+
try {
|
|
278
|
+
resolveProviderBinding(runtime, { provider: id, model: "_" });
|
|
279
|
+
return true;
|
|
280
|
+
}
|
|
281
|
+
catch {
|
|
282
|
+
return false;
|
|
283
|
+
}
|
|
98
284
|
}
|
|
99
285
|
//# sourceMappingURL=llm-provider-context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-provider-context.js","sourceRoot":"","sources":["../src/llm-provider-context.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"llm-provider-context.js","sourceRoot":"","sources":["../src/llm-provider-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-resolve.d.ts","sourceRoot":"","sources":["../src/llm-resolve.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,oBAAoB,CAAC;AAQ5B,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,kBAAkB,CAAC;CACxC;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,QAAQ,CAAC,IAAI,EAAE,oBAAoB,GAAG,gBAAgB,CAAC;gBAE3C,IAAI,EAAE,mBAAmB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM;CAK/D;AAED,uFAAuF;AACvF,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,kBAAkB,GAC5B,eAAe,
|
|
1
|
+
{"version":3,"file":"llm-resolve.d.ts","sourceRoot":"","sources":["../src/llm-resolve.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,oBAAoB,CAAC;AAQ5B,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,kBAAkB,CAAC;CACxC;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,QAAQ,CAAC,IAAI,EAAE,oBAAoB,GAAG,gBAAgB,CAAC;gBAE3C,IAAI,EAAE,mBAAmB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM;CAK/D;AAED,uFAAuF;AACvF,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,kBAAkB,GAC5B,eAAe,CA6BjB;AAED,sFAAsF;AACtF,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,GAChB,iBAAiB,GAAG,SAAS,CA0B/B;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,WAAW,EACpB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAYT;AAED,sFAAsF;AACtF,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,GAChB,eAAe,GAAG,SAAS,CAa7B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createRoutingLlmAdapter, } from "@xrkseek/llm-registry";
|
|
2
2
|
import { lookupModelContextWindow, resolveAgentDefaultModel, resolveSessionModelSelection, } from "./model-catalog.js";
|
|
3
|
-
import { providerHasUsableCredential,
|
|
3
|
+
import { providerHasUsableCredential, providerApiKeyEnv, readProviderApiKey, resolveProviderBinding, } from "./llm-provider-context.js";
|
|
4
4
|
export class FaceLlmResolveError extends Error {
|
|
5
5
|
code;
|
|
6
6
|
constructor(code, message) {
|
|
@@ -13,15 +13,13 @@ export class FaceLlmResolveError extends Error {
|
|
|
13
13
|
export function resolveLlmForSelection(runtime, selection) {
|
|
14
14
|
if (!providerHasUsableCredential(runtime, selection.provider)) {
|
|
15
15
|
const brand = runtime.registry.listBrands().find((b) => b.id === selection.provider);
|
|
16
|
-
const ref = brand?.apiKeyEnv ?? `llm.${selection.provider}`;
|
|
16
|
+
const ref = brand?.apiKeyEnv ?? providerApiKeyEnv(runtime, selection.provider) ?? `llm.${selection.provider}`;
|
|
17
17
|
throw new FaceLlmResolveError("missing-credential", `no API key configured for provider "${selection.provider}" (${ref})`);
|
|
18
18
|
}
|
|
19
|
-
const route = readProviderRoute(runtime, selection.provider);
|
|
20
19
|
const { apiKey } = readProviderApiKey(runtime, selection.provider);
|
|
21
|
-
const binding = resolveProviderBinding(runtime
|
|
20
|
+
const binding = resolveProviderBinding(runtime, {
|
|
22
21
|
provider: selection.provider,
|
|
23
22
|
model: selection.model,
|
|
24
|
-
route,
|
|
25
23
|
});
|
|
26
24
|
const adapter = runtime.registry.createAdapter(binding, apiKey ? { apiKey } : {}, {
|
|
27
25
|
id: `${binding.provider}:${binding.model}`,
|
|
@@ -84,10 +82,9 @@ export function resolveLlmForSession(runtime, sessionId) {
|
|
|
84
82
|
const selection = resolveSessionModelSelection(runtime, sessionId);
|
|
85
83
|
const config = routing.ensureRoute();
|
|
86
84
|
return {
|
|
87
|
-
binding: resolveProviderBinding(runtime
|
|
85
|
+
binding: resolveProviderBinding(runtime, {
|
|
88
86
|
provider: config.provider,
|
|
89
87
|
model: config.model,
|
|
90
|
-
route: readProviderRoute(runtime, config.provider),
|
|
91
88
|
}),
|
|
92
89
|
adapter: routing,
|
|
93
90
|
selection,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-resolve.js","sourceRoot":"","sources":["../src/llm-resolve.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,uBAAuB,GAExB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EACL,wBAAwB,EACxB,wBAAwB,EACxB,4BAA4B,GAE7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,2BAA2B,EAC3B,kBAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"llm-resolve.js","sourceRoot":"","sources":["../src/llm-resolve.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export interface FaceModelSelection {
|
|
|
15
15
|
readonly model: string;
|
|
16
16
|
readonly reasoningEffort?: string;
|
|
17
17
|
}
|
|
18
|
-
/**
|
|
18
|
+
/** Alias of {@link providerRouteServed} (DSH name kept for handlers). */
|
|
19
19
|
export declare function routeServed(runtime: FaceRuntime, provider: string): boolean;
|
|
20
20
|
/** Provider-grouped catalog for composer + `llm.models` (no `"default"` placeholders). */
|
|
21
21
|
export declare function buildFaceModelCatalog(runtime: FaceRuntime): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAWhD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,SAAS,cAAc,EAAE,CAAC;CAC5C;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;CACnC;AA2ED,yEAAyE;AACzE,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE3E;AAED,0FAA0F;AAC1F,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,WAAW,GACnB;IAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC;IAAC,QAAQ,EAAE,EAAE,CAAA;CAAE,CAwBpD;AAED,wFAAwF;AACxF,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,kBAAkB,GAC5B,MAAM,GAAG,SAAS,CAepB;AAED,oEAAoE;AACpE,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,WAAW,GACnB,kBAAkB,GAAG,SAAS,CAahC;AAED,gGAAgG;AAChG,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,GAChB,kBAAkB,CAsCpB;AAED,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,kBAAkB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAWf"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DEFAULT_DEEPSEEK_MODELS } from "./settings-schemas.js";
|
|
2
2
|
import { mergeLayers, persistSettingsDocument } from "./settings-document.js";
|
|
3
|
-
import { providerHasUsableCredential } from "./llm-provider-context.js";
|
|
3
|
+
import { listDeclaredPiAiProviders, piAiProviderProfile, providerHasUsableCredential, providerRouteServed, resolveProviderBinding, } from "./llm-provider-context.js";
|
|
4
4
|
function mergedNamespace(runtime, ns) {
|
|
5
5
|
const slot = runtime.settingsNamespaces.ensure(ns);
|
|
6
6
|
return mergeLayers(slot.base, slot.user);
|
|
@@ -47,15 +47,9 @@ function deepseekModels(runtime) {
|
|
|
47
47
|
}));
|
|
48
48
|
}
|
|
49
49
|
function piAiProviderModels(runtime, brandId) {
|
|
50
|
-
const
|
|
51
|
-
|
|
52
|
-
if (!providers || typeof providers !== "object" || Array.isArray(providers)) {
|
|
50
|
+
const profile = piAiProviderProfile(runtime, brandId);
|
|
51
|
+
if (!profile)
|
|
53
52
|
return [];
|
|
54
|
-
}
|
|
55
|
-
const profile = providers[brandId];
|
|
56
|
-
if (!profile || typeof profile !== "object" || Array.isArray(profile)) {
|
|
57
|
-
return [];
|
|
58
|
-
}
|
|
59
53
|
return asModelRows(profile.models);
|
|
60
54
|
}
|
|
61
55
|
function modelsForBrand(runtime, brand) {
|
|
@@ -69,21 +63,9 @@ function modelsForBrand(runtime, brand) {
|
|
|
69
63
|
}
|
|
70
64
|
return [];
|
|
71
65
|
}
|
|
72
|
-
/**
|
|
66
|
+
/** Alias of {@link providerRouteServed} (DSH name kept for handlers). */
|
|
73
67
|
export function routeServed(runtime, provider) {
|
|
74
|
-
|
|
75
|
-
if (!id)
|
|
76
|
-
return false;
|
|
77
|
-
try {
|
|
78
|
-
runtime.registry.resolve({ provider: id });
|
|
79
|
-
return true;
|
|
80
|
-
}
|
|
81
|
-
catch {
|
|
82
|
-
return false;
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
function providerHasCredentials(runtime, brandId) {
|
|
86
|
-
return providerHasUsableCredential(runtime, brandId);
|
|
68
|
+
return providerRouteServed(runtime, provider);
|
|
87
69
|
}
|
|
88
70
|
/** Provider-grouped catalog for composer + `llm.models` (no `"default"` placeholders). */
|
|
89
71
|
export function buildFaceModelCatalog(runtime) {
|
|
@@ -100,6 +82,18 @@ export function buildFaceModelCatalog(runtime) {
|
|
|
100
82
|
models,
|
|
101
83
|
});
|
|
102
84
|
}
|
|
85
|
+
for (const declared of listDeclaredPiAiProviders(runtime)) {
|
|
86
|
+
if (!declared.baseUrl || declared.models.length === 0)
|
|
87
|
+
continue;
|
|
88
|
+
groups.push({
|
|
89
|
+
id: declared.id,
|
|
90
|
+
name: declared.displayName,
|
|
91
|
+
models: declared.models.map((m) => ({
|
|
92
|
+
id: m.id,
|
|
93
|
+
name: m.name ?? m.id,
|
|
94
|
+
})),
|
|
95
|
+
});
|
|
96
|
+
}
|
|
103
97
|
return { groups, failures: [] };
|
|
104
98
|
}
|
|
105
99
|
/** Look up catalog contextWindow for a selection (Face contextPressure denominator). */
|
|
@@ -112,7 +106,7 @@ export function lookupModelContextWindow(runtime, selection) {
|
|
|
112
106
|
return deepseekModels(runtime).find((m) => m.id === selection.model)
|
|
113
107
|
?.contextWindow;
|
|
114
108
|
}
|
|
115
|
-
return
|
|
109
|
+
return piAiProviderModels(runtime, selection.provider).find((m) => m.id === selection.model)?.contextWindow;
|
|
116
110
|
}
|
|
117
111
|
return modelsForBrand(runtime, brand).find((m) => m.id === selection.model)
|
|
118
112
|
?.contextWindow;
|
|
@@ -141,7 +135,10 @@ export function resolveSessionModelSelection(runtime, sessionId) {
|
|
|
141
135
|
const saved = resolveAgentDefaultModel(runtime);
|
|
142
136
|
if (saved) {
|
|
143
137
|
try {
|
|
144
|
-
runtime
|
|
138
|
+
resolveProviderBinding(runtime, {
|
|
139
|
+
provider: saved.provider,
|
|
140
|
+
model: saved.model,
|
|
141
|
+
});
|
|
145
142
|
return saved;
|
|
146
143
|
}
|
|
147
144
|
catch {
|
|
@@ -151,7 +148,7 @@ export function resolveSessionModelSelection(runtime, sessionId) {
|
|
|
151
148
|
const credentialed = runtime.registry
|
|
152
149
|
.listBrands()
|
|
153
150
|
.filter((b) => (b.baseUrl || b.id === "ollama") &&
|
|
154
|
-
|
|
151
|
+
providerHasUsableCredential(runtime, b.id) &&
|
|
155
152
|
routeServed(runtime, b.id));
|
|
156
153
|
for (const brand of credentialed) {
|
|
157
154
|
const { groups } = buildFaceModelCatalog(runtime);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-catalog.js","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,
|
|
1
|
+
{"version":3,"file":"model-catalog.js","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,21 @@
|
|
|
1
|
-
/** Catalog of Face-exposed agent presets (
|
|
1
|
+
/** Catalog of Face-exposed session agent presets (tool composition badges). */
|
|
2
2
|
export interface AgentPresetInfo {
|
|
3
3
|
readonly id: string;
|
|
4
4
|
readonly displayName: string;
|
|
5
5
|
readonly description: string;
|
|
6
6
|
}
|
|
7
|
+
/**
|
|
8
|
+
* Session badges offered in the product UI.
|
|
9
|
+
* Host CLI also accepts `server` (same tools as harness) — see {@link resolveToolPreset}.
|
|
10
|
+
*/
|
|
7
11
|
export declare const FACE_AGENT_PRESETS: readonly AgentPresetInfo[];
|
|
12
|
+
/** Ids accepted on the wire (includes legacy `server` → harness tools). */
|
|
8
13
|
export declare const FACE_AGENT_PRESET_IDS: Set<string>;
|
|
14
|
+
/**
|
|
15
|
+
* Map session badge / Host `--preset` to the two tool compositions.
|
|
16
|
+
* `server` is the Host-plane CLI name; tools match harness.
|
|
17
|
+
*/
|
|
18
|
+
export declare function resolveToolPreset(agentPreset: string | undefined, hostFallback?: string): "minimal" | "harness";
|
|
19
|
+
/** Persist only catalog ids (legacy `server` → `harness`). */
|
|
20
|
+
export declare function canonicalAgentPresetId(id: string): "minimal" | "harness";
|
|
9
21
|
//# sourceMappingURL=presets-catalog.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presets-catalog.d.ts","sourceRoot":"","sources":["../src/presets-catalog.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"presets-catalog.d.ts","sourceRoot":"","sources":["../src/presets-catalog.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAE/E,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,SAAS,eAAe,EAYxD,CAAC;AAEF,2EAA2E;AAC3E,eAAO,MAAM,qBAAqB,aAGhC,CAAC;AAEH;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,YAAY,SAAY,GACvB,SAAS,GAAG,SAAS,CAGvB;AAED,8DAA8D;AAC9D,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAExE"}
|
|
@@ -1,20 +1,35 @@
|
|
|
1
|
-
/** Catalog of Face-exposed agent presets (
|
|
1
|
+
/** Catalog of Face-exposed session agent presets (tool composition badges). */
|
|
2
|
+
/**
|
|
3
|
+
* Session badges offered in the product UI.
|
|
4
|
+
* Host CLI also accepts `server` (same tools as harness) — see {@link resolveToolPreset}.
|
|
5
|
+
*/
|
|
2
6
|
export const FACE_AGENT_PRESETS = [
|
|
3
7
|
{
|
|
4
8
|
id: "minimal",
|
|
5
9
|
displayName: "Minimal",
|
|
6
|
-
description: "
|
|
10
|
+
description: "Filesystem tools only (no shell / web / lsp / PTY)",
|
|
7
11
|
},
|
|
8
12
|
{
|
|
9
13
|
id: "harness",
|
|
10
14
|
displayName: "Harness",
|
|
11
|
-
description: "Full
|
|
12
|
-
},
|
|
13
|
-
{
|
|
14
|
-
id: "server",
|
|
15
|
-
displayName: "Server",
|
|
16
|
-
description: "HTTP/host-oriented server preset",
|
|
15
|
+
description: "Full coding agent: fs + bash + web_search/web_fetch + lsp + terminal",
|
|
17
16
|
},
|
|
18
17
|
];
|
|
19
|
-
|
|
18
|
+
/** Ids accepted on the wire (includes legacy `server` → harness tools). */
|
|
19
|
+
export const FACE_AGENT_PRESET_IDS = new Set([
|
|
20
|
+
...FACE_AGENT_PRESETS.map((p) => p.id),
|
|
21
|
+
"server",
|
|
22
|
+
]);
|
|
23
|
+
/**
|
|
24
|
+
* Map session badge / Host `--preset` to the two tool compositions.
|
|
25
|
+
* `server` is the Host-plane CLI name; tools match harness.
|
|
26
|
+
*/
|
|
27
|
+
export function resolveToolPreset(agentPreset, hostFallback = "harness") {
|
|
28
|
+
const raw = (agentPreset?.trim() || hostFallback).trim();
|
|
29
|
+
return raw === "minimal" ? "minimal" : "harness";
|
|
30
|
+
}
|
|
31
|
+
/** Persist only catalog ids (legacy `server` → `harness`). */
|
|
32
|
+
export function canonicalAgentPresetId(id) {
|
|
33
|
+
return resolveToolPreset(id, "harness");
|
|
34
|
+
}
|
|
20
35
|
//# sourceMappingURL=presets-catalog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presets-catalog.js","sourceRoot":"","sources":["../src/presets-catalog.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"presets-catalog.js","sourceRoot":"","sources":["../src/presets-catalog.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAQ/E;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAA+B;IAC5D;QACE,EAAE,EAAE,SAAS;QACb,WAAW,EAAE,SAAS;QACtB,WAAW,EAAE,oDAAoD;KAClE;IACD;QACE,EAAE,EAAE,SAAS;QACb,WAAW,EAAE,SAAS;QACtB,WAAW,EACT,sEAAsE;KACzE;CACF,CAAC;AAEF,2EAA2E;AAC3E,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAS;IACnD,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACtC,QAAQ;CACT,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAC/B,WAA+B,EAC/B,YAAY,GAAG,SAAS;IAExB,MAAM,GAAG,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC;IACzD,OAAO,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;AACnD,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,sBAAsB,CAAC,EAAU;IAC/C,OAAO,iBAAiB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;AAC1C,CAAC"}
|