Skip to content

Commit 4b7a4dc

Browse files
committed
chore: merge main
2 parents 9a19121 + 784b562 commit 4b7a4dc

137 files changed

Lines changed: 3358 additions & 2285 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/server/scripts/record-claude-agent-sdk-replay-fixture.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ import {
1010
CLAUDE_AGENT_SDK_REPLAY_PROTOCOL,
1111
} from "../src/orchestration-v2/Adapters/ClaudeAdapterV2.testkit.ts";
1212
import { claudeRuntimeQueryPolicyForRuntimePolicy } from "../src/orchestration-v2/Adapters/ClaudeAdapterV2.ts";
13-
import {
14-
ProviderAdapterV2RuntimePolicy,
15-
type ProviderAdapterV2RuntimePolicy as ProviderAdapterV2RuntimePolicyType,
16-
} from "@t3tools/provider-core/server/ProviderAdapter";
13+
import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
1714
import type { RuntimePolicyV2Override } from "../src/orchestration-v2/RuntimePolicy.ts";
1815
import { makeCheckpointWorkspace } from "@t3tools/provider-testing/replayWorkspace";
1916
import { CLAUDE_MODEL_SELECTION } from "../src/orchestration-v2/testkit/fixtures/shared.ts";
@@ -440,8 +437,8 @@ validateClaudeReplayRecordingSelection({
440437
function runtimePolicyForRecording(input: {
441438
readonly cwd: string;
442439
readonly override?: RuntimePolicyV2Override;
443-
}): ProviderAdapterV2RuntimePolicyType {
444-
return ProviderAdapterV2RuntimePolicy.make({
440+
}): ProviderAdapter.ProviderAdapterV2RuntimePolicy {
441+
return ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
445442
runtimeMode: "full-access",
446443
interactionMode: "default",
447444
cwd: input.override?.cwd ?? input.cwd,

‎apps/server/scripts/record-grok-acp-replay-fixture.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import {
3333
} from "@t3tools/provider-grok/testing";
3434
import { ACP_PROTOCOL } from "@t3tools/provider-acp/server/adapter";
3535
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
36-
import type { ProviderAdapterV2SessionRuntime } from "@t3tools/provider-core/server/ProviderAdapter";
37-
import * as ProviderContinuationRequests from "@t3tools/provider-core/server/continuationRequests";
36+
import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
37+
import * as ProviderContinuationRequests from "@t3tools/provider-core/server/ProviderContinuationRequests";
3838
import * as ProviderAdapterRegistry from "../src/orchestration-v2/ProviderAdapterRegistry.ts";
3939
import { provideDeterministicTestRuntime } from "../src/orchestration-v2/testkit/DeterministicRuntime.ts";
4040
import { ORCHESTRATOR_REPLAY_FIXTURES } from "../src/orchestration-v2/testkit/fixtures/index.ts";
@@ -474,7 +474,7 @@ const recordScenario = Effect.fn("recordGrokScenario")(function* (fixtureName: s
474474
...adapter,
475475
openSession: (input) =>
476476
adapter.openSession(input).pipe(
477-
Effect.map((session): ProviderAdapterV2SessionRuntime => ({
477+
Effect.map((session): ProviderAdapter.ProviderAdapterV2SessionRuntime => ({
478478
...session,
479479
startTurn: (turnInput) => onWallClock(session.startTurn(turnInput)),
480480
steerTurn: (turnInput) => onWallClock(session.steerTurn(turnInput)),

‎apps/server/src/mcp/McpToolAccess.race.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ import { DispatchModeLimit } from "../orchestration-v2/DispatchModeLimit.ts";
1919
import { CodexProviderCapabilitiesV2 } from "../orchestration-v2/Adapters/CodexAdapterV2.ts";
2020
import * as Orchestrator from "../orchestration-v2/Orchestrator.ts";
2121
import * as ProjectionStore from "../orchestration-v2/ProjectionStore.ts";
22-
import type { ProviderAdapterV2Shape } from "@t3tools/provider-core/server/ProviderAdapter";
2322
import * as ProviderAdapterRegistry from "../orchestration-v2/ProviderAdapterRegistry.ts";
2423
import * as ThreadManagement from "../orchestration-v2/ThreadManagementService.ts";
2524
import * as ProviderReplayHarness from "../orchestration-v2/testkit/ProviderReplayHarness.ts";
2625
import * as McpHttpServer from "./McpHttpServer.ts";
2726
import * as McpInvocationContext from "./McpInvocationContext.ts";
2827
import * as McpToolAccess from "./McpToolAccess.ts";
28+
import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
2929

3030
// A Supervised outside agent renames a thread through a `writesThreads` tool.
3131
// The thread's user raises it to full access after the tool's check but
@@ -38,7 +38,7 @@ const adapter = {
3838
getCapabilities: () => Effect.succeed(CodexProviderCapabilitiesV2),
3939
planSelectionTransition: () => Effect.succeed({ type: "apply_on_next_turn" as const }),
4040
openSession: () => Effect.die("No provider process needed for metadata commands"),
41-
} as ProviderAdapterV2Shape;
41+
} as ProviderAdapter.ProviderAdapterV2["Service"];
4242
const layerDatabase = SqlitePersistence.layerMemory;
4343
const layerOrchestrator = Layer.mergeAll(
4444
layerDatabase,

‎apps/server/src/mcp/OrchestratorMcpService.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import {
2828
OrchestratorProjectionError,
2929
OrchestratorThreadAboveModeLimitError,
3030
} from "../orchestration-v2/Orchestrator.ts";
31-
import type { ProviderAdapterV2Shape } from "@t3tools/provider-core/server/ProviderAdapter";
3231
import * as ProviderAdapterRegistry from "../orchestration-v2/ProviderAdapterRegistry.ts";
3332
import * as ThreadManagementService from "../orchestration-v2/ThreadManagementService.ts";
3433
import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
@@ -39,6 +38,7 @@ import * as SecretRequests from "../secrets/SecretRequests.ts";
3938
import type { McpInvocationScope } from "./McpInvocationContext.ts";
4039
import { idleThreadProjection, liveThreadShell } from "./McpToolAccess.testkit.ts";
4140
import * as OrchestratorMcpService from "./OrchestratorMcpService.ts";
41+
import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
4242

4343
describe("OrchestratorMcpService", () => {
4444
it.effect("retries terminal acknowledgement with a fresh command id", () =>
@@ -810,7 +810,9 @@ describe("OrchestratorMcpService provider resolution", () => {
810810
list: () => Effect.succeed(instanceIds),
811811
get: (instanceId) =>
812812
instanceIds.includes(instanceId)
813-
? Effect.succeed({ instanceId } as unknown as ProviderAdapterV2Shape)
813+
? Effect.succeed({
814+
instanceId,
815+
} as unknown as ProviderAdapter.ProviderAdapterV2["Service"])
814816
: Effect.fail(
815817
new ProviderAdapterRegistry.ProviderAdapterRegistryLookupError({ instanceId }),
816818
),

‎apps/server/src/mcp/OrchestratorMcpToolkit.integration.test.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,9 @@ import { threadShellFromProjection } from "../orchestration-v2/ProjectionStore.t
5757
import * as EventSink from "../orchestration-v2/EventSink.ts";
5858
import * as Orchestrator from "../orchestration-v2/Orchestrator.ts";
5959
import * as ThreadManagementService from "../orchestration-v2/ThreadManagementService.ts";
60-
import {
61-
type ProviderAdapterV2Event,
62-
ProviderAdapterProtocolError,
63-
type ProviderAdapterV2Shape,
64-
type ProviderAdapterV2TurnInput,
65-
} from "@t3tools/provider-core/server/ProviderAdapter";
6660
import * as ProviderAdapterRegistry from "../orchestration-v2/ProviderAdapterRegistry.ts";
67-
import * as ProviderContinuationRequests from "@t3tools/provider-core/server/continuationRequests";
61+
import * as ProviderContinuationRequests from "@t3tools/provider-core/server/ProviderContinuationRequests";
62+
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
6863
import { checkpointWorkspace } from "@t3tools/provider-testing/replayWorkspace";
6964
import * as ProviderReplayHarness from "../orchestration-v2/testkit/ProviderReplayHarness.ts";
7065
import {
@@ -79,6 +74,7 @@ import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
7974
import * as McpHttpServer from "./McpHttpServer.ts";
8075
import * as McpInvocationContext from "./McpInvocationContext.ts";
8176
import { delegatedTaskRun, hasPendingChildRuns } from "./OrchestratorMcpService.ts";
77+
import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
8278

8379
// Effect returns a declared tool failure as `isError` with its encoded payload
8480
// as JSON text, never as `structuredContent`.
@@ -146,7 +142,7 @@ interface CapturedTurn {
146142
}
147143

148144
function unsupported(driver: ProviderDriverKind, detail: string) {
149-
return Effect.fail(new ProviderAdapterProtocolError({ driver, detail }));
145+
return Effect.fail(new ProviderAdapter.ProviderAdapterProtocolError({ driver, detail }));
150146
}
151147

152148
function makeProviderSnapshot(input: {
@@ -185,18 +181,20 @@ function makeDeterministicAdapter(input: {
185181
readonly driver: ProviderDriverKind;
186182
readonly capabilities: OrchestrationV2ProviderCapabilities;
187183
readonly capturedTurns: Ref.Ref<ReadonlyArray<CapturedTurn>>;
188-
readonly shouldComplete: (turn: ProviderAdapterV2TurnInput) => boolean;
189-
readonly terminalGate?: (turn: ProviderAdapterV2TurnInput) => Deferred.Deferred<void> | undefined;
190-
readonly response: (turn: ProviderAdapterV2TurnInput) => string;
191-
}): ProviderAdapterV2Shape {
184+
readonly shouldComplete: (turn: ProviderAdapter.ProviderAdapterV2TurnInput) => boolean;
185+
readonly terminalGate?: (
186+
turn: ProviderAdapter.ProviderAdapterV2TurnInput,
187+
) => Deferred.Deferred<void> | undefined;
188+
readonly response: (turn: ProviderAdapter.ProviderAdapterV2TurnInput) => string;
189+
}): ProviderAdapter.ProviderAdapterV2["Service"] {
192190
return {
193191
instanceId: input.instanceId,
194192
driver: input.driver,
195193
getCapabilities: () => Effect.succeed(input.capabilities),
196194
planSelectionTransition: () => Effect.succeed({ type: "apply_on_next_turn" }),
197195
openSession: (sessionInput) =>
198196
Effect.gen(function* () {
199-
const events = yield* PubSub.unbounded<ProviderAdapterV2Event>();
197+
const events = yield* PubSub.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
200198
const now = yield* DateTime.now;
201199
const providerSession: OrchestrationV2ProviderSession = {
202200
id: sessionInput.providerSessionId,
@@ -211,12 +209,12 @@ function makeDeterministicAdapter(input: {
211209
lastError: null,
212210
};
213211

214-
const publish = (providerEvents: ReadonlyArray<ProviderAdapterV2Event>) =>
212+
const publish = (providerEvents: ReadonlyArray<ProviderAdapter.ProviderAdapterV2Event>) =>
215213
Effect.forEach(providerEvents, (event) => PubSub.publish(events, event), {
216214
discard: true,
217215
});
218216
const runOrdinals = new Map<ProviderTurnId, number>();
219-
const turnInputs = new Map<ProviderTurnId, ProviderAdapterV2TurnInput>();
217+
const turnInputs = new Map<ProviderTurnId, ProviderAdapter.ProviderAdapterV2TurnInput>();
220218

221219
return {
222220
instanceId: input.instanceId,
@@ -3813,7 +3811,9 @@ describe("orchestrator MCP toolkit", () => {
38133811
Layer.provideMerge(McpServer.McpServer.layer),
38143812
Layer.provideMerge(layerOrchestration),
38153813
Layer.provide(
3816-
CodexOrchestratorReplayHarness.makeProviderAdapterRegistryLayer(transcript),
3814+
CodexOrchestratorReplayHarness.makeProviderAdapterRegistryLayer(transcript).pipe(
3815+
Layer.provide(McpProviderSessions.layer),
3816+
),
38173817
),
38183818
Layer.provide(layerProviderRegistry),
38193819
Layer.provide(layerUnusedScheduledTaskStub),

‎apps/server/src/mcpApps/McpAppRequests.test.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ import * as Layer from "effect/Layer";
1414
import * as Option from "effect/Option";
1515

1616
import * as Orchestrator from "../orchestration-v2/Orchestrator.ts";
17-
import type {
18-
ProviderAdapterV2McpApps,
19-
ProviderAdapterV2SessionRuntime,
20-
} from "@t3tools/provider-core/server/ProviderAdapter";
17+
import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
2118
import * as ProviderSessionManager from "../orchestration-v2/ProviderSessionManager.ts";
2219
import * as ThreadManagementService from "../orchestration-v2/ThreadManagementService.ts";
2320
import * as McpAppModelContext from "./McpAppModelContext.ts";
@@ -71,7 +68,7 @@ const storedContext = new Map<string, string>();
7168

7269
function makeLayer(input: {
7370
readonly item: OrchestrationV2TurnItem | null;
74-
readonly mcpApps?: ProviderAdapterV2McpApps;
71+
readonly mcpApps?: ProviderAdapter.ProviderAdapterV2McpApps;
7572
readonly live?: boolean;
7673
}) {
7774
return McpAppRequests.layer.pipe(
@@ -121,7 +118,9 @@ function makeLayer(input: {
121118
: Option.some(
122119
(input.mcpApps === undefined
123120
? {}
124-
: { mcpApps: input.mcpApps }) as ProviderAdapterV2SessionRuntime,
121+
: {
122+
mcpApps: input.mcpApps,
123+
}) as ProviderAdapter.ProviderAdapterV2SessionRuntime,
125124
),
126125
),
127126
}),
@@ -138,7 +137,7 @@ const reason = <A, R>(effect: Effect.Effect<A, McpAppRequestError, R>) =>
138137

139138
describe("McpAppRequests", () => {
140139
const calls: Array<{ server: string; tool: string }> = [];
141-
const mcpApps: ProviderAdapterV2McpApps = {
140+
const mcpApps: ProviderAdapter.ProviderAdapterV2McpApps = {
142141
listTools: () =>
143142
Effect.succeed([
144143
{ name: "refresh", annotations: { readOnlyHint: true } },

‎apps/server/src/mcpApps/McpAppRequests.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ import * as Predicate from "effect/Predicate";
2121
import * as Schema from "effect/Schema";
2222

2323
import * as Orchestrator from "../orchestration-v2/Orchestrator.ts";
24-
import type {
25-
ProviderAdapterV2McpApps,
26-
ProviderAdapterV2McpTool,
27-
} from "@t3tools/provider-core/server/ProviderAdapter";
24+
import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
2825
import * as ProviderSessionManager from "../orchestration-v2/ProviderSessionManager.ts";
2926
import * as ThreadManagementService from "../orchestration-v2/ThreadManagementService.ts";
3027
import * as McpAppModelContext from "./McpAppModelContext.ts";
@@ -57,10 +54,10 @@ export class McpAppRequests extends Context.Service<
5754
const encodeJson = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown));
5855
const utf8 = new TextEncoder();
5956

60-
const readOnlyHint = (tool: ProviderAdapterV2McpTool) =>
57+
const readOnlyHint = (tool: ProviderAdapter.ProviderAdapterV2McpTool) =>
6158
Predicate.isObject(tool.annotations) && tool.annotations.readOnlyHint === true;
6259

63-
const toolTitle = (tool: ProviderAdapterV2McpTool) =>
60+
const toolTitle = (tool: ProviderAdapter.ProviderAdapterV2McpTool) =>
6461
Predicate.isObject(tool.annotations) && typeof tool.annotations.title === "string"
6562
? tool.annotations.title
6663
: undefined;
@@ -112,7 +109,7 @@ const make = Effect.gen(function* () {
112109
.pipe(Effect.mapError((cause) => fail(input.threadId, "request-failed", cause))),
113110
);
114111
if (runtime === undefined) return yield* fail(input.threadId, "session-stopped");
115-
const mcpApps: ProviderAdapterV2McpApps | undefined = runtime.mcpApps;
112+
const mcpApps: ProviderAdapter.ProviderAdapterV2McpApps | undefined = runtime.mcpApps;
116113
if (mcpApps === undefined) return yield* fail(input.threadId, "provider-unsupported");
117114
return { app, providerThread, mcpApps };
118115
});

‎apps/server/src/orchestration-v2/AcpRegistryOrchestratorV2.live.test.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ import * as CodexInstallation from "../provider/CodexInstallation.ts";
2929
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
3030
import * as ModelManifest from "../provider/ModelManifest.ts";
3131
import * as ProviderInstanceRegistryHydration from "../provider/ProviderInstanceRegistryHydration.ts";
32-
import * as ProviderEventLoggers from "../provider/ProviderEventLoggers.ts";
32+
import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
33+
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
34+
import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
3335
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
3436
import * as OpenCodeServerLedger from "@t3tools/provider-opencode/server/OpenCodeServerLedger";
3537
import * as ServerSettings from "../serverSettings.ts";
@@ -112,6 +114,7 @@ const layerProviderInstanceRegistry = ProviderInstanceRegistryHydration.layer.pi
112114
ProviderEventLoggers.ProviderEventLoggers,
113115
ProviderEventLoggers.NoOpProviderEventLoggers,
114116
),
117+
ProviderLatestVersions.layer,
115118
ModelManifest.layerTest,
116119
AntigravityInstallation.AntigravityInstallation.layer.pipe(
117120
Layer.provide(layerServerConfig.pipe(Layer.provide(layerPlatformTest))),
@@ -142,6 +145,7 @@ const layerLive = RuntimeLayer.layer.pipe(
142145
Layer.provide(layerBackgroundPolicy),
143146
Layer.provide(ProviderTurnStartServiceTestkit.layer),
144147
Layer.provide(layerPlatformTest),
148+
Layer.provide(McpProviderSessions.layer),
145149
);
146150

147151
const waitForIdle = Effect.fn("AcpRegistryOrchestratorV2Live.waitForIdle")(function* (

0 commit comments

Comments
 (0)