@clinebot/core 0.0.21 → 0.0.23
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/ClineCore.d.ts +110 -0
- package/dist/ClineCore.d.ts.map +1 -0
- package/dist/account/cline-account-service.d.ts +2 -1
- package/dist/account/cline-account-service.d.ts.map +1 -1
- package/dist/account/index.d.ts +1 -1
- package/dist/account/index.d.ts.map +1 -1
- package/dist/account/rpc.d.ts +3 -1
- package/dist/account/rpc.d.ts.map +1 -1
- package/dist/account/types.d.ts +3 -0
- package/dist/account/types.d.ts.map +1 -1
- package/dist/agents/plugin-loader.d.ts.map +1 -1
- package/dist/agents/plugin-sandbox-bootstrap.js +17 -17
- package/dist/auth/client.d.ts +1 -1
- package/dist/auth/client.d.ts.map +1 -1
- package/dist/auth/cline.d.ts +1 -1
- package/dist/auth/cline.d.ts.map +1 -1
- package/dist/auth/codex.d.ts +1 -1
- package/dist/auth/codex.d.ts.map +1 -1
- package/dist/auth/oca.d.ts +1 -1
- package/dist/auth/oca.d.ts.map +1 -1
- package/dist/auth/utils.d.ts +2 -2
- package/dist/auth/utils.d.ts.map +1 -1
- package/dist/index.d.ts +50 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +949 -0
- package/dist/providers/local-provider-service.d.ts +4 -4
- package/dist/providers/local-provider-service.d.ts.map +1 -1
- package/dist/runtime/runtime-builder.d.ts +1 -0
- package/dist/runtime/runtime-builder.d.ts.map +1 -1
- package/dist/runtime/session-runtime.d.ts +2 -1
- package/dist/runtime/session-runtime.d.ts.map +1 -1
- package/dist/runtime/team-runtime-registry.d.ts +13 -0
- package/dist/runtime/team-runtime-registry.d.ts.map +1 -0
- package/dist/session/default-session-manager.d.ts +2 -2
- package/dist/session/default-session-manager.d.ts.map +1 -1
- package/dist/session/rpc-runtime-ensure.d.ts +53 -0
- package/dist/session/rpc-runtime-ensure.d.ts.map +1 -0
- package/dist/session/session-config-builder.d.ts +2 -3
- package/dist/session/session-config-builder.d.ts.map +1 -1
- package/dist/session/session-host.d.ts +8 -18
- package/dist/session/session-host.d.ts.map +1 -1
- package/dist/session/session-manager.d.ts +1 -1
- package/dist/session/session-manager.d.ts.map +1 -1
- package/dist/session/session-manifest.d.ts +1 -2
- package/dist/session/session-manifest.d.ts.map +1 -1
- package/dist/session/unified-session-persistence-service.d.ts +2 -2
- package/dist/session/unified-session-persistence-service.d.ts.map +1 -1
- package/dist/session/utils/helpers.d.ts +1 -1
- package/dist/session/utils/helpers.d.ts.map +1 -1
- package/dist/session/utils/types.d.ts +1 -1
- package/dist/session/utils/types.d.ts.map +1 -1
- package/dist/storage/provider-settings-legacy-migration.d.ts.map +1 -1
- package/dist/telemetry/OpenTelemetryProvider.d.ts.map +1 -1
- package/dist/telemetry/distinct-id.d.ts +2 -0
- package/dist/telemetry/distinct-id.d.ts.map +1 -0
- package/dist/telemetry/{opentelemetry.d.ts → index.d.ts} +1 -1
- package/dist/telemetry/index.d.ts.map +1 -0
- package/dist/telemetry/index.js +28 -0
- package/dist/tools/constants.d.ts +1 -1
- package/dist/tools/constants.d.ts.map +1 -1
- package/dist/tools/definitions.d.ts +3 -3
- package/dist/tools/definitions.d.ts.map +1 -1
- package/dist/tools/executors/apply-patch.d.ts +1 -1
- package/dist/tools/executors/apply-patch.d.ts.map +1 -1
- package/dist/tools/executors/bash.d.ts +1 -1
- package/dist/tools/executors/bash.d.ts.map +1 -1
- package/dist/tools/executors/editor.d.ts +1 -1
- package/dist/tools/executors/editor.d.ts.map +1 -1
- package/dist/tools/executors/file-read.d.ts +1 -1
- package/dist/tools/executors/file-read.d.ts.map +1 -1
- package/dist/tools/executors/index.d.ts +14 -14
- package/dist/tools/executors/index.d.ts.map +1 -1
- package/dist/tools/executors/search.d.ts +1 -1
- package/dist/tools/executors/search.d.ts.map +1 -1
- package/dist/tools/executors/web-fetch.d.ts +1 -1
- package/dist/tools/executors/web-fetch.d.ts.map +1 -1
- package/dist/tools/helpers.d.ts +1 -1
- package/dist/tools/helpers.d.ts.map +1 -1
- package/dist/tools/index.d.ts +10 -10
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/model-tool-routing.d.ts +1 -1
- package/dist/tools/model-tool-routing.d.ts.map +1 -1
- package/dist/tools/presets.d.ts +1 -1
- package/dist/tools/presets.d.ts.map +1 -1
- package/dist/types/common.d.ts +17 -8
- package/dist/types/common.d.ts.map +1 -1
- package/dist/types/config.d.ts +4 -3
- package/dist/types/config.d.ts.map +1 -1
- package/dist/types/provider-settings.d.ts +1 -1
- package/dist/types/provider-settings.d.ts.map +1 -1
- package/dist/types.d.ts +5 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/version.d.ts +2 -0
- package/dist/version.d.ts.map +1 -0
- package/package.json +44 -38
- package/src/ClineCore.ts +137 -0
- package/src/account/cline-account-service.test.ts +101 -0
- package/src/account/cline-account-service.ts +300 -0
- package/src/account/featurebase-token.test.ts +175 -0
- package/src/account/index.ts +23 -0
- package/src/account/rpc.test.ts +63 -0
- package/src/account/rpc.ts +185 -0
- package/src/account/types.ts +102 -0
- package/src/agents/agent-config-loader.test.ts +236 -0
- package/src/agents/agent-config-loader.ts +108 -0
- package/src/agents/agent-config-parser.ts +198 -0
- package/src/agents/hooks-config-loader.test.ts +20 -0
- package/src/agents/hooks-config-loader.ts +118 -0
- package/src/agents/index.ts +85 -0
- package/src/agents/plugin-config-loader.test.ts +140 -0
- package/src/agents/plugin-config-loader.ts +97 -0
- package/src/agents/plugin-loader.test.ts +210 -0
- package/src/agents/plugin-loader.ts +175 -0
- package/src/agents/plugin-sandbox-bootstrap.ts +448 -0
- package/src/agents/plugin-sandbox.test.ts +296 -0
- package/src/agents/plugin-sandbox.ts +341 -0
- package/src/agents/unified-config-file-watcher.test.ts +196 -0
- package/src/agents/unified-config-file-watcher.ts +483 -0
- package/src/agents/user-instruction-config-loader.test.ts +158 -0
- package/src/agents/user-instruction-config-loader.ts +438 -0
- package/src/auth/client.test.ts +40 -0
- package/src/auth/client.ts +25 -0
- package/src/auth/cline.test.ts +130 -0
- package/src/auth/cline.ts +420 -0
- package/src/auth/codex.test.ts +170 -0
- package/src/auth/codex.ts +491 -0
- package/src/auth/oca.test.ts +215 -0
- package/src/auth/oca.ts +573 -0
- package/src/auth/server.ts +216 -0
- package/src/auth/types.ts +81 -0
- package/src/auth/utils.test.ts +128 -0
- package/src/auth/utils.ts +247 -0
- package/src/chat/chat-schema.ts +82 -0
- package/src/index.ts +479 -0
- package/src/input/file-indexer.d.ts +11 -0
- package/src/input/file-indexer.test.ts +127 -0
- package/src/input/file-indexer.ts +327 -0
- package/src/input/index.ts +7 -0
- package/src/input/mention-enricher.test.ts +85 -0
- package/src/input/mention-enricher.ts +122 -0
- package/src/mcp/config-loader.test.ts +238 -0
- package/src/mcp/config-loader.ts +219 -0
- package/src/mcp/index.ts +26 -0
- package/src/mcp/manager.test.ts +106 -0
- package/src/mcp/manager.ts +262 -0
- package/src/mcp/types.ts +88 -0
- package/src/providers/local-provider-registry.ts +232 -0
- package/src/providers/local-provider-service.test.ts +783 -0
- package/src/providers/local-provider-service.ts +471 -0
- package/src/runtime/commands.test.ts +98 -0
- package/src/runtime/commands.ts +83 -0
- package/src/runtime/hook-file-hooks.test.ts +237 -0
- package/src/runtime/hook-file-hooks.ts +859 -0
- package/src/runtime/index.ts +37 -0
- package/src/runtime/rules.ts +34 -0
- package/src/runtime/runtime-builder.team-persistence.test.ts +245 -0
- package/src/runtime/runtime-builder.test.ts +371 -0
- package/src/runtime/runtime-builder.ts +631 -0
- package/src/runtime/runtime-parity.test.ts +143 -0
- package/src/runtime/sandbox/subprocess-sandbox.ts +231 -0
- package/src/runtime/session-runtime.ts +49 -0
- package/src/runtime/skills.ts +44 -0
- package/src/runtime/team-runtime-registry.ts +46 -0
- package/src/runtime/tool-approval.ts +104 -0
- package/src/runtime/workflows.test.ts +119 -0
- package/src/runtime/workflows.ts +45 -0
- package/src/session/default-session-manager.e2e.test.ts +384 -0
- package/src/session/default-session-manager.test.ts +1931 -0
- package/src/session/default-session-manager.ts +1422 -0
- package/src/session/file-session-service.ts +280 -0
- package/src/session/index.ts +45 -0
- package/src/session/rpc-runtime-ensure.ts +521 -0
- package/src/session/rpc-session-service.ts +107 -0
- package/src/session/rpc-spawn-lease.test.ts +49 -0
- package/src/session/rpc-spawn-lease.ts +122 -0
- package/src/session/runtime-oauth-token-manager.test.ts +137 -0
- package/src/session/runtime-oauth-token-manager.ts +272 -0
- package/src/session/session-agent-events.ts +248 -0
- package/src/session/session-artifacts.ts +106 -0
- package/src/session/session-config-builder.ts +113 -0
- package/src/session/session-graph.ts +92 -0
- package/src/session/session-host.test.ts +89 -0
- package/src/session/session-host.ts +205 -0
- package/src/session/session-manager.ts +69 -0
- package/src/session/session-manifest.ts +29 -0
- package/src/session/session-service.team-persistence.test.ts +48 -0
- package/src/session/session-service.ts +673 -0
- package/src/session/session-team-coordination.ts +229 -0
- package/src/session/session-telemetry.ts +100 -0
- package/src/session/sqlite-rpc-session-backend.ts +303 -0
- package/src/session/unified-session-persistence-service.test.ts +85 -0
- package/src/session/unified-session-persistence-service.ts +994 -0
- package/src/session/utils/helpers.ts +139 -0
- package/src/session/utils/types.ts +57 -0
- package/src/session/utils/usage.ts +32 -0
- package/src/session/workspace-manager.ts +98 -0
- package/src/session/workspace-manifest.ts +100 -0
- package/src/storage/artifact-store.ts +1 -0
- package/src/storage/file-team-store.ts +257 -0
- package/src/storage/index.ts +11 -0
- package/src/storage/provider-settings-legacy-migration.test.ts +424 -0
- package/src/storage/provider-settings-legacy-migration.ts +826 -0
- package/src/storage/provider-settings-manager.test.ts +191 -0
- package/src/storage/provider-settings-manager.ts +152 -0
- package/src/storage/session-store.ts +1 -0
- package/src/storage/sqlite-session-store.ts +275 -0
- package/src/storage/sqlite-team-store.ts +454 -0
- package/src/storage/team-store.ts +40 -0
- package/src/team/index.ts +4 -0
- package/src/team/projections.ts +285 -0
- package/src/telemetry/ITelemetryAdapter.ts +94 -0
- package/src/telemetry/LoggerTelemetryAdapter.test.ts +42 -0
- package/src/telemetry/LoggerTelemetryAdapter.ts +114 -0
- package/src/telemetry/OpenTelemetryAdapter.test.ts +157 -0
- package/src/telemetry/OpenTelemetryAdapter.ts +348 -0
- package/src/telemetry/OpenTelemetryProvider.test.ts +113 -0
- package/src/telemetry/OpenTelemetryProvider.ts +325 -0
- package/src/telemetry/TelemetryService.test.ts +134 -0
- package/src/telemetry/TelemetryService.ts +141 -0
- package/src/telemetry/core-events.ts +400 -0
- package/src/telemetry/distinct-id.test.ts +57 -0
- package/src/telemetry/distinct-id.ts +58 -0
- package/src/telemetry/index.ts +20 -0
- package/src/tools/constants.ts +35 -0
- package/src/tools/definitions.test.ts +704 -0
- package/src/tools/definitions.ts +709 -0
- package/src/tools/executors/apply-patch-parser.ts +520 -0
- package/src/tools/executors/apply-patch.ts +359 -0
- package/src/tools/executors/bash.test.ts +87 -0
- package/src/tools/executors/bash.ts +207 -0
- package/src/tools/executors/editor.test.ts +35 -0
- package/src/tools/executors/editor.ts +219 -0
- package/src/tools/executors/file-read.test.ts +49 -0
- package/src/tools/executors/file-read.ts +110 -0
- package/src/tools/executors/index.ts +87 -0
- package/src/tools/executors/search.ts +278 -0
- package/src/tools/executors/web-fetch.ts +259 -0
- package/src/tools/helpers.ts +130 -0
- package/src/tools/index.ts +169 -0
- package/src/tools/model-tool-routing.test.ts +86 -0
- package/src/tools/model-tool-routing.ts +132 -0
- package/src/tools/presets.test.ts +62 -0
- package/src/tools/presets.ts +168 -0
- package/src/tools/schemas.ts +327 -0
- package/src/tools/types.ts +329 -0
- package/src/types/common.ts +26 -0
- package/src/types/config.ts +86 -0
- package/src/types/events.ts +74 -0
- package/src/types/index.ts +24 -0
- package/src/types/provider-settings.ts +43 -0
- package/src/types/sessions.ts +16 -0
- package/src/types/storage.ts +64 -0
- package/src/types/workspace.ts +7 -0
- package/src/types.ts +132 -0
- package/src/version.ts +3 -0
- package/dist/index.node.d.ts +0 -47
- package/dist/index.node.d.ts.map +0 -1
- package/dist/index.node.js +0 -948
- package/dist/telemetry/opentelemetry.d.ts.map +0 -1
- package/dist/telemetry/opentelemetry.js +0 -27
|
@@ -0,0 +1,424 @@
|
|
|
1
|
+
import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
|
|
2
|
+
import os from "node:os";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { afterEach, describe, expect, it } from "vitest";
|
|
5
|
+
import {
|
|
6
|
+
type LegacyClineUserInfo,
|
|
7
|
+
migrateLegacyProviderSettings,
|
|
8
|
+
resolveLegacyClineAuth,
|
|
9
|
+
} from "./provider-settings-legacy-migration";
|
|
10
|
+
import { ProviderSettingsManager } from "./provider-settings-manager";
|
|
11
|
+
|
|
12
|
+
describe("migrateLegacyProviderSettings", () => {
|
|
13
|
+
const tempDirs: string[] = [];
|
|
14
|
+
|
|
15
|
+
afterEach(() => {
|
|
16
|
+
for (const dir of tempDirs.splice(0)) {
|
|
17
|
+
rmSync(dir, { recursive: true, force: true });
|
|
18
|
+
}
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
it("migrates legacy provider state into providers.json when target is empty", () => {
|
|
22
|
+
const tempDir = mkdtempSync(
|
|
23
|
+
path.join(os.tmpdir(), "core-legacy-provider-"),
|
|
24
|
+
);
|
|
25
|
+
tempDirs.push(tempDir);
|
|
26
|
+
const providersPath = path.join(tempDir, "provider-settings.json");
|
|
27
|
+
const manager = new ProviderSettingsManager({ filePath: providersPath });
|
|
28
|
+
|
|
29
|
+
writeFileSync(
|
|
30
|
+
path.join(tempDir, "globalState.json"),
|
|
31
|
+
JSON.stringify(
|
|
32
|
+
{
|
|
33
|
+
mode: "act",
|
|
34
|
+
actModeApiProvider: "anthropic",
|
|
35
|
+
actModeApiModelId: "claude-sonnet-4-6",
|
|
36
|
+
anthropicBaseUrl: "https://example.invalid/anthropic",
|
|
37
|
+
actModeReasoningEffort: "high",
|
|
38
|
+
actModeThinkingBudgetTokens: 2048,
|
|
39
|
+
requestTimeoutMs: 90000,
|
|
40
|
+
},
|
|
41
|
+
null,
|
|
42
|
+
2,
|
|
43
|
+
),
|
|
44
|
+
);
|
|
45
|
+
writeFileSync(
|
|
46
|
+
path.join(tempDir, "secrets.json"),
|
|
47
|
+
JSON.stringify({ apiKey: "legacy-anthropic-key" }, null, 2),
|
|
48
|
+
);
|
|
49
|
+
|
|
50
|
+
const result = migrateLegacyProviderSettings({
|
|
51
|
+
providerSettingsManager: manager,
|
|
52
|
+
dataDir: tempDir,
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
expect(result).toMatchObject({
|
|
56
|
+
migrated: true,
|
|
57
|
+
providerCount: 1,
|
|
58
|
+
lastUsedProvider: "anthropic",
|
|
59
|
+
});
|
|
60
|
+
expect(manager.getProviderSettings("anthropic")).toEqual({
|
|
61
|
+
provider: "anthropic",
|
|
62
|
+
model: "claude-sonnet-4-6",
|
|
63
|
+
apiKey: "legacy-anthropic-key",
|
|
64
|
+
baseUrl: "https://example.invalid/anthropic",
|
|
65
|
+
timeout: 90000,
|
|
66
|
+
reasoning: {
|
|
67
|
+
effort: "high",
|
|
68
|
+
budgetTokens: 2048,
|
|
69
|
+
},
|
|
70
|
+
});
|
|
71
|
+
expect(manager.read().providers.anthropic?.tokenSource).toBe("migration");
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
it("migrates missing providers without overwriting existing providers", () => {
|
|
75
|
+
const tempDir = mkdtempSync(
|
|
76
|
+
path.join(os.tmpdir(), "core-legacy-provider-"),
|
|
77
|
+
);
|
|
78
|
+
tempDirs.push(tempDir);
|
|
79
|
+
const providersPath = path.join(tempDir, "provider-settings.json");
|
|
80
|
+
const manager = new ProviderSettingsManager({ filePath: providersPath });
|
|
81
|
+
|
|
82
|
+
manager.saveProviderSettings({
|
|
83
|
+
provider: "openai",
|
|
84
|
+
model: "gpt-5",
|
|
85
|
+
apiKey: "already-migrated",
|
|
86
|
+
});
|
|
87
|
+
writeFileSync(
|
|
88
|
+
path.join(tempDir, "globalState.json"),
|
|
89
|
+
JSON.stringify(
|
|
90
|
+
{
|
|
91
|
+
mode: "act",
|
|
92
|
+
actModeApiProvider: "anthropic",
|
|
93
|
+
},
|
|
94
|
+
null,
|
|
95
|
+
2,
|
|
96
|
+
),
|
|
97
|
+
);
|
|
98
|
+
writeFileSync(
|
|
99
|
+
path.join(tempDir, "secrets.json"),
|
|
100
|
+
JSON.stringify({ apiKey: "legacy-key" }, null, 2),
|
|
101
|
+
);
|
|
102
|
+
|
|
103
|
+
const result = migrateLegacyProviderSettings({
|
|
104
|
+
providerSettingsManager: manager,
|
|
105
|
+
dataDir: tempDir,
|
|
106
|
+
});
|
|
107
|
+
|
|
108
|
+
expect(result.migrated).toBe(true);
|
|
109
|
+
expect(manager.getProviderSettings("openai")?.apiKey).toBe(
|
|
110
|
+
"already-migrated",
|
|
111
|
+
);
|
|
112
|
+
expect(manager.getProviderSettings("anthropic")).toEqual({
|
|
113
|
+
provider: "anthropic",
|
|
114
|
+
model: "claude-sonnet-4-6",
|
|
115
|
+
apiKey: "legacy-key",
|
|
116
|
+
});
|
|
117
|
+
expect(manager.read().providers.openai?.tokenSource).toBe("manual");
|
|
118
|
+
expect(manager.read().providers.anthropic?.tokenSource).toBe("migration");
|
|
119
|
+
});
|
|
120
|
+
|
|
121
|
+
it("migrates legacy OpenAI Codex OAuth credentials", () => {
|
|
122
|
+
const tempDir = mkdtempSync(
|
|
123
|
+
path.join(os.tmpdir(), "core-legacy-provider-"),
|
|
124
|
+
);
|
|
125
|
+
tempDirs.push(tempDir);
|
|
126
|
+
const providersPath = path.join(tempDir, "provider-settings.json");
|
|
127
|
+
const manager = new ProviderSettingsManager({ filePath: providersPath });
|
|
128
|
+
|
|
129
|
+
writeFileSync(
|
|
130
|
+
path.join(tempDir, "globalState.json"),
|
|
131
|
+
JSON.stringify(
|
|
132
|
+
{
|
|
133
|
+
mode: "act",
|
|
134
|
+
actModeApiProvider: "openai-codex",
|
|
135
|
+
},
|
|
136
|
+
null,
|
|
137
|
+
2,
|
|
138
|
+
),
|
|
139
|
+
);
|
|
140
|
+
writeFileSync(
|
|
141
|
+
path.join(tempDir, "secrets.json"),
|
|
142
|
+
JSON.stringify(
|
|
143
|
+
{
|
|
144
|
+
"openai-codex-oauth-credentials": JSON.stringify({
|
|
145
|
+
type: "openai-codex",
|
|
146
|
+
access_token: "legacy-access",
|
|
147
|
+
refresh_token: "legacy-refresh",
|
|
148
|
+
expires: Date.now() + 60_000,
|
|
149
|
+
accountId: "acct_123",
|
|
150
|
+
}),
|
|
151
|
+
},
|
|
152
|
+
null,
|
|
153
|
+
2,
|
|
154
|
+
),
|
|
155
|
+
);
|
|
156
|
+
|
|
157
|
+
const result = migrateLegacyProviderSettings({
|
|
158
|
+
providerSettingsManager: manager,
|
|
159
|
+
dataDir: tempDir,
|
|
160
|
+
});
|
|
161
|
+
|
|
162
|
+
expect(result).toMatchObject({
|
|
163
|
+
migrated: true,
|
|
164
|
+
lastUsedProvider: "openai-codex",
|
|
165
|
+
});
|
|
166
|
+
expect(manager.getProviderSettings("openai-codex")).toEqual({
|
|
167
|
+
provider: "openai-codex",
|
|
168
|
+
apiKey: "legacy-access",
|
|
169
|
+
auth: {
|
|
170
|
+
accessToken: "legacy-access",
|
|
171
|
+
refreshToken: "legacy-refresh",
|
|
172
|
+
accountId: "acct_123",
|
|
173
|
+
},
|
|
174
|
+
});
|
|
175
|
+
expect(manager.read().providers["openai-codex"]?.tokenSource).toBe(
|
|
176
|
+
"migration",
|
|
177
|
+
);
|
|
178
|
+
});
|
|
179
|
+
|
|
180
|
+
it("migrates legacy custom OpenAI-compatible config into the openai provider", () => {
|
|
181
|
+
const tempDir = mkdtempSync(
|
|
182
|
+
path.join(os.tmpdir(), "core-legacy-provider-"),
|
|
183
|
+
);
|
|
184
|
+
tempDirs.push(tempDir);
|
|
185
|
+
const providersPath = path.join(tempDir, "settings", "providers.json");
|
|
186
|
+
const manager = new ProviderSettingsManager({ filePath: providersPath });
|
|
187
|
+
|
|
188
|
+
writeFileSync(
|
|
189
|
+
path.join(tempDir, "globalState.json"),
|
|
190
|
+
JSON.stringify(
|
|
191
|
+
{
|
|
192
|
+
mode: "act",
|
|
193
|
+
actModeApiProvider: "openai",
|
|
194
|
+
actModeOpenAiModelId: "gpt-oss-120b",
|
|
195
|
+
openAiBaseUrl: "https://gateway.example.invalid/v1",
|
|
196
|
+
openAiHeaders: {
|
|
197
|
+
"X-Test": "legacy-header",
|
|
198
|
+
},
|
|
199
|
+
requestTimeoutMs: 45000,
|
|
200
|
+
},
|
|
201
|
+
null,
|
|
202
|
+
2,
|
|
203
|
+
),
|
|
204
|
+
);
|
|
205
|
+
writeFileSync(
|
|
206
|
+
path.join(tempDir, "secrets.json"),
|
|
207
|
+
JSON.stringify({ openAiApiKey: "legacy-openai-compatible-key" }, null, 2),
|
|
208
|
+
);
|
|
209
|
+
|
|
210
|
+
const result = migrateLegacyProviderSettings({
|
|
211
|
+
providerSettingsManager: manager,
|
|
212
|
+
dataDir: tempDir,
|
|
213
|
+
});
|
|
214
|
+
|
|
215
|
+
expect(result).toMatchObject({
|
|
216
|
+
migrated: true,
|
|
217
|
+
providerCount: 1,
|
|
218
|
+
lastUsedProvider: "openai",
|
|
219
|
+
});
|
|
220
|
+
expect(manager.getProviderSettings("openai")).toEqual({
|
|
221
|
+
provider: "openai",
|
|
222
|
+
model: "gpt-oss-120b",
|
|
223
|
+
apiKey: "legacy-openai-compatible-key",
|
|
224
|
+
baseUrl: "https://gateway.example.invalid/v1",
|
|
225
|
+
headers: {
|
|
226
|
+
"X-Test": "legacy-header",
|
|
227
|
+
},
|
|
228
|
+
timeout: 45000,
|
|
229
|
+
});
|
|
230
|
+
|
|
231
|
+
const modelsPath = path.join(tempDir, "settings", "models.json");
|
|
232
|
+
expect(JSON.parse(readFileSync(modelsPath, "utf8"))).toEqual({
|
|
233
|
+
version: 1,
|
|
234
|
+
providers: {
|
|
235
|
+
openai: {
|
|
236
|
+
provider: {
|
|
237
|
+
name: "OpenAI Compatible",
|
|
238
|
+
baseUrl: "https://gateway.example.invalid/v1",
|
|
239
|
+
defaultModelId: "gpt-oss-120b",
|
|
240
|
+
},
|
|
241
|
+
models: {
|
|
242
|
+
"gpt-oss-120b": {
|
|
243
|
+
id: "gpt-oss-120b",
|
|
244
|
+
name: "gpt-oss-120b",
|
|
245
|
+
},
|
|
246
|
+
},
|
|
247
|
+
},
|
|
248
|
+
},
|
|
249
|
+
});
|
|
250
|
+
});
|
|
251
|
+
|
|
252
|
+
it("keeps official OpenAI endpoints under the built-in openai provider", () => {
|
|
253
|
+
const tempDir = mkdtempSync(
|
|
254
|
+
path.join(os.tmpdir(), "core-legacy-provider-"),
|
|
255
|
+
);
|
|
256
|
+
tempDirs.push(tempDir);
|
|
257
|
+
const providersPath = path.join(tempDir, "settings", "providers.json");
|
|
258
|
+
const manager = new ProviderSettingsManager({ filePath: providersPath });
|
|
259
|
+
|
|
260
|
+
writeFileSync(
|
|
261
|
+
path.join(tempDir, "globalState.json"),
|
|
262
|
+
JSON.stringify(
|
|
263
|
+
{
|
|
264
|
+
mode: "act",
|
|
265
|
+
actModeApiProvider: "openai",
|
|
266
|
+
actModeOpenAiModelId: "gpt-5",
|
|
267
|
+
openAiBaseUrl: "https://api.openai.com/v1",
|
|
268
|
+
},
|
|
269
|
+
null,
|
|
270
|
+
2,
|
|
271
|
+
),
|
|
272
|
+
);
|
|
273
|
+
writeFileSync(
|
|
274
|
+
path.join(tempDir, "secrets.json"),
|
|
275
|
+
JSON.stringify({ openAiApiKey: "legacy-openai-key" }, null, 2),
|
|
276
|
+
);
|
|
277
|
+
|
|
278
|
+
const result = migrateLegacyProviderSettings({
|
|
279
|
+
providerSettingsManager: manager,
|
|
280
|
+
dataDir: tempDir,
|
|
281
|
+
});
|
|
282
|
+
|
|
283
|
+
expect(result).toMatchObject({
|
|
284
|
+
migrated: true,
|
|
285
|
+
providerCount: 1,
|
|
286
|
+
lastUsedProvider: "openai",
|
|
287
|
+
});
|
|
288
|
+
expect(manager.getProviderSettings("openai")).toEqual({
|
|
289
|
+
provider: "openai",
|
|
290
|
+
model: "gpt-5",
|
|
291
|
+
apiKey: "legacy-openai-key",
|
|
292
|
+
baseUrl: "https://api.openai.com/v1",
|
|
293
|
+
});
|
|
294
|
+
expect(manager.getProviderSettings("openai-compatible")).toBeUndefined();
|
|
295
|
+
});
|
|
296
|
+
});
|
|
297
|
+
|
|
298
|
+
// =============================================================================
|
|
299
|
+
// resolveLegacyClineAuth – pure in-memory tests
|
|
300
|
+
// =============================================================================
|
|
301
|
+
|
|
302
|
+
/** Builds a realistic LegacyClineUserInfo JSON string. */
|
|
303
|
+
function makeClineAccountJson(
|
|
304
|
+
overrides: Partial<LegacyClineUserInfo> & { userId?: string } = {},
|
|
305
|
+
): string {
|
|
306
|
+
return JSON.stringify({
|
|
307
|
+
idToken: overrides.idToken ?? "id-token-abc",
|
|
308
|
+
expiresAt: overrides.expiresAt ?? 1750000000000,
|
|
309
|
+
refreshToken: overrides.refreshToken ?? "refresh-token-xyz",
|
|
310
|
+
userInfo: overrides.userInfo ?? {
|
|
311
|
+
id: overrides.userId ?? "user-42",
|
|
312
|
+
email: "test@example.com",
|
|
313
|
+
displayName: "Test User",
|
|
314
|
+
termsAcceptedAt: "2025-01-01T00:00:00Z",
|
|
315
|
+
clineBenchConsent: false,
|
|
316
|
+
createdAt: "2025-01-01T00:00:00Z",
|
|
317
|
+
updatedAt: "2025-01-01T00:00:00Z",
|
|
318
|
+
},
|
|
319
|
+
provider: overrides.provider ?? "google",
|
|
320
|
+
startedAt: overrides.startedAt ?? Date.now(),
|
|
321
|
+
} satisfies LegacyClineUserInfo);
|
|
322
|
+
}
|
|
323
|
+
|
|
324
|
+
describe("resolveLegacyClineAuth", () => {
|
|
325
|
+
it("extracts all auth fields from a complete legacy account JSON", () => {
|
|
326
|
+
const result = resolveLegacyClineAuth(
|
|
327
|
+
makeClineAccountJson({
|
|
328
|
+
idToken: "my-id-token",
|
|
329
|
+
expiresAt: 1750000000000,
|
|
330
|
+
refreshToken: "my-refresh",
|
|
331
|
+
userId: "user-123",
|
|
332
|
+
}),
|
|
333
|
+
);
|
|
334
|
+
|
|
335
|
+
expect(result).toEqual({
|
|
336
|
+
accessToken: "my-id-token",
|
|
337
|
+
refreshToken: "my-refresh",
|
|
338
|
+
expiresAt: 1750000000000,
|
|
339
|
+
accountId: "user-123",
|
|
340
|
+
});
|
|
341
|
+
});
|
|
342
|
+
|
|
343
|
+
it("maps idToken to accessToken", () => {
|
|
344
|
+
const result = resolveLegacyClineAuth(
|
|
345
|
+
makeClineAccountJson({ idToken: "tok-abc" }),
|
|
346
|
+
);
|
|
347
|
+
expect(result?.accessToken).toBe("tok-abc");
|
|
348
|
+
});
|
|
349
|
+
|
|
350
|
+
it("preserves expiresAt as a number", () => {
|
|
351
|
+
const result = resolveLegacyClineAuth(
|
|
352
|
+
makeClineAccountJson({ expiresAt: 9999999999999 }),
|
|
353
|
+
);
|
|
354
|
+
expect(result?.expiresAt).toBe(9999999999999);
|
|
355
|
+
expect(typeof result?.expiresAt).toBe("number");
|
|
356
|
+
});
|
|
357
|
+
|
|
358
|
+
it("maps userInfo.id to accountId", () => {
|
|
359
|
+
const result = resolveLegacyClineAuth(
|
|
360
|
+
makeClineAccountJson({ userId: "uid-xyz" }),
|
|
361
|
+
);
|
|
362
|
+
expect(result?.accountId).toBe("uid-xyz");
|
|
363
|
+
});
|
|
364
|
+
|
|
365
|
+
it("returns undefined accountId when userInfo is missing entirely", () => {
|
|
366
|
+
const raw = JSON.stringify({
|
|
367
|
+
idToken: "tok",
|
|
368
|
+
expiresAt: 1000,
|
|
369
|
+
refreshToken: "ref",
|
|
370
|
+
provider: "google",
|
|
371
|
+
startedAt: 1,
|
|
372
|
+
});
|
|
373
|
+
|
|
374
|
+
const result = resolveLegacyClineAuth(raw);
|
|
375
|
+
expect(result).toBeDefined();
|
|
376
|
+
expect(result?.accessToken).toBe("tok");
|
|
377
|
+
expect(result?.accountId).toBeUndefined();
|
|
378
|
+
});
|
|
379
|
+
|
|
380
|
+
it("returns undefined accountId when userInfo.id is missing", () => {
|
|
381
|
+
const raw = JSON.stringify({
|
|
382
|
+
idToken: "tok",
|
|
383
|
+
expiresAt: 1000,
|
|
384
|
+
refreshToken: "ref",
|
|
385
|
+
userInfo: {
|
|
386
|
+
email: "x@y.com",
|
|
387
|
+
displayName: "X",
|
|
388
|
+
termsAcceptedAt: "2025-01-01T00:00:00Z",
|
|
389
|
+
clineBenchConsent: false,
|
|
390
|
+
createdAt: "2025-01-01T00:00:00Z",
|
|
391
|
+
updatedAt: "2025-01-01T00:00:00Z",
|
|
392
|
+
},
|
|
393
|
+
provider: "google",
|
|
394
|
+
startedAt: 1,
|
|
395
|
+
});
|
|
396
|
+
|
|
397
|
+
const result = resolveLegacyClineAuth(raw);
|
|
398
|
+
expect(result).toBeDefined();
|
|
399
|
+
expect(result?.accountId).toBeUndefined();
|
|
400
|
+
});
|
|
401
|
+
|
|
402
|
+
it("returns undefined for invalid json", () => {
|
|
403
|
+
expect(resolveLegacyClineAuth(undefined)).toBeUndefined();
|
|
404
|
+
expect(resolveLegacyClineAuth("")).toBeUndefined();
|
|
405
|
+
expect(resolveLegacyClineAuth(" \n\t ")).toBeUndefined();
|
|
406
|
+
expect(resolveLegacyClineAuth("not-json{{{")).toBeUndefined();
|
|
407
|
+
expect(resolveLegacyClineAuth("null")).toBeUndefined();
|
|
408
|
+
});
|
|
409
|
+
|
|
410
|
+
it("returns undefined fields when idToken/refreshToken are missing from JSON", () => {
|
|
411
|
+
const raw = JSON.stringify({
|
|
412
|
+
userInfo: { id: "uid" },
|
|
413
|
+
provider: "google",
|
|
414
|
+
startedAt: 1,
|
|
415
|
+
});
|
|
416
|
+
|
|
417
|
+
const result = resolveLegacyClineAuth(raw);
|
|
418
|
+
expect(result).toBeDefined();
|
|
419
|
+
expect(result?.accessToken).toBeUndefined();
|
|
420
|
+
expect(result?.refreshToken).toBeUndefined();
|
|
421
|
+
expect(result?.expiresAt).toBeUndefined();
|
|
422
|
+
expect(result?.accountId).toBe("uid");
|
|
423
|
+
});
|
|
424
|
+
});
|