gsd-pi 2.76.0-dev.4c866b677 → 2.76.0-dev.7218806ab
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/claude-cli-check.js +32 -3
- package/dist/mcp-server.d.ts +7 -0
- package/dist/mcp-server.js +35 -1
- package/dist/resources/extensions/claude-code-cli/readiness.js +4 -3
- package/dist/resources/extensions/claude-code-cli/stream-adapter.js +77 -17
- package/dist/resources/extensions/gsd/auto-model-selection.js +1 -1
- package/dist/resources/extensions/gsd/auto-start.js +11 -15
- package/dist/resources/extensions/gsd/auto.js +13 -17
- package/dist/resources/extensions/gsd/bootstrap/agent-end-recovery.js +17 -1
- package/dist/resources/extensions/gsd/bootstrap/db-tools.js +39 -9
- package/dist/resources/extensions/gsd/bootstrap/exec-tools.js +93 -0
- package/dist/resources/extensions/gsd/bootstrap/register-extension.js +2 -0
- package/dist/resources/extensions/gsd/bootstrap/register-hooks.js +40 -4
- package/dist/resources/extensions/gsd/bootstrap/write-gate.js +12 -1
- package/dist/resources/extensions/gsd/commands-prefs-wizard.js +968 -23
- package/dist/resources/extensions/gsd/compaction-snapshot.js +121 -0
- package/dist/resources/extensions/gsd/error-classifier.js +10 -3
- package/dist/resources/extensions/gsd/exec-history.js +120 -0
- package/dist/resources/extensions/gsd/exec-sandbox.js +258 -0
- package/dist/resources/extensions/gsd/gsd-db.js +3 -1
- package/dist/resources/extensions/gsd/guided-flow.js +189 -0
- package/dist/resources/extensions/gsd/health-widget.js +4 -1
- package/dist/resources/extensions/gsd/key-manager.js +6 -0
- package/dist/resources/extensions/gsd/model-router.js +36 -3
- package/dist/resources/extensions/gsd/pre-execution-checks.js +35 -9
- package/dist/resources/extensions/gsd/preferences-types.js +9 -0
- package/dist/resources/extensions/gsd/preferences-validation.js +83 -0
- package/dist/resources/extensions/gsd/preferences.js +17 -17
- package/dist/resources/extensions/gsd/prompts/discuss-headless.md +8 -0
- package/dist/resources/extensions/gsd/prompts/discuss.md +29 -2
- package/dist/resources/extensions/gsd/token-counter.js +22 -5
- package/dist/resources/extensions/gsd/tools/exec-search-tool.js +59 -0
- package/dist/resources/extensions/gsd/tools/exec-tool.js +126 -0
- package/dist/resources/extensions/gsd/tools/resume-tool.js +23 -0
- package/dist/resources/extensions/gsd/workflow-mcp.js +3 -0
- package/dist/tsconfig.extensions.tsbuildinfo +1 -1
- package/dist/web/standalone/.next/BUILD_ID +1 -1
- package/dist/web/standalone/.next/app-path-routes-manifest.json +11 -11
- package/dist/web/standalone/.next/build-manifest.json +2 -2
- package/dist/web/standalone/.next/prerender-manifest.json +3 -3
- package/dist/web/standalone/.next/server/app/_global-error.html +1 -1
- package/dist/web/standalone/.next/server/app/_global-error.rsc +1 -1
- package/dist/web/standalone/.next/server/app/_global-error.segments/_full.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/_global-error.segments/_global-error/__PAGE__.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/_global-error.segments/_global-error.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/_global-error.segments/_head.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/_global-error.segments/_index.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/_global-error.segments/_tree.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/_not-found.html +1 -1
- package/dist/web/standalone/.next/server/app/_not-found.rsc +1 -1
- package/dist/web/standalone/.next/server/app/_not-found.segments/_full.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/_not-found.segments/_head.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/_not-found.segments/_index.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/_not-found.segments/_not-found/__PAGE__.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/_not-found.segments/_not-found.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/_not-found.segments/_tree.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/index.html +1 -1
- package/dist/web/standalone/.next/server/app/index.rsc +1 -1
- package/dist/web/standalone/.next/server/app/index.segments/__PAGE__.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/index.segments/_full.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/index.segments/_head.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/index.segments/_index.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app/index.segments/_tree.segment.rsc +1 -1
- package/dist/web/standalone/.next/server/app-paths-manifest.json +11 -11
- package/dist/web/standalone/.next/server/middleware-build-manifest.js +1 -1
- package/dist/web/standalone/.next/server/middleware-manifest.json +5 -5
- package/dist/web/standalone/.next/server/pages/404.html +1 -1
- package/dist/web/standalone/.next/server/pages/500.html +1 -1
- package/dist/web/standalone/.next/server/server-reference-manifest.json +1 -1
- package/package.json +1 -1
- package/packages/mcp-server/dist/remote-questions.d.ts +45 -0
- package/packages/mcp-server/dist/remote-questions.d.ts.map +1 -0
- package/packages/mcp-server/dist/remote-questions.js +732 -0
- package/packages/mcp-server/dist/remote-questions.js.map +1 -0
- package/packages/mcp-server/dist/server.d.ts.map +1 -1
- package/packages/mcp-server/dist/server.js +18 -1
- package/packages/mcp-server/dist/server.js.map +1 -1
- package/packages/mcp-server/dist/workflow-tools.d.ts.map +1 -1
- package/packages/mcp-server/dist/workflow-tools.js +64 -25
- package/packages/mcp-server/dist/workflow-tools.js.map +1 -1
- package/packages/mcp-server/package.json +2 -1
- package/packages/mcp-server/src/remote-questions.test.ts +294 -0
- package/packages/mcp-server/src/remote-questions.ts +916 -0
- package/packages/mcp-server/src/server.ts +19 -1
- package/packages/mcp-server/src/workflow-tools.test.ts +146 -1
- package/packages/mcp-server/src/workflow-tools.ts +84 -43
- package/packages/mcp-server/tsconfig.test.json +19 -0
- package/packages/mcp-server/tsconfig.tsbuildinfo +1 -1
- package/packages/pi-ai/dist/providers/anthropic-shared.d.ts.map +1 -1
- package/packages/pi-ai/dist/providers/anthropic-shared.js +2 -0
- package/packages/pi-ai/dist/providers/anthropic-shared.js.map +1 -1
- package/packages/pi-ai/dist/providers/simple-options.d.ts +10 -0
- package/packages/pi-ai/dist/providers/simple-options.d.ts.map +1 -1
- package/packages/pi-ai/dist/providers/simple-options.js +16 -1
- package/packages/pi-ai/dist/providers/simple-options.js.map +1 -1
- package/packages/pi-ai/src/providers/anthropic-shared.ts +3 -1
- package/packages/pi-ai/src/providers/simple-options.ts +17 -1
- package/packages/pi-ai/tsconfig.tsbuildinfo +1 -1
- package/packages/pi-coding-agent/dist/core/model-registry-custom-caps.test.d.ts +2 -0
- package/packages/pi-coding-agent/dist/core/model-registry-custom-caps.test.d.ts.map +1 -0
- package/packages/pi-coding-agent/dist/core/model-registry-custom-caps.test.js +203 -0
- package/packages/pi-coding-agent/dist/core/model-registry-custom-caps.test.js.map +1 -0
- package/packages/pi-coding-agent/dist/core/model-registry.d.ts.map +1 -1
- package/packages/pi-coding-agent/dist/core/model-registry.js +14 -0
- package/packages/pi-coding-agent/dist/core/model-registry.js.map +1 -1
- package/packages/pi-coding-agent/dist/core/redact-secrets.d.ts +2 -0
- package/packages/pi-coding-agent/dist/core/redact-secrets.d.ts.map +1 -0
- package/packages/pi-coding-agent/dist/core/redact-secrets.js +49 -0
- package/packages/pi-coding-agent/dist/core/redact-secrets.js.map +1 -0
- package/packages/pi-coding-agent/dist/core/redact-secrets.test.d.ts +2 -0
- package/packages/pi-coding-agent/dist/core/redact-secrets.test.d.ts.map +1 -0
- package/packages/pi-coding-agent/dist/core/redact-secrets.test.js +67 -0
- package/packages/pi-coding-agent/dist/core/redact-secrets.test.js.map +1 -0
- package/packages/pi-coding-agent/dist/core/session-manager.d.ts.map +1 -1
- package/packages/pi-coding-agent/dist/core/session-manager.js +9 -5
- package/packages/pi-coding-agent/dist/core/session-manager.js.map +1 -1
- package/packages/pi-coding-agent/dist/core/session-manager.test.js +25 -1
- package/packages/pi-coding-agent/dist/core/session-manager.test.js.map +1 -1
- package/packages/pi-coding-agent/dist/modes/interactive/interactive-mode.d.ts.map +1 -1
- package/packages/pi-coding-agent/dist/modes/interactive/interactive-mode.js +13 -1
- package/packages/pi-coding-agent/dist/modes/interactive/interactive-mode.js.map +1 -1
- package/packages/pi-coding-agent/src/core/model-registry-custom-caps.test.ts +245 -0
- package/packages/pi-coding-agent/src/core/model-registry.ts +16 -0
- package/packages/pi-coding-agent/src/core/redact-secrets.test.ts +86 -0
- package/packages/pi-coding-agent/src/core/redact-secrets.ts +58 -0
- package/packages/pi-coding-agent/src/core/session-manager.test.ts +36 -1
- package/packages/pi-coding-agent/src/core/session-manager.ts +9 -5
- package/packages/pi-coding-agent/src/modes/interactive/interactive-mode.ts +13 -1
- package/packages/pi-coding-agent/tsconfig.tsbuildinfo +1 -1
- package/src/resources/extensions/claude-code-cli/readiness.ts +4 -3
- package/src/resources/extensions/claude-code-cli/stream-adapter.ts +78 -17
- package/src/resources/extensions/claude-code-cli/tests/stream-adapter.test.ts +149 -5
- package/src/resources/extensions/gsd/auto-model-selection.ts +1 -1
- package/src/resources/extensions/gsd/auto-post-unit.ts +0 -1
- package/src/resources/extensions/gsd/auto-start.ts +13 -16
- package/src/resources/extensions/gsd/auto.ts +12 -17
- package/src/resources/extensions/gsd/bootstrap/agent-end-recovery.ts +23 -1
- package/src/resources/extensions/gsd/bootstrap/db-tools.ts +40 -9
- package/src/resources/extensions/gsd/bootstrap/exec-tools.ts +109 -0
- package/src/resources/extensions/gsd/bootstrap/register-extension.ts +2 -0
- package/src/resources/extensions/gsd/bootstrap/register-hooks.ts +42 -4
- package/src/resources/extensions/gsd/bootstrap/write-gate.ts +13 -1
- package/src/resources/extensions/gsd/commands-prefs-wizard.ts +898 -32
- package/src/resources/extensions/gsd/compaction-snapshot.ts +165 -0
- package/src/resources/extensions/gsd/error-classifier.ts +10 -3
- package/src/resources/extensions/gsd/exec-history.ts +153 -0
- package/src/resources/extensions/gsd/exec-sandbox.ts +326 -0
- package/src/resources/extensions/gsd/gsd-db.ts +3 -1
- package/src/resources/extensions/gsd/guided-flow.ts +221 -0
- package/src/resources/extensions/gsd/health-widget.ts +3 -1
- package/src/resources/extensions/gsd/key-manager.ts +6 -0
- package/src/resources/extensions/gsd/model-router.ts +42 -1
- package/src/resources/extensions/gsd/pre-execution-checks.ts +36 -10
- package/src/resources/extensions/gsd/preferences-types.ts +38 -0
- package/src/resources/extensions/gsd/preferences-validation.ts +79 -0
- package/src/resources/extensions/gsd/preferences.ts +17 -17
- package/src/resources/extensions/gsd/prompts/discuss-headless.md +8 -0
- package/src/resources/extensions/gsd/prompts/discuss.md +29 -2
- package/src/resources/extensions/gsd/tests/compaction-snapshot.test.ts +123 -0
- package/src/resources/extensions/gsd/tests/doctor-providers.test.ts +31 -0
- package/src/resources/extensions/gsd/tests/exec-history.test.ts +124 -0
- package/src/resources/extensions/gsd/tests/exec-sandbox.test.ts +210 -0
- package/src/resources/extensions/gsd/tests/gsd-db.test.ts +64 -0
- package/src/resources/extensions/gsd/tests/isolation-none-branch-guard.test.ts +1 -1
- package/src/resources/extensions/gsd/tests/key-manager.test.ts +7 -0
- package/src/resources/extensions/gsd/tests/pre-exec-backtick-strip.test.ts +14 -0
- package/src/resources/extensions/gsd/tests/pre-execution-checks.test.ts +234 -0
- package/src/resources/extensions/gsd/tests/preferences.test.ts +110 -0
- package/src/resources/extensions/gsd/tests/prefs-wizard-coverage.test.ts +44 -0
- package/src/resources/extensions/gsd/tests/provider-errors.test.ts +48 -0
- package/src/resources/extensions/gsd/tests/ready-phrase-no-files-4573.test.ts +388 -0
- package/src/resources/extensions/gsd/tests/restore-tools-after-discuss.test.ts +9 -3
- package/src/resources/extensions/gsd/tests/save-gate-result-render.test.ts +95 -0
- package/src/resources/extensions/gsd/tests/session-start-footer.test.ts +32 -40
- package/src/resources/extensions/gsd/tests/token-counter.test.ts +105 -1
- package/src/resources/extensions/gsd/tests/tool-compatibility.test.ts +107 -0
- package/src/resources/extensions/gsd/tests/workflow-tool-executors.test.ts +65 -2
- package/src/resources/extensions/gsd/tests/write-gate.test.ts +64 -0
- package/src/resources/extensions/gsd/tests/zombie-gsd-state.test.ts +3 -1
- package/src/resources/extensions/gsd/token-counter.ts +22 -5
- package/src/resources/extensions/gsd/tools/exec-search-tool.ts +81 -0
- package/src/resources/extensions/gsd/tools/exec-tool.ts +183 -0
- package/src/resources/extensions/gsd/tools/resume-tool.ts +40 -0
- package/src/resources/extensions/gsd/workflow-logger.ts +2 -1
- package/src/resources/extensions/gsd/workflow-mcp.ts +3 -0
- /package/dist/web/standalone/.next/static/{jDqWYbuP_CG6Kjc-uKwkN → 5qAwYhcU5Fs2VOq_R8lOc}/_buildManifest.js +0 -0
- /package/dist/web/standalone/.next/static/{jDqWYbuP_CG6Kjc-uKwkN → 5qAwYhcU5Fs2VOq_R8lOc}/_ssgManifest.js +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-registry-custom-caps.test.d.ts","sourceRoot":"","sources":["../../src/core/model-registry-custom-caps.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Regression tests for #4563:
|
|
3
|
+
* Bug 1 — custom/Anthropic-compatible models were hard-capped to 32 k output tokens
|
|
4
|
+
* Bug 2 — custom models in models.json could not declare capabilities.supportsXhigh
|
|
5
|
+
*/
|
|
6
|
+
import assert from "node:assert/strict";
|
|
7
|
+
import { mkdirSync, rmSync, writeFileSync } from "node:fs";
|
|
8
|
+
import { tmpdir } from "node:os";
|
|
9
|
+
import { join } from "node:path";
|
|
10
|
+
import { afterEach, beforeEach, describe, it } from "node:test";
|
|
11
|
+
import { AuthStorage } from "./auth-storage.js";
|
|
12
|
+
import { ModelRegistry } from "./model-registry.js";
|
|
13
|
+
// ─── Helpers ─────────────────────────────────────────────────────────────────
|
|
14
|
+
let testDir;
|
|
15
|
+
beforeEach(() => {
|
|
16
|
+
testDir = join(tmpdir(), `model-registry-custom-caps-${Date.now()}-${Math.random().toString(36).slice(2)}`);
|
|
17
|
+
mkdirSync(testDir, { recursive: true });
|
|
18
|
+
});
|
|
19
|
+
afterEach(() => {
|
|
20
|
+
try {
|
|
21
|
+
rmSync(testDir, { recursive: true, force: true });
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
// best-effort cleanup
|
|
25
|
+
}
|
|
26
|
+
});
|
|
27
|
+
function createRegistry(modelsJson) {
|
|
28
|
+
const path = join(testDir, "models.json");
|
|
29
|
+
writeFileSync(path, JSON.stringify(modelsJson));
|
|
30
|
+
return new ModelRegistry(AuthStorage.inMemory(), path);
|
|
31
|
+
}
|
|
32
|
+
function writeModelsJson(obj) {
|
|
33
|
+
const path = join(testDir, "models.json");
|
|
34
|
+
writeFileSync(path, JSON.stringify(obj));
|
|
35
|
+
return path;
|
|
36
|
+
}
|
|
37
|
+
// ─── Bug 1: 32 k cap must not apply to custom/OpenAI-compatible models ────────
|
|
38
|
+
describe("Bug 1 — maxTokens cap (#4563)", () => {
|
|
39
|
+
it("custom openai-completions model with maxTokens > 32 k is not capped", () => {
|
|
40
|
+
const registry = createRegistry({
|
|
41
|
+
providers: {
|
|
42
|
+
"kimi-custom": {
|
|
43
|
+
baseUrl: "https://api.example.com/v1",
|
|
44
|
+
apiKey: "sk-test",
|
|
45
|
+
api: "openai-completions",
|
|
46
|
+
models: [
|
|
47
|
+
{
|
|
48
|
+
id: "kimi-k2.6-code-preview",
|
|
49
|
+
name: "Kimi K2.6 Code Preview",
|
|
50
|
+
maxTokens: 131072,
|
|
51
|
+
contextWindow: 262144,
|
|
52
|
+
},
|
|
53
|
+
],
|
|
54
|
+
},
|
|
55
|
+
},
|
|
56
|
+
});
|
|
57
|
+
const model = registry.getAll().find((m) => m.id === "kimi-k2.6-code-preview");
|
|
58
|
+
assert.ok(model, "model should be registered");
|
|
59
|
+
assert.equal(model.maxTokens, 131072, "maxTokens must be preserved as declared — not capped to 32 000");
|
|
60
|
+
});
|
|
61
|
+
it("custom model with maxTokens exactly 32 k is not affected", () => {
|
|
62
|
+
const registry = createRegistry({
|
|
63
|
+
providers: {
|
|
64
|
+
"custom-provider": {
|
|
65
|
+
baseUrl: "https://api.example.com/v1",
|
|
66
|
+
apiKey: "sk-test",
|
|
67
|
+
api: "openai-completions",
|
|
68
|
+
models: [{ id: "model-32k", maxTokens: 32000, contextWindow: 128000 }],
|
|
69
|
+
},
|
|
70
|
+
},
|
|
71
|
+
});
|
|
72
|
+
const model = registry.getAll().find((m) => m.id === "model-32k");
|
|
73
|
+
assert.ok(model);
|
|
74
|
+
assert.equal(model.maxTokens, 32000);
|
|
75
|
+
});
|
|
76
|
+
it("custom model with maxTokens 65 k is stored at full value", () => {
|
|
77
|
+
const registry = createRegistry({
|
|
78
|
+
providers: {
|
|
79
|
+
"dashscope-custom": {
|
|
80
|
+
baseUrl: "https://dashscope-intl.aliyuncs.com/compatible-mode/v1",
|
|
81
|
+
apiKey: "sk-test",
|
|
82
|
+
api: "openai-completions",
|
|
83
|
+
models: [
|
|
84
|
+
{
|
|
85
|
+
id: "qwen3.5-plus",
|
|
86
|
+
name: "Qwen3.5 Plus",
|
|
87
|
+
maxTokens: 65536,
|
|
88
|
+
contextWindow: 1000000,
|
|
89
|
+
},
|
|
90
|
+
],
|
|
91
|
+
},
|
|
92
|
+
},
|
|
93
|
+
});
|
|
94
|
+
const model = registry.getAll().find((m) => m.id === "qwen3.5-plus" && m.provider === "dashscope-custom");
|
|
95
|
+
assert.ok(model);
|
|
96
|
+
assert.equal(model.maxTokens, 65536);
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
// ─── Bug 2: capabilities.supportsXhigh must be declarable in models.json ──────
|
|
100
|
+
describe("Bug 2 — capabilities.supportsXhigh in models.json (#4563)", () => {
|
|
101
|
+
it("model with capabilities.supportsXhigh: true surfaces the flag", () => {
|
|
102
|
+
const registry = createRegistry({
|
|
103
|
+
providers: {
|
|
104
|
+
"kimi-custom": {
|
|
105
|
+
baseUrl: "https://api.example.com/v1",
|
|
106
|
+
apiKey: "sk-test",
|
|
107
|
+
api: "anthropic-messages",
|
|
108
|
+
models: [
|
|
109
|
+
{
|
|
110
|
+
id: "kimi-k2.6-code-preview",
|
|
111
|
+
name: "Kimi K2.6 Code Preview",
|
|
112
|
+
maxTokens: 131072,
|
|
113
|
+
contextWindow: 262144,
|
|
114
|
+
capabilities: { supportsXhigh: true },
|
|
115
|
+
},
|
|
116
|
+
],
|
|
117
|
+
},
|
|
118
|
+
},
|
|
119
|
+
});
|
|
120
|
+
const model = registry.getAll().find((m) => m.id === "kimi-k2.6-code-preview");
|
|
121
|
+
assert.ok(model, "model should be registered");
|
|
122
|
+
assert.equal(model.capabilities?.supportsXhigh, true, "supportsXhigh must be true as declared in models.json");
|
|
123
|
+
});
|
|
124
|
+
it("model without capabilities declaration has no supportsXhigh", () => {
|
|
125
|
+
const registry = createRegistry({
|
|
126
|
+
providers: {
|
|
127
|
+
"plain-provider": {
|
|
128
|
+
baseUrl: "https://api.example.com/v1",
|
|
129
|
+
apiKey: "sk-test",
|
|
130
|
+
api: "openai-completions",
|
|
131
|
+
models: [{ id: "plain-model", maxTokens: 16384, contextWindow: 128000 }],
|
|
132
|
+
},
|
|
133
|
+
},
|
|
134
|
+
});
|
|
135
|
+
const model = registry.getAll().find((m) => m.id === "plain-model");
|
|
136
|
+
assert.ok(model);
|
|
137
|
+
// supportsXhigh should be absent or explicitly false — never implicitly true
|
|
138
|
+
assert.ok(!model.capabilities?.supportsXhigh, "supportsXhigh must not be set for models that don't declare it");
|
|
139
|
+
});
|
|
140
|
+
it("capabilities.supportsXhigh: false is respected", () => {
|
|
141
|
+
const registry = createRegistry({
|
|
142
|
+
providers: {
|
|
143
|
+
"explicit-provider": {
|
|
144
|
+
baseUrl: "https://api.example.com/v1",
|
|
145
|
+
apiKey: "sk-test",
|
|
146
|
+
api: "openai-completions",
|
|
147
|
+
models: [
|
|
148
|
+
{
|
|
149
|
+
id: "no-xhigh-model",
|
|
150
|
+
capabilities: { supportsXhigh: false },
|
|
151
|
+
},
|
|
152
|
+
],
|
|
153
|
+
},
|
|
154
|
+
},
|
|
155
|
+
});
|
|
156
|
+
const model = registry.getAll().find((m) => m.id === "no-xhigh-model");
|
|
157
|
+
assert.ok(model);
|
|
158
|
+
assert.equal(model.capabilities?.supportsXhigh, false);
|
|
159
|
+
});
|
|
160
|
+
it("supportsXhigh declared in models.json is not overwritten by capability patches", () => {
|
|
161
|
+
// The capability-patches system must not overwrite an explicit declaration in models.json.
|
|
162
|
+
// applyCapabilityPatches uses spread: { ...patch.caps, ...model.capabilities }
|
|
163
|
+
// so model.capabilities wins. This test verifies the precedence end-to-end.
|
|
164
|
+
const registry = createRegistry({
|
|
165
|
+
providers: {
|
|
166
|
+
"compat-provider": {
|
|
167
|
+
baseUrl: "https://api.example.com/v1",
|
|
168
|
+
apiKey: "sk-test",
|
|
169
|
+
api: "openai-completions",
|
|
170
|
+
models: [
|
|
171
|
+
{
|
|
172
|
+
id: "custom-xhigh-model",
|
|
173
|
+
capabilities: { supportsXhigh: true },
|
|
174
|
+
},
|
|
175
|
+
],
|
|
176
|
+
},
|
|
177
|
+
},
|
|
178
|
+
});
|
|
179
|
+
const model = registry.getAll().find((m) => m.id === "custom-xhigh-model");
|
|
180
|
+
assert.ok(model);
|
|
181
|
+
assert.equal(model.capabilities?.supportsXhigh, true);
|
|
182
|
+
});
|
|
183
|
+
it("modelOverrides can set capabilities.supportsXhigh on built-in models", () => {
|
|
184
|
+
// A user-facing override in models.json should be able to add supportsXhigh
|
|
185
|
+
// to a built-in model that doesn't declare it.
|
|
186
|
+
const path = writeModelsJson({
|
|
187
|
+
providers: {
|
|
188
|
+
anthropic: {
|
|
189
|
+
modelOverrides: {
|
|
190
|
+
"claude-3-5-haiku-20241022": {
|
|
191
|
+
capabilities: { supportsXhigh: true },
|
|
192
|
+
},
|
|
193
|
+
},
|
|
194
|
+
},
|
|
195
|
+
},
|
|
196
|
+
});
|
|
197
|
+
const registry = new ModelRegistry(AuthStorage.inMemory(), path);
|
|
198
|
+
const model = registry.getAll().find((m) => m.provider === "anthropic" && m.id === "claude-3-5-haiku-20241022");
|
|
199
|
+
assert.ok(model, "built-in model must still be present");
|
|
200
|
+
assert.equal(model.capabilities?.supportsXhigh, true, "modelOverrides must be able to set capabilities.supportsXhigh");
|
|
201
|
+
});
|
|
202
|
+
});
|
|
203
|
+
//# sourceMappingURL=model-registry-custom-caps.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-registry-custom-caps.test.js","sourceRoot":"","sources":["../../src/core/model-registry-custom-caps.test.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Regression tests for #4563:\n * Bug 1 — custom/Anthropic-compatible models were hard-capped to 32 k output tokens\n * Bug 2 — custom models in models.json could not declare capabilities.supportsXhigh\n */\nimport assert from \"node:assert/strict\";\nimport { mkdirSync, rmSync, writeFileSync } from \"node:fs\";\nimport { tmpdir } from \"node:os\";\nimport { join } from \"node:path\";\nimport { afterEach, beforeEach, describe, it } from \"node:test\";\nimport { AuthStorage } from \"./auth-storage.js\";\nimport { ModelRegistry } from \"./model-registry.js\";\n\n// ─── Helpers ─────────────────────────────────────────────────────────────────\n\nlet testDir: string;\n\nbeforeEach(() => {\n\ttestDir = join(\n\t\ttmpdir(),\n\t\t`model-registry-custom-caps-${Date.now()}-${Math.random().toString(36).slice(2)}`,\n\t);\n\tmkdirSync(testDir, { recursive: true });\n});\n\nafterEach(() => {\n\ttry {\n\t\trmSync(testDir, { recursive: true, force: true });\n\t} catch {\n\t\t// best-effort cleanup\n\t}\n});\n\nfunction createRegistry(modelsJson: object): ModelRegistry {\n\tconst path = join(testDir, \"models.json\");\n\twriteFileSync(path, JSON.stringify(modelsJson));\n\treturn new ModelRegistry(AuthStorage.inMemory(), path);\n}\n\nfunction writeModelsJson(obj: object): string {\n\tconst path = join(testDir, \"models.json\");\n\twriteFileSync(path, JSON.stringify(obj));\n\treturn path;\n}\n\n// ─── Bug 1: 32 k cap must not apply to custom/OpenAI-compatible models ────────\n\ndescribe(\"Bug 1 — maxTokens cap (#4563)\", () => {\n\tit(\"custom openai-completions model with maxTokens > 32 k is not capped\", () => {\n\t\tconst registry = createRegistry({\n\t\t\tproviders: {\n\t\t\t\t\"kimi-custom\": {\n\t\t\t\t\tbaseUrl: \"https://api.example.com/v1\",\n\t\t\t\t\tapiKey: \"sk-test\",\n\t\t\t\t\tapi: \"openai-completions\",\n\t\t\t\t\tmodels: [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tid: \"kimi-k2.6-code-preview\",\n\t\t\t\t\t\t\tname: \"Kimi K2.6 Code Preview\",\n\t\t\t\t\t\t\tmaxTokens: 131072,\n\t\t\t\t\t\t\tcontextWindow: 262144,\n\t\t\t\t\t\t},\n\t\t\t\t\t],\n\t\t\t\t},\n\t\t\t},\n\t\t});\n\n\t\tconst model = registry.getAll().find((m) => m.id === \"kimi-k2.6-code-preview\");\n\t\tassert.ok(model, \"model should be registered\");\n\t\tassert.equal(\n\t\t\tmodel.maxTokens,\n\t\t\t131072,\n\t\t\t\"maxTokens must be preserved as declared — not capped to 32 000\",\n\t\t);\n\t});\n\n\tit(\"custom model with maxTokens exactly 32 k is not affected\", () => {\n\t\tconst registry = createRegistry({\n\t\t\tproviders: {\n\t\t\t\t\"custom-provider\": {\n\t\t\t\t\tbaseUrl: \"https://api.example.com/v1\",\n\t\t\t\t\tapiKey: \"sk-test\",\n\t\t\t\t\tapi: \"openai-completions\",\n\t\t\t\t\tmodels: [{ id: \"model-32k\", maxTokens: 32000, contextWindow: 128000 }],\n\t\t\t\t},\n\t\t\t},\n\t\t});\n\n\t\tconst model = registry.getAll().find((m) => m.id === \"model-32k\");\n\t\tassert.ok(model);\n\t\tassert.equal(model.maxTokens, 32000);\n\t});\n\n\tit(\"custom model with maxTokens 65 k is stored at full value\", () => {\n\t\tconst registry = createRegistry({\n\t\t\tproviders: {\n\t\t\t\t\"dashscope-custom\": {\n\t\t\t\t\tbaseUrl: \"https://dashscope-intl.aliyuncs.com/compatible-mode/v1\",\n\t\t\t\t\tapiKey: \"sk-test\",\n\t\t\t\t\tapi: \"openai-completions\",\n\t\t\t\t\tmodels: [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tid: \"qwen3.5-plus\",\n\t\t\t\t\t\t\tname: \"Qwen3.5 Plus\",\n\t\t\t\t\t\t\tmaxTokens: 65536,\n\t\t\t\t\t\t\tcontextWindow: 1000000,\n\t\t\t\t\t\t},\n\t\t\t\t\t],\n\t\t\t\t},\n\t\t\t},\n\t\t});\n\n\t\tconst model = registry.getAll().find((m) => m.id === \"qwen3.5-plus\" && m.provider === \"dashscope-custom\");\n\t\tassert.ok(model);\n\t\tassert.equal(model.maxTokens, 65536);\n\t});\n});\n\n// ─── Bug 2: capabilities.supportsXhigh must be declarable in models.json ──────\n\ndescribe(\"Bug 2 — capabilities.supportsXhigh in models.json (#4563)\", () => {\n\tit(\"model with capabilities.supportsXhigh: true surfaces the flag\", () => {\n\t\tconst registry = createRegistry({\n\t\t\tproviders: {\n\t\t\t\t\"kimi-custom\": {\n\t\t\t\t\tbaseUrl: \"https://api.example.com/v1\",\n\t\t\t\t\tapiKey: \"sk-test\",\n\t\t\t\t\tapi: \"anthropic-messages\",\n\t\t\t\t\tmodels: [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tid: \"kimi-k2.6-code-preview\",\n\t\t\t\t\t\t\tname: \"Kimi K2.6 Code Preview\",\n\t\t\t\t\t\t\tmaxTokens: 131072,\n\t\t\t\t\t\t\tcontextWindow: 262144,\n\t\t\t\t\t\t\tcapabilities: { supportsXhigh: true },\n\t\t\t\t\t\t},\n\t\t\t\t\t],\n\t\t\t\t},\n\t\t\t},\n\t\t});\n\n\t\tconst model = registry.getAll().find((m) => m.id === \"kimi-k2.6-code-preview\");\n\t\tassert.ok(model, \"model should be registered\");\n\t\tassert.equal(\n\t\t\tmodel.capabilities?.supportsXhigh,\n\t\t\ttrue,\n\t\t\t\"supportsXhigh must be true as declared in models.json\",\n\t\t);\n\t});\n\n\tit(\"model without capabilities declaration has no supportsXhigh\", () => {\n\t\tconst registry = createRegistry({\n\t\t\tproviders: {\n\t\t\t\t\"plain-provider\": {\n\t\t\t\t\tbaseUrl: \"https://api.example.com/v1\",\n\t\t\t\t\tapiKey: \"sk-test\",\n\t\t\t\t\tapi: \"openai-completions\",\n\t\t\t\t\tmodels: [{ id: \"plain-model\", maxTokens: 16384, contextWindow: 128000 }],\n\t\t\t\t},\n\t\t\t},\n\t\t});\n\n\t\tconst model = registry.getAll().find((m) => m.id === \"plain-model\");\n\t\tassert.ok(model);\n\t\t// supportsXhigh should be absent or explicitly false — never implicitly true\n\t\tassert.ok(\n\t\t\t!model.capabilities?.supportsXhigh,\n\t\t\t\"supportsXhigh must not be set for models that don't declare it\",\n\t\t);\n\t});\n\n\tit(\"capabilities.supportsXhigh: false is respected\", () => {\n\t\tconst registry = createRegistry({\n\t\t\tproviders: {\n\t\t\t\t\"explicit-provider\": {\n\t\t\t\t\tbaseUrl: \"https://api.example.com/v1\",\n\t\t\t\t\tapiKey: \"sk-test\",\n\t\t\t\t\tapi: \"openai-completions\",\n\t\t\t\t\tmodels: [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tid: \"no-xhigh-model\",\n\t\t\t\t\t\t\tcapabilities: { supportsXhigh: false },\n\t\t\t\t\t\t},\n\t\t\t\t\t],\n\t\t\t\t},\n\t\t\t},\n\t\t});\n\n\t\tconst model = registry.getAll().find((m) => m.id === \"no-xhigh-model\");\n\t\tassert.ok(model);\n\t\tassert.equal(model.capabilities?.supportsXhigh, false);\n\t});\n\n\tit(\"supportsXhigh declared in models.json is not overwritten by capability patches\", () => {\n\t\t// The capability-patches system must not overwrite an explicit declaration in models.json.\n\t\t// applyCapabilityPatches uses spread: { ...patch.caps, ...model.capabilities }\n\t\t// so model.capabilities wins. This test verifies the precedence end-to-end.\n\t\tconst registry = createRegistry({\n\t\t\tproviders: {\n\t\t\t\t\"compat-provider\": {\n\t\t\t\t\tbaseUrl: \"https://api.example.com/v1\",\n\t\t\t\t\tapiKey: \"sk-test\",\n\t\t\t\t\tapi: \"openai-completions\",\n\t\t\t\t\tmodels: [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tid: \"custom-xhigh-model\",\n\t\t\t\t\t\t\tcapabilities: { supportsXhigh: true },\n\t\t\t\t\t\t},\n\t\t\t\t\t],\n\t\t\t\t},\n\t\t\t},\n\t\t});\n\n\t\tconst model = registry.getAll().find((m) => m.id === \"custom-xhigh-model\");\n\t\tassert.ok(model);\n\t\tassert.equal(model.capabilities?.supportsXhigh, true);\n\t});\n\n\tit(\"modelOverrides can set capabilities.supportsXhigh on built-in models\", () => {\n\t\t// A user-facing override in models.json should be able to add supportsXhigh\n\t\t// to a built-in model that doesn't declare it.\n\t\tconst path = writeModelsJson({\n\t\t\tproviders: {\n\t\t\t\tanthropic: {\n\t\t\t\t\tmodelOverrides: {\n\t\t\t\t\t\t\"claude-3-5-haiku-20241022\": {\n\t\t\t\t\t\t\tcapabilities: { supportsXhigh: true },\n\t\t\t\t\t\t},\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t},\n\t\t});\n\n\t\tconst registry = new ModelRegistry(AuthStorage.inMemory(), path);\n\t\tconst model = registry.getAll().find(\n\t\t\t(m) => m.provider === \"anthropic\" && m.id === \"claude-3-5-haiku-20241022\",\n\t\t);\n\t\tassert.ok(model, \"built-in model must still be present\");\n\t\tassert.equal(\n\t\t\tmodel.capabilities?.supportsXhigh,\n\t\t\ttrue,\n\t\t\t\"modelOverrides must be able to set capabilities.supportsXhigh\",\n\t\t);\n\t});\n});\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-registry.d.ts","sourceRoot":"","sources":["../../src/core/model-registry.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACN,KAAK,GAAG,EAER,KAAK,2BAA2B,EAChC,KAAK,OAAO,EAMZ,KAAK,KAAK,EACV,KAAK,sBAAsB,EAK3B,KAAK,mBAAmB,EACxB,MAAM,YAAY,CAAC;AAOpB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAmB,eAAe,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"model-registry.d.ts","sourceRoot":"","sources":["../../src/core/model-registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,13 @@ const VercelGatewayRoutingSchema = Type.Object({
|
|
|
24
24
|
only: Type.Optional(Type.Array(Type.String())),
|
|
25
25
|
order: Type.Optional(Type.Array(Type.String())),
|
|
26
26
|
});
|
|
27
|
+
// Schema for model capability declarations (mirrors ModelCapabilities in pi-ai types)
|
|
28
|
+
const ModelCapabilitiesSchema = Type.Object({
|
|
29
|
+
supportsXhigh: Type.Optional(Type.Boolean()),
|
|
30
|
+
requiresToolCallId: Type.Optional(Type.Boolean()),
|
|
31
|
+
supportsServiceTier: Type.Optional(Type.Boolean()),
|
|
32
|
+
charsPerToken: Type.Optional(Type.Number()),
|
|
33
|
+
});
|
|
27
34
|
// Schema for OpenAI compatibility settings
|
|
28
35
|
const OpenAICompletionsCompatSchema = Type.Object({
|
|
29
36
|
supportsStore: Type.Optional(Type.Boolean()),
|
|
@@ -62,6 +69,7 @@ const ModelDefinitionSchema = Type.Object({
|
|
|
62
69
|
maxTokens: Type.Optional(Type.Number()),
|
|
63
70
|
headers: Type.Optional(Type.Record(Type.String(), Type.String())),
|
|
64
71
|
compat: Type.Optional(OpenAICompatSchema),
|
|
72
|
+
capabilities: Type.Optional(ModelCapabilitiesSchema),
|
|
65
73
|
});
|
|
66
74
|
// Schema for per-model overrides (all fields optional, merged with built-in model)
|
|
67
75
|
const ModelOverrideSchema = Type.Object({
|
|
@@ -78,6 +86,7 @@ const ModelOverrideSchema = Type.Object({
|
|
|
78
86
|
maxTokens: Type.Optional(Type.Number()),
|
|
79
87
|
headers: Type.Optional(Type.Record(Type.String(), Type.String())),
|
|
80
88
|
compat: Type.Optional(OpenAICompatSchema),
|
|
89
|
+
capabilities: Type.Optional(ModelCapabilitiesSchema),
|
|
81
90
|
});
|
|
82
91
|
const ProviderConfigSchema = Type.Object({
|
|
83
92
|
baseUrl: Type.Optional(Type.String({ minLength: 1 })),
|
|
@@ -151,6 +160,10 @@ function applyModelOverride(model, override) {
|
|
|
151
160
|
}
|
|
152
161
|
// Deep merge compat
|
|
153
162
|
result.compat = mergeCompat(model.compat, override.compat);
|
|
163
|
+
// Merge capabilities (override wins per-field)
|
|
164
|
+
if (override.capabilities) {
|
|
165
|
+
result.capabilities = { ...model.capabilities, ...override.capabilities };
|
|
166
|
+
}
|
|
154
167
|
return result;
|
|
155
168
|
}
|
|
156
169
|
/**
|
|
@@ -392,6 +405,7 @@ export class ModelRegistry {
|
|
|
392
405
|
maxTokens: modelDef.maxTokens ?? 16384,
|
|
393
406
|
headers,
|
|
394
407
|
compat: modelDef.compat,
|
|
408
|
+
capabilities: modelDef.capabilities,
|
|
395
409
|
});
|
|
396
410
|
}
|
|
397
411
|
}
|