From f752d074b90afb968f95204740b7cda25c77a951 Mon Sep 17 00:00:00 2001 From: Renfei Zhou Date: Fri, 6 Nov 2026 04:59:23 +0000 Subject: [PATCH] fix(fork): resolve upstream merge 3d78e915e3 - AntigravityAdapterV2.test.ts: keeps the fork's flavorOptions object, which a later test spreads, and takes upstream's `defaultModel: Effect.undefined`. The old suppression line goes with `Effect.succeed(undefined)`. - Orchestrator.ts: mayStartSubagentFollowup keeps the fork's delegatedCompletion check (the port of upstream #28462) and takes upstream's new return, which also starts usage-limit continuations. - ws.ts: keeps the fork's no-auth branch, which skips the revocation race, and runs upstream's new framedRpcWebSocketHttpEffect in both arms. - settings.ts: both sides only added keys; keeps the fork's previewBrowserMode and upstream's speech settings, in ServerSettings and in ServerSettingsPatch. - provider-acp adapter.ts: keeps the fork's runtimeAccount and upstream's openAgentRequests at runtime spawn and at runtime replacement. - pnpm-lock.yaml: regenerated from upstream's file with --lockfile-only; it is identical to the textual merge. The fork's code also follows upstream's new Effect rules and APIs: - EnvironmentAuth.ts and one fork test read the environment through HostProcess.Environment; PreviewDisplayError is a Schema.TaggedError. - Fork test fakes gain upstream's new methods: the fake Claude sessions, the AssetSigner mock and the secret store's label. - pdfWorker.ts returns pdf.js's own loading task with destroy wrapped. The worker still stops five minutes after the last document closes. Co-Authored-By: Claude Opus 5.5 --- apps/server/src/auth/EnvironmentAuth.ts | 3 ++- apps/server/src/fork/claudeSteerQueue.test.ts | 4 ++++ .../claudeUsageExport.test.ts | 3 ++- .../claudeLoginSource.test.ts | 1 + .../server/src/fork/generalRoleParity.test.ts | 8 ++++++- .../idleCompactionLevels.test.ts | 2 +- apps/server/src/fork/previewDisplay.ts | 13 ++++++------ .../Adapters/AntigravityAdapterV2.test.ts | 8 +------ .../src/orchestration-v2/Orchestrator.ts | 4 ---- apps/server/src/ws.ts | 17 ++------------- apps/web/src/fork/pdfWorker.ts | 21 +++++++++---------- packages/contracts/src/settings.ts | 7 +------ packages/provider-acp/src/server/adapter.ts | 6 ------ 13 files changed, 38 insertions(+), 59 deletions(-) diff --git a/apps/server/src/auth/EnvironmentAuth.ts b/apps/server/src/auth/EnvironmentAuth.ts index ed163d645e5c2..73b8ec9d4a493 100644 --- a/apps/server/src/auth/EnvironmentAuth.ts +++ b/apps/server/src/auth/EnvironmentAuth.ts @@ -23,6 +23,7 @@ import { type DpopFailureReason as DpopFailureReasonType, mcpClientScopes, } from "@t3tools/contracts"; +import * as HostProcess from "@t3tools/shared/HostProcess"; import { isLocalLoopbackHost } from "@t3tools/shared/hostClassification"; import { encodeOAuthScope } from "@t3tools/shared/oauthScope"; import * as Context from "effect/Context"; @@ -730,7 +731,7 @@ export const make = Effect.gen(function* () { const config = yield* ServerConfig.ServerConfig; const managedPolicy = yield* ManagedPolicy.ManagedPolicy; const devAuth = resolveReusableDevAuth(config); - const unsafeNoAuth = process.env.T3CODE_UNSAFE_NO_AUTH === "1"; + const unsafeNoAuth = (yield* HostProcess.Environment).T3CODE_UNSAFE_NO_AUTH === "1"; const authenticateToken = ( token: string, diff --git a/apps/server/src/fork/claudeSteerQueue.test.ts b/apps/server/src/fork/claudeSteerQueue.test.ts index e1d7b0e1b8027..d85134a3dd378 100644 --- a/apps/server/src/fork/claudeSteerQueue.test.ts +++ b/apps/server/src/fork/claudeSteerQueue.test.ts @@ -113,6 +113,10 @@ const startSteeredTurn = Effect.gen(function* () { applyFlagSettings: () => Effect.void, setPermissionMode: () => Effect.void, backgroundTasks: () => Effect.succeed(false), + mcpServerStatus: Effect.succeed([]), + readMcpResource: () => Effect.die("unexpected MCP resource read"), + callMcpTool: () => Effect.die("unexpected MCP tool call"), + listPermissionRules: Effect.die("unexpected permission rules read"), stopTask: () => Effect.void, interrupt: Effect.die("a steer must not interrupt"), close: Effect.void, diff --git a/apps/server/src/fork/claudeUsageExport/claudeUsageExport.test.ts b/apps/server/src/fork/claudeUsageExport/claudeUsageExport.test.ts index c77db8990affd..c99388f6c2b42 100644 --- a/apps/server/src/fork/claudeUsageExport/claudeUsageExport.test.ts +++ b/apps/server/src/fork/claudeUsageExport/claudeUsageExport.test.ts @@ -1,5 +1,6 @@ import * as NodeServices from "@effect/platform-node/NodeServices"; import { describe, expect, it } from "@effect/vitest"; +import * as HostProcess from "@t3tools/shared/HostProcess"; import * as Effect from "effect/Effect"; import * as Queue from "effect/Queue"; import * as TestClock from "effect/testing/TestClock"; @@ -108,7 +109,7 @@ describe("claude usage event export", () => { it.live("keeps the URL and key for the export and out of processes the server starts", () => Effect.gen(function* () { const environment: NodeJS.ProcessEnv = { - PATH: process.env.PATH, + PATH: (yield* HostProcess.Environment).PATH, T3CODE_CLAUDE_USAGE_EXPORT_URL: URL_, T3CODE_CLAUDE_USAGE_EXPORT_KEY: KEY, }; diff --git a/apps/server/src/fork/claudeUsageSource/claudeLoginSource.test.ts b/apps/server/src/fork/claudeUsageSource/claudeLoginSource.test.ts index 735a3710e1dd2..f53a82f43af94 100644 --- a/apps/server/src/fork/claudeUsageSource/claudeLoginSource.test.ts +++ b/apps/server/src/fork/claudeUsageSource/claudeLoginSource.test.ts @@ -53,6 +53,7 @@ const layerTest = ProviderOrchestrationAdapterInfrastructure.layer.pipe( Layer.provideMerge( Layer.mock(SecretResolver.SecretResolver)({ read: (references) => Effect.succeed(references.map(() => undefined)), + label: (provider) => Effect.succeed(provider), }), ), Layer.provideMerge( diff --git a/apps/server/src/fork/generalRoleParity.test.ts b/apps/server/src/fork/generalRoleParity.test.ts index fa604e15660c3..102c98ce3ea53 100644 --- a/apps/server/src/fork/generalRoleParity.test.ts +++ b/apps/server/src/fork/generalRoleParity.test.ts @@ -37,6 +37,7 @@ import { HttpBody, HttpClient, HttpRouter, HttpServer } from "effect/http"; import * as NetAddress from "effect/net/NetAddress"; import type { SDKUserMessage } from "@anthropic-ai/claude-agent-sdk"; +import { AssetSigner } from "../assets/AssetSigner.ts"; import { ServerSecretStore } from "../auth/ServerSecretStore.ts"; import * as ServerConfig from "../config.ts"; import { DeviceService } from "../device/DeviceService.ts"; @@ -118,7 +119,7 @@ interface ProviderFixture { readonly adapter: Effect.Effect< ProviderAdapter.ProviderAdapterV2["Service"], never, - McpProviderSessions.McpProviderSessions + McpProviderSessions.McpProviderSessions | Scope.Scope >; readonly firstRequest: (threadId: ThreadId) => Effect.Effect; }, @@ -225,6 +226,10 @@ const claude: ProviderFixture = { applyFlagSettings: () => Effect.void, setPermissionMode: () => Effect.void, backgroundTasks: () => Effect.succeed(false), + mcpServerStatus: Effect.succeed([]), + readMcpResource: () => Effect.die("unexpected MCP resource read"), + callMcpTool: () => Effect.die("unexpected MCP tool call"), + listPermissionRules: Effect.die("unexpected permission rules read"), stopTask: () => Effect.void, interrupt: Effect.void, close: Effect.void, @@ -633,6 +638,7 @@ it.effect.each( // Serving tools/list only reads registrations, so the handlers' services are never called. const toolHandlerServices = Layer.mergeAll( + Layer.mock(AssetSigner)({}), Layer.mock(DeviceService)({}), Layer.mock(DocumentText)({}), Layer.mock(GitVcsDriver.GitVcsDriver)({}), diff --git a/apps/server/src/fork/idleCompaction/idleCompactionLevels.test.ts b/apps/server/src/fork/idleCompaction/idleCompactionLevels.test.ts index 46e4ebced37bf..c2b48793f2b70 100644 --- a/apps/server/src/fork/idleCompaction/idleCompactionLevels.test.ts +++ b/apps/server/src/fork/idleCompaction/idleCompactionLevels.test.ts @@ -290,7 +290,7 @@ const idleCompactions = (options: { }), Layer.mock(ProjectionStore.ProjectionStoreV2)({ getThread: () => Effect.succeed(data.thread), - getThreadRecords: () => Effect.sync(() => data), + getThreadRecords: () => Effect.succeed(data), }), Layer.mock(LastUserInput.LastUserInput)({ atMs: () => diff --git a/apps/server/src/fork/previewDisplay.ts b/apps/server/src/fork/previewDisplay.ts index 4ffe827aee98b..890b2e2af6736 100644 --- a/apps/server/src/fork/previewDisplay.ts +++ b/apps/server/src/fork/previewDisplay.ts @@ -4,6 +4,7 @@ import * as Exit from "effect/Exit"; import * as FileSystem from "effect/FileSystem"; import * as Option from "effect/Option"; import * as Path from "effect/Path"; +import * as Schema from "effect/Schema"; import * as Scope from "effect/Scope"; import * as Semaphore from "effect/Semaphore"; import * as Stream from "effect/Stream"; @@ -53,9 +54,9 @@ export const keepStartPage = (context: BrowserContext) => { }; export const isStartPage = (page: Page) => startPages.has(page); -class PreviewDisplayError extends Error { - override readonly name = "PreviewDisplayError"; -} +class PreviewDisplayError extends Schema.TaggedError()("PreviewDisplayError", { + message: Schema.String, +}) {} /** * On Linux, each `env` call reads `enabled`. If true, it starts Xvfb when none is running and gives @@ -127,9 +128,9 @@ export const make = Effect.fn("previewDisplay.make")(function* ( ); if (!/^\d+$/.test(display.trim())) { yield* Scope.close(child, Exit.void); - return yield* Effect.fail( - new PreviewDisplayError(`T3's browser display did not start.\n${output}`.trim()), - ); + return yield* new PreviewDisplayError({ + message: `T3's browser display did not start.\n${output}`.trim(), + }); } return { env: { DISPLAY: `:${display.trim()}`, XAUTHORITY: authority }, diff --git a/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts index 5338e75944586..7582e41fa6496 100644 --- a/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts @@ -56,15 +56,9 @@ const flavorOptions = { selfInvocation: undefined as never, makeRuntime: () => Effect.die("not spawned in this test"), withProcess: (_stop, task) => task, -<<<<<<< origin/main - // @effect-diagnostics-next-line effectSucceedWithVoid:off - This optional result requires undefined, not the wider void type. - defaultModel: Effect.succeed(undefined), + defaultModel: Effect.undefined, } satisfies Parameters[0]; const flavor = makeAntigravityAcpAdapterFlavor(flavorOptions); -======= - defaultModel: Effect.undefined, -}); ->>>>>>> upstream/main function permissionRequest( toolCallId: string, diff --git a/apps/server/src/orchestration-v2/Orchestrator.ts b/apps/server/src/orchestration-v2/Orchestrator.ts index 7ddd0f4cf31d4..d925b300f5ae0 100644 --- a/apps/server/src/orchestration-v2/Orchestrator.ts +++ b/apps/server/src/orchestration-v2/Orchestrator.ts @@ -716,16 +716,12 @@ function mayStartSubagentFollowup( if (command.scheduledTaskId !== undefined || command.restartContinuationOfRunId !== undefined) return false; if (command.notification !== undefined) return command.notification.source.kind !== "monitor"; -<<<<<<< origin/main if (command.delegatedCompletion !== undefined) return true; - return command.createdBy === "user" || command.creationSource === "mcp"; -======= return ( command.createdBy === "user" || command.creationSource === "mcp" || command.usageLimitContinuationOfRunId !== undefined ); ->>>>>>> upstream/main } /** Waiting runs only drain post-terminal output; their agent turn is over and still needs a wake. */ diff --git a/apps/server/src/ws.ts b/apps/server/src/ws.ts index 31f9a1230baa4..8a652e4e927b9 100644 --- a/apps/server/src/ws.ts +++ b/apps/server/src/ws.ts @@ -3622,11 +3622,10 @@ export const layer = Layer.unwrap( return yield* Effect.acquireUseRelease( sessions.markConnected(session.sessionId), () => -<<<<<<< origin/main EnvironmentAuth.isUnsafeNoAuthSession(session.sessionId) - ? rpcWebSocketHttpEffect + ? framedRpcWebSocketHttpEffect : Effect.raceFirst( - rpcWebSocketHttpEffect, + framedRpcWebSocketHttpEffect, sessions.awaitInvalidation(session.sessionId, session.proofKeyThumbprint).pipe( Effect.as(HttpServerResponse.empty()), Effect.catchTags({ @@ -3635,18 +3634,6 @@ export const layer = Layer.unwrap( }), ), ), -======= - Effect.raceFirst( - framedRpcWebSocketHttpEffect, - sessions.awaitInvalidation(session.sessionId, session.proofKeyThumbprint).pipe( - Effect.as(HttpServerResponse.empty()), - Effect.catchTags({ - SessionCredentialVerificationError: (error) => - failEnvironmentInternal("internal_error", error), - }), - ), - ), ->>>>>>> upstream/main () => sessions.markDisconnected(session.sessionId), ); }).pipe( diff --git a/apps/web/src/fork/pdfWorker.ts b/apps/web/src/fork/pdfWorker.ts index 06e426a36ad39..1944b18e99161 100644 --- a/apps/web/src/fork/pdfWorker.ts +++ b/apps/web/src/fork/pdfWorker.ts @@ -13,17 +13,16 @@ export function getDocumentOnSharedWorker(params: Parameters worker ??= new PDFWorker(); open++; const task = getDocument({ ...params, worker }); + const destroy = task.destroy.bind(task); let closed = false; - return { - promise: task.promise, - destroy() { - if (!closed && --open === 0) - idle = setTimeout(() => { - worker?.destroy(); - worker = null; - }, IDLE_MS); - closed = true; - return task.destroy(); - }, + task.destroy = () => { + if (!closed && --open === 0) + idle = setTimeout(() => { + worker?.destroy(); + worker = null; + }, IDLE_MS); + closed = true; + return destroy(); }; + return task; } diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.ts index 0ba76be588b58..c484c5bb51de1 100644 --- a/packages/contracts/src/settings.ts +++ b/packages/contracts/src/settings.ts @@ -1256,7 +1256,6 @@ export const ServerSettings = Schema.Struct({ ), enableAgentBrowserAccess: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))), -<<<<<<< origin/main /** * Fork: "native" runs chrome-headless-shell. On Linux and Windows, "xvfb" runs full Chrome for * Testing. On Linux with Xvfb, Chrome opens a window on a private Xvfb display. On macOS "xvfb" @@ -1264,7 +1263,7 @@ export const ServerSettings = Schema.Struct({ */ previewBrowserMode: PreviewBrowserMode.pipe( Schema.withDecodingDefault(Effect.succeed("native" as const)), -======= + ), speechModelId: Schema.String.pipe( Schema.withDecodingDefault(Effect.succeed("handy-computer/parakeet-unified-en-0.6b-gguf")), ), @@ -1277,7 +1276,6 @@ export const ServerSettings = Schema.Struct({ // Null follows textGenerationModelSelection; a selection pins transcript cleanup to its own model. speechPostProcessingModelSelection: Schema.NullOr(ModelSelection).pipe( Schema.withDecodingDefault(Effect.succeed(null)), ->>>>>>> upstream/main ), projectAgentBrowserAccessOverrides: Schema.Record(ProjectId, Schema.Boolean).pipe( Schema.withDecodingDefault(Effect.succeed({})), @@ -1686,15 +1684,12 @@ export const ServerSettingsPatch = Schema.Struct({ enableProviderUpdateChecks: Schema.optionalKey(Schema.Boolean), continueThreadsAfterServerUpdate: Schema.optionalKey(Schema.Boolean), enableAgentBrowserAccess: Schema.optionalKey(Schema.Boolean), -<<<<<<< origin/main previewBrowserMode: Schema.optionalKey(PreviewBrowserMode), -======= speechModelId: Schema.optionalKey(Schema.String), speechAcceleration: Schema.optionalKey(SpeechAcceleration), speechModelUnloadTimeout: Schema.optionalKey(SpeechModelUnloadTimeout), speechProjectCustomWords: Schema.optionalKey(SpeechCustomWords), speechPostProcessingModelSelection: Schema.optionalKey(Schema.NullOr(ModelSelection)), ->>>>>>> upstream/main projectAgentBrowserAccessOverrides: Schema.optionalKey( Schema.Record(ProjectId, Schema.NullOr(Schema.Boolean)), ), diff --git a/packages/provider-acp/src/server/adapter.ts b/packages/provider-acp/src/server/adapter.ts index 42fb550f9f286..dbd2b65d13e48 100644 --- a/packages/provider-acp/src/server/adapter.ts +++ b/packages/provider-acp/src/server/adapter.ts @@ -6856,11 +6856,8 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* ( const mcpContext = yield* readMcpContext(threadId); runtimeMcpBridge = yield* makeRuntimeMcpBridge(mcpContext, runtimeScope); const runtimeGeneration = yield* Ref.get(runtimeCallbackGeneration); -<<<<<<< origin/main runtimeAccount = yield* readAccount; -======= openAgentRequests = new Set(); ->>>>>>> upstream/main runtime = yield* flavor .makeRuntime( makeRuntimeInput(runtimeGeneration, openAgentRequests, mcpContext, resumeSessionId), @@ -7005,11 +7002,8 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* ( runtime = replacementExit.value.replacementRuntime; runtimeScope = replacementScope; runtimeMcpBridge = replacementMcpBridge; -<<<<<<< origin/main runtimeAccount = replacementExit.value.replacementAccount; -======= openAgentRequests = replacementAgentRequests; ->>>>>>> upstream/main yield* Ref.set(runtimeCallbackGeneration, replacementGeneration); prepareTerminalEnvironment( yield* readMcpContext(threadId),