diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b718b894b9b4..57b98d0f1904e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -365,17 +365,12 @@ jobs: name: Test Web ${{ matrix.shard }} needs: changes if: ${{ !cancelled() && needs.changes.outputs.test_web != 'false' }} -<<<<<<< origin/main runs-on: ubuntu-24.04 timeout-minutes: 20 -======= - runs-on: blacksmith-8vcpu-ubuntu-2404 - timeout-minutes: 10 strategy: fail-fast: false matrix: shard: [1, 2] ->>>>>>> upstream/main steps: - name: Checkout uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0 diff --git a/README.md b/README.md index 03f8cb7c28227..d072a6c345d3e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -<<<<<<< origin/main # About this fork This is a fork of T3 Code that integrates a few additional features, including: @@ -21,14 +20,11 @@ This is a fork of T3 Code that integrates a few additional features, including: The following is the README from upstream. -# T3 Code -=======

T3 Code logo

->>>>>>> upstream/main

T3 Code

diff --git a/apps/server/integration/transferBudgetV2.integration.test.ts b/apps/server/integration/transferBudgetV2.integration.test.ts index 4aaac3b9e30e9..2eefe8c29cd1a 100644 --- a/apps/server/integration/transferBudgetV2.integration.test.ts +++ b/apps/server/integration/transferBudgetV2.integration.test.ts @@ -102,7 +102,9 @@ const CLIENT_BOUNDED_OPT_INS = { dedupeBodies: "1", compactIds: "1", deferWork: "1", -} satisfies Required; +} satisfies Required< + Omit +>; const CLIENT_HISTORY_OPT_INS = { compactIds: "1", deferWork: "1" } satisfies Required< Omit >; @@ -117,7 +119,9 @@ const CLIENT_THREAD_SUBSCRIPTION = { acceptCompactTurnItems: true, acceptCompactIds: true, acceptDedupedBodies: true, -} satisfies Required>; +} satisfies Required< + Omit +>; type ShellResumeField = "afterSequence" | "httpSnapshotFallback" | "knownProjectIdentities"; const CLIENT_SHELL_SUBSCRIPTION = { requestCompletionMarker: true, diff --git a/apps/server/src/fork/antigravityCliRuntime/antigravityCliRuntime.test.ts b/apps/server/src/fork/antigravityCliRuntime/antigravityCliRuntime.test.ts index 353774dce94ea..768216370e920 100644 --- a/apps/server/src/fork/antigravityCliRuntime/antigravityCliRuntime.test.ts +++ b/apps/server/src/fork/antigravityCliRuntime/antigravityCliRuntime.test.ts @@ -43,6 +43,13 @@ import { makeAntigravityAdapterV2, } from "../../orchestration-v2/Adapters/AntigravityAdapterV2.ts"; import { antigravitySessionMeta } from "../../provider/acp/AntigravityAcpSupport.ts"; +import { + antigravityRuntimeState, + type AntigravityRuntimeState, + profileAntigravityRuntimeState, + withAntigravityCliCompaction, + withUserAgyState, +} from "./antigravityCliRuntime.ts"; import { makeAntigravityUsageProbe } from "../../provider/antigravityUsageLimits.ts"; import { type AntigravityTextGenerationOptions, @@ -76,14 +83,6 @@ const cliRuntimeState = (path: Path.Path, userHome: string) => tokenFile: "antigravity-oauth-token", }); -const managedRuntimeState = (profileDirectory: string) => - Effect.succeed({ - runtime: "managed" as const, - root: profileDirectory, - appFolder: "antigravity-acp", - tokenFile: "acp_token.json", - }); - const ERROR_MESSAGE = 17; // An error step trimmed from `agy acp` 1.5.5: length-prefixed fields, so a length byte leads the status. const CLI_API_ERROR = Buffer.concat([ @@ -256,13 +255,48 @@ const cliHelperTurn = Effect.fn("cliHelperTurn")(function* ( }); describe("Antigravity CLI runtime", () => { + it.effect("runs a user's own agy on its own state and a managed release on the profile", () => + Effect.gen(function* () { + const path = yield* Path.Path; + const input = { profileDirectory: "/profile", userHome: "/home/user", path }; + const profileArgs = ["acp", "--gemini-dir", "/profile", "--app-data-dir", "antigravity-acp"]; + const spawn = { command: "agy", args: profileArgs, cwd: "/project" }; + for (const [found, managedVersionDirectory, runtime, args] of [ + ["the user's own", null, "cli", ["acp"]], + ["a managed release", "/managed/versions/release", "managed", profileArgs], + ] as const) { + const executable = { harnessPath: null, managedVersionDirectory }; + assert.equal(antigravityRuntimeState(executable, input).runtime, runtime, found); + assert.deepEqual(withUserAgyState(executable, spawn).args, args, found); + } + const harness = { harnessPath: "/release/harness", managedVersionDirectory: null }; + assert.equal(antigravityRuntimeState(harness, input).runtime, "harness"); + assert.deepEqual(withUserAgyState(harness, spawn).args, profileArgs); + }).pipe(Effect.provide(NodeServices.layer)), + ); + + it.effect("offers /compact on every agy and not on the harness runtime", () => + Effect.gen(function* () { + const session = { compactThread: () => Effect.void }; + for (const [runtime, offered] of [ + ["cli", true], + ["managed", true], + ["harness", false], + ] as const) { + const open = withAntigravityCliCompaction(() => Effect.succeed(session), { + profileDirectory: "profile", + runtimeState: Effect.succeed({ ...profileAntigravityRuntimeState("profile"), runtime }), + }); + assert.equal("compactThread" in (yield* open(undefined)), offered, runtime); + } + }), + ); + it.effect("opens CLI sessions without additional directories", () => Effect.gen(function* () { const path = yield* Path.Path; const attachmentsDir = path.join("state", "attachments"); - const sent = ( - runtimeState: ReturnType, - ) => + const sent = (runtimeState: Effect.Effect) => Effect.gen(function* () { let directories: RuntimeInput["additionalDirectories"]; const options = { @@ -281,8 +315,12 @@ describe("Antigravity CLI runtime", () => { return directories ?? []; }); - assert.deepEqual(yield* sent(managedRuntimeState("profile")), [attachmentsDir]); + assert.deepEqual(yield* sent(Effect.succeed(profileAntigravityRuntimeState("profile"))), [ + attachmentsDir, + ]); assert.deepEqual(yield* sent(cliRuntimeState(path, "home")), []); + const managedAgy = Effect.succeed(profileAntigravityRuntimeState("profile", "managed")); + assert.deepEqual(yield* sent(managedAgy), [], "T3's managed agy"); }).pipe(Effect.scoped, Effect.provide(layer)), ); diff --git a/apps/server/src/fork/antigravityCliRuntime/antigravityCliRuntime.ts b/apps/server/src/fork/antigravityCliRuntime/antigravityCliRuntime.ts index 8681608683f81..d49bb029f9344 100644 --- a/apps/server/src/fork/antigravityCliRuntime/antigravityCliRuntime.ts +++ b/apps/server/src/fork/antigravityCliRuntime/antigravityCliRuntime.ts @@ -10,67 +10,95 @@ import * as Option from "effect/Option"; import * as Path from "effect/Path"; import * as Schema from "effect/Schema"; import * as SqlClient from "effect/sql/SqlClient"; -import type * as EffectAcpSchema from "effect-acp/compat"; +import type * as AcpSessionRuntime from "@t3tools/provider-acp/server/AcpSessionRuntime"; import { removeAntigravitySessionFiles } from "../../provider/acp/AntigravitySessionFiles.ts"; +import type { AntigravityExecutable } from "../../provider/AntigravityInstallation.ts"; /** - * Where a runtime keeps its sessions and its login. The managed runtime uses the profile T3 - * gives it as GEMINI_HOME. The agy CLI ignores GEMINI_HOME and uses the user's own folder. + * Which runtime runs and where it keeps its sessions and its login. `harness` is the older 1.4.5 + * runtime and `managed` is T3's own `agy`; both use the profile T3 gives them. `cli` is a user's own + * `agy`, which uses the user's folder. */ export interface AntigravityRuntimeState { - readonly runtime: "managed" | "cli"; + readonly runtime: "harness" | "managed" | "cli"; readonly root: string; readonly appFolder: string; readonly tokenFile: string; } -export const managedAntigravityRuntimeState = ( +export const profileAntigravityRuntimeState = ( profileDirectory: string, + runtime: "harness" | "managed" = "harness", ): AntigravityRuntimeState => ({ - runtime: "managed", + runtime, root: profileDirectory, appFolder: "antigravity-acp", tokenFile: "acp_token.json", }); +/** An `agy` outside T3's managed releases; a managed release keeps its state in the profile. */ +const isUserAgy = ( + executable: Pick, +) => executable.harnessPath === null && executable.managedVersionDirectory === null; + export function antigravityRuntimeState( - executable: { readonly harnessPath: string | null }, + executable: Pick, input: { readonly profileDirectory: string; readonly userHome: string; readonly path: Path.Path; }, ): AntigravityRuntimeState { - return executable.harnessPath === null + return isUserAgy(executable) ? { runtime: "cli", root: input.path.join(input.userHome, ".gemini"), appFolder: "antigravity-cli", tokenFile: "antigravity-oauth-token", } - : managedAntigravityRuntimeState(input.profileDirectory); + : profileAntigravityRuntimeState( + input.profileDirectory, + executable.harnessPath === null ? "managed" : "harness", + ); } +const PROFILE_FLAGS = new Set(["--gemini-dir", "--app-data-dir"]); + +/** Upstream points every `agy` at T3's profile; the user's own `agy` keeps its own login and state. */ +export const withUserAgyState = ( + executable: Pick, + spawn: AcpSessionRuntime.AcpSpawnInput, +): AcpSessionRuntime.AcpSpawnInput => + isUserAgy(executable) + ? { + ...spawn, + args: spawn.args.filter( + (arg, index) => + !PROFILE_FLAGS.has(arg) && !PROFILE_FLAGS.has(spawn.args[index - 1] ?? ""), + ), + } + : spawn; + /** The state a caller was given, or the managed profile's when it was given none. */ export const antigravityRuntimeStateOf = (options: { readonly profileDirectory: string; readonly runtimeState?: Effect.Effect | undefined; }) => - options.runtimeState ?? Effect.succeed(managedAntigravityRuntimeState(options.profileDirectory)); + options.runtimeState ?? Effect.succeed(profileAntigravityRuntimeState(options.profileDirectory)); export const antigravityTokenPath = (state: AntigravityRuntimeState, path: Path.Path) => path.join(state.root, state.appFolder, state.tokenFile); -/** The CLI runs shell commands in an additional directory instead of the session's cwd. */ +/** `agy` runs shell commands in an additional directory instead of the session's cwd. */ export const antigravitySessionDirectories = ( state: AntigravityRuntimeState, attachmentsDir: string, -): ReadonlyArray => (state.runtime === "cli" ? [] : [attachmentsDir]); +): ReadonlyArray => (state.runtime === "harness" ? [attachmentsDir] : []); /** - * `agy acp` runs a `/compact` prompt as its own command. The managed runtime reads it as chat, - * so its sessions offer no compaction. The runtime is read as each session opens. + * `agy acp` runs a `/compact` prompt as its own command. The older harness runtime reads it as + * chat, so its sessions offer no compaction. The runtime is read as each session opens. */ export const withAntigravityCliCompaction = ( @@ -79,9 +107,9 @@ export const withAntigravityCliCompaction = ) => (input: Input): Effect.Effect => Effect.zipWith(openSession(input), antigravityRuntimeStateOf(options), (session, state) => { - if (state.runtime === "cli") return session; - const { compactThread: _, ...managed } = session; - return managed as Session; + if (state.runtime !== "harness") return session; + const { compactThread: _, ...harness } = session; + return harness as Session; }); const CLI_T3_MCP_TOOL_NAME = /^mcp_t3-code_[A-Za-z0-9_]+$/; @@ -135,16 +163,6 @@ export function antigravityCliApiError(text: string) { return match === null ? null : ([match[0], match[2], match[3], match[1]] as const); } -const advertisesSystemPromptAppend = Schema.is( - Schema.Struct({ - antigravity: Schema.Struct({ systemPrompt: Schema.Struct({ append: Schema.Literal(true) }) }), - }), -); - -export const antigravityAdvertisesSystemPromptAppend = ( - initializeResult: EffectAcpSchema.InitializeResponse, -) => advertisesSystemPromptAppend(initializeResult.agentCapabilities?._meta); - const CliLogin = Schema.Struct({ token: Schema.Struct({ access_token: Schema.NonEmptyString, @@ -160,7 +178,7 @@ interface AntigravityAccess { } /** - * Undefined for the managed runtime. The CLI's login holds no OAuth client, so T3 cannot + * Undefined unless the runtime is a user's own `agy`. The CLI's login holds no OAuth client, so T3 cannot * refresh it. The access token the CLI last saved stands in for a refresh until it expires. */ export const readAntigravityCliUsageLogin = Effect.fn("readAntigravityCliUsageLogin")(function* ( @@ -276,7 +294,7 @@ export const removeAntigravityRuntimeSessionFiles = Effect.fn( }) { const state = yield* input.runtimeState; const { sessionId, cwd } = input; - if (state.runtime === "managed") { + if (state.runtime !== "cli") { return yield* removeAntigravitySessionFiles({ profileDirectory: state.root, sessionId, cwd }); } if (sessionId === undefined || !isNativeSessionId(sessionId)) return; diff --git a/apps/server/src/fork/claudeSteerQueue.test.ts b/apps/server/src/fork/claudeSteerQueue.test.ts index d85134a3dd378..a6455ebac53b7 100644 --- a/apps/server/src/fork/claudeSteerQueue.test.ts +++ b/apps/server/src/fork/claudeSteerQueue.test.ts @@ -123,6 +123,7 @@ const startSteeredTurn = Effect.gen(function* () { }), forkSession: () => Effect.die("unused"), subagentLaunchToolUseId: () => Effect.succeed(null), + subagentModel: () => Effect.succeed(null), assertComplete: Effect.void, }, }); diff --git a/apps/server/src/fork/claudeSteerQueue.ts b/apps/server/src/fork/claudeSteerQueue.ts deleted file mode 100644 index 64ce0f99a11dd..0000000000000 --- a/apps/server/src/fork/claudeSteerQueue.ts +++ /dev/null @@ -1,28 +0,0 @@ -import type { SDKResultMessage } from "@anthropic-ai/claude-agent-sdk"; - -// A steer goes to Claude Code with no priority, so it waits in Claude's queue like text typed -// into Claude's own terminal. Claude reads it at the next tool result, or runs it as its own turn -// once the current one ends. A result keeps the T3 turn open only if the turn is not interrupted, -// the result has a non-empty uuid list, and a steer sent this turn is in no result's list yet. -const pendingSteerUuids = new WeakMap>(); - -/** Records a steer sent to `turn`; the returned function forgets it, for a send that failed. */ -export function trackClaudeSteer(turn: object, uuid: string): () => void { - const pending = pendingSteerUuids.get(turn) ?? new Set(); - pendingSteerUuids.set(turn, pending.add(uuid)); - return () => { - pending.delete(uuid); - }; -} - -/** - * Whether a steer sent to `turn` is still queued after `result`. False when `result` has no - * `user_message_uuids` or an empty list, so the turn settles on that result. - */ -export function isClaudeSteerQueuedPastResult(turn: object, result: SDKResultMessage): boolean { - const pending = pendingSteerUuids.get(turn); - const answered = result.user_message_uuids; - if (pending === undefined || answered === undefined || answered.length === 0) return false; - for (const uuid of answered) pending.delete(uuid); - return pending.size > 0; -} diff --git a/apps/server/src/fork/claudeUsageSource/claudeHub.test.ts b/apps/server/src/fork/claudeUsageSource/claudeHub.test.ts index 045a71e70b0e9..36cab501d8456 100644 --- a/apps/server/src/fork/claudeUsageSource/claudeHub.test.ts +++ b/apps/server/src/fork/claudeUsageSource/claudeHub.test.ts @@ -9,6 +9,7 @@ import * as TestClock from "effect/testing/TestClock"; import { HttpClient, HttpClientError, HttpClientResponse } from "effect/http"; import { makeCliproxyApi } from "../../usage/cliproxyApi.ts"; +import { managementTimeout } from "./claudeHub.ts"; const config = { kind: "cliproxy", @@ -110,6 +111,15 @@ describe("Claude through a CLIProxyAPI hub", () => { availableCount: 3, nextCreditId: "grant_a", nextExpiresAt: "2099-01-01T00:00:00.000Z", + options: [ + { + availableCount: 3, + creditId: "grant_a", + description: "Refills your 5-hour and weekly limits.", + expiresAt: "2099-01-01T00:00:00.000Z", + label: "Full reset", + }, + ], }); expect(test.requests.find((request) => request.body?.url)?.body?.url).toBe( "https://api.anthropic.com/api/oauth/usage?cedar_ember=1", @@ -273,6 +283,8 @@ describe("Claude through a CLIProxyAPI hub", () => { yield* TestClock.adjust("29 seconds"); expect((yield* Fiber.join(redeem)).outcome).toBe("reset"); } + const postedRead = { auth_index: "a", url: "https://example.com/quota", data: "{}" }; + expect(managementTimeout(postedRead)).toBe("15 seconds"); }), ); diff --git a/apps/server/src/fork/claudeUsageSource/claudeHub.ts b/apps/server/src/fork/claudeUsageSource/claudeHub.ts index 7ca72f77db5a2..918fc67f5494a 100644 --- a/apps/server/src/fork/claudeUsageSource/claudeHub.ts +++ b/apps/server/src/fork/claudeUsageSource/claudeHub.ts @@ -76,9 +76,39 @@ const isUsageLimitSourceError = Schema.is(UsageLimitSourceError); const CLAUDE_API = "https://api.anthropic.com/api"; export const CLAUDE_USAGE_URL = `${CLAUDE_API}/oauth/usage?cedar_ember=1`; +const REDEEM_URL = /\/(?:consume|reset_rate_limits)$/; + /** A redeem waits on the hub's own call to the provider, which can take longer than a read. */ export const managementTimeout = (body: unknown) => - typeof body === "object" && body !== null && "data" in body ? "30 seconds" : "15 seconds"; + typeof body === "object" && + body !== null && + "url" in body && + typeof body.url === "string" && + REDEEM_URL.test(body.url) + ? "30 seconds" + : "15 seconds"; + +const resetCredits = Effect.fn("ClaudeHub.resetCredits")(function* ( + usage: typeof ClaudeUsage.Type, +) { + return claudeResetCreditsToContract( + usage.cedar_ember, + DateTime.toEpochMillis(yield* DateTime.now), + ); +}); + +/** Adds reset credits and the reading's time from a usage answer to a hub account read from it. */ +export const withClaudeUsageAnswer = Effect.fn("ClaudeHub.withUsageAnswer")(function* < + A extends { readonly usageLimits: ServerProviderUsageLimits }, +>(body: string, account: A) { + const credits = yield* resetCredits(yield* decodeClaudeUsage(body)); + return withAccountReadAt( + body, + credits + ? { ...account, usageLimits: { ...account.usageLimits, resetCredits: credits } } + : account, + ); +}); /** Claude reads and reset claims through a CLIProxyAPI hub's management API. */ export const makeClaudeHub = Effect.fn("makeClaudeHub")(function* ( @@ -113,28 +143,6 @@ export const makeClaudeHub = Effect.fn("makeClaudeHub")(function* (body: string, account: A) { - const credits = yield* resetCredits(yield* decodeClaudeUsage(body)); - return withAccountReadAt( - body, - credits - ? { ...account, usageLimits: { ...account.usageLimits, resetCredits: credits } } - : account, - ); - }); - /** Usage in the Claude SDK's get_usage shape, plus reset credits. */ const usage = Effect.fn("ClaudeHub.usage")( function* (hub: CliproxyHub, account: HubAccount) { @@ -302,5 +310,5 @@ export const makeClaudeHub = Effect.fn("makeClaudeHub")(function* Layer.provideMerge(settingsFor(threadId)), Layer.provideMerge(ServerConfig.layerTest(process.cwd(), { prefix })), Layer.provideMerge(McpProviderSessions.layer), + Layer.provideMerge(ProviderInstallationGate.layer), Layer.provideMerge( Layer.succeed( ProviderEventLoggers.ProviderEventLoggers, @@ -169,6 +171,7 @@ const startClaudeTurn = Effect.fn("startClaudeTurn")(function* ( }), forkSession: () => Effect.die("unused"), subagentLaunchToolUseId: () => Effect.succeed(null), + subagentModel: () => Effect.succeed(null), assertComplete: Effect.void, }), ); @@ -290,11 +293,20 @@ const codexTurnStart = (input: { readonly text: string; readonly additionalContext?: Record; }) => [ + ...codexRequest( + input.id, + "config/read", + { cwd: "/workspace", includeLayers: false }, + { + config: {}, + origins: {}, + }, + ), { type: "expect_outbound" as const, label: "turn/start", frame: { - id: input.id, + id: input.id + 1, method: "turn/start", params: { threadId: input.nativeThreadId, @@ -307,14 +319,14 @@ const codexTurnStart = (input: { approvalPolicy: "never", approvalsReviewer: "user", sandboxPolicy: { type: "dangerFullAccess" }, - summary: "detailed", + summary: "auto", collaborationMode: { mode: "default", settings: { model: "gpt-5.4" } }, }, }, }, { type: "emit_inbound" as const, - frame: { id: input.id, result: { turn: codexTurn(input.nativeTurnId, "inProgress") } }, + frame: { id: input.id + 1, result: { turn: codexTurn(input.nativeTurnId, "inProgress") } }, }, codexNotification("turn/started", { threadId: input.nativeThreadId, @@ -322,17 +334,19 @@ const codexTurnStart = (input: { }), ]; -/** Codex's compaction, then the note that T3 adds again after it, and nothing else. */ +/** Codex's compaction, the turn's end, then the note that T3 adds again after it, and nothing else. */ const codexCompaction = (input: { readonly id: number; readonly nativeThreadId: string; readonly nativeTurnId: string; + readonly turnEnd: ReadonlyArray; }) => [ codexNotification("item/completed", { threadId: input.nativeThreadId, turnId: input.nativeTurnId, item: { type: "contextCompaction", id: "compaction-note-item" }, }), + ...input.turnEnd, ...codexRequest( input.id, "thread/inject_items", @@ -529,10 +543,16 @@ it.live( waitForTerminal: true, transcript: codexTranscript(nativeThreadId, [ ...codexTurnStart({ id: 3, nativeThreadId, nativeTurnId, text: "work" }), - ...codexCompaction({ id: 4, nativeThreadId, nativeTurnId }), - codexNotification("turn/completed", { - threadId: nativeThreadId, - turn: codexTurn(nativeTurnId, "completed"), + ...codexCompaction({ + id: 5, + nativeThreadId, + nativeTurnId, + turnEnd: [ + codexNotification("turn/completed", { + threadId: nativeThreadId, + turn: codexTurn(nativeTurnId, "completed"), + }), + ], }), ]), }); @@ -583,20 +603,26 @@ it.live( }, }), ...codexRequest( - 6, + 7, "thread/goal/set", { threadId: nativeThreadId, status: "active" }, { goal: codexGoal(nativeThreadId, "active") }, ), - ...codexCompaction({ id: 7, nativeThreadId, nativeTurnId }), - codexNotification("thread/goal/updated", { - threadId: nativeThreadId, - turnId: nativeTurnId, - goal: codexGoal(nativeThreadId, "complete"), - }), - codexNotification("turn/completed", { - threadId: nativeThreadId, - turn: codexTurn(nativeTurnId, "completed"), + ...codexCompaction({ + id: 8, + nativeThreadId, + nativeTurnId, + turnEnd: [ + codexNotification("thread/goal/updated", { + threadId: nativeThreadId, + turnId: nativeTurnId, + goal: codexGoal(nativeThreadId, "complete"), + }), + codexNotification("turn/completed", { + threadId: nativeThreadId, + turn: codexTurn(nativeTurnId, "completed"), + }), + ], }), ]), }); diff --git a/apps/server/src/fork/displayModeWrap/DisplayModeWrap.test.ts b/apps/server/src/fork/displayModeWrap/DisplayModeWrap.test.ts index 18ac4563c6269..592fcd132de64 100644 --- a/apps/server/src/fork/displayModeWrap/DisplayModeWrap.test.ts +++ b/apps/server/src/fork/displayModeWrap/DisplayModeWrap.test.ts @@ -31,6 +31,7 @@ import * as Effect from "effect/Effect"; import * as Layer from "effect/Layer"; import * as SqlClient from "effect/sql/SqlClient"; +import * as EventSink from "../../orchestration-v2/EventSink.ts"; import * as ProjectionStore from "../../orchestration-v2/ProjectionStore.ts"; import * as ProviderSessionManager from "../../orchestration-v2/ProviderSessionManager.ts"; import * as ProjectStore from "../../orchestration-v2/ProjectStore.ts"; @@ -290,6 +291,8 @@ const seedSource = Effect.fn("seedSource")(function* (now: DateTime.Utc) { const steered: string[] = []; let refuseSteer = false; +// Steering never reads the event stream. +const eventSink = Layer.mock(EventSink.EventSinkV2)({}); const sessions = Layer.mock(ProviderSessionManager.ProviderSessionManagerV2)({ get: () => Effect.succeedSome({ @@ -461,7 +464,7 @@ it.effect("wraps a steering message sent after the agent's hidden tool work", () Layer.merge( store, ProviderTurnControlService.layer.pipe( - Layer.provide(Layer.mergeAll(store, sessions, wrapper)), + Layer.provide(Layer.mergeAll(store, sessions, wrapper, eventSink)), ), ), ), @@ -496,7 +499,7 @@ it.effect("leaves the note owed after a slash command sent as a steer", () => store, wrapper, ProviderTurnControlService.layer.pipe( - Layer.provide(Layer.mergeAll(store, sessions, wrapper)), + Layer.provide(Layer.mergeAll(store, sessions, wrapper, eventSink)), ), ), ), diff --git a/apps/server/src/fork/generalRoleParity.test.ts b/apps/server/src/fork/generalRoleParity.test.ts index 09eeb45edea5c..5a8e2596a9b77 100644 --- a/apps/server/src/fork/generalRoleParity.test.ts +++ b/apps/server/src/fork/generalRoleParity.test.ts @@ -78,6 +78,7 @@ import { mapCodexModelCapabilities } from "../provider/CodexProvider.ts"; import { DocumentText } from "../provider/DocumentText.ts"; import * as ProviderRegistry from "../provider/ProviderRegistry.ts"; import { PullRequestReviewGuideService } from "../pullRequest/PullRequestReviewGuideService.ts"; +import { PullRequestService } from "../pullRequest/PullRequestService.ts"; import * as ScheduledTaskService from "../scheduledTasks/ScheduledTaskService.ts"; import * as SecretRequests from "../secrets/SecretRequests.ts"; import * as ServerSettings from "../serverSettings.ts"; @@ -239,6 +240,7 @@ const claude: ProviderFixture = { ), forkSession: () => Effect.die("unused"), subagentLaunchToolUseId: () => Effect.succeed(null), + subagentModel: () => Effect.succeed(null), assertComplete: Effect.void, }, }); @@ -665,6 +667,7 @@ const toolHandlerServices = Layer.mergeAll( Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({}), Layer.mock(ProviderRegistry.ProviderRegistry)({}), Layer.mock(PullRequestReviewGuideService)({}), + Layer.mock(PullRequestService)({}), Layer.mock(RemoteDelegation.RemoteDelegation)({}), Layer.mock(ScheduledTaskService.ScheduledTaskService)({}), Layer.mock(SecretRequests.SecretRequests)({}), diff --git a/apps/server/src/fork/subThreads/SubThreads.test.ts b/apps/server/src/fork/subThreads/SubThreads.test.ts index 2a6513627baac..88f82b4cb88fa 100644 --- a/apps/server/src/fork/subThreads/SubThreads.test.ts +++ b/apps/server/src/fork/subThreads/SubThreads.test.ts @@ -56,6 +56,7 @@ const layerFor = (calls: Queue.Queue) => Effect.succeedSome({ projectId, title: "Project", + hasCustomTitle: false, workspaceRoot: "/repo", defaultModelSelection: null, defaultThreadEnvMode: null, diff --git a/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts index 01d6c92a8684b..f3cf07eacc4dc 100644 --- a/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts @@ -4594,7 +4594,6 @@ describe("AcpAdapterV2", () => { ); assert.equal(runtimeOrdinalSeen, 2); assert.lengthOf(runtimeInputs, 2); -<<<<<<< origin/main assert.isFalse(yield* accountChanged!, "restarted process read the new account"); account = Option.some("account-c"); @@ -4609,10 +4608,7 @@ describe("AcpAdapterV2", () => { assert.isFalse(yield* accountChanged!, "replacement process read the new account"); account = Option.none(); assert.isFalse(yield* accountChanged!, "unreadable"); - }).pipe(Effect.provide(layerTest), Effect.scoped), -======= }).pipe(Effect.provide(layerTest)), ->>>>>>> upstream/main ); it.effect("fails a prompt its agent leaves silent past the inactivity timeout", () => diff --git a/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts index 3dd2183b0e286..f53f3435262ff 100644 --- a/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts @@ -177,7 +177,7 @@ describe("AntigravityAdapterV2 flavor", () => { assert.notDeepEqual(second, first, "another login"); yield* fileSystem.writeFileString(tokenPath, "{"); assert.isTrue(Option.isNone(yield* readAccount!), "malformed"); - }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))), + }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))), ); }); @@ -192,47 +192,6 @@ const layerSession = Layer.mergeAll( ); describe("AntigravityAdapterV2 compaction", () => { -<<<<<<< origin/main - it.effect("does not expose unsupported manual compaction on the provider session", () => - Effect.gen(function* () { - const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner; - const path = yield* Path.Path; - const crypto = yield* SecureRandom.SecureRandom; - const mockAgentPath = yield* path.fromFileUrl( - new URL("../../../scripts/acp-mock-agent.ts", import.meta.url), - ); - const instanceId = ProviderInstanceId.make("antigravity-compaction-test"); - const adapter = yield* makeAntigravityAdapterV2({ - instanceId, - profileDirectory: unusedProfileDirectory, - selfInvocation: yield* resolveSelfInvocation(), - makeRuntime: (input) => - makeAntigravityAcpRuntime({ - ...input, - childProcessSpawner, - spawn: { - command: process.execPath, - args: [mockAgentPath], - cwd: input.cwd, - env: { T3_ACP_ANTIGRAVITY: "1" }, - }, - }).pipe(Effect.provideService(SecureRandom.SecureRandom, crypto)), - withProcess: (_stop, task) => task, - defaultModel: Effect.undefined, - }); - const session = yield* adapter.openSession({ - threadId: ThreadId.make("thread-antigravity-compaction"), - providerSessionId: ProviderSessionId.make("provider-session-antigravity-compaction"), - modelSelection: { instanceId, model: "gemini-test-low" }, - runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({ - runtimeMode: "full-access", - interactionMode: "default", - cwd: process.cwd(), - }), - }); - assert.isUndefined(session.compactThread); - }).pipe(Effect.provide(layerSession), Effect.scoped), -======= it.live.each([false, true])( "negotiates native goals (%s) without enabling manual compaction", (nativeGoals) => @@ -249,6 +208,7 @@ describe("AntigravityAdapterV2 compaction", () => { const consumeStartupCommands = yield* Deferred.make(); const adapter = yield* makeAntigravityAdapterV2({ instanceId, + profileDirectory: unusedProfileDirectory, selfInvocation: yield* resolveSelfInvocation(), makeRuntime: (input) => makeAntigravityAcpRuntime({ @@ -300,7 +260,6 @@ describe("AntigravityAdapterV2 compaction", () => { assert.equal(session.providerSession.capabilities.turns.supportsNativeGoals, nativeGoals); assert.equal((yield* adapter.getCapabilities()).turns.supportsNativeGoals, nativeGoals); }).pipe(Effect.provide(layerSession)), ->>>>>>> upstream/main ); }); diff --git a/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.ts index eb2e3bcb0b5ec..09dc13464bbeb 100644 --- a/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.ts @@ -21,7 +21,7 @@ import { PULL_REQUEST_LINKING_INSTRUCTIONS } from "@t3tools/provider-core/server import { antigravityCliMcpToolCall, antigravitySessionDirectories, - managedAntigravityRuntimeState, + profileAntigravityRuntimeState, readAntigravityAccount, withAntigravityCliCompaction, type AntigravityRuntimeState, @@ -148,7 +148,7 @@ export function makeAntigravityAcpAdapterFlavor( ): AcpAdapterV2Flavor { const { profileDirectory } = options; const runtimeState = - options.runtimeState ?? Effect.succeed(managedAntigravityRuntimeState(profileDirectory)); + options.runtimeState ?? Effect.succeed(profileAntigravityRuntimeState(profileDirectory)); const antigravityClientFileRoots = (cwd: string | null) => cwd === null ? [options.host.paths.attachmentsDir] : [cwd, options.host.paths.attachmentsDir]; const makeRuntime = Effect.fn("AntigravityAdapterV2.makeRuntime")( @@ -231,12 +231,8 @@ export function makeAntigravityAcpAdapterFlavor( mcpOverHttp: true, sessionCarriesPullRequestLinking: antigravityAppendsSystemPrompt, makeRuntime, -<<<<<<< origin/main readAccount: readAntigravityAccount(runtimeState, options), - buildPrompt: ({ -======= buildAttachmentPrompt: ({ ->>>>>>> upstream/main text, attachments, resolveAttachmentPath, @@ -296,7 +292,7 @@ export function makeAntigravityAcpAdapterFlavor( antigravityCliMcpToolCall(normalizeAntigravityToolCall(toolCall)), extractSubagentUpdate: extractAntigravitySubagentUpdate, supportsImagePrompts: true, - // Only the CLI compacts on /compact; makeAntigravityAdapterV2 withholds it from the managed runtime. + // `agy` compacts on /compact; makeAntigravityAdapterV2 withholds it from the older harness runtime. supportsCompaction: true, requiresSignIn: isAntigravitySignInRequiredError, // Antigravity can leave a prompt open without updates; long tools and approvals pause this. diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts index 06a2823c84802..1f6c6b1e8a92a 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts @@ -2081,569 +2081,6 @@ describe("ClaudeAdapterV2 attachments", () => { ])( "preserves $name with native PDFs, images, and paths on sends and steering", ({ prompt, expectedText, command, ultrathink, resumed, budget }) => -<<<<<<< origin/main - Effect.scoped( - Effect.gen(function* () { - const fileSystem = yield* FileSystem.FileSystem; - const idAllocator = yield* IdAllocator.IdAllocatorV2; - const path = yield* Path.Path; - const claudeHome = yield* fileSystem.makeTempDirectoryScoped({ - prefix: "t3-claude-v2-skills-home-", - }); - yield* fileSystem.makeDirectory(path.join(claudeHome, "skills", "implement"), { - recursive: true, - }); - yield* fileSystem.writeFileString( - path.join(claudeHome, "skills", "implement", "SKILL.md"), - "---\ndescription: Implement the requested change\n---\nImplement it.\n", - ); - const modelSelection = { - ...CLAUDE_TEST_MODEL_SELECTION, - options: ultrathink ? CLAUDE_TEST_MODEL_SELECTION.options : [], - }; - const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({ - prefix: "t3-claude-v2-attachments-", - }); - const offeredMessages: Array = []; - let failOpen = false; - let failOffer = false; - let cancelAfterQueue = false; - const queued = yield* Deferred.make(); - const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({ - instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID, - settings: { ...DEFAULT_CLAUDE_SETTINGS, homePath: claudeHome }, - environment: {}, - attachmentsDir, - fileSystem, - path: yield* Path.Path, - random: yield* SecureRandom.SecureRandom, - idAllocator, - queryRunner: { - allocateSessionId: Effect.succeed("native-thread-claude-attachments"), - open: () => - Effect.gen(function* () { - if (failOpen) { - failOpen = false; - return yield* new ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError({ - method: "open", - cause: "rejected open", - }); - } - const messages = yield* Queue.unbounded(); - return { - messages: Stream.fromQueue(messages), - offer: (message, onQueued) => - Effect.suspend(() => { - if (failOffer) { - failOffer = false; - return Effect.fail( - new ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError({ - method: "offer", - cause: "rejected offer", - }), - ); - } - return Effect.sync(() => { - offeredMessages.push(message); - onQueued?.(); - }).pipe( - Effect.andThen(() => - cancelAfterQueue - ? Deferred.succeed(queued, undefined).pipe( - Effect.andThen(Effect.never), - ) - : Effect.void, - ), - ); - }), - setModel: () => Effect.void, - 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: Queue.shutdown(messages), - }; - }), - forkSession: () => Effect.die("unused forkSession"), - subagentLaunchToolUseId: () => Effect.succeed(null), - assertComplete: Effect.void, - }, - }); - const threadId = ThreadId.make("thread-claude-attachments"); - const providerSessionId = ProviderSessionId.make("provider-session-claude-attachments"); - const runtime = yield* adapter.openSession({ - threadId, - providerSessionId, - modelSelection, - runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY, - }); - const providerThread = yield* runtime.ensureThread({ - threadId, - modelSelection, - runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY, - }); - const attachment = ChatImageAttachment.make({ - type: "image", - id: ChatAttachmentId.make( - "thread-claude-attachments-12345678-1234-1234-1234-123456789abc", - ), - name: "diagram.png", - mimeType: "image/png", - sizeBytes: 4, - }); - const document = ChatFileAttachment.make({ - type: "file", - id: ChatAttachmentId.make( - "thread-claude-attachments-abcdefab-1234-1234-1234-123456789abc", - ), - name: "requirements.pdf", - mimeType: "application/pdf", - sizeBytes: 4, - }); - yield* fileSystem.writeFile( - path.join(attachmentsDir, attachmentRelativePath(attachment)!), - Uint8Array.from([1, 2, 3, 4]), - ); - const pdfBytes = Buffer.from( - "%PDF-1.7\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n2 0 obj << /Type /Pages /Count 1 /Kids [3 0 R] >> endobj\n3 0 obj << /Type /Page /Parent 2 0 R >> endobj\n%%EOF", - ); - yield* fileSystem.writeFile( - path.join(attachmentsDir, attachmentRelativePath(document)!), - pdfBytes, - ); - const attemptId = RunAttemptId.make("attempt-claude-attachments"); - const now = yield* DateTime.now; - - const turnInput = { - ...makeClaudeTestTurnInput({ - threadId, - providerThread, - now, - attemptId, - modelSelection, - text: prompt, - attachments: resumed ? [attachment] : [attachment, document], - }), - nativeThreadHasTurns: resumed, - }; - if (budget === "cancelled-send" || budget === "cancelled-steer") { - const documentPath = path.join(attachmentsDir, attachmentRelativePath(document)!); - const pages = Buffer.from( - `%PDF-1.7\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n2 0 obj << /Type /Pages /Count 60 >> endobj\n${Array.from({ length: 60 }, (_, i) => `${i + 3} 0 obj << /Type /Page /Parent 2 0 R >> endobj`).join("\n")}\n`, - ); - yield* fileSystem.writeFile( - documentPath, - Buffer.concat([ - pages, - Buffer.alloc(19 * 1024 * 1024 - pages.length - 5, 32), - Buffer.from("%%EOF"), - ]), - ); - const message = { ...turnInput.message, attachments: [document] }; - if (budget === "cancelled-steer") { - yield* runtime.startTurn({ ...turnInput, message: { ...message, attachments: [] } }); - } - const deliver = - budget === "cancelled-send" - ? runtime.startTurn({ ...turnInput, message }) - : runtime.steerTurn({ - threadId, - runId: turnInput.runId, - providerThread, - providerTurnId: idAllocator.derive.providerTurn({ - driver: ClaudeAdapterV2.CLAUDE_PROVIDER, - nativeTurnId: `turn:${attemptId}`, - }), - message, - }); - cancelAfterQueue = true; - const delivering = yield* deliver.pipe(Effect.forkChild); - yield* Deferred.await(queued); - yield* Fiber.interrupt(delivering); - const delivered = offeredMessages.at(-1)!.message.content; - assert.include(JSON.stringify(delivered), '"type":"document"'); - cancelAfterQueue = false; - if (budget === "cancelled-send") { - yield* runtime.interruptTurn({ - providerThread, - providerTurnId: idAllocator.derive.providerTurn({ - driver: ClaudeAdapterV2.CLAUDE_PROVIDER, - nativeTurnId: `turn:${attemptId}`, - }), - }); - } - yield* deliver; - const retried = offeredMessages.at(-1)!.message.content; - assert.notInclude(JSON.stringify(retried), '"type":"document"'); - assert.include(JSON.stringify(retried), JSON.stringify(documentPath).slice(1, -1)); - assert.isBelow(Buffer.byteLength(JSON.stringify(offeredMessages)), 32_000_000); - return; - } - if (budget !== "none") { - const providerTurnId = idAllocator.derive.providerTurn({ - driver: ClaudeAdapterV2.CLAUDE_PROVIDER, - nativeTurnId: `turn:${attemptId}`, - }); - const imagePath = path.join(attachmentsDir, attachmentRelativePath(attachment)!); - // The on-disk length deliberately disagrees with sizeBytes. - yield* fileSystem.writeFile(imagePath, Buffer.alloc(4 * 1024 * 1024)); - if (["later-images", "partial-images"].includes(budget)) { - const documentPath = path.join(attachmentsDir, attachmentRelativePath(document)!); - yield* fileSystem.writeFile( - documentPath, - Buffer.concat([ - pdfBytes.subarray(0, -5), - Buffer.alloc( - (budget === "later-images" ? 19 : 16) * 1024 * 1024 - pdfBytes.length, - 32, - ), - Buffer.from("%%EOF"), - ]), - ); - yield* runtime.startTurn({ - ...turnInput, - message: { ...turnInput.message, attachments: [document] }, - }); - assert.include( - JSON.stringify(offeredMessages[0]!.message.content), - '"type":"document"', - ); - const message = { ...turnInput.message, attachments: [attachment, attachment] }; - yield* runtime.interruptTurn({ providerThread, providerTurnId }); - const laterAttemptId = RunAttemptId.make("attempt-claude-attachments-later"); - yield* runtime.startTurn({ - ...turnInput, - attemptId: laterAttemptId, - providerTurnOrdinal: 2, - nativeThreadHasTurns: true, - message, - }); - const sent = offeredMessages.at(-1)!.message.content; - assert.isArray(sent); - assert.lengthOf( - typeof sent === "string" ? [] : sent.filter((block) => block.type === "image"), - budget === "partial-images" ? 1 : 0, - ); - assert.include(JSON.stringify(sent), JSON.stringify(imagePath).slice(1, -1)); - yield* runtime.steerTurn({ - threadId, - runId: RunId.make("run-claude-attachments"), - providerThread, - providerTurnId: idAllocator.derive.providerTurn({ - driver: ClaudeAdapterV2.CLAUDE_PROVIDER, - nativeTurnId: `turn:${laterAttemptId}`, - }), - message, - }); - const steered = offeredMessages.at(-1)!.message.content; - assert.isArray(steered); - assert.lengthOf( - typeof steered === "string" - ? [] - : steered.filter((block) => block.type === "image"), - 0, - ); - assert.include(JSON.stringify(steered), JSON.stringify(imagePath).slice(1, -1)); - assert.isBelow( - Buffer.byteLength( - JSON.stringify(offeredMessages.map((message) => message.message)), - ), - 32_000_000, - ); - return; - } - if (budget === "retained-documents") { - yield* fileSystem.writeFile( - path.join(attachmentsDir, attachmentRelativePath(document)!), - Buffer.concat([ - pdfBytes.subarray(0, pdfBytes.length - 5), - Buffer.alloc(10 * 1024 * 1024, 32), - Buffer.from("%%EOF"), - ]), - ); - } - yield* runtime.startTurn({ - ...turnInput, - message: { - ...turnInput.message, - text: budget === "retained-text" ? "x".repeat(10 * 1024 * 1024) : prompt, - attachments: - budget === "retained-text" - ? [] - : budget === "retained-documents" - ? [document] - : [attachment, attachment], - }, - }); - const largePdf = Buffer.concat([ - pdfBytes.subarray(0, pdfBytes.length - 5), - Buffer.alloc( - (budget === "retained-documents" ? 20 : 19) * 1024 * 1024 - pdfBytes.length, - 32, - ), - Buffer.from("%%EOF"), - ]); - const documentPath = path.join(attachmentsDir, attachmentRelativePath(document)!); - yield* fileSystem.writeFile(documentPath, largePdf); - yield* runtime.steerTurn({ - threadId, - runId: RunId.make("run-claude-attachments"), - providerThread, - providerTurnId, - message: { - ...turnInput.message, - attachments: - budget === "same-message-images" - ? [document, attachment, attachment] - : [document], - }, - }); - const sent = offeredMessages.at(-1)!.message.content; - assert.isArray(sent); - assert.lengthOf( - typeof sent === "string" ? [] : sent.filter((block) => block.type === "document"), - 0, - budget, - ); - assert.include(JSON.stringify(sent), JSON.stringify(documentPath).slice(1, -1)); - return; - } - if (!resumed) { - const undelivered = Buffer.from( - `%PDF-1.7\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n2 0 obj << /Type /Pages /Count 60 >> endobj\n${Array.from({ length: 60 }, (_, i) => `${i + 3} 0 obj << /Type /Page /Parent 2 0 R >> endobj`).join("\n")}\n%%EOF`, - ); - yield* fileSystem.writeFile( - path.join(attachmentsDir, attachmentRelativePath(document)!), - undelivered, - ); - failOpen = true; - assert.isTrue(Exit.isFailure(yield* runtime.startTurn(turnInput).pipe(Effect.exit))); - assert.lengthOf(offeredMessages, 0); - yield* fileSystem.writeFile( - path.join(attachmentsDir, attachmentRelativePath(document)!), - pdfBytes, - ); - } - yield* runtime.startTurn(turnInput); - - const expectedImageBlock = { - type: "image", - source: { - type: "base64", - media_type: "image/png", - data: "AQIDBA==", - }, - } as const; - const expectedDocumentBlock = { - type: "document", - source: { - type: "base64", - media_type: "application/pdf", - data: Buffer.from(pdfBytes).toString("base64"), - }, - } as const; - const expectedAttachmentPath = path.join( - attachmentsDir, - attachmentRelativePath(attachment)!, - ); - const expectedDocumentPath = path.join(attachmentsDir, attachmentRelativePath(document)!); - const attachmentNotes = `\n\n[Attached image "diagram.png" is saved at: ${expectedAttachmentPath}]${resumed ? "" : `\n\n[Attached file "requirements.pdf" is saved at: ${expectedDocumentPath}]`}`; - const requestBlock = { type: "text" as const, text: expectedText + attachmentNotes }; - const expectedContent = command - ? [ - requestBlock, - expectedImageBlock, - ...(!resumed ? [expectedDocumentBlock] : []), - { type: "text" as const, text: command + attachmentNotes }, - ] - : [expectedImageBlock, ...(!resumed ? [expectedDocumentBlock] : []), requestBlock]; - assert.deepEqual(offeredMessages[0]?.message.content, expectedContent); - - const providerTurnId = idAllocator.derive.providerTurn({ - driver: ClaudeAdapterV2.CLAUDE_PROVIDER, - nativeTurnId: `turn:${attemptId}`, - }); - yield* runtime.steerTurn({ - threadId, - runId: RunId.make("run-claude-attachments"), - providerThread, - providerTurnId, - message: { - createdBy: "user", - creationSource: "web", - messageId: MessageId.make("message-claude-attachments-steer"), - text: prompt, - attachments: resumed ? [attachment] : [attachment, document], - }, - }); - - assert.isUndefined(offeredMessages[1]?.priority); - assert.deepEqual(offeredMessages[1]?.message.content, expectedContent); - const documentPath = path.join(attachmentsDir, attachmentRelativePath(document)!); - for (const scenario of [ - "pages", - "bytes", - "invalid", - "invalid-page-tree", - "object-stream", - "encrypted", - "cyclic-tree", - "unterminated-string", - "missing-eof", - "escaped-name", - "incremental", - "compressed-bomb", - "indirect-count", - "indirect-type", - "indirect-kids", - "indirect-101-pages", - "aggregate-pages", - "retained-pages", - "delivery-failure", - "pasted-text", - "text-only", - ]) { - let attachments: ReadonlyArray = [document]; - if ( - ["pages", "aggregate-pages", "retained-pages", "delivery-failure"].includes(scenario) - ) { - const pages = scenario === "pages" ? 101 : scenario === "delivery-failure" ? 30 : 60; - const large = Buffer.from( - `%PDF-1.7\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n2 0 obj << /Type /Pages /Count ${pages} >> endobj\n${Array.from({ length: pages }, (_, i) => `${i + 3} 0 obj << /Type /Page /Parent 2 0 R >> endobj`).join("\n")}\n%%EOF`, - ); - yield* fileSystem.writeFile(documentPath, large); - if (scenario === "aggregate-pages") { - const second = { - ...document, - id: ChatAttachmentId.make("second-pdf"), - name: "second.pdf", - }; - yield* fileSystem.copyFile( - documentPath, - path.join(attachmentsDir, attachmentRelativePath(second)!), - ); - attachments = [document, second]; - } - } else if (scenario.startsWith("indirect-")) { - const raw = - scenario === "indirect-count" || scenario === "indirect-101-pages" - ? `%PDF-1.7\n1 0 obj ${scenario === "indirect-count" ? 1 : 101} endobj\n2 0 obj << /Type /Catalog /Pages 3 0 R >> endobj\n3 0 obj << /Type /Pages /Count 1 0 R /Kids [${Array.from({ length: scenario === "indirect-count" ? 1 : 101 }, (_, i) => `${i + 4} 0 R`).join(" ")}] >> endobj\n4 0 obj << /Type /Page /Parent 3 0 R >> endobj\n${scenario === "indirect-count" ? "" : Array.from({ length: 100 }, (_, i) => `${i + 5} 0 obj << /Type 105 0 R /Parent 3 0 R >> endobj`).join("\n")}\n105 0 obj /Page endobj\n%%EOF` - : scenario === "indirect-type" - ? pdfBytes - .toString() - .replace( - "%%EOF", - "4 0 obj << /Type 5 0 R >> endobj\n5 0 obj /Annot endobj\n%%EOF", - ) - : pdfBytes - .toString() - .replace("/Kids [3 0 R]", "/Kids 4 0 R") - .replace("%%EOF", "4 0 obj [3 0 R] endobj\n%%EOF"); - yield* fileSystem.writeFileString(documentPath, raw); - } else if (scenario === "bytes") { - yield* fileSystem.truncate(documentPath, 20 * 1024 * 1024 + 1); - } else if (scenario === "invalid") { - yield* fileSystem.writeFileString(documentPath, "This is not a PDF"); - } else if (scenario === "invalid-page-tree") { - const malformedBytes = Buffer.from( - "%PDF-1.7\n1 0 obj\n<< /Type /Catalog /Pages 42 >>\nendobj\ntrailer\n<< /Root 1 0 R >>\n%%EOF", - ); - yield* fileSystem.writeFile(documentPath, malformedBytes); - } else if ( - ["object-stream", "encrypted", "cyclic-tree", "compressed-bomb"].includes(scenario) - ) { - const suffix = - scenario === "encrypted" - ? "/Encrypt 9 0 R" - : scenario === "cyclic-tree" - ? "/Count 0 /Kids [2 0 R]" - : "/Type /ObjStm /Filter /FlateDecode /Length 1000000000"; - yield* fileSystem.writeFile( - documentPath, - Buffer.concat([ - pdfBytes.subarray(0, pdfBytes.length - 5), - Buffer.from(`\n4 0 obj << ${suffix} >> stream\nx\nendstream endobj\n%%EOF`), - ]), - ); - } else if ( - ["unterminated-string", "missing-eof", "escaped-name", "incremental"].includes( - scenario, - ) - ) { - const raw = pdfBytes.toString(); - yield* fileSystem.writeFileString( - documentPath, - scenario === "missing-eof" - ? raw.slice(0, -5) - : scenario === "escaped-name" - ? raw.replace("/Type /Page ", "/Type /Pa#67e ") - : raw.replace( - "%%EOF", - scenario === "incremental" ? "/Prev 42\n%%EOF" : "(unfinished\n%%EOF", - ), - ); - } else if (scenario === "pasted-text") { - yield* fileSystem.writeFile(documentPath, pdfBytes); - attachments = [{ ...document, source: { _tag: "pasted-text" } }]; - } else { - attachments = []; - yield* fileSystem.remove(documentPath); - } - const steering = { - threadId, - runId: RunId.make("run-claude-attachments"), - providerThread, - providerTurnId, - message: { - createdBy: "user", - creationSource: "web", - messageId: MessageId.make(`message-${scenario}`), - text: "Continue.", - attachments, - }, - } satisfies ProviderAdapter.ProviderAdapterV2SteerInput; - if (scenario === "delivery-failure") { - failOffer = true; - assert.isTrue(Exit.isFailure(yield* runtime.steerTurn(steering).pipe(Effect.exit))); - } - yield* runtime.steerTurn(steering); - - const sent = offeredMessages.at(-1)!.message.content; - const documents = - typeof sent === "string" ? [] : sent.filter((block) => block.type === "document"); - assert.lengthOf( - documents, - ["aggregate-pages", "delivery-failure"].includes(scenario) ? 1 : 0, - scenario, - ); - if (scenario === "text-only") - assert.equal(sent, ultrathink ? "Ultrathink:\nContinue." : "Continue."); - else assert.include(JSON.stringify(sent), JSON.stringify(documentPath).slice(1, -1)); - } - }).pipe( - Effect.provide( - Layer.mergeAll( - IdAllocator.layer, - McpProviderSessions.layer, - NodeServices.layer, - NodeCrypto.layer, - ), - ), - ), - ), - ); -}); - -describe("ClaudeAdapterV2 native fork", () => { - it.effect("forks at the source assistant cursor and resumes the forked session", () => - Effect.scoped( -======= ->>>>>>> upstream/main Effect.gen(function* () { const fileSystem = yield* FileSystem.FileSystem; const idAllocator = yield* IdAllocator.IdAllocatorV2; @@ -3036,7 +2473,7 @@ describe("ClaudeAdapterV2 native fork", () => { }, }); - assert.equal(offeredMessages[1]?.priority, "now"); + assert.isUndefined(offeredMessages[1]?.priority); assert.deepEqual(offeredMessages[1]?.message.content, expectedContent); const documentPath = path.join(attachmentsDir, attachmentRelativePath(document)!); for (const scenario of [ @@ -6000,11 +5437,11 @@ describe("ClaudeAdapterV2 background wake turns", () => { it.effect("settles a turn whose result echoes only a steer before the offer returns", () => Effect.gen(function* () { let settleDuringOffer: (message: SDKUserMessage) => Effect.Effect = () => Effect.void; + let offers = 0; const harness = yield* makeWakeHarnessWithOptions({ + // The first offer is the prompt; the steer follows it. offer: (message) => - message.priority === "now" - ? Effect.suspend(() => settleDuringOffer(message)) - : Effect.void, + offers++ === 0 ? Effect.void : Effect.suspend(() => settleDuringOffer(message)), }); settleDuringOffer = (message) => harness @@ -7763,35 +7200,7 @@ describe("ClaudeAdapterV2 background wake turns", () => { attachments: [], }, }); -<<<<<<< origin/main - yield* harness.runtime.startTurn(input); - if (steered) { - yield* harness.runtime.steerTurn({ - threadId: harness.threadId, - runId: input.runId, - providerThread: harness.providerThread, - providerTurnId: idAllocator.derive.providerTurn({ - driver: ClaudeAdapterV2.CLAUDE_PROVIDER, - nativeTurnId: `turn:${attemptId}`, - }), - message: { - createdBy: "user", - creationSource: "web", - messageId: MessageId.make("message-steering-abort"), - text: "Include the hierarchy mock.", - attachments: [], - }, - }); - assert.isUndefined(harness.offeredMessages[1]?.priority); - } - yield* harness.offerAndWait( - makeResultFrame({ - uuid: "00000000-0000-4000-8000-000000000901", - result: "", - terminalReason, - ...(steered ? { userMessageUuids: [harness.promptUuid(0)] } : {}), -======= - assert.equal(harness.offeredMessages[1]?.priority, "now"); + assert.isUndefined(harness.offeredMessages[1]?.priority); } const partialText = "The audit covers the `integ"; if (!queryExits) @@ -7807,6 +7216,7 @@ describe("ClaudeAdapterV2 background wake turns", () => { uuid: "00000000-0000-4000-8000-000000000901", result: "", terminalReason, + ...(steered ? { userMessageUuids: [harness.promptUuid(0)] } : {}), usage: { input_tokens: 600, output_tokens: 40, @@ -7824,7 +7234,6 @@ describe("ClaudeAdapterV2 background wake turns", () => { makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000902", result: "Audit finished after the steer.", ->>>>>>> upstream/main usage: { input_tokens: 3, output_tokens: 6, diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts index 5c08852d111be..c4a775589dc9e 100644 --- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts @@ -181,7 +181,6 @@ import { type CompiledClaudeModelSelection, } from "../../claudeModelOptions.ts"; import * as ServerConfig from "../../config.ts"; -import { isClaudeSteerQueuedPastResult, trackClaudeSteer } from "../../fork/claudeSteerQueue.ts"; import { claudeTerminalToolEnvironment } from "../../fork/userMessageTools/claudeTerminalTool.ts"; import { claudeDisplayModeHooks, @@ -2060,12 +2059,8 @@ export function makeClaudeQueryOptions(input: { : typeof input.sdkSettings === "object" && input.sdkSettings !== null ? ({ ...input.sdkSettings, ...selectionSettings } as ClaudeSdkSettings) : selectionSettings; -<<<<<<< origin/main const pluginRoot = input.environment?.T3CODE_CLAUDE_PLUGIN_ROOT?.trim(); - const compactQuerySettings = -======= const autoCompactWindow = ->>>>>>> upstream/main input.settings?.autoCompactWindow === undefined || input.settings.autoCompactWindow.length === 0 ? undefined : input.settings.autoCompactWindow; @@ -5290,12 +5285,9 @@ export interface ClaudeAdapterV2Options { request: ProviderContinuationRequests.ProviderContinuationRequest, ) => Effect.Effect; }; -<<<<<<< origin/main /** Omitting this sends no display mode note after a compaction or beside a slash command. */ readonly displayModeCompactionNote?: DisplayModeCompactionNoteShape | undefined; -======= readonly installationGate?: ProviderInstallationGate.ProviderInstallationGate["Service"]; ->>>>>>> upstream/main } export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( @@ -11185,10 +11177,10 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( const completedAt = yield* DateTime.now; const interrupted = (yield* Ref.get(interruptedTurns)).has(context.providerTurnId); const wasSteered = (yield* Ref.get(steeredTurns)).has(context.providerTurnId); -<<<<<<< origin/main - if (!interrupted && wasSteered && isClaudeSteerQueuedPastResult(context, message)) { -======= - if (!interrupted && wasSteered && isClaudeActiveSteeringAbortResult(message)) { + // Fork: a steer waits in Claude's queue, so the turn stays open while one is not yet taken in. + const steerQueued = + context.pendingSteers.size > 0 && (message.user_message_uuids?.length ?? 0) > 0; + if (!interrupted && wasSteered && steerQueued) { const cutOffReply = context.assistant.lastReply; context.assistant.lastReply = null; if (message.terminal_reason === "aborted_streaming") { @@ -11202,7 +11194,6 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( completedAt, }); } ->>>>>>> upstream/main context.steeredSegmentUsage.push(message.usage); context.steeredLedgerUsage = addClaudeLedgerUsage( context.steeredLedgerUsage, @@ -12973,9 +12964,6 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( }), persistAttachmentBudget(existing.nativeThreadId), ); -<<<<<<< origin/main - const steerUuid = yield* random.uuidV4().pipe(Effect.filterOrFail(isClaudePromptUuid)); -======= // A selection sent with the steer applies to the running turn when the live process can switch to it. const steerSelection = turnInput.modelSelection === undefined @@ -12989,7 +12977,6 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( existing.openedPermissionMode === currentTurn.queryPolicy.permissionMode) ? steerSelection : undefined; ->>>>>>> upstream/main const userMessage = yield* makeClaudeUserMessageWithAttachments({ text: applyClaudePromptEffortPrefix( turnInput.message.text, @@ -12999,10 +12986,6 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( ).promptEffort, ), attachments: turnInput.message.attachments, -<<<<<<< origin/main -======= - priority: "now", ->>>>>>> upstream/main uuid: steerUuid, attachmentsDir, fileSystem, @@ -13043,11 +13026,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( next.add(turnInput.providerTurnId); return next; }); -<<<<<<< origin/main - const forgetSteer = trackClaudeSteer(currentTurn, steerUuid); -======= yield* emitSteerStatus(currentTurn, messageId, "pending"); ->>>>>>> upstream/main yield* Effect.uninterruptibleMask((restore) => restore( existing.query.offer(userMessage, () => { @@ -13059,7 +13038,6 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* ( pdfReservation.commit(); }), ), - Effect.onError(() => Effect.sync(forgetSteer)), ), ).pipe( Effect.onError(() => @@ -13798,11 +13776,8 @@ export const createClaudeAdapterV2 = Effect.fn("ClaudeAdapterV2Driver.create")( const queryRunner = yield* ClaudeAgentSdkQueryRunner; const serverConfig = yield* ServerConfig.ServerConfig; const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests; -<<<<<<< origin/main const displayModeCompactionNote = yield* providedCompactionNote; -======= const installationGate = yield* ProviderInstallationGate.ProviderInstallationGate; ->>>>>>> upstream/main const baseEnvironment = yield* mergeClaudeProcessEnvironment( config, environment, @@ -13826,11 +13801,8 @@ export const createClaudeAdapterV2 = Effect.fn("ClaudeAdapterV2Driver.create")( idAllocator, queryRunner, continuationRequests, -<<<<<<< origin/main displayModeCompactionNote, -======= installationGate, ->>>>>>> upstream/main ...hooks, }); }, diff --git a/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts index 3a38152815a91..b4f3d15ea5f80 100644 --- a/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts +++ b/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts @@ -839,10 +839,7 @@ export const buildCodexTurnStartParams = Effect.fn("CodexAdapterV2.buildCodexTur const serviceTier = input.omitServiceTier === true ? undefined -<<<<<<< origin/main : resolveCodexTurnServiceTier(input.modelSelection, input.models ?? []); -======= - : getCodexServiceTierOptionValue(input.modelSelection); // A chosen program goes as is, even one the model lacks, so Codex rejects it visibly. const cyberAccessProgram = input.cyberAccess === undefined @@ -851,7 +848,6 @@ export const buildCodexTurnStartParams = Effect.fn("CodexAdapterV2.buildCodexTur getModelSelectionStringOptionValue(input.modelSelection, "cyberAccessProgram"), input.cyberAccess.defaultProgram, ].find(isCodexCyberAccessProgram); ->>>>>>> upstream/main // MCP-written app context must be quoted user input, not developer instructions. const appContext = Object.fromEntries( (input.appContext ?? []).map((entry) => [ @@ -1862,7 +1858,6 @@ export interface CodexAdapterV2Options { /** The provider's published models, read per turn for catalog defaults. */ readonly models?: Effect.Effect>; readonly resolveRuntime?: Effect.Effect; - readonly models?: Effect.Effect>; readonly compatibility?: ( version: string, ) => Effect.Effect; @@ -7414,7 +7409,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* ( browserToolsAvailable: mcpSession?.browserToolsAvailable ?? true, deviceToolsAvailable: mcpSession?.capabilities?.has("device") ?? false, omitServiceTier: adapterOptions.resolveRuntime !== undefined, - models: yield* adapterOptions.models ?? Effect.succeed([]), + models, ...(turnInput.appContext === undefined ? {} : { appContext: turnInput.appContext }), ...(configuredReasoningSummary === undefined ? {} : { configuredReasoningSummary }), }); @@ -7488,7 +7483,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* ( const activation = { stopped: false }; goalActivations.set(threadId, activation); yield* Effect.gen(function* () { - yield* startNativeTurn(turnInput, yield* codexInput); + yield* startNativeTurn(turnInput, yield* codexInput, turnInput.commandNote); if (activation.stopped) return; const { goal } = yield* client.request("thread/goal/set", { threadId, @@ -7574,53 +7569,6 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* ( }); goalsByNativeThread.set(threadId, providerGoalFromCodex(goal)); } -<<<<<<< origin/main - // Hold fast first turns until activation; Stop cancels activation. - const activation = { stopped: false }; - goalActivations.set(threadId, activation); - yield* Effect.gen(function* () { - // A bare objective gets echoed back, and "start this goal" gets a - // create_goal call that Codex rejects because the goal already exists. - yield* startNativeTurn( - turnInput, - command.type === "set" - ? yield* toCodexInput({ - ...turnInput, - message: { - ...turnInput.message, - text: `This thread's goal is already set. Do not call create_goal. Start working on it now: ${command.objective}`, - }, - }) - : [], - turnInput.commandNote, - ); - if (activation.stopped) return; - const { goal } = yield* client.request("thread/goal/set", { - threadId, - status: "active", - }); - goalsByNativeThread.set(threadId, providerGoalFromCodex(goal)); - if (activation.stopped) { - const paused = yield* client.request("thread/goal/set", { - threadId, - status: "paused", - }); - goalsByNativeThread.set(threadId, providerGoalFromCodex(paused.goal)); - } - }).pipe( - Effect.ensuring( - turnTerminalizationPermit.withPermits(1)( - Effect.gen(function* () { - if (goalActivations.get(threadId) === activation) { - goalActivations.delete(threadId); - } - if (goalsByNativeThread.get(threadId)?.status !== "active") { - yield* releaseGoalHold(threadId); - } - }), - ), - ), -======= // A bare objective gets echoed back, and "start this goal" gets a // create_goal call that Codex rejects because the goal already exists. yield* activateGoal( @@ -7635,7 +7583,6 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* ( }, }) : Effect.succeed([]), ->>>>>>> upstream/main ); }, (effect, turnInput) => @@ -7734,7 +7681,6 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* ( providerSession: session, events: Stream.fromEffectRepeat(Queue.take(events)), canReuseContextUsage: canReuseCodexContextUsage, -<<<<<<< origin/main accountChanged: readCodexAccount(fileSystem, authPath).pipe( Effect.map( (current) => @@ -7742,9 +7688,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* ( (Option.isNone(spawnedAccount) || current.value !== spawnedAccount.value), ), ), -======= normalizeThreadLoadModelSelection: normalizeCodexThreadLoadModelSelection, ->>>>>>> upstream/main // Idle release can beat delayed subagent resumes: Codex reports them completed between turns with no resume-expected signal. hasPendingBackgroundWork: Effect.gen(function* () { for (const items of (yield* Ref.get(runningCommandItemsByTurn)).values()) { diff --git a/apps/server/src/orchestration-v2/ClaudeAutomaticDelivery.integration.test.ts b/apps/server/src/orchestration-v2/ClaudeAutomaticDelivery.integration.test.ts index 3957c00be8a4c..20f2377184b7f 100644 --- a/apps/server/src/orchestration-v2/ClaudeAutomaticDelivery.integration.test.ts +++ b/apps/server/src/orchestration-v2/ClaudeAutomaticDelivery.integration.test.ts @@ -404,7 +404,7 @@ it.effect.each(deliveries)( yield* worker.drain(); const explicitSteer = delivery === "user steering" || delivery === "promoted queued message"; - assert.equal(batchAbort.signal.aborted, explicitSteer); + assert.isFalse(batchAbort.signal.aborted); assert.equal(offers.length, explicitSteer ? 2 : 1); const finished = yield* watch( (event) => @@ -415,8 +415,16 @@ it.effect.each(deliveries)( yield* Queue.offer(sdkMessages, toolResult("build", false)); for (const id of statusIds) yield* Queue.offer(sdkMessages, toolResult(id, batchAbort.signal.aborted)); - if (explicitSteer) yield* Queue.offer(sdkMessages, result("aborted", true)); - yield* Queue.offer(sdkMessages, result("completed", false)); + // Claude Code folds a no-priority steer in after the tool results and answers it in the + // same turn, so the turn's result lists the steer's uuid too. + yield* Queue.offer( + sdkMessages, + result( + "completed", + false, + explicitSteer ? offers.map((offer) => offer.uuid ?? "") : undefined, + ), + ); yield* Fiber.join(finished); yield* worker.drain(); yield* orchestrator.resumeQueuedRuns; @@ -448,15 +456,12 @@ it.effect.each(deliveries)( ); assert.equal(reads.length, 4); for (const read of reads) { - assert.equal(read.status, explicitSteer ? "cancelled" : "completed"); - assert.equal(read.toolNonExecutionKind, explicitSteer ? "cancelled" : undefined); - assert.equal(read.type === "dynamic_tool" && read.output === refusal, explicitSteer); + assert.equal(read.status, "completed"); + assert.isUndefined(read.toolNonExecutionKind); + assert.isFalse(read.type === "dynamic_tool" && read.output === refusal); } assert.equal(offers.length, 2); - assert.equal( - offers.filter((offer) => offer.priority === "now").length, - explicitSteer ? 1 : 0, - ); + assert.isTrue(offers.every((offer) => offer.priority === undefined)); if (!explicitSteer) { assert.equal(after.runs.length, 2); if (delivery === "child completion") { @@ -728,313 +733,6 @@ it.effect("offers a continuation for a later wake after a queued continuation is subagentModel: () => Effect.succeed(null), assertComplete: Effect.void, }, -<<<<<<< origin/main - }); - yield* Effect.gen(function* () { - const orchestrator = yield* Orchestrator.OrchestratorV2; - const worker = yield* EffectWorker.OrchestrationEffectWorkerV2; - const threadId = ThreadId.make("thread:automatic-delivery"); - const projectId = ProjectId.make("project:automatic-delivery"); - const watch = (predicate: (event: OrchestrationV2DomainEvent) => boolean) => - orchestrator.streamDomainEvents.pipe( - Stream.filter(predicate), - Stream.take(1), - Stream.runDrain, - Effect.forkScoped, - ); - yield* orchestrator.dispatch({ - type: "thread.create", - commandId: CommandId.make("create"), - threadId, - projectId, - title: "Automatic delivery", - modelSelection, - runtimeMode: "full-access", - interactionMode: "default", - branch: null, - worktreePath: cwd, - createdBy: "user", - creationSource: "web", - }); - const running = yield* watch( - (event) => event.type === "provider-turn.updated" && event.payload.status === "running", - ); - yield* orchestrator.dispatch({ - type: "message.dispatch", - commandId: CommandId.make("first"), - threadId, - messageId: MessageId.make("first"), - text: "Build and check all four tasks.", - attachments: [], - dispatchMode: { type: "start_immediately" }, - createdBy: "user", - creationSource: "web", - }); - yield* worker.drain(); - yield* Fiber.join(running); - const pending = yield* watch( - (event) => - event.type === "turn-item.updated" && - event.payload.nativeItemRef?.nativeId === "status-4", - ); - yield* Queue.offer(sdkMessages, batch); - yield* Fiber.join(pending); - const before = yield* orchestrator.getThreadProjection(threadId); - assert.equal(before.turnItems.filter((item) => item.status === "running").length, 5); - const parent = before.runs[0]!; - if (parent.rootNodeId === null) return yield* Effect.die("parent has no root node"); - const messageId = MessageId.make("automatic-notice"); - if (delivery === "child completion") { - const taskId = NodeId.make("completed-child"); - const now = yield* DateTime.now; - const sink = yield* EventSink.EventSinkV2; - yield* sink.write({ - events: [ - { - id: EventId.make("cohort"), - type: "run.updated", - threadId, - runId: parent.id, - occurredAt: now, - payload: { - ...parent, - delegatedCompletion: { - disposition: "open", - nextGeneration: 2, - delivery: { generation: 1, messageId, taskIds: [taskId] }, - }, - }, - }, - { - id: EventId.make("child"), - type: "subagent.updated", - threadId, - runId: parent.id, - nodeId: taskId, - occurredAt: now, - payload: { - id: taskId, - threadId, - runId: parent.id, - parentNodeId: parent.rootNodeId, - origin: "app_owned", - createdBy: "agent", - driver: ClaudeAdapterV2.CLAUDE_PROVIDER, - providerInstanceId: modelSelection.instanceId, - providerThreadId: null, - childThreadId: null, - nativeTaskRef: null, - prompt: "Background work", - title: "Child", - model: null, - completionWake: "always", - completionDelivery: { state: "claimed", observedByRunId: null }, - status: "completed", - result: "done", - startedAt: now, - completedAt: now, - updatedAt: now, - }, - }, - ], - }); - const command = { - type: "message.dispatch" as const, - commandId: CommandId.make("completion"), - threadId, - messageId, - text: "Child completed", - attachments: [], - dispatchMode: { type: "queue_after_active" as const }, - createdBy: "agent" as const, - creationSource: "server" as const, - delegatedCompletion: { parentRunId: parent.id, generation: 1, taskIds: [taskId] }, - }; - yield* orchestrator.dispatch(command); - yield* orchestrator.dispatch(command); - yield* orchestrator.recoverDelegatedTasks; - } else if (delivery === "scheduled message") { - yield* Effect.gen(function* () { - const service = yield* ScheduledTaskService.ScheduledTaskService; - const { task } = yield* service.upsert( - yield* decodeScheduledTask({ - title: "Status check", - prompt: "Check the four tasks.", - enabled: true, - schedule: { type: "interval", everyMs: 60_000 }, - projectId, - threadId, - workspaceStrategy: { type: "root" }, - modelSelection, - runtimeMode: "full-access", - interactionMode: "default", - }), - ); - const ran = yield* service.runNow({ id: task.id }); - assert.equal(ran.task.lastRunStatus, "succeeded"); - }).pipe( - Effect.provide( - ScheduledTaskService.layer.pipe( - Layer.provide(ThreadManagementService.layer), - Layer.provide(ServerSettings.layerTest()), - Layer.provide( - Layer.mock(LegacyV1ThreadImporter.LegacyV1ThreadImporter)({ - ensureTranscript: () => - Effect.succeed({ importedThreadCount: 0, importedMessageCount: 0 }), - }), - ), - Layer.provide(Layer.mock(ThreadLaunchService.ThreadLaunchService)({})), - Layer.provide(ManagedPolicy.layerTest()), - Layer.provide( - Layer.mock(ManagedProjectFolders.ManagedProjectFolders)({ - namedProjectsRoot: "/projects", - isScratchProject: () => Effect.succeed(false), - }), - ), - Layer.provide(Layer.mock(SecretRequests.SecretRequests)({})), - Layer.provide( - CommandReceiptStore.layer.pipe(Layer.provide(SqlitePersistence.layerMemory)), - ), - Layer.provide( - Layer.mergeAll( - NodeCrypto.layer, - Scheduler.layer, - SqlitePersistence.layerMemory, - ), - ), - ), - ), - ); - } else if (delivery === "user steering") { - yield* orchestrator.dispatch({ - type: "message.dispatch", - commandId: CommandId.make("steer"), - threadId, - messageId, - text: "Change direction now.", - attachments: [], - dispatchMode: { type: "steer_active", targetRunId: parent.id }, - createdBy: "user", - creationSource: "web", - }); - } else { - yield* orchestrator.dispatch({ - type: "message.dispatch", - commandId: CommandId.make("queue"), - threadId, - messageId, - text: "Change direction now.", - attachments: [], - dispatchMode: { type: "queue_after_active" }, - createdBy: "user", - creationSource: "web", - }); - const queuedRun = (yield* orchestrator.getThreadProjection(threadId)).runs[1]!; - yield* orchestrator.dispatch({ - type: "queued-message.promote-to-steer", - commandId: CommandId.make("promote"), - threadId, - queuedRunId: queuedRun.id, - targetRunId: parent.id, - }); - const promoted = yield* orchestrator.getThreadProjection(threadId); - assert.equal(promoted.runs.find((run) => run.id === queuedRun.id)?.status, "cancelled"); - assert.equal( - promoted.messages.find((message) => message.id === messageId)?.runId, - parent.id, - ); - const steer = promoted.turnItems.find( - (item) => item.type === "user_message" && item.messageId === messageId, - ); - assert.ok(steer?.type === "user_message"); - assert.equal(steer.inputIntent, "promoted_queued_to_steer"); - } - yield* worker.drain(); - const explicitSteer = - delivery === "user steering" || delivery === "promoted queued message"; - assert.isFalse(batchAbort.signal.aborted); - assert.equal(offers.length, explicitSteer ? 2 : 1); - const finished = yield* watch( - (event) => - event.type === "run.updated" && - event.payload.id === parent.id && - event.payload.status === "waiting", - ); - yield* Queue.offer(sdkMessages, toolResult("build", false)); - for (const id of statusIds) - yield* Queue.offer(sdkMessages, toolResult(id, batchAbort.signal.aborted)); - // Claude Code folds a no-priority steer in after the tool results and answers it in the - // same turn, so the turn's result lists the steer's uuid too. - yield* Queue.offer( - sdkMessages, - result( - "completed", - false, - explicitSteer ? offers.map((offer) => offer.uuid ?? "") : undefined, - ), - ); - yield* Fiber.join(finished); - yield* worker.drain(); - yield* orchestrator.resumeQueuedRuns; - yield* worker.drain(); - if (!explicitSteer) { - const queued = (yield* orchestrator.getThreadProjection(threadId)).runs[1]!; - const noticeFinished = yield* watch( - (event) => - event.type === "run.updated" && - event.payload.id === queued.id && - event.payload.status === "waiting", - ); - const delivered = - delivery === "child completion" - ? yield* watch( - (event) => - event.type === "subagent.updated" && - event.payload.completionDelivery?.state === "delivered", - ) - : null; - yield* Queue.offer(sdkMessages, result("notice-completed", false)); - yield* Fiber.join(noticeFinished); - yield* worker.drain(); - if (delivered !== null) yield* Fiber.join(delivered); - } - const after = yield* orchestrator.getThreadProjection(threadId); - const reads = after.turnItems.filter((item) => - statusIds.includes(item.nativeItemRef?.nativeId ?? ""), - ); - assert.equal(reads.length, 4); - for (const read of reads) { - assert.equal(read.status, "completed"); - assert.isUndefined(read.toolNonExecutionKind); - assert.isFalse(read.type === "dynamic_tool" && read.output === refusal); - } - assert.equal(offers.length, 2); - assert.isTrue(offers.every((offer) => offer.priority === undefined)); - if (!explicitSteer) { - assert.equal(after.runs.length, 2); - if (delivery === "child completion") { - assert.equal(after.messages.filter((message) => message.id === messageId).length, 1); - assert.equal(after.subagents[0]?.completionDelivery?.state, "delivered"); - } else { - assert.equal( - after.messages.filter((message) => message.scheduledTaskId !== undefined).length, - 1, - ); - } - } - yield* orchestrator.recoverDelegatedTasks; - yield* orchestrator.resumeQueuedRuns; - yield* worker.drain(); - assert.equal(offers.length, 2); - }).pipe( - Effect.provide( - ProviderReplayHarness.layerWithRegistry( - { name: "claude-automatic-delivery" }, - ProviderAdapterRegistry.layerSingle(adapter), - { runEffectWorker: false }, - ), - ), -======= }).pipe(Effect.provideContext(services)); return [adapter]; }), @@ -1049,7 +747,6 @@ it.effect("offers a continuation for a later wake after a queued continuation is Stream.take(1), Stream.runDrain, Effect.forkScoped, ->>>>>>> upstream/main ); const runUpdated = (messageId: string, status: string) => watch( diff --git a/apps/server/src/orchestration-v2/ContextHandoffService.ts b/apps/server/src/orchestration-v2/ContextHandoffService.ts index b743dbb8f02b7..e112fa07c8783 100644 --- a/apps/server/src/orchestration-v2/ContextHandoffService.ts +++ b/apps/server/src/orchestration-v2/ContextHandoffService.ts @@ -537,15 +537,11 @@ const makeContextHandoffService = Effect.fn("orchestrationV2.ContextHandoffServi ), ); const runStatuses = new Map(input.runs?.map((run) => [run.id, run.status])); -<<<<<<< origin/main - const coverage = handoffCoverage(input); - const sentTexts = foldSentTexts(input.items); -======= const coverage = handoffCoverage({ ...input, threadId: input.sourceThreadId ?? input.threadId, }); ->>>>>>> upstream/main + const sentTexts = foldSentTexts(input.items); const selected = selectHistory({ messages: input.items.flatMap((item) => { const message = historicalMessage(item, sentTexts); diff --git a/apps/server/src/orchestration-v2/IdleCompaction.test.ts b/apps/server/src/orchestration-v2/IdleCompaction.test.ts index ffe84c2595bb0..a64bb1a86f4ec 100644 --- a/apps/server/src/orchestration-v2/IdleCompaction.test.ts +++ b/apps/server/src/orchestration-v2/IdleCompaction.test.ts @@ -215,125 +215,7 @@ describe("IdleCompactionService", () => { projectDisabled: false, ...scenario, } as const; -<<<<<<< origin/main - return Effect.scoped( - Effect.gen(function* () { - yield* TestClock.setTime(NOW_MS); - const selectedInstance = ProviderInstanceId.make( - "instance" in test ? test.instance : "claudeAgent", - ); - const driver = ProviderDriverKind.make("driver" in test ? test.driver : "claudeAgent"); - const base = records({ cacheExpiresInMs: 2 * MINUTE_MS }); - const data: OrchestrationV2ThreadProjection = { - ...base, - thread: { - ...base.thread, - providerInstanceId: selectedInstance, - modelSelection: { ...base.thread.modelSelection, instanceId: selectedInstance }, - }, - runs: base.runs.map((run) => ({ - ...run, - providerInstanceId: selectedInstance, - modelSelection: { ...run.modelSelection, instanceId: selectedInstance }, - })), - providerThreads: base.providerThreads.map((thread) => ({ - ...thread, - driver, - providerInstanceId: selectedInstance, - })), - attempts: [], - nodes: [], - subagents: [], - providerSessions: [], - plans: [], - checkpointScopes: [], - checkpoints: [], - contextHandoffs: [], - visibleTurnItems: [], - updatedAt: at(), - }; - let historyReads = 0; - let dispatches = 0; - const done = yield* Deferred.make(); - const tracer = Tracer.make({ - span(options) { - const span = new Tracer.NativeSpan(options); - const end = span.end.bind(span); - span.end = (...args) => { - end(...args); - if (span.name === "IdleCompactionService.compactWhenDue") - Deferred.doneUnsafe(done, Effect.void); - }; - return span; - }, - }); - const dependencies = Layer.mergeAll( - Layer.mock(Orchestrator.OrchestratorV2)({ - streamDomainEvents: Stream.make({ - id: EventId.make("idle-completed"), - type: "run.updated", - threadId, - runId, - occurredAt: at(), - payload: data.runs[0]!, - }), - dispatch: () => - Effect.sync(() => { - dispatches++; - return { sequence: 1, storedEvents: [] }; - }), - }), - Layer.mock(ProjectionStore.ProjectionStoreV2)({ - getThread: () => Effect.succeed(data.thread), - getThreadRecords: () => - Effect.sync(() => { - historyReads++; - return data; - }), - }), - Layer.mock(LastUserInput.LastUserInput)({ atMs: () => Effect.succeed(null) }), - Layer.mock(ServerSettings.ServerSettingsService)({ - getSettings: Effect.succeed({ - ...DEFAULT_SERVER_SETTINGS, - idleCompaction: test.mode, - providerInstances: - "unconfigured" in test - ? {} - : { - [selectedInstance]: { - driver, - enabled: test.enabled, - config: { idleCompaction: test.override }, - }, - }, - projectSettingsOverrides: test.projectDisabled - ? { - [data.thread.projectId]: { - providerInstances: { [selectedInstance]: { enabled: false } }, - }, - } - : {}, - }), - }), - ); - yield* Effect.gen(function* () { - const service = yield* IdleCompactionService.make; - yield* service.start(); - yield* Deferred.await(done); - }).pipe(Effect.provide(dependencies), Effect.withTracer(tracer)); - expect(historyReads).toBe(test.reads); - expect(dispatches).toBe(test.reads); - }), - ); - }, - ); - - it.effect("keeps the latest run's compaction when an earlier run reports completed again", () => - Effect.scoped( - Effect.gen(function* () { -======= return Effect.gen(function* () { ->>>>>>> upstream/main yield* TestClock.setTime(NOW_MS); const selectedInstance = ProviderInstanceId.make( "instance" in test ? test.instance : "claudeAgent", @@ -517,6 +399,7 @@ describe("IdleCompactionService", () => { ), }), }), + Layer.mock(LastUserInput.LastUserInput)({ atMs: () => Effect.succeed(null) }), Layer.mock(ServerSettings.ServerSettingsService)({ getSettings: Effect.succeed({ ...DEFAULT_SERVER_SETTINGS, diff --git a/apps/server/src/orchestration-v2/Orchestrator.ts b/apps/server/src/orchestration-v2/Orchestrator.ts index 9cbe11b63d2c6..dfce0ea977d39 100644 --- a/apps/server/src/orchestration-v2/Orchestrator.ts +++ b/apps/server/src/orchestration-v2/Orchestrator.ts @@ -774,9 +774,6 @@ function cancelledAppOwnedTask( }; } -<<<<<<< origin/main -// Provider wakes and delegated completions can start follow-ups. Monitor updates only report progress. -======= // A workspace change detaches the session, which can settle the calling run at once. Queuing its // follow-up in a later command would let a delegated task report its result before that exists. function metadataUpdateContinuation( @@ -797,8 +794,7 @@ function metadataUpdateContinuation( }; } -// Provider wakes can start follow-up work; monitor updates only report progress. ->>>>>>> upstream/main +// Provider wakes and delegated completions can start follow-ups. Monitor updates only report progress. // Dispatch takes the parent's lock for follow-ups because intake writes the parent. function mayStartSubagentFollowup( command: Extract, diff --git a/apps/server/src/orchestration-v2/ProjectionStore.ts b/apps/server/src/orchestration-v2/ProjectionStore.ts index c836f0df3d711..eb1005572291b 100644 --- a/apps/server/src/orchestration-v2/ProjectionStore.ts +++ b/apps/server/src/orchestration-v2/ProjectionStore.ts @@ -95,11 +95,8 @@ import type * as Statement from "effect/sql/Statement"; import { MCP_APP_OUTPUT_KEY } from "@t3tools/shared/mcpApp"; import { SEND_TO_USER_PAYLOAD_LIKE } from "@t3tools/shared/displayModes"; import { threadHtmlRenderAttachmentIds } from "../attachmentStore.ts"; -<<<<<<< origin/main import * as ShownHistory from "../fork/shownHistory/ShownHistory.ts"; -======= import { readableSearchText } from "./messageSearchIndex.ts"; ->>>>>>> upstream/main import { isFoldableWorkItem, isThreadHistoryUserTurn, @@ -6988,7 +6985,6 @@ export const layer: Layer.Layer = sql .withTransaction( Effect.gen(function* () { -<<<<<<< origin/main const shown = workMode === "work" ? null : ShownHistory.shownCursorOf(cursor); if (shown !== null) return ( @@ -7000,9 +6996,6 @@ export const layer: Layer.Layer = inheritedRunFork, )) ?? (yield* new ProjectionStoreThreadNotFoundError({ threadId })) ); - const index = yield* readTimelineIndex(threadId, new Set(), workMode !== undefined); - if (index.records.thread.deletedAt !== null) -======= const withWork = workMode !== undefined; // A jump to a target entry selects from the whole index. const local = @@ -7012,7 +7005,6 @@ export const layer: Layer.Layer = const full = local === null ? yield* readSnapshotTimelineIndex(threadId, withWork) : null; if ((local ?? full)?.records.thread.deletedAt !== null) ->>>>>>> upstream/main return yield* new ProjectionStoreThreadNotFoundError({ threadId }); const revisions = yield* sql<{ sequence: number; diff --git a/apps/server/src/orchestration-v2/ProviderTurnControlService.ts b/apps/server/src/orchestration-v2/ProviderTurnControlService.ts index 7b79d99333da8..d9e0064daf544 100644 --- a/apps/server/src/orchestration-v2/ProviderTurnControlService.ts +++ b/apps/server/src/orchestration-v2/ProviderTurnControlService.ts @@ -17,13 +17,9 @@ import * as Option from "effect/Option"; import * as Schema from "effect/Schema"; import * as Stream from "effect/Stream"; -<<<<<<< origin/main -import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter"; -import * as DisplayModeWrap from "../fork/displayModeWrap/DisplayModeWrap.ts"; -======= import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter"; +import * as DisplayModeWrap from "../fork/displayModeWrap/DisplayModeWrap.ts"; import * as EventSink from "./EventSink.ts"; ->>>>>>> upstream/main import * as ProjectionStore from "./ProjectionStore.ts"; import * as ProviderSessionManager from "./ProviderSessionManager.ts"; @@ -460,9 +456,7 @@ export const layer: Layer.Layer< }, }) .pipe( -<<<<<<< origin/main Effect.tap(() => wrapped.accepted), -======= Effect.catchTags({ ProviderAdapterSteerDeclinedError: (cause) => Effect.fail( @@ -475,7 +469,6 @@ export const layer: Layer.Layer< }), ), }), ->>>>>>> upstream/main Effect.catch((cause) => Effect.gen(function* () { if (isProviderTurnControlError(cause)) return yield* cause; diff --git a/apps/server/src/orchestration-v2/ProviderTurnStartService.ts b/apps/server/src/orchestration-v2/ProviderTurnStartService.ts index 7e79ef06f3591..a905868298cf2 100644 --- a/apps/server/src/orchestration-v2/ProviderTurnStartService.ts +++ b/apps/server/src/orchestration-v2/ProviderTurnStartService.ts @@ -35,12 +35,8 @@ import * as GitWorkflowService from "../git/GitWorkflowService.ts"; import * as ProjectService from "../project/ProjectService.ts"; import * as ProviderAuthService from "../provider/ProviderAuthService.ts"; import * as ServerSettings from "../serverSettings.ts"; -<<<<<<< origin/main import * as DisplayModeWrap from "../fork/displayModeWrap/DisplayModeWrap.ts"; -import { makeIsManagedWorktreePath } from "../worktreesDirectory.ts"; -======= import { makeRestoreMissingWorktree } from "../workspace/restoreMissingWorktree.ts"; ->>>>>>> upstream/main import * as EventSink from "./EventSink.ts"; import * as ProviderUsageAnalytics from "../telemetry/ProviderUsageAnalytics.ts"; import * as ContextHandoffService from "./ContextHandoffService.ts"; @@ -167,76 +163,9 @@ export const layer: Layer.Layer< const providerSessions = yield* ProviderSessionManager.ProviderSessionManagerV2; const runExecution = yield* RunExecutionService.RunExecutionServiceV2; const runtimePolicy = yield* RuntimePolicy.RuntimePolicyV2; -<<<<<<< origin/main const displayModeWrap = yield* DisplayModeWrap.orUnchanged; - const isManagedWorktreePath = yield* makeIsManagedWorktreePath; - - const resolveRecreateBase = Effect.fn("ProviderTurnStartService.resolveRecreateBase")( - function* (cwd: string) { - // Recovery can follow an external checkout, before the status cache expires. - yield* gitWorkflow.invalidateLocalStatus(cwd); - const { refName: currentBranch } = yield* gitWorkflow.localStatus({ cwd }); - if (currentBranch !== null) { - const refName = `refs/heads/${currentBranch}`; - return { refName, baseRefName: refName }; - } - if (yield* gitWorkflow.hasCommit({ cwd, refName: "refs/remotes/origin/HEAD" })) { - const { commitSha } = yield* gitWorkflow.resolveRemoteTrackingCommit({ - cwd, - refName: "HEAD", - fallbackRemoteName: "origin", - }); - // Start from the commit so the thread branch does not track the default branch. - return { refName: commitSha, baseRefName: "refs/remotes/origin/HEAD" }; - } - if (yield* gitWorkflow.hasCommit({ cwd, refName: "HEAD" })) { - return { refName: "HEAD", baseRefName: undefined }; - } - return null; - }, - ); - - const recreateMissingWorktree = Effect.fn("ProviderTurnStartService.recreateMissingWorktree")( - function* (input: { - readonly cwd: string; - readonly worktreePath: string; - readonly branch: string; - }) { - const { cwd, worktreePath, branch } = input; - yield* gitWorkflow.pruneWorktrees({ cwd }); - const localBranchNames = yield* gitWorkflow.listLocalBranchNames(cwd); - if (localBranchNames.includes(branch)) { - yield* gitWorkflow.createWorktree({ cwd, refName: branch, path: worktreePath }); - return; - } - // Push keeps the tracking ref current, so recovery reads it without fetching. - const pushedRef = `refs/remotes/origin/${branch}`; - if (yield* gitWorkflow.hasCommit({ cwd, refName: pushedRef })) { - yield* gitWorkflow.createWorktree({ - cwd, - refName: pushedRef, - newRefName: branch, - path: worktreePath, - }); - return; - } - const base = yield* resolveRecreateBase(cwd); - if (base === null) { - return yield* new WorktreeRecreateNoBaseError({ worktreePath, branch }); - } - yield* gitWorkflow.createWorktree({ - cwd, - refName: base.refName, - newRefName: branch, - ...(base.baseRefName === undefined ? {} : { baseRefName: base.baseRefName }), - path: worktreePath, - }); - }, - ); -======= const restoreMissingWorktree = yield* makeRestoreMissingWorktree; const turnItemPositions = yield* TurnItemPositionStore.TurnItemPositionStoreV2; ->>>>>>> upstream/main // Build draining callbacks outside startup scope so they cannot retain full thread history. const makeRunControls = (input: { @@ -821,7 +750,6 @@ export const layer: Layer.Layer< }); let effectiveHandoffs = handoffs; let resumeFellBack = false; -<<<<<<< origin/main const wrapInput = { threadId: run.threadId, message, @@ -832,19 +760,11 @@ export const layer: Layer.Layer< }; let wrapped = yield* displayModeWrap.wrapUserText(wrapInput); let userText = wrapped.text; - // Codex and Claude parse /goal from the prompt, so it goes verbatim and history waits a turn. - const goalDriver = session.driver === "codex" || session.driver === "claudeAgent"; -======= - const userText = projectComposerContextForProvider({ - text: message.text, - records: message.context?.records ?? [], - }); // Native goal commands go verbatim; handoff history waits a turn. const goalDriver = session.driver === "codex" || session.driver === "claudeAgent" || session.providerSession.capabilities.turns.supportsNativeGoals === true; ->>>>>>> upstream/main const goalCommand = goalDriver && parseGoalCommand(message) !== null; // The provider turn marks cancellation work delivered; restart continuations use their own text or resume natively. const noteContinuation = isRestartNoteContinuation( diff --git a/apps/server/src/orchestration-v2/ThreadFind.ts b/apps/server/src/orchestration-v2/ThreadFind.ts index 5f00e1396934c..c3951c525c6d7 100644 --- a/apps/server/src/orchestration-v2/ThreadFind.ts +++ b/apps/server/src/orchestration-v2/ThreadFind.ts @@ -417,9 +417,6 @@ export const makeThreadFind = Effect.fn("makeThreadFind")(function* ( const cached = documents.get(row.position); if (cached) return cached; const decoded = yield* decode(row); -<<<<<<< origin/main - const key = textKey(decoded.item, cwd, input.skills ?? [], sentTexts); -======= if ( decoded.item.type === "assistant_message" && decoded.item.text === "" && @@ -429,8 +426,7 @@ export const makeThreadFind = Effect.fn("makeThreadFind")(function* ( documents.set(row.position, document); return document; } - const key = textKey(decoded.item, cwd, input.skills ?? []); ->>>>>>> upstream/main + const key = textKey(decoded.item, cwd, input.skills ?? [], sentTexts); const segments = yield* Cache.get( key.text.length <= 32_768 ? textCache.text : textCache.largeText, key, diff --git a/apps/server/src/provider/ClaudeProvider.ts b/apps/server/src/provider/ClaudeProvider.ts index d5155a0a4dab1..5a4ca4b615aca 100644 --- a/apps/server/src/provider/ClaudeProvider.ts +++ b/apps/server/src/provider/ClaudeProvider.ts @@ -308,13 +308,10 @@ export type ClaudeCapabilitiesProbe = { /** Undefined means get_usage failed; absent windows on success mean no subscription windows, as with API keys. */ readonly usage?: Pick; readonly usageCheckedAt?: string; -<<<<<<< origin/main readonly usageReadAt?: string | undefined; readonly usageError?: { readonly message: string }; -======= /** Each settings source's `maxEffortLevel` caps; Claude Code clamps every higher effort. */ readonly effortCapSources?: ReadonlyArray; ->>>>>>> upstream/main }; // `getSettings` exists at runtime but is missing from the SDK's `Query` type, and older CLIs diff --git a/apps/server/src/provider/CodexProvider.ts b/apps/server/src/provider/CodexProvider.ts index 846fd5c4b49b6..aa633a339dfbc 100644 --- a/apps/server/src/provider/CodexProvider.ts +++ b/apps/server/src/provider/CodexProvider.ts @@ -378,11 +378,7 @@ export function applyPreferredCodexDefaultModel( }); } -<<<<<<< origin/main -export function applyConfiguredCodexServiceTier( -======= function mapCodexOptionDescriptors( ->>>>>>> upstream/main models: ReadonlyArray, update: ( descriptors: ReadonlyArray, @@ -422,7 +418,7 @@ function withConfiguredSelectDefault( ); } -function applyConfiguredCodexServiceTier( +export function applyConfiguredCodexServiceTier( models: ReadonlyArray, serviceTier: string | undefined, ): ReadonlyArray { diff --git a/apps/server/src/provider/Drivers/AntigravityDriver.test.ts b/apps/server/src/provider/Drivers/AntigravityDriver.test.ts index 447745fc673a0..e3e2400f62bb6 100644 --- a/apps/server/src/provider/Drivers/AntigravityDriver.test.ts +++ b/apps/server/src/provider/Drivers/AntigravityDriver.test.ts @@ -444,6 +444,18 @@ it.layer(layerTest)("AntigravityDriver", (it) => { .map((request) => request.params?.value), ).toEqual(["default"]); } + + // Fork: a user's own agy keeps its own state, so it gets no profile flags. + h.controls.selected = { ...h.controls.selected, managedVersionDirectory: null }; + const userThreadId = ThreadId.make("thread-antigravity-user-agy"); + const userSession = yield* h.instance.orchestrationAdapter.openSession({ + threadId: userThreadId, + providerSessionId: ProviderSessionId.make("provider-session-user-agy"), + modelSelection, + runtimePolicy, + }); + yield* userSession.ensureThread({ threadId: userThreadId, modelSelection, runtimePolicy }); + expect(h.launches.at(-1)?.args).toEqual(["acp"]); }), ); diff --git a/apps/server/src/provider/Drivers/AntigravityDriver.ts b/apps/server/src/provider/Drivers/AntigravityDriver.ts index 5159788e5a373..07284659ecaec 100644 --- a/apps/server/src/provider/Drivers/AntigravityDriver.ts +++ b/apps/server/src/provider/Drivers/AntigravityDriver.ts @@ -32,8 +32,9 @@ import { } from "../../textGeneration/AntigravityTextGeneration.ts"; import { antigravityRuntimeState, - managedAntigravityRuntimeState, + profileAntigravityRuntimeState, removeAntigravityRuntimeSessionFiles, + withUserAgyState, } from "../../fork/antigravityCliRuntime/antigravityCliRuntime.ts"; import { makeAntigravityAuth, type AntigravityAuth } from "../AntigravityAuth.ts"; import * as AntigravityInstallation from "../AntigravityInstallation.ts"; @@ -187,7 +188,7 @@ export const AntigravityDriver: ProviderDriver< Effect.map((executable) => antigravityRuntimeState(executable, { profileDirectory, userHome, path }), ), - Effect.orElseSucceed(() => managedAntigravityRuntimeState(profileDirectory)), + Effect.orElseSucceed(() => profileAntigravityRuntimeState(profileDirectory)), ); const continuationIdentity = defaultProviderContinuationIdentity({ driverKind: DRIVER, @@ -280,14 +281,17 @@ export const AntigravityDriver: ProviderDriver< runtimeVersion: executable.version, authMethod: auth.authMethod, childProcessSpawner: spawner, - spawn: buildAntigravityAcpSpawnInput({ - installation: executable, - profile, - cwd: input.cwd, - baseEnv: processEnvironment, - auth, - runtimeTempDirectory, - }), + spawn: withUserAgyState( + executable, + buildAntigravityAcpSpawnInput({ + installation: executable, + profile, + cwd: input.cwd, + baseEnv: processEnvironment, + auth, + runtimeTempDirectory, + }), + ), }).pipe(Effect.provideService(SecureRandom.SecureRandom, random)); return { ...runtime, diff --git a/apps/server/src/provider/Drivers/CodexDriver.ts b/apps/server/src/provider/Drivers/CodexDriver.ts index 5b90e72c9e7d0..f8a753169b54a 100644 --- a/apps/server/src/provider/Drivers/CodexDriver.ts +++ b/apps/server/src/provider/Drivers/CodexDriver.ts @@ -253,9 +253,6 @@ export const CodexDriver: ProviderDriver< Effect.map((value) => value.models), ), compatibility: installation.compatibility, - models: Effect.suspend(() => snapshot.getSnapshot).pipe( - Effect.map((value) => value.models), - ), }, ).pipe( Effect.mapError( diff --git a/apps/server/src/provider/ProviderInstanceRegistry.test.ts b/apps/server/src/provider/ProviderInstanceRegistry.test.ts index ee76643f77f38..707275afc97d2 100644 --- a/apps/server/src/provider/ProviderInstanceRegistry.test.ts +++ b/apps/server/src/provider/ProviderInstanceRegistry.test.ts @@ -50,7 +50,6 @@ import { makeProviderInstanceRegistry } from "./ProviderInstanceRegistry.ts"; import { ProviderDriverError } from "./Errors.ts"; import * as ProviderInstallationGate from "./ProviderInstallationGate.ts"; import * as ProviderOrchestrationAdapterInfrastructure from "./ProviderOrchestrationAdapterInfrastructure.ts"; -import * as SqlitePersistence from "../persistence/Sqlite.ts"; import * as PortScanner from "../preview/PortScanner.ts"; import * as ProviderHostLive from "./ProviderHostLive.ts"; import * as SqlitePersistence from "../persistence/Sqlite.ts"; diff --git a/apps/server/src/provider/ProviderInstanceRegistryHydration.ts b/apps/server/src/provider/ProviderInstanceRegistryHydration.ts index 8a492c2ecedb0..f1f0ba8b59874 100644 --- a/apps/server/src/provider/ProviderInstanceRegistryHydration.ts +++ b/apps/server/src/provider/ProviderInstanceRegistryHydration.ts @@ -17,7 +17,6 @@ import * as FileSystem from "effect/FileSystem"; import * as Layer from "effect/Layer"; import type * as SqlClient from "effect/sql/SqlClient"; import * as Path from "effect/Path"; -import type * as SqlClient from "effect/sql/SqlClient"; import * as Stream from "effect/Stream"; import * as ManagedProviders from "../policy/managedProviders.ts"; @@ -42,8 +41,6 @@ type ProviderInstanceRegistryHydrationEnv = | ProviderHost.ProviderHost > | Settings.ServerSettingsService - // The display mode note after a compaction reads the told record. - | SqlClient.SqlClient | BackgroundPolicy.BackgroundPolicy | ServerConfig.ServerConfig | Path.Path diff --git a/apps/server/src/provider/ProviderOrchestrationAdapterInfrastructure.ts b/apps/server/src/provider/ProviderOrchestrationAdapterInfrastructure.ts index 6b52b371b5716..95e2bb62c2c76 100644 --- a/apps/server/src/provider/ProviderOrchestrationAdapterInfrastructure.ts +++ b/apps/server/src/provider/ProviderOrchestrationAdapterInfrastructure.ts @@ -41,11 +41,7 @@ export const layer = Layer.mergeAll( ClaudeAdapterV2.layerQueryRunner, CodexAdapterV2.layerAppServerClientFactory, CursorAgentSdk.layer.pipe(Layer.provideMerge(CursorSdk.layer)), -<<<<<<< origin/main DisplayModeCompactionNote.layer, - IdAllocator.layer, -======= layerIdAllocator, ->>>>>>> upstream/main ProviderContinuationRequests.layer, ); diff --git a/apps/server/src/provider/ProviderRegistry.test.ts b/apps/server/src/provider/ProviderRegistry.test.ts index b3ee88f0c90a9..564a90f40e6ce 100644 --- a/apps/server/src/provider/ProviderRegistry.test.ts +++ b/apps/server/src/provider/ProviderRegistry.test.ts @@ -66,7 +66,6 @@ import * as OpenCodeServerLedger from "@t3tools/provider-opencode/server/OpenCod import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers"; import * as ProviderInstallationGate from "./ProviderInstallationGate.ts"; import * as ProviderInstanceRegistryHydration from "./ProviderInstanceRegistryHydration.ts"; -import * as SqlitePersistence from "../persistence/Sqlite.ts"; import * as PortScanner from "../preview/PortScanner.ts"; import * as ServerConfig from "../config.ts"; import * as ServerSettingsModule from "../serverSettings.ts"; @@ -3554,9 +3553,6 @@ it.layer( const layerProviderRegistry = ProviderRegistry.layer.pipe( Layer.provideMerge( ProviderInstanceRegistryHydration.layer.pipe( -<<<<<<< origin/main - Layer.provide(Layer.merge(PortScanner.layerTest, SqlitePersistence.layerMemory)), -======= Layer.provide( Layer.mergeAll( PortScanner.layerTest, @@ -3564,7 +3560,6 @@ it.layer( SqlitePersistence.layerMemory, ), ), ->>>>>>> upstream/main ), ), Layer.provideMerge(AntigravityInstallation.AntigravityInstallation.layer), @@ -3684,9 +3679,6 @@ it.layer( const layerProviderRegistry = ProviderRegistry.layer.pipe( Layer.provideMerge( ProviderInstanceRegistryHydration.layer.pipe( -<<<<<<< origin/main - Layer.provide(Layer.merge(PortScanner.layerTest, SqlitePersistence.layerMemory)), -======= Layer.provide( Layer.mergeAll( PortScanner.layerTest, @@ -3694,7 +3686,6 @@ it.layer( SqlitePersistence.layerMemory, ), ), ->>>>>>> upstream/main ), ), Layer.provideMerge(AntigravityInstallation.AntigravityInstallation.layer), @@ -3831,9 +3822,6 @@ it.layer( readSeed = false; const services = yield* Layer.build( ProviderInstanceRegistryHydration.layer.pipe( -<<<<<<< origin/main - Layer.provide(Layer.merge(PortScanner.layerTest, SqlitePersistence.layerMemory)), -======= Layer.provide( Layer.mergeAll( PortScanner.layerTest, @@ -3841,7 +3829,6 @@ it.layer( SqlitePersistence.layerMemory, ), ), ->>>>>>> upstream/main ), ).pipe(Effect.provide(dependencies)); failCurrentRead = input.failCurrentRead ?? false; diff --git a/apps/server/src/provider/acp/AntigravityAcpSupport.ts b/apps/server/src/provider/acp/AntigravityAcpSupport.ts index 743caafa10cc7..7fd64e2534fa7 100644 --- a/apps/server/src/provider/acp/AntigravityAcpSupport.ts +++ b/apps/server/src/provider/acp/AntigravityAcpSupport.ts @@ -25,7 +25,6 @@ import { } from "../antigravityAuthSupport.ts"; import * as AcpSessionRuntime from "@t3tools/provider-acp/server/AcpSessionRuntime"; import packageJson from "../../../package.json" with { type: "json" }; -import { antigravityAdvertisesSystemPromptAppend } from "../../fork/antigravityCliRuntime/antigravityCliRuntime.ts"; import { normalizeAntigravitySessionUpdate } from "./AntigravityProtocol.ts"; export interface AntigravityAcpRuntimeInput extends Omit< @@ -96,11 +95,6 @@ const OPEN_MODEL_ACCESS_RELEASE = [1, 5, 1] as const; */ export const antigravityAppendsSystemPrompt = ( initializeResult: EffectAcpSchema.InitializeResponse, -<<<<<<< origin/main -) => - isQualifiedAntigravityRelease(initializeResult.agentInfo?.version) || - antigravityAdvertisesSystemPromptAppend(initializeResult); -======= ) => { if (isQualifiedAntigravityRelease(initializeResult.agentInfo?.version)) return true; const extension = initializeResult.agentCapabilities?._meta?.antigravity; @@ -110,7 +104,6 @@ export const antigravityAppendsSystemPrompt = ( extension.systemPrompt.append === true ); }; ->>>>>>> upstream/main export function antigravitySessionMeta( initializeResult: EffectAcpSchema.InitializeResponse, diff --git a/apps/server/src/provider/acp/AntigravityTurnOutcome.test.ts b/apps/server/src/provider/acp/AntigravityTurnOutcome.test.ts index 03f6d8fcf181f..e8c091f58b978 100644 --- a/apps/server/src/provider/acp/AntigravityTurnOutcome.test.ts +++ b/apps/server/src/provider/acp/AntigravityTurnOutcome.test.ts @@ -7,7 +7,7 @@ import * as FileSystem from "effect/FileSystem"; import * as Path from "effect/Path"; import type * as EffectAcpSchema from "effect-acp/compat"; -import { managedAntigravityRuntimeState } from "../../fork/antigravityCliRuntime/antigravityCliRuntime.ts"; +import { profileAntigravityRuntimeState } from "../../fork/antigravityCliRuntime/antigravityCliRuntime.ts"; import { watchAntigravityPromptOutcome } from "./AntigravityTurnOutcome.ts"; const USER_INPUT = 14; @@ -66,7 +66,7 @@ describe("watchAntigravityPromptOutcome", () => { ) => Effect.gen(function* () { const check = yield* watchAntigravityPromptOutcome( - managedAntigravityRuntimeState(profileDirectory), + profileAntigravityRuntimeState(profileDirectory), sessionId, ); appendSteps(steps); @@ -195,7 +195,7 @@ describe("watchAntigravityPromptOutcome", () => { path.join(conversations, `${own}.db`), ); const linked = yield* watchAntigravityPromptOutcome( - managedAntigravityRuntimeState(profileDirectory), + profileAntigravityRuntimeState(profileDirectory), own, ); append(peer, ERROR_MESSAGE, QUOTA_ERROR); @@ -206,7 +206,7 @@ describe("watchAntigravityPromptOutcome", () => { yield* fs.remove(path.join(conversations, `${own}.db`)); yield* fs.writeFileString(path.join(conversations, `${own}.db`), "not a database"); const corrupt = yield* watchAntigravityPromptOutcome( - managedAntigravityRuntimeState(profileDirectory), + profileAntigravityRuntimeState(profileDirectory), own, ); assert.isUndefined(yield* corrupt({ stopReason: "end_turn" })); diff --git a/apps/server/src/provider/agentContextBudget.json b/apps/server/src/provider/agentContextBudget.json index 62c0ca7abdb74..2e2f37cb50643 100644 --- a/apps/server/src/provider/agentContextBudget.json +++ b/apps/server/src/provider/agentContextBudget.json @@ -1,11 +1,5 @@ { -<<<<<<< origin/main - "claudeSystemAppendBytes": 5238, - "codexAdditionalContextBytes": 6968, - "mcpToolListJsonBytes": 52257 -======= - "claudeSystemAppendBytes": 5594, - "codexAdditionalContextBytes": 7324, - "mcpToolListJsonBytes": 48094 ->>>>>>> upstream/main + "claudeSystemAppendBytes": 5294, + "codexAdditionalContextBytes": 7024, + "mcpToolListJsonBytes": 52134 } diff --git a/apps/server/src/provider/codexLaunchArgs.test.ts b/apps/server/src/provider/codexLaunchArgs.test.ts index fc0d674aef634..6676d1ae9101e 100644 --- a/apps/server/src/provider/codexLaunchArgs.test.ts +++ b/apps/server/src/provider/codexLaunchArgs.test.ts @@ -5,7 +5,7 @@ import { describe, it } from "vite-plus/test"; import { codexAppServerArgs, codexExecLaunchArgs, -<<<<<<< origin/main + codexMcpListLaunchArgs, resolveCodexSkillRoot, } from "./codexLaunchArgs.ts"; @@ -21,10 +21,6 @@ describe("resolveCodexSkillRoot", () => { NodeAssert.equal(resolveCodexSkillRoot({ T3CODE_CODEX_SKILL_ROOT: " " }), undefined); }); }); -======= - codexMcpListLaunchArgs, -} from "./codexLaunchArgs.ts"; ->>>>>>> upstream/main describe("codexAppServerArgs", () => { it.each([ diff --git a/apps/server/src/storageCleanup.ts b/apps/server/src/storageCleanup.ts index 84c3a6233d1cd..99097501d49d7 100644 --- a/apps/server/src/storageCleanup.ts +++ b/apps/server/src/storageCleanup.ts @@ -679,17 +679,7 @@ const make = Effect.gen(function* () { ); if (result === null) return null; if (result.exitCode === 0 || result.exitCode === allowedExitCode) return result; -<<<<<<< origin/main - const stderr = result.stderr.toLowerCase(); - // Newer Git (seen on 2.56, not 2.43) reports a dangling gitfile this way. - if ( - stderr.includes("not a git repository") || - stderr.includes("does not point to a valid repository") - ) - return null; -======= if (isNonRepositoryGitStderr(result.stderr)) return null; ->>>>>>> upstream/main return yield* failure( result.stderr.trim().split(/\r?\n/)[0]?.slice(0, 1000) || "command failed", ); diff --git a/apps/server/src/usage/cliproxyApi.test.ts b/apps/server/src/usage/cliproxyApi.test.ts index f86cdf34cf30b..c9d18cf3bac8b 100644 --- a/apps/server/src/usage/cliproxyApi.test.ts +++ b/apps/server/src/usage/cliproxyApi.test.ts @@ -49,25 +49,16 @@ const encodeJson = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown)); function fixture( options: { -<<<<<<< origin/main - accounts?: Array< - (typeof accounts)[number] & { - label?: string; - disabled?: boolean; - id_token: { chatgpt_account_id: string; plan_type?: string; chatgpt_plan_type?: string }; - } - >; -======= accounts?: Array<{ id: string; auth_index: string; provider: string; + label?: string; email?: string; disabled?: boolean; project_id?: string; id_token?: { chatgpt_account_id: string; plan_type?: string; chatgpt_plan_type?: string }; }>; ->>>>>>> upstream/main upstream?: (request: RequestBody) => { status: number; body: unknown }; cooldownStatus?: number; } = {}, diff --git a/apps/server/src/usage/cliproxyApi.ts b/apps/server/src/usage/cliproxyApi.ts index 6809386feeb92..ade68671e0a51 100644 --- a/apps/server/src/usage/cliproxyApi.ts +++ b/apps/server/src/usage/cliproxyApi.ts @@ -23,11 +23,6 @@ import { import { codexPlanLabel } from "../provider/CodexProvider.ts"; import { codexRateLimitsToLimits } from "../provider/codexUsageLimits.ts"; import { claudeUsageResponseToLimits } from "../provider/claudeUsageLimits.ts"; -<<<<<<< origin/main -import { makeUnavailableUsageLimits } from "@t3tools/provider-core/server/usageLimits"; -import { withAccountReadAt } from "../fork/usageReadAt/usageReadAt.ts"; -import * as ClaudeHub from "../fork/claudeUsageSource/claudeHub.ts"; -======= import { antigravityAccountFingerprint, antigravitySummaryWindows, @@ -37,7 +32,8 @@ import { makeUnavailableUsageLimits, makeUsageLimits, } from "@t3tools/provider-core/server/usageLimits"; ->>>>>>> upstream/main +import { withAccountReadAt } from "../fork/usageReadAt/usageReadAt.ts"; +import * as ClaudeHub from "../fork/claudeUsageSource/claudeHub.ts"; /** A hub with its management key already read from wherever the setting keeps it. */ export interface CliproxyHub { @@ -52,11 +48,8 @@ const AuthFile = Schema.Struct({ label: Schema.optional(Schema.String), email: Schema.optional(Schema.String), disabled: Schema.optional(Schema.Boolean), -<<<<<<< origin/main organization_uuid: Schema.optional(Schema.String), -======= project_id: Schema.optional(Schema.String), ->>>>>>> upstream/main id_token: Schema.optional( Schema.Struct({ chatgpt_account_id: Schema.optional(Schema.String), @@ -225,6 +218,7 @@ interface HubProvider { } const listedIdentity = (account: AuthFile) => ({ + ...(account.label?.trim() ? { label: account.label.trim() } : {}), ...(account.email ? { email: account.email } : {}), ...(account.id_token?.chatgpt_account_id?.trim() ? { workspaceId: account.id_token.chatgpt_account_id.trim() } @@ -256,7 +250,8 @@ const CODEX_HUB: HubProvider = { : {}), }), read: Effect.fnUntraced(function* ({ account, call, checkedAt }) { - const usage = yield* decodeCodexUsage(yield* call(`${CODEX_BASE}/usage`)); + const body = yield* call(`${CODEX_BASE}/usage`); + const usage = yield* decodeCodexUsage(body); const toWindow = (window: typeof CodexWindow.Type | null | undefined) => window ? { @@ -271,7 +266,7 @@ const CODEX_HUB: HubProvider = { const next = available?.[0]; const planType = usage.plan_type ?? account.id_token?.plan_type ?? account.id_token?.chatgpt_plan_type; - return { + return withAccountReadAt(body, { ...listedIdentity(account), plan: codexPlanLabel(planType), usageLimits: { @@ -297,7 +292,7 @@ const CODEX_HUB: HubProvider = { } : {}), }, - }; + }); }), }; @@ -315,13 +310,10 @@ const HUB_PROVIDERS = new Map([ header: () => ({ Authorization: "Bearer $TOKEN$", "anthropic-beta": "oauth-2025-04-20", - // The OAuth usage endpoint can return 429 without a Claude Code user agent. - "User-Agent": "claude-code/2.1.273", }), read: Effect.fnUntraced(function* ({ account, call, checkedAt }) { - const usage = yield* decodeClaudeUsage( - yield* call("https://api.anthropic.com/api/oauth/usage"), - ); + const body = yield* call(ClaudeHub.CLAUDE_USAGE_URL); + const usage = yield* decodeClaudeUsage(body); const model_scoped = (usage.limits ?? []).flatMap((limit) => limit.kind === "weekly_scoped" && limit.scope?.model && typeof limit.percent === "number" ? [ @@ -340,14 +332,14 @@ const HUB_PROVIDERS = new Map([ spend: usage.spend, extra_usage: usage.extra_usage ?? null, }; - return { + return yield* ClaudeHub.withClaudeUsageAnswer(body, { ...listedIdentity(account), plan: "Claude Subscription", usageLimits: claudeUsageResponseToLimits({ checkedAt, response: { rate_limits_available: true, rate_limits: rateLimits }, }).limits, - }; + }); }), }, ], @@ -457,24 +449,6 @@ export const makeCliproxyApi = Effect.gen(function* () { url: string, data?: unknown, ) { -<<<<<<< origin/main - const header = - account.provider === "codex" - ? { - Authorization: "Bearer $TOKEN$", - "Content-Type": "application/json", - "OpenAI-Beta": "codex-1", - Originator: "Codex Desktop", - ...(account.id_token?.chatgpt_account_id - ? { "Chatgpt-Account-Id": account.id_token.chatgpt_account_id } - : {}), - } - : { - Authorization: "Bearer $TOKEN$", - "anthropic-beta": "oauth-2025-04-20", - }; -======= ->>>>>>> upstream/main const raw = yield* management(hub, "api-call", { auth_index: account.auth_index, method: data === undefined ? "GET" : "POST", @@ -497,101 +471,10 @@ export const makeCliproxyApi = Effect.gen(function* () { provider: HubProvider, ) { const checkedAt = DateTime.formatIso(yield* DateTime.now); -<<<<<<< origin/main - const base = { - id: account.id, - driver: ProviderDriverKind.make(account.provider === "codex" ? "codex" : "claudeAgent"), - ...(account.label?.trim() ? { label: account.label.trim() } : {}), - ...(account.email ? { email: account.email } : {}), - ...(account.id_token?.chatgpt_account_id?.trim() - ? { workspaceId: account.id_token.chatgpt_account_id.trim() } - : {}), - }; - const read = Effect.gen(function* () { - if (account.provider === "claude") { - const body = yield* apiCall(hub, account, ClaudeHub.CLAUDE_USAGE_URL); - const usage = yield* decodeClaudeUsage(body); - const model_scoped = (usage.limits ?? []).flatMap((limit) => - limit.kind === "weekly_scoped" && limit.scope?.model && typeof limit.percent === "number" - ? [ - { - display_name: limit.scope.model.display_name, - utilization: limit.percent, - resets_at: limit.resets_at ?? null, - }, - ] - : [], - ); - const rateLimits = { - five_hour: usage.five_hour ?? null, - seven_day: usage.seven_day ?? null, - model_scoped, - spend: usage.spend, - extra_usage: usage.extra_usage ?? null, - }; - return yield* claude.withUsageAnswer(body, { - ...base, - plan: "Claude Subscription", - usageLimits: claudeUsageResponseToLimits({ - checkedAt, - response: { - rate_limits_available: true, - rate_limits: rateLimits, - }, - }).limits, - }); - } - const body = yield* apiCall(hub, account, `${CODEX_BASE}/usage`); - const usage = yield* decodeCodexUsage(body); - const toWindow = (window: typeof CodexWindow.Type | null | undefined) => - window - ? { - usedPercent: window.used_percent, - resetsAt: window.reset_at ?? null, - ...(window.limit_window_seconds === undefined - ? {} - : { windowDurationMins: window.limit_window_seconds / 60 }), - } - : null; - const available = yield* credits(hub, account).pipe(Effect.orElseSucceed(() => undefined)); - const next = available?.[0]; - const planType = - usage.plan_type ?? account.id_token?.plan_type ?? account.id_token?.chatgpt_plan_type; - return withAccountReadAt(body, { - ...base, - plan: codexPlanLabel(planType), - usageLimits: { - ...codexRateLimitsToLimits({ - checkedAt, - snapshot: { - planType: planType ?? null, - primary: toWindow(usage.rate_limit?.primary_window), - secondary: toWindow(usage.rate_limit?.secondary_window), - }, - }), - ...(available - ? { - resetCredits: { - availableCount: available.length, - ...(next - ? { - nextCreditId: next.id, - nextExpiresAt: DateTime.formatIso(DateTime.makeUnsafe(next.expires_at)), - } - : {}), - }, - } - : {}), - }, - }); - }); - return yield* read.pipe( -======= const call: HubCall = (url, data) => apiCall(hub, account, provider.header(account, platform, architecture), url, data); const reading = yield* provider.read({ account, call, checkedAt }).pipe( Effect.provideService(Digest.Digest, digest), ->>>>>>> upstream/main Effect.orElseSucceed(() => ({ ...listedIdentity(account), usageLimits: makeUnavailableUsageLimits({ diff --git a/apps/web/src/components/AppSidebarLayout.tsx b/apps/web/src/components/AppSidebarLayout.tsx index fcb12b732ac6e..641f0458ac9e6 100644 --- a/apps/web/src/components/AppSidebarLayout.tsx +++ b/apps/web/src/components/AppSidebarLayout.tsx @@ -333,13 +333,9 @@ function SidebarControl({ const router = useRouter(); const usagePageOpen = useLocation({ select: (location) => location.pathname === "/usage" }); const keybindings = useAtomValue(primaryServerKeybindingsAtom); -<<<<<<< origin/main - const { setOpen, toggleSidebar, isMobile, mobileSheetMounted } = useSidebar(); + const { setOpen, toggleSidebar } = useSidebar(); useWhiteboardSidebarStartState(boardHidden, sidebarFits, setOpen); -======= - const { toggleSidebar } = useSidebar(); const mobileSidebarSheetMounted = useMobileSidebarSheetMounted(); ->>>>>>> upstream/main const isSidebarVisible = useSidebarVisibility(); const environmentIdentificationMode = useEnvironmentIdentificationMode(); const stageBackdropVariant = useSidebarStageBackdropVariant(environmentIdentificationMode); diff --git a/apps/web/src/components/ChatMarkdown.browser.test.tsx b/apps/web/src/components/ChatMarkdown.browser.test.tsx index 525be68e6ae54..e57bf8ddec328 100644 --- a/apps/web/src/components/ChatMarkdown.browser.test.tsx +++ b/apps/web/src/components/ChatMarkdown.browser.test.tsx @@ -165,22 +165,6 @@ function buttonsLabelled(container: HTMLElement, label: string) { ); } -<<<<<<< origin/main -it("keeps single tildes in assistant replies and renders double-tilde strikethrough", async () => { - setup(); - const text = "1~3月的数据不完整，建议使用4~9月的数据进行对比。 ~~删除~~"; - await using screen = await renderText(text, { assistantReply: true, isStreaming: true }); - await vi.waitFor(() => { - expect(screen.container.textContent).toBe( - "1~3月的数据不完整，建议使用4~9月的数据进行对比。 删除", - ); - expect([...screen.container.querySelectorAll("del")].map((node) => node.textContent)).toEqual([ - "删除", - ]); - }); - await screen.rerender(); - await vi.waitFor(() => expect(screen.container.querySelectorAll("del")).toHaveLength(2)); -======= const SOURCE_NUMBER_PLUGINS = [remarkEnableOrderedListNumbers]; it("keeps decimal markers in nested user lists while documents keep their counter styles", async () => { @@ -211,7 +195,22 @@ it("keeps decimal markers in nested user lists while documents keep their counte expect( [...preview!.querySelectorAll("ol")].map((list) => getComputedStyle(list).listStyleType), ).toEqual(["decimal", "lower-alpha", "lower-roman"]); ->>>>>>> upstream/main +}); + +it("keeps single tildes in assistant replies and renders double-tilde strikethrough", async () => { + setup(); + const text = "1~3月的数据不完整，建议使用4~9月的数据进行对比。 ~~删除~~"; + await using screen = await renderText(text, { assistantReply: true, isStreaming: true }); + await vi.waitFor(() => { + expect(screen.container.textContent).toBe( + "1~3月的数据不完整，建议使用4~9月的数据进行对比。 删除", + ); + expect([...screen.container.querySelectorAll("del")].map((node) => node.textContent)).toEqual([ + "删除", + ]); + }); + await screen.rerender(); + await vi.waitFor(() => expect(screen.container.querySelectorAll("del")).toHaveLength(2)); }); it("shows unavailable audio when a workspace embed has no thread", async () => { diff --git a/apps/web/src/components/ChatMarkdown.tsx b/apps/web/src/components/ChatMarkdown.tsx index ca18386f5ea15..e262aa769086e 100644 --- a/apps/web/src/components/ChatMarkdown.tsx +++ b/apps/web/src/components/ChatMarkdown.tsx @@ -19,12 +19,9 @@ import { CHAT_MARKDOWN_REMARK_PLUGINS, CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS, CHAT_MARKDOWN_REHYPE_PLUGINS, -<<<<<<< origin/main ASSISTANT_MARKDOWN_REMARK_PLUGINS, ASSISTANT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS, -======= remarkAssistantInsights, ->>>>>>> upstream/main } from "@t3tools/shared/markdownPipeline"; import { useAtomValue } from "@effect/atom-react"; import { diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx index 31bc555766552..520dd9720f1b4 100644 --- a/apps/web/src/components/ChatView.tsx +++ b/apps/web/src/components/ChatView.tsx @@ -594,15 +594,7 @@ export default function ChatView(props: ChatViewProps) { select: (location) => location.state.assistantCitationActivation ?? location.state.__TSR_key, }); const citationLocation = { href: citationHref, key: citationKey }; -<<<<<<< origin/main - const citationRequest = (() => { - const citation = timelineCitation(assistantCitationFromLocation(citationLocation.href)); - return citation && citation.environmentId === environmentId && citation.threadId === threadId - ? { citation, key: citationLocation.key ?? citationLocation.href } - : null; - })() as AssistantCitationRequest | null; -======= - const locationCitation = assistantCitationFromLocation(citationLocation.href); + const locationCitation = timelineCitation(assistantCitationFromLocation(citationLocation.href)); const citationActivation = citationLocation.key ?? citationLocation.href; const citationRequest = ( locationCitation && @@ -612,7 +604,6 @@ export default function ChatView(props: ChatViewProps) { : null ) as AssistantCitationRequest | null; useSideChatCitationReveal(embedded ? null : routeThreadRef, locationCitation, citationActivation); ->>>>>>> upstream/main const citationHistory = useCitedHistory(citationRequest); const { resolvedTheme } = useTheme(); const composerRuntimeMode = useComposerDraftStore( @@ -3415,14 +3406,8 @@ export default function ChatView(props: ChatViewProps) { {isWorkspaceFileDragActive ? : null} >>>>>> upstream/main onOpenProviderSetup={openProviderSetupStable} threadId={activeThread.id} threadError={timelineThreadError} @@ -3511,15 +3496,10 @@ export default function ChatView(props: ChatViewProps) { onOpenThread={onOpenRelatedThreadStable} parentThreadLink={parentThreadLink} workflowOpening={workflowOpening} -<<<<<<< origin/main supportsConversationRollback={ supportsConversationRollback && subThreadDraft === null } - threadStartCheckpointReady={threadStartCheckpointReady} -======= - supportsConversationRollback={supportsConversationRollback} threadStartCheckpointAvailable={threadStartCheckpointAvailable} ->>>>>>> upstream/main availableRevertTurnCounts={availableRevertTurnCounts} onRevertToTurnCount={onRevertTimelineTurnStable} onUseArtifactTemplate={insertArtifactTemplateStable} @@ -4067,17 +4047,13 @@ export default function ChatView(props: ChatViewProps) { ) : null} -<<<<<<< origin/main {subThreadDraft === null ? ( - + ) : null} -======= - ->>>>>>> upstream/main {embedded ? null : } {subThreadDraft === null ? : null} diff --git a/apps/web/src/components/ComposerPromptEditorTiptap.tsx b/apps/web/src/components/ComposerPromptEditorTiptap.tsx index d3a4258f0ef00..aab2102ec6a97 100644 --- a/apps/web/src/components/ComposerPromptEditorTiptap.tsx +++ b/apps/web/src/components/ComposerPromptEditorTiptap.tsx @@ -488,16 +488,11 @@ function ComposerCitationNodeView({ node, editor, getPos }: NodeViewProps) { const end = pos + current.nodeSize; const from = removeOnCancel.before && doc.textBetween(pos - 1, pos) === " " ? pos - 1 : pos; const to = removeOnCancel.after && doc.textBetween(end, end + 1) === " " ? end + 1 : end; -<<<<<<< origin/main - const chain = focusDashboardCitationSource(citation, commentTarget?.sourceAnchor) - ? editor.chain() - : editor.chain().focus(); - chain.deleteRange({ from, to }).run(); -======= // A read-only composer (dictation) can still receive a new citation, so Cancel must undo it. const chain = editor.chain(); - (editor.isEditable ? chain.focus() : chain).deleteRange({ from, to }).run(); ->>>>>>> upstream/main + const focusComposer = + !focusDashboardCitationSource(citation, commentTarget?.sourceAnchor) && editor.isEditable; + (focusComposer ? chain.focus() : chain).deleteRange({ from, to }).run(); }; const sentRef = useRef(false); diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx index 6219b9547a6f1..d78aa1194fb29 100644 --- a/apps/web/src/components/Sidebar.tsx +++ b/apps/web/src/components/Sidebar.tsx @@ -233,14 +233,11 @@ import { useActiveRowReveal, } from "./sidebar/routeReveal"; import { stackedThreadToast, toastManager } from "./ui/toast"; -<<<<<<< origin/main +import { titleRegenerationToast } from "./threadTitleRegenerationToast"; import { displayModeMenuItems, useDisplayModeMenuAction, } from "../fork/displayMode/useThreadDisplayMode"; -======= -import { titleRegenerationToast } from "./threadTitleRegenerationToast"; ->>>>>>> upstream/main import { copyThreadReference } from "../lib/copyThreadReference"; import { threadChipCopyTarget } from "@t3tools/client-runtime/thread-reference"; import { Button } from "./ui/button"; diff --git a/apps/web/src/components/chat/AssistantCitationChip.tsx b/apps/web/src/components/chat/AssistantCitationChip.tsx index ba0edec665d51..8c79c5dcc913a 100644 --- a/apps/web/src/components/chat/AssistantCitationChip.tsx +++ b/apps/web/src/components/chat/AssistantCitationChip.tsx @@ -81,7 +81,9 @@ function ResponseCard({ leading: boolean; trailing: boolean; }) { - const linkProps = useCitationSourceLinkProps(citation); + const { onClick, ...linkProps } = useCitationSourceLinkProps(citation); + // Fork: a Dashboard quote has no message to go to. + const navigable = !isDashboardCitation(citation); return ( // One copy boundary for the card and its comment, so a copied card carries the comment once. ) => { - if (event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) { - return; - } - event.preventDefault(); - void navigate(assistantCitationNavigation(citation)); - }, - }; const navigable = !isDashboardCitation(citation); const composerSourceLink = !navigable ? ( @@ -283,9 +271,6 @@ export function AssistantCitationChip({ ) : ( -======= - const composerSourceLink = ( ->>>>>>> upstream/main ); -<<<<<<< origin/main - if (!composer) { - return ( - } - label={label} - accessibleLabel={`Quoted assistant text: ${label}`} - copyMarkdown={serializeAssistantCitation(citation)} - > -
- - {navigable ? ( - } />} - > - - ) : null} -
- - ); - } -======= ->>>>>>> upstream/main return ( >>>>>> upstream/main /> {/* Rows span the header row's width so the radios align with the question text and the shortcut column sits under the dismiss button. */}
diff --git a/apps/web/src/components/chat/MathTypeset.tsx b/apps/web/src/components/chat/MathTypeset.tsx index e684685e349f4..e70b9787e2161 100644 --- a/apps/web/src/components/chat/MathTypeset.tsx +++ b/apps/web/src/components/chat/MathTypeset.tsx @@ -26,26 +26,12 @@ function typeset(tex: string, display: boolean): string { }; let html = ""; try { -<<<<<<< origin/main - html = katex.renderToString(tex, { - displayMode: display, - output: "htmlAndMathml", - throwOnError: true, - // No \href, \url, \htmlClass, or other commands that emit active HTML. - trust: false, - strict: "ignore", - maxSize: 20, - maxExpand: 1000, - macros: mathMacros(), - }); -======= - html = katex.renderToString(tex, options); ->>>>>>> upstream/main + html = katex.renderToString(tex, { ...options, macros: mathMacros() }); } catch { const repaired = escapeLiteralPercents(tex); if (repaired !== tex) { try { - html = katex.renderToString(repaired, options); + html = katex.renderToString(repaired, { ...options, macros: mathMacros() }); } catch { // Unfinished or unsupported TeX stays readable as its source. } diff --git a/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx b/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx index 8ac12b54a4e50..3e6dddf967d68 100644 --- a/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx +++ b/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx @@ -865,7 +865,7 @@ describe("MessagesTimeline messages", () => { expect((globalThis as { __t3Xss?: number }).__t3Xss).toBeUndefined(); }); - it("keeps single tildes in user paths literal without changing double tildes or assistant text", async () => { + it("keeps single tildes in user and assistant paths literal without changing double tildes", async () => { const source = "Install the skill as ~/folder-a/skills/x, then follow the guide (~/folder-a/guide.md)."; await using screen = await renderTimeline([ @@ -879,9 +879,8 @@ describe("MessagesTimeline messages", () => { expect(user?.textContent).toContain(source); expect(user?.querySelector("del")).toBeNull(); expect(doubleTilde?.querySelector("del")?.textContent).toBe("the old plan"); - expect(assistant?.querySelector("del")?.textContent).toBe( - "/folder-a/skills/x, then follow the guide (", - ); + // Fork: agent text keeps single tildes too. + expect(assistant?.querySelector("del")).toBeNull(); }); it("renders sanitized raw HTML in assistant messages", async () => { diff --git a/apps/web/src/components/chat/ProposedPlanCard.tsx b/apps/web/src/components/chat/ProposedPlanCard.tsx index b1136741f4687..156953ef56027 100644 --- a/apps/web/src/components/chat/ProposedPlanCard.tsx +++ b/apps/web/src/components/chat/ProposedPlanCard.tsx @@ -202,7 +202,7 @@ export const ProposedPlanCard = memo(function ProposedPlanCard({ threadRef={threadRef} isStreaming={false} headingLevelOffset={3} - // Fork: selects upstream's single-tilde list, so a plan's "1~2" keeps its tilde. + // Fork: selects the agent-text single-tilde list, so a plan's "1~2" keeps its tilde. assistantReply /> ) : ( @@ -213,7 +213,7 @@ export const ProposedPlanCard = memo(function ProposedPlanCard({ threadRef={threadRef} isStreaming={false} headingLevelOffset={3} - // Fork: selects upstream's single-tilde list, so a plan's "1~2" keeps its tilde. + // Fork: selects the agent-text single-tilde list, so a plan's "1~2" keeps its tilde. assistantReply /> )} diff --git a/apps/web/src/components/chat/TimelineAssistantRows.tsx b/apps/web/src/components/chat/TimelineAssistantRows.tsx index c2e7c7d0ee8e2..71357d8f6f962 100644 --- a/apps/web/src/components/chat/TimelineAssistantRows.tsx +++ b/apps/web/src/components/chat/TimelineAssistantRows.tsx @@ -57,11 +57,8 @@ export function AssistantTimelineRow({ row }: { row: Extract >>>>>> upstream/main cwd={ctx.markdownCwd} threadRef={ctx.threadRef ?? undefined} isStreaming={Boolean(row.message.streaming)} @@ -82,15 +79,12 @@ export function AssistantTimelineRow({ row }: { row: Extract ) : null} -<<<<<<< origin/main -======= {!row.showAssistantMeta && row.projectedItem?.item.status === "interrupted" ? (
) : null} ->>>>>>> upstream/main {row.showAssistantMeta ? ( ))} @@ -480,7 +480,7 @@ function WorkEntryLogRow(props: WorkEntryRowProps) { )} cwd={ctx.markdownCwd} parseRawHtml={false} - // Fork: selects upstream's single-tilde list, so a thinking line's "1~2" keeps its tilde. + // Fork: selects the agent-text single-tilde list, so a thinking line's "1~2" keeps its tilde. assistantReply extraRemarkPlugins={ workEntry.toolLifecycleStatus === "inProgress" diff --git a/apps/web/src/components/chat/TimelineWorkGroupRows.tsx b/apps/web/src/components/chat/TimelineWorkGroupRows.tsx index dd4ce97dd34bd..de903a78ce1f1 100644 --- a/apps/web/src/components/chat/TimelineWorkGroupRows.tsx +++ b/apps/web/src/components/chat/TimelineWorkGroupRows.tsx @@ -615,7 +615,7 @@ export function LiveWorkEntryTimelineRow({ text={thoughtLine} cwd={ctx.markdownCwd} parseRawHtml={false} - // Fork: selects upstream's single-tilde list, so a thinking line's "1~2" keeps its tilde. + // Fork: selects the agent-text single-tilde list, so a thinking line's "1~2" keeps its tilde. assistantReply extraRemarkPlugins={THOUGHT_PREVIEW_PLUGINS} /> @@ -638,7 +638,7 @@ export function LiveWorkEntryTimelineRow({ text={(row.entry.detail ?? label).slice(0, THOUGHT_PREVIEW_SOURCE_MAX_LENGTH)} cwd={ctx.markdownCwd} parseRawHtml={false} - // Fork: selects upstream's single-tilde list, so a thinking line's "1~2" keeps its tilde. + // Fork: selects the agent-text single-tilde list, so a thinking line's "1~2" keeps its tilde. assistantReply extraRemarkPlugins={row.active ? THINKING_PREVIEW_PLUGINS : THOUGHT_PREVIEW_PLUGINS} /> diff --git a/apps/web/src/components/chat/UserMessageContextChips.tsx b/apps/web/src/components/chat/UserMessageContextChips.tsx index 390d35dfdc9e2..ef258d2c890a2 100644 --- a/apps/web/src/components/chat/UserMessageContextChips.tsx +++ b/apps/web/src/components/chat/UserMessageContextChips.tsx @@ -1,5 +1,6 @@ import { documentChipKindForFileName } from "~/pierre-icons"; import { isSvgAttachment } from "@t3tools/shared/image"; +import { CHAT_USER_MARKDOWN_REMARK_PLUGINS } from "@t3tools/shared/markdownPipeline"; import { useRenderedAppearance } from "../../hooks/useTheme"; import { PullRequestGlyph } from "../pullRequest/pullRequestIcons"; import { ReadOnlySourcePreview } from "../files/AttachmentFilePreview"; @@ -580,8 +581,8 @@ function UserMessageReviewCommentCard({ comment }: { comment: ReviewCommentConte skills={ctx.skills} parseRawHtml={false} lineBreaks - // Fork: selects upstream's single-tilde list, so a sent "1~2" keeps its tilde. - assistantReply + // Fork: a sent "1~2" keeps its tilde, as in the user's message. + extraRemarkPlugins={CHAT_USER_MARKDOWN_REMARK_PLUGINS} />
)} diff --git a/apps/web/src/components/composerContextPresentation.tsx b/apps/web/src/components/composerContextPresentation.tsx index 2fa0fdacff149..185a29ec5183d 100644 --- a/apps/web/src/components/composerContextPresentation.tsx +++ b/apps/web/src/components/composerContextPresentation.tsx @@ -1,5 +1,6 @@ import ChatMarkdown from "./ChatMarkdown"; import { isSvgAttachment } from "@t3tools/shared/image"; +import { CHAT_USER_MARKDOWN_REMARK_PLUGINS } from "@t3tools/shared/markdownPipeline"; import { ReadOnlySourcePreview } from "./files/AttachmentFilePreview"; import type { EnvironmentContextRecord, @@ -298,8 +299,8 @@ function ComposerReviewCommentDetails({ comment }: { comment: ReviewCommentConte ) : null} {comment.diff.trim() ? ( diff --git a/apps/web/src/composerDraftStore.ts b/apps/web/src/composerDraftStore.ts index 1cca212110669..ab06148827235 100644 --- a/apps/web/src/composerDraftStore.ts +++ b/apps/web/src/composerDraftStore.ts @@ -1579,12 +1579,8 @@ function resolveComposerThreadId( } return ( state.draftThreadsByThreadKey[normalizedTarget]?.threadId ?? -<<<<<<< origin/main threadOfSubThreadDraft(normalizedTarget)?.threadId ?? - null -======= queuedRunEditThreadId(normalizedTarget) ->>>>>>> upstream/main ); } diff --git a/apps/web/src/fork/cjkLinkEnd.test.tsx b/apps/web/src/fork/cjkLinkEnd.test.tsx index c94f7b93ec078..a9300c21c65d6 100644 --- a/apps/web/src/fork/cjkLinkEnd.test.tsx +++ b/apps/web/src/fork/cjkLinkEnd.test.tsx @@ -48,7 +48,6 @@ describe("remarkEndLinksAtCjkPunctuation", () => { ], ["（see https://example.com/a)，然后", [bare("https://example.com/a")]], ['"https://example.com/a"，然后', [bare("https://example.com/a")]], - ["[https://example.com/a]，然后", [bare("https://example.com/a")]], [ "https://example.com/a，另见https://example.com/b，又见https://example.com/c", ["a", "b", "c"].map((path) => bare(`https://example.com/${path}`)), @@ -57,16 +56,6 @@ describe("remarkEndLinksAtCjkPunctuation", () => { "https://example.com/a，另见https://example.com/b?u=https://example.com/c", [bare("https://example.com/a"), bare("https://example.com/b?u=https://example.com/c")], ], - [ - "https://example.com/a，www.example.com/b?u=https://example.com/c", - [ - bare("https://example.com/a"), - bare( - "http://www.example.com/b?u=https://example.com/c", - "www.example.com/b?u=https://example.com/c", - ), - ], - ], ["https://example.com/a，见xhttps://example.com/b", [bare("https://example.com/a")]], ["https://example.com/a，见www.example.com/b", [bare("https://example.com/a")]], [ @@ -106,7 +95,6 @@ describe("remarkEndLinksAtCjkPunctuation", () => { "见 https://example.com/wiki/苹果（消歧义）", [bare("https://example.com/wiki/苹果（消歧义）")], ], - ["见 https://example.com/report（1）.pdf 页", [bare("https://example.com/report（1）.pdf")]], ["(see https://example.com/a), then", [bare("https://example.com/a")]], [ "see https://example.com/a_(b) and https://example.com/c.", @@ -117,4 +105,20 @@ describe("remarkEndLinksAtCjkPunctuation", () => { ])("leaves links that need no CJK ending as they were: %j", (source, links) => { expect(anchors(source)).toEqual(links); }); + + // Upstream's CJK autolink pass ends these first. The first two differ from GFM at a space. + it.each([ + ["[https://example.com/a]，然后", [bare("https://example.com/a]")]], + [ + "https://example.com/a，www.example.com/b?u=https://example.com/c", + [ + bare("https://example.com/a"), + bare("http://www.example.com/b?u=", "www.example.com/b?u="), + bare("https://example.com/c"), + ], + ], + ["见 https://example.com/report（1）.pdf 页", [bare("https://example.com/report")]], + ])("keeps upstream's ending of %j", (source, links) => { + expect(anchors(source)).toEqual(links); + }); }); diff --git a/apps/web/src/fork/dashboard/dashboardCitationChip.browser.test.tsx b/apps/web/src/fork/dashboard/dashboardCitationChip.browser.test.tsx index 201d61967ce12..6cf9d1fc649b4 100644 --- a/apps/web/src/fork/dashboard/dashboardCitationChip.browser.test.tsx +++ b/apps/web/src/fork/dashboard/dashboardCitationChip.browser.test.tsx @@ -1,10 +1,12 @@ import { EnvironmentId, MessageId, ThreadId } from "@t3tools/contracts"; import { describe, expect, it } from "vite-plus/test"; -import { page, userEvent } from "vite-plus/test/browser"; import "~/index.css"; -import { AssistantCitationChip } from "../../components/chat/AssistantCitationChip"; +import { + AssistantCitationChip, + AssistantCitationEmbed, +} from "../../components/chat/AssistantCitationChip"; import { render } from "../../../test/render"; const quote = (messageId: string) => ({ @@ -26,24 +28,22 @@ const cases = [ describe("a quote chip", () => { it.each(cases)( - "for $source in a sent message offers Go to source: $navigable", + "for $source in a sent message goes to the source: $navigable", async ({ messageId, navigable }) => { - await using screen = await render(); - await userEvent.click( - screen.getByRole("button", { name: "Quoted assistant text: Pick A. Show details" }), + await using screen = await render( + , ); - await expect.element(page.getByRole("blockquote")).toHaveTextContent("Pick A"); + const card = screen.container.querySelector("a")!; - expect(page.getByText("Go to source").query() !== null).toBe(navigable); + expect(card.hasAttribute("href")).toBe(navigable); + expect(card.getAttribute("aria-disabled") === "true").toBe(!navigable); }, ); it.each(cases)( "for $source in the composer links its label to the source: $navigable", async ({ messageId, navigable }) => { - await using screen = await render( - , - ); + await using screen = await render(); expect(screen.container.querySelector("a") !== null).toBe(navigable); expect(screen.container.textContent).toContain("Pick A"); diff --git a/apps/web/src/fork/dashboard/dashboardCitationComment.browser.test.tsx b/apps/web/src/fork/dashboard/dashboardCitationComment.browser.test.tsx index 7c47e8dfa7ae6..a5cdec231cdbd 100644 --- a/apps/web/src/fork/dashboard/dashboardCitationComment.browser.test.tsx +++ b/apps/web/src/fork/dashboard/dashboardCitationComment.browser.test.tsx @@ -72,7 +72,10 @@ function Composer(props: { onCitationDraftSave={(replacedValue, savedValue) => { if (replacedValue === prompt) setPrompt(savedValue); }} - onCitationSubmitAndSend={() => setPrompt("")} + onCitationSubmitAndSend={() => { + setPrompt(""); + return true; + }} onPaste={() => {}} /> ); diff --git a/apps/web/src/fork/subThreads/subThreadTimeline.test.ts b/apps/web/src/fork/subThreads/subThreadTimeline.test.ts index 81e9efa18e7cb..0bd554517bcba 100644 --- a/apps/web/src/fork/subThreads/subThreadTimeline.test.ts +++ b/apps/web/src/fork/subThreads/subThreadTimeline.test.ts @@ -45,6 +45,7 @@ const EMPTY: ComposerThreadDraftState = { reviewComments: [], threadContexts: [], environmentContexts: [], + replyTo: null, modelSelectionByProvider: {}, activeProvider: null, runtimeMode: null, diff --git a/apps/web/src/terminal-links.ts b/apps/web/src/terminal-links.ts index 550fa65b473a7..de0dff074ac76 100644 --- a/apps/web/src/terminal-links.ts +++ b/apps/web/src/terminal-links.ts @@ -1,6 +1,3 @@ -<<<<<<< origin/main -import { blankCjkPunctuation } from "./fork/cjkLinkEnd"; -======= import { formatFilePathPosition, parseFileUrlHref, @@ -9,7 +6,7 @@ import { } from "@t3tools/shared/fileLinks"; import { safeDecodeURIComponent } from "@t3tools/shared/markdownLinks"; import { stripSlashPrefixedWindowsDrive } from "@t3tools/shared/path"; ->>>>>>> upstream/main +import { blankCjkPunctuation } from "./fork/cjkLinkEnd"; import { isMacPlatform } from "./lib/utils"; export type TerminalLinkKind = "url" | "path"; @@ -138,15 +135,11 @@ export function extractTerminalLinks(line: string): TerminalLinkMatch[] { [...prose.matchAll(REQUEST_ROUTE_PATTERN), ...prose.matchAll(SCHEME_URL_PATTERN)], (match) => ({ start: match.index, end: match.index + match[0].length }), ); -<<<<<<< origin/main - const urlMatches = collectMatches(prose, "url", URL_PATTERN, promptMatches); -======= const remoteTails = Array.from(line.matchAll(SCP_REMOTE_PATTERN), (match) => ({ start: match.index + match[0].indexOf(":") + 1, end: match.index + match[0].length, })); - const urlMatches = collectMatches(line, "url", URL_PATTERN, promptMatches); ->>>>>>> upstream/main + const urlMatches = collectMatches(prose, "url", URL_PATTERN, promptMatches); const quotedMatches = collectMatches(line, "path", QUOTED_FILE_PATH_PATTERN, [ ...promptMatches, ...urlMatches, diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts index 46a50a99f69ec..3e71566ad8c20 100644 --- a/apps/web/vite.config.ts +++ b/apps/web/vite.config.ts @@ -22,11 +22,8 @@ import { loadRepoEnv } from "../../scripts/lib/public-config"; import { thirdPartyLicensesPlugin } from "../../scripts/lib/third-party-licenses"; import { tailwindPlugins } from "./vite/tailwind"; import { warmBundledDevPlugin } from "./vite/warmBundledDev"; -<<<<<<< origin/main -import { whiteboardBuildPlugin } from "./vite/fork/whiteboardBuild"; -======= import { formatAppDisplayName, resolveWebAppStageLabel } from "./src/branding.logic"; ->>>>>>> upstream/main +import { whiteboardBuildPlugin } from "./vite/fork/whiteboardBuild"; const repoEnv = loadRepoEnv(); Object.assign(process.env, repoEnv); @@ -330,11 +327,8 @@ export default defineConfig(() => { react({ compiler: true }), tailwindPlugins(bundledDev), warmBundledDevPlugin(), -<<<<<<< origin/main whiteboardBuildPlugin(), -======= bundledDev ? bundledDevStableNamesPlugin() : undefined, ->>>>>>> upstream/main ], optimizeDeps: { include: [ diff --git a/docs/user/providers-antigravity.md b/docs/user/providers-antigravity.md index 0d1d40d1627d9..3eb626e632b3f 100644 --- a/docs/user/providers-antigravity.md +++ b/docs/user/providers-antigravity.md @@ -1,12 +1,8 @@ # Antigravity T3 Code runs Google's official Antigravity ACP agent on your selected environment. -<<<<<<< origin/main -It has its own sign-in, separate from the Antigravity IDE or CLI, unless you -[use the Antigravity CLI](#use-the-antigravity-cli) as the runtime. Google controls -======= -T3 manages its own CLI installation and sign-in, separate from your terminal or IDE. Google controls ->>>>>>> upstream/main +T3 manages its own CLI installation and sign-in, separate from your terminal or IDE, unless you +[use your own Antigravity CLI](#use-a-manual-installation). Google controls which models and account access are available through this agent. ## Set up Antigravity @@ -67,30 +63,23 @@ Set **Binary path** to its `agy` executable and update it yourself. Leave the field blank to use the managed runtime, or a compatible executable on `PATH` if no managed runtime is installed. -<<<<<<< origin/main -### Use the Antigravity CLI - -Set **Binary path** to the `agy` executable of Antigravity CLI 1.5 or later to run -the CLI's own ACP mode instead of the managed runtime. - -The instance then has no private profile. The agent uses the CLI's own Google -login, settings, and state folder (`~/.gemini/antigravity-cli`), so sign in with -`agy` on the environment first. Every instance that points at the CLI shares that -login, and its sessions are stored with the CLI's own. +When **Binary path** names your own `agy` of Antigravity CLI 1.5 or later (a full +path, or `agy` to find it on `PATH`), the instance has no private profile. The agent uses the CLI's own Google login, settings, and state +folder (`~/.gemini/antigravity-cli`), so sign in with `agy` on the environment +first. Every instance that uses it shares that login, and its sessions are stored +with the CLI's own. The CLI's tool-permission setting decides whether it asks before a tool call. When it asks, T3 Code answers by the thread's [permission mode](./permission-modes.md). When the CLI is set to always proceed, tools run without asking in every mode. -Send `/compact` to have the CLI compact the thread's context. - **Usage > Limits** reads with the access the CLI last saved. T3 Code cannot renew that access, so once it expires the page says so until the CLI runs its next turn. T3 Code does not use the CLI for titles, commit messages, or other generated text while `~/.gemini/config` holds hooks or MCP servers, because they would run in those helper sessions too. Select another model for generated text. -======= + ## Update the managed runtime In web or desktop provider settings, choose **Update Antigravity** when an update @@ -102,7 +91,6 @@ Updating an older 1.4.5 installation migrates it to the native CLI. You may need sign in again after migration. Threads already running finish with their original runtime; new sessions use the updated release. Custom binary paths keep using the executable you selected. ->>>>>>> upstream/main ## Models and threads @@ -124,9 +112,8 @@ T3 Code keeps conversation history and file diffs, but Antigravity cannot rewind its conversation. Reverting a thread or editing and resubmitting an earlier turn is unavailable. Continue with a follow-up message or start a new thread. -Manual context compaction is unavailable through the managed runtime. Send `/clear` -when you need a fresh context, or [use the Antigravity CLI](#use-the-antigravity-cli), -which has `/compact`. +Send `/compact` to compact the thread's context. The older 1.4.5 runtime has no +manual compaction; send `/clear` when you need a fresh context, or update Antigravity. ### Skills and attachments diff --git a/evals/thread-titles/README.md b/evals/thread-titles/README.md index 0941096f87ef9..61282adbe612c 100644 --- a/evals/thread-titles/README.md +++ b/evals/thread-titles/README.md @@ -17,8 +17,4 @@ pnpm thread-titles --model --out runs/titles-new --baseline runs/t ## Add a case -<<<<<<< origin/main -Add an entry to `cases.ts` with an `id`, a `source`, the thread `messages`, the `previousTitle`, and a `rubric` that says what a good title names. A case can set `instructions`, the added instruction text under test, imported from its source. -======= -Add an entry to `cases.ts` with an `id`, a `source`, the thread `messages`, the `previousTitle`, an optional `projectTitle`, and a `rubric` that says what a good title names. ->>>>>>> upstream/main +Add an entry to `cases.ts` with an `id`, a `source`, the thread `messages`, the `previousTitle`, an optional `projectTitle`, and a `rubric` that says what a good title names. A case can set `instructions`, the added instruction text under test, imported from its source. diff --git a/evals/thread-titles/cases.ts b/evals/thread-titles/cases.ts index 14a91a4e40586..b7fb3a321645b 100644 --- a/evals/thread-titles/cases.ts +++ b/evals/thread-titles/cases.ts @@ -135,9 +135,6 @@ export const threadTitleEvaluationCases = [ ], rubric: "Keep title generation as the subject. Do not focus on filing the PR.", }, -<<<<<<< origin/main - ...subThreadSummaryCases, -======= { id: "project-name", source: "https://github.com/pingdotgg/t3code/pull/33418", @@ -156,7 +153,7 @@ export const threadTitleEvaluationCases = [ ], rubric: "Name the default config on init. Leave out Hyperdrive, the project name.", }, ->>>>>>> upstream/main + ...subThreadSummaryCases, ] satisfies ReadonlyArray<{ id: string; source: string; diff --git a/packages/provider-acp/src/server/adapter.ts b/packages/provider-acp/src/server/adapter.ts index 785c9ab0ec130..d9440398d3883 100644 --- a/packages/provider-acp/src/server/adapter.ts +++ b/packages/provider-acp/src/server/adapter.ts @@ -8157,20 +8157,6 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* ( resolveExtractedTextPath: host.resolveExtractedTextPath, }); const isNativeSlashCommand = userText.trimStart().startsWith("/"); -<<<<<<< origin/main - const text = t3AcpPromptWithInstructions({ - prompt: messageText, - state: instructionState, - provider: driver, - ...(previousInstructionState === undefined || compactionMarker !== undefined - ? {} - : { previousState: previousInstructionState }), - }); - if (text.length > 0) { - prompt.push({ type: "text", text }); - } -======= ->>>>>>> upstream/main const imageAttachments = turnInput.message.attachments.filter( isProviderNativeImageAttachment, ); @@ -8246,6 +8232,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* ( const text = t3AcpPromptWithInstructions({ prompt: messageText, state: instructionState, + provider: driver, ...(previousInstructionState === undefined || compactionMarker !== undefined ? {} : { previousState: previousInstructionState }), diff --git a/packages/provider-core/src/server/orchestrationInstructions.ts b/packages/provider-core/src/server/orchestrationInstructions.ts index 4cf957ab10278..fcbd05470e4fd 100644 --- a/packages/provider-core/src/server/orchestrationInstructions.ts +++ b/packages/provider-core/src/server/orchestrationInstructions.ts @@ -11,24 +11,13 @@ Ordinary coding tasks need no T3 tools. - Subagents: use your native tool when the child uses your provider, a model it offers and no settings beyond yours (Claude \`Agent\`, \`run_in_background:false\`; Codex \`spawn_agent\`, then wait). Use \`delegate_task\` for another provider's model, user-asked settings, a separate checkout (\`isolation:"worktree"\`), or \`delegate_task\` by name. A native type on another provider's model counts too. Background agent: \`delegate_task\`, never a background \`Agent\`. Workflow only when asked. - Call \`orchestrator_capabilities\` once per thread, before the first \`delegate_task\`. Again only after an error or a user-named provider change. Settings go in \`target.options\`. Provider or model unavailable: say so. Never switch unasked or fall back to native tools, Workflow or CLIs. Never make a child's checkout in the shell or in \`task\`. - Every new delegate review or re-check is a new \`delegate_task\` (brief, findings, objections), never a \`t3_thread_send\`. Fix small review findings yourself; start no delegate for them. When told to proceed without a delegate, or to run fewer, \`task_cancel\` the extras. Start no replacement. -<<<<<<< origin/main -- Follow a running delegate's \`next\`. Do not poll it (\`task_status\`, \`sleep\`, watchers, Monitor, ScheduleWakeup). Stop a delegate run you replace or no longer need with \`task_cancel\`, never \`t3_thread_interrupt\` on a \`childThreadId\`.`, - `- \`t3_thread_launch\` and \`create_threads\` make new top-level threads, only when the user asks for a new thread. "Subagent", "delegate", and "parallel" never mean one. Worktree thread: set \`workspaceStrategy\`. Honor a requested base. Otherwise, independent work uses the default branch as \`remote/branch\` with \`startFromOrigin:true\`; with no remote, use the local default. Required unpublished commits and dependent work use their local base. Shell worktrees do not bind it, and no checkout setup in its prompt. No \`workspaceStrategy\`: project root, not your worktree. -- Given a thread id, \`t3_thread_read\` it before you answer about it. -- Another machine: \`t3_environment_links\` lists linked ones. Pass its \`environmentId\` to a T3 tool to act there. Ids are then that machine's, so pass \`threadId\`. -- A machine the user names that is not linked ("delegate this to my vps"): call \`t3_environment_link\` with a \`hint\` from their words. Never ask for a pairing code in chat. -- In your reply, mention a thread by its \`link\`, verbatim. Never a plain title or bare id. -- A login, token, PIN, pairing code or sudo password only the user can give: call \`request_secret\`, not a chat ask or a handoff. Not for access you have. Sudo: if \`sudo -n \` says a password is required, use \`delivery: "file"\` and run \`sudo -S -p '' < "$file"\`; the password takes stdin, so give other input as a file argument. When asked only to schedule, \`schedule_task\` without running its prompt. -======= -- Follow a running delegate's \`next\`. Don't poll it (\`task_status\`, \`sleep\`, watchers, Monitor, ScheduleWakeup). Stop a delegate run you replace or no longer need with \`task_cancel\`, never \`t3_thread_interrupt\` on a \`childThreadId\`. -- As a subagent or child, do the work yourself. Start no subagents unless your task says to.`, +- Follow a running delegate's \`next\`. Don't poll it (\`task_status\`, \`sleep\`, watchers, Monitor, ScheduleWakeup). Stop a delegate run you replace or no longer need with \`task_cancel\`, never \`t3_thread_interrupt\` on a \`childThreadId\`.`, `- \`t3_thread_launch\` and \`create_threads\` make new top-level threads, only when the user asks for a new thread. "Subagent", "delegate", and "parallel" never mean one. Worktree thread: set \`workspaceStrategy\`. Honor a requested base. Otherwise independent work uses the default branch as \`remote/branch\` with \`startFromOrigin:true\`; with no remote, use the local default. Required unpublished commits and dependent work use their local base. Shell worktrees don't bind it, and no checkout setup in its prompt. No \`workspaceStrategy\`: project root, not your worktree. - Given a thread id, \`t3_thread_read\` it before you answer about it. Asked to settle a thread, this one too: \`t3_thread_organize\`. - Another machine: \`t3_environment_links\` lists linked ones. Pass its \`environmentId\` and that machine's \`threadId\` to T3 tools. - Unlinked ("delegate this to my vps"): \`t3_environment_link\` with a \`hint\` from the user's words, never a pairing code in chat. No link tools: say to enable Settings → Labs → Linked environments. - In your reply, mention a thread by its \`link\`, verbatim, never a plain title or bare id. - A login, token, PIN, pairing code or sudo password only the user can give: call \`request_secret\`, not a chat ask or a handoff. Not for access you have. Sudo: if \`sudo -n \` needs a password, use \`delivery: "file"\` and run \`sudo -S -p '' < "$file"\`; the password takes stdin, so give other input as a file argument. Asked only to schedule: \`schedule_task\` without running its prompt. ->>>>>>> upstream/main - T3 tools may load late. Try the name once before you call it absent.`, `### Visuals and preview diff --git a/packages/shared/src/markdownPipeline.ts b/packages/shared/src/markdownPipeline.ts index b527ca95b0ad7..79e73a62ef893 100644 --- a/packages/shared/src/markdownPipeline.ts +++ b/packages/shared/src/markdownPipeline.ts @@ -278,7 +278,12 @@ export const CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS: PluggableList = [ remarkNormalizeLinksAndTagInlineCode, ]; -<<<<<<< origin/main +// Users type paths like ~/a and (~/b, which GFM's single-tilde strikethrough hides as . +// Appended after the base list, this reconfigures its remark-gfm entry; ~~double~~ still strikes. +export const CHAT_USER_MARKDOWN_REMARK_PLUGINS: PluggableList = [ + [remarkGfm, { singleTilde: false }], +]; + export const ASSISTANT_MARKDOWN_REMARK_PLUGINS: PluggableList = [ ...CHAT_MARKDOWN_REMARK_PLUGINS, [remarkGfm, { singleTilde: false }], @@ -286,11 +291,6 @@ export const ASSISTANT_MARKDOWN_REMARK_PLUGINS: PluggableList = [ export const ASSISTANT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS: PluggableList = [ ...CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS, -======= -// Users type paths like ~/a and (~/b, which GFM's single-tilde strikethrough hides as . -// Appended after the base list, this reconfigures its remark-gfm entry; ~~double~~ still strikes. -export const CHAT_USER_MARKDOWN_REMARK_PLUGINS: PluggableList = [ ->>>>>>> upstream/main [remarkGfm, { singleTilde: false }], ]; diff --git a/packages/shared/src/threadFindText.ts b/packages/shared/src/threadFindText.ts index cd941855e43c0..68366f26ad60f 100644 --- a/packages/shared/src/threadFindText.ts +++ b/packages/shared/src/threadFindText.ts @@ -36,13 +36,8 @@ import { remarkAssistantInsights, CHAT_MARKDOWN_REHYPE_PLUGINS, CHAT_MARKDOWN_REMARK_PLUGINS, -<<<<<<< origin/main - ASSISTANT_MARKDOWN_REMARK_PLUGINS, - ASSISTANT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS, -======= CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS, CHAT_USER_MARKDOWN_REMARK_PLUGINS, ->>>>>>> upstream/main } from "./markdownPipeline.ts"; // Inline wrappers (including Shiki token spans) must not split a search phrase. @@ -85,34 +80,17 @@ export const THREAD_FIND_BLOCK_TAGS = new Set([ "ul", ]); -<<<<<<< origin/main -const assistantProcessor = unified() - .use(remarkParse) - .use(CHAT_MARKDOWN_REMARK_PLUGINS) - .use(remarkRehype, { allowDangerousHtml: true }) - .use(CHAT_MARKDOWN_REHYPE_PLUGINS); -const replyProcessor = unified() - .use(remarkParse) - .use(ASSISTANT_MARKDOWN_REMARK_PLUGINS) - .use(remarkRehype, { allowDangerousHtml: true }) - .use(CHAT_MARKDOWN_REHYPE_PLUGINS); -const replyBreaksProcessor = unified() - .use(remarkParse) - .use(ASSISTANT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS) - .use(remarkRehype, { allowDangerousHtml: true }) - .use(CHAT_MARKDOWN_REHYPE_PLUGINS); -// Fork: selects upstream's single-tilde list, as sent messages render, so find matches them. -const userProcessor = unified() - .use(remarkParse) - .use(ASSISTANT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS) -======= function assistantTextProcessor(lineBreaks = false, renderInsights = false) { - return unified() - .use(remarkParse) - .use(renderInsights ? [remarkAssistantInsights] : []) - .use(lineBreaks ? CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS : CHAT_MARKDOWN_REMARK_PLUGINS) - .use(remarkRehype, { allowDangerousHtml: true }) - .use(CHAT_MARKDOWN_REHYPE_PLUGINS); + return ( + unified() + .use(remarkParse) + .use(renderInsights ? [remarkAssistantInsights] : []) + .use(lineBreaks ? CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS : CHAT_MARKDOWN_REMARK_PLUGINS) + // Fork: agent text renders with single tildes kept, so find matches it. + .use(CHAT_USER_MARKDOWN_REMARK_PLUGINS) + .use(remarkRehype, { allowDangerousHtml: true }) + .use(CHAT_MARKDOWN_REHYPE_PLUGINS) + ); } const assistantProcessor = assistantTextProcessor(); const assistantBreaksProcessor = assistantTextProcessor(true); @@ -122,7 +100,6 @@ const userProcessor = unified() .use(remarkParse) .use(CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS) .use(CHAT_USER_MARKDOWN_REMARK_PLUGINS) ->>>>>>> upstream/main .use(remarkRehype, { allowDangerousHtml: true }); interface TextTree { @@ -143,18 +120,6 @@ function markdownThreadFindText( cwd?: string, skills: readonly InlineSkill[] = [], lineBreaks = false, -<<<<<<< origin/main - assistantReply = false, -): string[] { - const processor = userMessage - ? userProcessor - : !assistantReply - ? assistantProcessor - : lineBreaks - ? replyBreaksProcessor - : replyProcessor; - const tree = processor.runSync(processor.parse(markdown)); -======= renderInsights = false, ): string[] { const processor = userMessage @@ -168,7 +133,6 @@ function markdownThreadFindText( : insightProcessor : processor; const tree = renderer.runSync(renderer.parse(markdown), markdown); ->>>>>>> upstream/main const paths = [ ...extractMarkdownLinkHrefs(renderCodexInlineDirectivesAsMarkdown(markdown)), ...extractInlineCodeSpans(markdown).flatMap((span) => inlineCodeFilePathCandidate(span) ?? []), @@ -262,8 +226,7 @@ function markdownThreadFindText( export function searchablePlanSegments(markdown: string, cwd?: string): readonly string[] { return [ proposedPlanTitle(markdown) ?? "Proposed plan", - // Fork: selects upstream's single-tilde list, as plan cards render, so find matches them. - ...markdownThreadFindText(stripDisplayedPlanMarkdown(markdown), false, cwd, [], false, true), + ...markdownThreadFindText(stripDisplayedPlanMarkdown(markdown), false, cwd, []), ]; } diff --git a/packages/shared/src/usageLimits.test.ts b/packages/shared/src/usageLimits.test.ts index ddeebe3177077..ec91e459c3a79 100644 --- a/packages/shared/src/usageLimits.test.ts +++ b/packages/shared/src/usageLimits.test.ts @@ -922,50 +922,6 @@ describe("pools", () => { ).toEqual(["weekly", "weekly:secondary"]); }); -<<<<<<< origin/main - it("orders accounts by weekly reset, then by the first window for accounts without one", () => { - const account = (id: string, sessionReset: string, weeklyReset?: string) => ({ - id, - driver: claude, - email: `${id}@example.com`, - usageLimits: { - checkedAt, - windows: [ - { ...window, resetsAt: sessionReset }, - ...(weeklyReset ? [{ ...weekly, usedPercent: 20, resetsAt: weeklyReset }] : []), - ], - }, - }); - const input = new Map([ - [ - EnvironmentId.make("env-a"), - { - ...laptop, - serverConfig: { - providers: [], - usageLimitSources: [ - { - ...source, - accounts: [ - account("late-week", "2026-09-03T12:30:00.000Z", "2026-09-08T12:00:00.000Z"), - account("no-week-late", "2026-09-03T16:00:00.000Z"), - account("early-week", "2026-09-03T15:00:00.000Z", "2026-09-04T12:00:00.000Z"), - account("no-week-early", "2026-09-03T13:00:00.000Z"), - ], - }, - ], - }, - }, - ], - ]); - const [pool] = collectLimitPools(collectLimitAccounts(input), now); - expect(pool?.accounts.map((account) => account.email)).toEqual([ - "early-week@example.com", - "late-week@example.com", - "no-week-early@example.com", - "no-week-late@example.com", - ]); -======= it("weights pooled Codex quota and resets by each account's plan capacity", () => { const [pool] = collectLimitPools( collectLimitAccounts( @@ -1010,7 +966,50 @@ describe("pools", () => { restoresPercent, ]), ).toContainEqual(["pro@example.com", 95]); ->>>>>>> upstream/main + }); + + it("orders accounts by weekly reset, then by the first window for accounts without one", () => { + const account = (id: string, sessionReset: string, weeklyReset?: string) => ({ + id, + driver: claude, + email: `${id}@example.com`, + usageLimits: { + checkedAt, + windows: [ + { ...window, resetsAt: sessionReset }, + ...(weeklyReset ? [{ ...weekly, usedPercent: 20, resetsAt: weeklyReset }] : []), + ], + }, + }); + const input = new Map([ + [ + EnvironmentId.make("env-a"), + { + ...laptop, + serverConfig: { + providers: [], + usageLimitSources: [ + { + ...source, + accounts: [ + account("late-week", "2026-09-03T12:30:00.000Z", "2026-09-08T12:00:00.000Z"), + account("no-week-late", "2026-09-03T16:00:00.000Z"), + account("early-week", "2026-09-03T15:00:00.000Z", "2026-09-04T12:00:00.000Z"), + account("no-week-early", "2026-09-03T13:00:00.000Z"), + ], + }, + ], + }, + }, + ], + ]); + const [pool] = collectLimitPools(collectLimitAccounts(input), now); + expect(pool?.accounts.map((account) => account.email)).toEqual([ + "early-week@example.com", + "late-week@example.com", + "no-week-early@example.com", + "no-week-late@example.com", + ]); }); it("pools windows by id across accounts and orders resets by when they land", () => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fd94320868fc9..e67431e77db10 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11745,7 +11745,6 @@ packages: remark-breaks@4.0.0: resolution: {integrity: sha512-IjEjJOkH4FuJvHZVIW0QCDWxcG96kCq7An/KVH2NfJe6rKZU2AsHeB3OEjPNRxi4QC34Xdx7I2KGYn6IpT7gxQ==} -<<<<<<< origin/main remark-cjk-friendly@2.3.1: resolution: {integrity: sha512-f+pKZRxCRwNEGFBKNRAZAqU91GIK1SAo3ZyFHWRUgC9zcxRR0BXKd6YwqgSsxtW0rNpUDtONj7H5nje2WL3fcA==} engines: {node: '>=18'} @@ -11755,10 +11754,9 @@ packages: peerDependenciesMeta: '@types/mdast': optional: true -======= + remark-frontmatter@5.0.0: resolution: {integrity: sha512-XTFYvNASMe5iPN0719nPrdItC9aU0ssC4v14mH1BCi1u0n1gAocqcujWUrByftZTbLhRtiKRyjYTSIOcr69UVQ==} ->>>>>>> upstream/main remark-gfm@4.0.1: resolution: {integrity: sha512-1quofZ2RQ9EWdeN34S79+KExV1764+wCUGop5CPL1WGdD0ocPpu91lzPGbwWMECpEpd42kJGQwzRfyov9j4yNg==} @@ -22773,7 +22771,6 @@ snapshots: mdast-util-newline-to-break: 2.0.0 unified: 11.0.5 -<<<<<<< origin/main remark-cjk-friendly@2.3.1(@types/mdast@4.0.4)(micromark-util-types@2.0.2)(micromark@4.0.2(patch_hash=cb79edde7eca83bbcaaafb6ceb7b044b81b987314cde4910823b15257ecada67)(supports-color@8.1.1))(unified@11.0.5): dependencies: mdast-util-to-markdown-cjk-friendly: 1.0.0(@types/mdast@4.0.4)(micromark-util-types@2.0.2) @@ -22784,7 +22781,7 @@ snapshots: transitivePeerDependencies: - micromark - micromark-util-types -======= + remark-frontmatter@5.0.0(supports-color@8.1.1): dependencies: '@types/mdast': 4.0.4 @@ -22793,7 +22790,6 @@ snapshots: unified: 11.0.5 transitivePeerDependencies: - supports-color ->>>>>>> upstream/main remark-gfm@4.0.1(supports-color@8.1.1): dependencies: