Skip to content

Commit 95fd0d6

Browse files
committed
Merge branch 'main' into fix/context-meter-million-boundary
2 parents 8b4c620 + 6497246 commit 95fd0d6

209 files changed

Lines changed: 4370 additions & 3262 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/marketing/src/layouts/Layout.astro‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,15 @@ const canonicalUrl = new URL(Astro.url.pathname, Astro.site);
7878
<nav class="nav">
7979
<div class="nav-inner">
8080
<a href="/" class="nav-brand" aria-label="T3 Code home">
81-
<span class="nav-brand-name">T3 Code</span>
81+
<svg
82+
class="nav-brand-mark"
83+
viewBox="15.5309 37 94.3941 56.96"
84+
fill="currentColor"
85+
aria-hidden="true"
86+
>
87+
<path d="M33.4509 93V47.56H15.5309V37H64.3309V47.56H46.4109V93H33.4509ZM86.7253 93.96C82.832 93.96 78.9653 93.4533 75.1253 92.44C71.2853 91.3733 68.032 89.88 65.3653 87.96L70.4053 78.04C72.5386 79.5867 75.0186 80.8133 77.8453 81.72C80.672 82.6267 83.5253 83.08 86.4053 83.08C89.6586 83.08 92.2186 82.44 94.0853 81.16C95.952 79.88 96.8853 78.12 96.8853 75.88C96.8853 73.7467 96.0586 72.0667 94.4053 70.84C92.752 69.6133 90.0853 69 86.4053 69H80.4853V60.44L96.0853 42.76L97.5253 47.4H68.1653V37H107.365V45.4L91.8453 63.08L85.2853 59.32H89.0453C95.9253 59.32 101.125 60.8667 104.645 63.96C108.165 67.0533 109.925 71.0267 109.925 75.88C109.925 79.0267 109.099 81.9867 107.445 84.76C105.792 87.48 103.259 89.6933 99.8453 91.4C96.432 93.1067 92.0586 93.96 86.7253 93.96Z" />
88+
</svg>
89+
<span class="nav-brand-name">Code</span>
8290
</a>
8391
<div class="nav-right">
8492
<a class="nav-link" href="/download">Download</a>
@@ -365,7 +373,8 @@ const canonicalUrl = new URL(Astro.url.pathname, Astro.site);
365373

366374
.nav-brand {
367375
display: inline-flex;
368-
align-items: center;
376+
align-items: baseline;
377+
gap: 4px;
369378
color: var(--fg);
370379
transition: color 0.2s ease;
371380
}
@@ -374,11 +383,18 @@ const canonicalUrl = new URL(Astro.url.pathname, Astro.site);
374383
color: #fff;
375384
}
376385

386+
.nav-brand-mark {
387+
height: 1cap;
388+
width: auto;
389+
flex: none;
390+
}
391+
377392
.nav-brand-name {
378393
font-size: 16px;
379-
font-weight: 650;
394+
font-weight: 500;
380395
letter-spacing: -0.025em;
381396
line-height: 1;
397+
color: var(--fg-muted);
382398
}
383399

