axon-code 2.5.1 → 2.6.1
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/config/axon-md-parser.d.ts.map +1 -1
- package/dist/config/axon-md-parser.js +21 -4
- package/dist/config/axon-md-parser.js.map +1 -1
- package/dist/config/index.d.ts +9 -6
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +1 -0
- package/dist/config/index.js.map +1 -1
- package/dist/context/enhanced.d.ts.map +1 -1
- package/dist/context/enhanced.js +5 -0
- package/dist/context/enhanced.js.map +1 -1
- package/dist/core/loop.d.ts +45 -1
- package/dist/core/loop.d.ts.map +1 -1
- package/dist/core/loop.js +317 -111
- package/dist/core/loop.js.map +1 -1
- package/dist/core/max-tokens.d.ts.map +1 -1
- package/dist/core/max-tokens.js +5 -0
- package/dist/core/max-tokens.js.map +1 -1
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +7 -14
- package/dist/core/session.js.map +1 -1
- package/dist/daemon/config.d.ts +6 -6
- package/dist/daemon/executor.d.ts.map +1 -1
- package/dist/daemon/executor.js +24 -30
- package/dist/daemon/executor.js.map +1 -1
- package/dist/mcp/config.d.ts +8 -8
- package/dist/media/index.d.ts +1 -1
- package/dist/media/index.d.ts.map +1 -1
- package/dist/media/index.js +3 -3
- package/dist/media/index.js.map +1 -1
- package/dist/media/office.d.ts +17 -0
- package/dist/media/office.d.ts.map +1 -1
- package/dist/media/office.js +227 -2
- package/dist/media/office.js.map +1 -1
- package/dist/memory/memory-search.d.ts +4 -1
- package/dist/memory/memory-search.d.ts.map +1 -1
- package/dist/memory/memory-search.js +31 -2
- package/dist/memory/memory-search.js.map +1 -1
- package/dist/memory/memory-sync.d.ts +7 -0
- package/dist/memory/memory-sync.d.ts.map +1 -1
- package/dist/memory/memory-sync.js +88 -0
- package/dist/memory/memory-sync.js.map +1 -1
- package/dist/memory/notebook.d.ts.map +1 -1
- package/dist/memory/notebook.js +562 -15
- package/dist/memory/notebook.js.map +1 -1
- package/dist/models/config.d.ts.map +1 -1
- package/dist/models/config.js +7 -4
- package/dist/models/config.js.map +1 -1
- package/dist/models/index.d.ts +1 -0
- package/dist/models/index.d.ts.map +1 -1
- package/dist/models/index.js +1 -0
- package/dist/models/index.js.map +1 -1
- package/dist/models/model-limits.d.ts +13 -0
- package/dist/models/model-limits.d.ts.map +1 -0
- package/dist/models/model-limits.js +79 -0
- package/dist/models/model-limits.js.map +1 -0
- package/dist/prompt/attachments.d.ts +1 -0
- package/dist/prompt/attachments.d.ts.map +1 -1
- package/dist/prompt/attachments.js +17 -2
- package/dist/prompt/attachments.js.map +1 -1
- package/dist/prompt/cache.d.ts +1 -8
- package/dist/prompt/cache.d.ts.map +1 -1
- package/dist/prompt/cache.js +37 -9
- package/dist/prompt/cache.js.map +1 -1
- package/dist/session/index.d.ts +1 -0
- package/dist/session/index.d.ts.map +1 -1
- package/dist/session/index.js.map +1 -1
- package/dist/tools/agent.d.ts +8 -0
- package/dist/tools/agent.d.ts.map +1 -1
- package/dist/tools/agent.js +66 -2
- package/dist/tools/agent.js.map +1 -1
- package/dist/tools/file.d.ts.map +1 -1
- package/dist/tools/file.js +99 -30
- package/dist/tools/file.js.map +1 -1
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +7 -4
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/mcp.d.ts.map +1 -1
- package/dist/tools/mcp.js +5 -0
- package/dist/tools/mcp.js.map +1 -1
- package/dist/tools/memory-search.d.ts +1 -1
- package/dist/tools/memory-search.d.ts.map +1 -1
- package/dist/tools/memory-search.js +1 -1
- package/dist/tools/memory-search.js.map +1 -1
- package/dist/tools/notebook-write.d.ts.map +1 -1
- package/dist/tools/notebook-write.js +3 -1
- package/dist/tools/notebook-write.js.map +1 -1
- package/dist/tools/skill.d.ts +0 -6
- package/dist/tools/skill.d.ts.map +1 -1
- package/dist/tools/skill.js +211 -34
- package/dist/tools/skill.js.map +1 -1
- package/dist/types/messages.d.ts +1 -5
- package/dist/types/messages.d.ts.map +1 -1
- package/dist/web/server/api-manager.d.ts +7 -5
- package/dist/web/server/api-manager.d.ts.map +1 -1
- package/dist/web/server/api-manager.js +140 -146
- package/dist/web/server/api-manager.js.map +1 -1
- package/dist/web/server/conversation.d.ts.map +1 -1
- package/dist/web/server/conversation.js +27 -10
- package/dist/web/server/conversation.js.map +1 -1
- package/dist/web/server/routes/api.d.ts.map +1 -1
- package/dist/web/server/routes/api.js +21 -24
- package/dist/web/server/routes/api.js.map +1 -1
- package/dist/web/server/routes/axon-cloud.d.ts.map +1 -1
- package/dist/web/server/routes/axon-cloud.js +350 -1
- package/dist/web/server/routes/axon-cloud.js.map +1 -1
- package/dist/web/server/routes/config-api.d.ts.map +1 -1
- package/dist/web/server/routes/config-api.js +12 -20
- package/dist/web/server/routes/config-api.js.map +1 -1
- package/dist/web/server/routes/download-proxy.d.ts.map +1 -1
- package/dist/web/server/routes/download-proxy.js +234 -12
- package/dist/web/server/routes/download-proxy.js.map +1 -1
- package/dist/web/server/runtime/api-connection-test.d.ts +18 -0
- package/dist/web/server/runtime/api-connection-test.d.ts.map +1 -0
- package/dist/web/server/runtime/api-connection-test.js +62 -0
- package/dist/web/server/runtime/api-connection-test.js.map +1 -0
- package/dist/web/server/runtime/codex-client.d.ts +5 -0
- package/dist/web/server/runtime/codex-client.d.ts.map +1 -1
- package/dist/web/server/runtime/codex-client.js +229 -29
- package/dist/web/server/runtime/codex-client.js.map +1 -1
- package/dist/web/server/runtime/runtime-model-catalog.d.ts +10 -0
- package/dist/web/server/runtime/runtime-model-catalog.d.ts.map +1 -0
- package/dist/web/server/runtime/runtime-model-catalog.js +85 -0
- package/dist/web/server/runtime/runtime-model-catalog.js.map +1 -0
- package/dist/web/server/runtime/runtime-model-list.d.ts +24 -0
- package/dist/web/server/runtime/runtime-model-list.d.ts.map +1 -0
- package/dist/web/server/runtime/runtime-model-list.js +43 -0
- package/dist/web/server/runtime/runtime-model-list.js.map +1 -0
- package/dist/web/server/runtime/runtime-selection.d.ts +1 -0
- package/dist/web/server/runtime/runtime-selection.d.ts.map +1 -1
- package/dist/web/server/runtime/runtime-selection.js +5 -3
- package/dist/web/server/runtime/runtime-selection.js.map +1 -1
- package/dist/web/server/runtime/types.d.ts +5 -0
- package/dist/web/server/runtime/types.d.ts.map +1 -1
- package/dist/web/server/runtime/utility-client.d.ts.map +1 -1
- package/dist/web/server/runtime/utility-client.js +4 -1
- package/dist/web/server/runtime/utility-client.js.map +1 -1
- package/dist/web/server/services/axon-cloud-service.d.ts +24 -0
- package/dist/web/server/services/axon-cloud-service.d.ts.map +1 -1
- package/dist/web/server/services/axon-cloud-service.js +93 -0
- package/dist/web/server/services/axon-cloud-service.js.map +1 -1
- package/dist/web/server/services/config-service.d.ts +2 -1
- package/dist/web/server/services/config-service.d.ts.map +1 -1
- package/dist/web/server/services/config-service.js +28 -18
- package/dist/web/server/services/config-service.js.map +1 -1
- package/dist/web/server/session-manager.d.ts +9 -0
- package/dist/web/server/session-manager.d.ts.map +1 -1
- package/dist/web/server/session-manager.js +38 -0
- package/dist/web/server/session-manager.js.map +1 -1
- package/dist/web/server/slash-commands.d.ts.map +1 -1
- package/dist/web/server/slash-commands.js +79 -19
- package/dist/web/server/slash-commands.js.map +1 -1
- package/dist/web/server/task-manager.d.ts +4 -15
- package/dist/web/server/task-manager.d.ts.map +1 -1
- package/dist/web/server/task-manager.js +11 -4
- package/dist/web/server/task-manager.js.map +1 -1
- package/dist/web/server/web-auth.d.ts.map +1 -1
- package/dist/web/server/web-auth.js +32 -28
- package/dist/web/server/web-auth.js.map +1 -1
- package/dist/web/server/websocket.d.ts.map +1 -1
- package/dist/web/server/websocket.js +62 -35
- package/dist/web/server/websocket.js.map +1 -1
- package/dist/web/shared/auth-summary.d.ts.map +1 -1
- package/dist/web/shared/auth-summary.js +5 -2
- package/dist/web/shared/auth-summary.js.map +1 -1
- package/dist/web/shared/model-catalog.d.ts +3 -2
- package/dist/web/shared/model-catalog.d.ts.map +1 -1
- package/dist/web/shared/model-catalog.js +29 -37
- package/dist/web/shared/model-catalog.js.map +1 -1
- package/dist/web/shared/runtime-capabilities.d.ts +37 -0
- package/dist/web/shared/runtime-capabilities.d.ts.map +1 -0
- package/dist/web/shared/runtime-capabilities.js +101 -0
- package/dist/web/shared/runtime-capabilities.js.map +1 -0
- package/dist/web/shared/setup-runtime.d.ts +23 -0
- package/dist/web/shared/setup-runtime.d.ts.map +1 -1
- package/dist/web/shared/setup-runtime.js +119 -19
- package/dist/web/shared/setup-runtime.js.map +1 -1
- package/dist/web/shared/thinking-config.d.ts.map +1 -1
- package/dist/web/shared/thinking-config.js +10 -5
- package/dist/web/shared/thinking-config.js.map +1 -1
- package/dist/web/shared/types.d.ts +8 -0
- package/dist/web/shared/types.d.ts.map +1 -1
- package/dist/web/shared/types.js.map +1 -1
- package/electron/main.cjs +8 -1
- package/package.json +3 -1
- package/src/web/client/dist/assets/index-B2M5Nr-5.js +736 -0
- package/src/web/client/dist/assets/index-COEqamS-.css +32 -0
- package/src/web/client/dist/index.html +2 -2
- package/src/web/client/dist/assets/index-B0gwq5PJ.js +0 -727
- package/src/web/client/dist/assets/index-CwhuMLtk.css +0 -32
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { type WebRuntimeBackend, type WebRuntimeProvider } from '../../shared/model-catalog.js';
|
|
2
|
+
import { type RuntimeSelectionOptions } from './runtime-selection.js';
|
|
3
|
+
export interface RuntimeModelListItem {
|
|
4
|
+
id: string;
|
|
5
|
+
name: string;
|
|
6
|
+
description: string;
|
|
7
|
+
modelId: string;
|
|
8
|
+
provider: WebRuntimeProvider;
|
|
9
|
+
}
|
|
10
|
+
export interface RuntimeModelListResponse {
|
|
11
|
+
provider: WebRuntimeProvider;
|
|
12
|
+
runtimeBackend: WebRuntimeBackend;
|
|
13
|
+
models: RuntimeModelListItem[];
|
|
14
|
+
}
|
|
15
|
+
export declare function buildRuntimeModelListResponse(options: {
|
|
16
|
+
provider: WebRuntimeProvider;
|
|
17
|
+
runtimeBackend: WebRuntimeBackend;
|
|
18
|
+
currentModel?: string;
|
|
19
|
+
availableModels?: string[];
|
|
20
|
+
}): RuntimeModelListResponse;
|
|
21
|
+
export declare function buildCurrentRuntimeModelListResponse(options: RuntimeSelectionOptions & {
|
|
22
|
+
availableModels?: string[];
|
|
23
|
+
}): RuntimeModelListResponse;
|
|
24
|
+
//# sourceMappingURL=runtime-model-list.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime-model-list.d.ts","sourceRoot":"","sources":["../../../../src/web/server/runtime/runtime-model-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,wBAAwB,CAAC;AAEhC,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,kBAAkB,CAAC;CAC9B;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,cAAc,EAAE,iBAAiB,CAAC;IAClC,MAAM,EAAE,oBAAoB,EAAE,CAAC;CAChC;AAiBD,wBAAgB,6BAA6B,CAAC,OAAO,EAAE;IACrD,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,cAAc,EAAE,iBAAiB,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B,GAAG,wBAAwB,CAsB3B;AAED,wBAAgB,oCAAoC,CAClD,OAAO,EAAE,uBAAuB,GAAG;IAAE,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAChE,wBAAwB,CAS1B"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { getWebModelLabel, getWebModelOptionsForBackend, } from '../../shared/model-catalog.js';
|
|
2
|
+
import { resolveRuntimeSelection, } from './runtime-selection.js';
|
|
3
|
+
function getRuntimeBackendDisplayPrefix(runtimeBackend) {
|
|
4
|
+
switch (runtimeBackend) {
|
|
5
|
+
case 'codex-subscription':
|
|
6
|
+
return 'Codex';
|
|
7
|
+
case 'openai-compatible-api':
|
|
8
|
+
return 'OpenAI Compatible';
|
|
9
|
+
case 'claude-compatible-api':
|
|
10
|
+
return 'Claude Compatible';
|
|
11
|
+
case 'axon-cloud':
|
|
12
|
+
return 'Axon Cloud';
|
|
13
|
+
default:
|
|
14
|
+
return 'Claude';
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
export function buildRuntimeModelListResponse(options) {
|
|
18
|
+
const backendLabel = getRuntimeBackendDisplayPrefix(options.runtimeBackend);
|
|
19
|
+
const models = getWebModelOptionsForBackend(options.runtimeBackend, options.currentModel, options.currentModel, options.availableModels).map(model => ({
|
|
20
|
+
id: model.value,
|
|
21
|
+
name: `${backendLabel} ${getWebModelLabel(model.value, model.provider)}`,
|
|
22
|
+
description: model.description || (model.provider === 'codex'
|
|
23
|
+
? 'Current or configured responses-compatible model'
|
|
24
|
+
: 'Claude-family model'),
|
|
25
|
+
modelId: model.value,
|
|
26
|
+
provider: model.provider,
|
|
27
|
+
}));
|
|
28
|
+
return {
|
|
29
|
+
provider: options.provider,
|
|
30
|
+
runtimeBackend: options.runtimeBackend,
|
|
31
|
+
models,
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
export function buildCurrentRuntimeModelListResponse(options) {
|
|
35
|
+
const selection = resolveRuntimeSelection(options);
|
|
36
|
+
return buildRuntimeModelListResponse({
|
|
37
|
+
provider: selection.provider,
|
|
38
|
+
runtimeBackend: options.runtimeBackend,
|
|
39
|
+
currentModel: selection.normalizedModel,
|
|
40
|
+
availableModels: options.availableModels,
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=runtime-model-list.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime-model-list.js","sourceRoot":"","sources":["../../../../src/web/server/runtime/runtime-model-list.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,4BAA4B,GAG7B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,uBAAuB,GAExB,MAAM,wBAAwB,CAAC;AAgBhC,SAAS,8BAA8B,CAAC,cAAiC;IACvE,QAAQ,cAAc,EAAE,CAAC;QACvB,KAAK,oBAAoB;YACvB,OAAO,OAAO,CAAC;QACjB,KAAK,uBAAuB;YAC1B,OAAO,mBAAmB,CAAC;QAC7B,KAAK,uBAAuB;YAC1B,OAAO,mBAAmB,CAAC;QAC7B,KAAK,YAAY;YACf,OAAO,YAAY,CAAC;QACtB;YACE,OAAO,QAAQ,CAAC;IACpB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,OAK7C;IACC,MAAM,YAAY,GAAG,8BAA8B,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,4BAA4B,CACzC,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,eAAe,CACxB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACd,EAAE,EAAE,KAAK,CAAC,KAAK;QACf,IAAI,EAAE,GAAG,YAAY,IAAI,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE;QACxE,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,OAAO;YAC3D,CAAC,CAAC,kDAAkD;YACpD,CAAC,CAAC,qBAAqB,CAAC;QAC1B,OAAO,EAAE,KAAK,CAAC,KAAK;QACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACzB,CAAC,CAAC,CAAC;IAEJ,OAAO;QACL,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,MAAM;KACP,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oCAAoC,CAClD,OAAiE;IAEjE,MAAM,SAAS,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAEnD,OAAO,6BAA6B,CAAC;QACnC,QAAQ,EAAE,SAAS,CAAC,QAAQ;QAC5B,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,YAAY,EAAE,SAAS,CAAC,eAAe;QACvC,eAAe,EAAE,OAAO,CAAC,eAAe;KACzC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -3,6 +3,7 @@ export interface RuntimeSelectionOptions {
|
|
|
3
3
|
runtimeBackend: WebRuntimeBackend;
|
|
4
4
|
model?: string;
|
|
5
5
|
defaultModelByBackend?: Partial<Record<WebRuntimeBackend, string>>;
|
|
6
|
+
customModelCatalogByBackend?: Partial<Record<WebRuntimeBackend, string[]>>;
|
|
6
7
|
codexModelName?: string;
|
|
7
8
|
customModelName?: string;
|
|
8
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-selection.d.ts","sourceRoot":"","sources":["../../../../src/web/server/runtime/runtime-selection.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACxB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,iBAAiB,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,qBAAqB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAOD,wBAAgB,6BAA6B,CAC3C,cAAc,EAAE,iBAAiB,EACjC,qBAAqB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,EAClE,cAAc,CAAC,EAAE,MAAM,EACvB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"runtime-selection.d.ts","sourceRoot":"","sources":["../../../../src/web/server/runtime/runtime-selection.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACxB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,iBAAiB,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,qBAAqB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,CAAC;IACnE,2BAA2B,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAC3E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAOD,wBAAgB,6BAA6B,CAC3C,cAAc,EAAE,iBAAiB,EACjC,qBAAqB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,EAClE,cAAc,CAAC,EAAE,MAAM,EACvB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,GAAG,SAAS,CAkBpB;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,uBAAuB,GAAG,sBAAsB,CAwBhG"}
|
|
@@ -10,8 +10,9 @@ export function getConfiguredRuntimeModelName(runtimeBackend, defaultModelByBack
|
|
|
10
10
|
}
|
|
11
11
|
switch (runtimeBackend) {
|
|
12
12
|
case 'codex-subscription':
|
|
13
|
-
case 'openai-compatible-api':
|
|
14
13
|
return trimToUndefined(codexModelName);
|
|
14
|
+
case 'openai-compatible-api':
|
|
15
|
+
return trimToUndefined(codexModelName) || trimToUndefined(customModelName);
|
|
15
16
|
case 'axon-cloud':
|
|
16
17
|
return trimToUndefined(codexModelName) || trimToUndefined(customModelName);
|
|
17
18
|
case 'claude-subscription':
|
|
@@ -21,9 +22,10 @@ export function getConfiguredRuntimeModelName(runtimeBackend, defaultModelByBack
|
|
|
21
22
|
}
|
|
22
23
|
}
|
|
23
24
|
export function resolveRuntimeSelection(options) {
|
|
25
|
+
const availableModels = options.customModelCatalogByBackend?.[options.runtimeBackend];
|
|
24
26
|
const customModelName = getConfiguredRuntimeModelName(options.runtimeBackend, options.defaultModelByBackend, options.codexModelName, options.customModelName);
|
|
25
|
-
const normalizedModel = normalizeWebRuntimeModelForBackend(options.runtimeBackend, options.model, customModelName);
|
|
26
|
-
const provider = getProviderForRuntimeBackend(options.runtimeBackend,
|
|
27
|
+
const normalizedModel = normalizeWebRuntimeModelForBackend(options.runtimeBackend, options.model, customModelName, availableModels);
|
|
28
|
+
const provider = getProviderForRuntimeBackend(options.runtimeBackend, normalizedModel);
|
|
27
29
|
return {
|
|
28
30
|
provider,
|
|
29
31
|
normalizedModel,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-selection.js","sourceRoot":"","sources":["../../../../src/web/server/runtime/runtime-selection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,kCAAkC,GAGnC,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"runtime-selection.js","sourceRoot":"","sources":["../../../../src/web/server/runtime/runtime-selection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,kCAAkC,GAGnC,MAAM,+BAA+B,CAAC;AAiBvC,SAAS,eAAe,CAAC,KAAc;IACrC,MAAM,OAAO,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IAC9B,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,6BAA6B,CAC3C,cAAiC,EACjC,qBAAkE,EAClE,cAAuB,EACvB,eAAwB;IAExB,MAAM,WAAW,GAAG,eAAe,CAAC,qBAAqB,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IAC7E,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,QAAQ,cAAc,EAAE,CAAC;QACvB,KAAK,oBAAoB;YACvB,OAAO,eAAe,CAAC,cAAc,CAAC,CAAC;QACzC,KAAK,uBAAuB;YAC1B,OAAO,eAAe,CAAC,cAAc,CAAC,IAAI,eAAe,CAAC,eAAe,CAAC,CAAC;QAC7E,KAAK,YAAY;YACf,OAAO,eAAe,CAAC,cAAc,CAAC,IAAI,eAAe,CAAC,eAAe,CAAC,CAAC;QAC7E,KAAK,qBAAqB,CAAC;QAC3B,KAAK,uBAAuB,CAAC;QAC7B;YACE,OAAO,eAAe,CAAC,eAAe,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,OAAgC;IACtE,MAAM,eAAe,GAAG,OAAO,CAAC,2BAA2B,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACtF,MAAM,eAAe,GAAG,6BAA6B,CACnD,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,qBAAqB,EAC7B,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,eAAe,CACxB,CAAC;IACF,MAAM,eAAe,GAAG,kCAAkC,CACxD,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,KAAK,EACb,eAAe,EACf,eAAe,CAChB,CAAC;IACF,MAAM,QAAQ,GAAG,4BAA4B,CAC3C,OAAO,CAAC,cAAc,EACtB,eAAe,CAChB,CAAC;IAEF,OAAO;QACL,QAAQ;QACR,eAAe;QACf,eAAe;KAChB,CAAC;AACJ,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type Anthropic from '@anthropic-ai/sdk';
|
|
1
2
|
import type { PromptBlock } from '../../../prompt/index.js';
|
|
2
3
|
import type { ContentBlock, Message, ToolDefinition } from '../../../types/index.js';
|
|
3
4
|
import type { ThinkingResult } from '../../../models/index.js';
|
|
@@ -93,5 +94,9 @@ export interface ConversationRequestOptions {
|
|
|
93
94
|
export interface ConversationClient {
|
|
94
95
|
createMessage(messages: Message[], tools?: ToolDefinition[], systemPrompt?: string, options?: ConversationRequestOptions): Promise<ConversationMessageResponse>;
|
|
95
96
|
createMessageStream(messages: Message[], tools?: ToolDefinition[], systemPrompt?: string, options?: ConversationRequestOptions): AsyncGenerator<ConversationStreamEvent>;
|
|
97
|
+
getModel(): string;
|
|
98
|
+
setModel(model: string): void;
|
|
99
|
+
getIsOAuth(): boolean;
|
|
100
|
+
getAnthropicClient(): Anthropic | undefined;
|
|
96
101
|
}
|
|
97
102
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/web/server/runtime/types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/web/server/runtime/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utility-client.d.ts","sourceRoot":"","sources":["../../../../src/web/server/runtime/utility-client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utility-client.d.ts","sourceRoot":"","sources":["../../../../src/web/server/runtime/utility-client.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,wBAAgB,eAAe,CAAC,uBAAuB,GAAE,MAAgB,GAAG,MAAM,CAmBjF;AAED,wBAAgB,mBAAmB,CAAC,uBAAuB,GAAE,MAAgB,GAAG,kBAAkB,GAAG,IAAI,CA2BxG;AAED,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,uBAAuB,GAAE,MAAgB,GACxC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA0BxB"}
|
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import { webAuth } from '../web-auth.js';
|
|
2
2
|
import { resolveRuntimeSelection } from './runtime-selection.js';
|
|
3
3
|
import { normalizeWebRuntimeModelForBackend } from '../../shared/model-catalog.js';
|
|
4
|
+
import { shouldPreferAnthropicUtilityModelForBackend } from '../../shared/runtime-capabilities.js';
|
|
4
5
|
import { createConversationClient } from './factory.js';
|
|
5
6
|
export function getUtilityModel(preferredAnthropicModel = 'haiku') {
|
|
6
7
|
const runtimeBackend = webAuth.getRuntimeBackend();
|
|
7
8
|
const selection = resolveRuntimeSelection({
|
|
8
9
|
runtimeBackend,
|
|
9
|
-
model: runtimeBackend
|
|
10
|
+
model: shouldPreferAnthropicUtilityModelForBackend(runtimeBackend)
|
|
10
11
|
? preferredAnthropicModel
|
|
11
12
|
: undefined,
|
|
12
13
|
defaultModelByBackend: webAuth.getDefaultModelByBackend(),
|
|
14
|
+
customModelCatalogByBackend: webAuth.getCustomModelCatalogByBackend(),
|
|
13
15
|
codexModelName: webAuth.getCodexModelName(),
|
|
14
16
|
customModelName: webAuth.getCustomModelName(),
|
|
15
17
|
});
|
|
@@ -29,6 +31,7 @@ export function createUtilityClient(preferredAnthropicModel = 'haiku') {
|
|
|
29
31
|
runtimeBackend,
|
|
30
32
|
model,
|
|
31
33
|
defaultModelByBackend: webAuth.getDefaultModelByBackend(),
|
|
34
|
+
customModelCatalogByBackend: webAuth.getCustomModelCatalogByBackend(),
|
|
32
35
|
codexModelName: webAuth.getCodexModelName(),
|
|
33
36
|
customModelName: webAuth.getCustomModelName(),
|
|
34
37
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utility-client.js","sourceRoot":"","sources":["../../../../src/web/server/runtime/utility-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,kCAAkC,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAGxD,MAAM,UAAU,eAAe,CAAC,0BAAkC,OAAO;IACvE,MAAM,cAAc,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IACnD,MAAM,SAAS,GAAG,uBAAuB,CAAC;QACxC,cAAc;QACd,KAAK,EACH,
|
|
1
|
+
{"version":3,"file":"utility-client.js","sourceRoot":"","sources":["../../../../src/web/server/runtime/utility-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,19 @@ export interface TokenInfo {
|
|
|
31
31
|
unlimited_quota: boolean;
|
|
32
32
|
remain_quota: number;
|
|
33
33
|
}
|
|
34
|
+
export interface AxonCloudTopupProduct {
|
|
35
|
+
productId: string;
|
|
36
|
+
name?: string;
|
|
37
|
+
description?: string;
|
|
38
|
+
price?: number;
|
|
39
|
+
amount?: number;
|
|
40
|
+
currency?: string;
|
|
41
|
+
bonus?: number;
|
|
42
|
+
}
|
|
43
|
+
export interface AxonCloudTopupInfo {
|
|
44
|
+
enableCreemTopup: boolean;
|
|
45
|
+
creemProducts: AxonCloudTopupProduct[];
|
|
46
|
+
}
|
|
34
47
|
export interface AxonCloudSession {
|
|
35
48
|
accessToken: string;
|
|
36
49
|
userId: string;
|
|
@@ -62,6 +75,9 @@ export declare class AxonCloudService {
|
|
|
62
75
|
* 构造认证 headers
|
|
63
76
|
*/
|
|
64
77
|
private authHeaders;
|
|
78
|
+
private getResultMessage;
|
|
79
|
+
private normalizeOptionalNumber;
|
|
80
|
+
private normalizeTopupProducts;
|
|
65
81
|
/**
|
|
66
82
|
* 获取用户信息
|
|
67
83
|
*/
|
|
@@ -90,6 +106,14 @@ export declare class AxonCloudService {
|
|
|
90
106
|
quota: number;
|
|
91
107
|
used: number;
|
|
92
108
|
}>;
|
|
109
|
+
/**
|
|
110
|
+
* 获取充值信息和可用的 Creem 套餐
|
|
111
|
+
*/
|
|
112
|
+
getTopupInfo(accessToken: string, userId: string): Promise<AxonCloudTopupInfo>;
|
|
113
|
+
/**
|
|
114
|
+
* 创建 Creem Checkout,会返回最终支付页 URL
|
|
115
|
+
*/
|
|
116
|
+
createCreemCheckout(accessToken: string, userId: string, productId: string): Promise<string>;
|
|
93
117
|
}
|
|
94
118
|
export declare const axonCloudService: AxonCloudService;
|
|
95
119
|
//# sourceMappingURL=axon-cloud-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axon-cloud-service.d.ts","sourceRoot":"","sources":["../../../../src/web/server/services/axon-cloud-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA6B;IAEzD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA6B;IAE1D;;OAEG;IACG,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA6BnE;;;;;OAKG;IACG,KAAK,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA2D7D;;OAEG;IACH,OAAO,CAAC,WAAW;IAOnB;;OAEG;IACG,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAmBzE;;OAEG;IACG,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAe7E;;;OAGG;IACG,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAc5F;;OAEG;IACG,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,MAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IA2B9F;;OAEG;IACG,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAcvE;;OAEG;IACG,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"axon-cloud-service.d.ts","sourceRoot":"","sources":["../../../../src/web/server/services/axon-cloud-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -109,6 +109,46 @@ export class AxonCloudService {
|
|
|
109
109
|
'New-Api-User': userId,
|
|
110
110
|
};
|
|
111
111
|
}
|
|
112
|
+
getResultMessage(result, fallback) {
|
|
113
|
+
if (typeof result?.message === 'string' && result.message.trim()) {
|
|
114
|
+
return result.message;
|
|
115
|
+
}
|
|
116
|
+
if (typeof result?.error === 'string' && result.error.trim()) {
|
|
117
|
+
return result.error;
|
|
118
|
+
}
|
|
119
|
+
return fallback;
|
|
120
|
+
}
|
|
121
|
+
normalizeOptionalNumber(value) {
|
|
122
|
+
if (typeof value === 'number' && Number.isFinite(value)) {
|
|
123
|
+
return value;
|
|
124
|
+
}
|
|
125
|
+
if (typeof value === 'string') {
|
|
126
|
+
const parsed = Number(value);
|
|
127
|
+
if (Number.isFinite(parsed)) {
|
|
128
|
+
return parsed;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
return undefined;
|
|
132
|
+
}
|
|
133
|
+
normalizeTopupProducts(value) {
|
|
134
|
+
if (Array.isArray(value)) {
|
|
135
|
+
return value;
|
|
136
|
+
}
|
|
137
|
+
if (typeof value === 'string') {
|
|
138
|
+
const trimmed = value.trim();
|
|
139
|
+
if (!trimmed) {
|
|
140
|
+
return [];
|
|
141
|
+
}
|
|
142
|
+
try {
|
|
143
|
+
const parsed = JSON.parse(trimmed);
|
|
144
|
+
return Array.isArray(parsed) ? parsed : [];
|
|
145
|
+
}
|
|
146
|
+
catch {
|
|
147
|
+
return [];
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
return [];
|
|
151
|
+
}
|
|
112
152
|
/**
|
|
113
153
|
* 获取用户信息
|
|
114
154
|
*/
|
|
@@ -205,6 +245,59 @@ export class AxonCloudService {
|
|
|
205
245
|
const userInfo = await this.getUserInfo(accessToken, userId);
|
|
206
246
|
return { quota: userInfo.quota, used: userInfo.usedQuota };
|
|
207
247
|
}
|
|
248
|
+
/**
|
|
249
|
+
* 获取充值信息和可用的 Creem 套餐
|
|
250
|
+
*/
|
|
251
|
+
async getTopupInfo(accessToken, userId) {
|
|
252
|
+
const res = await fetch(`${this.NEWAPI_BASE}/api/user/topup/info`, {
|
|
253
|
+
headers: this.authHeaders(accessToken, userId),
|
|
254
|
+
});
|
|
255
|
+
const result = await res.json();
|
|
256
|
+
if (!result.success) {
|
|
257
|
+
throw new Error(this.getResultMessage(result, 'Failed to get top-up info'));
|
|
258
|
+
}
|
|
259
|
+
const data = result.data || {};
|
|
260
|
+
const rawProducts = this.normalizeTopupProducts(data.creem_products ?? data.creemProducts);
|
|
261
|
+
return {
|
|
262
|
+
enableCreemTopup: Boolean(data.enable_creem_topup ?? data.enableCreemTopup),
|
|
263
|
+
creemProducts: rawProducts
|
|
264
|
+
.map((product) => ({
|
|
265
|
+
productId: String(product?.product_id ?? product?.productId ?? product?.id ?? '').trim(),
|
|
266
|
+
name: typeof product?.name === 'string' ? product.name : undefined,
|
|
267
|
+
description: typeof product?.description === 'string' ? product.description : undefined,
|
|
268
|
+
price: this.normalizeOptionalNumber(product?.price),
|
|
269
|
+
amount: this.normalizeOptionalNumber(product?.amount),
|
|
270
|
+
currency: typeof product?.currency === 'string' ? product.currency : undefined,
|
|
271
|
+
bonus: this.normalizeOptionalNumber(product?.bonus ?? product?.gift_amount ?? product?.giftAmount),
|
|
272
|
+
}))
|
|
273
|
+
.filter((product) => !!product.productId),
|
|
274
|
+
};
|
|
275
|
+
}
|
|
276
|
+
/**
|
|
277
|
+
* 创建 Creem Checkout,会返回最终支付页 URL
|
|
278
|
+
*/
|
|
279
|
+
async createCreemCheckout(accessToken, userId, productId) {
|
|
280
|
+
const res = await fetch(`${this.NEWAPI_BASE}/api/user/creem/pay`, {
|
|
281
|
+
method: 'POST',
|
|
282
|
+
headers: {
|
|
283
|
+
'Content-Type': 'application/json',
|
|
284
|
+
...this.authHeaders(accessToken, userId),
|
|
285
|
+
},
|
|
286
|
+
body: JSON.stringify({
|
|
287
|
+
product_id: productId,
|
|
288
|
+
payment_method: 'creem',
|
|
289
|
+
}),
|
|
290
|
+
});
|
|
291
|
+
const result = await res.json();
|
|
292
|
+
if (!result.success) {
|
|
293
|
+
throw new Error(this.getResultMessage(result, 'Failed to create Creem checkout'));
|
|
294
|
+
}
|
|
295
|
+
const checkoutUrl = result.data?.checkout_url || result.data?.checkoutUrl;
|
|
296
|
+
if (!checkoutUrl || typeof checkoutUrl !== 'string') {
|
|
297
|
+
throw new Error('Creem checkout URL missing from response');
|
|
298
|
+
}
|
|
299
|
+
return checkoutUrl;
|
|
300
|
+
}
|
|
208
301
|
}
|
|
209
302
|
export const axonCloudService = new AxonCloudService();
|
|
210
303
|
//# sourceMappingURL=axon-cloud-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axon-cloud-service.js","sourceRoot":"","sources":["../../../../src/web/server/services/axon-cloud-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;
|
|
1
|
+
{"version":3,"file":"axon-cloud-service.js","sourceRoot":"","sources":["../../../../src/web/server/services/axon-cloud-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { ConfigManager, UserConfig, ConfigSource, ConfigSourceInfo, ConfigKeySource, EnterprisePolicyConfig } from '../../../config/index.js';
|
|
6
6
|
import type { McpServerConfig } from '../../../types/index.js';
|
|
7
|
-
import {
|
|
7
|
+
import type { WebRuntimeBackend } from '../../shared/model-catalog.js';
|
|
8
8
|
/**
|
|
9
9
|
* API 配置
|
|
10
10
|
*/
|
|
@@ -26,6 +26,7 @@ export interface ApiConfig {
|
|
|
26
26
|
runtimeBackend?: WebRuntimeBackend;
|
|
27
27
|
defaultModelByBackend?: Partial<Record<WebRuntimeBackend, string>>;
|
|
28
28
|
customModelCatalogByBackend?: Partial<Record<WebRuntimeBackend, string[]>>;
|
|
29
|
+
modelContextWindowById?: Record<string, number>;
|
|
29
30
|
geminiApiKey?: string;
|
|
30
31
|
ollamaUrl?: string;
|
|
31
32
|
ollamaModel?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-service.d.ts","sourceRoot":"","sources":["../../../../src/web/server/services/config-service.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,sBAAsB,EAAwC,MAAM,0BAA0B,CAAC;AACpL,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,
|
|
1
|
+
{"version":3,"file":"config-service.d.ts","sourceRoot":"","sources":["../../../../src/web/server/services/config-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { configManager as globalConfigManager } from '../../../config/index.js';
|
|
6
6
|
import { webAuth } from '../web-auth.js';
|
|
7
|
-
import {
|
|
7
|
+
import { normalizeRuntimeConfigShape } from '../../shared/setup-runtime.js';
|
|
8
8
|
// ============ WebConfigService 类 ============
|
|
9
9
|
/**
|
|
10
10
|
* WebUI 配置服务类
|
|
@@ -86,6 +86,7 @@ export class WebConfigService {
|
|
|
86
86
|
runtimeBackend: webAuth.getRuntimeBackend(),
|
|
87
87
|
defaultModelByBackend: webAuth.getDefaultModelByBackend(),
|
|
88
88
|
customModelCatalogByBackend: webAuth.getCustomModelCatalogByBackend(),
|
|
89
|
+
modelContextWindowById: config.modelContextWindowById,
|
|
89
90
|
geminiApiKey: maskedGeminiKey,
|
|
90
91
|
ollamaUrl: config.ollamaUrl || 'http://localhost:11434',
|
|
91
92
|
ollamaModel: config.ollamaModel || '',
|
|
@@ -233,23 +234,26 @@ export class WebConfigService {
|
|
|
233
234
|
async updateApiConfig(config) {
|
|
234
235
|
try {
|
|
235
236
|
const updates = { ...config };
|
|
236
|
-
const
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
: updates.apiProvider
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
}
|
|
251
|
-
|
|
252
|
-
updates.
|
|
237
|
+
const currentConfig = this.configManager.getAll();
|
|
238
|
+
const normalizedRuntime = normalizeRuntimeConfigShape({
|
|
239
|
+
current: {
|
|
240
|
+
runtimeBackend: webAuth.getRuntimeBackend(),
|
|
241
|
+
runtimeProvider: webAuth.getRuntimeProvider(),
|
|
242
|
+
apiProvider: currentConfig.apiProvider,
|
|
243
|
+
authPriority: currentConfig.authPriority,
|
|
244
|
+
},
|
|
245
|
+
updates: {
|
|
246
|
+
runtimeBackend: updates.runtimeBackend,
|
|
247
|
+
runtimeProvider: updates.runtimeProvider,
|
|
248
|
+
apiProvider: updates.apiProvider,
|
|
249
|
+
authPriority: updates.authPriority,
|
|
250
|
+
},
|
|
251
|
+
});
|
|
252
|
+
const runtimeBackend = normalizedRuntime.runtimeBackend;
|
|
253
|
+
updates.runtimeBackend = normalizedRuntime.runtimeBackend;
|
|
254
|
+
updates.runtimeProvider = normalizedRuntime.runtimeProvider;
|
|
255
|
+
updates.apiProvider = normalizedRuntime.apiProvider;
|
|
256
|
+
updates.authPriority = normalizedRuntime.authPriority;
|
|
253
257
|
// apiKey 特殊处理:空值或掩码值不覆盖已有 key
|
|
254
258
|
if ('apiKey' in updates) {
|
|
255
259
|
const val = updates.apiKey?.trim() || '';
|
|
@@ -294,6 +298,12 @@ export class WebConfigService {
|
|
|
294
298
|
updates.customModelName = existingModelMap[runtimeBackend];
|
|
295
299
|
}
|
|
296
300
|
updates.defaultModelByBackend = existingModelMap;
|
|
301
|
+
if ('modelContextWindowById' in updates) {
|
|
302
|
+
const modelContextWindowById = updates.modelContextWindowById;
|
|
303
|
+
if (!modelContextWindowById || Object.keys(modelContextWindowById).length === 0) {
|
|
304
|
+
updates.modelContextWindowById = undefined;
|
|
305
|
+
}
|
|
306
|
+
}
|
|
297
307
|
// 保存其余配置
|
|
298
308
|
if (Object.keys(updates).length > 0) {
|
|
299
309
|
this.configManager.save(updates);
|