@clinebot/core 0.0.35 → 0.0.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -2
- package/dist/ClineCore.d.ts +53 -39
- package/dist/ClineCore.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 +6 -6
- package/dist/account/rpc.d.ts.map +1 -1
- package/dist/cron/index.d.ts +6 -0
- package/dist/cron/index.d.ts.map +1 -0
- package/dist/cron/resource-limiter.d.ts +9 -0
- package/dist/cron/resource-limiter.d.ts.map +1 -0
- package/dist/cron/schedule-command-service.d.ts +10 -0
- package/dist/cron/schedule-command-service.d.ts.map +1 -0
- package/dist/cron/schedule-service.d.ts +100 -0
- package/dist/cron/schedule-service.d.ts.map +1 -0
- package/dist/cron/scheduler.d.ts +66 -0
- package/dist/cron/scheduler.d.ts.map +1 -0
- package/dist/cron/sqlite-schedule-store.d.ts +52 -0
- package/dist/cron/sqlite-schedule-store.d.ts.map +1 -0
- package/dist/extensions/config/agent-config-loader.d.ts +4 -3
- package/dist/extensions/config/agent-config-loader.d.ts.map +1 -1
- package/dist/extensions/config/runtime-commands.d.ts +1 -0
- package/dist/extensions/config/runtime-commands.d.ts.map +1 -1
- package/dist/extensions/config/user-instruction-config-loader.d.ts +1 -0
- package/dist/extensions/config/user-instruction-config-loader.d.ts.map +1 -1
- package/dist/extensions/context/agentic-compaction.d.ts +2 -2
- package/dist/extensions/context/agentic-compaction.d.ts.map +1 -1
- package/dist/extensions/context/compaction-shared.d.ts +5 -4
- package/dist/extensions/context/compaction-shared.d.ts.map +1 -1
- package/dist/extensions/context/compaction.d.ts.map +1 -1
- package/dist/extensions/plugin/plugin-config-loader.d.ts +9 -2
- package/dist/extensions/plugin/plugin-config-loader.d.ts.map +1 -1
- package/dist/extensions/plugin/plugin-loader.d.ts +5 -3
- package/dist/extensions/plugin/plugin-loader.d.ts.map +1 -1
- package/dist/extensions/plugin/plugin-module-import.d.ts.map +1 -1
- package/dist/extensions/plugin/plugin-sandbox.d.ts +15 -2
- package/dist/extensions/plugin/plugin-sandbox.d.ts.map +1 -1
- package/dist/extensions/plugin/plugin-targeting.d.ts +7 -0
- package/dist/extensions/plugin/plugin-targeting.d.ts.map +1 -0
- package/dist/extensions/plugin-sandbox-bootstrap.js +211 -211
- package/dist/extensions/tools/definitions.d.ts +1 -1
- package/dist/extensions/tools/definitions.d.ts.map +1 -1
- package/dist/extensions/tools/executors/apply-patch.d.ts +3 -1
- package/dist/extensions/tools/executors/apply-patch.d.ts.map +1 -1
- package/dist/extensions/tools/executors/search.d.ts +1 -1
- package/dist/extensions/tools/executors/search.d.ts.map +1 -1
- package/dist/extensions/tools/index.d.ts +2 -0
- package/dist/extensions/tools/index.d.ts.map +1 -1
- package/dist/extensions/tools/presets.d.ts +26 -43
- package/dist/extensions/tools/presets.d.ts.map +1 -1
- package/dist/extensions/tools/runtime.d.ts +25 -0
- package/dist/extensions/tools/runtime.d.ts.map +1 -0
- package/dist/extensions/tools/schemas.d.ts.map +1 -1
- package/dist/extensions/tools/team/team-tools.d.ts +1 -0
- package/dist/extensions/tools/team/team-tools.d.ts.map +1 -1
- package/dist/hooks/hook-file-hooks.d.ts +4 -1
- package/dist/hooks/hook-file-hooks.d.ts.map +1 -1
- package/dist/hooks/index.d.ts +0 -1
- package/dist/hooks/index.d.ts.map +1 -1
- package/dist/hooks/subprocess.d.ts +8 -1
- package/dist/hooks/subprocess.d.ts.map +1 -1
- package/dist/hub/browser-websocket.d.ts +18 -0
- package/dist/hub/browser-websocket.d.ts.map +1 -0
- package/dist/hub/client.d.ts +45 -0
- package/dist/hub/client.d.ts.map +1 -0
- package/dist/hub/connect.d.ts +15 -0
- package/dist/hub/connect.d.ts.map +1 -0
- package/dist/hub/daemon-entry.d.ts +2 -0
- package/dist/hub/daemon-entry.d.ts.map +1 -0
- package/dist/hub/daemon-entry.js +1045 -0
- package/dist/hub/daemon.d.ts +5 -0
- package/dist/hub/daemon.d.ts.map +1 -0
- package/dist/hub/defaults.d.ts +13 -0
- package/dist/hub/defaults.d.ts.map +1 -0
- package/dist/hub/discovery.d.ts +29 -0
- package/dist/hub/discovery.d.ts.map +1 -0
- package/dist/hub/index.d.ts +15 -0
- package/dist/hub/index.d.ts.map +1 -0
- package/dist/hub/index.js +1044 -0
- package/dist/hub/native-transport.d.ts +17 -0
- package/dist/hub/native-transport.d.ts.map +1 -0
- package/dist/hub/runtime-handlers.d.ts +11 -0
- package/dist/hub/runtime-handlers.d.ts.map +1 -0
- package/dist/hub/server.d.ts +86 -0
- package/dist/hub/server.d.ts.map +1 -0
- package/dist/hub/session-client.d.ts +87 -0
- package/dist/hub/session-client.d.ts.map +1 -0
- package/dist/hub/start-shared-server.d.ts +19 -0
- package/dist/hub/start-shared-server.d.ts.map +1 -0
- package/dist/hub/transport.d.ts +8 -0
- package/dist/hub/transport.d.ts.map +1 -0
- package/dist/hub/ui-client.d.ts +44 -0
- package/dist/hub/ui-client.d.ts.map +1 -0
- package/dist/hub/workspace.d.ts +4 -0
- package/dist/hub/workspace.d.ts.map +1 -0
- package/dist/index.d.ts +26 -15
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +498 -476
- package/dist/llms/configured-provider-registry.d.ts +28 -0
- package/dist/llms/configured-provider-registry.d.ts.map +1 -0
- package/dist/llms/provider-defaults.d.ts +27 -0
- package/dist/llms/provider-defaults.d.ts.map +1 -0
- package/dist/llms/provider-settings.d.ts +202 -0
- package/dist/llms/provider-settings.d.ts.map +1 -0
- package/dist/llms/runtime-config.d.ts +4 -0
- package/dist/llms/runtime-config.d.ts.map +1 -0
- package/dist/llms/runtime-registry.d.ts +20 -0
- package/dist/llms/runtime-registry.d.ts.map +1 -0
- package/dist/llms/runtime-types.d.ts +85 -0
- package/dist/llms/runtime-types.d.ts.map +1 -0
- package/dist/runtime/host.d.ts +1 -2
- package/dist/runtime/host.d.ts.map +1 -1
- package/dist/runtime/rules.d.ts +1 -0
- package/dist/runtime/rules.d.ts.map +1 -1
- package/dist/runtime/runtime-builder.d.ts.map +1 -1
- package/dist/runtime/runtime-host.d.ts +22 -24
- package/dist/runtime/runtime-host.d.ts.map +1 -1
- package/dist/runtime/runtime-oauth-token-manager.d.ts.map +1 -1
- package/dist/runtime/session-runtime.d.ts +1 -19
- package/dist/runtime/session-runtime.d.ts.map +1 -1
- package/dist/services/global-settings.d.ts +12 -0
- package/dist/services/global-settings.d.ts.map +1 -0
- package/dist/services/local-runtime-bootstrap.d.ts +9 -3
- package/dist/services/local-runtime-bootstrap.d.ts.map +1 -1
- package/dist/services/plugin-tools.d.ts +16 -0
- package/dist/services/plugin-tools.d.ts.map +1 -0
- package/dist/services/providers/local-provider-registry.d.ts +4 -4
- package/dist/services/providers/local-provider-registry.d.ts.map +1 -1
- package/dist/services/providers/local-provider-service.d.ts +13 -13
- package/dist/services/providers/local-provider-service.d.ts.map +1 -1
- package/dist/services/session-data.d.ts +1 -1
- package/dist/services/session-data.d.ts.map +1 -1
- package/dist/services/storage/provider-settings-legacy-migration.d.ts +1 -1
- package/dist/services/storage/provider-settings-legacy-migration.d.ts.map +1 -1
- package/dist/services/telemetry/index.js +28 -15
- package/dist/services/workspace-manifest.d.ts +11 -0
- package/dist/services/workspace-manifest.d.ts.map +1 -1
- package/dist/session/persistence-service.d.ts +11 -23
- package/dist/session/persistence-service.d.ts.map +1 -1
- package/dist/session/session-manifest-store.d.ts +22 -0
- package/dist/session/session-manifest-store.d.ts.map +1 -0
- package/dist/session/session-row.d.ts +93 -0
- package/dist/session/session-row.d.ts.map +1 -0
- package/dist/session/session-service.d.ts +2 -102
- package/dist/session/session-service.d.ts.map +1 -1
- package/dist/session/subagent-session-manager.d.ts +36 -0
- package/dist/session/subagent-session-manager.d.ts.map +1 -0
- package/dist/session/team-persistence-store.d.ts +24 -0
- package/dist/session/team-persistence-store.d.ts.map +1 -0
- package/dist/transports/hub.d.ts +47 -0
- package/dist/transports/hub.d.ts.map +1 -0
- package/dist/transports/local.d.ts +10 -6
- package/dist/transports/local.d.ts.map +1 -1
- package/dist/transports/remote.d.ts +10 -0
- package/dist/transports/remote.d.ts.map +1 -0
- package/dist/transports/runtime-host-support.d.ts +3 -2
- package/dist/transports/runtime-host-support.d.ts.map +1 -1
- package/dist/types/chat-schema.d.ts +10 -12
- package/dist/types/chat-schema.d.ts.map +1 -1
- package/dist/types/config.d.ts +8 -7
- package/dist/types/config.d.ts.map +1 -1
- package/dist/types/provider-settings.d.ts +4 -5
- package/dist/types/provider-settings.d.ts.map +1 -1
- package/dist/types/session.d.ts +2 -1
- package/dist/types/session.d.ts.map +1 -1
- package/dist/types.d.ts +8 -1
- package/dist/types.d.ts.map +1 -1
- package/package.json +20 -6
- package/src/ClineCore.ts +68 -40
- package/src/account/index.ts +3 -3
- package/src/account/rpc.ts +12 -12
- package/src/cron/index.ts +5 -0
- package/src/cron/resource-limiter.ts +46 -0
- package/src/cron/schedule-command-service.ts +193 -0
- package/src/cron/schedule-service.ts +703 -0
- package/src/cron/scheduler.ts +637 -0
- package/src/cron/sqlite-schedule-store.ts +708 -0
- package/src/extensions/config/agent-config-loader.ts +17 -7
- package/src/extensions/config/runtime-commands.ts +6 -0
- package/src/extensions/config/user-instruction-config-loader.ts +1 -0
- package/src/extensions/context/agentic-compaction.ts +3 -3
- package/src/extensions/context/basic-compaction.ts +2 -2
- package/src/extensions/context/compaction-shared.ts +5 -4
- package/src/extensions/context/compaction.ts +3 -3
- package/src/extensions/plugin/plugin-config-loader.ts +17 -2
- package/src/extensions/plugin/plugin-loader.ts +48 -4
- package/src/extensions/plugin/plugin-module-import.ts +0 -2
- package/src/extensions/plugin/plugin-sandbox-bootstrap.ts +93 -39
- package/src/extensions/plugin/plugin-sandbox.ts +47 -27
- package/src/extensions/plugin/plugin-targeting.ts +32 -0
- package/src/extensions/tools/definitions.ts +30 -49
- package/src/extensions/tools/executors/apply-patch.ts +69 -80
- package/src/extensions/tools/executors/search.ts +195 -3
- package/src/extensions/tools/index.ts +10 -0
- package/src/extensions/tools/presets.ts +31 -46
- package/src/extensions/tools/runtime.ts +261 -0
- package/src/extensions/tools/schemas.ts +4 -2
- package/src/extensions/tools/team/team-tools.ts +21 -0
- package/src/hooks/hook-file-hooks.ts +8 -2
- package/src/hooks/index.ts +0 -7
- package/src/hooks/subprocess-runner.ts +1 -1
- package/src/hooks/subprocess.ts +9 -0
- package/src/hub/browser-websocket.ts +137 -0
- package/src/hub/client.ts +574 -0
- package/src/hub/connect.ts +156 -0
- package/src/hub/daemon-entry.ts +87 -0
- package/src/hub/daemon.ts +181 -0
- package/src/hub/defaults.ts +43 -0
- package/src/hub/discovery.ts +247 -0
- package/src/hub/index.ts +14 -0
- package/src/hub/native-transport.ts +31 -0
- package/src/hub/runtime-handlers.ts +140 -0
- package/src/hub/server.ts +1888 -0
- package/src/hub/session-client.ts +460 -0
- package/src/hub/start-shared-server.ts +58 -0
- package/src/hub/transport.ts +14 -0
- package/src/hub/ui-client.ts +122 -0
- package/src/hub/workspace.ts +19 -0
- package/src/index.ts +124 -68
- package/src/llms/configured-provider-registry.ts +193 -0
- package/src/llms/provider-defaults.ts +637 -0
- package/src/llms/provider-settings.ts +263 -0
- package/src/llms/runtime-config.ts +43 -0
- package/src/llms/runtime-registry.ts +171 -0
- package/src/llms/runtime-types.ts +121 -0
- package/src/runtime/host.ts +107 -269
- package/src/runtime/index.ts +1 -0
- package/src/runtime/rules.ts +12 -0
- package/src/runtime/runtime-builder.ts +24 -8
- package/src/runtime/runtime-host.ts +89 -61
- package/src/runtime/runtime-oauth-token-manager.ts +11 -15
- package/src/runtime/session-runtime.ts +0 -24
- package/src/services/global-settings.ts +122 -0
- package/src/services/local-runtime-bootstrap.ts +51 -13
- package/src/services/plugin-tools.ts +85 -0
- package/src/services/providers/local-provider-registry.ts +6 -6
- package/src/services/providers/local-provider-service.ts +42 -37
- package/src/services/session-data.ts +15 -9
- package/src/services/storage/provider-settings-legacy-migration.ts +6 -4
- package/src/services/storage/provider-settings-manager.ts +1 -1
- package/src/services/workspace-manifest.ts +18 -0
- package/src/session/file-session-service.ts +1 -1
- package/src/session/index.ts +6 -27
- package/src/session/persistence-service.ts +119 -504
- package/src/session/session-manifest-store.ts +158 -0
- package/src/session/session-row.ts +199 -0
- package/src/session/session-service.ts +17 -376
- package/src/session/session-team-coordination.ts +1 -1
- package/src/session/subagent-session-manager.ts +397 -0
- package/src/session/team-persistence-store.ts +176 -0
- package/src/transports/hub.ts +656 -0
- package/src/transports/local.ts +135 -40
- package/src/transports/remote.ts +26 -0
- package/src/transports/runtime-host-support.ts +63 -9
- package/src/types/chat-schema.ts +4 -5
- package/src/types/config.ts +8 -7
- package/src/types/provider-settings.ts +11 -7
- package/src/types/session.ts +2 -4
- package/src/types.ts +27 -1
- package/dist/hooks/persistent.d.ts +0 -64
- package/dist/hooks/persistent.d.ts.map +0 -1
- package/dist/runtime/rpc-runtime-ensure.d.ts +0 -65
- package/dist/runtime/rpc-runtime-ensure.d.ts.map +0 -1
- package/dist/runtime/rpc-spawn-lease.d.ts +0 -8
- package/dist/runtime/rpc-spawn-lease.d.ts.map +0 -1
- package/dist/session/rpc-session-service.d.ts +0 -16
- package/dist/session/rpc-session-service.d.ts.map +0 -1
- package/dist/session/sqlite-rpc-session-backend.d.ts +0 -31
- package/dist/session/sqlite-rpc-session-backend.d.ts.map +0 -1
- package/dist/transports/rpc.d.ts +0 -51
- package/dist/transports/rpc.d.ts.map +0 -1
- package/src/ClineCore.test.ts +0 -226
- package/src/account/cline-account-service.test.ts +0 -185
- package/src/account/featurebase-token.test.ts +0 -175
- package/src/account/rpc.test.ts +0 -63
- package/src/auth/bounded-ttl-cache.test.ts +0 -38
- package/src/auth/client.test.ts +0 -69
- package/src/auth/cline.test.ts +0 -267
- package/src/auth/codex.test.ts +0 -170
- package/src/auth/oca.test.ts +0 -340
- package/src/auth/server.test.ts +0 -287
- package/src/auth/utils.test.ts +0 -128
- package/src/extensions/config/agent-config-loader.test.ts +0 -236
- package/src/extensions/config/hooks-config-loader.test.ts +0 -20
- package/src/extensions/config/runtime-commands.test.ts +0 -115
- package/src/extensions/config/unified-config-file-watcher.test.ts +0 -196
- package/src/extensions/config/user-instruction-config-loader.test.ts +0 -246
- package/src/extensions/context/compaction.test.ts +0 -483
- package/src/extensions/mcp/config-loader.test.ts +0 -238
- package/src/extensions/mcp/manager.test.ts +0 -105
- package/src/extensions/plugin/plugin-config-loader.test.ts +0 -184
- package/src/extensions/plugin/plugin-loader.test.ts +0 -292
- package/src/extensions/plugin/plugin-sandbox.test.ts +0 -423
- package/src/extensions/tools/definitions.test.ts +0 -780
- package/src/extensions/tools/executors/bash.test.ts +0 -87
- package/src/extensions/tools/executors/editor.test.ts +0 -35
- package/src/extensions/tools/executors/file-read.test.ts +0 -125
- package/src/extensions/tools/model-tool-routing.test.ts +0 -86
- package/src/extensions/tools/presets.test.ts +0 -70
- package/src/extensions/tools/team/multi-agent.lifecycle.test.ts +0 -455
- package/src/extensions/tools/team/spawn-agent-tool.test.ts +0 -381
- package/src/extensions/tools/team/team-tools.test.ts +0 -918
- package/src/hooks/checkpoint-hooks.test.ts +0 -168
- package/src/hooks/hook-file-hooks.test.ts +0 -311
- package/src/hooks/persistent.ts +0 -661
- package/src/runtime/history.test.ts +0 -114
- package/src/runtime/host.test.ts +0 -230
- package/src/runtime/rpc-runtime-ensure.test.ts +0 -123
- package/src/runtime/rpc-runtime-ensure.ts +0 -659
- package/src/runtime/rpc-spawn-lease.test.ts +0 -81
- package/src/runtime/rpc-spawn-lease.ts +0 -156
- package/src/runtime/runtime-builder.team-persistence.test.ts +0 -245
- package/src/runtime/runtime-builder.test.ts +0 -615
- package/src/runtime/runtime-oauth-token-manager.test.ts +0 -137
- package/src/runtime/runtime-parity.test.ts +0 -143
- package/src/services/providers/local-provider-service.test.ts +0 -1062
- package/src/services/session-data.test.ts +0 -160
- package/src/services/storage/provider-settings-legacy-migration.test.ts +0 -424
- package/src/services/storage/provider-settings-manager.test.ts +0 -191
- package/src/services/telemetry/OpenTelemetryAdapter.test.ts +0 -157
- package/src/services/telemetry/OpenTelemetryProvider.test.ts +0 -326
- package/src/services/telemetry/TelemetryLoggerSink.test.ts +0 -42
- package/src/services/telemetry/TelemetryService.test.ts +0 -134
- package/src/services/telemetry/distinct-id.test.ts +0 -57
- package/src/services/workspace/file-indexer.d.ts +0 -11
- package/src/services/workspace/file-indexer.test.ts +0 -156
- package/src/services/workspace/mention-enricher.test.ts +0 -106
- package/src/session/persistence-service.test.ts +0 -300
- package/src/session/rpc-session-service.ts +0 -114
- package/src/session/session-service.team-persistence.test.ts +0 -48
- package/src/session/sqlite-rpc-session-backend.ts +0 -301
- package/src/transports/local.e2e.test.ts +0 -380
- package/src/transports/local.test.ts +0 -2559
- package/src/transports/rpc.test.ts +0 -82
- package/src/transports/rpc.ts +0 -665
|
@@ -1,137 +0,0 @@
|
|
|
1
|
-
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
-
import {
|
|
3
|
-
OAuthReauthRequiredError,
|
|
4
|
-
RuntimeOAuthTokenManager,
|
|
5
|
-
} from "./runtime-oauth-token-manager";
|
|
6
|
-
|
|
7
|
-
const {
|
|
8
|
-
getValidOpenAICodexCredentials,
|
|
9
|
-
getValidClineCredentials,
|
|
10
|
-
getValidOcaCredentials,
|
|
11
|
-
} = vi.hoisted(() => ({
|
|
12
|
-
getValidOpenAICodexCredentials: vi.fn(),
|
|
13
|
-
getValidClineCredentials: vi.fn(),
|
|
14
|
-
getValidOcaCredentials: vi.fn(),
|
|
15
|
-
}));
|
|
16
|
-
|
|
17
|
-
vi.mock("../auth/codex", () => ({
|
|
18
|
-
getValidOpenAICodexCredentials,
|
|
19
|
-
}));
|
|
20
|
-
|
|
21
|
-
vi.mock("../auth/cline", () => ({
|
|
22
|
-
getValidClineCredentials,
|
|
23
|
-
}));
|
|
24
|
-
|
|
25
|
-
vi.mock("../auth/oca", () => ({
|
|
26
|
-
getValidOcaCredentials,
|
|
27
|
-
}));
|
|
28
|
-
|
|
29
|
-
describe("RuntimeOAuthTokenManager", () => {
|
|
30
|
-
beforeEach(() => {
|
|
31
|
-
vi.clearAllMocks();
|
|
32
|
-
});
|
|
33
|
-
|
|
34
|
-
it("refreshes and persists OpenAI Codex OAuth credentials", async () => {
|
|
35
|
-
const getProviderSettings = vi.fn().mockReturnValue({
|
|
36
|
-
provider: "openai-codex",
|
|
37
|
-
auth: {
|
|
38
|
-
accessToken: "access-old",
|
|
39
|
-
refreshToken: "refresh-old",
|
|
40
|
-
expiresAt: Date.now() - 1_000,
|
|
41
|
-
accountId: "acct-old",
|
|
42
|
-
},
|
|
43
|
-
});
|
|
44
|
-
const saveProviderSettings = vi.fn();
|
|
45
|
-
|
|
46
|
-
getValidOpenAICodexCredentials.mockResolvedValueOnce({
|
|
47
|
-
access: "access-new",
|
|
48
|
-
refresh: "refresh-new",
|
|
49
|
-
expires: 4_000_000_000_000,
|
|
50
|
-
accountId: "acct-new",
|
|
51
|
-
});
|
|
52
|
-
|
|
53
|
-
const manager = new RuntimeOAuthTokenManager({
|
|
54
|
-
providerSettingsManager: {
|
|
55
|
-
getProviderSettings,
|
|
56
|
-
saveProviderSettings,
|
|
57
|
-
} as never,
|
|
58
|
-
});
|
|
59
|
-
|
|
60
|
-
const result = await manager.resolveProviderApiKey({
|
|
61
|
-
providerId: "openai-codex",
|
|
62
|
-
});
|
|
63
|
-
|
|
64
|
-
expect(result).toMatchObject({
|
|
65
|
-
providerId: "openai-codex",
|
|
66
|
-
apiKey: "access-new",
|
|
67
|
-
accountId: "acct-new",
|
|
68
|
-
refreshed: true,
|
|
69
|
-
});
|
|
70
|
-
expect(saveProviderSettings).toHaveBeenCalledWith(
|
|
71
|
-
expect.objectContaining({
|
|
72
|
-
auth: expect.objectContaining({
|
|
73
|
-
accessToken: "access-new",
|
|
74
|
-
refreshToken: "refresh-new",
|
|
75
|
-
accountId: "acct-new",
|
|
76
|
-
expiresAt: 4_000_000_000_000,
|
|
77
|
-
}),
|
|
78
|
-
}),
|
|
79
|
-
{ setLastUsed: false, tokenSource: "oauth" },
|
|
80
|
-
);
|
|
81
|
-
});
|
|
82
|
-
|
|
83
|
-
it("throws re-auth required when refresh returns null", async () => {
|
|
84
|
-
getValidOpenAICodexCredentials.mockResolvedValueOnce(null);
|
|
85
|
-
const manager = new RuntimeOAuthTokenManager({
|
|
86
|
-
providerSettingsManager: {
|
|
87
|
-
getProviderSettings: vi.fn().mockReturnValue({
|
|
88
|
-
provider: "openai-codex",
|
|
89
|
-
auth: {
|
|
90
|
-
accessToken: "access-old",
|
|
91
|
-
refreshToken: "refresh-old",
|
|
92
|
-
expiresAt: Date.now() - 1_000,
|
|
93
|
-
},
|
|
94
|
-
}),
|
|
95
|
-
saveProviderSettings: vi.fn(),
|
|
96
|
-
} as never,
|
|
97
|
-
});
|
|
98
|
-
|
|
99
|
-
await expect(
|
|
100
|
-
manager.resolveProviderApiKey({ providerId: "openai-codex" }),
|
|
101
|
-
).rejects.toBeInstanceOf(OAuthReauthRequiredError);
|
|
102
|
-
});
|
|
103
|
-
|
|
104
|
-
it("de-duplicates concurrent refresh calls per provider", async () => {
|
|
105
|
-
const refreshBarrier = Promise.resolve().then(() => ({
|
|
106
|
-
access: "access-new",
|
|
107
|
-
refresh: "refresh-new",
|
|
108
|
-
expires: Date.now() + 60_000,
|
|
109
|
-
}));
|
|
110
|
-
getValidOpenAICodexCredentials.mockImplementationOnce(
|
|
111
|
-
async () => refreshBarrier,
|
|
112
|
-
);
|
|
113
|
-
|
|
114
|
-
const manager = new RuntimeOAuthTokenManager({
|
|
115
|
-
providerSettingsManager: {
|
|
116
|
-
getProviderSettings: vi.fn().mockReturnValue({
|
|
117
|
-
provider: "openai-codex",
|
|
118
|
-
auth: {
|
|
119
|
-
accessToken: "access-old",
|
|
120
|
-
refreshToken: "refresh-old",
|
|
121
|
-
expiresAt: Date.now() - 1_000,
|
|
122
|
-
},
|
|
123
|
-
}),
|
|
124
|
-
saveProviderSettings: vi.fn(),
|
|
125
|
-
} as never,
|
|
126
|
-
});
|
|
127
|
-
|
|
128
|
-
const [first, second] = await Promise.all([
|
|
129
|
-
manager.resolveProviderApiKey({ providerId: "openai-codex" }),
|
|
130
|
-
manager.resolveProviderApiKey({ providerId: "openai-codex" }),
|
|
131
|
-
]);
|
|
132
|
-
|
|
133
|
-
expect(first?.apiKey).toBe("access-new");
|
|
134
|
-
expect(second?.apiKey).toBe("access-new");
|
|
135
|
-
expect(getValidOpenAICodexCredentials).toHaveBeenCalledTimes(1);
|
|
136
|
-
});
|
|
137
|
-
});
|
|
@@ -1,143 +0,0 @@
|
|
|
1
|
-
import { mkdtempSync } from "node:fs";
|
|
2
|
-
import { tmpdir } from "node:os";
|
|
3
|
-
import { join } from "node:path";
|
|
4
|
-
import type { Tool } from "@clinebot/shared";
|
|
5
|
-
import { describe, expect, it } from "vitest";
|
|
6
|
-
import { createBuiltinTools } from "../extensions/tools";
|
|
7
|
-
import { DefaultRuntimeBuilder } from "./runtime-builder";
|
|
8
|
-
|
|
9
|
-
type LegacyConfig = {
|
|
10
|
-
providerId: string;
|
|
11
|
-
modelId: string;
|
|
12
|
-
apiKey: string;
|
|
13
|
-
systemPrompt: string;
|
|
14
|
-
cwd: string;
|
|
15
|
-
enableTools: boolean;
|
|
16
|
-
enableSpawnAgent: boolean;
|
|
17
|
-
enableAgentTeams: boolean;
|
|
18
|
-
};
|
|
19
|
-
|
|
20
|
-
function legacyBuiltinTools(cwd: string): Tool[] {
|
|
21
|
-
return createBuiltinTools({
|
|
22
|
-
cwd,
|
|
23
|
-
enableReadFiles: true,
|
|
24
|
-
enableSearch: true,
|
|
25
|
-
enableBash: true,
|
|
26
|
-
enableWebFetch: true,
|
|
27
|
-
});
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
function legacyBuildRuntimeEnvironment(
|
|
31
|
-
config: LegacyConfig,
|
|
32
|
-
createSpawnTool?: () => Tool,
|
|
33
|
-
): Tool[] {
|
|
34
|
-
const tools: Tool[] = [];
|
|
35
|
-
if (config.enableTools) {
|
|
36
|
-
tools.push(...legacyBuiltinTools(config.cwd));
|
|
37
|
-
}
|
|
38
|
-
if (config.enableSpawnAgent && createSpawnTool) {
|
|
39
|
-
const spawnTool = createSpawnTool();
|
|
40
|
-
tools.push({
|
|
41
|
-
...spawnTool,
|
|
42
|
-
execute: async (input, context) => spawnTool.execute(input, context),
|
|
43
|
-
});
|
|
44
|
-
}
|
|
45
|
-
return tools;
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
function normalizeParityToolNames(toolNames: string[]): string[] {
|
|
49
|
-
// Skills are discovered from user/workspace config and can appear in tests
|
|
50
|
-
// depending on the machine state. MCP tools may also be configured outside
|
|
51
|
-
// the test workspace. They are intentionally excluded from strict legacy
|
|
52
|
-
// parity checks.
|
|
53
|
-
return toolNames.filter(
|
|
54
|
-
(toolName) => toolName !== "skills" && !toolName.includes("__"),
|
|
55
|
-
);
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
function makeEmptyWorkspaceCwd(): string {
|
|
59
|
-
return mkdtempSync(join(tmpdir(), "runtime-parity-"));
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
function makeSpawnTool(): Tool {
|
|
63
|
-
return {
|
|
64
|
-
name: "spawn_agent",
|
|
65
|
-
description: "Spawn a subagent",
|
|
66
|
-
inputSchema: { type: "object", properties: {}, required: [] },
|
|
67
|
-
execute: async () => ({ ok: true }),
|
|
68
|
-
};
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
describe("runtime tool parity", () => {
|
|
72
|
-
it("matches legacy tool list when tools+spawn are enabled", async () => {
|
|
73
|
-
const config: LegacyConfig = {
|
|
74
|
-
providerId: "anthropic",
|
|
75
|
-
modelId: "claude-sonnet-4-6",
|
|
76
|
-
apiKey: "key",
|
|
77
|
-
systemPrompt: "test",
|
|
78
|
-
cwd: makeEmptyWorkspaceCwd(),
|
|
79
|
-
enableTools: true,
|
|
80
|
-
enableSpawnAgent: true,
|
|
81
|
-
enableAgentTeams: false,
|
|
82
|
-
};
|
|
83
|
-
const createSpawnTool = makeSpawnTool;
|
|
84
|
-
const expected = normalizeParityToolNames(
|
|
85
|
-
legacyBuildRuntimeEnvironment(config, createSpawnTool).map(
|
|
86
|
-
(tool) => tool.name,
|
|
87
|
-
),
|
|
88
|
-
);
|
|
89
|
-
const runtime = await new DefaultRuntimeBuilder().build({
|
|
90
|
-
config,
|
|
91
|
-
createSpawnTool,
|
|
92
|
-
});
|
|
93
|
-
const actual = runtime.tools.map((tool) => tool.name);
|
|
94
|
-
|
|
95
|
-
expect(normalizeParityToolNames(actual)).toEqual(expected);
|
|
96
|
-
});
|
|
97
|
-
|
|
98
|
-
it("matches legacy tool list when only spawn is enabled", async () => {
|
|
99
|
-
const config: LegacyConfig = {
|
|
100
|
-
providerId: "anthropic",
|
|
101
|
-
modelId: "claude-sonnet-4-6",
|
|
102
|
-
apiKey: "key",
|
|
103
|
-
systemPrompt: "test",
|
|
104
|
-
cwd: makeEmptyWorkspaceCwd(),
|
|
105
|
-
enableTools: false,
|
|
106
|
-
enableSpawnAgent: true,
|
|
107
|
-
enableAgentTeams: false,
|
|
108
|
-
};
|
|
109
|
-
const createSpawnTool = makeSpawnTool;
|
|
110
|
-
const expected = normalizeParityToolNames(
|
|
111
|
-
legacyBuildRuntimeEnvironment(config, createSpawnTool).map(
|
|
112
|
-
(tool) => tool.name,
|
|
113
|
-
),
|
|
114
|
-
);
|
|
115
|
-
const runtime = await new DefaultRuntimeBuilder().build({
|
|
116
|
-
config,
|
|
117
|
-
createSpawnTool,
|
|
118
|
-
});
|
|
119
|
-
const actual = runtime.tools.map((tool) => tool.name);
|
|
120
|
-
|
|
121
|
-
expect(normalizeParityToolNames(actual)).toEqual(expected);
|
|
122
|
-
});
|
|
123
|
-
|
|
124
|
-
it("matches legacy tool list when tools+spawn are disabled", async () => {
|
|
125
|
-
const config: LegacyConfig = {
|
|
126
|
-
providerId: "anthropic",
|
|
127
|
-
modelId: "claude-sonnet-4-6",
|
|
128
|
-
apiKey: "key",
|
|
129
|
-
systemPrompt: "test",
|
|
130
|
-
cwd: makeEmptyWorkspaceCwd(),
|
|
131
|
-
enableTools: false,
|
|
132
|
-
enableSpawnAgent: false,
|
|
133
|
-
enableAgentTeams: false,
|
|
134
|
-
};
|
|
135
|
-
const expected = normalizeParityToolNames(
|
|
136
|
-
legacyBuildRuntimeEnvironment(config).map((tool) => tool.name),
|
|
137
|
-
);
|
|
138
|
-
const runtime = await new DefaultRuntimeBuilder().build({ config });
|
|
139
|
-
const actual = runtime.tools.map((tool) => tool.name);
|
|
140
|
-
|
|
141
|
-
expect(normalizeParityToolNames(actual)).toEqual(expected);
|
|
142
|
-
});
|
|
143
|
-
});
|