384400
.nav-right {

‎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-cursor-agent-sdk-replay-fixture.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
33
import * as Config from "effect/Config";
44
import * as Console from "effect/Console";
55
import * as Effect from "effect/Effect";
6+
import * as Layer from "effect/Layer";
67
import * as FileSystem from "effect/FileSystem";
78
import * as Option from "effect/Option";
89
import * as Path from "effect/Path";
910
import * as Redacted from "effect/Redacted";
1011
import * as Schema from "effect/Schema";
1112
import * as Struct from "effect/Struct";
1213
import { Command, Flag } from "effect/cli";
14+
import * as CursorSdk from "@t3tools/provider-cursor/server/CursorSdk";
1315

1416
import {
1517
recordCursorAgentSdkReplayTranscript,
@@ -219,6 +221,6 @@ const recordCursorReplayCommand = Command.make(
219221
);
220222

221223
Command.run(recordCursorReplayCommand, { version: "0.0.0" }).pipe(
222-
Effect.provide(NodeServices.layer),
224+
Effect.provide(Layer.mergeAll(CursorSdk.layer, NodeServices.layer)),
223225
NodeRuntime.runMain,
224226
);

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@ import * as FileSystem from "effect/FileSystem";
2121
import * as Layer from "effect/Layer";
2222
import * as Path from "effect/Path";
2323
import * as Schema from "effect/Schema";
24-
import { ChildProcessSpawner } from "effect/process";
2524
import type * as EffectAcpProtocol from "effect-acp/protocol";
2625

27-
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
26+
import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
2827
import {
2928
GROK_DEFAULT_INSTANCE_ID,
3029
GROK_PROVIDER,
@@ -33,8 +32,8 @@ import {
3332
} from "@t3tools/provider-grok/testing";
3433
import { ACP_PROTOCOL } from "@t3tools/provider-acp/server/adapter";
3534
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";
35+
import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
36+
import * as ProviderContinuationRequests from "@t3tools/provider-core/server/ProviderContinuationRequests";
3837
import * as ProviderAdapterRegistry from "../src/orchestration-v2/ProviderAdapterRegistry.ts";
3938
import { provideDeterministicTestRuntime } from "../src/orchestration-v2/testkit/DeterministicRuntime.ts";
4039
import { ORCHESTRATOR_REPLAY_FIXTURES } from "../src/orchestration-v2/testkit/fixtures/index.ts";
@@ -443,7 +442,6 @@ const recordScenario = Effect.fn("recordGrokScenario")(function* (fixtureName: s
443442
const settings = { ...DEFAULT_GROK_SETTINGS, binaryPath: process.env.T3_GROK_BIN ?? "grok" };
444443
const layerRegistry = ProviderAdapterRegistry.layerFromAdaptersEffect(
445444
Effect.gen(function* () {
446-
const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
447445
const environment = yield* HostProcessEnvironment;
448446
const adapter = yield* makeGrokAdapterV2({
449447
instanceId: GROK_DEFAULT_INSTANCE_ID,
@@ -460,7 +458,6 @@ const recordScenario = Effect.fn("recordGrokScenario")(function* (fixtureName: s
460458
interruptPromptOnCancel: input.interruptPromptOnCancel ?? false,
461459
grokSettings: settings,
462460
environment,
463-
childProcessSpawner,
464461
runtimeMode: grokLaunchRuntimeMode(runtimePolicy),
465462
}),
466463
});
@@ -474,7 +471,7 @@ const recordScenario = Effect.fn("recordGrokScenario")(function* (fixtureName: s
474471
...adapter,
475472
openSession: (input) =>
476473
adapter.openSession(input).pipe(
477-
Effect.map((session): ProviderAdapterV2SessionRuntime => ({
474+
Effect.map((session): ProviderAdapter.ProviderAdapterV2SessionRuntime => ({
478475
...session,
479476
startTurn: (turnInput) => onWallClock(session.startTurn(turnInput)),
480477
steerTurn: (turnInput) => onWallClock(session.steerTurn(turnInput)),
@@ -490,7 +487,7 @@ const recordScenario = Effect.fn("recordGrokScenario")(function* (fixtureName: s
490487
).pipe(
491488
Layer.provide(
492489
Layer.mergeAll(
493-
layerTestProviderHost().pipe(Layer.provide(NodeServices.layer)),
490+
TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer)),
494491
NodeServices.layer,
495492
IdAllocator.layer,
496493
),

‎apps/server/src/assets/AssetAccess.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
5353
import { parseAttachmentFileExtension, resolveAttachmentPathById } from "../attachmentStore.ts";
5454
import * as ServerConfig from "../config.ts";
5555
import * as Orchestrator from "../orchestration-v2/Orchestrator.ts";
56-
import { expandHomePathWith } from "@t3tools/provider-core/server/pathExpansion";
56+
import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
5757
import * as ProjectFaviconResolver from "../project/ProjectFaviconResolver.ts";
5858
import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
5959
import * as NativeAppIconResolver from "./NativeAppIconResolver.ts";
@@ -469,7 +469,7 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
469469

470470
switch (input.resource._tag) {
471471
case "media-file": {
472-
let requestedPath = expandHomePathWith(input.resource.path, path);
472+
let requestedPath = expandHomePath(input.resource.path);
473473
if (!path.isAbsolute(requestedPath)) {
474474
if (!input.workspaceRoot) {
475475
return yield* new AssetWorkspaceContextNotFoundError({ resource: input.resource });

‎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
});

0 commit comments

Comments
 (0)