From 28a420060b321ce3317f8529a5db5138af97c189 Mon Sep 17 00:00:00 2001 From: Sudharsan <126713117+Sidreyas@users.noreply.github.com> Date: Sun, 22 Nov 2026 11:06:26 +0530 Subject: [PATCH 1/8] fix(server): checkpoint repository scopes walk the project folder once per turn (#40671) Co-authored-by: Julius Marminge --- .../src/orchestration-v2/CheckpointService.ts | 9 ++++---- .../src/workspace/WorkspaceFolders.test.ts | 22 +++++++++++-------- apps/server/src/workspace/WorkspaceFolders.ts | 5 +++-- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/apps/server/src/orchestration-v2/CheckpointService.ts b/apps/server/src/orchestration-v2/CheckpointService.ts index 079ac88211870..ec3e872d61c2b 100644 --- a/apps/server/src/orchestration-v2/CheckpointService.ts +++ b/apps/server/src/orchestration-v2/CheckpointService.ts @@ -924,10 +924,11 @@ export const layer: Layer.Layer< const repositoryScopesIfReadable: CheckpointServiceV2Shape["repositoryScopesIfReadable"] = Effect.fn("CheckpointService.repositoryScopes")( function* (input) { - const [workspace, submodules] = yield* Effect.all([ - workspaceFolders.forThread(input), - workspaceFolders.submodules(input), - ]); + const workspace = yield* workspaceFolders.forThread(input); + const submodules = yield* workspaceFolders.submodules({ + ...input, + folders: workspace.folders, + }); return yield* Effect.forEach( [...workspace.folders.filter((folder) => folder.isGitRepository), ...submodules], (folder) => diff --git a/apps/server/src/workspace/WorkspaceFolders.test.ts b/apps/server/src/workspace/WorkspaceFolders.test.ts index 4c5b33bbf7776..3a02d202be891 100644 --- a/apps/server/src/workspace/WorkspaceFolders.test.ts +++ b/apps/server/src/workspace/WorkspaceFolders.test.ts @@ -330,17 +330,21 @@ it.layer(NodeServices.layer)("WorkspaceFolders", (it) => { folders: [], extraRoots: [], }); - assert.deepEqual(yield* workspaceFolders.submodules({ projectId, worktreePath: null }), [ - { name: "lib", path: path.join(workspaceRoot, "vendor", "lib"), isGitRepository: true }, - { - name: "deep", - path: path.join(workspaceRoot, "vendor", "lib", "deep"), - isGitRepository: true, - }, - ]); + const { folders } = yield* workspaceFolders.forThread({ projectId, worktreePath: null }); + assert.deepEqual( + yield* workspaceFolders.submodules({ projectId, worktreePath: null, folders }), + [ + { name: "lib", path: path.join(workspaceRoot, "vendor", "lib"), isGitRepository: true }, + { + name: "deep", + path: path.join(workspaceRoot, "vendor", "lib", "deep"), + isGitRepository: true, + }, + ], + ); // A worktree reaches its own submodules, named by where the project folder has them. assert.deepEqual( - yield* workspaceFolders.submodules({ projectId, worktreePath: worktree }), + yield* workspaceFolders.submodules({ projectId, worktreePath: worktree, folders: [] }), [ { name: "lib", diff --git a/apps/server/src/workspace/WorkspaceFolders.ts b/apps/server/src/workspace/WorkspaceFolders.ts index 9b21fd3fbcc62..0824c647ce360 100644 --- a/apps/server/src/workspace/WorkspaceFolders.ts +++ b/apps/server/src/workspace/WorkspaceFolders.ts @@ -64,6 +64,8 @@ export class WorkspaceFolders extends Context.Service< readonly submodules: (input: { readonly projectId: ProjectId; readonly worktreePath: string | null; + /** The thread's `forThread` folders; passed in so the project is walked once. */ + readonly folders: ReadonlyArray; }) => Effect.Effect, WorkspaceFoldersError>; readonly list: ( input: WorkspaceListFoldersInput, @@ -508,7 +510,6 @@ const make = Effect.gen(function* () { const submodules: WorkspaceFolders["Service"]["submodules"] = Effect.fn( "WorkspaceFolders.submodules", )(function* (input) { - const { folders } = yield* forThread(input); // A worktree can outlive its project record; its submodules are then named by where they are. const projectRoot = yield* readProject(input.projectId).pipe( Effect.map((project) => path.resolve(project.workspaceRoot)), @@ -520,7 +521,7 @@ const make = Effect.gen(function* () { const identity = Option.getOrElse(projectRoot, () => root); return yield* submodulesOf([ { path: root, identity }, - ...folders.flatMap((folder) => + ...input.folders.flatMap((folder) => folder.isGitRepository ? [{ path: folder.path, identity: folder.repositoryPath ?? folder.path }] : [], From c5fa33b27e45ca48fea7b4e12337b8560845f3db Mon Sep 17 00:00:00 2001 From: MIT-Consulting Date: Sun, 22 Nov 2026 00:42:40 -0500 Subject: [PATCH 2/8] fix(server,cursor): preserve inline handoff when a failed Cursor turn drops its prompt (#40670) Co-authored-by: Julius Marminge --- .../ContextHandoffDelivery.ts | 10 +- .../src/orchestration-v2/Orchestrator.ts | 5 +- .../ProviderTurnStartService.ts | 103 +++++++--- .../orchestration-v2/RestartBackgroundNote.ts | 35 ++-- .../RunExecutionService.test.ts | 48 +++++ .../orchestration-v2/RunExecutionService.ts | 192 ++++++++++++------ .../ProviderSwitch.integration.test.ts | 169 +++++++++++++++ packages/contracts/src/orchestrationV2.ts | 8 + .../src/server/ProviderAdapter.ts | 4 + .../src/server/adapter.test.ts | 143 +++++++++++++ .../provider-cursor/src/server/adapter.ts | 14 ++ .../orchestrationV2ManualContinuation.test.ts | 12 ++ .../src/orchestrationV2ManualContinuation.ts | 10 +- 13 files changed, 634 insertions(+), 119 deletions(-) diff --git a/apps/server/src/orchestration-v2/ContextHandoffDelivery.ts b/apps/server/src/orchestration-v2/ContextHandoffDelivery.ts index 5211da2faf169..72471eb8cf944 100644 --- a/apps/server/src/orchestration-v2/ContextHandoffDelivery.ts +++ b/apps/server/src/orchestration-v2/ContextHandoffDelivery.ts @@ -37,7 +37,7 @@ export const deliverContextHandoffs = Effect.fn("orchestrationV2.deliverContextH handoff.delivery.status === "pending", ); if (pending.length === 0 || (input.deferInline && input.inject === undefined)) - return { context: "", delivered: Effect.void, unsent: Effect.void }; + return { context: "", delivered: Effect.void, unsent: Effect.void, inlineHandoffs: [] }; const budget = typeof input.budget === "number" ? input.budget : yield* input.budget; let coverage = pending .map( @@ -76,7 +76,8 @@ export const deliverContextHandoffs = Effect.fn("orchestrationV2.deliverContextH budget, }); if (historyCost(selected.messages, selected.context) > budget) { - if (input.deferInline) return { context: "", delivered: Effect.void, unsent: Effect.void }; + if (input.deferInline) + return { context: "", delivered: Effect.void, unsent: Effect.void, inlineHandoffs: [] }; return yield* new ContextHandoffBudgetError(); } const omittedItemIds = new Set(selected.omittedItemIds); @@ -127,7 +128,7 @@ export const deliverContextHandoffs = Effect.fn("orchestrationV2.deliverContextH }); if (injected) { yield* persist("injected"); - return { context: "", delivered: Effect.void, unsent: Effect.void }; + return { context: "", delivered: Effect.void, unsent: Effect.void, inlineHandoffs: [] }; } } else { yield* persist("pending"); @@ -135,12 +136,13 @@ export const deliverContextHandoffs = Effect.fn("orchestrationV2.deliverContextH if (input.deferInline) { // Compaction cannot carry inline transcripts; retain for the next turn if native injection is unsupported. yield* Effect.forEach(pending, input.persist, { discard: true }); - return { context: "", delivered: Effect.void, unsent: Effect.void }; + return { context: "", delivered: Effect.void, unsent: Effect.void, inlineHandoffs: [] }; } return { context: renderHistory(selected.messages, selected.context), delivered: persist("inline"), unsent: Effect.forEach(pending, input.persist, { discard: true }), + inlineHandoffs: pending, }; }, ); diff --git a/apps/server/src/orchestration-v2/Orchestrator.ts b/apps/server/src/orchestration-v2/Orchestrator.ts index 4f1d2d671060e..995ff63b25747 100644 --- a/apps/server/src/orchestration-v2/Orchestrator.ts +++ b/apps/server/src/orchestration-v2/Orchestrator.ts @@ -28,6 +28,7 @@ import { CommandId, type GuestMessageId, isCompactionCommandMessage, + isDeliveredProviderTurn, isOrchestrationV2WorkActive, isProviderNativeSubagentThread, MessageId, @@ -1599,7 +1600,9 @@ function lastDeliveredRunForProviderThread( isHandoffSourceRun(run) && run.providerThreadId === providerThreadId && (run.status === "completed" || - projection.providerTurns.some((turn) => turn.runAttemptId === run.activeAttemptId)), + projection.providerTurns.some( + (turn) => turn.runAttemptId === run.activeAttemptId && isDeliveredProviderTurn(turn), + )), ); } diff --git a/apps/server/src/orchestration-v2/ProviderTurnStartService.ts b/apps/server/src/orchestration-v2/ProviderTurnStartService.ts index e47e88eda09a0..8e35271ce5aa9 100644 --- a/apps/server/src/orchestration-v2/ProviderTurnStartService.ts +++ b/apps/server/src/orchestration-v2/ProviderTurnStartService.ts @@ -16,6 +16,7 @@ import { type OrchestrationV2ThreadProjection, type OrchestrationV2TurnItem, isCompactionCommandMessage, + isDeliveredProviderTurn, parseGoalCommand, RunId, RunAttemptId, @@ -32,6 +33,7 @@ import * as Option from "effect/Option"; import * as Path from "effect/Path"; import * as Predicate from "effect/Predicate"; import * as Schema from "effect/Schema"; +import * as Semaphore from "effect/Semaphore"; import * as ServerConfig from "../config.ts"; import { @@ -173,7 +175,9 @@ const nativeSessionMissesKeptTurns = ( ): boolean => { const nativeId = providerThread.nativeThreadRef?.nativeId; if (nativeId === undefined) return false; - const acceptedAttemptIds = new Set(projection.providerTurns.map((turn) => turn.runAttemptId)); + const acceptedAttemptIds = new Set( + projection.providerTurns.filter(isDeliveredProviderTurn).map((turn) => turn.runAttemptId), + ); const accepted = projection.attempts.filter((attempt) => acceptedAttemptIds.has(attempt.id)); const runsById = new Map(projection.runs.map((source) => [source.id, source])); const ordinalOf = (attempt: OrchestrationV2RunAttempt) => @@ -1087,7 +1091,12 @@ export const layer: Layer.Layer< ...settledHandoffs.flatMap((handoff) => handoff.delivery?.omittedItemIds ?? []), ]); const deliveredAttemptIds = new Set( - projection.providerTurns.map((turn) => turn.runAttemptId), + projection.providerTurns.filter(isDeliveredProviderTurn).map((turn) => turn.runAttemptId), + ); + const droppedAttemptIds = new Set( + projection.providerTurns + .filter((turn) => !isDeliveredProviderTurn(turn)) + .map((turn) => turn.runAttemptId), ); const acceptedAttempts = projection.attempts.filter( (source) => @@ -1159,7 +1168,9 @@ export const layer: Layer.Layer< (source) => source.ordinal < run.ordinal && source.providerThreadId === providerThread.id && - (source.status === "failed" || source.status === "interrupted") && + (source.status === "failed" || + source.status === "interrupted" || + (source.status === "cancelled" && droppedAttemptIds.has(source.activeAttemptId))) && !deliveredAttemptIds.has(source.activeAttemptId), ); const missedRunIds = new Set(missedRuns.map((source) => source.id)); @@ -1536,7 +1547,9 @@ export const layer: Layer.Layer< const rejectedHistory = yield* Effect.gen(function* () { if (session.driver !== "codex") return false; const acceptedAttemptIds = new Set( - projection.providerTurns.map((turn) => turn.runAttemptId), + projection.providerTurns + .filter(isDeliveredProviderTurn) + .map((turn) => turn.runAttemptId), ); const previous = projection.runs.findLast( (source) => @@ -1605,7 +1618,9 @@ export const layer: Layer.Layer< // Dispatch prepares no import handoff for a session import: its history is in the native session. const importedNativeSession = projection.thread.historyOrigin === "v1_import" && - !projection.providerTurns.some((turn) => turn.providerThreadId === providerThread.id) && + !projection.providerTurns.some( + (turn) => turn.providerThreadId === providerThread.id && isDeliveredProviderTurn(turn), + ) && !projection.contextHandoffs.some( (handoff) => handoff.toProviderThreadId === providerThread.id && @@ -2025,6 +2040,10 @@ export const layer: Layer.Layer< ], }); }); + let inlineDeliveredHandoffs: ReadonlyArray = []; + let promptDroppedOnTerminal = false; + const inlineDeliveryLock = yield* Semaphore.make(1); + const retryHandoffIds = new Set(retryHandoff.handoffs.map((handoff) => handoff.id)); const startWithHandoffs = Effect.fn("ProviderTurnStartService.startWithHandoffs")( function* (turnInput: Parameters[0], compact = false) { const delivery = yield* deliverContextHandoffs({ @@ -2051,6 +2070,15 @@ export const layer: Layer.Layer< sideChatHandoff === undefined || compact || goalCommand ? "" : sideChatHandoff.summaryText; + // Record inline handoffs before startTurn so an immediate dropped terminal can restore them. + inlineDeliveredHandoffs = [ + ...delivery.inlineHandoffs.map((handoff) => + retryHandoffIds.has(handoff.id) + ? { ...handoff, status: "superseded" as const } + : handoff, + ), + ...(sideChatContext === "" || sideChatHandoff === undefined ? [] : [sideChatHandoff]), + ]; const context = [delivery.context, sideChatContext, restartNote] .filter((part) => part !== "") .join("\n\n"); @@ -2101,31 +2129,39 @@ export const layer: Layer.Layer< : Effect.void, ), ); - // After provider acceptance, failed delivery bookkeeping must not stop live ingestion. - const nativeThreadId = runningProviderThread.nativeThreadRef?.nativeId; - yield* Effect.forEach( - [ - delivery.delivered, - ...(sideChatContext === "" || sideChatHandoff === undefined || nativeThreadId == null - ? [] - : [ - persistHandoff({ - ...sideChatHandoff, - toProviderThreadId: runningProviderThread.id, - delivery: { nativeThreadId, status: "inline" as const, itemIds: [] }, - }), - ]), - ], - (record) => - record.pipe( - Effect.catchCause(() => - Effect.logWarning("Failed to record accepted context handoff delivery", { - runId: run.id, - deliveryStatus: "pending", - }), - ), - ), - { discard: true }, + // Serialize acceptance writes against dropped-terminal restoration so neither overwrites the other. + yield* inlineDeliveryLock.withPermits(1)( + Effect.gen(function* () { + if (promptDroppedOnTerminal) return; + // After provider acceptance, failed delivery bookkeeping must not stop live ingestion. + const nativeThreadId = runningProviderThread.nativeThreadRef?.nativeId; + yield* Effect.forEach( + [ + delivery.delivered, + ...(sideChatContext === "" || + sideChatHandoff === undefined || + nativeThreadId == null + ? [] + : [ + persistHandoff({ + ...sideChatHandoff, + toProviderThreadId: runningProviderThread.id, + delivery: { nativeThreadId, status: "inline" as const, itemIds: [] }, + }), + ]), + ], + (record) => + record.pipe( + Effect.catchCause(() => + Effect.logWarning("Failed to record accepted context handoff delivery", { + runId: run.id, + deliveryStatus: "pending", + }), + ), + ), + { discard: true }, + ); + }), ); }, Effect.mapError((cause) => @@ -2186,6 +2222,13 @@ export const layer: Layer.Layer< hasUnpairedRunInterruptRequest: runControls.hasUnpairedRunInterruptRequest, loadRunInterruptReason: runControls.loadRunInterruptReason, hasWorkspaceMoved: runControls.hasWorkspaceMoved, + loadDroppedInlineHandoffs: () => + inlineDeliveryLock.withPermits(1)( + Effect.sync(() => { + promptDroppedOnTerminal = true; + return inlineDeliveredHandoffs; + }), + ), loadUnsettledWork: runControls.loadUnsettledWork, message: { messageId: message.id, diff --git a/apps/server/src/orchestration-v2/RestartBackgroundNote.ts b/apps/server/src/orchestration-v2/RestartBackgroundNote.ts index ceaf2fd5de54b..58918bdef612d 100644 --- a/apps/server/src/orchestration-v2/RestartBackgroundNote.ts +++ b/apps/server/src/orchestration-v2/RestartBackgroundNote.ts @@ -1,14 +1,15 @@ -import type { - NodeId, - OrchestrationV2ConversationMessage, - OrchestrationV2PendingBackgroundTask, - OrchestrationV2ProviderThread, - OrchestrationV2ProviderTurn, - OrchestrationV2RestartCancelledBackgroundWork, - OrchestrationV2Run, - OrchestrationV2RunAttempt, - OrchestrationV2Subagent, - OrchestrationV2TurnItem, +import { + isDeliveredProviderTurn, + type NodeId, + type OrchestrationV2ConversationMessage, + type OrchestrationV2PendingBackgroundTask, + type OrchestrationV2ProviderThread, + type OrchestrationV2ProviderTurn, + type OrchestrationV2RestartCancelledBackgroundWork, + type OrchestrationV2Run, + type OrchestrationV2RunAttempt, + type OrchestrationV2Subagent, + type OrchestrationV2TurnItem, } from "@t3tools/contracts"; import { subagentHoldsCompletion } from "@t3tools/provider-core/server/subagentProjection"; import { backgroundWorkHoldsCompletion } from "@t3tools/shared/orchestrationV2PendingBackgroundWork"; @@ -151,7 +152,7 @@ export function restartCancelledBackgroundWorkNote( type ProviderTurnState = Pick< OrchestrationV2ProviderTurn, - "runAttemptId" | "providerThreadId" | "status" + "runAttemptId" | "providerThreadId" | "status" | "promptDropped" >; export function isRestartNoteSource( @@ -307,12 +308,14 @@ export function delegatedTaskResultRun( /** The provider never accepted this continuation's prompt, so starting it again repeats nothing. */ export function continuationFailedBeforePrompt( run: Pick, - providerTurns: ReadonlyArray>, + providerTurns: ReadonlyArray>, ): boolean { return ( run.status === "failed" && run.restartContinuationOfRunId !== undefined && - !providerTurns.some((turn) => turn.runAttemptId === run.activeAttemptId) + !providerTurns.some( + (turn) => turn.runAttemptId === run.activeAttemptId && isDeliveredProviderTurn(turn), + ) ); } @@ -323,7 +326,9 @@ export function continuationStartRetryDelayMs( run: OrchestrationV2Run, projection: { readonly runs: ReadonlyArray; - readonly providerTurns: ReadonlyArray>; + readonly providerTurns: ReadonlyArray< + Pick + >; readonly turnItems: Parameters[1]; }, ): number | undefined { diff --git a/apps/server/src/orchestration-v2/RunExecutionService.test.ts b/apps/server/src/orchestration-v2/RunExecutionService.test.ts index a23a3fdf87bff..1d13620b75623 100644 --- a/apps/server/src/orchestration-v2/RunExecutionService.test.ts +++ b/apps/server/src/orchestration-v2/RunExecutionService.test.ts @@ -8,6 +8,7 @@ import { NodeId, type OrchestrationV2AppThread, type OrchestrationV2CheckpointScope, + type OrchestrationV2ContextHandoff, type OrchestrationV2DomainEvent, type OrchestrationV2ExecutionNode, type OrchestrationV2PendingBackgroundTask, @@ -3702,6 +3703,49 @@ it.effect.each([ }), ); +it.effect("restores dropped inline handoffs when ingestion fails before the terminal", () => + Effect.gen(function* () { + const key = "dropped-turn-ingest-error"; + const ids = backgroundScenarioIds(key); + const handoff = { id: `handoff:${key}` } as unknown as OrchestrationV2ContextHandoff; + const { finalEvents } = yield* captureRootRunTermination({ + key, + shouldFinalizeRun: () => Effect.succeed(true), + loadDroppedInlineHandoffs: () => Effect.succeed([handoff]), + events: () => + Stream.make({ + type: "provider_turn.updated" as const, + driver, + threadId: ids.threadId, + providerTurn: { + id: ids.rootProviderTurnId, + providerThreadId: ids.providerThreadId, + runAttemptId: ids.attemptId, + ordinal: 1, + status: "failed", + promptDropped: true, + } as OrchestrationV2ProviderTurn, + }), + ingestNormalized: ({ event }) => + event.type === "provider_turn.updated" + ? Effect.fail( + new ProviderEventIngestor.ProviderEventPublishError({ + providerSessionId: ProviderSessionId.make(`session:${key}`), + eventCount: 1, + cause: new Error("SQLITE_FULL: database or disk is full"), + }), + ) + : Effect.succeed([]), + }); + assert.deepEqual( + finalEvents.flatMap((event) => + event.type === "context-handoff.updated" ? [event.payload.id] : [], + ), + [handoff.id], + ); + }), +); + it.effect("does not interrupt a provider when ingestion fails before the root turn is known", () => Effect.gen(function* () { const interrupts = yield* Ref.make(0); @@ -3989,6 +4033,7 @@ function captureRootRunTermination(input: { readonly hasUnpairedRunInterruptRequest?: () => Effect.Effect; readonly hasWorkspaceMoved?: () => Effect.Effect; readonly loadRunInterruptReason?: () => Effect.Effect; + readonly loadDroppedInlineHandoffs?: RunExecutionService.RunExecutionServiceV2StartRootRunInput["loadDroppedInlineHandoffs"]; readonly hasPendingBackgroundWorkForThread?: ProviderAdapter.ProviderAdapterV2SessionRuntime["hasPendingBackgroundWorkForThread"]; readonly seedOpenSubagent?: boolean; readonly events?: ( @@ -4235,6 +4280,9 @@ function captureRootRunTermination(input: { ...(input.hasWorkspaceMoved === undefined ? {} : { hasWorkspaceMoved: input.hasWorkspaceMoved }), + ...(input.loadDroppedInlineHandoffs === undefined + ? {} + : { loadDroppedInlineHandoffs: input.loadDroppedInlineHandoffs }), message: { messageId: MessageId.make(`message:${input.key}`), text: input.messageText ?? "interrupt projection", diff --git a/apps/server/src/orchestration-v2/RunExecutionService.ts b/apps/server/src/orchestration-v2/RunExecutionService.ts index 1bc83f639d5ae..34cc31f98fa09 100644 --- a/apps/server/src/orchestration-v2/RunExecutionService.ts +++ b/apps/server/src/orchestration-v2/RunExecutionService.ts @@ -9,6 +9,7 @@ import { type NodeId, type OrchestrationV2AppThread, type OrchestrationV2CheckpointScope, + type OrchestrationV2ContextHandoff, type OrchestrationV2DomainEvent, type OrchestrationV2ExecutionNode, type OrchestrationV2ProviderFailure, @@ -658,6 +659,11 @@ export interface RunExecutionServiceV2StartRootRunInput { readonly hasUnpairedRunInterruptRequest?: () => Effect.Effect; readonly loadRunInterruptReason?: () => Effect.Effect; readonly hasWorkspaceMoved?: () => Effect.Effect; + /** Restores inline context handoffs if the provider drops this turn's prompt before persisting it. */ + readonly loadDroppedInlineHandoffs?: () => Effect.Effect< + ReadonlyArray, + never + >; /** * Stored rows of a thread's unsettled work. Work a dead runtime left is ended from these, since * Stop may have settled it after the snapshots this run holds. @@ -736,6 +742,7 @@ export const layer: Layer.Layer< readonly abandonedProviderTurn?: OrchestrationV2ProviderTurn; // Stored root tool calls still open when the provider runtime was lost; nothing else ends them. readonly lostToolCalls?: ReadonlyArray; + readonly restoredHandoffs?: ReadonlyArray; readonly terminal: ProviderTerminalEvent; readonly completedAt?: DateTime.Utc; readonly failureItemPersisted: boolean; @@ -752,24 +759,35 @@ export const layer: Layer.Layer< status: input.terminal.status, completedAt, }; + const allocateEventId = () => idAllocator.allocate.event({ threadId: input.run.threadId }); + const buildRestoredHandoffEvents = () => + input.terminal.promptDropped === true && + input.restoredHandoffs !== undefined && + input.restoredHandoffs.length > 0 + ? Effect.forEach(input.restoredHandoffs, (handoff) => + Effect.map(allocateEventId(), (id) => ({ + id, + type: "context-handoff.updated" as const, + threadId: input.run.threadId, + runId: input.run.id, + providerInstanceId: input.run.providerInstanceId, + occurredAt: completedAt, + payload: { ...handoff, updatedAt: completedAt }, + })), + ) + : Effect.succeed([]); const shouldFinalizeRun = input.shouldFinalizeRun === undefined ? true : yield* input.shouldFinalizeRun(); if (!shouldFinalizeRun) { - if (input.terminal.status === "interrupted") { - const hasUnpairedRequest = - input.hasUnpairedRunInterruptRequest === undefined - ? false - : yield* input.hasUnpairedRunInterruptRequest(); - if (hasUnpairedRequest) { - const reason = - input.loadRunInterruptReason === undefined - ? undefined - : yield* input.loadRunInterruptReason(); - yield* eventSink.writeWithEffects({ - effects: [], - events: [ + const restoredHandoffEvents = yield* buildRestoredHandoffEvents(); + const unpairedInterruptEvents = + input.terminal.status === "interrupted" && + (input.hasUnpairedRunInterruptRequest === undefined + ? false + : yield* input.hasUnpairedRunInterruptRequest()) + ? [ { - id: yield* idAllocator.allocate.event({ threadId: input.run.threadId }), + id: yield* allocateEventId(), type: "turn-item.updated" as const, threadId: input.run.threadId, runId: input.run.id, @@ -781,18 +799,25 @@ export const layer: Layer.Layer< run: input.run, rootNode: input.rootNode, providerThread: input.providerThread, - reason, + reason: + input.loadRunInterruptReason === undefined + ? undefined + : yield* input.loadRunInterruptReason(), completedAt, }), }, - ], - }); - yield* input.refreshAfterTurn; - } + ] + : []; + const earlyEvents = [...unpairedInterruptEvents, ...restoredHandoffEvents]; + if (earlyEvents.length > 0) { + yield* eventSink.writeWithEffects({ + effects: [], + events: earlyEvents, + }); + yield* input.refreshAfterTurn; } return false; } - const allocateEventId = () => idAllocator.allocate.event({ threadId: input.run.threadId }); const reason = input.terminal.status === "interrupted" ? ((input.loadRunInterruptReason === undefined @@ -839,6 +864,7 @@ export const layer: Layer.Layer< status: finalProviderThreadStatus(input.terminal.threadDisposition), updatedAt: completedAt, }; + const restoredHandoffEvents = yield* buildRestoredHandoffEvents(); const runEventId = yield* allocateEventId(); const nodeEventId = yield* allocateEventId(); const providerThreadEventId = yield* allocateEventId(); @@ -1005,6 +1031,7 @@ export const layer: Layer.Layer< occurredAt: completedAt, payload: finalizedProviderThread, }, + ...restoredHandoffEvents, ], } satisfies Parameters[0]; if (input.writeIfRunCurrent !== undefined) { @@ -1031,6 +1058,13 @@ export const layer: Layer.Layer< effects: finalization.effects, }); if (!result.committed) { + if (restoredHandoffEvents.length > 0) { + yield* eventSink.writeWithEffects({ + effects: [], + events: restoredHandoffEvents, + }); + yield* input.refreshAfterTurn; + } return false; } } else { @@ -1275,44 +1309,55 @@ export const layer: Layer.Layer< } const providerThread = yield* Ref.get(latestProviderThread); const openSubagents = yield* Ref.get(openRunOwnedSubagents); - const writeTerminal = (settledTerminal: ProviderTerminalEvent) => - writeFinalRunEvents({ - run: input.run, - rootNode: input.rootNode, - checkpointScope: input.checkpointScope, - providerThread, - attempt: input.attempt, - ...(input.shouldFinalizeRun === undefined - ? {} - : { - shouldFinalizeRun: input.shouldFinalizeRun, - // Stop may commit between the ownership read and this - // terminal write. Gate the events and checkpoint together. - writeIfRunCurrent: { - activeAttemptId: input.attempt.id, - expectedStatus: "running" as const, - unlessInterruptRequested: settledTerminal !== terminal, - }, - }), - ...(input.hasUnpairedRunInterruptRequest === undefined - ? {} - : { - hasUnpairedRunInterruptRequest: input.hasUnpairedRunInterruptRequest, - }), - ...(input.loadRunInterruptReason === undefined - ? {} - : { loadRunInterruptReason: input.loadRunInterruptReason }), - openRunOwnedSubagents: openSubagents, - openRunOwnedSubagentsTerminal: terminal, - ...(abandonedProviderTurn === undefined ? {} : { abandonedProviderTurn }), - terminal: settledTerminal, - failureItemPersisted: settledTerminal.status === "failed", - refreshAfterTurn, - }).pipe( - Effect.mapError( - (cause) => new RunExecutionIngestError({ runId: input.run.id, cause }), + const writeTerminal = Effect.fnUntraced( + function* (settledTerminal: ProviderTerminalEvent) { + const restoredHandoffs = + settledTerminal.promptDropped === true && + input.loadDroppedInlineHandoffs !== undefined + ? yield* input.loadDroppedInlineHandoffs() + : undefined; + return yield* writeFinalRunEvents({ + run: input.run, + rootNode: input.rootNode, + checkpointScope: input.checkpointScope, + providerThread, + attempt: input.attempt, + ...(input.shouldFinalizeRun === undefined + ? {} + : { + shouldFinalizeRun: input.shouldFinalizeRun, + // Stop may commit between the ownership read and this + // terminal write. Gate the events and checkpoint together. + writeIfRunCurrent: { + activeAttemptId: input.attempt.id, + expectedStatus: "running" as const, + unlessInterruptRequested: settledTerminal !== terminal, + }, + }), + ...(input.hasUnpairedRunInterruptRequest === undefined + ? {} + : { + hasUnpairedRunInterruptRequest: input.hasUnpairedRunInterruptRequest, + }), + ...(input.loadRunInterruptReason === undefined + ? {} + : { loadRunInterruptReason: input.loadRunInterruptReason }), + openRunOwnedSubagents: openSubagents, + openRunOwnedSubagentsTerminal: terminal, + ...(abandonedProviderTurn === undefined ? {} : { abandonedProviderTurn }), + ...(restoredHandoffs === undefined ? {} : { restoredHandoffs }), + terminal: settledTerminal, + failureItemPersisted: settledTerminal.status === "failed", + refreshAfterTurn, + }); + }, + (effect) => + effect.pipe( + Effect.mapError( + (cause) => new RunExecutionIngestError({ runId: input.run.id, cause }), + ), ), - ); + ); // A workspace handoff detaches the session and stops the turn that asked // for it: the run completes, while its native subagents still settle // as interrupted. The completed write refuses in the same transaction @@ -2116,6 +2161,13 @@ export const layer: Layer.Layer< : null; const latestItemOrdinal = yield* Ref.get(latestTurnItemOrdinal); const openSubagents = yield* Ref.get(openRunOwnedSubagents); + const droppedPrompt = + (yield* Ref.get(terminalEvent))?.promptDropped === true || + rootProviderTurn?.promptDropped === true; + const recoveredHandoffs = + droppedPrompt && input.loadDroppedInlineHandoffs !== undefined + ? yield* input.loadDroppedInlineHandoffs() + : undefined; const lostToolCalls = runtimeLost ? yield* loadLostRootToolCalls.pipe( Effect.catchCauseIf( @@ -2141,18 +2193,24 @@ export const layer: Layer.Layer< }, openRunOwnedSubagents: openSubagents, ...(abandonedProviderTurn === null ? {} : { abandonedProviderTurn }), + ...(recoveredHandoffs === undefined + ? {} + : { restoredHandoffs: recoveredHandoffs }), lostToolCalls, completedAt, - terminal: makeFailedTerminalEvent( - makeProviderFailure({ - cause: squashed, - message: - knownProviderFailureMessage(squashed) ?? - userFacingDatabaseErrorMessage(squashed), - class: "unknown", - }), - latestItemOrdinal + 1, - ), + terminal: { + ...makeFailedTerminalEvent( + makeProviderFailure({ + cause: squashed, + message: + knownProviderFailureMessage(squashed) ?? + userFacingDatabaseErrorMessage(squashed), + class: "unknown", + }), + latestItemOrdinal + 1, + ), + ...(droppedPrompt ? { promptDropped: true as const } : {}), + }, failureItemPersisted: false, refreshAfterTurn, }).pipe( diff --git a/apps/server/src/orchestration-v2/testkit/ProviderSwitch.integration.test.ts b/apps/server/src/orchestration-v2/testkit/ProviderSwitch.integration.test.ts index ee048c2100592..ddf9259622599 100644 --- a/apps/server/src/orchestration-v2/testkit/ProviderSwitch.integration.test.ts +++ b/apps/server/src/orchestration-v2/testkit/ProviderSwitch.integration.test.ts @@ -118,6 +118,7 @@ function makeTestAdapter(input: { readonly failure?: ReturnType; readonly rejectedNativeThreads?: Ref.Ref>; readonly failedRunOrdinals?: ReadonlySet; + readonly promptDroppedRunOrdinals?: ReadonlySet; readonly brokenRunOrdinals?: ReadonlySet; readonly interruptedRunOrdinals?: ReadonlySet; readonly cancelledRunOrdinals?: ReadonlySet; @@ -410,6 +411,9 @@ function makeTestAdapter(input: { status: terminalStatus, startedAt: eventTime, completedAt: eventTime, + ...(input.promptDroppedRunOrdinals?.has(turnInput.runOrdinal) + ? { promptDropped: true as const } + : {}), }, }, { @@ -462,6 +466,9 @@ function makeTestAdapter(input: { threadDisposition: input.brokenRunOrdinals?.has(turnInput.runOrdinal) ? "broken" : "reusable", + ...(input.promptDroppedRunOrdinals?.has(turnInput.runOrdinal) + ? { promptDropped: true as const } + : {}), }, ]; const reportedUsage = input.tokenUsageByRunOrdinal?.[turnInput.runOrdinal]; @@ -6400,4 +6407,166 @@ describe("orchestration v2 provider switching", () => { ); }), ); + + it.effect.each([ + "same-provider-retry", + "cancelled-dropped", + "switch-away-and-return", + "persisted-failure", + ] as const)("handles an inline context handoff after a failed returning turn (%s)", (variant) => + Effect.gen(function* () { + const cwd = yield* checkpointWorkspace(`dropped-handoff-${variant}`); + const capturedTurns = yield* Ref.make>([]); + const dropped = variant !== "persisted-failure"; + const cancelled = variant === "cancelled-dropped"; + const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([ + makeTestAdapter({ + instanceId: CODEX_MODEL_SELECTION.instanceId, + driver: CODEX_DRIVER, + capabilities: CodexProviderCapabilitiesV2, + modelSelection: CODEX_MODEL_SELECTION, + responseByRunOrdinal: { + 1: "Morning Codex summary.", + 3: "", + 4: "Recovered Codex answer.", + 5: "Recovered Codex after round-trip.", + }, + capturedTurns, + ...(cancelled + ? { cancelledRunOrdinals: new Set([3]) } + : { failedRunOrdinals: new Set([3]) }), + ...(dropped ? { promptDroppedRunOrdinals: new Set([3]) } : {}), + }), + makeTestAdapter({ + instanceId: CLAUDE_MODEL_SELECTION.instanceId, + driver: CLAUDE_DRIVER, + capabilities: ClaudeProviderCapabilitiesV2, + modelSelection: CLAUDE_MODEL_SELECTION, + responseByRunOrdinal: { + 2: "Afternoon Claude shipped b63 live draft.", + 4: "Extra Claude turn after dropped handoff.", + }, + capturedTurns, + }), + ]); + + yield* Effect.gen(function* () { + const orchestrator = yield* Orchestrator.OrchestratorV2; + const worker = yield* EffectWorker.OrchestrationEffectWorkerV2; + const testThreadId = ThreadId.make(`thread:dropped-handoff:${variant}`); + yield* orchestrator.dispatch({ + type: "thread.create", + createdBy: "user", + creationSource: "web", + commandId: CommandId.make(`command:dropped-handoff:${variant}:create`), + threadId: testThreadId, + projectId, + title: `Dropped handoff ${variant}`, + modelSelection: CODEX_MODEL_SELECTION, + runtimeMode: "full-access", + interactionMode: "default", + branch: null, + worktreePath: cwd, + }); + let step = 0; + const send = (text: string, modelSelection: ModelSelection) => + Effect.gen(function* () { + step += 1; + yield* orchestrator.dispatch({ + type: "message.dispatch", + createdBy: "user", + creationSource: "web", + commandId: CommandId.make(`command:dropped-handoff:${variant}:msg-${step}`), + threadId: testThreadId, + messageId: MessageId.make(`message:dropped-handoff:${variant}:${step}`), + text, + attachments: [], + modelSelection, + dispatchMode: { type: "start_immediately" }, + }); + yield* worker.drain(); + yield* waitForIdle(testThreadId); + yield* worker.drain(); + return yield* orchestrator.getThreadProjection(testThreadId); + }); + + // Run 1: establish native session on Codex. + yield* send("Morning task", CODEX_MODEL_SELECTION); + // Run 2: switch to Claude and do real work. + yield* send("Build live draft b63", CLAUDE_MODEL_SELECTION); + // Run 3: switch back to Codex (delta handoff covering run 2); fails. + const afterRun3 = yield* send("Resume after failure", CODEX_MODEL_SELECTION); + const run3 = afterRun3.runs.find((run) => run.ordinal === 3)!; + assert.equal(run3.status, cancelled ? "cancelled" : "failed"); + const run3Handoff = afterRun3.contextHandoffs.find( + (handoff) => handoff.targetRunId === run3.id, + ); + assert.isDefined(run3Handoff); + assert.deepEqual(run3Handoff?.coveredRunOrdinals, { from: 2, to: 2 }); + + if (dropped) { + assert.isUndefined( + run3Handoff?.delivery, + "dropping the failed prompt must clear inline handoff delivery", + ); + const run3Turn = afterRun3.providerTurns.find( + (turn) => turn.runAttemptId === run3.activeAttemptId, + ); + assert.equal(run3Turn?.promptDropped, true); + } else { + assert.equal(run3Handoff?.delivery?.status, "inline"); + } + + if (variant === "same-provider-retry" || variant === "cancelled-dropped") { + // Run 4: stay on Codex; must re-deliver run 2's handoff. + const afterRun4 = yield* send("Resume", CODEX_MODEL_SELECTION); + const turns = yield* Ref.get(capturedTurns); + const run4Turn = turns.at(-1)!; + assert.include(run4Turn.text, "Afternoon Claude shipped b63 live draft."); + assert.include(run4Turn.text, "Resume after failure"); + assert.include(run4Turn.text, "User message:\nResume"); + const updatedHandoff = afterRun4.contextHandoffs.find( + (handoff) => handoff.id === run3Handoff!.id, + ); + assert.equal(updatedHandoff?.delivery?.status, "inline"); + } else if (variant === "switch-away-and-return") { + // Run 4: bounce back to Claude, then Run 5: return to Codex. + yield* send("Continue on Claude", CLAUDE_MODEL_SELECTION); + const afterRun5 = yield* send("Back to Codex", CODEX_MODEL_SELECTION); + const run5 = afterRun5.runs.find((run) => run.ordinal === 5)!; + const run5Handoff = afterRun5.contextHandoffs.find( + (handoff) => handoff.targetRunId === run5.id, + ); + assert.isDefined(run5Handoff); + assert.deepEqual(run5Handoff?.coveredRunOrdinals, { from: 2, to: 4 }); + const run5Turn = (yield* Ref.get(capturedTurns)).at(-1)!; + assert.include(run5Turn.text, "Afternoon Claude shipped b63 live draft."); + assert.include(run5Turn.text, "Extra Claude turn after dropped handoff."); + } else { + // Control: run 3 persisted its prompt before failing, so run 4 must not re-send run 2. + yield* send("Resume", CODEX_MODEL_SELECTION); + const run4Turn = (yield* Ref.get(capturedTurns)).at(-1)!; + assert.notInclude(run4Turn.text, "Afternoon Claude shipped b63 live draft."); + } + }).pipe( + Effect.provide( + ProviderReplayHarness.layerWithRegistry( + { + name: `dropped-handoff-${variant}`, + runtimePolicyOverride: { + cwd, + approvalPolicy: "never", + sandboxPolicy: { + type: "readOnly", + access: { type: "fullAccess" }, + networkAccess: false, + }, + }, + }, + layerRegistry, + ), + ), + ); + }), + ); }); diff --git a/packages/contracts/src/orchestrationV2.ts b/packages/contracts/src/orchestrationV2.ts index 2d5bc546d1800..8b05c12e17871 100644 --- a/packages/contracts/src/orchestrationV2.ts +++ b/packages/contracts/src/orchestrationV2.ts @@ -1334,9 +1334,17 @@ export const OrchestrationV2ProviderTurn = Schema.Struct({ turnTokenUsage: Schema.optional(TurnTokenUsage), /** The model the provider reported running this turn's root agent, which can differ from the requested one. */ model: Schema.optional(TrimmedNonEmptyString), + /** True when the provider dropped this turn's request before persisting it to native history. */ + promptDropped: Schema.optional(Schema.Literal(true)), }); export type OrchestrationV2ProviderTurn = typeof OrchestrationV2ProviderTurn.Type; +export function isDeliveredProviderTurn( + turn: Pick, +): boolean { + return turn.promptDropped !== true; +} + /** Codex goals can span multiple native turns within one attempt. */ export function latestProviderTurnForAttempt< Turn extends Pick, diff --git a/packages/provider-core/src/server/ProviderAdapter.ts b/packages/provider-core/src/server/ProviderAdapter.ts index 18ebf74baa1c7..c0bf5156acb97 100644 --- a/packages/provider-core/src/server/ProviderAdapter.ts +++ b/packages/provider-core/src/server/ProviderAdapter.ts @@ -202,6 +202,8 @@ export const ProviderAdapterV2Event = Schema.Union([ failure: Schema.Null, reason: Schema.optional(Schema.String), threadDisposition: Schema.Literals(["reusable", "broken"]), + /** The provider dropped this turn's request before persisting it to native history. */ + promptDropped: Schema.optional(Schema.Literal(true)), retainedRuntimeRequestIds: Schema.optional(Schema.Array(RuntimeRequestId)), }), Schema.Struct({ @@ -216,6 +218,8 @@ export const ProviderAdapterV2Event = Schema.Union([ retry: Schema.optional(OrchestrationV2ProviderRetry), retryStartedAt: Schema.optional(Schema.DateTimeUtc), threadDisposition: Schema.Literals(["reusable", "broken"]), + /** The provider dropped this turn's request before persisting it to native history. */ + promptDropped: Schema.optional(Schema.Literal(true)), /** Child turns outlive root failure and report their own terminals; otherwise open children settle. */ childTurnsContinue: Schema.optional(Schema.Literal(true)), retainedRuntimeRequestIds: Schema.optional(Schema.Array(RuntimeRequestId)), diff --git a/packages/provider-cursor/src/server/adapter.test.ts b/packages/provider-cursor/src/server/adapter.test.ts index 5c0a1940d671c..dfa1ac4865269 100644 --- a/packages/provider-cursor/src/server/adapter.test.ts +++ b/packages/provider-cursor/src/server/adapter.test.ts @@ -756,6 +756,149 @@ describe("CursorAdapterV2", () => { ), ); + it.effect("marks failed turns as promptDropped only when Cursor did not checkpoint the run", () => + Effect.gen(function* () { + const fileSystem = yield* FileSystem.FileSystem; + const workspace = yield* fileSystem.makeTempDirectoryScoped({ + prefix: "cursor-v2-dropped-", + }); + const checkpointedRuns = new Set(); + let sendCalls = 0; + const instanceId = ProviderInstanceId.make("cursor"); + const threadId = ThreadId.make("cursor-dropped-thread"); + const modelSelection = { instanceId, model: "gemini-4-neon" }; + const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({ + runtimeMode: "full-access", + interactionMode: "default", + cwd: workspace, + }); + const adapter = yield* makeCursorAdapterV2({ + instanceId, + environment: { HOME: workspace }, + }).pipe( + Effect.provideService(CursorAgentSdk.CursorAgentSdkRunner, { + assertComplete: Effect.void, + open: () => + Effect.succeed({ + agentId: "native-cursor-dropped", + listMessages: Effect.succeed([]), + close: Effect.void, + runCheckpointed: (runId) => + Effect.succeed(runId !== undefined && checkpointedRuns.has(runId)), + send: () => + Effect.sync(() => { + sendCalls += 1; + const runId = `native-cursor-run-${sendCalls}`; + return { + agentId: "native-cursor-dropped", + runId, + cancel: Effect.void, + wait: Effect.succeed({ + id: runId, + status: "error" as const, + error: { + message: + 'AI Model Not Found Invalid parameters for registry model: "gemini-4-neon"', + }, + }), + }; + }), + }), + textGenerate: () => Effect.die("unused"), + }), + Effect.provide(TestProviderHost.layer({ cwd: workspace })), + ); + const runtime = yield* adapter.openSession({ + threadId, + providerSessionId: ProviderSessionId.make("cursor-dropped-session"), + modelSelection, + runtimePolicy, + }); + const providerThread = yield* runtime.ensureThread({ + threadId, + modelSelection, + runtimePolicy, + }); + const now = yield* DateTime.now; + const appThread = { + id: threadId, + projectId: ProjectId.make("cursor-dropped-project"), + createdBy: "user" as const, + creationSource: "web" as const, + title: "Cursor dropped prompt", + providerInstanceId: instanceId, + modelSelection, + runtimeMode: "full-access" as const, + interactionMode: "default" as const, + branch: null, + worktreePath: null, + activeProviderThreadId: providerThread.id, + lineage: { parentThreadId: null, relationshipToParent: null, rootThreadId: threadId }, + forkedFrom: null, + createdAt: now, + updatedAt: now, + archivedAt: null, + settledOverride: null, + settledAt: null, + lastVisitedAt: null, + deletedAt: null, + }; + const runFailed = (ordinal: number) => + Effect.gen(function* () { + yield* runtime.startTurn({ + threadId, + providerThread, + modelSelection, + runtimePolicy, + runId: RunId.make(`cursor-dropped-run-${ordinal}`), + runOrdinal: ordinal, + providerTurnOrdinal: ordinal, + attemptId: RunAttemptId.make(`cursor-dropped-attempt-${ordinal}`), + rootNodeId: NodeId.make(`cursor-dropped-root-${ordinal}`), + appThread, + message: { + messageId: MessageId.make(`cursor-dropped-message-${ordinal}`), + createdBy: "user", + creationSource: "web", + text: "Resume", + attachments: [], + }, + }); + const events = yield* runtime.events.pipe( + Stream.takeUntil((event) => event.type === "turn.terminal"), + Stream.runCollect, + ); + const terminal = events.find((event) => event.type === "turn.terminal"); + const turn = events.findLast( + (event) => + event.type === "provider_turn.updated" && event.providerTurn.completedAt !== null, + ); + return { + terminal: terminal?.type === "turn.terminal" ? terminal : undefined, + turn: turn?.type === "provider_turn.updated" ? turn.providerTurn : undefined, + }; + }); + + // Uncheckpointed failure: Cursor never persisted the prompt. + const uncheckpointed = yield* runFailed(1); + assert.equal(uncheckpointed.terminal?.status, "failed"); + assert.equal(uncheckpointed.terminal?.promptDropped, true); + assert.equal(uncheckpointed.turn?.promptDropped, true); + + // Checkpointed failure: Cursor kept the run's prompt in its store. + checkpointedRuns.add("native-cursor-run-2"); + const checkpointed = yield* runFailed(2); + assert.equal(checkpointed.terminal?.status, "failed"); + assert.isUndefined(checkpointed.terminal?.promptDropped); + assert.isUndefined(checkpointed.turn?.promptDropped); + }).pipe( + Effect.scoped, + Effect.provide( + Layer.mergeAll(NodeServices.layer, IdAllocator.layer, McpProviderSessions.layer), + ), + ), + ); + it.effect("sends T3 instructions to each Cursor conversation that lacks them", () => Effect.gen(function* () { const fileSystem = yield* FileSystem.FileSystem; diff --git a/packages/provider-cursor/src/server/adapter.ts b/packages/provider-cursor/src/server/adapter.ts index 7aadadaf9ddd4..b4dd1033c2a9f 100644 --- a/packages/provider-cursor/src/server/adapter.ts +++ b/packages/provider-cursor/src/server/adapter.ts @@ -2510,6 +2510,7 @@ export const makeCursorAdapterV2 = Effect.fn("makeCursorAdapterV2")(function* ( readonly status: OrchestrationV2ProviderTurn["status"]; readonly completedAt: DateTime.Utc | null; readonly tokenUsage?: OrchestrationV2ProviderTurn["tokenUsage"]; + readonly promptDropped?: true; }): OrchestrationV2ProviderTurn => ({ id: input.context.providerTurnId, providerThreadId: input.context.input.providerThread.id, @@ -2525,6 +2526,7 @@ export const makeCursorAdapterV2 = Effect.fn("makeCursorAdapterV2")(function* ( startedAt: input.context.startedAt, completedAt: input.completedAt, ...(input.tokenUsage === undefined ? {} : { tokenUsage: input.tokenUsage }), + ...(input.promptDropped === true ? { promptDropped: true as const } : {}), ...(input.completedAt === null || input.context.usage === undefined ? {} : { @@ -2590,6 +2592,15 @@ export const makeCursorAdapterV2 = Effect.fn("makeCursorAdapterV2")(function* ( }).pipe(Effect.as(undefined)), ), ); + // Cursor only keeps a run in conversation history once it saves its first checkpoint. + const promptDropped = + (input.status === "failed" || input.status === "cancelled") && + !input.context.compacted && + input.context.prompt !== undefined && + !(yield* ( + input.context.session.runCheckpointed?.(input.context.run.runId) ?? + Effect.succeed(false) + ).pipe(Effect.orElseSucceed(() => false))); yield* emitProviderEvent({ type: "provider_turn.updated", driver: CursorAgentSdk.CURSOR_PROVIDER, @@ -2597,6 +2608,7 @@ export const makeCursorAdapterV2 = Effect.fn("makeCursorAdapterV2")(function* ( context: input.context, status: input.status, completedAt, + ...(promptDropped ? { promptDropped: true as const } : {}), ...(contextUsage === undefined ? {} : { @@ -2633,6 +2645,7 @@ export const makeCursorAdapterV2 = Effect.fn("makeCursorAdapterV2")(function* ( status: input.status, failure: input.failure ?? makeProviderFailure({ class: "provider_error" }), threadDisposition, + ...(promptDropped ? { promptDropped: true as const } : {}), } : { type: "turn.terminal", @@ -2643,6 +2656,7 @@ export const makeCursorAdapterV2 = Effect.fn("makeCursorAdapterV2")(function* ( status: input.status, failure: null, threadDisposition, + ...(promptDropped ? { promptDropped: true as const } : {}), }, ); if (input.context.runtimeInstructions !== undefined) { diff --git a/packages/shared/src/orchestrationV2ManualContinuation.test.ts b/packages/shared/src/orchestrationV2ManualContinuation.test.ts index 137bf6cd8f205..e7670749f6c5a 100644 --- a/packages/shared/src/orchestrationV2ManualContinuation.test.ts +++ b/packages/shared/src/orchestrationV2ManualContinuation.test.ts @@ -108,4 +108,16 @@ describe("unsentManualContinuationSource", () => { unsentManualContinuationSource(run("c", "a" as RunId), projection([a, b], [], [])), ).toBeUndefined(); }); + + it("treats a turn with promptDropped as unsent", () => { + const source = run("src"); + const a1 = attempt("a1", "src", 1); + const dropped = { ...turn("a1"), promptDropped: true as const }; + expect( + unsentManualContinuationSource( + run("r2", "src" as RunId), + projection([source], [a1], [dropped]), + ), + ).toBe(source); + }); }); diff --git a/packages/shared/src/orchestrationV2ManualContinuation.ts b/packages/shared/src/orchestrationV2ManualContinuation.ts index 3fb6c8d5a1866..ad64b63483e14 100644 --- a/packages/shared/src/orchestrationV2ManualContinuation.ts +++ b/packages/shared/src/orchestrationV2ManualContinuation.ts @@ -1,4 +1,8 @@ -import type { OrchestrationV2Run, OrchestrationV2ThreadProjection } from "@t3tools/contracts"; +import { + isDeliveredProviderTurn, + type OrchestrationV2Run, + type OrchestrationV2ThreadProjection, +} from "@t3tools/contracts"; export function unsentManualContinuationSource( run: Pick | undefined, @@ -7,7 +11,9 @@ export function unsentManualContinuationSource( let sourceId = run?.manualContinuationOfRunId; if (sourceId === undefined) return undefined; const runs = new Map(projection.runs.map((source) => [source.id, source])); - const acceptedAttempts = new Set(projection.providerTurns.map((turn) => turn.runAttemptId)); + const acceptedAttempts = new Set( + projection.providerTurns.filter(isDeliveredProviderTurn).map((turn) => turn.runAttemptId), + ); const latestAttempt = ( runId: OrchestrationV2Run["id"], matches: (attempt: (typeof projection.attempts)[number]) => boolean, From 0fb6ac6e65cced6201247705b304170010e37a78 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Sat, 21 Nov 2026 21:47:07 -0800 Subject: [PATCH 3/8] perf(web): Markdown renders with Words as static islands under one shared tooltip; remark leaves the web app (#27866) Co-authored-by: Claude Opus 5.5 Co-authored-by: Yash Singh Co-authored-by: Cursor Co-authored-by: Gemini 4 Neon Co-authored-by: Noah Sigel --- .pnpmfile.cjs | 26 +- .../pull-requests/PullRequestDescription.tsx | 4 +- .../pull-requests/PullRequestMarkdown.tsx | 8 +- .../pullRequestAutolinks.test.ts | 2 +- .../pullRequestDescriptionContent.test.ts | 4 +- .../usePullRequestDescription.ts | 2 +- apps/mobile/src/lib/composerContext.test.ts | 13 +- apps/mobile/src/lib/composerContext.ts | 10 +- .../src/native/T3ComposerEditor.ios.tsx | 4 +- .../src/native/T3ComposerEditor.native.tsx | 4 +- apps/web/deps/README.md | 15 + .../deps/pierre-words-0.2.2-t3.4-7c04b7f1.tgz | Bin 0 -> 219310 bytes apps/web/package.json | 13 +- .../components/ChatMarkdown.browser.test.tsx | 99 +- apps/web/src/components/ChatMarkdown.tsx | 495 ++++--- .../chat/ChatMarkdownMedia.browser.test.tsx | 13 +- .../chat/MarkdownCodeBlock.logic.ts | 10 +- .../src/components/chat/MarkdownCodeBlock.tsx | 122 +- .../src/components/chat/MarkdownDetails.tsx | 39 + .../src/components/chat/MarkdownFileLink.tsx | 135 +- .../chat/MarkdownMath.browser.test.tsx | 36 - apps/web/src/components/chat/MarkdownMath.tsx | 81 -- .../components/chat/MathTypeset.logic.test.ts | 30 - .../src/components/chat/MathTypeset.logic.ts | 39 - apps/web/src/components/chat/MathTypeset.tsx | 49 - .../chat/MessagesTimeline.browser.test.tsx | 64 +- .../components/chat/MessagesTimeline.logic.ts | 2 +- .../components/chat/TimelineAssistantRows.tsx | 2 +- .../chat/TimelineUserMessageRow.tsx | 12 +- .../chat/TimelineWorkEntryRow.logic.ts | 74 +- .../components/chat/TimelineWorkEntryRow.tsx | 8 +- .../components/chat/TimelineWorkGroupRows.tsx | 10 +- .../components/chat/markdownIslands.test.ts | 50 + .../src/components/chat/markdownIslands.ts | 214 +++ .../components/chat/markdownRenderer.test.tsx | 85 +- .../src/components/chat/markdownRenderer.ts | 76 +- ....test.tsx => markdownStreamBlocks.test.ts} | 33 +- .../components/chat/markdownSyntaxGates.ts | 204 --- .../components/chat/markdownTextDirection.ts | 33 +- .../components/chat/threadFindHighlights.ts | 2 +- .../components/chat/timelineMinimapItems.ts | 64 +- .../src/components/files/FilePreviewPanel.tsx | 2 +- .../src/components/files/NotebookPreview.tsx | 23 +- .../pullRequest/PullRequestDetailPanel.tsx | 4 +- .../PullRequestMarkdown.browser.test.tsx | 2 +- .../pullRequest/PullRequestMarkdown.tsx | 6 +- .../pullRequest/PullRequestSummaryTab.tsx | 2 +- .../pullRequestDetail.logic.test.ts | 9 + .../pullRequest/pullRequestDetail.logic.ts | 31 +- .../pullRequestMarkdown.logic.test.ts | 86 +- .../pullRequest/pullRequestMarkdown.logic.ts | 154 +- .../src/components/settings/settingsSearch.ts | 1 + apps/web/src/components/ui/shared-tooltip.tsx | 262 ++++ .../components/ui/tooltip.browser.test.tsx | 131 +- apps/web/src/components/ui/tooltip.tsx | 28 +- apps/web/src/composer-editor-mentions.ts | 5 +- apps/web/src/composer-rich-text-doc.ts | 3 +- apps/web/src/i18n/translations/de.json | 5 - apps/web/src/i18n/translations/en.json | 5 - apps/web/src/i18n/translations/es.json | 5 - apps/web/src/i18n/translations/fr.json | 5 - apps/web/src/i18n/translations/ja.json | 5 - apps/web/src/i18n/translations/ko.json | 5 - apps/web/src/i18n/translations/pt-BR.json | 5 - apps/web/src/i18n/translations/ru.json | 5 - apps/web/src/i18n/translations/sv.json | 5 - apps/web/src/i18n/translations/zh.json | 5 - apps/web/src/index.css | 13 +- apps/web/src/markdown-clipboard.test.ts | 128 +- apps/web/src/markdown-clipboard.ts | 4 +- apps/web/src/markdown-incremental.test.tsx | 135 -- apps/web/src/markdown-incremental.ts | 98 -- apps/web/src/markdown-links.ts | 39 + apps/web/src/markdown/markdownText.ts | 68 + apps/web/src/markdown/wordsHast.test.ts | 403 +++++ apps/web/src/markdown/wordsHast.ts | 1296 +++++++++++++++++ packages/client-runtime/package.json | 12 +- .../src/pullRequestMarkdown.test.ts | 80 +- .../client-runtime/src/pullRequestMarkdown.ts | 71 +- .../src/pullRequestReferences.ts | 30 + packages/shared/package.json | 19 + packages/shared/src/assistantInsights.ts | 3 + packages/shared/src/codexArtifactTemplates.ts | 26 + .../shared/src/codexMarkdownDirectives.ts | 26 - .../shared/src/composerInlineTokens.test.ts | 18 +- packages/shared/src/composerInlineTokens.ts | 15 +- .../shared/src/markdownGithubAlerts.test.ts | 19 +- packages/shared/src/markdownHast.ts | 211 +++ packages/shared/src/markdownLinks.ts | 3 + .../src/markdownListIndentation.test.ts | 23 +- packages/shared/src/markdownPipeline.ts | 212 +-- packages/shared/src/markdownTaskEdits.ts | 28 + packages/shared/src/markdownTaskList.test.ts | 3 +- packages/shared/src/markdownTaskList.ts | 31 +- packages/shared/src/markdownWindowsPaths.ts | 4 +- packages/shared/src/textDirection.ts | 4 +- packages/shared/src/threadFindBlockTags.ts | 38 + packages/shared/src/threadFindText.ts | 47 +- pnpm-lock.yaml | 109 +- scripts/check-changed.ts | 3 +- scripts/release-smoke.ts | 11 +- 101 files changed, 3959 insertions(+), 2256 deletions(-) create mode 100644 apps/web/deps/README.md create mode 100644 apps/web/deps/pierre-words-0.2.2-t3.4-7c04b7f1.tgz delete mode 100644 apps/web/src/components/chat/MarkdownMath.browser.test.tsx delete mode 100644 apps/web/src/components/chat/MarkdownMath.tsx delete mode 100644 apps/web/src/components/chat/MathTypeset.logic.test.ts delete mode 100644 apps/web/src/components/chat/MathTypeset.logic.ts delete mode 100644 apps/web/src/components/chat/MathTypeset.tsx create mode 100644 apps/web/src/components/chat/markdownIslands.test.ts create mode 100644 apps/web/src/components/chat/markdownIslands.ts rename apps/web/src/components/chat/{markdownStreamBlocks.test.tsx => markdownStreamBlocks.test.ts} (81%) delete mode 100644 apps/web/src/components/chat/markdownSyntaxGates.ts create mode 100644 apps/web/src/components/ui/shared-tooltip.tsx delete mode 100644 apps/web/src/markdown-incremental.test.tsx delete mode 100644 apps/web/src/markdown-incremental.ts create mode 100644 apps/web/src/markdown/markdownText.ts create mode 100644 apps/web/src/markdown/wordsHast.test.ts create mode 100644 apps/web/src/markdown/wordsHast.ts create mode 100644 packages/client-runtime/src/pullRequestReferences.ts create mode 100644 packages/shared/src/assistantInsights.ts rename apps/web/src/markdownGithubAlerts.test.tsx => packages/shared/src/markdownGithubAlerts.test.ts (70%) create mode 100644 packages/shared/src/markdownHast.ts rename apps/web/src/markdownListIndentation.test.tsx => packages/shared/src/markdownListIndentation.test.ts (72%) create mode 100644 packages/shared/src/markdownTaskEdits.ts create mode 100644 packages/shared/src/threadFindBlockTags.ts diff --git a/.pnpmfile.cjs b/.pnpmfile.cjs index 87a153f7b030d..8e79fceda4142 100644 --- a/.pnpmfile.cjs +++ b/.pnpmfile.cjs @@ -1,16 +1,22 @@ const fs = require("node:fs"); const path = require("node:path"); -// Our forks ship as tarballs in apps/mobile/deps. A pnpm patch on one is a second source of -// truth that the next tarball silently drops, so changes go to the fork (apps/mobile/deps/README.md). +// Our forks ship as tarballs in apps/mobile/deps and apps/web/deps. A pnpm patch on one is a +// second source of truth that the next tarball silently drops, so changes go to the fork (see +// the README beside each tarball). +const FORK_APPS = ["apps/mobile", "apps/web"]; + function forkTarballPatches(patchedDependencies) { - const manifestPath = path.join(__dirname, "apps/mobile/package.json"); - // Release staging installs a partial workspace without the mobile app. - if (!patchedDependencies || !fs.existsSync(manifestPath)) return []; - const { dependencies = {} } = JSON.parse(fs.readFileSync(manifestPath, "utf8")); - const forks = Object.keys(dependencies).filter((name) => - String(dependencies[name]).startsWith("file:deps/"), - ); + if (!patchedDependencies) return []; + const forks = FORK_APPS.flatMap((app) => { + const manifestPath = path.join(__dirname, app, "package.json"); + // Release staging installs a partial workspace without every app. + if (!fs.existsSync(manifestPath)) return []; + const { dependencies = {} } = JSON.parse(fs.readFileSync(manifestPath, "utf8")); + return Object.keys(dependencies).filter((name) => + String(dependencies[name]).startsWith("file:deps/"), + ); + }); return Object.keys(patchedDependencies).filter((key) => forks.some((name) => key === name || key.startsWith(`${name}@`)), ); @@ -23,7 +29,7 @@ module.exports = { if (forkPatches.length > 0) { throw new Error( `pnpm-workspace.yaml patches ${forkPatches.join(", ")}, which ships as a fork tarball in ` + - "apps/mobile/deps. Change the fork and replace the tarball instead (apps/mobile/deps/README.md).", + "an app's deps directory. Change the fork and replace the tarball instead (deps/README.md).", ); } // Windows installs need Linux x64 glibc binaries because WSL shares node_modules. diff --git a/apps/mobile/src/features/pull-requests/PullRequestDescription.tsx b/apps/mobile/src/features/pull-requests/PullRequestDescription.tsx index 3251cb8773f03..f0604d6b4ceb6 100644 --- a/apps/mobile/src/features/pull-requests/PullRequestDescription.tsx +++ b/apps/mobile/src/features/pull-requests/PullRequestDescription.tsx @@ -10,7 +10,7 @@ import { useContext, useMemo, useState, type ComponentProps, type ReactNode } fr import { Platform, Pressable, ScrollView, StyleSheet, View } from "react-native"; import Svg, { Defs, LinearGradient, Rect, Stop } from "react-native-svg"; import { pullRequestImageSource } from "./pullRequestMediaSource"; -import { parseMarkdownDocument } from "../../lib/markdownDocument"; +import { markdownReferenceDefinitions, parseMarkdownDocument } from "../../lib/markdownDocument"; import { SymbolView } from "../../components/ui/AppSymbol"; import { AppText as Text } from "../../components/ui/AppText"; import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider"; @@ -44,7 +44,7 @@ export function PullRequestDescription(props: { const document = parseMarkdownDocument(props.markdown); const content = pullRequestDescriptionContent( document, - splitPullRequestBody(props.markdown), + splitPullRequestBody(props.markdown, markdownReferenceDefinitions), messages, ); return { diff --git a/apps/mobile/src/features/pull-requests/PullRequestMarkdown.tsx b/apps/mobile/src/features/pull-requests/PullRequestMarkdown.tsx index 3654cfd87bb42..c1852a6ee2601 100644 --- a/apps/mobile/src/features/pull-requests/PullRequestMarkdown.tsx +++ b/apps/mobile/src/features/pull-requests/PullRequestMarkdown.tsx @@ -17,7 +17,7 @@ import { createContext, useContext, useMemo, useState } from "react"; import { changeRequestReferenceAutolinker, resolveChangeRequestMediaUrl, -} from "@t3tools/client-runtime/pull-request-markdown"; +} from "@t3tools/client-runtime/pull-request-references"; import { sourceControlClients, type ReferenceAutolink, @@ -28,6 +28,7 @@ import { useOpenPullRequest } from "../../native/useOpenPullRequest"; import { SelectableMarkdownText } from "../../native/SelectableMarkdownText"; import { useMarkdownPreviewStyles } from "../files/FileMarkdownPreview"; import { markdownImageSources } from "../../lib/markdownImageSources"; +import { markdownReferenceDefinitions } from "../../lib/markdownDocument"; import { FilePreviewGallery, useFilePreviewGallery } from "../../components/ui/FilePreviewGallery"; import { pullRequestImageSource } from "./pullRequestMediaSource"; import { @@ -124,7 +125,10 @@ export function PullRequestMarkdown(props: { }) { const mediaContext = useContext(PullRequestMediaContext); const changeRequestUrl = useContext(ChangeRequestUrlContext); - const segments = useMemo(() => splitPullRequestBody(props.markdown), [props.markdown]); + const segments = useMemo( + () => splitPullRequestBody(props.markdown, markdownReferenceDefinitions), + [props.markdown], + ); const [undoneTicks, setUndoneTicks] = useState(0); const gallery: FilePreviewItem[] = markdownImageSources( props.imageGroupMarkdown ?? props.markdown, diff --git a/apps/mobile/src/features/pull-requests/pullRequestAutolinks.test.ts b/apps/mobile/src/features/pull-requests/pullRequestAutolinks.test.ts index 6500a79885a8d..7acb1640694f7 100644 --- a/apps/mobile/src/features/pull-requests/pullRequestAutolinks.test.ts +++ b/apps/mobile/src/features/pull-requests/pullRequestAutolinks.test.ts @@ -1,4 +1,4 @@ -import { changeRequestReferenceAutolinker } from "@t3tools/client-runtime/pull-request-markdown"; +import { changeRequestReferenceAutolinker } from "@t3tools/client-runtime/pull-request-references"; import { describe, expect, it } from "vite-plus/test"; import { nativePullRequestMarkdown } from "./pullRequestAutolinks"; diff --git a/apps/mobile/src/features/pull-requests/pullRequestDescriptionContent.test.ts b/apps/mobile/src/features/pull-requests/pullRequestDescriptionContent.test.ts index 6d6a1bfe4b624..74e21d39018ee 100644 --- a/apps/mobile/src/features/pull-requests/pullRequestDescriptionContent.test.ts +++ b/apps/mobile/src/features/pull-requests/pullRequestDescriptionContent.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from "vite-plus/test"; -import type { MarkdownNode } from "../../lib/markdownDocument"; +import { markdownReferenceDefinitions, type MarkdownNode } from "../../lib/markdownDocument"; import { splitPullRequestBody } from "@t3tools/client-runtime/pull-request-markdown"; import { pullRequestDescriptionContent } from "./pullRequestDescriptionContent"; @@ -15,6 +15,7 @@ describe("PR attachments", () => { } as MarkdownNode; const media = splitPullRequestBody( `${uri}\n\nhttps://drop.example.com/demo.mp4\n\nhttps://github.com/user-attachments/assets/123-abc`, + markdownReferenceDefinitions, ); expect(pullRequestDescriptionContent(document, media).attachments).toEqual([ { uri, caption: "Screenshot", kind: "image" }, @@ -30,6 +31,7 @@ describe("PR attachments", () => { it("collects videos from a before/after table", () => { const media = splitPullRequestBody( "\n\n\n
BeforeAfter
\n\nhttps://drop.example.com/before.mp4\n\n\n\nhttps://drop.example.com/after.mp4\n\n
", + markdownReferenceDefinitions, ); expect( pullRequestDescriptionContent({ type: "root" } as MarkdownNode, media).attachments, diff --git a/apps/mobile/src/features/pull-requests/usePullRequestDescription.ts b/apps/mobile/src/features/pull-requests/usePullRequestDescription.ts index 105f4a1095009..5758e6b2ee84a 100644 --- a/apps/mobile/src/features/pull-requests/usePullRequestDescription.ts +++ b/apps/mobile/src/features/pull-requests/usePullRequestDescription.ts @@ -8,7 +8,7 @@ import { } from "@t3tools/client-runtime/pull-request-editing"; import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime"; import type { PullRequestDetail } from "@t3tools/contracts"; -import { setMarkdownTaskChecked } from "@t3tools/shared/markdownTaskList"; +import { setMarkdownTaskChecked } from "@t3tools/shared/markdownTaskEdits"; import { AsyncResult } from "effect/reactivity"; import { useGT } from "gt-react-native"; import { useRef, useState } from "react"; diff --git a/apps/mobile/src/lib/composerContext.test.ts b/apps/mobile/src/lib/composerContext.test.ts index e2a5a015c61af..255666ebcf0b2 100644 --- a/apps/mobile/src/lib/composerContext.test.ts +++ b/apps/mobile/src/lib/composerContext.test.ts @@ -8,6 +8,7 @@ import { type ServerProviderSkill, } from "@t3tools/contracts"; import { collectComposerInlineTokens } from "@t3tools/shared/composerInlineTokens"; +import { markdownMathRanges } from "@t3tools/shared/markdownMath"; import { serializeAssistantCitation } from "@t3tools/shared/assistantCitations"; import { ATTACHMENT_ONLY_BOOTSTRAP_PROMPT, @@ -167,7 +168,7 @@ describe("mobile composer context", () => { const modelTokens = (text: string) => composerContextEditorTokens( text, - collectComposerInlineTokens(text), + collectComposerInlineTokens(text, { findMath: markdownMathRanges }), new Set(), collectComposerModelTokens(text, known), ) @@ -256,7 +257,7 @@ describe("mobile composer context", () => { const skills = [babysit, disabled, agentOnly]; const tokens = composerContextEditorTokens( text, - collectComposerInlineTokens(text), + collectComposerInlineTokens(text, { findMath: markdownMathRanges }), composerSkillLabels(skills), ); expect(tokens.map((token) => token.source)).toEqual([ @@ -271,14 +272,14 @@ describe("mobile composer context", () => { expect( composerContextEditorTokens( text, - collectComposerInlineTokens(text), + collectComposerInlineTokens(text, { findMath: markdownMathRanges }), composerSkillLabels([]), ).map((token) => token.type), ).toEqual(["mention", "context", "context", "citation", "citation"]); expect( composerContextEditorTokens( text, - collectComposerInlineTokens(text), + collectComposerInlineTokens(text, { findMath: markdownMathRanges }), composerSkillLabels([{ ...babysit, name: "HOME" }]), ) .filter((token) => token.type === "skill") @@ -292,7 +293,7 @@ describe("mobile composer context", () => { expect( composerContextEditorTokens( text, - collectComposerInlineTokens(text), + collectComposerInlineTokens(text, { findMath: markdownMathRanges }), composerSkillLabels(promoted), ) .filter((token) => token.type === "skill") @@ -301,7 +302,7 @@ describe("mobile composer context", () => { expect( composerContextEditorTokens( text, - collectComposerInlineTokens(text), + collectComposerInlineTokens(text, { findMath: markdownMathRanges }), composerSkillLabels(skills), ) .filter((token) => token.type === "skill") diff --git a/apps/mobile/src/lib/composerContext.ts b/apps/mobile/src/lib/composerContext.ts index 754774c4f1306..219a61108fd51 100644 --- a/apps/mobile/src/lib/composerContext.ts +++ b/apps/mobile/src/lib/composerContext.ts @@ -40,6 +40,7 @@ import { composerMathRanges, type ComposerInlineToken, } from "@t3tools/shared/composerInlineTokens"; +import { markdownMathRanges } from "@t3tools/shared/markdownMath"; const isMessageContext = Schema.is(OrchestrationMessageContext); const decodeMessageContext = Schema.decodeUnknownOption(OrchestrationMessageContext); @@ -73,7 +74,7 @@ export function composerMentionPath(source: string, context?: OrchestrationMessa const record = context?.records.find((entry) => entry.contextId === reference.contextId); return record?.kind === "mention" && "path" in record ? record.path : null; } - const token = collectComposerInlineTokens(`${source} `)[0]; + const token = collectComposerInlineTokens(`${source} `, { findMath: markdownMathRanges })[0]; return token?.type === "mention" && token.source === source ? token.value : null; } @@ -222,7 +223,12 @@ export function composerContextEditorTokens( !references.some((ref) => token.start < ref.end && token.end > ref.start) && !citations.some((ref) => token.start < ref.end && token.end > ref.start), ); - const taken = [...inlineTokens, ...references, ...citations, ...composerMathRanges(text)]; + const taken = [ + ...inlineTokens, + ...references, + ...citations, + ...composerMathRanges(text, markdownMathRanges), + ]; const models = modelTokens.filter( (mention) => !taken.some((range) => mention.start < range.end && mention.end > range.start), ); diff --git a/apps/mobile/src/native/T3ComposerEditor.ios.tsx b/apps/mobile/src/native/T3ComposerEditor.ios.tsx index ef57536abe95f..7e8eba1d01b28 100644 --- a/apps/mobile/src/native/T3ComposerEditor.ios.tsx +++ b/apps/mobile/src/native/T3ComposerEditor.ios.tsx @@ -1,6 +1,7 @@ import { PASTED_TEXT_ATTACHMENT_THRESHOLD_BYTES } from "@t3tools/client-runtime/text-paste"; import { PROVIDER_SEND_TURN_MAX_INPUT_CHARS } from "@t3tools/contracts"; import { collectComposerInlineTokens } from "@t3tools/shared/composerInlineTokens"; +import { markdownMathRanges } from "@t3tools/shared/markdownMath"; import { composerContextEditorTokens, composerSkillLabels } from "../lib/composerContext"; import { useComposerModelTokens } from "./useComposerModelTokens"; import { requireNativeView } from "expo"; @@ -169,11 +170,12 @@ export function ComposerEditor({ // an abandoned render from leaking a trailing token into the next one. const [confirmedTokens, setConfirmedTokens] = useState(() => ({ value: props.value, - tokens: collectComposerInlineTokens(props.value), + tokens: collectComposerInlineTokens(props.value, { findMath: markdownMathRanges }), })); let tokens = confirmedTokens.tokens; if (confirmedTokens.value !== props.value) { tokens = collectComposerInlineTokens(props.value, { + findMath: markdownMathRanges, preserveTrailingFrom: confirmedTokens.tokens, }); setConfirmedTokens({ value: props.value, tokens }); diff --git a/apps/mobile/src/native/T3ComposerEditor.native.tsx b/apps/mobile/src/native/T3ComposerEditor.native.tsx index 28f47c3b758ab..4a0f57e411020 100644 --- a/apps/mobile/src/native/T3ComposerEditor.native.tsx +++ b/apps/mobile/src/native/T3ComposerEditor.native.tsx @@ -1,6 +1,7 @@ import { PASTED_TEXT_ATTACHMENT_THRESHOLD_BYTES } from "@t3tools/client-runtime/text-paste"; import { PROVIDER_SEND_TURN_MAX_INPUT_CHARS } from "@t3tools/contracts"; import { collectComposerInlineTokens } from "@t3tools/shared/composerInlineTokens"; +import { markdownMathRanges } from "@t3tools/shared/markdownMath"; import { composerContextEditorTokens, composerSkillLabels } from "../lib/composerContext"; import { DEFAULT_COMPOSER_ENTER_BEHAVIOR } from "../lib/composerEnterBehavior"; import { useComposerModelTokens } from "./useComposerModelTokens"; @@ -156,11 +157,12 @@ export function ComposerEditor({ // an abandoned render from leaking a trailing token into the next one. const [confirmedTokens, setConfirmedTokens] = useState(() => ({ value: props.value, - tokens: collectComposerInlineTokens(props.value), + tokens: collectComposerInlineTokens(props.value, { findMath: markdownMathRanges }), })); let tokens = confirmedTokens.tokens; if (confirmedTokens.value !== props.value) { tokens = collectComposerInlineTokens(props.value, { + findMath: markdownMathRanges, preserveTrailingFrom: confirmedTokens.tokens, }); setConfirmedTokens({ value: props.value, tokens }); diff --git a/apps/web/deps/README.md b/apps/web/deps/README.md new file mode 100644 index 0000000000000..26750d308c195 --- /dev/null +++ b/apps/web/deps/README.md @@ -0,0 +1,15 @@ +The Words tarball comes from the [`fork/t3-words` branch](https://github.com/pingdotgg/pierre/tree/fork/t3-words) of our fork of [pierrecomputer/pierre](https://github.com/pierrecomputer/pierre). Its `t3-fork.json` records the source commit and the upstream base. The fork adds opt-in options, all off by default so default output stays byte-identical to upstream: + +- `singleTilde: false`: only `~~` strikes. +- `windowsPaths`: backslashes in Windows drive paths stay. +- `codeMeta`: code fence info after the language becomes `data-meta`. +- `sourcePositions`: `data-sourcepos` byte ranges on list items, links, images, code blocks, math and directives. +- `directives`: the named remark-directive text and leaf directives. +- `escapeHtml`: raw HTML renders as escaped text. +- `leadingWhitespace`: spaces typed at the start of paragraph lines show, in `data-leading-whitespace` spans. +- `texDelimiters`: with `math`, `\(…\)` and `\[…\]` are math, as T3's llm-math reads them. +- `autolinkBoundaries`: end ASCII bare URLs before CJK/Arabic punctuation and keep trailing `_`/`~` when not closing emphasis. + +To replace it, commit the change on `fork/t3-words`, bump `packages/words/package.json` to the next `0.2.2-t3.N` and update `t3-fork.json`'s `source`, then run `moon run words:build` (or `node scripts/build.ts && tsdown`) and `npm pack` in `packages/words`. Name the archive with the first eight characters of the source commit, such as `pierre-words-0.2.2-t3.4-7c04b7f1.tgz`, update the path in `apps/web/package.json`, and run `vp i`. + +Change it through the fork, never with a pnpm patch: the next tarball would drop the patch without a trace. diff --git a/apps/web/deps/pierre-words-0.2.2-t3.4-7c04b7f1.tgz b/apps/web/deps/pierre-words-0.2.2-t3.4-7c04b7f1.tgz new file mode 100644 index 0000000000000000000000000000000000000000..b6716f0395062eef7d2d14d830eafacc8c0d894f GIT binary patch literal 219310 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 xwYqImg?t*iHj+@gPJ`e`A_vv&Xh literal 0 HcmV?d00001 diff --git a/apps/web/package.json b/apps/web/package.json index 21ac8caba0b1e..a60eb801260cf 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -34,6 +34,7 @@ "@noble/hashes": "catalog:", "@pierre/diffs": "catalog:", "@pierre/trees": "1.0.0-beta.6", + "@pierre/words": "file:deps/pierre-words-0.2.2-t3.4-7c04b7f1.tgz", "@t3tools/client-runtime": "workspace:*", "@t3tools/contracts": "workspace:*", "@t3tools/provider-core": "workspace:*", @@ -74,24 +75,16 @@ "jszip": "3.10.1", "katex": "^0.18.2", "lucide-react": "^0.564.0", - "mdast-util-from-markdown": "^2.0.3", - "micromark-util-combine-extensions": "^2.0.1", "pdfjs-dist": "6.4.299", "pele": "catalog:", + "property-information": "^7.2.0", "react": "catalog:", "react-dom": "catalog:", - "react-markdown": "^10.1.0", - "remark-gfm": "catalog:", - "remark-math": "6.0.0", - "remark-parse": "catalog:", - "remark-rehype": "catalog:", "saxes": "6.0.0", "sql.js": "1.15.0", "tailwind-merge": "^3.4.0", "tiff": "7.1.3", - "unified": "catalog:", "use-sync-external-store": "^1.6.0", - "vfile": "^6.0.3", "zustand": "^5.0.11" }, "devDependencies": { @@ -103,7 +96,6 @@ "@types/compression": "^1.8.1", "@types/culori": "^4.0.1", "@types/hast": "^3.0.4", - "@types/mdast": "^4.0.4", "@types/react": "catalog:", "@types/react-dom": "catalog:", "@types/sql.js": "1.4.11", @@ -113,7 +105,6 @@ "@vitest/browser-playwright": "5.0.5", "compression": "^1.8.2", "gt": "2.27.0", - "micromark-util-types": "catalog:", "oxc-transform-react": "~0.152.0", "playwright": "1.64.1", "tailwindcss": "^4.0.0", diff --git a/apps/web/src/components/ChatMarkdown.browser.test.tsx b/apps/web/src/components/ChatMarkdown.browser.test.tsx index 0586a724b0c56..faca71b4a101f 100644 --- a/apps/web/src/components/ChatMarkdown.browser.test.tsx +++ b/apps/web/src/components/ChatMarkdown.browser.test.tsx @@ -2,7 +2,6 @@ import { MISSING_FILE_ACCESS_MESSAGE } from "@t3tools/client-runtime/state/asset import { EnvironmentId, ThreadId } from "@t3tools/contracts"; import { AsyncResult } from "effect/reactivity"; import { type ReactElement } from "react"; -import remarkGfm from "remark-gfm"; import { describe, expect, it, vi } from "vite-plus/test"; import { commands, page, userEvent } from "vite-plus/test/browser"; @@ -15,11 +14,8 @@ import { selectActiveRightPanelSurface, useRightPanelStore, } from "../rightPanelStore"; -import { - CHAT_USER_MARKDOWN_REMARK_PLUGINS, - remarkEnableOrderedListNumbers, -} from "@t3tools/shared/markdownPipeline"; -import { setMarkdownTaskChecked } from "@t3tools/shared/markdownTaskList"; +import type { MarkdownExtensions } from "../markdown/wordsHast"; +import { setMarkdownTaskChecked } from "@t3tools/shared/markdownTaskEdits"; import { HostImageUrlContext } from "./chat/hostImageUrl"; import { getSyntaxHighlighterPromise } from "~/lib/syntaxHighlighting"; @@ -28,14 +24,14 @@ const { workspaceSearch, filesystemMetadata } = vi.hoisted(() => ({ filesystemMetadata: vi.fn(), })); const parsedSources = vi.hoisted(() => [] as string[]); -vi.mock(import("mdast-util-from-markdown"), async (original) => { +vi.mock(import("../markdown/wordsHast"), async (original) => { const actual = await original(); return { ...actual, - fromMarkdown: ((source: string, ...rest: never[]) => { - parsedSources.push(String(source)); - return (actual.fromMarkdown as (...args: unknown[]) => unknown)(source, ...rest); - }) as typeof actual.fromMarkdown, + wordsHast: (source, options) => { + parsedSources.push(source); + return actual.wordsHast(source, options); + }, }; }); @@ -188,7 +184,7 @@ function buttonsLabelled(container: HTMLElement, label: string) { ); } -const SOURCE_NUMBER_PLUGINS = [remarkEnableOrderedListNumbers]; +const USER_MESSAGE = { userMessage: true }; it("keeps decimal markers in nested user lists while documents keep their counter styles", async () => { setup(); @@ -201,7 +197,7 @@ it("keeps decimal markers in nested user lists while documents keep their counte cwd={undefined} text={text} className="user-message-markdown" - extraRemarkPlugins={SOURCE_NUMBER_PLUGINS} + extensions={USER_MESSAGE} />

@@ -312,36 +308,24 @@ it("reuses the parse of a streaming reply's finished blocks when it remounts", a expect(parsedSources.filter((source) => source.includes("Finished block"))).toHaveLength(1); }); -it("reuses the parse of a remounted message that has stable extra plugins", async () => { +it("reuses the parse of a remounted message that has stable extensions", async () => { setup(); - const parsed = vi.fn(); - const countingPlugins = [() => () => void parsed()]; - const message = ( - - ); + const extensions = { userMessage: true }; + const message = ; { await using first = await render( - , + , ); await first.rerender(message); } await using screen = await render(message); await expect.element(screen.getByText("Cached text")).toBeVisible(); - expect(parsed).toHaveBeenCalledTimes(1); - const changed = vi.fn(); + const parses = () => parsedSources.filter((source) => source === "Cached text").length; + expect(parses()).toBe(1); await screen.rerender( - () => void changed()]} - />, + , ); - expect(changed).toHaveBeenCalledTimes(1); + expect(parses()).toBe(2); }); it("highlights a code block's own source when an earlier block of the same length was cached", async () => { @@ -399,6 +383,45 @@ describe("ChatMarkdown external link labels", () => { }); }); +describe("ChatMarkdown link tooltips", () => { + it("shows each link's address on one shared tooltip as the pointer moves between links", async () => { + setup(); + await using screen = await render( + , + ); + await userEvent.hover(screen.getByRole("link", { name: /First/ })); + await expect.element(page.getByText("https://example.com/a")).toBeVisible(); + await userEvent.hover(screen.getByRole("link", { name: /Second/ })); + await expect.element(page.getByText("https://example.org/b")).toBeVisible(); + expect(document.querySelectorAll('[data-slot="tooltip-popup"]')).toHaveLength(1); + }); +}); + +describe("ChatMarkdown details", () => { + it("opens collapsed details by click, and by keyboard without losing focus", async () => { + setup(); + await using screen = await render( + First\n\nHidden one\n\n\n\n
Second\n\nHidden two\n\n
" + } + />, + ); + await userEvent.click(screen.getByRole("button", { name: "First" })); + await expect.element(screen.getByText("Hidden one")).toBeVisible(); + await userEvent.tab(); + const second = screen.getByRole("button", { name: "Second" }); + await expect.element(second).toHaveFocus(); + await userEvent.keyboard("{Enter}"); + await expect.element(screen.getByText("Hidden two")).toBeVisible(); + await expect.element(screen.getByRole("button", { name: "Second" })).toHaveFocus(); + }); +}); + describe("ChatMarkdown streaming", () => { it("runs only a complete single-line shell block after a click", async () => { setup(); @@ -802,12 +825,12 @@ describe("ChatMarkdown copy", () => { "copies and selects user lines the same whether their typed indentation shows: $text", async (copy) => { setup(); - const copied = async (extraRemarkPlugins: typeof CHAT_USER_MARKDOWN_REMARK_PLUGINS) => { + const copied = async (extensions: MarkdownExtensions) => { await using screen = await renderText(copy.text, { className: "user-message-markdown", lineBreaks: true, parseRawHtml: false, - extraRemarkPlugins, + extensions, }); const range = document.createRange(); range.selectNodeContents(screen.container); @@ -824,9 +847,9 @@ describe("ChatMarkdown copy", () => { // A drag or anything else that reads the selection gets its text, not the copy payload. return { payload: chatMarkdownClipboardPayload(selection), selected: selection.toString() }; }; - const shown = await copied(CHAT_USER_MARKDOWN_REMARK_PLUGINS); + const shown = await copied({ userMessage: true, leadingWhitespace: true }); // The user pipeline as it was before typed indentation was shown. - expect(shown).toEqual(await copied([[remarkGfm, { singleTilde: false }]])); + expect(shown).toEqual(await copied({ userMessage: true })); }, ); @@ -885,7 +908,7 @@ describe("ChatMarkdown copy", () => { setup(); await using screen = await renderText( source, - userMessage ? { extraRemarkPlugins: SOURCE_NUMBER_PLUGINS } : {}, + userMessage ? { extensions: USER_MESSAGE } : {}, ); const itemText = (shown: string) => [...screen.container.querySelectorAll("li")] diff --git a/apps/web/src/components/ChatMarkdown.tsx b/apps/web/src/components/ChatMarkdown.tsx index 8c0d14520871d..979d1858cafc1 100644 --- a/apps/web/src/components/ChatMarkdown.tsx +++ b/apps/web/src/components/ChatMarkdown.tsx @@ -13,7 +13,7 @@ import { extractMarkdownLinkHrefs, inlineCodeFilePathCandidate, } from "@t3tools/shared/markdownLinks"; -import { taskListMarkerOffset } from "@t3tools/shared/markdownTaskList"; +import { taskListMarkerOffset } from "@t3tools/shared/markdownTaskEdits"; import { isHostPath, resolveWorkspaceFilePath } from "@t3tools/shared/path"; import { usePullRequestLinking } from "~/hooks/usePullRequestLinking"; import { @@ -21,14 +21,7 @@ import { AuthOrchestrationOperateScope, SOURCE_CONTROL_MEDIA_ASSET, } from "@t3tools/contracts"; -import { - CHAT_MARKDOWN_REMARK_PLUGINS, - CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS, - CHAT_MARKDOWN_REHYPE_PLUGINS, - chatMarkdownImageSource, - decodeMarkdownLinkEscapes, - remarkAssistantInsights, -} from "@t3tools/shared/markdownPipeline"; +import { chatMarkdownImageSource } from "@t3tools/shared/markdownHast"; import { useAtomValue } from "@effect/atom-react"; import { COMPOSER_CONTEXT_CLIPBOARD_MIME, @@ -94,27 +87,17 @@ import React, { useState, type ReactNode, } from "react"; -import type { - Components, - ExtraProps as ReactMarkdownExtraProps, - Options as ReactMarkdownOptions, -} from "react-markdown"; -import { createIncrementalMarkdownPlugin } from "../markdown-incremental"; -import type { Pluggable, PluggableList } from "unified"; -import { defaultUrlTransform } from "react-markdown"; import { parseAssistantCitationHref } from "@t3tools/shared/assistantCitations"; import { parseComposerContextHref } from "@t3tools/shared/composerContextReferences"; import { parseThreadLinkHref } from "@t3tools/shared/threadLinks"; import { AssistantCitationEmbed } from "./chat/AssistantCitationChip"; import { MarkdownThreadLink } from "./chat/MarkdownThreadLink"; -import { mathKind } from "@t3tools/shared/markdownMath"; -import remarkMath from "remark-math"; +import { artifactTemplateFromHastProperties } from "@t3tools/shared/codexArtifactTemplates"; import { - artifactTemplateFromHastProperties, + decodeMarkdownLinkEscapes, renderCodexInlineDirectivesAsMarkdown, -} from "@t3tools/shared/codexMarkdownDirectives"; +} from "../markdown/markdownText"; import { renderSkillInlineMarkdownChildren } from "./chat/SkillInlineText"; -import { MarkdownMath } from "./chat/MarkdownMath"; import { resolveMarkdownMediaPreview, type ExpandedImagePreview, @@ -131,7 +114,7 @@ import { resolveExternalWebLinkHost, showExternalLinkContextMenu, } from "./chat/externalLinkContextMenu"; -import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip"; +import { SharedTooltipProvider, SharedTooltipTrigger } from "./ui/shared-tooltip"; import { Button } from "./ui/button"; import { stackedThreadToast, toastManager } from "./ui/toast"; import { recordVisitForThread } from "../browserHistoryStore"; @@ -214,6 +197,15 @@ import { PullRequestLinkPreview } from "./pullRequest/PullRequestLinkPreview"; import { IssueLinkPreview, IssueLinkPreviewFallback } from "./issue/IssueLinkPreview"; import { MarkdownCodeBlock, SuspenseShikiCodeBlock } from "./chat/MarkdownCodeBlock"; import { createMarkdownRenderer } from "./chat/markdownRenderer"; +import type { MarkdownExtensions, WordsHastOptions } from "../markdown/wordsHast"; +import { + type MarkdownIslandOptions, + renderHastWithIslands, + withProperties, +} from "./chat/markdownIslands"; +import type { Element as HastElement } from "hast"; +import { matchInlineSkills } from "@t3tools/shared/inlineSkills"; +import { collectComposerModelMentions } from "@t3tools/client-runtime/composer-model-mentions"; import { splitMarkdownBlocks } from "./chat/markdownStreamBlocks"; import { MarkdownMermaidCodeBlock } from "./chat/MarkdownMermaidCodeBlock"; import { MarkdownTable } from "./chat/MarkdownTable"; @@ -230,9 +222,7 @@ import { import { MarkdownExternalLinkContent } from "./chat/MarkdownExternalLink"; import { MarkdownFileLink } from "./chat/MarkdownFileLink"; import { canUseMarkdownFileShellActions } from "./chat/MarkdownFileLink.logic"; -import { rehypeChipPunctuation } from "./chat/markdownChipPunctuation"; -import { handleMarkdownFragmentClick, rehypeHeadingIds } from "./chat/markdownFragments"; -import { rehypeTextDirection } from "./chat/markdownTextDirection"; +import { handleMarkdownFragmentClick } from "./chat/markdownFragments"; import { hastHasText, hastPlainTextDeep, plainHastText } from "./chat/markdownHast.logic"; import { extractCodeBlock, @@ -268,8 +258,8 @@ interface ChatMarkdownProps { imageBaseDir?: string | undefined; workspaceMutationId?: string | null | undefined; onImageExpand?: ((preview: ExpandedImagePreview) => void) | undefined; - /** Keep one list per configuration (a module constant): it keys the shared parse cache. */ - extraRemarkPlugins?: NonNullable; + /** Keep one object per configuration (a module constant): it keys the shared parse cache. */ + extensions?: MarkdownExtensions | undefined; renderContextReference?: ((reference: ChatMarkdownContextReference) => ReactNode) | undefined; /** Loads media a source control host keeps behind a credential through the server, which holds `cwd`'s; without it a private repository's uploads load unauthenticated and 404. */ @@ -289,7 +279,7 @@ export interface ChatMarkdownContextReference { } const EMPTY_MARKDOWN_SKILLS: ReadonlyArray = []; -const EMPTY_REMARK_PLUGINS: NonNullable = []; +const NO_EXTENSIONS: MarkdownExtensions = {}; const ARTIFACT_TEMPLATE_ICON_BY_KIND = { document: FileTextIcon, @@ -423,19 +413,29 @@ function normalizeMarkdownLinkHrefKey(href: string): string { : rewrittenHref; } -// Heading ids are added after sanitizing, which would prefix them a second time. -const CHAT_MARKDOWN_RENDER_REHYPE_PLUGINS = [ - ...CHAT_MARKDOWN_REHYPE_PLUGINS, - rehypeHeadingIds, - rehypeTextDirection, - rehypeChipPunctuation, -] satisfies NonNullable; +/** A component per element, with the hast node it renders, as react-markdown typed them. */ +type MarkdownComponents = { + [Tag in keyof React.JSX.IntrinsicElements]?: React.ComponentType< + React.JSX.IntrinsicElements[Tag] & { node?: HastElement | undefined } + >; +}; -const CHAT_MARKDOWN_LITERAL_HTML_REHYPE_PLUGINS = [ - rehypeHeadingIds, - rehypeTextDirection, - rehypeChipPunctuation, -] satisfies NonNullable; +// react-markdown's defaultUrlTransform: relative URLs, and absolute ones with a safe protocol. +const SAFE_PROTOCOL = /^(?:https?|ircs?|mailto|xmpp)$/i; +function safeUrl(value: string): string { + const colon = value.indexOf(":"); + const before = (character: string) => { + const at = value.indexOf(character); + return at !== -1 && colon > at; + }; + return colon === -1 || + before("/") || + before("?") || + before("#") || + SAFE_PROTOCOL.test(value.slice(0, colon)) + ? value + : ""; +} function markdownUrlTransform(href: string) { if (parseAssistantCitationHref(href)) return href; @@ -443,7 +443,7 @@ function markdownUrlTransform(href: string) { if (parseThreadLinkHref(href)) return href; if (isWindowsDrivePathHref(href)) return href; if (isLocalEditorFileHref(href)) return href; - return rewriteMarkdownFileUriHref(href) ?? defaultUrlTransform(href); + return rewriteMarkdownFileUriHref(href) ?? safeUrl(href); } const NO_MARKDOWN_EDITORS: ReadonlyArray = []; @@ -486,11 +486,16 @@ const markdownServerConfigFieldsAtom = Atom.family((environmentId: EnvironmentId }).pipe(Atom.withLabel("markdown-server-config-fields")), ); -function fileLinkSourcesKey( +interface BlockFileLinkSources { + readonly hrefs: ReadonlyArray; + readonly spans: ReadonlyArray; +} + +function blockFileLinkSources( text: string, cwd: string | undefined, imageBaseDir: string | undefined, -): string { +): BlockFileLinkSources { const hrefs = extractMarkdownLinkHrefs(renderCodexInlineDirectivesAsMarkdown(text)) .filter((href) => !parseComposerContextHref(href)) .map(decodeMarkdownLinkEscapes) @@ -499,7 +504,47 @@ function fileLinkSourcesKey( const spans = extractInlineCodeSpans(text).filter((span) => resolveInlineCodeFileLinkMeta(span, cwd, imageBaseDir ?? cwd), ); - return JSON.stringify([[...new Set(hrefs)], [...new Set(spans)]]); + return { hrefs, spans }; +} + +// Links and code spans never cross blocks: a streamed reply rescans only its open last block. +const MAX_CACHED_BLOCK_CHARS = 2_000_000; +const finishedBlockFileLinkSources = new Map(); +let cachedBlockChars = 0; + +function fileLinkSourcesKey( + text: string, + cwd: string | undefined, + imageBaseDir: string | undefined, + streamingBlocks: ReadonlyArray | null, +): string { + if (!streamingBlocks) { + const { hrefs, spans } = blockFileLinkSources(text, cwd, imageBaseDir); + return JSON.stringify([[...new Set(hrefs)], [...new Set(spans)]]); + } + const config = `${cwd ?? ""}\u0000${imageBaseDir ?? ""}\u0000`; + const hrefs = new Set(); + const spans = new Set(); + const last = streamingBlocks.length - 1; + for (const [index, block] of streamingBlocks.entries()) { + // The last block still grows; caching each of its prefixes would only fill the cache. + const key = config + block; + let sources = index === last ? undefined : finishedBlockFileLinkSources.get(key); + if (!sources) { + sources = blockFileLinkSources(block, cwd, imageBaseDir); + if (index !== last) { + if (cachedBlockChars + key.length > MAX_CACHED_BLOCK_CHARS) { + finishedBlockFileLinkSources.clear(); + cachedBlockChars = 0; + } + finishedBlockFileLinkSources.set(key, sources); + cachedBlockChars += key.length; + } + } + for (const href of sources.hrefs) hrefs.add(href); + for (const span of sources.spans) spans.add(span); + } + return JSON.stringify([[...hrefs], [...spans]]); } function resolveFileLinkSources( @@ -525,27 +570,30 @@ function resolveFileLinkSources( return { markdownFileLinkMetaByHref, inlineCodeFileLinkMetaByText, fileLinkParentSuffixByPath }; } -function useChatMarkdownState({ - text, - inline = false, - cwd, - agentDirectories, - threadRef, - pullRequestPanelRef, - environmentId: explicitEnvironmentId, - onTaskListChange, - isStreaming = false, - skills = EMPTY_MARKDOWN_SKILLS, - onUseArtifactTemplate, - onRunShellCommand, - imageBaseDir, - workspaceMutationId, - onImageExpand, - renderContextReference, - headingLevelOffset = 0, - sourceControlMedia = false, - sourceControlMediaRepository, -}: ChatMarkdownProps) { +function useChatMarkdownState( + { + text, + inline = false, + cwd, + agentDirectories, + threadRef, + pullRequestPanelRef, + environmentId: explicitEnvironmentId, + onTaskListChange, + isStreaming = false, + skills = EMPTY_MARKDOWN_SKILLS, + onUseArtifactTemplate, + onRunShellCommand, + imageBaseDir, + workspaceMutationId, + onImageExpand, + renderContextReference, + headingLevelOffset = 0, + sourceControlMedia = false, + sourceControlMediaRepository, + }: ChatMarkdownProps, + streamingBlocks: ReadonlyArray | null, +) { const gt = useGT(); const messages = useMessages(); const resolvedTheme = useRenderedAppearance(); @@ -743,7 +791,7 @@ function useChatMarkdownState({ // Keyed by the file links found, not the text, so streamed text that adds none keeps the // renderer context, and every block reading it, unchanged. // A template literal marks the key as a string, so the compiler memoizes the maps on its value. - const fileLinksKey = `${fileLinkSourcesKey(text, cwd, imageBaseDir)}`; + const fileLinksKey = `${fileLinkSourcesKey(text, cwd, imageBaseDir, isStreaming ? (streamingBlocks ?? splitMarkdownBlocks(text) ?? [text]) : null)}`; const { markdownFileLinkMetaByHref, inlineCodeFileLinkMetaByText, fileLinkParentSuffixByPath } = resolveFileLinkSources(fileLinksKey, cwd, imageBaseDir); const resolveThreadPullRequest = ( @@ -1087,7 +1135,7 @@ function markdownHeadingRenderer(level: 1 | 2 | 3 | 4 | 5 | 6) { return function MarkdownHeading({ node: _node, ...props - }: ComponentProps & ReactMarkdownExtraProps) { + }: ComponentProps & { node?: HastElement | undefined }) { const { headingLevelOffset } = use(ChatMarkdownRendererContext); return ( ; } - return ( - - - {href} - - ); + return ; } const label = nodeToPlainText(children); @@ -1533,18 +1576,9 @@ const CHAT_MARKDOWN_COMPONENTS = { ); }, code: function MarkdownCode({ node, children, className, ...props }) { - const { cwd, imageBaseDir, inlineCodeFileLinkMetaByText, fileLinkChip, mathEnabled, inline } = - use(ChatMarkdownRendererContext); - const math = mathEnabled ? mathKind(className) : null; - if (math) { - return ( - - ); - } + const { cwd, imageBaseDir, inlineCodeFileLinkMetaByText, fileLinkChip } = use( + ChatMarkdownRendererContext, + ); if (node?.properties?.dataInlineCode != null) { const codeText = nodeToPlainText(children); const fileLinkMeta = @@ -1769,15 +1803,9 @@ const CHAT_MARKDOWN_COMPONENTS = { }, pre: function MarkdownPre({ node, children, ...props }) { const gt = useGT(); - const { - resolvedTheme, - diffThemeName, - expandMedia, - isStreaming, - onRunShellCommand, - inline, - mathEnabled, - } = use(ChatMarkdownRendererContext); + const { resolvedTheme, diffThemeName, expandMedia, isStreaming, onRunShellCommand } = use( + ChatMarkdownRendererContext, + ); const text = use(ChatMarkdownTextContext); const codeBlock = extractCodeBlock(children); if (!codeBlock) { @@ -1785,15 +1813,6 @@ const CHAT_MARKDOWN_COMPONENTS = { } const language = extractFenceLanguage(codeBlock.className); - if ( - mathEnabled && - language === "math" && - (!isStreaming || - mathKind(codeBlock.className) === "display" || - isClosedCodeFence(node, text, codeBlock.code)) - ) { - return ; - } const fenceTitle = extractFenceTitle(extractPreCodeMeta(node)); const highlightedCode = ( ); }, -} satisfies Components; - -const REMARK_MATH: Pluggable = [remarkMath, { singleDollarTextMath: true }]; -// Shared lists, so every message with the same options shares a processor and its cache. -const CHAT_MARKDOWN_REMARK_PLUGIN_SETS = { - plain: CHAT_MARKDOWN_REMARK_PLUGINS, - breaks: CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS, - math: [REMARK_MATH, ...CHAT_MARKDOWN_REMARK_PLUGINS], - mathBreaks: [REMARK_MATH, ...CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS], -} satisfies Record; - -const combinedPlugins = new WeakMap>(); +} satisfies MarkdownComponents; -// One combined list per pair, so a stable extra list shares a renderer and its parse cache. -const INSIGHT_REMARK_PLUGINS: PluggableList = [remarkAssistantInsights]; +const markdownOptions = new WeakMap>(); -function withExtraPlugins(shared: PluggableList, extra: PluggableList): PluggableList { - if (extra.length === 0) return shared; - let byShared = combinedPlugins.get(extra); - if (!byShared) combinedPlugins.set(extra, (byShared = new WeakMap())); - let combined = byShared.get(shared); - if (!combined) byShared.set(shared, (combined = [...shared, ...extra])); - return combined; +/** One options object per configuration, so equal messages share a renderer and its cache. */ +function wordsOptions( + extensions: MarkdownExtensions, + flags: Omit, +): WordsHastOptions { + let byFlags = markdownOptions.get(extensions); + if (!byFlags) markdownOptions.set(extensions, (byFlags = new Map())); + const key = `${+flags.math}${+flags.breaks}${+flags.escapeHtml}${+flags.insights}`; + let options = byFlags.get(key); + if (!options) byFlags.set(key, (options = { ...flags, extensions })); + return options; } const markdownRenderers = new WeakMap< - PluggableList, - WeakMap> + WordsHastOptions, + ReturnType >(); -function markdownRenderer(remarkPlugins: PluggableList, rehypePlugins: PluggableList) { - let byRehype = markdownRenderers.get(remarkPlugins); - if (!byRehype) markdownRenderers.set(remarkPlugins, (byRehype = new WeakMap())); - let renderer = byRehype.get(rehypePlugins); +function markdownRenderer(markdown: WordsHastOptions) { + let renderer = markdownRenderers.get(markdown); if (!renderer) { renderer = createMarkdownRenderer({ - remarkPlugins, - rehypePlugins, + markdown, components: CHAT_MARKDOWN_COMPONENTS, urlTransform: markdownUrlTransform, }); - byRehype.set(rehypePlugins, renderer); + markdownRenderers.set(markdown, renderer); } return renderer; } +type ChatMarkdownComponentState = ReturnType["componentState"]; + +function hastClassName(node: HastElement): string | undefined { + const { className } = node.properties; + return Array.isArray(className) ? className.join(" ") : (className as string | undefined); +} + +// Paragraphs and list items turn skill and model mentions in their text into chips, except in +// code and links, as SkillInlineText does. +function hastTextHasChip(node: HastElement, skills: ReadonlyArray): boolean { + return node.children.some((child) => + child.type === "text" + ? (skills.length > 0 && !matchInlineSkills(child.value, skills).next().done) || + collectComposerModelMentions(child.value).length > 0 + : child.type === "element" && + child.tagName !== "code" && + child.tagName !== "a" && + hastTextHasChip(child, skills), + ); +} + +const HEADING_LEVELS: Record = { h1: 1, h2: 2, h3: 3, h4: 4, h5: 5, h6: 6 }; + +const markdownIslandOptionsByState = new WeakMap< + ChatMarkdownComponentState, + MarkdownIslandOptions +>(); + +/** Which elements need CHAT_MARKDOWN_COMPONENTS, and what the others' components add. */ +function markdownIslandOptions(state: ChatMarkdownComponentState): MarkdownIslandOptions { + const cached = markdownIslandOptionsByState.get(state); + if (cached) return cached; + const { + cwd, + headingLevelOffset, + imageBaseDir, + inlineCodeFileLinkMetaByText, + onTaskListChange, + skills, + } = state; + const options: MarkdownIslandOptions = { + components: CHAT_MARKDOWN_COMPONENTS, + variant: String(headingLevelOffset), + isIsland: (node) => { + switch (node.tagName) { + case "a": + case "img": + case "pre": + case "details": + case "table": + return true; + case "blockquote": + return GITHUB_ALERT_PRESENTATIONS[String(node.properties.dataAlert ?? "")] !== undefined; + case "div": + return artifactTemplateFromHastProperties(node.properties) !== null; + case "input": + return node.properties.type === "checkbox" && onTaskListChange !== undefined; + case "code": { + if (node.properties.dataInlineCode == null) return false; + const codeText = hastPlainTextDeep(node); + return ( + (inlineCodeFileLinkMetaByText.get(codeText.trim()) ?? + resolveInlineCodeFileLinkMeta(codeText, cwd, imageBaseDir ?? cwd)) != null + ); + } + case "p": + case "li": + return hastTextHasChip(node, skills); + default: + return false; + } + }, + staticElement: (node) => { + const level = HEADING_LEVELS[node.tagName]; + if (level !== undefined) { + return headingLevelOffset > 0 + ? withProperties(node, { ariaLevel: Math.min(level + headingLevelOffset, 6) }) + : node; + } + switch (node.tagName) { + case "ol": { + const itemValues = node.children.flatMap((child) => + child.type === "element" && child.tagName === "li" ? [child.properties.value] : [], + ); + const gutter = orderedListGutterStyle(itemValues, node.properties.start); + if (!gutter) return node; + const authored = typeof node.properties.style === "string" ? node.properties.style : ""; + return withProperties(node, { + style: `${authored}${authored ? ";" : ""}--list-gutter:${gutter["--list-gutter"]}`, + }); + } + case "li": + return hastClassName(node)?.includes("task-list-item") + ? withProperties(node, { dataListItemOffset: node.position?.start.offset }) + : node; + case "input": + return node.properties.type === "checkbox" + ? withProperties(node, { readOnly: true }) + : node; + default: + return node; + } + }, + }; + markdownIslandOptionsByState.set(state, options); + return options; +} + const MarkdownSource = memo(function MarkdownSource({ text, - remarkPlugins, - rehypePlugins, - shared, + markdown, cache, }: { text: string; - remarkPlugins: PluggableList; - rehypePlugins: PluggableList; - /** The plugins are one of the shared sets. */ - shared: boolean; + markdown: WordsHastOptions; /** The text will not change again; streamed text would only fill the cache with prefixes. */ cache: boolean; }) { - // Per-instance plugins, such as the incremental parser, set up their state on every render. - const render = shared - ? markdownRenderer(remarkPlugins, rehypePlugins) - : createMarkdownRenderer({ - remarkPlugins, - rehypePlugins, - components: CHAT_MARKDOWN_COMPONENTS, - urlTransform: markdownUrlTransform, - }); - const element = render(text); + const render = markdownRenderer(markdown); + const entry = render.parse(text); // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- Caching during render would make React Compiler rebuild the element when `cache` flips. useEffect(() => { - if (shared && cache) render.remember(text, element); - }, [render, text, element, shared, cache]); - return {element}; + if (cache) render.remember(text, entry); + }, [render, text, entry, cache]); + const islandState = use(ChatMarkdownRendererContext); + return ( + + {islandState + ? renderHastWithIslands(entry.tree, markdownIslandOptions(islandState)) + : render.element(entry)} + + ); }); function ChatMarkdown({ @@ -1935,51 +2045,28 @@ function ChatMarkdown({ inline = false, lineBreaks = false, parseRawHtml = true, - extraRemarkPlugins = EMPTY_REMARK_PLUGINS, + extensions = NO_EXTENSIONS, renderInsights = false, ...props }: ChatMarkdownProps) { - const { componentState, handleCopy, markdownRef, localMediaPreview, closeLocalMediaPreview } = - useChatMarkdownState({ text, inline, ...props }); - const hasInsights = renderInsights && text.includes("★ Insight"); - // Streaming re-renders only the last block; offsets for task edits need the whole text. + // Streaming re-renders only the last block; offsets for task edits, and extensions that read + // the whole message, need the whole text. const streamingBlocks = - props.isStreaming === true && - !inline && - extraRemarkPlugins.length === 0 && - !props.onTaskListChange - ? splitMarkdownBlocks(text) + props.isStreaming === true && !inline && extensions === NO_EXTENSIONS && !props.onTaskListChange + ? (splitMarkdownBlocks(text) ?? [text]) : null; - const incrementalParsing = - props.isStreaming === true && - !hasInsights && - streamingBlocks === null && - extraRemarkPlugins.length === 0 && - /(?:^|\n) {0,3}(?:`{3}|~{3})/.test(text); + const { componentState, handleCopy, markdownRef, localMediaPreview, closeLocalMediaPreview } = + useChatMarkdownState({ text, inline, ...props }, streamingBlocks); const Root = inline ? "span" : "div"; const bindMarkdownRef = (node: HTMLElement | null) => { markdownRef.current = node; }; - const sharedRemarkPlugins = - CHAT_MARKDOWN_REMARK_PLUGIN_SETS[ - componentState.mathEnabled - ? lineBreaks - ? "mathBreaks" - : "math" - : lineBreaks - ? "breaks" - : "plain" - ]; - // The incremental parser keeps per-instance state, so its output is not shared. - const uncachedPlugins = incrementalParsing; - const remarkPlugins = incrementalParsing - ? [...sharedRemarkPlugins, ...extraRemarkPlugins, createIncrementalMarkdownPlugin()] - : withExtraPlugins( - hasInsights - ? withExtraPlugins(INSIGHT_REMARK_PLUGINS, sharedRemarkPlugins) - : sharedRemarkPlugins, - extraRemarkPlugins, - ); + const markdown = wordsOptions(extensions, { + math: componentState.mathEnabled, + breaks: lineBreaks, + escapeHtml: !parseRawHtml, + insights: renderInsights && text.includes("★ Insight"), + }); const blocks = streamingBlocks ?? [text]; return ( @@ -1995,22 +2082,18 @@ function ChatMarkdown({ onCopy={handleCopy} > - {blocks.map((source, index) => ( - - ))} + + {blocks.map((source, index) => ( + + ))} + {localMediaPreview ? ( diff --git a/apps/web/src/components/chat/ChatMarkdownMedia.browser.test.tsx b/apps/web/src/components/chat/ChatMarkdownMedia.browser.test.tsx index db46999708043..04a4d9fd76f84 100644 --- a/apps/web/src/components/chat/ChatMarkdownMedia.browser.test.tsx +++ b/apps/web/src/components/chat/ChatMarkdownMedia.browser.test.tsx @@ -1,7 +1,6 @@ import type { PreparedConnection } from "@t3tools/client-runtime/connection"; import { EnvironmentId, ThreadId } from "@t3tools/contracts"; -import remarkParse from "remark-parse"; -import { unified } from "unified"; +import { markdownTree } from "~/markdown/wordsHast"; import { describe, expect, it, vi } from "vite-plus/test"; import { render } from "../../../test/render"; @@ -91,9 +90,13 @@ describe("markdownImageCopy", () => { it("copies an image whose path has a space as Markdown that is still that image", () => { // Raw HTML and sources reach the copy with the space unencoded. const copied = markdownImageCopy("Shot", "/work/my shot.png", undefined); - const [block] = unified().use(remarkParse).parse(copied).children; + const [block] = markdownTree(copied).children; const images = - block?.type === "paragraph" ? block.children.filter((node) => node.type === "image") : []; - expect(images.map((image) => decodeURI(image.url))).toEqual(["/work/my shot.png"]); + block?.type === "element" && block.tagName === "p" + ? block.children.filter((node) => node.type === "element" && node.tagName === "img") + : []; + expect( + images.map((image) => image.type === "element" && decodeURI(String(image.properties.src))), + ).toEqual(["/work/my shot.png"]); }); }); diff --git a/apps/web/src/components/chat/MarkdownCodeBlock.logic.ts b/apps/web/src/components/chat/MarkdownCodeBlock.logic.ts index fcee475c2886a..0a45cd6ac5659 100644 --- a/apps/web/src/components/chat/MarkdownCodeBlock.logic.ts +++ b/apps/web/src/components/chat/MarkdownCodeBlock.logic.ts @@ -1,5 +1,5 @@ import { Children, isValidElement, type ReactNode } from "react"; -import type { ExtraProps as ReactMarkdownExtraProps } from "react-markdown"; +import type { Element } from "hast"; import type { DiffThemeName } from "../../lib/diffRendering"; @@ -44,11 +44,7 @@ export function extractPreCodeMeta(node: unknown): string | undefined { return typeof meta === "string" && meta.trim().length > 0 ? meta.trim() : undefined; } -export function isClosedCodeFence( - node: ReactMarkdownExtraProps["node"], - text: string, - code: string, -): boolean { +export function isClosedCodeFence(node: Element | undefined, text: string, code: string): boolean { const start = node?.position?.start.offset; const end = node?.position?.end.offset; if (start === undefined || end === undefined) return false; @@ -98,7 +94,7 @@ export function extractCodeBlock( return null; } // With a custom `code` component the child's type is that component, not - // the "code" tag — the hast node react-markdown attaches still names it. + // the "code" tag — the hast node the renderer passes still names it. if (onlyChild.type !== "code" && onlyChild.props.node?.tagName !== "code") { return null; } diff --git a/apps/web/src/components/chat/MarkdownCodeBlock.tsx b/apps/web/src/components/chat/MarkdownCodeBlock.tsx index d6c8a7aaba2eb..726c34cbf029e 100644 --- a/apps/web/src/components/chat/MarkdownCodeBlock.tsx +++ b/apps/web/src/components/chat/MarkdownCodeBlock.tsx @@ -1,4 +1,4 @@ -import { T, useGT } from "gt-react"; +import { useGT } from "gt-react"; import { PlayIcon, WrapTextIcon, CheckIcon, CopyIcon } from "lucide-react"; import { toHtml } from "hast-util-to-html"; import React, { use, useEffect, useState, type ReactNode } from "react"; @@ -18,7 +18,7 @@ import { syntheticFileNameForLanguageId, } from "../../pierre-icons"; import { Button } from "../ui/button"; -import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip"; +import { SharedTooltipTrigger } from "../ui/shared-tooltip"; import { HighlightedCodeLines } from "./HighlightedCodeLines"; import { createHighlightCacheKey, @@ -115,19 +115,17 @@ function MarkdownCodeBlockTitleContent({ return {language}; } return ( - - - } - > - - - {language} - + + } + > + + ); } @@ -187,22 +185,20 @@ export function MarkdownCodeBlock({ const handleCopy = () => copyToClipboard(code.endsWith("\n") ? code.slice(0, -1) : code); const copyButton = ( - - - } - > - {copied ? : } - - {copyLabel} - + + } + > + {copied ? : } + ); if (diagram) { @@ -231,43 +227,37 @@ export function MarkdownCodeBlock({ aria-label={gt("Code block actions")} > {canWrap ? ( - - setWrapOverride(!wrapped)} - aria-label={wrapLabel} - /> - } - > - - - {wrapLabel} - + setWrapOverride(!wrapped)} + aria-label={wrapLabel} + /> + } + > + + ) : null} {canRun ? ( - - onRunShellCommand(command)} - aria-label={gt("Run in terminal")} - /> - } - > - - - - Run in terminal - - + onRunShellCommand(command)} + aria-label={gt("Run in terminal")} + /> + } + > + + ) : null} {viewToggle} {copyButton} diff --git a/apps/web/src/components/chat/MarkdownDetails.tsx b/apps/web/src/components/chat/MarkdownDetails.tsx index 5ec510c3a4306..b6fa2b1d8d1f1 100644 --- a/apps/web/src/components/chat/MarkdownDetails.tsx +++ b/apps/web/src/components/chat/MarkdownDetails.tsx @@ -1,5 +1,6 @@ import { useGT } from "gt-react"; import { ChevronRightIcon } from "lucide-react"; +import { flushSync } from "react-dom"; import { Children, isValidElement, @@ -12,6 +13,11 @@ import { import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from "../ui/collapsible"; import { findRevealRef, MarkdownFindContext } from "./markdownFindContext"; +const focusOnMount = (element: HTMLElement | null) => { + if (element && element.ownerDocument.activeElement === element.ownerDocument.body) + element.focus(); +}; + export function MarkdownDetails({ children, open = false, @@ -19,6 +25,7 @@ export function MarkdownDetails({ }: Pick, "children" | "open" | "dir">) { const gt = useGT(); const [isOpen, setIsOpen] = useState(open); + const [armed, setArmed] = useState<"hover" | "focus" | null>(null); const searching = use(MarkdownFindContext); const expanded = isOpen; const revealForFind = () => setIsOpen(true); @@ -36,6 +43,36 @@ export function MarkdownDetails({ : gt("Details", { $context: "fallback title of a collapsible section" }); const content = childNodes.filter((_, index) => index !== summaryIndex); + // Most details stay closed: mount Base UI on hover or focus, before the first click. + if (!armed && !expanded && !searching) { + return ( +
+
+ +
+
+ ); + } + return (
- } - className={MARKDOWN_FILE_LINK_CLASS_NAME} - data-markdown-copy={copyMarkdown} - onClick={(event) => { - event.preventDefault(); - event.stopPropagation(); - if (onOpen && shouldOpenMarkdownFileLinkInEditor(event)) { - handleOpenInEditor(); - return; - } - if (useBrowserPrimaryAction) { - handleOpenInBrowser(); - return; - } - handleOpenInFilePreview(); - }} - onContextMenu={handleContextMenu} - > - - ) : undefined - } - path={iconPath} - environmentId={environmentId} - label={label} - theme={theme} - /> - - ) : ( - } - aria-label={gt("File options for {label}", { label })} - aria-haspopup="menu" - className={cn(MARKDOWN_FILE_LINK_CLASS_NAME, "select-text")} - data-markdown-copy={copyMarkdown} - onClick={handleContextMenu} - onContextMenu={handleContextMenu} - > - - ) : undefined - } - path={iconPath} - environmentId={environmentId} - label={label} - theme={theme} - /> - - ) + const tooltipContent = ( + + ); + const sharedTooltip = useSharedTooltip({ + render: () => tooltipContent, + contentKey: `${iconPath}\u0000${targetPath}`, + variant: "code", + }); + const chip = hasPrimaryAction ? ( + } + className={MARKDOWN_FILE_LINK_CLASS_NAME} + data-markdown-copy={copyMarkdown} + onClick={(event) => { + event.preventDefault(); + event.stopPropagation(); + if (onOpen && shouldOpenMarkdownFileLinkInEditor(event)) { + handleOpenInEditor(); + return; + } + if (useBrowserPrimaryAction) { + handleOpenInBrowser(); + return; } + handleOpenInFilePreview(); + }} + onContextMenu={handleContextMenu} + > + : undefined + } + path={iconPath} + environmentId={environmentId} + label={label} + theme={theme} + /> + + ) : ( + } + aria-label={gt("File options for {label}", { label })} + aria-haspopup="menu" + className={cn(MARKDOWN_FILE_LINK_CLASS_NAME, "select-text")} + data-markdown-copy={copyMarkdown} + onClick={handleContextMenu} + onContextMenu={handleContextMenu} + > + : undefined + } + path={iconPath} + environmentId={environmentId} + label={label} + theme={theme} /> + + ); + if (sharedTooltip) return withSharedTooltip(chip, sharedTooltip); + return ( + + - + {tooltipContent} ); diff --git a/apps/web/src/components/chat/MarkdownMath.browser.test.tsx b/apps/web/src/components/chat/MarkdownMath.browser.test.tsx deleted file mode 100644 index ec5b38541ddc4..0000000000000 --- a/apps/web/src/components/chat/MarkdownMath.browser.test.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import { expect, it } from "vite-plus/test"; -import { userEvent } from "vite-plus/test/browser"; - -import { render } from "../../../test/render"; -import "../../index.css"; - -import { MarkdownMath } from "./MarkdownMath"; - -it("keeps keyboard scrolling available as a streamed equation outgrows its viewport", async () => { - const equation = (tex: string, width = 180) => ( -
- - - -
- ); - await using screen = await render(equation("x")); - await screen.getByRole("button", { name: "Before equation" }).click(); - await userEvent.keyboard("{Tab}"); - await expect.element(screen.getByRole("button", { name: "After equation" })).toHaveFocus(); - - await screen.rerender(equation("x_1 + x_2 + x_3 + x_4 + x_5 + x_6 + x_7 + x_8")); - const scroller = screen.getByLabelText("Scroll display equation"); - await expect.element(scroller).toHaveAttribute("tabindex", "0"); - await screen.getByRole("button", { name: "Before equation" }).click(); - await userEvent.keyboard("{Tab}"); - await expect.element(scroller).toHaveFocus(); - await userEvent.keyboard("{ArrowRight}"); - await expect.element(scroller).not.toHaveProperty("scrollLeft", 0); - - await screen.rerender(equation("x_1 + x_2 + x_3 + x_4 + x_5 + x_6 + x_7 + x_8", 1000)); - await expect.element(screen.getByLabelText("Scroll display equation")).not.toBeInTheDocument(); - await screen.getByRole("button", { name: "Before equation" }).click(); - await userEvent.keyboard("{Tab}"); - await expect.element(screen.getByRole("button", { name: "After equation" })).toHaveFocus(); -}); diff --git a/apps/web/src/components/chat/MarkdownMath.tsx b/apps/web/src/components/chat/MarkdownMath.tsx deleted file mode 100644 index 8070d64ac3c18..0000000000000 --- a/apps/web/src/components/chat/MarkdownMath.tsx +++ /dev/null @@ -1,81 +0,0 @@ -import { useGT } from "gt-react"; -import { lazy, memo, Suspense, useLayoutEffect, useRef, useState } from "react"; - -import { observeResize } from "../../lib/observeResize"; - -import { RenderErrorBoundary } from "../RenderErrorBoundary"; - -const MathTypeset = lazy(() => import("./MathTypeset")); - -/** - * One formula from `remark-math`. Shows its TeX until KaTeX loads, and - * keeps showing it when KaTeX cannot parse it, such as mid-stream. Copying - * any part of a formula copies its whole TeX source. - */ -export const MarkdownMath = memo(function MarkdownMath(props: { - tex: string; - display: boolean; - focusable?: boolean; -}) { - const gt = useGT(); - const viewportRef = useRef(null); - const contentRef = useRef(null); - const [overflows, setOverflows] = useState(false); - // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- observes formula DOM width to make overflowing equations keyboard scrollable - useLayoutEffect(() => { - const viewport = viewportRef.current; - const content = contentRef.current; - if (!viewport || !content || props.focusable === false) return; - const measure = () => setOverflows(viewport.scrollWidth > viewport.clientWidth); - measure(); - // Typesetting and streamed TeX can change content width without resizing the viewport. - return observeResize([viewport, content], measure); - }, [props.focusable]); - const scrollable = props.focusable !== false && overflows; - const tex = props.tex.trim(); - const source = props.display ? `\\[\n${tex}\n\\]` : `\\(${tex}\\)`; - const fallback = {source}; - return ( - - - - - - - - - - - - ); -}); diff --git a/apps/web/src/components/chat/MathTypeset.logic.test.ts b/apps/web/src/components/chat/MathTypeset.logic.test.ts deleted file mode 100644 index 634f5146475ac..0000000000000 --- a/apps/web/src/components/chat/MathTypeset.logic.test.ts +++ /dev/null @@ -1,30 +0,0 @@ -import katex from "katex"; -import { describe, expect, it } from "vite-plus/test"; - -import { escapeLiteralPercents } from "./MathTypeset.logic"; - -describe("escapeLiteralPercents", () => { - it.each([ - ["\\text{3.18% yield}", "\\text{3.18\\% yield}"], - ["\\text{100%% yield}", "\\text{100\\%\\% yield}"], - ["6\\% + 2\\%", "6\\% + 2\\%"], - ["x\\\\%", "x\\\\\\%"], - ["x % note\n+ 1", "x % note\n+ 1"], - ["% note\n\\text{2%}", "% note\n\\text{2\\%}"], - ["x &= 1 % +9%\n\\text{2%}", "x &= 1 % +9%\n\\text{2\\%}"], - ["\\verb|50%|+\\text{2%}", "\\verb|50%|+\\text{2\\%}"], - ["\\verb*%a%b%+c%", "\\verb*%a%b\\%+c\\%"], - ["\\verb|50%+\\text{2%}", "\\verb|50%+\\text{2%}"], - ])("repairs %j", (tex, expected) => { - expect(escapeLiteralPercents(tex)).toBe(expected); - }); - - it("lets the reported multiline equation typeset", () => { - const tex = - "R_e=\\underbrace{\\frac{1.0176}{32}}_{\\text{3.18% dividend yield}}\n+\\underbrace{6\\%}_{\\text{growth}}\n=\\boxed{9.18\\%}"; - expect(() => katex.renderToString(tex, { throwOnError: true })).toThrow(); - expect(() => - katex.renderToString(escapeLiteralPercents(tex), { throwOnError: true }), - ).not.toThrow(); - }); -}); diff --git a/apps/web/src/components/chat/MathTypeset.logic.ts b/apps/web/src/components/chat/MathTypeset.logic.ts deleted file mode 100644 index 04111ab4a70b4..0000000000000 --- a/apps/web/src/components/chat/MathTypeset.logic.ts +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Escapes each `%` written right after other text, as in `\text{3.18% yield}`. - * A `%` at a line start or after whitespace stays a comment. Skips escapes and - * `\verb` like KaTeX's lexer, in one linear pass. - */ -export function escapeLiteralPercents(tex: string): string { - let repaired = ""; - let copied = 0; - let index = 0; - while (index < tex.length) { - const char = tex[index]; - if (char === "\\") { - if (tex.startsWith("\\verb", index)) { - const starred = tex[index + 5] === "*"; - const delimiter = tex[index + (starred ? 6 : 5)]; - if (delimiter !== undefined && (starred || !/[*a-zA-Z]/.test(delimiter))) { - const bodyStart = index + (starred ? 7 : 6); - let close = bodyStart; - while (close < tex.length && ![delimiter, "\n", "\r"].includes(tex[close]!)) close++; - // KaTeX rejects a \verb that does not close on its own line. - if (tex[close] !== delimiter) return tex; - index = close + 1; - continue; - } - } - // A control symbol such as `\%` or `\\` is two characters. - index += 2; - } else if (char === "%" && index > 0 && !/\s/.test(tex[index - 1]!)) { - repaired += `${tex.slice(copied, index)}\\%`; - copied = ++index; - } else if (char === "%") { - const newline = tex.indexOf("\n", index); - index = newline === -1 ? tex.length : newline + 1; - } else { - index++; - } - } - return copied === 0 ? tex : repaired + tex.slice(copied); -} diff --git a/apps/web/src/components/chat/MathTypeset.tsx b/apps/web/src/components/chat/MathTypeset.tsx deleted file mode 100644 index 16d3dba409ee6..0000000000000 --- a/apps/web/src/components/chat/MathTypeset.tsx +++ /dev/null @@ -1,49 +0,0 @@ -import katex from "katex"; -import "katex/dist/katex.min.css"; -import type { ReactNode } from "react"; - -import { LRUCache } from "../../lib/lruCache"; -import { escapeLiteralPercents } from "./MathTypeset.logic"; - -// Virtualized threads remount messages while scrolling; cached markup keeps -// that from typesetting the same formulas again. "" records a parse error. -const typesetCache = new LRUCache(1000, 4 * 1024 * 1024); - -function typeset(tex: string, display: boolean): string { - const key = `${display ? "display" : "inline"}:${tex}`; - const cached = typesetCache.get(key); - if (cached !== null) return cached; - const options = { - displayMode: display, - output: "htmlAndMathml" as const, - throwOnError: true, - // No \href, \url, \htmlClass, or other commands that emit active HTML. - trust: false, - strict: "ignore" as const, - maxSize: 20, - maxExpand: 1000, - }; - let html = ""; - try { - html = katex.renderToString(tex, options); - } catch { - const repaired = escapeLiteralPercents(tex); - if (repaired !== tex) { - try { - html = katex.renderToString(repaired, options); - } catch { - // Unfinished or unsupported TeX stays readable as its source. - } - } - } - typesetCache.set(key, html, (key.length + html.length) * 2); - return html; -} - -/** KaTeX lives in this lazily loaded chunk, so it is only fetched once a formula renders. */ -export default function MathTypeset(props: { tex: string; display: boolean; fallback: ReactNode }) { - const html = typeset(props.tex, props.display); - if (!html) return props.fallback; - // KaTeX escapes the TeX it renders, and `trust: false` keeps it from emitting links or attributes. - return ; -} diff --git a/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx b/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx index 2e7721dddea18..d15a26ca43db0 100644 --- a/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx +++ b/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx @@ -44,11 +44,10 @@ import { type PendingApproval, deriveTimelineEntriesFromVisibleTurnItems, } from "../../session-logic"; -import type { Root } from "mdast"; import { ViewedImagesTimelineRow } from "./TimelineWorkEntryRow"; -import { remarkThoughtPreview, THOUGHT_PREVIEW_MAX_LENGTH } from "./TimelineWorkEntryRow.logic"; +import { THOUGHT_PREVIEW_MAX_LENGTH, thoughtPreviewMarkdown } from "./TimelineWorkEntryRow.logic"; +import { wordsHast } from "~/markdown/wordsHast"; import { TimelineRowCtx } from "./timelineRowContext"; -import { parseMarkdownWithMath } from "@t3tools/shared/markdownMath"; import { searchableMessageSegments } from "@t3tools/shared/threadFindText"; import { countThreadSearchOccurrences } from "@t3tools/shared/threadSearch"; import { collectThreadFindRanges } from "./threadFindHighlights"; @@ -2128,49 +2127,22 @@ describe("compact reasoning math", () => { ["hard \nbreak\\\nagain", [["text", "hard break again"]]], ["
only html
", [["text", "Reasoning"]]], ])("keeps formulas while flattening compact reasoning previews: %j", (source, expected) => { - const tree = parseMarkdownWithMath(source); - remarkThoughtPreview("Reasoning")(tree); - expect(tree.children.map((node) => [node.type, "value" in node ? node.value : null])).toEqual( - expected, - ); - }); - - it("stops reading the tree once the preview is full", () => { - const beyondCap = (): string => { - throw new Error("read beyond cap"); - }; - const head = "x".repeat(THOUGHT_PREVIEW_MAX_LENGTH - 2); - const tree: Root = { - type: "root", - children: [ - { - type: "paragraph", - children: [ - { type: "text", value: head }, - { type: "strong", children: [{ type: "text", value: "yz beyond" }] }, - { - type: "inlineMath", - get value() { - return beyondCap(); - }, - }, - ], - }, - { - type: "paragraph", - children: [ - { - type: "text", - get value() { - return beyondCap(); - }, - }, - ], - }, - ], - }; - remarkThoughtPreview("Reasoning")(tree); - expect(tree.children).toEqual([{ type: "text", value: `${head}yz` }]); + const tree = wordsHast(source, { + math: true, + breaks: false, + escapeHtml: false, + insights: false, + extensions: thoughtPreviewMarkdown("Reasoning"), + }); + expect( + tree.children.map((node) => + node.type === "text" + ? ["text", node.value] + : node.type === "element" && node.children[0]?.type === "element" + ? ["inlineMath", String(node.children[0].properties.ariaLabel).trim()] + : [node.type, null], + ), + ).toEqual(expected); }); }); diff --git a/apps/web/src/components/chat/MessagesTimeline.logic.ts b/apps/web/src/components/chat/MessagesTimeline.logic.ts index 124062303e0cf..b00a48185b9db 100644 --- a/apps/web/src/components/chat/MessagesTimeline.logic.ts +++ b/apps/web/src/components/chat/MessagesTimeline.logic.ts @@ -14,7 +14,7 @@ import { IDLE_COMPACTION_TITLES, } from "@t3tools/client-runtime/user-message"; import type { HandoffTimelineRun } from "@t3tools/client-runtime/handoff"; -import { renderCodexDirectivesForCopy } from "@t3tools/shared/codexMarkdownDirectives"; +import { renderCodexDirectivesForCopy } from "~/markdown/markdownText"; import { commandDisplayText, commandProgramName, diff --git a/apps/web/src/components/chat/TimelineAssistantRows.tsx b/apps/web/src/components/chat/TimelineAssistantRows.tsx index 7ab6e361494ee..72fcf79013e87 100644 --- a/apps/web/src/components/chat/TimelineAssistantRows.tsx +++ b/apps/web/src/components/chat/TimelineAssistantRows.tsx @@ -1,4 +1,4 @@ -import { shouldPreserveAssistantLineBreaks } from "@t3tools/shared/markdownPipeline"; +import { shouldPreserveAssistantLineBreaks } from "@t3tools/shared/assistantInsights"; import { MessageId, type RunId, type TurnItemId } from "@t3tools/contracts"; import { canForkProjectedAssistantItem } from "@t3tools/client-runtime/state/thread-workflows"; import { agentWorkingDirectories } from "@t3tools/client-runtime/workspace-basename-lookup"; diff --git a/apps/web/src/components/chat/TimelineUserMessageRow.tsx b/apps/web/src/components/chat/TimelineUserMessageRow.tsx index 88cdd61b58cc5..cd99aad44d080 100644 --- a/apps/web/src/components/chat/TimelineUserMessageRow.tsx +++ b/apps/web/src/components/chat/TimelineUserMessageRow.tsx @@ -1,10 +1,7 @@ import { copySnapshot as copySnapshotToClipboard } from "./copySnapshot"; import { InlineAudioPreview } from "../files/InlineAudioPreview"; import { filePreviewKind } from "@t3tools/shared/filePreview"; -import { - CHAT_USER_MARKDOWN_REMARK_PLUGINS, - remarkEnableOrderedListNumbers, -} from "@t3tools/shared/markdownPipeline"; +import type { MarkdownExtensions } from "~/markdown/wordsHast"; import { T, useGT, useMessages, Var } from "gt-react"; import { findRevealRef } from "./markdownFindContext"; import { @@ -1284,10 +1281,7 @@ const CollapsibleUserMessageBody = memo(function CollapsibleUserMessageBody(prop ); }); -const USER_MESSAGE_REMARK_PLUGINS = [ - ...CHAT_USER_MARKDOWN_REMARK_PLUGINS, - remarkEnableOrderedListNumbers, -]; +const USER_MESSAGE_MARKDOWN: MarkdownExtensions = { userMessage: true, leadingWhitespace: true }; const UserMessageBody = memo(function UserMessageBody(props: { text: string; @@ -1308,7 +1302,7 @@ const UserMessageBody = memo(function UserMessageBody(props: { className="text-message-foreground user-message-markdown" lineBreaks parseRawHtml={false} - extraRemarkPlugins={USER_MESSAGE_REMARK_PLUGINS} + extensions={USER_MESSAGE_MARKDOWN} renderContextReference={props.renderContextReference} headingLevelOffset={MESSAGE_HEADING_LEVEL} /> diff --git a/apps/web/src/components/chat/TimelineWorkEntryRow.logic.ts b/apps/web/src/components/chat/TimelineWorkEntryRow.logic.ts index dc279ea8cb164..894f58f45edb4 100644 --- a/apps/web/src/components/chat/TimelineWorkEntryRow.logic.ts +++ b/apps/web/src/components/chat/TimelineWorkEntryRow.logic.ts @@ -1,6 +1,5 @@ import { msg } from "gt-react"; -import type { PluggableList } from "unified"; -import type { Root, RootContent } from "mdast"; +import type { MarkdownExtensions } from "~/markdown/wordsHast"; import { resolveWorkEntryToolPresentation, toolGroupAction, @@ -209,67 +208,14 @@ export function workEntryIconName(workEntry: TimelineWorkEntry): WorkEntryIconNa export const THOUGHT_PREVIEW_SOURCE_MAX_LENGTH = 8_192; export const THOUGHT_PREVIEW_MAX_LENGTH = 2_048; -/** Compact reasoning keeps formulas while flattening other Markdown into label text. */ -export function remarkThoughtPreview(fallback: string) { - return (tree: Root) => { - const children: RootContent[] = []; - let remaining = THOUGHT_PREVIEW_MAX_LENGTH; - let fragments: string[] = []; - const flush = () => { - if (fragments.length === 0) return; - children.push({ type: "text", value: fragments.join("").replace(/\s+/g, " ") }); - fragments = []; - }; - const take = (value: string) => { - const text = value.slice(0, remaining); - remaining = text.length < value.length ? 0 : remaining - text.length; - // A cut here or at the source limit must not leave half a surrogate pair. - return text.replace(/[\uD800-\uDBFF]$/, ""); - }; - const append = (value: string) => { - fragments.push(take(value)); - }; - const visit = (node: Root | RootContent) => { - if (remaining === 0 || node.type === "html" || node.type === "definition") return; - if (node.type === "math" || node.type === "inlineMath") { - flush(); - const value = take(node.value); - children.push({ - type: "inlineMath", - value, - position: node.position, - data: { - hName: "code", - hProperties: { className: ["language-math", "math-inline"] }, - hChildren: [{ type: "text", value }], - }, - }); - } else if ("alt" in node) append(node.alt ?? ""); - else if ("value" in node) append(node.value); - else if ("children" in node) { - for (const [index, child] of node.children.entries()) { - if (remaining === 0) break; - if ( - index && - ["root", "blockquote", "list", "listItem", "table", "tableRow"].includes(node.type) - ) - append(" "); - visit(child); - } - } else if (node.type === "break") append(" "); - }; - visit(tree); - flush(); - const first = children[0]; - const last = children.at(-1); - if (first?.type === "text") first.value = first.value.trimStart(); - if (last?.type === "text") last.value = last.value.trimEnd(); - tree.children = children.some((child) => child.type !== "text" || child.value) - ? children - : [{ type: "text", value: fallback }]; - }; -} +const thoughtPreviews = new Map(); -export function thoughtPreviewPlugins(fallback: string): PluggableList { - return [[remarkThoughtPreview, fallback]]; +/** Compact reasoning keeps formulas while flattening other Markdown into label text. */ +export function thoughtPreviewMarkdown(fallback: string): MarkdownExtensions { + let extensions = thoughtPreviews.get(fallback); + if (!extensions) { + extensions = { preview: { fallback, maxLength: THOUGHT_PREVIEW_MAX_LENGTH } }; + thoughtPreviews.set(fallback, extensions); + } + return extensions; } diff --git a/apps/web/src/components/chat/TimelineWorkEntryRow.tsx b/apps/web/src/components/chat/TimelineWorkEntryRow.tsx index 8e7f03618e59d..4cd6fc0e8dee6 100644 --- a/apps/web/src/components/chat/TimelineWorkEntryRow.tsx +++ b/apps/web/src/components/chat/TimelineWorkEntryRow.tsx @@ -73,7 +73,7 @@ import { workEntryRawCommand, buildToolCallExpandedBody, workEntryIconName, - thoughtPreviewPlugins, + thoughtPreviewMarkdown, THOUGHT_PREVIEW_SOURCE_MAX_LENGTH, } from "./TimelineWorkEntryRow.logic"; @@ -590,10 +590,10 @@ function WorkEntryLogRow(props: WorkEntryRowProps) { )} cwd={ctx.markdownCwd} parseRawHtml={false} - extraRemarkPlugins={ + extensions={ workEntry.toolLifecycleStatus === "inProgress" - ? thoughtPreviewPlugins(gt("Thinking")) - : thoughtPreviewPlugins(gt("Thought")) + ? thoughtPreviewMarkdown(gt("Thinking")) + : thoughtPreviewMarkdown(gt("Thought")) } /> ) : threadLabel ? ( diff --git a/apps/web/src/components/chat/TimelineWorkGroupRows.tsx b/apps/web/src/components/chat/TimelineWorkGroupRows.tsx index 745a7aff68fdf..c67c76bf4cca3 100644 --- a/apps/web/src/components/chat/TimelineWorkGroupRows.tsx +++ b/apps/web/src/components/chat/TimelineWorkGroupRows.tsx @@ -56,7 +56,7 @@ import { SimpleWorkEntryRow, } from "./TimelineWorkEntryRow"; import { - thoughtPreviewPlugins, + thoughtPreviewMarkdown, THOUGHT_PREVIEW_SOURCE_MAX_LENGTH, toolGroupSummaryIconName, workEntryIconName, @@ -640,7 +640,7 @@ export function LiveWorkEntryTimelineRow({ text={thoughtLine} cwd={ctx.markdownCwd} parseRawHtml={false} - extraRemarkPlugins={thoughtPreviewPlugins(gt("Thought"))} + extensions={thoughtPreviewMarkdown(gt("Thought"))} />
} @@ -661,10 +661,10 @@ export function LiveWorkEntryTimelineRow({ text={(row.entry.detail ?? label).slice(0, THOUGHT_PREVIEW_SOURCE_MAX_LENGTH)} cwd={ctx.markdownCwd} parseRawHtml={false} - extraRemarkPlugins={ + extensions={ row.active - ? thoughtPreviewPlugins(gt("Thinking")) - : thoughtPreviewPlugins(gt("Thought")) + ? thoughtPreviewMarkdown(gt("Thinking")) + : thoughtPreviewMarkdown(gt("Thought")) } /> ) : threadLabel ? ( diff --git a/apps/web/src/components/chat/markdownIslands.test.ts b/apps/web/src/components/chat/markdownIslands.test.ts new file mode 100644 index 0000000000000..f328c9ea51251 --- /dev/null +++ b/apps/web/src/components/chat/markdownIslands.test.ts @@ -0,0 +1,50 @@ +import type { Root } from "hast"; +import { renderToStaticMarkup } from "react-dom/server"; +import { createElement, Fragment } from "react"; +import { describe, expect, it } from "vite-plus/test"; + +import { renderHastWithIslands } from "./markdownIslands"; + +describe("renderHastWithIslands", () => { + it("writes SVG attributes by their SVG names in static HTML", () => { + const tree: Root = { + type: "root", + children: [ + { + type: "element", + tagName: "p", + properties: {}, + children: [ + { + type: "element", + tagName: "svg", + properties: { viewBox: "0 0 1 1" }, + children: [ + { + type: "element", + tagName: "text", + properties: { fontSize: "700", strokeWidth: "2" }, + children: [{ type: "text", value: "x" }], + }, + ], + }, + ], + }, + ], + }; + const html = renderToStaticMarkup( + createElement( + Fragment, + null, + renderHastWithIslands(tree, { + components: {}, + variant: "", + isIsland: () => false, + staticElement: (node) => node, + }), + ), + ); + expect(html).toContain('x'); + expect(html).toContain('viewBox="0 0 1 1"'); + }); +}); diff --git a/apps/web/src/components/chat/markdownIslands.ts b/apps/web/src/components/chat/markdownIslands.ts new file mode 100644 index 0000000000000..8c434daf099ce --- /dev/null +++ b/apps/web/src/components/chat/markdownIslands.ts @@ -0,0 +1,214 @@ +import type { Element, ElementContent, Properties, Root, RootContent } from "hast"; +import { find, html as htmlSchema, svg as svgSchema } from "property-information"; +import { toJsxRuntime, type Components } from "hast-util-to-jsx-runtime"; +import { createElement, Fragment as ReactFragment, type ReactNode } from "react"; +import { Fragment, jsx, jsxs } from "react/jsx-runtime"; + +export interface MarkdownIslandOptions { + readonly components: Partial; + /** Elements that need their React component; everything else renders as static HTML. */ + readonly isIsland: (node: Element) => boolean; + /** What a static element's component would have added, or the node itself when nothing. */ + readonly staticElement: (node: Element) => Element; + /** Separates static HTML that `staticElement` renders differently, such as a heading offset. */ + readonly variant: string; +} + +const VOID_ELEMENTS = new Set( + "area base br col embed hr img input link meta source track wbr".split(" "), +); + +const jsxOptions = (components: Partial) => + ({ + Fragment, + components, + ignoreInvalidStyle: true, + jsx, + jsxs, + passKeys: true, + passNode: true, + }) as const; + +// Static HTML depends only on the cached, immutable tree and the variant. +const innerHtmlCache = new WeakMap(); + +function transformStatic( + node: ElementContent, + staticElement: MarkdownIslandOptions["staticElement"], +): ElementContent { + if (node.type !== "element") return node; + const element = staticElement(node); + let children: ElementContent[] | undefined; + for (let index = 0; index < element.children.length; index++) { + const child = element.children[index]!; + const next = transformStatic(child, staticElement); + if (next !== child) { + children ??= element.children.slice(); + children[index] = next; + } + } + return children ? { ...element, children } : element; +} + +function innerHtml(node: Element, options: MarkdownIslandOptions): string { + const cached = innerHtmlCache.get(node); + if (cached?.variant === options.variant) return cached.html; + let html = ""; + for (const child of node.children) { + html += serialize(transformStatic(child, options.staticElement)); + } + innerHtmlCache.set(node, { variant: options.variant, html }); + return html; +} + +interface AttributeInfo { + readonly name: string; + readonly boolean: boolean; + readonly separator: string; +} + +const attributeInfo = new Map(); + +// SVG names its attributes differently (`fontSize` is `font-size`), so its lookups key apart. +function infoFor(property: string, inSvg: boolean): AttributeInfo { + const key = inSvg ? `svg:${property}` : property; + let info = attributeInfo.get(key); + if (!info) { + const found = find(inSvg ? svgSchema : htmlSchema, property); + info = { + name: found.attribute, + boolean: found.boolean || found.overloadedBoolean, + separator: found.commaSeparated ? ", " : " ", + }; + attributeInfo.set(key, info); + } + return info; +} + +const escapeText = (value: string) => + value.includes("&") || value.includes("<") || value.includes(">") + ? value.replace(/&/g, "&").replace(//g, ">") + : value; +const escapeAttribute = (value: string) => + value.includes("&") || value.includes('"') + ? value.replace(/&/g, "&").replace(/"/g, """) + : value; + +/** HTML for the elements and text this pipeline builds; the DOM matches hast-util-to-html's. */ +function serialize(node: ElementContent, inSvg = false): string { + if (node.type === "text") return escapeText(node.value); + if (node.type !== "element") return ""; + const svg = inSvg || node.tagName === "svg"; + let html = `<${node.tagName}`; + const { properties } = node; + for (const key in properties) { + const value = properties[key]; + if (value === null || value === undefined || value === false || Number.isNaN(value)) continue; + const info = infoFor(key, svg); + if (info.boolean && value) { + html += ` ${info.name}`; + continue; + } + const text = Array.isArray(value) + ? value.join(info.separator) + : value === true + ? "" + : String(value); + html += ` ${info.name}="${escapeAttribute(text)}"`; + } + html += ">"; + if (VOID_ELEMENTS.has(node.tagName)) return html; + for (const child of node.children) html += serialize(child, svg); + return `${html}`; +} + +/** React props for an element, converted as hast-util-to-jsx-runtime converts them. */ +function shallowProps(node: Element, components: Partial): Record { + const element = toJsxRuntime( + { ...node, children: [] }, + { ...jsxOptions(components), components: {}, passNode: false }, + ) as { props: Record }; + const { children: _children, ...props } = element.props; + return props; +} + +interface Plan { + readonly islands: Set; + /** Elements with an island somewhere below them. */ + readonly ancestors: Set; +} + +function renderContent( + node: RootContent, + key: number, + options: MarkdownIslandOptions, + plan: Plan, +): ReactNode { + if (node.type === "text") return node.value; + if (node.type !== "element") return null; + if (plan.islands.has(node)) { + return createElement( + ReactFragment, + { key }, + toJsxRuntime(node, jsxOptions(options.components)), + ); + } + const element = options.staticElement(node); + const props: Record = { ...shallowProps(element, options.components), key }; + if (plan.ancestors.has(node)) { + return createElement( + element.tagName, + props, + ...element.children.map((child, index) => renderContent(child, index, options, plan)), + ); + } + if (element.children.length > 0 && !VOID_ELEMENTS.has(element.tagName)) { + props.dangerouslySetInnerHTML = { __html: innerHtml(node, options) }; + } + return createElement(element.tagName, props); +} + +/** + * Renders a hast tree with React only on the path to elements that need a component: subtrees + * without one become static HTML, which the browser builds without React reconciling each node. + */ +export function renderHastWithIslands(tree: Root, options: MarkdownIslandOptions): ReactNode { + // The same elements again let React skip the block; islands still follow their context. + let signature = options.variant; + const plan: Plan = { islands: new Set(), ancestors: new Set() }; + const visit = (node: Root | Element): boolean => { + let below = false; + for (const child of node.children) { + if (child.type !== "element") continue; + const island = options.isIsland(child); + signature += island ? "1" : "0"; + if (island) { + plan.islands.add(child); + below = true; + continue; + } + if (visit(child)) { + plan.ancestors.add(child); + below = true; + } + } + return below; + }; + visit(tree); + const cached = renderedTrees.get(tree); + if (cached?.signature === signature && cached.components === options.components) { + return cached.node; + } + const node = tree.children.map((child, index) => renderContent(child, index, options, plan)); + renderedTrees.set(tree, { signature, components: options.components, node }); + return node; +} + +const renderedTrees = new WeakMap< + Root, + { signature: string; components: Partial; node: ReactNode } +>(); + +export function withProperties(node: Element, properties: Properties): Element { + return { ...node, properties: { ...node.properties, ...properties } }; +} diff --git a/apps/web/src/components/chat/markdownRenderer.test.tsx b/apps/web/src/components/chat/markdownRenderer.test.tsx index f15fe49584aea..a9a60c545b37b 100644 --- a/apps/web/src/components/chat/markdownRenderer.test.tsx +++ b/apps/web/src/components/chat/markdownRenderer.test.tsx @@ -1,88 +1,41 @@ -import { - CHAT_MARKDOWN_REHYPE_PLUGINS, - CHAT_MARKDOWN_REMARK_PLUGINS, -} from "@t3tools/shared/markdownPipeline"; import { renderToStaticMarkup } from "react-dom/server"; -import ReactMarkdown from "react-markdown"; import { describe, expect, it } from "vite-plus/test"; -import { createIncrementalMarkdownPlugin } from "../../markdown-incremental"; import { createMarkdownRenderer } from "./markdownRenderer"; // Visible in the markup, so every URL attribute must pass through it. const urlTransform = (url: string) => `${url}#seen`; describe("createMarkdownRenderer", () => { - const render = createMarkdownRenderer({ - remarkPlugins: CHAT_MARKDOWN_REMARK_PLUGINS, - rehypePlugins: CHAT_MARKDOWN_REHYPE_PLUGINS, + const renderer = createMarkdownRenderer({ + markdown: { math: false, breaks: false, escapeHtml: false, insights: false, extensions: {} }, components: {}, urlTransform, }); + const render = (text: string) => renderer.element(renderer.parse(text)); + const renderAndRemember = (text: string) => { + const entry = renderer.parse(text); + renderer.remember(text, entry); + return renderer.element(entry); + }; - it.each([ - '# Title\n\nText with `code`, **bold**, [a link](https://example.com "t") and https://bare.example.com.', - "![shot](./shot.png) and [file](file:///C:/repo/a.ts) and [bad](javascript:alert(1))", - "
More\n\nHidden bold \n\n
", - "| a | b |\n| - | - |\n|
| [x](#frag) |\n\n- [ ] task\n- [x] done", - '```ts title="a.ts"\nconst a = 1;\n```\n\n> [!WARNING]\n> careful
bare', - "Footnote[^1] and ~~strike~~\n\n[^1]: the note", - // Each GFM construct the parser skips when its text cannot match, next to one that can. - "Mail me@example.com, see www.example.com and HTTPS://example.com/a, not [x](https://y.z).", - "a.b-c_d+e@x.io and @user\n\n`me@x.io` ", - "A table without pipes\n:--", - "> | quoted |\n> | - |\n> | body |\n\n- [ ] open\n- [X] done", - "Escaped www\\.example.com and me@example.com", - "\ufeffA byte order mark\n\n| a |\n| - |\n| b |", - "> - | a |\r\n> | - |\r\n> | me@x.io |\r\n\n-\t[ ] tab\n\n ~~lazy~~", - ])("renders what react-markdown renders: %j", (source) => { - const expected = renderToStaticMarkup( - - {source} - , + it("passes every URL attribute through the transform", () => { + const html = renderToStaticMarkup( + render('![shot](./shot.png) and [a link](https://example.com "t") and '), ); - const element = render(source); - expect(renderToStaticMarkup(element)).toBe(expected); - render.remember(source, element); - expect(render(source)).toBe(element); + expect(html).toContain('src="./shot.png#seen"'); + expect(html).toContain('href="https://example.com#seen"'); + expect(html).toContain('src="b.png#seen"'); }); - it("renders what react-markdown renders while a reply streams through the incremental parser", () => { - const reply = - "```ts\nconst a = 1;\n```\n\n| a | b |\n| - | - |\n| me@x.io | www.x.io |\n\nDone ~~now~~."; - // As ChatMarkdown streams: one incremental plugin for the reply, a fresh renderer per update. - const incremental = createIncrementalMarkdownPlugin(); - for (let end = 1; end <= reply.length; end++) { - const source = reply.slice(0, end); - const streamed = createMarkdownRenderer({ - remarkPlugins: [...CHAT_MARKDOWN_REMARK_PLUGINS, incremental], - rehypePlugins: CHAT_MARKDOWN_REHYPE_PLUGINS, - components: {}, - urlTransform, - })(source); - expect(renderToStaticMarkup(streamed)).toBe( - renderToStaticMarkup( - - {source} - , - ), - ); - } + it("reuses a remembered message's element", () => { + const element = renderAndRemember("# Title\n\nText with `code` and **bold**."); + expect(render("# Title\n\nText with `code` and **bold**.")).toBe(element); }); it("keeps cached messages when one far larger than the cache is rendered", () => { - const element = render("Kept *message*"); - render.remember("Kept *message*", element); - const large = "x".repeat(600_000); - render.remember(large, render(large)); + const element = renderAndRemember("Kept *message*"); + renderAndRemember("x".repeat(600_000)); expect(render("Kept *message*")).toBe(element); }); }); diff --git a/apps/web/src/components/chat/markdownRenderer.ts b/apps/web/src/components/chat/markdownRenderer.ts index 9637d68e8f158..c2aa499a9583d 100644 --- a/apps/web/src/components/chat/markdownRenderer.ts +++ b/apps/web/src/components/chat/markdownRenderer.ts @@ -3,18 +3,13 @@ import { toJsxRuntime, type Components } from "hast-util-to-jsx-runtime"; import { urlAttributes } from "html-url-attributes"; import type { ReactElement } from "react"; import { Fragment, jsx, jsxs } from "react/jsx-runtime"; -import remarkParse from "remark-parse"; -import remarkRehype from "remark-rehype"; -import { type PluggableList, unified } from "unified"; -import { VFile } from "vfile"; -import { remarkParseWithoutUnusedSyntax } from "./markdownSyntaxGates"; +import { wordsHast, type WordsHastOptions } from "../../markdown/wordsHast"; export type MarkdownUrlTransform = (url: string, key: string, node: Element) => string; interface MarkdownRendererOptions { - readonly remarkPlugins: PluggableList; - readonly rehypePlugins: PluggableList; + readonly markdown: WordsHastOptions; readonly components: Partial; readonly urlTransform: MarkdownUrlTransform; } @@ -23,7 +18,11 @@ interface MarkdownRendererOptions { // reuses one instead of parsing again. Parsing is most of the cost of rendering markdown. // An element and the hast it keeps hold about 20 bytes per source character, so ~10 MB. const MAX_CACHED_CHARS = 500_000; -const rendered = new Map(); +interface Rendered { + readonly tree: Root; + element?: ReactElement; +} +const rendered = new Map(); let cachedChars = 0; let nextRendererId = 0; @@ -31,10 +30,10 @@ let nextRendererId = 0; const ENTRY_OVERHEAD_CHARS = 200; const entrySize = (key: string) => key.length + ENTRY_OVERHEAD_CHARS; -function remember(key: string, element: ReactElement) { +function remember(key: string, entry: Rendered) { // One huge message would otherwise evict everything else. if (entrySize(key) > MAX_CACHED_CHARS / 4) return; - rendered.set(key, element); + rendered.set(key, entry); cachedChars += entrySize(key); for (const oldest of rendered.keys()) { if (cachedChars <= MAX_CACHED_CHARS) break; @@ -43,32 +42,18 @@ function remember(key: string, element: ReactElement) { } } -/** Renders markdown as react-markdown does, with one processor per plugin set. */ +/** Renders markdown with Words, keeping one parse cache per option set. */ export function createMarkdownRenderer({ - remarkPlugins, - rehypePlugins, + markdown, components, urlTransform, }: MarkdownRendererOptions) { - const processor = unified() - .use(remarkParse) - .use(remarkParseWithoutUnusedSyntax) - .use(remarkPlugins) - .use(remarkRehype, { allowDangerousHtml: true }) - .use(rehypePlugins) - .freeze(); const keyPrefix = `${nextRendererId++}\u0000`; - // Literal raw HTML that survived the rehype plugins, and URL attributes, as react-markdown treats them. + // URL attributes, as react-markdown transformed them. const prepare = (node: Nodes) => { if (!("children" in node)) return; - const { children } = node; - for (let index = 0; index < children.length; index++) { - const child = children[index]!; - if (child.type === "raw") { - children[index] = { type: "text", value: child.value }; - continue; - } + for (const child of node.children) { if (child.type !== "element") continue; const { properties } = child; for (const key in properties) { @@ -82,7 +67,7 @@ export function createMarkdownRenderer({ } }; - const render = (text: string): ReactElement => { + const parse = (text: string): Rendered => { const key = keyPrefix + text; const cached = rendered.get(key); if (cached !== undefined) { @@ -91,24 +76,27 @@ export function createMarkdownRenderer({ rendered.set(key, cached); return cached; } - const file = new VFile(text); - const tree = processor.runSync(processor.parse(file), file) as Root; + const tree = wordsHast(text, markdown); prepare(tree); - return toJsxRuntime(tree, { - Fragment, - components, - ignoreInvalidStyle: true, - jsx, - jsxs, - passKeys: true, - passNode: true, - }); + return { tree }; }; - return Object.assign(render, { - remember(text: string, element: ReactElement) { + return { + /** A cached entry, or a fresh one that `remember` can keep. Cached trees are shared, so callers must not change them. */ + parse, + element: (entry: Rendered): ReactElement => + (entry.element ??= toJsxRuntime(entry.tree, { + Fragment, + components, + ignoreInvalidStyle: true, + jsx, + jsxs, + passKeys: true, + passNode: true, + })), + remember(text: string, entry: Rendered) { const key = keyPrefix + text; - if (!rendered.has(key)) remember(key, element); + if (!rendered.has(key)) remember(key, entry); }, - }); + }; } diff --git a/apps/web/src/components/chat/markdownStreamBlocks.test.tsx b/apps/web/src/components/chat/markdownStreamBlocks.test.ts similarity index 81% rename from apps/web/src/components/chat/markdownStreamBlocks.test.tsx rename to apps/web/src/components/chat/markdownStreamBlocks.test.ts index 38ecff7666508..b89940489ec32 100644 --- a/apps/web/src/components/chat/markdownStreamBlocks.test.tsx +++ b/apps/web/src/components/chat/markdownStreamBlocks.test.ts @@ -1,32 +1,19 @@ -import { - CHAT_MARKDOWN_REHYPE_PLUGINS, - CHAT_MARKDOWN_REMARK_PLUGINS, - remarkAssistantInsights, -} from "@t3tools/shared/markdownPipeline"; -import { renderToStaticMarkup } from "react-dom/server"; -import ReactMarkdown from "react-markdown"; -import remarkMath from "remark-math"; -import type { PluggableList } from "unified"; +import { toHtml } from "hast-util-to-html"; import { describe, expect, it } from "vite-plus/test"; +import { wordsHast } from "~/markdown/wordsHast"; import { splitMarkdownBlocks } from "./markdownStreamBlocks"; -import { rehypeHeadingIds } from "./markdownFragments"; - -const MATH_PLUGINS: PluggableList = [[remarkMath, { singleDollarTextMath: true }]]; // Whitespace between top-level blocks collapses in the rendered message. const renderMarkdown = (source: string, math = false) => - renderToStaticMarkup( - - {source} - , + toHtml( + wordsHast(source, { + math, + breaks: false, + escapeHtml: false, + insights: source.includes("★ Insight"), + extensions: {}, + }), ) .replace(/>\s+<") .trim(); diff --git a/apps/web/src/components/chat/markdownSyntaxGates.ts b/apps/web/src/components/chat/markdownSyntaxGates.ts deleted file mode 100644 index 57587a51b9d13..0000000000000 --- a/apps/web/src/components/chat/markdownSyntaxGates.ts +++ /dev/null @@ -1,204 +0,0 @@ -import type { Nodes as MdastNodes } from "mdast"; -import { - type Extension as MdastExtension, - fromMarkdown, - type Options as FromMarkdownOptions, - type Transform, -} from "mdast-util-from-markdown"; -import { combineExtensions } from "micromark-util-combine-extensions"; -import type { Construct, Extension, TokenizeContext } from "micromark-util-types"; -import type { Processor } from "unified"; - -// A table needs a delimiter row: dashes with a `|` or `:`, after any `>` or indent. -// One character class per pattern: overlapping ones backtrack quadratically on a run of dashes. -const DELIMITER_LINE = /^[ \t>|:-]+$/gm; -const isDelimiterRow = (line: string) => line.includes("-") && /[|:]/.test(line); -const NEXT_LINE = /[^\r\n]*(?:\r\n?|\n)([^\r\n]*)/y; - -function hasDelimiterRow(text: string) { - for (const [line] of text.matchAll(DELIMITER_LINE)) if (isDelimiterRow(line)) return true; - return false; -} -const PROTOCOL = /https?:\/\//iy; -const WWW = /www\./iy; -const EMAIL_ATEXT = /[\w+.-]*@/y; - -const matchesAt = (pattern: RegExp, text: string, offset: number) => { - pattern.lastIndex = offset; - return pattern.test(text); -}; - -interface Gate { - readonly names: ReadonlyArray; - /** False when the construct cannot match anywhere in the text. */ - readonly inText: (text: string) => boolean; - /** False when it cannot start at this offset, which keeps micromark from trying it there. */ - readonly at?: (context: TokenizeContext, text: string, offset: number) => boolean; -} - -// micromark tries these at every candidate character: email autolinks at every word, tables -// at every line. That is most of what GFM adds to a parse, and most texts cannot match them. -const GATES: ReadonlyArray = [ - { - names: ["emailAutolink"], - inText: (text) => text.includes("@"), - at: (_, text, offset) => matchesAt(EMAIL_ATEXT, text, offset), - }, - { - names: ["protocolAutolink"], - inText: (text) => /https?:\/\//i.test(text), - at: (_, text, offset) => matchesAt(PROTOCOL, text, offset), - }, - { - names: ["wwwAutolink"], - inText: (text) => /www\./i.test(text), - at: (_, text, offset) => matchesAt(WWW, text, offset), - }, - { - names: ["table"], - inText: hasDelimiterRow, - at: (context, text, offset) => { - NEXT_LINE.lastIndex = offset; - const nextLine = NEXT_LINE.exec(text)?.[1]; - return (nextLine !== undefined && hasDelimiterRow(nextLine)) || continuesTable(context); - }, - }, - { names: ["strikethrough"], inText: (text) => text.includes("~") }, - { - names: ["gfmFootnoteCall", "gfmPotentialFootnoteCall", "gfmFootnoteDefinition"], - inText: (text) => text.includes("[^"), - }, - { names: ["tasklistCheck"], inText: (text) => /\[[\sxX]\]/.test(text) }, -]; - -// A body row follows the head or another row. Mirrors `start` in micromark-extension-gfm-table's -// lib/syntax.js: recheck it when that package changes. -function continuesTable({ events }: TokenizeContext) { - let index = events.length - 1; - while (index > -1 && /^(?:lineEnding|linePrefix)$/.test(events[index]![1].type)) index--; - // The table extension's token types are not in micromark's map unless its types are loaded. - const tail: string | undefined = events[index]?.[1].type; - return tail === "tableHead" || tail === "tableRow"; -} - -let parsing = ""; -const gated = new WeakMap(); - -function gatedConstruct(construct: Construct, gate: Gate): Construct { - const at = gate.at; - if (!at) return construct; - let wrapped = gated.get(construct); - if (!wrapped) { - const { previous, tokenize } = construct; - wrapped = { - ...construct, - tokenize(effects, ok, nok) { - return at(this, parsing, this.now().offset) ? tokenize.call(this, effects, ok, nok) : nok; - }, - ...(previous && { - previous(code) { - return previous.call(this, code) && at(this, parsing, this.now().offset); - }, - }), - }; - gated.set(construct, wrapped); - } - return wrapped; -} - -type ConstructMap = Record; - -function gateExtension(extension: Extension, absent: ReadonlySet): Extension { - const gateOf = (name: string | undefined) => - GATES.find((gate) => name && gate.names.includes(name)); - const result: Record = {}; - for (const [field, value] of Object.entries(extension)) { - if (field === "disable" || field === "attentionMarkers" || !value) { - result[field] = value; - continue; - } - const map: ConstructMap = {}; - for (const [code, entry] of Object.entries(value as ConstructMap)) { - const kept = (Array.isArray(entry) ? entry : [entry]).flatMap((construct) => { - const gate = construct && gateOf(construct.name); - if (!construct || !gate) return construct ? [construct] : []; - return absent.has(gate) ? [] : [gatedConstruct(construct, gate)]; - }); - if (kept.length > 0) map[code] = Array.isArray(entry) ? kept : kept[0]; - } - result[field] = map; - } - return result as Extension; -} - -type MdastExtensions = NonNullable; - -// Merged once, as mdast-util-from-markdown merges them on every call: lists in order, handlers by key. -function mergeMdastExtensions(extensions: MdastExtensions): MdastExtension { - const merged = { - canContainEols: [] as string[], - enter: {}, - exit: {}, - transforms: [] as Transform[], - }; - for (const extension of extensions.flat()) { - merged.canContainEols.push(...(extension.canContainEols ?? [])); - Object.assign(merged.enter, extension.enter); - Object.assign(merged.exit, extension.exit); - // GFM looks for autolink literals again in the decoded text outside links, so `www\.x.io` - // links too. Most texts have URLs only in link destinations and code, where it finds nothing. - for (const transform of extension.transforms ?? []) { - merged.transforms.push( - extension.enter?.literalAutolink - ? (tree) => (hasAutolinkText(tree) ? transform(tree) : undefined) - : transform, - ); - } - } - return merged; -} - -const AUTOLINK_TEXT = /@|https?:\/\/|www\./i; - -function hasAutolinkText(node: MdastNodes): boolean { - if (node.type === "text") return AUTOLINK_TEXT.test(node.value); - if (node.type === "link" || node.type === "linkReference" || !("children" in node)) return false; - return node.children.some(hasAutolinkText); -} - -/** - * Parses as remark-parse does, without the syntax extension constructs that cannot match the - * text. Same tree, in about half the time. - */ -function attachParserWithoutUnusedSyntax(this: Processor) { - const data = this.data(); - const byMask = new Map(); - let mdastExtensions: MdastExtension[] | undefined; - this.parser = (document) => { - let mask = 0; - GATES.forEach((gate, index) => { - if (!gate.inText(document)) mask |= 1 << index; - }); - let extensions = byMask.get(mask); - if (!extensions) { - const absent = new Set(GATES.filter((_, index) => mask & (1 << index))); - extensions = [ - combineExtensions( - (data.micromarkExtensions ?? []).map((extension) => gateExtension(extension, absent)), - ), - ]; - byMask.set(mask, extensions); - } - mdastExtensions ??= [mergeMdastExtensions(data.fromMarkdownExtensions ?? [])]; - const outer = parsing; - // Gates read micromark offsets, which skip a leading byte order mark. - parsing = document.charCodeAt(0) === 0xfeff ? document.slice(1) : document; - try { - return fromMarkdown(document, { ...data.settings, extensions, mdastExtensions }); - } finally { - parsing = outer; - } - }; -} - -export const remarkParseWithoutUnusedSyntax = attachParserWithoutUnusedSyntax; diff --git a/apps/web/src/components/chat/markdownTextDirection.ts b/apps/web/src/components/chat/markdownTextDirection.ts index ffdbde76c1148..a4c78d3342754 100644 --- a/apps/web/src/components/chat/markdownTextDirection.ts +++ b/apps/web/src/components/chat/markdownTextDirection.ts @@ -1,4 +1,4 @@ -import { textDirection } from "~/textDirection"; +import { LETTER, RTL_LETTER, textDirection } from "~/textDirection"; type HastNode = { type?: string; @@ -57,11 +57,32 @@ function isolateInlineCode(node: HastNode): void { */ export function rehypeTextDirection() { return (tree: HastNode) => { - for (const block of tree.children ?? []) { - if (block.type !== "element" || block.tagName === "pre") continue; - const dir = textDirection(proseText(block)); - if (dir) block.properties = { ...block.properties, dir }; - } + blockTextDirections(tree); isolateInlineCode(tree); }; } + +/** Each top-level block's direction, from its prose; an RTL letter decides as textDirection does. */ +function blockTextDirections(tree: HastNode) { + for (const block of tree.children ?? []) { + if (block.type !== "element" || block.tagName === "pre") continue; + const dir = scriptOf(block) === "rtl" ? textDirection(proseText(block)) : scriptOf(block); + if (dir) block.properties = { ...block.properties, dir }; + } +} + +/** "rtl" when any prose letter is right-to-left; otherwise what textDirection would say. */ +function scriptOf(node: HastNode): "rtl" | "ltr" | undefined { + let found: "ltr" | undefined; + const visit = (current: HastNode): boolean => { + if (current.type === "text") { + const value = current.value ?? ""; + if (RTL_LETTER.test(value)) return true; + if (!found && LETTER.test(value)) found = "ltr"; + return false; + } + if (current.tagName === "code") return false; + return (current.children ?? []).some(visit); + }; + return visit(node) ? "rtl" : found; +} diff --git a/apps/web/src/components/chat/threadFindHighlights.ts b/apps/web/src/components/chat/threadFindHighlights.ts index c8ce0b31b9c9e..fe6a3ba5d3056 100644 --- a/apps/web/src/components/chat/threadFindHighlights.ts +++ b/apps/web/src/components/chat/threadFindHighlights.ts @@ -1,6 +1,6 @@ import { findThreadSearchOccurrences } from "@t3tools/shared/threadSearch"; import { useEffect, useEffectEvent, useRef } from "react"; -import { THREAD_FIND_BLOCK_TAGS } from "@t3tools/shared/threadFindText"; +import { THREAD_FIND_BLOCK_TAGS } from "@t3tools/shared/threadFindBlockTags"; import { observeResize } from "~/lib/observeResize"; diff --git a/apps/web/src/components/chat/timelineMinimapItems.ts b/apps/web/src/components/chat/timelineMinimapItems.ts index 151a02d88175e..57f6229c99526 100644 --- a/apps/web/src/components/chat/timelineMinimapItems.ts +++ b/apps/web/src/components/chat/timelineMinimapItems.ts @@ -4,10 +4,9 @@ import { isAttachmentOnlyBootstrapPrompt, replaceComposerContextReferences, } from "@t3tools/shared/composerContextReferences"; -import type { Nodes } from "mdast"; -import remarkGfm from "remark-gfm"; -import remarkParse from "remark-parse"; -import { unified } from "unified"; +import type { Nodes } from "hast"; + +import { markdownTree } from "~/markdown/wordsHast"; import type { MessagesTimelineRow } from "./MessagesTimeline.logic"; @@ -58,50 +57,49 @@ function resolveFinalAssistantTextForTurn( return finalAssistantText; } -const markdownPreviewParser = unified().use(remarkParse).use(remarkGfm).freeze(); - -const INLINE_PARENT_TYPES = new Set([ - "paragraph", - "heading", - "tableCell", - "emphasis", +// Elements whose children run together; every other element is separated by a space. +const INLINE_PARENTS = new Set([ + "p", + "h1", + "h2", + "h3", + "h4", + "h5", + "h6", + "td", + "th", + "em", "strong", - "delete", - "link", - "linkReference", + "del", + "a", + "code", + "span", + "sup", + "sub", ]); function markdownNodeText(node: Nodes): string { - if (node.type === "html") { - return node.value - .replace(/|$)/g, "") - .replace(/<\/?([a-z][\w-]*)(?:[^"'<>]|"[^"]*"|'[^']*')*>/gi, (_, tag: string) => - /^(?:address|article|aside|blockquote|br|dd|details|div|dl|dt|figcaption|figure|footer|h[1-6]|header|hr|li|main|nav|ol|p|pre|section|summary|table|tbody|td|th|thead|tr|ul)$/i.test( - tag, - ) - ? " " - : "", - ); - } - if (node.type === "break") return " "; - if ("value" in node) return node.value; - if (node.type === "image" || node.type === "imageReference") return node.alt ?? ""; - if (!("children" in node)) return ""; - const separator = INLINE_PARENT_TYPES.has(node.type) ? "" : " "; + if (node.type === "text") return node.value; + if (node.type === "element" && node.tagName === "br") return " "; + if (node.type === "element" && node.tagName === "img") return String(node.properties.alt ?? ""); + if (node.type !== "element" && node.type !== "root") return ""; + const separator = node.type === "element" && INLINE_PARENTS.has(node.tagName) ? "" : " "; const text = node.children.map(markdownNodeText).join(separator); // A thread autolink's only text is its URL. - return node.type === "link" && parseThreadLinkHref(text) !== null ? "a thread" : text; + return node.type === "element" && node.tagName === "a" && parseThreadLinkHref(text) !== null + ? "a thread" + : text; } /** Markdown as one line of the text it renders, without markup or link targets. */ export function markdownPlainText(markdown: string): string { - return markdownNodeText(markdownPreviewParser.parse(markdown)).replace(/\s+/g, " ").trim(); + return markdownNodeText(markdownTree(markdown)).replace(/\s+/g, " ").trim(); } // The tooltip shows a few lines; bound parsing work for long messages and streaming responses. function markdownMinimapPreview(markdown: string | null) { if (markdown === null) return null; - const compact = markdownNodeText(markdownPreviewParser.parse(markdown.slice(0, 1_500))) + const compact = markdownNodeText(markdownTree(markdown.slice(0, 1_500))) .replace(/\s+/g, " ") .trim(); return compact.length > 0 ? compact : null; diff --git a/apps/web/src/components/files/FilePreviewPanel.tsx b/apps/web/src/components/files/FilePreviewPanel.tsx index c020113815dfa..2c27cfb8d80d1 100644 --- a/apps/web/src/components/files/FilePreviewPanel.tsx +++ b/apps/web/src/components/files/FilePreviewPanel.tsx @@ -132,7 +132,7 @@ import { shouldShowFileExplorer, workspaceAssetResource, } from "./filePreviewMode"; -import { setMarkdownTaskChecked } from "@t3tools/shared/markdownTaskList"; +import { setMarkdownTaskChecked } from "@t3tools/shared/markdownTaskEdits"; import { changeFileSaveSession, useFileSaveSession } from "./fileSaveSessions"; import { revisionedQuery } from "~/state/revisionedQuery"; import { diff --git a/apps/web/src/components/files/NotebookPreview.tsx b/apps/web/src/components/files/NotebookPreview.tsx index 35d0203818850..c2104ad2ddec6 100644 --- a/apps/web/src/components/files/NotebookPreview.tsx +++ b/apps/web/src/components/files/NotebookPreview.tsx @@ -2,8 +2,8 @@ import { formatAttachmentSize } from "@t3tools/client-runtime/state/attachments"; import { T, useGT, useMessages } from "gt-react"; import { useEffect, useRef, useState } from "react"; -import type { Root, RootContent } from "mdast"; import ChatMarkdown from "~/components/ChatMarkdown"; +import type { MarkdownExtensions } from "~/markdown/wordsHast"; import { Button } from "~/components/ui/button"; import ReadOnlySourcePreview from "./ReadOnlySourcePreview"; import DocumentPages from "./DocumentPages"; @@ -11,24 +11,7 @@ import { FileSurfaceNotice } from "./fileSurfaceChrome"; import type { OfficeWorkerResult } from "./officePreviewProtocol"; // Saved notebooks must not load URLs or turn authored links into app actions. -function inertNotebookMarkdown() { - function clean(nodes: RootContent[]): RootContent[] { - return nodes.flatMap((node): RootContent[] => { - if (node.type === "html" || node.type === "definition") return []; - if (node.type === "image" || node.type === "imageReference") - return [{ type: "text", value: node.alt ?? "" }]; - if (node.type === "link" || node.type === "linkReference") return clean(node.children); - if (node.type === "inlineCode") return [{ type: "text", value: node.value }]; - if (node.type === "code" && node.lang === "mermaid") return [{ ...node, lang: "text" }]; - if ("children" in node) node.children = clean(node.children) as typeof node.children; - return [node]; - }); - } - return (tree: Root) => { - tree.children = clean(tree.children) as Root["children"]; - }; -} -const NOTEBOOK_PLUGINS = [inertNotebookMarkdown]; +const NOTEBOOK_MARKDOWN: MarkdownExtensions = { inert: true }; function NotebookSource(props: { readonly name: string; readonly text: string }) { const [height, setHeight] = useState(Math.min(360, props.text.split("\n").length * 20 + 16)); @@ -129,7 +112,7 @@ export default function NotebookPreview(props: { text={cell.source} cwd={undefined} parseRawHtml={false} - extraRemarkPlugins={NOTEBOOK_PLUGINS} + extensions={NOTEBOOK_MARKDOWN} className="px-4 py-3" /> ) : cell.source.trim() ? ( diff --git a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx index 1e0fa7680c405..cbf9de56dbbb2 100644 --- a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx +++ b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx @@ -112,7 +112,7 @@ import { PullRequestsUnavailableState } from "./PullRequestsUnavailableState"; import type { PullRequestAgentSelectionInput } from "./PullRequestCodeTab"; import { openOnHostLabel } from "./pullRequestLinkContextMenu"; import { PullRequestMarkdownContext } from "./PullRequestMarkdown"; -import { pullRequestMarkdownPlugins } from "./pullRequestMarkdown.logic"; +import { pullRequestMarkdownExtensions } from "./pullRequestMarkdown.logic"; import { PullRequestComposer } from "./PullRequestComposer"; import { PullRequestSummaryTab } from "./PullRequestSummaryTab"; import { PullRequestTimelineTab } from "./PullRequestTimelineTab"; @@ -298,7 +298,7 @@ function pullRequestMarkdownContext( threadRef: ScopedThreadRef | null, ) { return { - remarkPlugins: pullRequestMarkdownPlugins(detail), + extensions: pullRequestMarkdownExtensions(detail), lineBreaks: sourceControlClients.find(detail?.provider ?? "")?.hardLineBreaks ?? false, threadRef, repository: detail?.repository ?? null, diff --git a/apps/web/src/components/pullRequest/PullRequestMarkdown.browser.test.tsx b/apps/web/src/components/pullRequest/PullRequestMarkdown.browser.test.tsx index fae5270d27123..f1cd6b6ba6708 100644 --- a/apps/web/src/components/pullRequest/PullRequestMarkdown.browser.test.tsx +++ b/apps/web/src/components/pullRequest/PullRequestMarkdown.browser.test.tsx @@ -24,7 +24,7 @@ async function renderBody( ) { const { repository = null, text = "first line\nsecond line", ...props } = options; const context = { - remarkPlugins: [], + extensions: {}, lineBreaks: sourceControlClients.get(host).hardLineBreaks ?? false, threadRef: null, repository, diff --git a/apps/web/src/components/pullRequest/PullRequestMarkdown.tsx b/apps/web/src/components/pullRequest/PullRequestMarkdown.tsx index 071e8dbe45d17..82012eae8f0a7 100644 --- a/apps/web/src/components/pullRequest/PullRequestMarkdown.tsx +++ b/apps/web/src/components/pullRequest/PullRequestMarkdown.tsx @@ -9,7 +9,7 @@ import { type ScopedThreadRef, } from "@t3tools/contracts"; import { createContext, useContext } from "react"; -import type { PluggableList } from "unified"; +import type { MarkdownExtensions } from "~/markdown/wordsHast"; import { useAssetUrlRefresh, useAssetUrlState } from "~/assets/assetUrls"; import { cn } from "~/lib/utils"; @@ -21,7 +21,7 @@ import { splitPullRequestBody, type PullRequestBodySegment } from "./pullRequest export const PullRequestMarkdownContext = createContext<{ /** Stable per repository, so comments share one renderer and its parse cache. */ - remarkPlugins: PluggableList; + extensions: MarkdownExtensions; lineBreaks: boolean; threadRef: ScopedThreadRef | null; /** The change request's `owner/name`, which can differ from the checkout the body renders in. */ @@ -129,7 +129,7 @@ function PullRequestBodySegmentView({ threadRef={threadRef} pullRequestPanelRef={threadRef ?? listPanelRef} environmentId={environmentId} - {...(context ? { extraRemarkPlugins: context.remarkPlugins } : {})} + {...(context ? { extensions: context.extensions } : {})} lineBreaks={lineBreaks} sourceControlMedia sourceControlMediaRepository={repository} diff --git a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx index dd4cf2f811c72..1f409d282ecc3 100644 --- a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx +++ b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx @@ -87,7 +87,7 @@ import { startDescriptionSave, type DescriptionDraft, } from "@t3tools/client-runtime/pull-request-editing"; -import { setMarkdownTaskChecked } from "@t3tools/shared/markdownTaskList"; +import { setMarkdownTaskChecked } from "@t3tools/shared/markdownTaskEdits"; import { PullRequestMarkdown } from "./PullRequestMarkdown"; import { PullRequestCommentBody } from "./PullRequestCommentBody"; import { PullRequestMoreReplies } from "./PullRequestMoreReplies"; diff --git a/apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts b/apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts index 4f25b26f3276e..3d0ae22b15017 100644 --- a/apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts +++ b/apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts @@ -1280,6 +1280,15 @@ describe("adding a remark to the chat", () => { }); expect(context?.text).toBe("octocat: This leaks the token.\n\n```html\n\n```"); + // A stray backtick before the comment opens no code span across the paragraphs. + const stray = buildPullRequestCommentContext(pullRequest, { + kind: "comment", + comment: remark( + "c2", + "Avoid `foo.\n\n\nSee `bar` and `` a ` ``.", + ), + }); + expect(stray?.text).toBe("octocat: Avoid `foo.\n\nSee `bar` and `` a ` ``."); }); it("keeps comments inside a quoted fence as code", () => { diff --git a/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts b/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts index 238038730b93f..d98ec3ff114ec 100644 --- a/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts +++ b/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts @@ -5,8 +5,9 @@ import { resolvePullRequestReviewAnchor, } from "@t3tools/shared/pullRequestAnchor"; import { stripInlineContextReferences } from "~/lib/composerContextReferences"; -import type { Nodes as MdastNodes } from "mdast"; -import { fromMarkdown } from "mdast-util-from-markdown"; +import type { Nodes } from "hast"; + +import { markdownHtmlComments, markdownTree } from "~/markdown/wordsHast"; import { sourceControlClients, type ChangeRequestTerminology, @@ -693,27 +694,18 @@ export function pagePullRequestConversationItems( function readableBody(raw: string): string | null { if (visibleBody(raw) === null) return null; const body = raw.replace(/\r\n?/gu, "\n"); - const cuts: Array<[number, number]> = []; - const visit = (node: MdastNodes) => { - if (node.type === "html" && node.position?.start.offset !== undefined) { - cuts.push([node.position.start.offset, node.position.end.offset ?? body.length]); - } - if ("children" in node) for (const child of node.children) visit(child); - }; - visit(fromMarkdown(body)); let readable = ""; let from = 0; - for (const [start, end] of cuts) { + for (const { start, end } of markdownHtmlComments(body)) { + // A comment opened inside another one ends with it. + if (start < from) continue; readable += body.slice(from, start); - // An HTML block can carry markup around its comment; only the comment itself is hidden. - const html = body.slice(start, end).replace(/|$)/gu, ""); // A line that was all comment is dropped rather than left as a blank one. const ownLine = /(?:^|\n)[ \t>]*$/u.test(readable) && /^[ \t]*(?:\n|$)/u.test(body.slice(end)); - if (ownLine && html.trim() === "") { + if (ownLine) { readable = readable.replace(/[ \t>]*$/u, ""); from = end + (/^[ \t]*\n/u.exec(body.slice(end))?.[0].length ?? 0); } else { - readable += html; from = end; } } @@ -740,11 +732,12 @@ const LINK_EXCERPT_LENGTH = 280; /** The words of a markdown body, without markup, HTML or images, for a short preview. */ function markdownExcerpt(body: string): string | null { const words: string[] = []; - const visit = (node: MdastNodes) => { - if (node.type === "text" || node.type === "inlineCode") words.push(node.value); - if (node.type !== "code" && "children" in node) for (const child of node.children) visit(child); + const visit = (node: Nodes) => { + if (node.type === "text") words.push(node.value); + if (node.type === "element" && node.tagName === "pre") return; + if ("children" in node) for (const child of node.children) visit(child); }; - visit(fromMarkdown(body)); + visit(markdownTree(body, { skipHtml: true })); // GitHub's alert marker (`> [!NOTE]`) parses as text but reads as markup. const text = words .join(" ") diff --git a/apps/web/src/components/pullRequest/pullRequestMarkdown.logic.test.ts b/apps/web/src/components/pullRequest/pullRequestMarkdown.logic.test.ts index 1655427b2d4e9..7c4ffac84b8a5 100644 --- a/apps/web/src/components/pullRequest/pullRequestMarkdown.logic.test.ts +++ b/apps/web/src/components/pullRequest/pullRequestMarkdown.logic.test.ts @@ -1,45 +1,44 @@ -import { changeRequestReferenceAutolinker } from "@t3tools/client-runtime/pull-request-markdown"; -import remarkParse from "remark-parse"; -import { unified } from "unified"; +import type { Element, Root } from "hast"; import { describe, expect, it } from "vite-plus/test"; +import { wordsHast } from "~/markdown/wordsHast"; import { pullRequestCommentPreview, - pullRequestMarkdownPlugins, - remarkPullRequestAutolinks, + pullRequestMarkdownExtensions, } from "./pullRequestMarkdown.logic"; -type Node = { - type: string; - value?: string; - url?: string; - data?: { hProperties?: Record }; - children?: Node[]; -}; - function links(markdown: string) { - const autolinks = changeRequestReferenceAutolinker({ + const extensions = pullRequestMarkdownExtensions({ provider: "github", url: "https://github.com/team/repo/pull/8", - })!; - const tree = unified().use(remarkParse).parse(markdown) as Node; - remarkPullRequestAutolinks({ autolinks })(tree as never); - const found: Array<[string | undefined, string | undefined, unknown]> = []; - const visit = (node: Node) => { - if (node.type === "link") { - found.push([ - node.children?.[0]?.value, - node.url, - node.data?.hProperties?.["dataPullRequestAutolink"], - ]); + }); + const tree = wordsHast(markdown, { + math: false, + breaks: false, + escapeHtml: false, + insights: false, + extensions, + }); + const found: Array<[string, unknown, unknown]> = []; + const visit = (node: Root | Element) => { + for (const child of node.children) { + if (child.type !== "element") continue; + if (child.tagName === "a") { + const label = child.children[0]; + found.push([ + label?.type === "text" ? label.value : "", + child.properties.href, + child.properties.dataPullRequestAutolink, + ]); + } + visit(child); } - node.children?.forEach(visit); }; visit(tree); return found; } -describe("remarkPullRequestAutolinks", () => { +describe("pullRequestMarkdownExtensions", () => { it("links the host's references in prose and leaves links and code alone", () => { expect(links("Fixes #12 in **abcdef1**. [#13](https://example.com) `#14`")).toEqual([ ["#12", "https://github.com/team/repo/issues/12", "reference"], @@ -47,22 +46,25 @@ describe("remarkPullRequestAutolinks", () => { ["#13", "https://example.com", undefined], ]); }); -}); - -describe("pullRequestMarkdownPlugins", () => { it("renders GitHub emoji shortcodes in prose and leaves code literal", () => { - const processor = unified() - .use(remarkParse) - .use( - pullRequestMarkdownPlugins({ - provider: "github", - url: "https://github.com/team/repo/pull/8", - }), - ); - const tree = processor.runSync(processor.parse("Ship it :tada: :+1: `:tada:`")) as Node; - const text = (node: Node): string => - (node.type === "inlineCode" ? `\`${node.value}\`` : (node.value ?? "")) + - (node.children ?? []).map(text).join(""); + const extensions = pullRequestMarkdownExtensions({ + provider: "github", + url: "https://github.com/team/repo/pull/8", + }); + const tree = wordsHast("Ship it :tada: :+1: `:tada:`", { + math: false, + breaks: false, + escapeHtml: false, + insights: false, + extensions, + }); + const text = (node: Root | Element | Root["children"][number]): string => { + if (node.type === "text") return node.value; + if (node.type === "element" && node.tagName === "code") { + return `\`${node.children.map(text).join("")}\``; + } + return "children" in node ? node.children.map(text).join("") : ""; + }; expect(text(tree)).toBe("Ship it 🎉 👍 `:tada:`"); }); }); diff --git a/apps/web/src/components/pullRequest/pullRequestMarkdown.logic.ts b/apps/web/src/components/pullRequest/pullRequestMarkdown.logic.ts index 21f3574838e06..560b6ee03fd37 100644 --- a/apps/web/src/components/pullRequest/pullRequestMarkdown.logic.ts +++ b/apps/web/src/components/pullRequest/pullRequestMarkdown.logic.ts @@ -1,130 +1,63 @@ -import { - changeRequestReferenceAutolinker, - expandGithubEmojiAliases, - resolveChangeRequestMediaUrl, -} from "@t3tools/client-runtime/pull-request-markdown"; -import { - sourceControlClients, - type ReferenceAutolink, -} from "@t3tools/client-runtime/source-control-clients"; -import { - CHAT_MARKDOWN_REHYPE_PLUGINS, - CHAT_MARKDOWN_REMARK_PLUGINS, -} from "@t3tools/shared/markdownPipeline"; +import { changeRequestReferenceAutolinker } from "@t3tools/client-runtime/pull-request-references"; +import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients"; import type { Nodes } from "hast"; -import remarkParse from "remark-parse"; -import remarkRehype from "remark-rehype"; -import { unified, type PluggableList } from "unified"; -export { - splitPullRequestBody, +import { + splitPullRequestBody as splitBody, type PullRequestBodySegment, } from "@t3tools/client-runtime/pull-request-markdown"; +import { + markdownReferenceDefinitions, + wordsHast, + type MarkdownExtensions, +} from "~/markdown/wordsHast"; -type MarkdownNode = { - type: string; - value?: string; - children?: MarkdownNode[]; - url?: string; - data?: unknown; -}; - -const AUTOLINK_IGNORED_TYPES = new Set(["link", "linkReference"]); - -export function remarkPullRequestAutolinks(options: { - readonly autolinks: (text: string) => ReadonlyArray; -}) { - const visit = (node: MarkdownNode): void => { - const children = node.children; - if (children === undefined) return; - for (let index = 0; index < children.length; index += 1) { - const child = children[index]!; - if (AUTOLINK_IGNORED_TYPES.has(child.type)) continue; - if (child.type !== "text" || child.value === undefined) { - visit(child); - continue; - } - const value = child.value; - const links = options.autolinks(value); - if (links.length === 0) continue; - const replacements: MarkdownNode[] = []; - let start = 0; - for (const link of links) { - if (start < link.index) { - replacements.push({ type: "text", value: value.slice(start, link.index) }); - } - replacements.push({ - type: "link", - url: link.url, - data: { hProperties: { dataPullRequestAutolink: link.kind } }, - children: [{ type: "text", value: link.label }], - }); - start = link.index + link.text.length; - } - if (start < value.length) replacements.push({ type: "text", value: value.slice(start) }); - children.splice(index, 1, ...replacements); - index += replacements.length - 1; - } - }; - return (tree: MarkdownNode) => visit(tree); -} +export type { PullRequestBodySegment }; -function remarkChangeRequestMediaUrls(options: { readonly changeRequestUrl: string }) { - const visit = (node: MarkdownNode): void => { - if ((node.type === "image" || node.type === "definition") && node.url !== undefined) { - node.url = resolveChangeRequestMediaUrl(node.url, options.changeRequestUrl); - } - node.children?.forEach(visit); - }; - return (tree: MarkdownNode) => visit(tree); +export function splitPullRequestBody(body: string): ReadonlyArray { + return splitBody(body, markdownReferenceDefinitions); } -/** GitHub renders `:alias:` emoji in prose; code keeps them, being `inlineCode`/`code`, not `text`. */ -function remarkGithubEmoji() { - const visit = (node: MarkdownNode): void => { - if (node.type === "text" && node.value !== undefined) - node.value = expandGithubEmojiAliases(node.value); - node.children?.forEach(visit); - }; - return (tree: MarkdownNode) => visit(tree); -} - -const NO_PLUGINS: PluggableList = []; -const markdownPlugins = new Map(); +const NO_EXTENSIONS: MarkdownExtensions = {}; +const markdownExtensions = new Map(); /** - * One plugin list per repository, so every comment of a pull request shares one markdown + * One extension object per repository, so every comment of a pull request shares one markdown * renderer and its parse cache instead of parsing again on each render. */ -export function pullRequestMarkdownPlugins( +export function pullRequestMarkdownExtensions( changeRequest: { readonly provider: string; readonly url: string } | null, -): PluggableList { - if (changeRequest === null) return NO_PLUGINS; +): MarkdownExtensions { + if (changeRequest === null) return NO_EXTENSIONS; const repositoryUrl = sourceControlClients.parseChangeRequestUrl(changeRequest.url)?.link .repositoryUrl; - if (repositoryUrl === undefined) return NO_PLUGINS; + if (repositoryUrl === undefined) return NO_EXTENSIONS; const key = `${changeRequest.provider}\u0000${repositoryUrl}`; - let plugins = markdownPlugins.get(key); - if (plugins === undefined) { - const autolinks = changeRequestReferenceAutolinker(changeRequest); - plugins = [[remarkChangeRequestMediaUrls, { changeRequestUrl: repositoryUrl }]]; - if (changeRequest.provider === "github") plugins.push(remarkGithubEmoji); - if (autolinks) plugins.push([remarkPullRequestAutolinks, { autolinks }]); - markdownPlugins.set(key, plugins); + let extensions = markdownExtensions.get(key); + if (extensions === undefined) { + extensions = { + changeRequest: { + repositoryUrl, + autolinks: changeRequestReferenceAutolinker(changeRequest), + }, + githubEmoji: changeRequest.provider === "github", + }; + markdownExtensions.set(key, extensions); } - return plugins; + return extensions; } -const commentPreviewProcessor = (plugins: PluggableList) => - unified() - .use(remarkParse) - .use(CHAT_MARKDOWN_REMARK_PLUGINS) - .use(plugins) - .use(remarkRehype, { allowDangerousHtml: true }) - .use(CHAT_MARKDOWN_REHYPE_PLUGINS) - .freeze(); -const commentPreview = commentPreviewProcessor(NO_PLUGINS); -const githubCommentPreview = commentPreviewProcessor([remarkGithubEmoji]); +const PREVIEW_MARKDOWN = { + math: false, + breaks: false, + escapeHtml: false, + insights: false, + extensions: NO_EXTENSIONS, +}; +const GITHUB_PREVIEW_MARKDOWN = { + ...PREVIEW_MARKDOWN, + extensions: { githubEmoji: true }, +}; const PREVIEW_BLOCK_TAGS = new Set([ "blockquote", @@ -164,7 +97,6 @@ function commentPreviewText(node: Nodes): string { } export function pullRequestCommentPreview(body: string, provider: string): string { - const processor = provider === "github" ? githubCommentPreview : commentPreview; - const tree = processor.runSync(processor.parse(body), body); - return commentPreviewText(tree).replace(/\s+/gu, " ").trim(); + const options = provider === "github" ? GITHUB_PREVIEW_MARKDOWN : PREVIEW_MARKDOWN; + return commentPreviewText(wordsHast(body, options)).replace(/\s+/gu, " ").trim(); } diff --git a/apps/web/src/components/settings/settingsSearch.ts b/apps/web/src/components/settings/settingsSearch.ts index d91d6da4a42d7..4252fccc9c7d0 100644 --- a/apps/web/src/components/settings/settingsSearch.ts +++ b/apps/web/src/components/settings/settingsSearch.ts @@ -512,6 +512,7 @@ export const SETTINGS_SEARCH_ITEMS = [ targetId: "boring-sidebar", searchTerms: [msg("beta boring sidebar folder rows multiline branch pull request details")], }, + { id: "tool-call-visibility", title: msg("Tool calls in chat"), diff --git a/apps/web/src/components/ui/shared-tooltip.tsx b/apps/web/src/components/ui/shared-tooltip.tsx new file mode 100644 index 0000000000000..0858fa656e6bb --- /dev/null +++ b/apps/web/src/components/ui/shared-tooltip.tsx @@ -0,0 +1,262 @@ +import { + cloneElement, + createContext, + use, + useEffect, + useId, + useRef, + useState, + type FocusEvent, + type PointerEvent, + type ReactElement, + type ReactNode, +} from "react"; + +import { Tooltip, TooltipPopup, TooltipTrigger, useTooltipScrollTracker } from "./tooltip"; + +// Base UI's tooltip timing: open after a rest, reopen at once right after another closed. +const OPEN_DELAY_MS = 600; +const REOPEN_WINDOW_MS = 400; +// Time to travel from the trigger into a hoverable popup. +const CLOSE_GRACE_MS = 100; + +interface SharedTooltipContent { + readonly render: () => ReactNode; + /** Comparable key that changes whenever `render()` output changes while open. */ + readonly contentKey?: unknown; + readonly side?: "top" | "bottom" | "left" | "right"; + readonly variant?: "default" | "glass" | "code"; +} + +interface SharedTooltipState extends SharedTooltipContent { + readonly anchor: HTMLElement; + readonly open: boolean; +} + +interface SharedTooltipApi { + show(anchor: HTMLElement, content: SharedTooltipContent, immediate: boolean): void; + refresh(anchor: HTMLElement, content: SharedTooltipContent): void; + hide(anchor: HTMLElement): void; + /** A press closes it at once, as Base UI's closeOnClick does. */ + dismiss(anchor: HTMLElement): void; + holdOpen(): void; +} + +function setAriaDescribedBy(element: HTMLElement, id: string, present: boolean) { + const tokens = (element.getAttribute("aria-describedby") ?? "").split(/\s+/).filter(Boolean); + const next = present + ? tokens.includes(id) + ? tokens + : [...tokens, id] + : tokens.filter((token) => token !== id); + if (next.length > 0) element.setAttribute("aria-describedby", next.join(" ")); + else element.removeAttribute("aria-describedby"); +} + +const SharedTooltipContext = createContext(null); + +/** + * One tooltip for many triggers: a long message would otherwise mount a Base UI tooltip per + * link and file chip, and almost none of them are ever hovered. + */ +export function SharedTooltipProvider({ children }: { children: ReactNode }) { + const popupId = useId(); + const [state, setState] = useState(null); + const timer = useRef | null>(null); + const pending = useRef(null); + const lastClosedAt = useRef(0); + const current = useRef(null); + + const commit = (next: SharedTooltipState | null) => { + current.current = next; + setState(next); + }; + const clearTimer = () => { + if (timer.current !== null) clearTimeout(timer.current); + timer.current = null; + pending.current = null; + }; + const [api] = useState(() => ({ + show(anchor, content, immediate) { + clearTimer(); + const open = current.current?.open === true; + const reopen = performance.now() - lastClosedAt.current < REOPEN_WINDOW_MS; + if (immediate || open || reopen) { + commit({ ...content, anchor, open: true }); + return; + } + pending.current = { ...content, anchor, open: true }; + timer.current = setTimeout(() => { + const next = pending.current; + pending.current = null; + if (next) commit(next); + }, OPEN_DELAY_MS); + }, + refresh(anchor, content) { + if (pending.current?.anchor === anchor) { + pending.current = { ...pending.current, ...content }; + } + const active = current.current; + if (!active || active.anchor !== anchor) return; + if ( + active.contentKey === content.contentKey && + active.side === content.side && + active.variant === content.variant + ) { + return; + } + commit({ ...active, ...content }); + }, + hide(anchor) { + if (current.current && current.current.anchor !== anchor) { + clearTimer(); + return; + } + clearTimer(); + timer.current = setTimeout(() => { + if (current.current?.open) lastClosedAt.current = performance.now(); + if (current.current) commit({ ...current.current, open: false }); + }, CLOSE_GRACE_MS); + }, + dismiss(anchor) { + clearTimer(); + if (current.current?.anchor !== anchor) return; + if (current.current.open) lastClosedAt.current = 0; + commit({ ...current.current, open: false }); + }, + holdOpen() { + clearTimer(); + }, + })); + + const activeAnchor = state?.open ? state.anchor : null; + // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- links the active trigger DOM element to the shared tooltip popup via aria-describedby + useEffect(() => { + if (!activeAnchor) return; + setAriaDescribedBy(activeAnchor, popupId, true); + return () => setAriaDescribedBy(activeAnchor, popupId, false); + }, [activeAnchor, popupId]); + + return ( + + {children} + {state ? ( + { + if (!open) api.hide(state.anchor); + }} + > + api.holdOpen()} + onMouseLeave={() => api.hide(state.anchor)} + > + {state.render()} + + + ) : null} + + ); +} + +export interface SharedTooltipTriggerProps { + onPointerEnter: (event: PointerEvent) => void; + onPointerLeave: (event: PointerEvent) => void; + onFocus: (event: FocusEvent) => void; + onBlur: (event: FocusEvent) => void; + onPointerDown: (event: PointerEvent) => void; +} + +/** Props that show `content` on the shared tooltip, or null outside a SharedTooltipProvider. */ +export function useSharedTooltip(content: SharedTooltipContent): SharedTooltipTriggerProps | null { + const api = use(SharedTooltipContext); + const scrollTracker = useTooltipScrollTracker(); + const anchorRef = useRef(null); + // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- refreshes an open shared tooltip when its trigger's label changes + useEffect(() => { + if (api && anchorRef.current) api.refresh(anchorRef.current, content); + }, [api, content]); + if (!api) return null; + return { + // Touch never opens it, as Base UI's mouseOnly trigger; taps also send compatibility mouse events. + onPointerEnter: (event) => { + if (event.pointerType === "touch") return; + const trigger = event.currentTarget; + anchorRef.current = trigger; + api.show(trigger, content, false); + // Scrolling the timeline closes it, as it does a TooltipTrigger's. + scrollTracker?.hover(trigger, api, () => api.dismiss(trigger)); + }, + onPointerLeave: (event) => api.hide(event.currentTarget), + // Keyboard focus shows it at once, as Base UI does. + onFocus: (event) => { + if (event.currentTarget.matches(":focus-visible")) { + anchorRef.current = event.currentTarget; + api.show(event.currentTarget, content, true); + } + }, + onBlur: (event) => api.hide(event.currentTarget), + onPointerDown: (event) => api.dismiss(event.currentTarget), + }; +} + +type Handlers = Partial void>>; + +/** The trigger's own handlers run first, then the shared tooltip's. */ +export function withSharedTooltip( + element: ReactElement, + tooltip: SharedTooltipTriggerProps, + children?: ReactNode, +): ReactElement { + const own = element.props as Handlers; + const merged: Record void> = {}; + for (const key of Object.keys(tooltip) as Array) { + const shared = tooltip[key] as (event: never) => void; + const mine = own[key]; + merged[key] = mine + ? (event) => { + mine(event); + shared(event); + } + : shared; + } + return children === undefined + ? cloneElement(element, merged as Partial) + : cloneElement(element, merged as Partial, children); +} + +/** A tooltip on `render`: the shared one inside a SharedTooltipProvider, Base UI's otherwise. */ +export function SharedTooltipTrigger({ + render, + children, + label, + side = "top", + variant, +}: { + render: ReactElement; + children?: ReactNode; + label: ReactNode; + side?: SharedTooltipContent["side"]; + variant?: SharedTooltipContent["variant"]; +}) { + const tooltip = useSharedTooltip({ + render: () => label, + contentKey: label, + side, + ...(variant ? { variant } : {}), + }); + if (tooltip) return withSharedTooltip(render, tooltip, children); + return ( + + {children} + + {label} + + + ); +} diff --git a/apps/web/src/components/ui/tooltip.browser.test.tsx b/apps/web/src/components/ui/tooltip.browser.test.tsx index 24d76784e8a5a..bcb62ee2fdaf0 100644 --- a/apps/web/src/components/ui/tooltip.browser.test.tsx +++ b/apps/web/src/components/ui/tooltip.browser.test.tsx @@ -3,41 +3,114 @@ import { page, userEvent } from "vite-plus/test/browser"; import "~/index.css"; import { render } from "../../../test/render"; +import { SharedTooltipProvider, SharedTooltipTrigger } from "./shared-tooltip"; import { Tooltip, TooltipPopup, TooltipScrollDismissArea, TooltipTrigger } from "./tooltip"; +function TimelineAction({ shared }: { shared: boolean }) { + if (shared) { + return ( + + }> + Timeline action + + + ); + } + return ( + + Timeline action + Description + + ); +} + it.each([ - { focus: "mouse", keptOpen: false }, - { focus: "keyboard", keptOpen: true }, -])("scrolling with a $focus-focused hovered trigger keeps it open: $keptOpen", async (c) => { - const onScroll = vi.fn(); + { shared: false, focus: "mouse", keptOpen: false }, + { shared: false, focus: "keyboard", keptOpen: true }, + { shared: true, focus: "mouse", keptOpen: false }, + { shared: true, focus: "keyboard", keptOpen: true }, +])( + "scrolling with a $focus-focused hovered trigger (shared: $shared) keeps it open: $keptOpen", + async (c) => { + const onScroll = vi.fn(); + await using screen = await render( + + +
+ , + ); + const trigger = screen.getByRole("button", { name: "Timeline action" }); + if (c.focus === "mouse") { + // A press closes the tooltip; hovering again reopens it with mouse focus kept. + await userEvent.click(trigger); + await userEvent.unhover(trigger); + } else { + await userEvent.keyboard("{Tab}"); + } + await userEvent.hover(trigger); + await expect.element(trigger).toHaveFocus(); + await expect.element(page.getByText("Description")).toBeVisible(); + + // One pixel keeps the pointer over the trigger, so only the scroll can close it. + screen.getByTestId("timeline").element().scrollTop = 1; + await vi.waitFor(() => expect(onScroll).toHaveBeenCalledOnce()); + + if (c.keptOpen) await expect.element(page.getByText("Description")).toBeVisible(); + else await expect.element(page.getByText("Description")).not.toBeInTheDocument(); + }, +); + +it("refreshes an open shared tooltip's label and links aria-describedby on focus", async () => { await using screen = await render( - - - Timeline action - Description - -
- , + + }> + Copy + + , ); - const trigger = screen.getByRole("button", { name: "Timeline action" }); - if (c.focus === "mouse") { - // A press closes the tooltip; hovering again reopens it with mouse focus kept. - await userEvent.click(trigger); - await userEvent.unhover(trigger); - } else { - await userEvent.keyboard("{Tab}"); - } - await userEvent.hover(trigger); + const trigger = screen.getByRole("button", { name: "Copy" }); + await userEvent.keyboard("{Tab}"); await expect.element(trigger).toHaveFocus(); - await expect.element(page.getByText("Description")).toBeVisible(); + const popup = page.getByText("Copy code"); + await expect.element(popup).toBeVisible(); + const popupId = trigger.element().getAttribute("aria-describedby"); + expect(popupId).toBeTruthy(); + expect(document.getElementById(popupId!)?.textContent).toBe("Copy code"); - screen.getByTestId("timeline").element().scrollTop = 20; - await vi.waitFor(() => expect(onScroll).toHaveBeenCalledOnce()); + await screen.rerender( + + }> + Copy + + , + ); + await expect.element(page.getByText("Copied")).toBeVisible(); + + await userEvent.keyboard("{Tab}"); + await vi.waitFor(() => expect(trigger.element().getAttribute("aria-describedby")).toBeNull()); +}); - if (c.keptOpen) await expect.element(page.getByText("Description")).toBeVisible(); - else await expect.element(page.getByText("Description")).not.toBeInTheDocument(); +it("refreshes a pending shared tooltip if its label changes during the open delay", async () => { + await using screen = await render( + + }> + Copy + + , + ); + const trigger = screen.getByRole("button", { name: "Copy" }); + await userEvent.hover(trigger); + await screen.rerender( + + }> + Copy + + , + ); + await expect.element(page.getByText("Copy code")).toBeVisible(); + expect(page.getByText("Copied").query()).toBeNull(); }); diff --git a/apps/web/src/components/ui/tooltip.tsx b/apps/web/src/components/ui/tooltip.tsx index 577aa48da87fa..e47a6b8d13afe 100644 --- a/apps/web/src/components/ui/tooltip.tsx +++ b/apps/web/src/components/ui/tooltip.tsx @@ -21,13 +21,13 @@ type TooltipActionsRef = RefObject; // The compiler freezes context values; update hovered tooltips through calls instead of shared ref writes. function createTooltipHoverTracker() { - let hovered: { trigger: HTMLElement; actionsRef: TooltipActionsRef } | null = null; + let hovered: { trigger: HTMLElement; owner: object; close: () => void } | null = null; return { - hover(trigger: HTMLElement, actionsRef: TooltipActionsRef) { - hovered = { trigger, actionsRef }; + hover(trigger: HTMLElement, owner: object, close: () => void) { + hovered = { trigger, owner, close }; }, - release(actionsRef: TooltipActionsRef) { - if (hovered?.actionsRef === actionsRef) hovered = null; + release(owner: object) { + if (hovered?.owner === owner) hovered = null; }, dismissUnfocused() { const tooltip = hovered; @@ -37,8 +37,7 @@ function createTooltipHoverTracker() { return; } hovered = null; - // Base UI also cancels delayed hover opens through this action. - tooltip.actionsRef.current?.close(); + tooltip.close(); }, }; } @@ -96,7 +95,8 @@ function TooltipTrigger(props: TooltipPrimitive.Trigger.Props) { {...props} onMouseEnter={(event) => { props.onMouseEnter?.(event); - tracker.hover(event.currentTarget, actionsRef); + // Base UI also cancels delayed hover opens through this action. + tracker.hover(event.currentTarget, actionsRef, () => actionsRef.current?.close()); }} /> ); @@ -161,4 +161,14 @@ function TooltipPopup({ ); } -export { TooltipProvider, Tooltip, TooltipTrigger, TooltipPopup, TooltipScrollDismissArea }; +/** The enclosing TooltipScrollDismissArea's tracker, for triggers that bypass TooltipTrigger. */ +const useTooltipScrollTracker = () => use(TooltipScrollContext); + +export { + TooltipProvider, + Tooltip, + TooltipTrigger, + TooltipPopup, + TooltipScrollDismissArea, + useTooltipScrollTracker, +}; diff --git a/apps/web/src/composer-editor-mentions.ts b/apps/web/src/composer-editor-mentions.ts index 7f3e93b821488..6608d3b2a0439 100644 --- a/apps/web/src/composer-editor-mentions.ts +++ b/apps/web/src/composer-editor-mentions.ts @@ -7,6 +7,7 @@ import { composerMathRanges, type ComposerInlineToken, } from "@t3tools/shared/composerInlineTokens"; +import { markdownMathRanges } from "~/markdown/wordsHast"; export type ComposerPromptSegment = | { @@ -89,7 +90,7 @@ function collectModelTokens(text: string, inlineTokens: ReadonlyArray !taken.some((range) => mention.start < range.end && mention.end > range.start), @@ -98,7 +99,7 @@ function collectModelTokens(text: string, inlineTokens: ReadonlyArray = []; for (const formula of formulas) { diff --git a/apps/web/src/i18n/translations/de.json b/apps/web/src/i18n/translations/de.json index c7095b8536469..92a2fa11cf7f2 100644 --- a/apps/web/src/i18n/translations/de.json +++ b/apps/web/src/i18n/translations/de.json @@ -3694,7 +3694,6 @@ "7c1923203049d602": "Code kopieren", "637817e4ff79c90e": "Aktionen für Codeblock", "ebf3a2b1e314aa5f": "Im Terminal ausführen", - "fe219642547fa0bf": "Im Terminal ausführen", "122a8512abc51180": "Details", "58c38c65c2783c5d": "Vollständiger Pfad", "f37e7d36b51c5b28": "Relativen Pfad kopieren", @@ -3706,10 +3705,6 @@ "4967584e8d0fb1c2": "Medienvorschau", "67589dd912eacb7c": "Im integrierten Browser öffnen", "a3c98d4c4b24cecb": "Dateioptionen für {label}", - "b4fe8a076e9fd2f8": "Abgesetzte Formel", - "085d1407e8c92cce": "Formel im Text", - "a2ef393fa7b48ae8": "Abgesetzte Formel scrollen", - "e94685ea5642e088": "Formel im Text scrollen", "3a04583c8500e23d": "Diagramm anzeigen", "16d64f650840fe06": "Code anzeigen", "6d329f7d3a50c7e7": "Tabelle kopieren", diff --git a/apps/web/src/i18n/translations/en.json b/apps/web/src/i18n/translations/en.json index 2ff8148bb7329..b174085c87c95 100644 --- a/apps/web/src/i18n/translations/en.json +++ b/apps/web/src/i18n/translations/en.json @@ -3693,7 +3693,6 @@ "7c1923203049d602": "Copy code", "637817e4ff79c90e": "Code block actions", "ebf3a2b1e314aa5f": "Run in terminal", - "fe219642547fa0bf": "Run in terminal", "122a8512abc51180": "Details", "58c38c65c2783c5d": "Full path", "f37e7d36b51c5b28": "Copy relative path", @@ -3705,10 +3704,6 @@ "4967584e8d0fb1c2": "Preview media", "67589dd912eacb7c": "Open in integrated browser", "a3c98d4c4b24cecb": "File options for {label}", - "b4fe8a076e9fd2f8": "Display equation", - "085d1407e8c92cce": "Inline equation", - "a2ef393fa7b48ae8": "Scroll display equation", - "e94685ea5642e088": "Scroll inline equation", "3a04583c8500e23d": "Show diagram", "16d64f650840fe06": "Show code", "6d329f7d3a50c7e7": "Copy table", diff --git a/apps/web/src/i18n/translations/es.json b/apps/web/src/i18n/translations/es.json index 78c68c4c0dc2f..b12f6e7f0dc32 100644 --- a/apps/web/src/i18n/translations/es.json +++ b/apps/web/src/i18n/translations/es.json @@ -3693,7 +3693,6 @@ "7c1923203049d602": "Copiar código", "637817e4ff79c90e": "Acciones del bloque de código", "ebf3a2b1e314aa5f": "Ejecutar en la terminal", - "fe219642547fa0bf": "Ejecutar en la terminal", "122a8512abc51180": "Detalles", "58c38c65c2783c5d": "Ruta completa", "f37e7d36b51c5b28": "Copiar ruta relativa", @@ -3705,10 +3704,6 @@ "4967584e8d0fb1c2": "Vista previa del contenido", "67589dd912eacb7c": "Abrir en el navegador integrado", "a3c98d4c4b24cecb": "Opciones de archivo de {label}", - "b4fe8a076e9fd2f8": "Ecuación en bloque", - "085d1407e8c92cce": "Ecuación en línea", - "a2ef393fa7b48ae8": "Desplazar la ecuación en bloque", - "e94685ea5642e088": "Desplazar la ecuación en línea", "3a04583c8500e23d": "Mostrar diagrama", "16d64f650840fe06": "Mostrar código", "6d329f7d3a50c7e7": "Copiar tabla", diff --git a/apps/web/src/i18n/translations/fr.json b/apps/web/src/i18n/translations/fr.json index 873767a296ba5..c5f7562a38e7d 100644 --- a/apps/web/src/i18n/translations/fr.json +++ b/apps/web/src/i18n/translations/fr.json @@ -3693,7 +3693,6 @@ "7c1923203049d602": "Copier le code", "637817e4ff79c90e": "Actions du bloc de code", "ebf3a2b1e314aa5f": "Exécuter dans le terminal", - "fe219642547fa0bf": "Exécuter dans le terminal", "122a8512abc51180": "Détails", "58c38c65c2783c5d": "Chemin complet", "f37e7d36b51c5b28": "Copier le chemin relatif", @@ -3705,10 +3704,6 @@ "4967584e8d0fb1c2": "Aperçu du média", "67589dd912eacb7c": "Ouvrir dans le navigateur intégré", "a3c98d4c4b24cecb": "Options du fichier {label}", - "b4fe8a076e9fd2f8": "Équation en bloc", - "085d1407e8c92cce": "Équation en ligne", - "a2ef393fa7b48ae8": "Faire défiler l’équation en bloc", - "e94685ea5642e088": "Faire défiler l’équation en ligne", "3a04583c8500e23d": "Afficher le diagramme", "16d64f650840fe06": "Afficher le code", "6d329f7d3a50c7e7": "Copier le tableau", diff --git a/apps/web/src/i18n/translations/ja.json b/apps/web/src/i18n/translations/ja.json index 69ac82ad8a247..a0a71c4814184 100644 --- a/apps/web/src/i18n/translations/ja.json +++ b/apps/web/src/i18n/translations/ja.json @@ -3688,7 +3688,6 @@ "7c1923203049d602": "コードをコピー", "637817e4ff79c90e": "コードブロックの操作", "ebf3a2b1e314aa5f": "ターミナルで実行", - "fe219642547fa0bf": "ターミナルで実行", "122a8512abc51180": "詳細", "58c38c65c2783c5d": "フルパス", "f37e7d36b51c5b28": "相対パスをコピー", @@ -3700,10 +3699,6 @@ "4967584e8d0fb1c2": "メディアをプレビュー", "67589dd912eacb7c": "統合ブラウザーで開く", "a3c98d4c4b24cecb": "{label} のファイルオプション", - "b4fe8a076e9fd2f8": "ディスプレイ数式", - "085d1407e8c92cce": "インライン数式", - "a2ef393fa7b48ae8": "ディスプレイ数式をスクロール", - "e94685ea5642e088": "インライン数式をスクロール", "3a04583c8500e23d": "図を表示", "16d64f650840fe06": "コードを表示", "6d329f7d3a50c7e7": "表をコピー", diff --git a/apps/web/src/i18n/translations/ko.json b/apps/web/src/i18n/translations/ko.json index 10782b2ca6166..ba0da8c82495a 100644 --- a/apps/web/src/i18n/translations/ko.json +++ b/apps/web/src/i18n/translations/ko.json @@ -3688,7 +3688,6 @@ "7c1923203049d602": "코드 복사", "637817e4ff79c90e": "코드 블록 작업", "ebf3a2b1e314aa5f": "터미널에서 실행", - "fe219642547fa0bf": "터미널에서 실행", "122a8512abc51180": "세부 정보", "58c38c65c2783c5d": "전체 경로", "f37e7d36b51c5b28": "상대 경로 복사", @@ -3700,10 +3699,6 @@ "4967584e8d0fb1c2": "미디어 미리 보기", "67589dd912eacb7c": "통합 브라우저에서 열기", "a3c98d4c4b24cecb": "{label} 파일 옵션", - "b4fe8a076e9fd2f8": "블록 수식", - "085d1407e8c92cce": "인라인 수식", - "a2ef393fa7b48ae8": "블록 수식 스크롤", - "e94685ea5642e088": "인라인 수식 스크롤", "3a04583c8500e23d": "다이어그램 표시", "16d64f650840fe06": "코드 표시", "6d329f7d3a50c7e7": "표 복사", diff --git a/apps/web/src/i18n/translations/pt-BR.json b/apps/web/src/i18n/translations/pt-BR.json index 5b2b9e2b9b381..66d4f0b457e35 100644 --- a/apps/web/src/i18n/translations/pt-BR.json +++ b/apps/web/src/i18n/translations/pt-BR.json @@ -3693,7 +3693,6 @@ "7c1923203049d602": "Copiar código", "637817e4ff79c90e": "Ações do bloco de código", "ebf3a2b1e314aa5f": "Executar no terminal", - "fe219642547fa0bf": "Executar no terminal", "122a8512abc51180": "Detalhes", "58c38c65c2783c5d": "Caminho completo", "f37e7d36b51c5b28": "Copiar caminho relativo", @@ -3705,10 +3704,6 @@ "4967584e8d0fb1c2": "Pré-visualizar mídia", "67589dd912eacb7c": "Abrir no navegador integrado", "a3c98d4c4b24cecb": "Opções do arquivo {label}", - "b4fe8a076e9fd2f8": "Equação em destaque", - "085d1407e8c92cce": "Equação em linha", - "a2ef393fa7b48ae8": "Rolar a equação em destaque", - "e94685ea5642e088": "Rolar a equação em linha", "3a04583c8500e23d": "Mostrar diagrama", "16d64f650840fe06": "Mostrar código", "6d329f7d3a50c7e7": "Copiar tabela", diff --git a/apps/web/src/i18n/translations/ru.json b/apps/web/src/i18n/translations/ru.json index 0ecadaba9ded1..879d2684c207f 100644 --- a/apps/web/src/i18n/translations/ru.json +++ b/apps/web/src/i18n/translations/ru.json @@ -3693,7 +3693,6 @@ "7c1923203049d602": "Копировать код", "637817e4ff79c90e": "Действия с блоком кода", "ebf3a2b1e314aa5f": "Выполнить в терминале", - "fe219642547fa0bf": "Выполнить в терминале", "122a8512abc51180": "Подробности", "58c38c65c2783c5d": "Полный путь", "f37e7d36b51c5b28": "Копировать относительный путь", @@ -3705,10 +3704,6 @@ "4967584e8d0fb1c2": "Предпросмотр медиа", "67589dd912eacb7c": "Открыть во встроенном браузере", "a3c98d4c4b24cecb": "Параметры файла {label}", - "b4fe8a076e9fd2f8": "Формула в отдельной строке", - "085d1407e8c92cce": "Формула в строке", - "a2ef393fa7b48ae8": "Прокрутить формулу", - "e94685ea5642e088": "Прокрутить формулу в строке", "3a04583c8500e23d": "Показать диаграмму", "16d64f650840fe06": "Показать код", "6d329f7d3a50c7e7": "Копировать таблицу", diff --git a/apps/web/src/i18n/translations/sv.json b/apps/web/src/i18n/translations/sv.json index 1c01b1112768f..3de08f6ce6252 100644 --- a/apps/web/src/i18n/translations/sv.json +++ b/apps/web/src/i18n/translations/sv.json @@ -3693,7 +3693,6 @@ "7c1923203049d602": "Kopiera kod", "637817e4ff79c90e": "Åtgärder för kodblock", "ebf3a2b1e314aa5f": "Kör i terminalen", - "fe219642547fa0bf": "Kör i terminalen", "122a8512abc51180": "Detaljer", "58c38c65c2783c5d": "Fullständig sökväg", "f37e7d36b51c5b28": "Kopiera relativ sökväg", @@ -3705,10 +3704,6 @@ "4967584e8d0fb1c2": "Förhandsvisa media", "67589dd912eacb7c": "Öppna i den integrerade webbläsaren", "a3c98d4c4b24cecb": "Filalternativ för {label}", - "b4fe8a076e9fd2f8": "Fristående ekvation", - "085d1407e8c92cce": "Ekvation i texten", - "a2ef393fa7b48ae8": "Rulla fristående ekvation", - "e94685ea5642e088": "Rulla ekvation i texten", "3a04583c8500e23d": "Visa diagram", "16d64f650840fe06": "Visa kod", "6d329f7d3a50c7e7": "Kopiera tabell", diff --git a/apps/web/src/i18n/translations/zh.json b/apps/web/src/i18n/translations/zh.json index 43790340d1167..0193a3db09720 100644 --- a/apps/web/src/i18n/translations/zh.json +++ b/apps/web/src/i18n/translations/zh.json @@ -3698,7 +3698,6 @@ "7c1923203049d602": "复制代码", "637817e4ff79c90e": "代码块操作", "ebf3a2b1e314aa5f": "在终端中运行", - "fe219642547fa0bf": "在终端中运行", "122a8512abc51180": "详情", "58c38c65c2783c5d": "完整路径", "f37e7d36b51c5b28": "复制相对路径", @@ -3710,10 +3709,6 @@ "4967584e8d0fb1c2": "预览媒体", "67589dd912eacb7c": "在内置浏览器中打开", "a3c98d4c4b24cecb": "{label} 的文件选项", - "b4fe8a076e9fd2f8": "独立公式", - "085d1407e8c92cce": "行内公式", - "a2ef393fa7b48ae8": "滚动查看独立公式", - "e94685ea5642e088": "滚动查看行内公式", "3a04583c8500e23d": "显示图表", "16d64f650840fe06": "显示代码", "6d329f7d3a50c7e7": "复制表格", diff --git a/apps/web/src/index.css b/apps/web/src/index.css index 4ba107059f2b7..2b19b90cc28e3 100644 --- a/apps/web/src/index.css +++ b/apps/web/src/index.css @@ -1887,10 +1887,6 @@ code { margin: 0.65rem 0; } -.chat-markdown-math-display .katex-display { - margin: 0; -} - :is(.chat-markdown, .composer-tiptap) h1, :is(.chat-markdown, .composer-tiptap) h2, :is(.chat-markdown, .composer-tiptap) h3, @@ -2312,6 +2308,15 @@ code { overflow-wrap: break-word; } +.chat-markdown [data-markdown-math] { + font-weight: normal; + font-style: normal; +} + +.chat-markdown [data-markdown-math] > svg { + font-size: 1.21em; +} + /* Formula cells keep their natural width and scroll with the table. */ .chat-markdown :is(th, td):has([data-markdown-math]) { max-width: none; diff --git a/apps/web/src/markdown-clipboard.test.ts b/apps/web/src/markdown-clipboard.test.ts index 1b0aa804a8437..7a50785c726c7 100644 --- a/apps/web/src/markdown-clipboard.test.ts +++ b/apps/web/src/markdown-clipboard.test.ts @@ -11,19 +11,27 @@ import { collectAssistantCitations, serializeAssistantCitation, } from "@t3tools/shared/assistantCitations"; -import { markdownMathRanges, parseMarkdownWithMath } from "@t3tools/shared/markdownMath"; +import type { Element as HastElement, ElementContent, Root } from "hast"; -import { unified } from "unified"; -import remarkParse from "remark-parse"; -import { - CHAT_MARKDOWN_REMARK_PLUGINS, - CHAT_USER_MARKDOWN_REMARK_PLUGINS, -} from "@t3tools/shared/markdownPipeline"; +import { markdownTree } from "./markdown/wordsHast"; -const userMarkdown = unified() - .use(remarkParse) - .use(CHAT_MARKDOWN_REMARK_PLUGINS) - .use(CHAT_USER_MARKDOWN_REMARK_PLUGINS); +// Copied Markdown read back as the chat reads it, to check it says what was copied. +const elementsOf = (node: Root | HastElement) => + (node.children as ElementContent[]).filter( + (child): child is HastElement => child.type === "element", + ); +const textOf = (node: ElementContent): string => + node.type === "text" + ? node.value + : node.type === "element" + ? node.children.map(textOf).join("") + : ""; +const readBack = (markdown: string, options?: Parameters[1]) => + elementsOf(markdownTree(markdown, options))[0]!; +// A user message's reading: a single `~` stays text. +const readUserBack = (markdown: string) => readBack(markdown, { singleTilde: false }); +const inline = (node: ElementContent) => + node.type === "element" ? [node.tagName, textOf(node)] : [node.type, textOf(node)]; const TEXT_NODE = 3; const ELEMENT_NODE = 1; @@ -223,10 +231,10 @@ describe("serializeRenderedMarkdownFragment", () => { new FakeText(" here."), ), ); - const paragraph = parseMarkdownWithMath(serializeRenderedMarkdownFragment(asNode(container))) - .children[0]; - if (paragraph?.type !== "paragraph") throw new Error("Expected a paragraph"); - expect(paragraph.children.find((child) => child.type === "inlineCode")?.value).toBe(value); + const paragraph = readBack(serializeRenderedMarkdownFragment(asNode(container))); + const code = elementsOf(paragraph).find((child) => child.tagName === "code"); + expect(paragraph.tagName).toBe("p"); + expect(code && textOf(code)).toBe(value); }); it.each([ @@ -238,28 +246,24 @@ describe("serializeRenderedMarkdownFragment", () => { String.raw`before\ after\ end`, ])("copies prose that parses back unchanged: %s", (value) => { const container = new FakeElement("DIV").append(new FakeText(value)); - const paragraph = userMarkdown.parse(serializeRenderedMarkdownFragment(asNode(container))) - .children[0]; - expect(paragraph).toMatchObject({ type: "paragraph", children: [{ type: "text", value }] }); + const paragraph = readUserBack(serializeRenderedMarkdownFragment(asNode(container))); + expect(paragraph.tagName).toBe("p"); + expect(paragraph.children.map(inline)).toEqual([["text", value]]); }); it.each([ - ["*", "EM", "word", "emphasis"], - ["\\", "CODE", "value", "inlineCode"], - ])("keeps a text edge %j beside %s", (edge, tag, value, type) => { + ["*", "EM", "word"], + ["\\", "CODE", "value"], + ])("keeps a text edge %j beside %s", (edge, tag, value) => { const container = new FakeElement("DIV").append( new FakeText(edge), new FakeElement(tag).append(new FakeText(value)), ); - const paragraph = userMarkdown.parse(serializeRenderedMarkdownFragment(asNode(container))) - .children[0]; - expect(paragraph).toMatchObject({ - type: "paragraph", - children: [ - { type: "text", value: edge }, - type === "inlineCode" ? { type, value } : { type, children: [{ type: "text", value }] }, - ], - }); + const paragraph = readUserBack(serializeRenderedMarkdownFragment(asNode(container))); + expect(paragraph.children.map(inline)).toEqual([ + ["text", edge], + [tag.toLowerCase(), value], + ]); }); it("copies email links with their address and drops in-app destinations", () => { @@ -288,10 +292,10 @@ describe("serializeRenderedMarkdownFragment", () => { expect(copied).toBe( "Write to support@example.com, [Support](mailto:support@example.com?subject=Help), [Support](mailto:support@example.com?subject=Help\\)) or the thread.", ); - const paragraph = parseMarkdownWithMath(copied).children[0]; - if (paragraph?.type !== "paragraph") throw new Error("Expected a paragraph"); expect( - paragraph.children.filter((child) => child.type === "link").map((link) => link.url), + elementsOf(readBack(copied)) + .filter((child) => child.tagName === "a") + .map((link) => link.properties.href), ).toEqual([ "mailto:support@example.com", "mailto:support@example.com?subject=Help", @@ -312,12 +316,14 @@ describe("serializeRenderedMarkdownFragment", () => { ])("keeps the link label and destination: %s", (label, href) => { const anchor = new FakeElement("A", [], { href }).append(new FakeText(label)); const container = new FakeElement("DIV").append(anchor); - const paragraph = userMarkdown.parse(serializeRenderedMarkdownFragment(asNode(container))) - .children[0]; - if (paragraph?.type !== "paragraph") throw new Error("Expected a paragraph"); - expect(paragraph.children).toMatchObject([ - { type: "link", url: href, children: [{ type: "text", value: label }] }, - ]); + const paragraph = readUserBack(serializeRenderedMarkdownFragment(asNode(container))); + expect( + paragraph.children.map((child) => + child.type === "element" + ? [child.tagName, decodeURI(String(child.properties.href)), textOf(child)] + : [child.type, textOf(child)], + ), + ).toEqual([["a", href, label]]); }); it("copies alert and insight callouts as their Markdown instead of the rendered label", () => { @@ -484,31 +490,25 @@ describe("copying rendered Markdown tables", () => { ); const markdown = serializeTableElementToMarkdown(table as unknown as Element); - const tree = parseMarkdownWithMath(markdown); - const parsed = tree.children[0]; - if (parsed?.type !== "table") throw new Error("Expected a table"); - expect(parsed.children.map((row) => row.children.length)).toEqual([2, 2, 2, 2, 2]); - expect(markdownMathRanges(markdown, tree).map((formula) => formula.tex)).toEqual([ - "|x|", - "\\|x\\|", - "|y|", - "|z|", - ]); - expect(parsed.children[1]?.children[1]?.children).toMatchObject([ - { type: "text", value: "*a* | ~~b~~" }, - ]); - expect(parsed.children[4]?.children[1]?.children).toMatchObject([ - { type: "text", value: "> c | d" }, - ]); - const [, , codeRow, linkRow] = parsed.children; - expect(codeRow?.children[1]?.children[0]).toMatchObject({ - type: "inlineCode", - value: "\\(c|d\\)", - }); - expect(linkRow?.children[0]?.children[0]).toMatchObject({ - type: "link", - url: "https://example.com/?q=a|b", - }); + const parsed = readBack(markdown, { math: true }); + expect(parsed.tagName).toBe("table"); + const rows = elementsOf(parsed).flatMap((section) => elementsOf(section)); + const cells = rows.map((row) => elementsOf(row)); + expect(cells.map((row) => row.length)).toEqual([2, 2, 2, 2, 2]); + const formulas: string[] = []; + const visit = (node: HastElement) => { + if (node.tagName === "svg") formulas.push(String(node.properties.ariaLabel)); + else elementsOf(node).forEach(visit); + }; + visit(parsed); + expect(formulas).toEqual(["|x|", "\\|x\\|", "|y|", "|z|"]); + expect(textOf(cells[1]![1]!)).toBe("*a* | ~~b~~"); + expect(textOf(cells[4]![1]!).trim()).toBe("> c | d"); + expect(inline(cells[2]![1]!.children[0]!)).toEqual(["code", "\\(c|d\\)"]); + const link = cells[3]![0]!.children[0]!; + expect(link.type === "element" && decodeURI(String(link.properties.href))).toBe( + "https://example.com/?q=a|b", + ); }); it("copies code and diagrams in cells without markers or unescaped pipes", () => { diff --git a/apps/web/src/markdown-clipboard.ts b/apps/web/src/markdown-clipboard.ts index 7421dbadd4bae..39ef90b2ec19a 100644 --- a/apps/web/src/markdown-clipboard.ts +++ b/apps/web/src/markdown-clipboard.ts @@ -1,4 +1,4 @@ -import { UNFINISHED_DRIVE_PATH } from "@t3tools/shared/markdownWindowsPaths"; +import { UNFINISHED_DRIVE_PATH } from "@t3tools/shared/markdownLinks"; const SKIPPED_TAGS = new Set(["BUTTON", "INPUT", "SCRIPT", "STYLE", "TEMPLATE"]); const SKIPPED_CLASS_NAMES = ["select-none", "sr-only"]; @@ -428,7 +428,7 @@ export function serializeTableElementToMarkdown(table: Element): string { return serializeTable(table).replaceAll(CODE_BOUNDARY, "").trim(); } -// The wrapper MarkdownMath puts on every formula it renders. The sanitizer drops +// The wrapper wordsHast puts on every formula it renders. The sanitizer drops // the attribute from authored HTML. const MATH_SELECTOR = "[data-markdown-math]"; diff --git a/apps/web/src/markdown-incremental.test.tsx b/apps/web/src/markdown-incremental.test.tsx deleted file mode 100644 index 3682deb281fa9..0000000000000 --- a/apps/web/src/markdown-incremental.test.tsx +++ /dev/null @@ -1,135 +0,0 @@ -import { CHAT_MARKDOWN_REHYPE_PLUGINS } from "@t3tools/shared/markdownPipeline"; -import type { Root } from "mdast"; -import { renderToStaticMarkup } from "react-dom/server"; -import ReactMarkdown from "react-markdown"; -import remarkGfm from "remark-gfm"; -import type { Plugin } from "unified"; -import { describe, expect, it } from "vite-plus/test"; - -import { remarkCodexDirectives } from "@t3tools/shared/codexMarkdownDirectives"; -import { remarkGithubAlerts } from "@t3tools/shared/markdownGithubAlerts"; -import { createIncrementalMarkdownPlugin } from "./markdown-incremental"; -import { remarkNormalizeListItemIndentation } from "@t3tools/shared/markdownListIndentation"; - -function render(source: string, incremental?: Plugin<[], Root>, parsedSources?: string[]) { - let tree: Root | undefined; - const observeParsing: Plugin<[], Root> = function () { - const original = this.parser; - if (original) { - this.parser = (text, file) => { - parsedSources?.push(text); - return original(text, file); - }; - } - }; - const capture: Plugin<[], Root> = () => (root) => { - tree = structuredClone(root); - }; - const html = renderToStaticMarkup( - - {source} - , - ); - return { html, tree }; -} - -const prefix = "# Before\n\n```ts\nconst values = [1, 2];\n```\n\n"; - -describe("incremental Markdown parsing", () => { - it("keeps the document prefix cached when list recovery parses contain fences", () => { - const source = - prefix + - "- first block\n\n ```ts\n const nested = 1;\n ```\n\n tail"; - const incremental = createIncrementalMarkdownPlugin(); - const parsedSources: string[] = []; - expect(render(source, incremental, parsedSources)).toEqual(render(source)); - parsedSources.length = 0; - const next = source + " more"; - expect(render(next, incremental, parsedSources)).toEqual(render(next)); - expect(parsedSources).not.toContain(next); - expect(parsedSources.some((text) => text.startsWith("t3-markdown-inline-prefix:"))).toBe(true); - }); - - it.each([ - "a\n===\n\nb\n---\n", - "- first\n\n continued\n\n- next\n", - "> quoted\n>\n> ```js\n> abc\n> ```\n\nend", - "
\nhello\n\n
\n\nend", - "[ref]\n\n[ref]: /later", - "a[^x]\n\n[^x]: note", - "a | b\n--|--\na | b\n", - "```\na\n```\n\nnext\n\n~~~\nb\n~~~\n\nmore", - "\n\n\tcode\n\nmore", - "text *bold*", - "> [!NOTE]\n> alert\n\n- [ ] task", - "\uFEFFtext after a byte-order mark", - ])("preserves the parse tree, positions, and HTML while streaming %j", (tail) => { - const source = prefix + tail; - const incremental = createIncrementalMarkdownPlugin(); - for (let end = 0; end <= source.length; end++) { - const text = source.slice(0, end); - expect(render(text, incremental), `prefix ${end}`).toEqual(render(text)); - } - }); - - it.each(["\r\n", "\r"])("preserves partial %j line endings", (newline) => { - const source = (prefix + "next\n\n```\nlast\n```\n\nend").replaceAll("\n", newline); - const incremental = createIncrementalMarkdownPlugin(); - for (let end = 0; end <= source.length; end++) { - const text = source.slice(0, end); - expect(render(text, incremental)).toEqual(render(text)); - } - }); - - it("updates earlier references when definitions arrive after the cached prefix", () => { - const before = "[later] and footnote[^note]\n\n" + prefix; - const incremental = createIncrementalMarkdownPlugin(); - for (const tail of ["text", "[later]: /target", "[later]: /target\n\n[^note]: a note"]) { - expect(render(before + tail, incremental)).toEqual(render(before + tail)); - } - }); - - it("handles edits, replacements, and repeated renders without leaking transformed nodes", () => { - const incremental = createIncrementalMarkdownPlugin(); - const documents = [ - prefix + "- first\n - second", - prefix + "> [!NOTE]\n> transformed alert", - prefix + "plain text", - "replacement without fences", - prefix.replace("Before", "Edited") + "edited prefix", - prefix + "plain text", - prefix + "plain text", - ]; - for (const document of documents) { - expect(render(document, incremental)).toEqual(render(document)); - } - }); - - it("does not freeze unclosed, nested, indented, or mismatched fences", () => { - const prefixes = [ - "```\nopen\n\n", - "````\n```\n\n", - "> ```\n> code\n> ```\n\n", - "- ```\n code\n ```\n\n", - " ```\n code\n ```\n\n", - " $y$', + { ...ASSISTANT, math: true }, + ), + ); + expect(html).not.toMatch(/onload|javascript|position| ReadonlyArray) | null; + }; + /** Expand GitHub `:alias:` emoji shortcodes in prose outside code. */ + readonly githubEmoji?: boolean; +} + +export interface WordsHastOptions { + /** `$…$`, `$$…$$` and `math` code blocks render as SVG. */ + readonly math: boolean; + /** Soft line breaks render as `
`, as remark-breaks does. */ + readonly breaks: boolean; + /** Raw HTML shows as the text it was written as. */ + readonly escapeHtml: boolean; + /** `★ Insight ───` blocks render as insight callouts. */ + readonly insights: boolean; + readonly extensions: MarkdownExtensions; +} + +const CODEX_DIRECTIVES = ["codex-file-citation", "codex-followup", "artifact-template"]; + +const VOID = new Set("area base br col embed hr img input link meta source track wbr".split(" ")); + +const TAG = + /<(\/?)([a-zA-Z][\w:-]*)((?:\s+[^\s"'>/=]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'=<>`]+))?)*)\s*(\/?)>|)|]*>|<\?[\s\S]*?\?>/g; +const ATTRIBUTE = /([^\s"'>/=]+)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'=<>`]+)))?/g; + +// Start tags an HTML parser closes an open `

` for, and the elements that scope that search. +const CLOSES_PARAGRAPH = new Set( + "address article aside blockquote center details dialog dir div dl fieldset figcaption figure footer form h1 h2 h3 h4 h5 h6 header hgroup hr li listing main menu nav ol p plaintext pre search section summary table ul xmp dd dt".split( + " ", + ), +); +const PARAGRAPH_SCOPE = new Set([ + "applet", + "caption", + "table", + "td", + "th", + "marquee", + "object", + "template", + "button", +]); + +type RenderOptions = Omit; + +const decoder = new TextDecoder(); +const encoder = new TextEncoder(); + +function renderToHtml(markdown: string, options: RenderOptions): Uint8Array { + try { + return wordsRenderToHtml(markdown, options); + } catch { + return encoder.encode( + `

${markdown.replaceAll("&", "&").replaceAll("<", "<").replaceAll("\n", "
")}

`, + ); + } +} + +const decode = (value: string) => (value.includes("&") ? decodeHTML(value) : value); + +function properties(source: string | undefined, inSvg: boolean): Element["properties"] { + const result: Element["properties"] = {}; + if (!source) return result; + for (const match of source.matchAll(ATTRIBUTE)) { + const name = match[1]!; + const info = find(inSvg ? svgSchema : htmlSchema, inSvg ? name : name.toLowerCase()); + const raw = match[2] ?? match[3] ?? match[4]; + if (raw === undefined) { + result[info.property] = info.boolean || info.overloadedBoolean ? true : ""; + continue; + } + // Attribute values decode as attributes: `©=` in a query stays as written. + const value = raw.includes("&") ? decodeHTMLAttribute(raw) : raw; + result[info.property] = + info.spaceSeparated || info.commaSeparated + ? value.split(info.commaSeparated ? "," : /\s+/).filter(Boolean) + : info.boolean + ? true + : value; + } + return result; +} + +interface Tokenized { + readonly root: Root; + /** Elements with a `data-sourcepos`, which raw HTML can write too. */ + readonly positioned: Element[]; +} + +/** + * Hast for Words' HTML. Its own markup is well formed; raw HTML closes where its end tags say, + * and is sanitized afterwards, so a misnested tag can only change structure, never safety. + */ +function tokenize(html: string, offsetOf: (byte: number) => number): Tokenized { + const root: Root = { type: "root", children: [] }; + const positioned: Element[] = []; + const stack: Array = [root]; + let svgDepth = 0; + let last = 0; + // rehypePreserveBareAnchorPlaceholders: an `
` with no attributes that never closes is text. + const anchors: Array<{ element: Element; parent: Root | Element; tag: string } | null> = []; + const text = (end: number) => { + if (end <= last) return; + const parent = stack.at(-1)!; + const value = decode(html.slice(last, end)); + const previous = parent.children.at(-1); + if (previous?.type === "text") previous.value += value; + else parent.children.push({ type: "text", value } as Text); + }; + for (const match of html.matchAll(TAG)) { + text(match.index); + last = match.index + match[0].length; + const tagName = match[2]?.toLowerCase(); + if (!tagName) continue; + if (match[1]) { + if (tagName === "a") anchors.pop(); + if (tagName === "p" && openParagraph(stack) < 0) { + // A stray `

` is an empty paragraph to an HTML parser. + (stack.at(-1)!.children as ElementContent[]).push({ + type: "element", + tagName: "p", + properties: {}, + children: [], + }); + continue; + } + const at = stack.findLastIndex((node) => node.type === "element" && node.tagName === tagName); + if (at > 0) { + for (let index = at; index < stack.length; index++) { + if ((stack[index] as Element).tagName === "svg") svgDepth--; + } + stack.length = at; + } + continue; + } + const inSvg = svgDepth > 0 || tagName === "svg"; + if (!inSvg && CLOSES_PARAGRAPH.has(tagName)) { + const paragraph = openParagraph(stack); + if (paragraph > 0) stack.length = paragraph; + } + const element: Element = { + type: "element", + tagName: inSvg ? match[2]! : tagName, + properties: properties(match[3], inSvg), + children: [], + }; + const sourcepos = element.properties.dataSourcepos; + if (typeof sourcepos === "string") { + delete element.properties.dataSourcepos; + const [start, end] = sourcepos.split("-").map((byte) => offsetOf(Number(byte))); + element.position = { + start: { line: 1, column: start! + 1, offset: start! }, + end: { line: 1, column: end! + 1, offset: end! }, + }; + positioned.push(element); + } + const parent = stack.at(-1)!; + (parent.children as ElementContent[]).push(element); + if (tagName === "a") { + anchors.push(match[3]?.trim() ? null : { element, parent, tag: match[0] }); + } + // The HTML parser ignores `/>` on elements that are not void, such as `
`. + if (!VOID.has(tagName) && (!match[4] || !inSvg)) { + stack.push(element); + if (tagName === "svg") svgDepth++; + } + } + text(html.length); + for (const anchor of anchors) { + if (!anchor) continue; + const siblings = anchor.parent.children as ElementContent[]; + const at = siblings.indexOf(anchor.element); + if (at >= 0) + siblings.splice(at, 1, { type: "text", value: anchor.tag }, ...anchor.element.children); + } + normalizeRawTables(root); + // Words ends each block with a newline; hast from remark has none after the last. + const end = root.children.at(-1); + if (end?.type === "text") { + end.value = end.value.replace(/\n$/, ""); + if (end.value.trim() === "") root.children.pop(); + } + return { root, positioned }; +} + +const positionKey = (node: Element) => + `${node.tagName.toLowerCase()}:${node.position!.start.offset}-${node.position!.end.offset}`; + +/** + * Words' HTML for `markdown` as hast. A position marks what Words generated, so raw HTML that + * writes its own `data-sourcepos` keeps none: Words' elements are those it also writes with raw + * HTML escaped, and a range claimed more often than that is trusted for none of its claimants. + */ +function parse(markdown: string, options: RenderOptions): Root { + const offsetOf = utf16Offsets(markdown); + const render = (escapeHtml?: true) => + tokenize( + decoder.decode( + renderToHtml(markdown, { + ...options, + ...(escapeHtml ? { escapeHtml } : {}), + sourcePositions: true, + }), + ), + offsetOf, + ); + const { root, positioned } = render(); + if (options.escapeHtml || options.skipHtml || !/data-sourcepos/i.test(markdown)) return root; + const generated = new Map(); + for (const node of render(true).positioned) { + const key = positionKey(node); + generated.set(key, (generated.get(key) ?? 0) + 1); + } + const claimed = new Map(); + for (const node of positioned) { + const key = positionKey(node); + claimed.set(key, (claimed.get(key) ?? 0) + 1); + } + for (const node of positioned) { + const key = positionKey(node); + if (claimed.get(key)! > (generated.get(key) ?? 0)) delete node.position; + } + return root; +} + +/** The stack index of the `

` an HTML parser would close, or -1 when none is in scope. */ +function openParagraph(stack: ReadonlyArray): number { + for (let index = stack.length - 1; index > 0; index--) { + const tagName = (stack[index] as Element).tagName; + if (tagName === "p") return index; + if (PARAGRAPH_SCOPE.has(tagName)) return -1; + } + return -1; +} + +/** parse5 puts a raw HTML table's rows in a ``; Words' own tables start with ``. */ +function normalizeRawTables(node: Root | Element) { + for (const child of node.children) { + if (child.type === "element") normalizeRawTables(child); + } + if (node.type !== "element" || node.tagName !== "table") return; + const first = node.children.findIndex((child) => isElement(child, "tr")); + if (first < 0) return; + node.children = [ + ...node.children.slice(0, first), + { type: "element", tagName: "tbody", properties: {}, children: node.children.slice(first) }, + ]; +} + +// Words leaves these raw in Markdown destinations, where micromark percent-encodes them. +const UNSAFE_URL_CHARACTERS = /[\\[\]`{}|^"<> ]/g; +const normalizeUri = (value: string) => + value.replace(UNSAFE_URL_CHARACTERS, (character) => encodeURIComponent(character)); + +const windowsPath = (url: string) => { + const path = url.replace(/%5C/gi, "\\"); + return /^[A-Za-z]:[\\/]/.test(path) ? path : undefined; +}; + +const isElement = (node: unknown, tagName?: string): node is Element => + (node as Element | undefined)?.type === "element" && + (tagName === undefined || (node as Element).tagName === tagName); + +const isElementNode = (node: ElementContent): node is Element => node.type === "element"; + +const isMarkdownImage = (node: unknown): boolean => + (isElement(node, "img") && node.position !== undefined) || + (isElement(node, "a") && + node.position !== undefined && + node.children.length === 1 && + isMarkdownImage(node.children[0])); + +const BREAK: ElementContent = { type: "element", tagName: "br", properties: {}, children: [] }; + +// Words' math: these elements and presentation attributes, and no links or handlers. +const MATH_ELEMENTS = new Set(["svg", "g", "text", "tspan", "rect", "path"]); +const MATH_PROPERTIES = new Set([ + "xmlns", + "width", + "height", + "viewBox", + "fill", + "fontFamily", + "fontSize", + "fontStyle", + "fontWeight", + "role", + "ariaLabel", + "x", + "y", + "dx", + "dy", + "d", + "transform", + "stroke", + "strokeWidth", + "textAnchor", +]); +const MATH_STYLE = /^(?:display|vertical-align|overflow|margin|white-space)$/; + +function sanitizeMath(node: Element): Element | null { + if (!MATH_ELEMENTS.has(node.tagName)) return null; + const properties: Element["properties"] = {}; + for (const [key, value] of Object.entries(node.properties)) { + if (MATH_PROPERTIES.has(key)) properties[key] = value; + } + if (typeof node.properties.style === "string") { + const style = node.properties.style + .split(";") + .filter((rule) => MATH_STYLE.test(rule.split(":")[0]!.trim())) + .join(";"); + if (style) properties.style = style; + } + const children: ElementContent[] = []; + for (const child of node.children) { + if (child.type === "text") children.push(child); + else if (child.type === "element") { + const clean = sanitizeMath(child); + if (clean) children.push(clean); + } + } + return { ...node, properties, children }; +} + +interface Walk { + /** Words' hast for more Markdown, rendered with the same options; `indent` as leadingWhitespace's. */ + readonly render: (markdown: string, indent: number) => Root; + readonly source: string; + readonly options: WordsHastOptions; + readonly math: Map; + /** A per-render id prefix for math placeholders, which authored ids cannot share. */ + readonly mathKey: string; + /** What insightSource opened each insight block with, when it opened any. */ + readonly insightMarker: RegExp | null; +} + +/** UTF-16 offsets for the UTF-8 byte offsets in Words' `data-sourcepos`. */ +function utf16Offsets(source: string): (byte: number) => number { + if (!/[^\x00-\x7f]/.test(source)) return (byte) => byte; + const offsets: number[] = []; + for (let index = 0; index < source.length; index++) { + const code = source.codePointAt(index)!; + const bytes = code < 0x80 ? 1 : code < 0x800 ? 2 : code < 0x10000 ? 3 : 4; + for (let byte = 0; byte < bytes; byte++) offsets.push(index); + if (code >= 0x10000) index++; + } + offsets.push(source.length); + return (byte) => offsets[byte] ?? source.length; +} + +const sourceOf = (node: Element, source: string) => + node.position ? source.slice(node.position.start.offset, node.position.end.offset) : ""; + +const textOf = (node: ElementContent): string => + node.type === "text" + ? node.value + : node.type === "element" + ? node.children.map(textOf).join("") + : ""; + +/** A directive's attributes, as strings; anything else Words would never write reads as none. */ +function directiveAttributes(node: Element): Record { + let parsed: unknown; + try { + parsed = JSON.parse(String(node.properties.dataAttributes ?? "{}")); + } catch { + return {}; + } + if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return {}; + return Object.fromEntries( + Object.entries(parsed).filter( + (entry): entry is [string, string] => typeof entry[1] === "string", + ), + ); +} + +/** remarkCodexDirectives: what a directive Words parsed becomes, as the remark plugin builds it. */ +function codexDirective(node: Element, walk: Walk, inLink: boolean): ElementContent { + const name = node.properties.dataDirective; + const attributes = directiveAttributes(node); + const asText = (): ElementContent => { + const value: ElementContent = { type: "text", value: sourceOf(node, walk.source) }; + return node.tagName === "div" + ? { type: "element", tagName: "p", properties: {}, children: [value] } + : value; + }; + if (name === "codex-file-citation") { + const citation = resolveCodexFileCitationLink(attributes); + if (!citation || inLink) return asText(); + return { + type: "element", + tagName: "a", + properties: { href: citation.href }, + children: [{ type: "text", value: citation.label }], + ...(node.position ? { position: node.position } : {}), + }; + } + if (name === "codex-followup") { + if (!attributes.prompt?.trim() || !node.children.map(textOf).join("").trim()) return asText(); + return { type: "element", tagName: "span", properties: {}, children: node.children }; + } + const template = resolveCodexArtifactTemplate(attributes); + if (!template) return asText(); + return { + type: "element", + tagName: "div", + properties: { + dataCodexArtifactTemplate: "true", + dataArtifactKind: template.artifactKind, + dataDisplayName: template.displayName, + ...(template.galleryKind === undefined ? {} : { dataGalleryKind: template.galleryKind }), + dataSkillDirectory: template.skillDirectory, + dataSkillName: template.skillName, + }, + children: [], + }; +} + +const INLINE_PREFIX = "t3-markdown-inline-prefix:"; + +function stripPositions(node: ElementContent) { + delete node.position; + if (node.type === "element") node.children.forEach(stripPositions); +} + +/** + * remarkNormalizeListItemIndentation: four spaces after a list marker make indented code, but + * agents mean wide indentation, so code starting on the marker's line is Markdown again. True + * when it recovered the item, whose children it then has transformed. + */ +function recoverIndentedCode( + item: Element, + list: Root | Element, + walk: Walk, + inLink: boolean, + inCode: boolean, +): boolean { + const code = item.children.find((child) => child.type === "element"); + const start = code?.position?.start.offset; + const itemStart = item.position?.start.offset; + if (!isElement(code, "pre") || start === undefined || itemStart === undefined) return false; + const value = textOf(code); + if (!/^[\t ]/.test(value)) return false; + if (walk.source.slice(itemStart, start).includes("\n") || /[`~]/.test(walk.source[start]!)) { + return false; + } + // The trimmed first line sets where the item's content starts. + const indent = [.../^[\t ]*/.exec(value)![0]].reduce( + (column, character) => (character === "\t" ? (Math.floor(column / 4) + 1) * 4 : column + 1), + 0, + ); + // The prefix keeps block syntax at the start, such as `#`, from opening a block. + const source = `${INLINE_PREFIX}${value.trim()}`; + const recovered = walk.render(source, indent); + const paragraph = recovered.children.find((child) => child.type === "element"); + const first = isElement(paragraph, "p") ? paragraph.children[0] : undefined; + if (first?.type !== "text" || !first.value.startsWith(INLINE_PREFIX)) return false; + first.value = first.value.slice(INLINE_PREFIX.length); + if (first.value === "") paragraph!.children.shift(); + transform(recovered, { ...walk, source }, inLink, inCode); + transform(item, walk, inLink, inCode); + let blocks = recovered.children.filter( + (child) => !(child.type === "text" && child.value.trim() === ""), + ) as ElementContent[]; + // Their positions point into `source`, not the message. + blocks.forEach(stripPositions); + let at = item.children.indexOf(code); + let remove = 1; + if (!isLooseList(list, walk.source)) { + // A tight item shows its text bare, as remark-rehype unwraps its paragraphs. + blocks = blocks.flatMap((block, index) => [ + ...(index > 0 ? [{ type: "text", value: "\n" } as Text] : []), + ...(isElement(block, "p") ? block.children : [block]), + ]); + const isBlank = (node: ElementContent | undefined) => + node?.type === "text" && node.value.trim() === ""; + if (at === 1 && isBlank(item.children[0])) [at, remove] = [0, 2]; + if (at + remove === item.children.length - 1 && isBlank(item.children.at(-1))) remove++; + } + item.children.splice(at, remove, ...blocks); + return true; +} + +/** remark-rehype's listLoose: a blank line between items, or an item Words wrote as paragraphs. */ +function isLooseList(list: Root | Element, source: string): boolean { + const items = (list.children as ElementContent[]).filter((child): child is Element => + isElement(child, "li"), + ); + return items.some( + (item, index) => + item.children.some((child) => isElement(child, "p")) || + (index > 0 && + /\n[ \t>]*\n/.test( + source.slice( + items[index - 1]!.position?.end.offset ?? 0, + item.position?.start.offset ?? 0, + ), + )), + ); +} + +const WRITTEN_NUMBER = /[ \t]*(\d{1,9})[.)]/y; + +function keepListNumbers(list: Element, source: string) { + let expected = Number(list.properties.start ?? 1); + for (const item of list.children) { + if (!isElement(item, "li")) continue; + const offset = item.position?.start.offset; + WRITTEN_NUMBER.lastIndex = offset ?? 0; + const digits = offset === undefined ? undefined : WRITTEN_NUMBER.exec(source)?.[1]; + const value = digits === undefined ? expected : Number(digits); + if (value !== expected) item.properties.value = String(value); + expected = value + 1; + } +} + +/** What the chat's remark plugins add that Words does not. */ +const link = (href: string, label: string, properties: Element["properties"] = {}): Element => ({ + type: "element", + tagName: "a", + properties: { href, ...properties }, + children: [{ type: "text", value: label }], +}); + +/** Links in text: absolute file paths (remarkLinkAbsoluteFilePaths), then a change request's references. */ +function linkText(value: string, walk: Walk): ElementContent[] | null { + let parts: ElementContent[] = []; + let offset = 0; + for (const { index, path } of absoluteFilePathMatches(value)) { + if (index > offset) parts.push({ type: "text", value: value.slice(offset, index) }); + parts.push(link(path, path)); + offset = index + path.length; + } + if (offset < value.length) parts.push({ type: "text", value: value.slice(offset) }); + const autolinks = walk.options.extensions.changeRequest?.autolinks; + if (autolinks) { + parts = parts.flatMap((part) => { + if (part.type !== "text") return [part]; + const found = autolinks(part.value); + if (found.length === 0) return [part]; + const linked: ElementContent[] = []; + let start = 0; + for (const reference of found) { + if (start < reference.index) { + linked.push({ type: "text", value: part.value.slice(start, reference.index) }); + } + linked.push( + link(reference.url, reference.label, { dataPullRequestAutolink: reference.kind }), + ); + start = reference.index + reference.text.length; + } + if (start < part.value.length) linked.push({ type: "text", value: part.value.slice(start) }); + return linked; + }); + } + return parts.length === 1 && parts[0]!.type === "text" ? null : parts; +} + +function transform(node: Root | Element, walk: Walk, inLink: boolean, inCode: boolean) { + const children = node.children as ElementContent[]; + for (let index = 0; index < children.length; index++) { + const child = children[index]!; + if (child.type === "text") { + if (inCode) continue; + if (walk.options.extensions.githubEmoji && child.value.includes(":")) { + child.value = expandGithubEmojiAliases(child.value); + } + if (inLink) continue; + const parts = linkText(child.value, walk); + if (!parts) continue; + children.splice(index, 1, ...parts); + index += parts.length - 1; + continue; + } + if (child.type !== "element") continue; + // Words gives what it generates a source position; raw HTML that copies its attributes has none. + if (child.properties.dataDirective !== undefined && child.position) { + children[index] = codexDirective(child, walk, inLink); + index--; + continue; + } + const { tagName, properties: props } = child; + if (tagName === "svg") { + // Sanitizing drops SVG, so math waits under a placeholder until after it. + const clean = walk.options.math && child.position ? sanitizeMath(child) : null; + if (clean) { + const key = `${walk.mathKey}-${walk.math.size}`; + walk.math.set(key, clean); + children[index] = { + type: "element", + tagName: "span", + properties: { id: key }, + children: [], + }; + } + continue; + } + if (tagName === "a" && props.dataFootnoteRef !== undefined) { + // remark-rehype's footnote markup, before rehype-sanitize prefixes ids again. + props.href = `#user-content-${String(props.href).slice(1)}`; + props.id = `user-content-${String(props.id)}`; + props.ariaDescribedBy = ["footnote-label"]; + } else if (tagName === "a" && props.dataFootnoteBackref !== undefined) { + const { href, ariaLabel } = props; + child.properties = { + href: `#user-content-${String(href).slice(1)}`, + dataFootnoteBackref: "", + ariaLabel, + className: ["data-footnote-backref"], + }; + } else if (tagName === "li" && typeof props.id === "string" && props.id.startsWith("fn-")) { + props.id = `user-content-${props.id}`; + } else if (tagName === "section" && props.dataFootnotes !== undefined) { + child.properties = { dataFootnotes: "", className: ["footnotes"] }; + child.children.unshift({ + type: "element", + tagName: "h2", + properties: { className: ["sr-only"], id: "footnote-label" }, + children: [{ type: "text", value: "Footnotes" }], + }); + } else if (tagName === "a" && typeof props.href === "string") { + // remarkNormalizeLinksAndTagInlineCode: a Windows drive path links as a file URL. + const path = windowsPath(props.href); + props.href = path ? `file:///${path.replaceAll("\\", "/")}` : normalizeUri(props.href); + } else if (tagName === "img" && typeof props.src === "string") { + const changeRequest = walk.options.extensions.changeRequest; + const src = changeRequest + ? resolveChangeRequestMediaUrl(props.src, changeRequest.repositoryUrl) + : props.src; + props.src = windowsPath(src) ?? normalizeUri(src); + } else if (tagName === "code" && isElement(node, "pre")) { + if (props.dataMeta !== undefined) { + props.dataCodeMeta = props.dataMeta; + delete props.dataMeta; + } + } else if (tagName === "code" && !inLink) { + props.dataInlineCode = ""; + } else if (tagName === "ol" && walk.options.extensions.userMessage) { + keepListNumbers(child, walk.source); + } else if (tagName === "li") { + const firstBlock = child.children.find(isElementNode); + if (isElement(firstBlock, "pre") && recoverIndentedCode(child, node, walk, inLink, inCode)) { + continue; + } + // Tight items put the checkbox directly in `

  • `, loose ones inside its first `

    `. + const checkbox = isElement(child.children[0], "input") + ? child.children[0] + : isElement(firstBlock, "p") && isElement(firstBlock.children[0], "input") + ? firstBlock.children[0] + : undefined; + if (checkbox) { + props.className = ["task-list-item"]; + const { checked } = checkbox.properties; + checkbox.properties = { type: "checkbox", checked, disabled: true }; + if (node.type === "element") node.properties.className = ["contains-task-list"]; + } + breakLines(child, walk.options.breaks); + } else if (tagName === "p") { + breakLines(child, walk.options.breaks); + } else if (tagName === "blockquote") { + // remarkGithubAlerts + const paragraph = child.children.find((item) => item.type === "element"); + const first = isElement(paragraph, "p") ? paragraph.children[0] : undefined; + const text = first?.type === "text" ? first.value : ""; + const insight = walk.insightMarker?.exec(text); + const alert = GITHUB_ALERT_MARKER.exec(text); + // An alert marker followed by more inline content on its line is text, as remarkGithubAlerts reads it. + const match = insight + ? ([insight[0], "insight"] as const) + : alert && (alert[0].endsWith("\n") || (paragraph as Element).children.length === 1) + ? alert + : null; + if (match && first?.type === "text" && isElement(paragraph, "p")) { + first.value = first.value.slice(match[0].length); + if (first.value === "") paragraph.children.shift(); + if (paragraph.children.length === 0) { + const at = child.children.indexOf(paragraph); + const next = child.children[at + 1]; + // The line ending after it goes too, as remark leaves none for a removed paragraph. + const blank = next?.type === "text" && next.value.trim() === "" ? 2 : 1; + child.children.splice(at, blank); + } + props.dataAlert = match[1]!.toLowerCase(); + } + } + transform( + child, + walk, + inLink || tagName === "a", + inCode || tagName === "code" || tagName === "pre", + ); + } +} + +/** + * remark-breaks puts a `
    ` before every soft line ending, and remarkBreakAroundImageLines + * before those next to a Markdown image. Both keep the line ending after it. + */ +/** A Markdown image alone on its line: nothing but a line ending (or the paragraph's edge) around it. */ +function imageOwnsLine(items: ElementContent[], at: number): boolean { + if (!isMarkdownImage(items[at])) return false; + const before = items[at - 1]; + const after = items[at + 1]; + const startsLine = + before === undefined || + (before.type === "text" && /\n[ \t]*$/.test(before.value)) || + isElement(before, "br"); + const endsLine = after === undefined || (after.type === "text" && /^[ \t]*\n/.test(after.value)); + return startsLine && endsLine; +} + +const isBlockElement = (node: ElementContent | undefined) => + node?.type === "element" && CLOSES_PARAGRAPH.has(node.tagName); + +function breakLines(paragraph: Element, breaks: boolean) { + const items = paragraph.children; + for (let at = 0; at < items.length; at++) { + const item = items[at]!; + if ( + item.type === "element" && + breaks && + item.tagName !== "code" && + !CLOSES_PARAGRAPH.has(item.tagName) + ) { + breakLines(item, breaks); + } + if (item.type !== "text" || !item.value.includes("\n")) continue; + const afterImage = imageOwnsLine(items, at - 1); + const beforeImage = imageOwnsLine(items, at + 1); + const afterBlock = isBlockElement(items[at - 1]) || (at === 0 && paragraph.tagName === "li"); + const beforeBlock = + isBlockElement(items[at + 1]) || (at === items.length - 1 && paragraph.tagName === "li"); + const lines = item.value.split("\n"); + const parts: ElementContent[] = []; + lines.forEach((line, index) => { + // A hard break's own line ending follows its
    , and adds no second one; + // structural line endings around a list item's block children stay breaks between blocks. + const afterHardBreak = index === 1 && isElement(items[at - 1], "br"); + const blockBoundary = + (index === 1 && lines[0] === "" && afterBlock) || + (index === lines.length - 1 && line === "" && beforeBlock); + const breaksHere = + index > 0 && + !afterHardBreak && + !blockBoundary && + (breaks || (index === 1 && afterImage) || (index === lines.length - 1 && beforeImage)); + if (index > 0) { + if (breaksHere) { + const previous = parts.at(-1); + if (previous?.type === "text") previous.value = previous.value.replace(/[ \t]+$/, ""); + parts.push(BREAK); + } + parts.push({ type: "text", value: `\n${line}` }); + } else if (line) { + parts.push({ type: "text", value: line }); + } + }); + // Rejoin text that did not break, so the tree matches remark's text nodes. + const merged: ElementContent[] = []; + for (const part of parts) { + const previous = merged.at(-1); + if (part.type === "text" && previous?.type === "text") previous.value += part.value; + else merged.push(part); + } + items.splice(at, 1, ...merged); + at += merged.length - 1; + } +} + +/** + * The wrapper copying reads (markdown-clipboard's MATH_SELECTOR): the formula's TeX, as the source + * Words drew it from, so copying any part of a formula copies the whole of it. + */ +// A formula wider than its block scrolls, with room for the glyphs that reach past its box; in a +// table it keeps its width and the table scrolls. +const MATH_SCROLL = [ + "max-w-full", + "overflow-x-auto", + "overflow-y-hidden", + "px-0.5", + "py-0.75", + "in-[.chat-markdown-table-container]:max-w-none", + "in-[.chat-markdown-table-container]:overflow-visible", +]; + +function mathWrapper(svg: Element): Element { + const tex = String(svg.properties.ariaLabel ?? "").trim(); + const display = /display:\s*block/.test(String(svg.properties.style ?? "")); + return { + type: "element", + tagName: "span", + properties: display + ? { + className: ["chat-markdown-math-display", "block", ...MATH_SCROLL], + dataMarkdownMath: "display", + dataMarkdownCopy: `\\[\n${tex}\n\\]\n\n`, + } + : { + className: ["inline-block", "align-middle", ...MATH_SCROLL], + dataMarkdownMath: "inline", + dataMarkdownCopy: `\\(${tex}\\)`, + }, + children: [svg], + }; +} + +function restoreMath(node: Root | Element, math: Map) { + const children = node.children as ElementContent[]; + for (let index = 0; index < children.length; index++) { + const child = children[index]!; + if (child.type !== "element") continue; + const id = child.properties.id; + const svg = typeof id === "string" ? math.get(id.replace(/^user-content-/, "")) : undefined; + if (svg) children[index] = mathWrapper(svg); + else restoreMath(child, math); + } +} + +const addHeadingIds = rehypeHeadingIds(); +const addTextDirection = rehypeTextDirection(); +const preserveImageSourceMeta = rehypePreserveImageSourceMeta(); +const normalizeLocalEditorLinks = rehypeNormalizeLocalEditorLinks(); +const groupChipPunctuation = rehypeChipPunctuation(); + +const INSIGHT_OPENING = /^( {0,3})(`?)★ Insight[ \t]+─{3,}\2[ \t]*$/u; +const INSIGHT_CLOSING = /^( {0,3})(`?)─{3,}\2[ \t]*$/u; + +interface InsightSource { + readonly source: string; + readonly tree: Root; + readonly marker: RegExp; + /** The offset in the message for an offset in `source`. */ + readonly toOriginal: (offset: number) => number; +} + +/** + * remarkAssistantInsights: a `★ Insight ───` line opens a quoted insight block, which a `───` line + * at the same indentation closes; the end of the text closes one that never does. Lines in code + * neither open nor close one, and an opening Words does not read as a quote's first line, as in + * an HTML block or a quote's lazy line, stays text. + */ +function insightSource(text: string, options: RenderOptions): InsightSource | null { + if (!text.includes("★ Insight")) return null; + const code: Array = []; + const findCode = (node: Root | Element) => { + for (const child of node.children) { + if (child.type !== "element") continue; + if (child.tagName === "pre" && child.position) { + code.push([child.position.start.offset!, child.position.end.offset!]); + } else findCode(child); + } + }; + findCode(parse(text, options)); + const nonce = Math.random().toString(36).slice(2); + const marker = new RegExp(String.raw`^\[!T3-INSIGHT-${nonce}-(\d+)\](?:\r?\n)?`); + const anywhere = new RegExp(String.raw`\[!T3-INSIGHT-${nonce}-(\d+)\]`, "g"); + const lines = text.split(/(?<=\n)/u); + const skipped = new Set(); + for (;;) { + // Each line's offset in the message and in the source, and how much longer it got. + const offsets: Array<{ original: number; source: number; length: number; delta: number }> = []; + let original = 0; + let rewritten = 0; + let opened = 0; + let indent: string | undefined; + const source = lines + .map((line, lineIndex) => { + const value = line.replace(/[\r\n]+$/u, ""); + const ending = line.slice(value.length); + const inCode = code.some(([start, end]) => original >= start && original < end); + let output = line; + if (indent === undefined) { + const opening = inCode ? null : INSIGHT_OPENING.exec(value); + if (opening && !skipped.has(lineIndex)) { + indent = opening[1] ?? ""; + opened++; + output = `> [!T3-INSIGHT-${nonce}-${lineIndex}]${ending}`; + } + } else { + const closing = inCode ? null : INSIGHT_CLOSING.exec(value); + if (closing && closing[1] === indent) { + indent = undefined; + output = ending; + } else output = `> ${line}`; + } + offsets.push({ + original, + source: rewritten, + length: line.length, + delta: output.length - line.length, + }); + original += line.length; + rewritten += output.length; + return output; + }) + .join(""); + if (opened === 0) return null; + const tree = parse(source, options); + let stranded = false; + const visit = (node: Root | Element, quoteStart: Text | undefined) => { + for (const child of node.children) { + if (child.type === "text") { + for (const found of child.value.matchAll(anywhere)) { + if (child === quoteStart && found.index === 0) continue; + skipped.add(Number(found[1])); + stranded = true; + } + } else if (child.type === "element") { + const paragraph = + child.tagName === "blockquote" ? child.children.find(isElementNode) : undefined; + const first = isElement(paragraph, "p") ? paragraph.children[0] : undefined; + visit(child, first?.type === "text" ? first : quoteStart); + } + } + }; + visit(tree, undefined); + if (stranded) continue; + return { + source, + tree, + marker, + toOriginal: (offset) => { + const line = offsets.findLast((entry) => entry.source <= offset) ?? offsets[0]!; + return ( + line.original + Math.min(Math.max(offset - line.source - line.delta, 0), line.length) + ); + }, + }; + } +} + +/** Positions that point into an insight's rewritten source, moved back into the message. */ +function restorePositions(node: Root | Element, toOriginal: (offset: number) => number) { + for (const child of node.children) { + if (child.type !== "element") continue; + if (child.position) { + const start = toOriginal(child.position.start.offset!); + const end = toOriginal(child.position.end.offset!); + child.position = { + start: { line: 1, column: start + 1, offset: start }, + end: { line: 1, column: end + 1, offset: end }, + }; + } + restorePositions(child, toOriginal); + } +} + +const PREVIEW_SEPARATED = new Set([ + "blockquote", + "ul", + "ol", + "li", + "table", + "thead", + "tbody", + "tr", +]); + +/** remarkThoughtPreview: the message as one line of text, keeping math, cut at `maxLength`. */ +function flattenPreview(tree: Root, preview: NonNullable): Root { + const children: ElementContent[] = []; + let remaining = preview.maxLength; + let fragments: string[] = []; + const flush = () => { + if (fragments.length === 0) return; + children.push({ type: "text", value: fragments.join("").replace(/\s+/g, " ") }); + fragments = []; + }; + const take = (value: string) => { + const text = value.slice(0, remaining); + remaining = text.length < value.length ? 0 : remaining - text.length; + // A cut must not leave half a surrogate pair. + return text.replace(/[\uD800-\uDBFF]$/, ""); + }; + const visit = (node: Root | ElementContent) => { + if (remaining === 0) return; + if (node.type === "text") { + fragments.push(take(node.value)); + return; + } + if (node.type === "element" && node.properties.dataMarkdownMath !== undefined) { + flush(); + // One line has no room for display math, which a preview shows inline. + const svg = node.children[0]; + children.push( + node.properties.dataMarkdownMath === "display" && svg?.type === "element" + ? mathWrapper({ + ...svg, + properties: { + ...svg.properties, + style: "display:inline;vertical-align:middle;overflow:visible", + }, + }) + : node, + ); + return; + } + if (node.type === "element" && node.tagName === "img") { + fragments.push(take(String(node.properties.alt ?? ""))); + return; + } + if (node.type === "element" && node.tagName === "br") { + fragments.push(take(" ")); + return; + } + if (node.type !== "root" && node.type !== "element") return; + const separates = node.type === "root" || PREVIEW_SEPARATED.has(node.tagName); + let first = true; + for (const child of node.children as ElementContent[]) { + if (remaining === 0) break; + if (child.type === "text" && child.value.trim() === "" && separates) continue; + if (!first && separates) fragments.push(take(" ")); + first = false; + visit(child); + } + }; + visit(tree); + flush(); + const head = children[0]; + const tail = children.at(-1); + if (head?.type === "text") head.value = head.value.trimStart(); + if (tail?.type === "text") tail.value = tail.value.trimEnd(); + const visible = children.some((child) => child.type !== "text" || child.value); + return { + type: "root", + children: visible ? children : [{ type: "text", value: preview.fallback }], + }; +} + +/** Links become their text, images their alt text, inline code plain text, Mermaid plain code. */ +function makeInert(node: Root | Element) { + const children = node.children as ElementContent[]; + for (let index = 0; index < children.length; index++) { + const child = children[index]!; + if (child.type !== "element") continue; + if (child.tagName === "a") { + children.splice(index, 1, ...child.children); + index--; + continue; + } + if (child.tagName === "img") { + children[index] = { type: "text", value: String(child.properties.alt ?? "") }; + continue; + } + if (child.tagName === "code" && child.properties.dataInlineCode !== undefined) { + children[index] = { type: "text", value: textOf(child) }; + continue; + } + if ( + child.tagName === "code" && + String(child.properties.className ?? "").includes("language-mermaid") + ) { + child.properties.className = ["language-text"]; + } + makeInert(child); + } +} + +/** ChatMarkdown's sanitized hast for `text`, rendered by Words. */ +export function wordsHast(text: string, options: WordsHastOptions): Root { + const { extensions } = options; + const renderOptions: RenderOptions = { + math: options.math, + // llm-math's `\(…\)` and `\[…\]`, which agents write as often as `$`. + texDelimiters: options.math, + autolinkBoundaries: true, + singleTilde: !extensions.userMessage, + leadingWhitespace: extensions.leadingWhitespace === true, + windowsPaths: true, + codeMeta: true, + directives: CODEX_DIRECTIVES, + // Previews and inert Markdown drop raw HTML, as their remark plugins dropped html nodes. + ...(extensions.preview || extensions.inert + ? { skipHtml: true } + : { escapeHtml: options.escapeHtml }), + }; + const insights = options.insights ? insightSource(text, renderOptions) : null; + const source = insights?.source ?? text; + const tree = insights?.tree ?? parse(source, renderOptions); + const walk: Walk = { + render: (markdown, indent) => + parse(markdown, { + ...renderOptions, + leadingWhitespace: extensions.leadingWhitespace === true && { indent }, + }), + source, + options, + math: new Map(), + mathKey: `t3-math-${Math.random().toString(36).slice(2)}`, + insightMarker: insights?.marker ?? null, + }; + transform(tree, walk, false, false); + preserveImageSourceMeta(tree as never); + normalizeLocalEditorLinks(tree as never); + const hast = sanitizeChatHast(tree); + if (walk.math.size > 0) restoreMath(hast, walk.math); + if (insights) restorePositions(hast, insights.toOriginal); + if (extensions.inert) makeInert(hast); + if (extensions.preview) return flattenPreview(hast, extensions.preview); + addHeadingIds(hast); + addTextDirection(hast as never); + groupChipPunctuation(hast as never); + return hast; +} + +export interface CodexDirectiveSource { + readonly name: string; + readonly attributes: Record; + /** UTF-16 offsets of the whole directive in the source. */ + readonly start: number; + readonly end: number; + /** The label's text as written. */ + readonly label: string; + /** Inside a link, where a file citation stays text. */ + readonly inLink: boolean; +} + +/** The Codex directives in `markdown`, as Words reads them. */ +export function codexDirectiveSources(markdown: string): CodexDirectiveSource[] { + const found: CodexDirectiveSource[] = []; + const visit = (node: Root | Element, inLink: boolean) => { + for (const child of node.children) { + if (child.type !== "element") continue; + const name = child.properties.dataDirective; + if (typeof name === "string" && child.position) { + const { start, end } = child.position; + found.push({ + name, + attributes: directiveAttributes(child), + start: start.offset!, + end: end.offset!, + label: directiveLabel(markdown.slice(start.offset, end.offset)), + inLink, + }); + } + visit(child, inLink || child.tagName === "a"); + } + }; + visit( + parse(markdown, { + windowsPaths: true, + autolinkBoundaries: true, + directives: CODEX_DIRECTIVES, + }), + false, + ); + return found; +} + +/** The label of a directive as written, `:name[label]{…}`: brackets nest in it, and `\` escapes. */ +function directiveLabel(written: string): string { + const open = written.indexOf("["); + if (open < 0) return ""; + let depth = 0; + for (let index = open; index < written.length; index++) { + const character = written[index]; + if (character === "\\") index++; + else if (character === "[") depth++; + else if (character === "]" && --depth === 0) return written.slice(open + 1, index); + } + return ""; +} + +/** + * Words' HTML for `markdown` as hast, unsanitized and without the chat's additions. Code blocks, + * links, list items and math carry source positions. + */ +export function markdownTree( + markdown: string, + options: { skipHtml?: boolean; singleTilde?: boolean; math?: boolean } = {}, +): Root { + return parse(markdown, { + windowsPaths: true, + autolinkBoundaries: true, + skipHtml: options.skipHtml === true, + singleTilde: options.singleTilde !== false, + math: options.math === true, + texDelimiters: options.math === true, + }); +} + +/** The formulas Words reads in `text`, as source offsets, for editors that keep math as source. */ +export function markdownMathRanges(text: string): Array<{ start: number; end: number }> { + if (!/[$\\]|(?:`{3,}|~{3,})[ \t]*math\b/.test(text)) return []; + const ranges: Array<{ start: number; end: number }> = []; + const visit = (node: Root | Element) => { + for (const child of node.children) { + if (child.type !== "element") continue; + if (child.tagName === "svg") { + if (child.position) { + ranges.push({ start: child.position.start.offset!, end: child.position.end.offset! }); + } + continue; + } + visit(child); + } + }; + visit(parse(text, { math: true, texDelimiters: true })); + return ranges; +} + +/** The HTML comments Words reads as raw HTML in `markdown`, not as code or text, as source offsets. */ +export function markdownHtmlComments(markdown: string): Array<{ start: number; end: number }> { + const openers = [...markdown.matchAll(/", start + 4); + return { start, end: close < 0 ? markdown.length : close + 3 }; + }); +} + +/** + * The first definition of each label in `markdown`, as one line of Markdown. Words decides which + * `[label]:` text defines one: each label is looked up again after the text. + */ +export function markdownReferenceDefinitions(markdown: string): string[] { + const labels = new Map(); + for (const match of markdown.matchAll(/\[((?:[^\\[\]]|\\.){1,999})\]:/g)) { + const key = match[1]!.replace(/\s+/g, " ").trim().toLowerCase(); + // `[^1]:` is a footnote. + if (key !== "" && !key.startsWith("^") && !labels.has(key)) labels.set(key, match[1]!); + } + if (labels.size === 0) return []; + let probe = `${markdown}\n\n`; + const lookups = new Map(); + for (const label of labels.values()) { + lookups.set(probe.length, label); + probe += `[${label}]\n\n`; + } + const definitions: string[] = []; + const visit = (node: Root | Element) => { + for (const child of node.children) { + if (child.type !== "element") continue; + const label = lookups.get(child.position?.start.offset ?? -1); + if (child.tagName === "a" && label !== undefined) { + const href = String(child.properties.href ?? "").replace(/[<>\\\n]/g, encodeURIComponent); + const title = child.properties.title; + definitions.push( + `[${label}]: <${href}>${typeof title === "string" ? ` "${title.replace(/\s+/g, " ").replace(/["\\]/g, "\\$&")}"` : ""}`, + ); + } else visit(child); + } + }; + visit(parse(probe, { windowsPaths: true })); + return definitions; +} diff --git a/packages/client-runtime/package.json b/packages/client-runtime/package.json index fee70319c71de..92fad6b57ac9d 100644 --- a/packages/client-runtime/package.json +++ b/packages/client-runtime/package.json @@ -654,6 +654,10 @@ "./provider-instance-ids": { "types": "./src/providerInstanceIds.ts", "default": "./src/providerInstanceIds.ts" + }, + "./pull-request-references": { + "types": "./src/pullRequestReferences.ts", + "default": "./src/pullRequestReferences.ts" } }, "scripts": { @@ -680,16 +684,16 @@ "effect": "catalog:", "gt-i18n": "1.0.40", "jszip": "3.10.1", - "remark-gfm": "catalog:", - "remark-parse": "catalog:", "three": "0.180.0", - "unbash": "^5.0.0", - "unified": "catalog:" + "unbash": "^5.0.0" }, "devDependencies": { "@effect/vitest": "catalog:", "@types/mdast": "^4.0.4", "@types/three": "0.180.0", + "remark-gfm": "catalog:", + "remark-parse": "catalog:", + "unified": "catalog:", "vite-plus": "catalog:" } } diff --git a/packages/client-runtime/src/pullRequestMarkdown.test.ts b/packages/client-runtime/src/pullRequestMarkdown.test.ts index d4f19173758ec..7d9d162d76a05 100644 --- a/packages/client-runtime/src/pullRequestMarkdown.test.ts +++ b/packages/client-runtime/src/pullRequestMarkdown.test.ts @@ -4,19 +4,39 @@ import remarkParse from "remark-parse"; import { unified } from "unified"; import { describe, expect, it } from "vite-plus/test"; +import { splitPullRequestBody, type PullRequestBodySegment } from "./pullRequestMarkdown.ts"; import { changeRequestReferenceAutolinker, resolveChangeRequestMediaUrl, - splitPullRequestBody, - type PullRequestBodySegment, -} from "./pullRequestMarkdown.ts"; +} from "./pullRequestReferences.ts"; + +const definitionParser = unified().use(remarkParse).use(remarkGfm); + +// The finder a client passes: each first definition, joined onto one line out of its quote. +const split = (body: string) => + splitPullRequestBody(body, (markdown) => { + const definitions = new Map(); + const visit = (node: Root | RootContent, quotes: number) => { + if (node.type === "definition" && !definitions.has(node.identifier)) { + const wrap = new RegExp(`(?:\\r\\n|\\r|\\n)(?:[ \\t]*>){0,${quotes}}[ \\t]*`, "gu"); + const source = markdown.slice(node.position?.start.offset, node.position?.end.offset); + definitions.set(node.identifier, source.replace(wrap, " ")); + } + if ("children" in node) { + for (const child of node.children) + visit(child, quotes + (node.type === "blockquote" ? 1 : 0)); + } + }; + visit(definitionParser.parse(markdown), 0); + return [...definitions.values()]; + }); describe("pull request body segmentation", () => { // GitHub writes a dropped image into the body as an `` tag, so a bare attachment link on // its own line is the shape it uses for a video — every one sampled in the wild was one. it("lifts a dropped video out and keeps the prose around it", () => { expect( - splitPullRequestBody( + split( "Before\n\nhttps://github.com/user-attachments/assets/2f8c1a90-1b2c-4d5e-8f90-abcdef123456\n\nAfter", ), ).toEqual([ @@ -43,7 +63,7 @@ describe("pull request body segmentation", () => { ? segment.rows.flat().flatMap((cell) => prose(cell.segments)) : [], ); - const runs = prose(splitPullRequestBody(body)); + const runs = prose(split(body)); expect(runs.map((segment) => segment.text)).toEqual([ "- [ ] Before", " - [ ] code\n- [x] After", @@ -59,9 +79,7 @@ describe("pull request body segmentation", () => { it("reads the source out of a video tag, including a multi-line one", () => { expect( - splitPullRequestBody( - '', - ), + split(''), ).toEqual([ { id: "attachment:0", @@ -75,21 +93,21 @@ describe("pull request body segmentation", () => { it("leaves the img tag GitHub writes for a dropped image as markdown", () => { const body = 'image'; - expect(splitPullRequestBody(body)).toEqual([ + expect(split(body)).toEqual([ { id: "markdown:0", kind: "markdown", text: body, sourceOffset: 0 }, ]); }); it("leaves an ordinary link alone, whether it is bare or written as markdown", () => { const body = "https://example.com/page\n\n[the docs](https://example.com/docs)"; - expect(splitPullRequestBody(body)).toEqual([ + expect(split(body)).toEqual([ { id: "markdown:0", kind: "markdown", text: body, sourceOffset: 0 }, ]); }); it("never lifts a link inside fenced code out of it", () => { const body = "```\nhttps://example.com/demo.mp4\n```"; - expect(splitPullRequestBody(body)).toEqual([ + expect(split(body)).toEqual([ { id: "markdown:0", kind: "markdown", text: body, sourceOffset: 0 }, ]); }); @@ -97,14 +115,14 @@ describe("pull request body segmentation", () => { // GitHub keeps CRLF in a body written in its web editor. it("recognizes fences in a body with CRLF line endings", () => { const body = "```\r\nhttps://example.com/demo.mp4\r\n```"; - expect(splitPullRequestBody(body)).toEqual([ + expect(split(body)).toEqual([ { id: "markdown:0", kind: "markdown", text: body, sourceOffset: 0 }, ]); }); it("closes a CRLF fence, so a video after it still lifts out", () => { const code = '```html\r\n\r\n```'; - expect(splitPullRequestBody(`${code}\r\n\r\nhttps://example.com/demo.mp4\r\n`)).toEqual([ + expect(split(`${code}\r\n\r\nhttps://example.com/demo.mp4\r\n`)).toEqual([ { id: "markdown:0", kind: "markdown", text: code, sourceOffset: 0 }, { id: "attachment:1", @@ -117,21 +135,21 @@ describe("pull request body segmentation", () => { it("does not let a different fence marker close an open fence", () => { const body = "```\n~~~\nhttps://example.com/demo.mp4\n```"; - expect(splitPullRequestBody(body)).toEqual([ + expect(split(body)).toEqual([ { id: "markdown:0", kind: "markdown", text: body, sourceOffset: 0 }, ]); }); it("keeps a video tag that shares its line with prose as markdown", () => { const body = 'Before after'; - expect(splitPullRequestBody(body)).toEqual([ + expect(split(body)).toEqual([ { id: "markdown:0", kind: "markdown", text: body, sourceOffset: 0 }, ]); }); it("treats an info-string fence as a nested opener, not a close", () => { const body = "```\n```javascript\nhttps://example.com/demo.mp4\n```"; - expect(splitPullRequestBody(body)).toEqual([ + expect(split(body)).toEqual([ { id: "markdown:0", kind: "markdown", text: body, sourceOffset: 0 }, ]); }); @@ -139,9 +157,7 @@ describe("pull request body segmentation", () => { it("does not open a fence on a line of inline triple-backtick code", () => { const code = "```\nhttps://example.com/b.png\n```"; expect( - splitPullRequestBody( - `\`\`\`npm test\`\`\` passes.\n\nhttps://example.com/demo.mp4\n\n${code}`, - ), + split(`\`\`\`npm test\`\`\` passes.\n\nhttps://example.com/demo.mp4\n\n${code}`), ).toEqual([ { id: "markdown:0", kind: "markdown", text: "```npm test``` passes.", sourceOffset: 0 }, { @@ -153,14 +169,14 @@ describe("pull request body segmentation", () => { { id: "markdown:2", kind: "markdown", text: code, sourceOffset: 54 }, ]); const multilineSpan = "```foo`\nhttps://example.com/demo.mp4\nbar```"; - expect(splitPullRequestBody(multilineSpan)).toEqual([ + expect(split(multilineSpan)).toEqual([ { id: "markdown:0", kind: "markdown", text: multilineSpan, sourceOffset: 0 }, ]); }); it("leaves an indented code line alone even when it is only a video link", () => { const body = " https://example.com/demo.mp4"; - expect(splitPullRequestBody(body)).toEqual([ + expect(split(body)).toEqual([ { id: "markdown:0", kind: "markdown", text: body, sourceOffset: 0 }, ]); }); @@ -169,14 +185,14 @@ describe("pull request body segmentation", () => { const body = ['

    ");
         expect(html).toContain("
  • for (const step of rest.steps) {
  • "); expect(html).toContain("
  • if (step.request.body) {
  • "); - expect(html).toContain("
  • step.request.body = "<redacted>";
  • "); + expect(html).toContain('
  • step.request.body = "";
  • '); }); it("preserves every recovered block separated by blank lines", () => { diff --git a/packages/shared/src/markdownPipeline.ts b/packages/shared/src/markdownPipeline.ts index 53b49a03762a3..6bb022f532942 100644 --- a/packages/shared/src/markdownPipeline.ts +++ b/packages/shared/src/markdownPipeline.ts @@ -1,4 +1,3 @@ -import { isLocalEditorFileUrl, LOCAL_FILE_LINK_SCHEMES } from "@t3tools/contracts"; import type { Heading, Link, @@ -15,7 +14,7 @@ import remarkParse from "remark-parse"; import remarkRehype from "remark-rehype"; import { find, html } from "property-information"; import rehypeRaw from "rehype-raw"; -import rehypeSanitize, { defaultSchema } from "rehype-sanitize"; +import rehypeSanitize from "rehype-sanitize"; import remarkBreaks from "remark-breaks"; import remarkGfm from "remark-gfm"; import { remarkGithubAlerts } from "./markdownGithubAlerts.ts"; @@ -25,17 +24,18 @@ import { remarkEnableLeadingWhitespace, remarkKeepLeadingWhitespace, } from "./markdownLeadingWhitespace.ts"; -import { - CODEX_ARTIFACT_TEMPLATE_HAST_PROPERTIES, - remarkCodexDirectives, -} from "./codexMarkdownDirectives.ts"; -import { - absoluteFilePathMatches, - isWindowsDrivePathHref, - normalizeMarkdownLinkDestination, -} from "./markdownLinks.ts"; +import { remarkCodexDirectives } from "./codexMarkdownDirectives.ts"; +import { absoluteFilePathMatches } from "./markdownLinks.ts"; import { isWindowsAbsolutePath } from "./path.ts"; -import { THREAD_LINK_PROTOCOL } from "./threadLinks.ts"; +import { + CHAT_MARKDOWN_SANITIZE_SCHEMA, + chatMarkdownImageSource, + rehypeNormalizeLocalEditorLinks, + rehypePreserveImageSourceMeta, + type ChatMarkdownImageProperties, +} from "./markdownHast.ts"; + +export { chatMarkdownImageSource, type ChatMarkdownImageProperties }; export { remarkEnableOrderedListNumbers } from "./markdownOrderedListNumbers.ts"; @@ -47,44 +47,6 @@ type MarkdownImageHastNode = { children?: MarkdownImageHastNode[]; }; -function meaningfulHastChildren(node: MarkdownImageHastNode): MarkdownImageHastNode[] { - return (node.children ?? []).filter( - (child) => !(child.type === "text" && (child as { value?: string }).value?.trim() === ""), - ); -} - -const STANDALONE_IMAGE_BLOCKS = new Set([ - "p", - "div", - "li", - "td", - "th", - "figure", - "center", - "blockquote", -]); - -function soleImageDescendant(node: MarkdownImageHastNode): MarkdownImageHastNode | undefined { - const children = meaningfulHastChildren(node); - if (children.length !== 1) return undefined; - const only = children[0]; - if (only?.type !== "element") return undefined; - if (only.tagName === "img") return only; - return only.tagName === "a" || only.tagName === "strong" || only.tagName === "em" - ? soleImageDescendant(only) - : undefined; -} - -function markStandaloneImages(node: MarkdownImageHastNode) { - if (node.type === "root" || (node.tagName && STANDALONE_IMAGE_BLOCKS.has(node.tagName))) { - const image = soleImageDescendant(node); - if (image) image.properties = { ...image.properties, dataStandalone: true }; - } - node.children?.forEach((child) => { - if (child.type === "element") markStandaloneImages(child); - }); -} - // Whole tags, attributes, and comments, so closing-anchor text inside them never counts as a tag. const RAW_HTML_TAG_PATTERN = /|$)|<\/?[A-Za-z](?:[^"'<>]|"[^"]*"|'[^']*')*>/g; @@ -133,121 +95,6 @@ function rehypePreserveBareAnchorPlaceholders() { }; } -const COLOR_SCHEME_MEDIA = /^\(\s*prefers-color-scheme\s*:\s*(dark|light)\s*\)$/i; - -/** - * The renderer resolves an ``'s `src` (workspace files, host media) but never a ``'s - * `srcset`, which would load unresolved whenever its media matched. A color-scheme source moves - * onto the `` for the renderer to pick by theme; every source is then dropped. - */ -function moveColorSchemeSourcesToImage(picture: MarkdownImageHastNode) { - if (!picture.children) return; - const image = picture.children.find((child) => child.tagName === "img"); - for (const source of picture.children) { - if (source.tagName !== "source" || !image) continue; - const media = source.properties?.media; - const scheme = typeof media === "string" ? COLOR_SCHEME_MEDIA.exec(media)?.[1] : undefined; - const srcSet = source.properties?.srcSet; - const candidate = Array.isArray(srcSet) ? srcSet[0] : srcSet; - // A candidate's URL runs to the first space (a descriptor such as `2x` may follow). - const url = - typeof candidate === "string" ? candidate.trim().split(/\s/, 1)[0]?.replace(/,+$/, "") : ""; - const key = scheme?.toLowerCase() === "dark" ? "dataDarkSrc" : "dataLightSrc"; - // As in a browser, the first source that matches a scheme is the one shown. - if (scheme && url && image.properties?.[key] === undefined) { - // The sanitizer reads a drive letter as a protocol; as a file URL it resolves to the same path. - const value = isWindowsDrivePathHref(url) ? `file:///${url.replaceAll("\\", "/")}` : url; - image.properties = { ...image.properties, [key]: value }; - } - } - picture.children = picture.children.filter((child) => child.tagName !== "source"); -} - -function rehypePreserveImageSourceMeta() { - return (tree: MarkdownImageHastNode) => { - const visit = (node: MarkdownImageHastNode) => { - const src = node.properties?.src; - const title = node.properties?.title; - if (node.type === "element" && node.tagName === "picture") { - moveColorSchemeSourcesToImage(node); - } - if (node.type === "element" && node.tagName === "img") { - node.properties = { - ...node.properties, - ...(typeof src === "string" && isWindowsDrivePathHref(src) ? { dataLocalSrc: src } : {}), - ...(typeof title === "string" ? { dataMarkdownTitle: title } : {}), - }; - } - node.children?.forEach(visit); - }; - - visit(tree); - markStandaloneImages(tree); - }; -} - -const IMAGE_SRC_PROTOCOLS = [...(defaultSchema.protocols?.src ?? []), "file", "t3-context"]; - -// The sanitizer compares schemes case-sensitively, so lowercase accepted editor links first. -function rehypeNormalizeLocalEditorLinks() { - return (tree: MarkdownImageHastNode) => { - const visit = (node: MarkdownImageHastNode) => { - const href = node.properties?.href; - if (node.type === "element" && node.tagName === "a" && typeof href === "string") { - try { - const url = new URL(href); - if (isLocalEditorFileUrl(url)) node.properties = { ...node.properties, href: url.href }; - } catch { - // Not an absolute URL; the sanitizer decides. - } - } - node.children?.forEach(visit); - }; - - visit(tree); - }; -} - -const CHAT_MARKDOWN_SANITIZE_SCHEMA = { - ...defaultSchema, - attributes: { - ...defaultSchema.attributes, - "*": (defaultSchema.attributes?.["*"] ?? []).filter((attribute) => attribute !== "title"), - // Fence languages plus the two math classes the web chat's math plugin emits. - code: [ - ["className", /^language-./, "math-inline", "math-display"], - "dataCodeMeta", - "dataInlineCode", - ], - blockquote: [...(defaultSchema.attributes?.blockquote ?? []), "dataAlert"], - div: [...(defaultSchema.attributes?.div ?? []), ...CODEX_ARTIFACT_TEMPLATE_HAST_PROPERTIES], - a: [...(defaultSchema.attributes?.a ?? []), "dataPullRequestAutolink"], - img: [ - ...(defaultSchema.attributes?.img ?? []), - "dataDarkSrc", - "dataLightSrc", - "dataLocalSrc", - "dataMarkdownTitle", - "dataStandalone", - ], - }, - protocols: { - ...defaultSchema.protocols, - href: [ - ...(defaultSchema.protocols?.href ?? []), - "file", - "t3-citation", - "t3-context", - THREAD_LINK_PROTOCOL, - // Scheme only: the renderer's URL transform checks the rest of the link shape. - ...LOCAL_FILE_LINK_SCHEMES, - ], - src: IMAGE_SRC_PROTOCOLS, - dataDarkSrc: IMAGE_SRC_PROTOCOLS, - dataLightSrc: IMAGE_SRC_PROTOCOLS, - }, -} satisfies Parameters[0]; - export const CHAT_MARKDOWN_REMARK_PLUGINS: PluggableList = [ remarkGfm, remarkEndAutolinksAtScriptPunctuation, @@ -752,10 +599,6 @@ function remarkNormalizeLinksAndTagInlineCode() { }; } -export function shouldPreserveAssistantLineBreaks(text: string): boolean { - return /^★ Insight(?:\s|─)/mu.test(text); -} - export function remarkAssistantInsights(this: Processor) { return (tree: Root, file: { value: unknown }) => { const source = String(file.value); @@ -840,37 +683,6 @@ const imageSourceProcessor = unified() .use(remarkRehype, { allowDangerousHtml: true }) .use(CHAT_MARKDOWN_REHYPE_PLUGINS); -export type ChatMarkdownImageProperties = { - readonly src?: unknown; - readonly dataLocalSrc?: unknown; - readonly dataDarkSrc?: unknown; - readonly dataLightSrc?: unknown; -}; - -/** Keep the authored path for file links and normalize Windows separators for classification. */ -export function chatMarkdownImageSource( - properties?: ChatMarkdownImageProperties, - theme?: "dark" | "light", -) { - const themeSrc = - theme === undefined - ? undefined - : properties?.[theme === "dark" ? "dataDarkSrc" : "dataLightSrc"]; - const localSrc = typeof themeSrc === "string" ? undefined : properties?.dataLocalSrc; - const source = - typeof themeSrc === "string" - ? themeSrc - : typeof localSrc === "string" - ? localSrc - : properties?.src; - if (typeof source !== "string") return null; - const authoredSrc = normalizeMarkdownLinkDestination(source); - return { - authoredSrc, - classifiedSrc: typeof localSrc === "string" ? authoredSrc.replaceAll("\\", "/") : authoredSrc, - }; -} - interface ImageSourceNode { readonly type: string; readonly tagName?: string; diff --git a/packages/shared/src/markdownTaskEdits.ts b/packages/shared/src/markdownTaskEdits.ts new file mode 100644 index 0000000000000..2f33428613147 --- /dev/null +++ b/packages/shared/src/markdownTaskEdits.ts @@ -0,0 +1,28 @@ +/** Offset of the `[ ]` marker on the first line of the list item starting at `listItemStart`. */ +export function taskListMarkerOffset(markdown: string, listItemStart: number): number | null { + const firstLineEnd = markdown.indexOf("\n", listItemStart); + const firstLine = markdown.slice( + listItemStart, + firstLineEnd === -1 ? markdown.length : firstLineEnd, + ); + const match = firstLine.match(/^(?:\s*(?:[-+*]|\d+[.)])\s+)(\[[ xX]\])/); + if (!match?.[1]) return null; + return listItemStart + firstLine.indexOf(match[1]); +} + +export function setMarkdownTaskChecked( + markdown: string, + markerOffset: number, + checked: boolean, +): string { + if ( + markerOffset < 0 || + markdown[markerOffset] !== "[" || + !/[ xX]/.test(markdown[markerOffset + 1] ?? "") || + markdown[markerOffset + 2] !== "]" + ) { + return markdown; + } + + return `${markdown.slice(0, markerOffset + 1)}${checked ? "x" : " "}${markdown.slice(markerOffset + 2)}`; +} diff --git a/packages/shared/src/markdownTaskList.test.ts b/packages/shared/src/markdownTaskList.test.ts index 5e00a3926fa54..7f7519ce49ee5 100644 --- a/packages/shared/src/markdownTaskList.test.ts +++ b/packages/shared/src/markdownTaskList.test.ts @@ -1,6 +1,7 @@ import { describe, expect, it } from "vite-plus/test"; -import { markdownTaskMarkerOffset, setMarkdownTaskChecked } from "./markdownTaskList.ts"; +import { markdownTaskMarkerOffset } from "./markdownTaskList.ts"; +import { setMarkdownTaskChecked } from "./markdownTaskEdits.ts"; describe("setMarkdownTaskChecked", () => { const markdown = "- [ ] First\n- [x] Second\n"; diff --git a/packages/shared/src/markdownTaskList.ts b/packages/shared/src/markdownTaskList.ts index fb02f757992b9..a4d18895505c6 100644 --- a/packages/shared/src/markdownTaskList.ts +++ b/packages/shared/src/markdownTaskList.ts @@ -3,36 +3,9 @@ import remarkGfm from "remark-gfm"; import remarkParse from "remark-parse"; import { unified } from "unified"; -const parser = unified().use(remarkParse).use(remarkGfm); - -/** Offset of the `[ ]` marker on the first line of the list item starting at `listItemStart`. */ -export function taskListMarkerOffset(markdown: string, listItemStart: number): number | null { - const firstLineEnd = markdown.indexOf("\n", listItemStart); - const firstLine = markdown.slice( - listItemStart, - firstLineEnd === -1 ? markdown.length : firstLineEnd, - ); - const match = firstLine.match(/^(?:\s*(?:[-+*]|\d+[.)])\s+)(\[[ xX]\])/); - if (!match?.[1]) return null; - return listItemStart + firstLine.indexOf(match[1]); -} - -export function setMarkdownTaskChecked( - markdown: string, - markerOffset: number, - checked: boolean, -): string { - if ( - markerOffset < 0 || - markdown[markerOffset] !== "[" || - !/[ xX]/.test(markdown[markerOffset + 1] ?? "") || - markdown[markerOffset + 2] !== "]" - ) { - return markdown; - } +import { taskListMarkerOffset } from "./markdownTaskEdits.ts"; - return `${markdown.slice(0, markerOffset + 1)}${checked ? "x" : " "}${markdown.slice(markerOffset + 2)}`; -} +const parser = unified().use(remarkParse).use(remarkGfm); /** Hard breaks as U+2028, as iOS draws them; soft breaks stay "\n". */ function plainText(node: Nodes): string { diff --git a/packages/shared/src/markdownWindowsPaths.ts b/packages/shared/src/markdownWindowsPaths.ts index c4c04490a2140..d7c827c8dba8c 100644 --- a/packages/shared/src/markdownWindowsPaths.ts +++ b/packages/shared/src/markdownWindowsPaths.ts @@ -1,5 +1,6 @@ import type { Processor } from "unified"; import { decodeString } from "micromark-util-decode-string"; +import { UNFINISHED_DRIVE_PATH } from "./markdownLinks.ts"; import { isWindowsAbsolutePath } from "./path.ts"; interface DestinationCompileContext { @@ -18,9 +19,6 @@ function keepWindowsPathDestination(this: DestinationCompileContext, token: unkn : decoded; } -// A drive path that has not reached whitespace yet: `C:`, `C:\Users\me`, `C:/work`. -export const UNFINISHED_DRIVE_PATH = /(?:^|\W)[A-Za-z]:(?:[\\/]\S*)?$/; - interface EscapeCompileContext { readonly stack: ReadonlyArray<{ readonly type: string; diff --git a/packages/shared/src/textDirection.ts b/packages/shared/src/textDirection.ts index 0d4a7d88fd837..1efe672108cad 100644 --- a/packages/shared/src/textDirection.ts +++ b/packages/shared/src/textDirection.ts @@ -2,8 +2,8 @@ export type TextDirection = "ltr" | "rtl"; // Hebrew through Arabic Extended-A, their presentation forms, and the // supplementary right-to-left blocks. -const RTL_LETTER = /[֐-ࣿיִ-﷿ﹰ-\u{10800}-\u{10FFF}\u{1E800}-\u{1EFFF}]/u; -const LETTER = /\p{L}/u; +export const RTL_LETTER = /[֐-ࣿיִ-﷿ﹰ-\u{10800}-\u{10FFF}\u{1E800}-\u{1EFFF}]/u; +export const LETTER = /\p{L}/u; const SENTENCE_END = /(?<=[.!?؟])(?=0.5.1' + react: ^18.3.1 || ^19.0.0 + peerDependenciesMeta: + '@pierre/highlights': + optional: true + react: + optional: true + '@pinojs/redact@0.4.0': resolution: {integrity: sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg==} @@ -11629,12 +11623,6 @@ packages: react-is@19.2.7: resolution: {integrity: sha512-kZFnouyVv7eP/Phmrlo9FK+zcAdriZJvzxXHF1Sl1P377WSGe2G/JxVolhTrB/jeV47lKImhNUsijjHAAbcl/A==} - react-markdown@10.1.0: - resolution: {integrity: sha512-qKxVopLT/TyA6BX3Ue5NwabOsAzm0Q7kAPwq6L+wWDwisYs7R8vZ0nRXqq6rkueboxpkjvLGU9fWifiX/ZZFxQ==} - peerDependencies: - '@types/react': '>=18' - react: '>=18' - react-native-enriched-markdown@file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-16db4c75.tgz: resolution: {integrity: sha512-TdP2nTxn8W4jPJ5EU+9Ctgf6aOncENP/kMa9aEZpJDmWNLXkxPpcugHMWyZJt2o5WDYE4SPi0V6zV6mOl3+8cA==, tarball: file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-16db4c75.tgz} version: 1.2.0-t3.18 @@ -16556,6 +16544,11 @@ snapshots: - '@shikijs/themes' - shiki + '@pierre/words@file:apps/web/deps/pierre-words-0.2.2-t3.4-7c04b7f1.tgz(@pierre/highlights@0.5.1)(react@19.3.0)': + optionalDependencies: + '@pierre/highlights': 0.5.1 + react: 19.3.0 + '@pinojs/redact@0.4.0': {} '@polka/url@1.0.0-next.29': {} @@ -22531,24 +22524,6 @@ snapshots: react-is@19.2.7: {} - react-markdown@10.1.0(@types/react@19.3.0)(react@19.3.0)(supports-color@8.1.1): - dependencies: - '@types/hast': 3.0.5 - '@types/mdast': 4.0.4 - '@types/react': 19.3.0 - devlop: 1.1.0 - hast-util-to-jsx-runtime: 2.3.6(supports-color@8.1.1) - html-url-attributes: 3.0.1 - mdast-util-to-hast: 13.2.1(patch_hash=57ea46c73aea3c876ab8d351fe0482ddd081dcb4a0610576e399dbe5eb59d2b1) - react: 19.3.0 - remark-parse: 11.0.0(supports-color@8.1.1) - remark-rehype: 11.1.2 - unified: 11.0.5 - unist-util-visit: 5.1.0 - vfile: 6.0.3 - transitivePeerDependencies: - - supports-color - react-native-enriched-markdown@file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-16db4c75.tgz(katex@0.16.47)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0): dependencies: react: 19.3.0 diff --git a/scripts/check-changed.ts b/scripts/check-changed.ts index 135ff4ed201f7..d5881661f4cdc 100644 --- a/scripts/check-changed.ts +++ b/scripts/check-changed.ts @@ -433,6 +433,7 @@ const checkChanged = Effect.fn("checkChanged")(function* (input: { file === ".pnpmfile.cjs" || file.startsWith("patches/") || file.startsWith("apps/mobile/deps/") || + file.startsWith("apps/web/deps/") || path.basename(file) === "package.json", ); @@ -479,7 +480,7 @@ const checkChanged = Effect.fn("checkChanged")(function* (input: { if (yield* fs.exists(inRoot(manifest))) yield* copy(manifest); } } - for (const extra of ["apps/mobile/deps", "patches", ".pnpmfile.cjs"]) { + for (const extra of ["apps/mobile/deps", "apps/web/deps", "patches", ".pnpmfile.cjs"]) { if (yield* fs.exists(inRoot(extra))) yield* copy(extra); } const result = yield* vp(["install", "--lockfile-only", "--ignore-scripts"], temp); diff --git a/scripts/release-smoke.ts b/scripts/release-smoke.ts index 3c58be4cbabbf..e7acbf1e76ff1 100644 --- a/scripts/release-smoke.ts +++ b/scripts/release-smoke.ts @@ -68,11 +68,12 @@ function copyWorkspaceManifestFixture(targetRoot: string): void { NodeFS.cpSync(sourcePath, destinationPath); } - const mobileDependencies = NodePath.resolve(repoRoot, "apps/mobile/deps"); - if (NodeFS.existsSync(mobileDependencies)) { - NodeFS.cpSync(mobileDependencies, NodePath.resolve(targetRoot, "apps/mobile/deps"), { - recursive: true, - }); + // Fork tarballs that file: dependencies install from. + for (const forks of ["apps/mobile/deps", "apps/web/deps"]) { + const source = NodePath.resolve(repoRoot, forks); + if (NodeFS.existsSync(source)) { + NodeFS.cpSync(source, NodePath.resolve(targetRoot, forks), { recursive: true }); + } } const patchesDirectory = NodePath.resolve(repoRoot, "patches"); From c1fbdf6cdbe1e16379beebf8658b12a0b8a84f70 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Sat, 21 Nov 2026 21:53:58 -0800 Subject: [PATCH 4/8] fix(web): pasting text copied from Word inserts the text instead of an image (#40686) --- apps/web/src/components/chat/ChatComposer.tsx | 10 ++++- .../chat/composerAttachmentFiles.test.ts | 18 +++++++- .../chat/composerAttachmentFiles.ts | 44 +++++++++++++------ 3 files changed, 56 insertions(+), 16 deletions(-) diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx index 2c3bc34529ffd..6d4487adef153 100644 --- a/apps/web/src/components/chat/ChatComposer.tsx +++ b/apps/web/src/components/chat/ChatComposer.tsx @@ -133,6 +133,7 @@ import { fileAttachmentCapabilityBlockReason, fileAttachmentStagingLimit, isPreviewableComposerVideo, + isImageOnlyClipboardHtml, shouldHandleComposerAttachmentPaste, } from "./composerAttachmentFiles"; import { @@ -2918,7 +2919,14 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps) (!pastedContext && activeThreadId && files.length > 0 && - shouldHandleComposerAttachmentPaste({ files, plainText, bypassAutoAttachment })) + shouldHandleComposerAttachmentPaste({ + files, + plainText, + bypassAutoAttachment, + htmlIsOnlyImage: + plainText.length > 0 && + isImageOnlyClipboardHtml(event.clipboardData.getData("text/html")), + })) ) { event.preventDefault(); event.stopPropagation(); diff --git a/apps/web/src/components/chat/composerAttachmentFiles.test.ts b/apps/web/src/components/chat/composerAttachmentFiles.test.ts index 2a487b1f237de..f842566d7cd60 100644 --- a/apps/web/src/components/chat/composerAttachmentFiles.test.ts +++ b/apps/web/src/components/chat/composerAttachmentFiles.test.ts @@ -121,10 +121,26 @@ describe("composer attachment files", () => { ).toBe(true); }); - it("leaves an image-and-text clipboard to the text path under Paste as Text", () => { + it("leaves a Word image-and-text clipboard to the text path, with or without Paste as Text", () => { const image = new File(["png"], "image.png", { type: "image/png" }); const input = { files: [image], plainText: "Hello from Word", bypassAutoAttachment: true }; expect(shouldHandleComposerAttachmentPaste(input)).toBe(false); + // A plain paste of the same Word clipboard keeps the text too. + expect(shouldHandleComposerAttachmentPaste({ ...input, bypassAutoAttachment: false })).toBe( + false, + ); + // Firefox's Copy Image adds the image URL as text and only an as HTML; the image attaches. + expect( + shouldHandleComposerAttachmentPaste({ + files: [image], + plainText: "https://example.com/image.png", + htmlIsOnlyImage: true, + }), + ).toBe(true); + // Finder adds a copied file's name as text. + expect(shouldHandleComposerAttachmentPaste({ files: [image], plainText: "image.png" })).toBe( + true, + ); }); it("preserves text when the clipboard also includes generic image files", () => { diff --git a/apps/web/src/components/chat/composerAttachmentFiles.ts b/apps/web/src/components/chat/composerAttachmentFiles.ts index 041db7193d2e2..191c5841185ff 100644 --- a/apps/web/src/components/chat/composerAttachmentFiles.ts +++ b/apps/web/src/components/chat/composerAttachmentFiles.ts @@ -239,30 +239,46 @@ export function attachmentsToReleaseOnUploadCapabilityLoss( ); } +function isOnlyFileNames(text: string, files: ReadonlyArray): boolean { + const names = new Set(files.map((file) => file.name)); + return text + .split(/\r?\n/) + .filter((line) => line.length > 0) + .every((line) => names.has(line)); +} + +/** A browser's Copy Image puts only an in text/html; rich text sources put the text there. */ +export function isImageOnlyClipboardHtml(html: string): boolean { + if (html.length === 0) return false; + const body = new DOMParser().parseFromString(html, "text/html").body; + return body.querySelector("img") !== null && (body.textContent ?? "").trim().length === 0; +} + export function shouldHandleComposerAttachmentPaste(input: { readonly files: ReadonlyArray; readonly plainText: string; readonly bypassAutoAttachment?: boolean; + readonly htmlIsOnlyImage?: boolean; }): boolean { // Paste as Text keeps the text even when the source also put an image of it on the clipboard. if (input.bypassAutoAttachment && input.plainText.length > 0) return false; if ( - input.files.some((file) => { - if (isDngFile(file)) return true; - const classification = classifyComposerAttachmentFile(file); - return ( - classification === "image" || - classification === "unsupported-image" || - isSvgAttachment({ name: file.name, mimeType: file.type }) - ); - }) + input.files.some( + (file) => isDngFile(file) || isSvgAttachment({ name: file.name, mimeType: file.type }), + ) ) { return true; } - - if (input.plainText.length > 0) { - return false; + const hasImage = input.files.some((file) => { + const classification = classifyComposerAttachmentFile(file); + return classification === "image" || classification === "unsupported-image"; + }); + if (input.plainText.length === 0) { + return hasImage || input.files.some((file) => classifyComposerAttachmentFile(file) === "file"); } - - return input.files.some((file) => classifyComposerAttachmentFile(file) === "file"); + // Rich text sources (Word, Pages) add a picture of the text. Copy Image adds the image URL as + // text beside an , and a Finder copy adds the file names. + return ( + hasImage && (input.htmlIsOnlyImage === true || isOnlyFileNames(input.plainText, input.files)) + ); } From 3b3f8808f43cd67a82e19cbdc5cfcefa7f8d56d4 Mon Sep 17 00:00:00 2001 From: Yash Singh Date: Sun, 22 Nov 2026 00:03:48 -0600 Subject: [PATCH 5/8] fix(web): wait for image uploads before sending (#40672) Co-authored-by: Cursor Co-authored-by: Julius Marminge Co-authored-by: Claude Opus 5.5 --- .../src/components/ChatView.browser.test.tsx | 103 ++++++++++++++++++ apps/web/src/components/ChatView.tsx | 24 +++- apps/web/src/components/chat/ChatComposer.tsx | 91 ++++++++++++---- .../chat/ComposerFooterControls.tsx | 2 + .../chat/ComposerHeldSendBanner.tsx | 50 +++++++++ .../chat/ComposerPrimaryActions.tsx | 30 +++-- .../chat/preparingComposerImages.test.ts | 58 ++++++++++ .../chat/preparingComposerImages.ts | 90 +++++++++++++++ .../chat/useComposerAttachmentIntake.ts | 34 +++--- .../components/chat/useComposerSelection.ts | 6 + .../src/components/chat/useComposerSend.ts | 36 +++++- apps/web/src/i18n/translations/de.json | 20 ++-- apps/web/src/i18n/translations/en.json | 20 ++-- apps/web/src/i18n/translations/es.json | 20 ++-- apps/web/src/i18n/translations/fr.json | 20 ++-- apps/web/src/i18n/translations/ja.json | 20 ++-- apps/web/src/i18n/translations/ko.json | 20 ++-- apps/web/src/i18n/translations/pt-BR.json | 20 ++-- apps/web/src/i18n/translations/ru.json | 20 ++-- apps/web/src/i18n/translations/sv.json | 20 ++-- apps/web/src/i18n/translations/zh.json | 20 ++-- 21 files changed, 594 insertions(+), 130 deletions(-) create mode 100644 apps/web/src/components/chat/ComposerHeldSendBanner.tsx create mode 100644 apps/web/src/components/chat/preparingComposerImages.test.ts diff --git a/apps/web/src/components/ChatView.browser.test.tsx b/apps/web/src/components/ChatView.browser.test.tsx index ae6628ba6733c..cfd06a8864e0d 100644 --- a/apps/web/src/components/ChatView.browser.test.tsx +++ b/apps/web/src/components/ChatView.browser.test.tsx @@ -112,6 +112,19 @@ vi.mock("../../../../packages/client-runtime/src/connection/driver.ts", async (i return { ...actual, layer: Layer.succeed(actual.ConnectionDriver, fakeDriver) }; }); +// Null runs the real compression; a test sets it to hold an image in preparation. +const compression = vi.hoisted(() => ({ gate: null as Promise | null })); +vi.mock(import("~/lib/imageCompression"), async (original) => { + const actual = await original(); + return { + ...actual, + prepareImageForAttachment: async (...args) => { + await compression.gate; + return actual.prepareImageForAttachment(...args); + }, + }; +}); + vi.mock(import("~/rpc/requestLatencyState"), async (original) => ({ ...(await original()), trackRpcRequestSent: () => {}, @@ -438,6 +451,96 @@ it("an interrupted image-only first send of a new thread says it may not have be expect(page.getByText("Copy message", { exact: true }).query()).toBeNull(); }); +it.each(["new", "existing"] as const)( + "Enter while an image compresses shows a cancellable banner, cancels on edit or Esc, and still sends after leaving a %s thread", + async (kind) => { + const thread = threadWithHistory(`upload-wait-${kind}`, 1); + const other = threadWithHistory(`upload-wait-other-${kind}`, 1); + using _environment = installFakeEnvironment(kind === "existing" ? [thread, other] : [other], { + acceptCommands: true, + }); + __setClientSettingsForTests({ + ...DEFAULT_CLIENT_SETTINGS, + onboardingCompletedAt: "2026-01-01T00:00:00.000Z", + }); + const draftId = DraftId.make(`draft-upload-wait-${kind}`); + if (kind === "new") { + useComposerDraftStore + .getState() + .setProjectDraftThreadId(scopeProjectRef(ENVIRONMENT_ID, PROJECT_ID), draftId, { + threadId: thread.id, + }); + } + using launch = holdRpc(ORCHESTRATION_V2_WS_METHODS.launchThread, Effect.interrupt); + const router = getRouter( + createMemoryHistory({ + initialEntries: [kind === "new" ? `/draft/${draftId}` : `/${ENVIRONMENT_ID}/${thread.id}`], + }), + ); + await router.load(); + await using _app = await render(, { + // AppRoot brings its own router. + router: false, + }); + const compressed = Promise.withResolvers(); + compression.gate = compressed.promise; + using _compression = { [Symbol.dispose]: () => (compression.gate = null) }; + using _uploads = acceptAttachmentUploads(); + const editor = page.getByTestId("composer-editor"); + await expect.element(editor).toBeVisible(); + await expect.element(page.getByText("render", { exact: true }).first()).toBeVisible(); + + await userEvent.click(editor); + const clipboardData = new DataTransfer(); + clipboardData.items.add(new File([PNG], "shot.png", { type: "image/png" })); + editor + .element() + .dispatchEvent( + new ClipboardEvent("paste", { clipboardData, bubbles: true, cancelable: true }), + ); + + // Enter arms the send and shows the banner plus a disabled spinner button. + await userEvent.keyboard("check image{Enter}"); + await expect.element(page.getByText("Sending once image is ready")).toBeVisible(); + const waitingButton = page.getByRole("button", { name: "Sending when ready", exact: true }); + await expect.element(waitingButton).toBeDisabled(); + await expect.element(waitingButton).toHaveAttribute("aria-busy", "true"); + + // Typing disarms the queued send and keeps the edit. + await userEvent.keyboard(" now"); + await expect.element(page.getByText("Sending once image is ready")).not.toBeInTheDocument(); + await expect.element(editor).toHaveTextContent("check image now"); + + // Enter arms again; Esc cancels cleanly. + await userEvent.keyboard("{Enter}"); + await expect.element(page.getByText("Sending once image is ready")).toBeVisible(); + await userEvent.keyboard("{Escape}"); + await expect.element(page.getByText("Sending once image is ready")).not.toBeInTheDocument(); + + // Enter arms again; leaving the thread still sends once the image is ready. + await userEvent.keyboard("{Enter}"); + await expect.element(page.getByText("Sending once image is ready")).toBeVisible(); + await router.navigate({ to: `/${ENVIRONMENT_ID}/${other.id}` }); + await expect.element(page.getByText(`Answer 0 for upload-wait-other-${kind}.`)).toBeVisible(); + + compressed.resolve(); + await vi.waitFor(() => { + if (kind === "new") { + expect(launch.calls).toHaveLength(1); + } else { + expect(dispatchedCommands()).toContainEqual( + expect.objectContaining({ + type: "message.dispatch", + threadId: thread.id, + attachments: [expect.objectContaining({ type: "image", id: "upload-1" })], + }), + ); + } + }); + launch.release(); + }, +); + it("opens the thread actions menu for an older settled thread the shell leaves out", async () => { const thread = { ...threadWithHistory("older-settled", 1), olderSettled: true as const }; using _environment = installFakeEnvironment([thread]); diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx index ea16d027fcfe9..254bbd4eb9e42 100644 --- a/apps/web/src/components/ChatView.tsx +++ b/apps/web/src/components/ChatView.tsx @@ -59,7 +59,9 @@ import { visibleThreadPullRequests } from "@t3tools/shared/threadPullRequests"; import type { UsageLimitSourceSnapshots } from "@t3tools/contracts"; import { feedbackBannerItem } from "./chat/ComposerFeedback"; import { freshSessionBannerItem } from "./chat/ComposerFreshSession"; +import { heldComposerSendBannerItem } from "./chat/ComposerHeldSendBanner"; import { armFreshSession, disarmFreshSession, useFreshSessionArmed } from "./chat/freshSessionArms"; +import { cancelHeldComposerSend, useComposerSendHeld } from "./chat/preparingComposerImages"; import { useUsageLimitsPanel } from "./chat/useUsageLimitsPanel"; import { useWorktreeSetup } from "./chat/useWorktreeSetup"; import { useChatShortcuts } from "./chat/useChatShortcuts"; @@ -253,6 +255,7 @@ import { type ComposerFileAttachment, type ComposerImageAttachment, type DraftThreadEnvMode, + composerTargetKey, useComposerDraftStore, DraftId, } from "../composerDraftStore"; @@ -2658,7 +2661,16 @@ export default function ChatView(props: ChatViewProps) { // While a question or approval owns the composer, its text answers that, not the agent. const freshSessionCommandAvailable = freshSessionAvailable && activePendingApproval === null && pendingUserInputs.length === 0; - const toggleKeepFullHistory = () => setKeepFullHistory(routeThreadKey, !keepFullHistory); + const composerDraftTargetKey = composerTargetKey(composerDraftTarget); + const composerSendHeld = useComposerSendHeld(composerDraftTargetKey); + const cancelHeldSendStable = useStableCallback(() => { + cancelHeldComposerSend(composerDraftTargetKey); + focusComposerStable(); + }); + const toggleKeepFullHistory = () => { + cancelHeldComposerSend(composerDraftTargetKey); + setKeepFullHistory(routeThreadKey, !keepFullHistory); + }; const toggleKeepFullHistoryStable = useStableCallback(toggleKeepFullHistory); const armFreshSessionStable = useStableCallback(() => armFreshSession(routeThreadKey)); const handleRestoreThreadBranch = () => { @@ -2769,6 +2781,14 @@ export default function ChatView(props: ChatViewProps) { freshSessionPending && activePendingApproval === null ? [freshSessionBannerItem(() => disarmFreshSession(routeThreadKey), messages)] : []; + const heldSendItems = composerSendHeld + ? [ + heldComposerSendBannerItem( + { draftTarget: composerDraftTarget, onCancel: cancelHeldSendStable }, + messages, + ), + ] + : []; if (!localCheckoutBranchMismatch || !showBranchMismatchBanner || !activeBranchMismatchKey) { return [ ...feedbackBannerItems, @@ -2778,6 +2798,7 @@ export default function ChatView(props: ChatViewProps) { ...usageLimitsItems, ...projectCloneItems, ...freshSessionItems, + ...heldSendItems, ...systemComposerBannerItems, ]; } @@ -2789,6 +2810,7 @@ export default function ChatView(props: ChatViewProps) { ...usageLimitsItems, ...projectCloneItems, ...freshSessionItems, + ...heldSendItems, ...systemComposerBannerItems, branchMismatchBannerItem( { diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx index 6d4487adef153..6fb651c3471f6 100644 --- a/apps/web/src/components/chat/ChatComposer.tsx +++ b/apps/web/src/components/chat/ChatComposer.tsx @@ -252,6 +252,7 @@ import { useNavigate } from "@tanstack/react-router"; import { assistantCitationLabel } from "@t3tools/shared/assistantCitations"; import { assistantCitationNavigation } from "../../lib/assistantCitationNavigation"; import { Button } from "../ui/button"; +import { Spinner } from "../ui/spinner"; import { useManagedPolicy } from "../../state/managedPolicy"; import { hasProviderSetup } from "./ProviderStatusBanner"; import { type AppModelOption, getAppModelOptionsForInstance } from "../../modelSelection"; @@ -286,10 +287,13 @@ import { useComposerStash } from "./useComposerStash"; import { useComposerContextImport } from "./useComposerContextImport"; import { useComposerAttachmentIntake } from "./useComposerAttachmentIntake"; import { + cancelHeldComposerSend, countPreparingComposerImages, + useComposerSendHeld, usePreparingComposerImages, useSubmitAfterPreparingImages, } from "./preparingComposerImages"; +import { HELD_COMPOSER_SEND_BANNER_ID } from "./ComposerHeldSendBanner"; import { ComposerControlsBar } from "./ComposerControlsBar"; import { composerCommandKeyHandler } from "./composerCommandKey"; import { promptSuggestionToAccept, usePromptSuggestion } from "./usePromptSuggestion"; @@ -729,8 +733,18 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps) uncommittedSnapShotIds, standaloneComposerImages, } = useComposerImageGroups(attachmentDraftTarget, composerImages, composerPreviewAnnotations); - const preparingComposerImages = usePreparingComposerImages(attachmentTargetKey).filter( - (image) => !image.hidden, + const allPreparingComposerImages = usePreparingComposerImages(attachmentTargetKey); + const preparingComposerImages = allPreparingComposerImages.filter((image) => !image.hidden); + // A message send waits for these itself; an answer waits in the composer below. + const messageHasPreparingImages = + questionAttachmentTarget === null && allPreparingComposerImages.length > 0; + const composerSendHeld = useComposerSendHeld(composerDraftTargetKey); + const cancelHeldSend = () => cancelHeldComposerSend(composerDraftTargetKey); + const handleMultipleModelSelectionsChangeStable = useStableCallback( + (next: React.SetStateAction | null>) => { + cancelHeldSend(); + setMultipleModelSelections(next); + }, ); const nonPersistedComposerImageIds = attachmentDraft.nonPersistedImageIds; const uploadsByImageId = useAttachmentUploadStore((state) => state.uploadsByImageId); @@ -1267,21 +1281,28 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps) isComplete: Boolean(activePendingResolvedAnswers), } : null; + const hasMessageToSend = composerSendState.hasSendableContent || messageHasPreparingImages; const showResumeAction = - canResume && !composerDraftHasUserContent(composerDraft) && !isEditingQueuedMessage; + canResume && + !composerDraftHasUserContent(composerDraft) && + !messageHasPreparingImages && + !isEditingQueuedMessage; const collapsedComposerPrimaryActionDisabled = phase === "running" || isSendBusy || + composerSendHeld || isSendDisabled || noProviderAvailable || projectSelectionRequired || environmentUnavailable !== null || - (!composerSendState.hasSendableContent && !showResumeAction); - const collapsedComposerPrimaryActionLabel = showResumeAction - ? gt("Resume thread") - : props.resumeCompactionTokens !== null && !props.keepFullHistory - ? gt("Open composer to compact and send") - : gt("Send message"); + (!hasMessageToSend && !showResumeAction); + const collapsedComposerPrimaryActionLabel = composerSendHeld + ? gt("Sending when ready") + : showResumeAction + ? gt("Resume thread") + : props.resumeCompactionTokens !== null && !props.keepFullHistory + ? gt("Open composer to compact and send") + : gt("Send message"); const showMobilePendingAnswerActions = isMobileViewport && !isComposerCollapsedMobile && pendingPrimaryAction !== null; @@ -2196,7 +2217,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps) if (activePendingProgress) { return activePendingProgress.isLastQuestion && Boolean(activePendingResolvedAnswers); } - return composerSendState.hasSendableContent; + return hasMessageToSend; }; const submitComposerRef = useRef< @@ -2282,9 +2303,14 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps) event?.preventDefault(); return false; } - // Sending now would leave a still-compressing image out of the turn, so wait for it. + if (composerSendHeld) { + event?.preventDefault(); + return false; + } + // Sending now would leave a still-compressing image out of the answer, so wait for it. if ( activeThreadId && + questionAttachmentTarget && submitAfterPreparingImages(() => submitComposerRef.current(dispatchMode, submissionIntent)) ) { event?.preventDefault(); @@ -2467,8 +2493,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps) ? promptSuggestion : null; - const onComposerCommandKey = (key: string, event: KeyboardEvent, isTaskItem?: boolean) => - composerCommandKeyHandler({ + const onComposerCommandKey = (key: string, event: KeyboardEvent, isTaskItem?: boolean) => { + if (key === "Escape" && composerSendHeld && !event.isComposing) { + cancelHeldSend(); + return true; + } + return composerCommandKeyHandler({ keybindings, getShortcutContext, sendShortcut: settings.sendShortcut, @@ -2507,6 +2537,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps) promptSuggestion: offeredPromptSuggestion, dismissPromptSuggestion, })(key, event, isTaskItem); + }; const { stashQueue, @@ -2615,7 +2646,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps) isSendBusy={isSendBusy} multipleModelsEnabled={routeKind === "draft" && supportsMultipleModels} multipleModelSelections={multipleModelSelections} - onMultipleModelSelectionsChange={setMultipleModelSelections} + onMultipleModelSelectionsChange={handleMultipleModelSelectionsChangeStable} selectedModelSelection={selectedModelSelection} onProviderModelSelect={onProviderModelSelect} activeThreadModelSelection={activeThreadModelSelection} @@ -2713,7 +2744,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps) const shelfItems = hasBlockingComposerTopDrawer ? bannerItems.filter( (item) => - item.group === "environment" && (item.variant === "error" || item.variant === "warning"), + item.id === HELD_COMPOSER_SEND_BANNER_ID || + (item.group === "environment" && + (item.variant === "error" || item.variant === "warning")), ) : bannerItems; @@ -3518,6 +3551,17 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
    { + if ( + event.key === "Escape" && + composerSendHeld && + !event.defaultPrevented && + !event.nativeEvent.isComposing + ) { + event.preventDefault(); + cancelHeldSend(); + } + }} onFocusCapture={(event) => { const activeElement = event.target; if ( @@ -3652,7 +3696,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps) canOperateThread={canOperateThread} canInterrupt={canInterrupt} runId={activeThread?.runtime?.activeRunId ?? null} - hasSendableContent={composerSendState.hasSendableContent} + hasSendableContent={hasMessageToSend} isEditingQueuedMessage={isEditingQueuedMessage} onInterrupt={handleInterruptPrimaryActionStable} > @@ -3662,6 +3706,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps) className="flex size-8 shrink-0 items-center justify-center rounded-full bg-message-action text-message-action-foreground hover:bg-message-action-hover disabled:opacity-64" disabled={collapsedComposerPrimaryActionDisabled} aria-label={collapsedComposerPrimaryActionLabel} + aria-busy={composerSendHeld || isSendBusy || undefined} onPointerDown={(event) => event.preventDefault()} onClick={(event) => { event.stopPropagation(); @@ -3671,7 +3716,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps) else submitComposer(); }} > - {showResumeAction ? ( + {composerSendHeld || isSendBusy ? ( +