pi-cursor-sdk 0.1.36 → 0.1.38

package/src/cursor-provider-run-finalizer.ts

@@ -1,6 +1,5 @@
 import type { AssistantMessage } from "@earendil-works/pi-ai";
-import { cursorLiveRuns } from "./cursor-provider-live-run-drain.js";
-import { abandonSessionCursorAgent } from "./cursor-provider-live-run-drain.js";
+import { abandonSessionCursorAgent, cursorLiveRuns } from "./cursor-provider-live-run-drain.js";
 import {
 	classifyCursorRunEmission,
 	getCursorRunAbortMessage,
@@ -12,7 +11,10 @@ import {
 	sanitizeCursorProviderError,
 } from "./cursor-provider-errors.js";
 import { CursorLiveRunAbortError } from "./cursor-live-run-coordinator.js";
-import type { IncompleteCursorToolRunOutcomeInput } from "./cursor-incomplete-tool-visibility.js";
+import {
+	buildIncompleteCursorToolRunOutcome,
+	type IncompleteCursorToolRunOutcomeInput,
+} from "./cursor-incomplete-tool-visibility.js";
 import type { installCursorSdkProcessErrorGuard } from "./cursor-sdk-process-error-guard.js";
 import type { CursorSdkEventDebugSink } from "./cursor-sdk-event-debug.js";
 import { awaitFinalizeCursorRunOutcome } from "./cursor-provider-turn-finalize.js";
@@ -24,8 +26,6 @@ import type {
 } from "./cursor-provider-turn-types.js";
 import { applyCursorApproximateUsage } from "./cursor-usage-accounting.js";
 import { hasUsableText } from "./cursor-record-utils.js";
-import { buildIncompleteCursorToolRunOutcome } from "./cursor-incomplete-tool-visibility.js";
-
 export type CursorTurnTerminalEvent =
 	| {
 			kind: "direct";

package/src/cursor-provider-run-outcome.ts

@@ -10,7 +10,6 @@ import { hasUsableText } from "./cursor-record-utils.js";
 import {
 	buildIncompleteCursorToolRunOutcome,
 	type IncompleteCursorToolRunOutcome,
-	type IncompleteCursorToolRunOutcomeInput,
 } from "./cursor-incomplete-tool-visibility.js";
 
 /** Unified SDK wait() facts consumed by live and direct emission strategies. */

package/src/cursor-provider-turn-coordinator.ts

@@ -13,7 +13,7 @@ import {
 	type IncompleteCursorToolRunOutcome,
 } from "./cursor-incomplete-tool-visibility.js";
 import { getToolName } from "./cursor-transcript-utils.js";
-import { classifyCursorToolVisibility } from "./cursor-tool-visibility.js";
+import { getNormalizedCursorToolName } from "./cursor-tool-visibility.js";
 import { buildCursorPiToolDisplay } from "./cursor-tool-transcript.js";
 import { getField } from "./cursor-record-utils.js";
 import { CursorTurnDisplayRouter } from "./cursor-provider-turn-display-router.js";
@@ -32,10 +32,6 @@ import {
 	getToolFingerprint,
 } from "./cursor-provider-turn-tool-ledger.js";
 
-function getNormalizedCursorToolName(toolCall: unknown): string {
-	return classifyCursorToolVisibility(toolCall).normalizedName;
-}
-
 export interface CursorSdkTurnCoordinatorOptions {
 	stream: AssistantMessageEventStream;
 	partial: AssistantMessage;
@@ -207,6 +203,9 @@ export class CursorSdkTurnCoordinator {
 				identity: resolution.identity,
 				source: resolution.source,
 			});
+			if (resolution.matchedStartedCallId && resolution.matchedStartedCallId !== update.callId) {
+				this.ledger.recordCompletedIdentity(`cursor-tool:${resolution.matchedStartedCallId}`);
+			}
 			return;
 		}
 		if (update.type === "shell-output-delta") {

package/src/cursor-provider-turn-display-router.ts

@@ -10,7 +10,11 @@ import {
 	type IncompleteCursorToolDiscardReason,
 } from "./cursor-incomplete-tool-visibility.js";
 import { scrubPiToolDisplay, scrubSensitiveText } from "./cursor-sensitive-text.js";
-import { buildCursorPiToolDisplay, formatCursorToolTranscript, getCursorCreatePlanText } from "./cursor-tool-transcript.js";
+import {
+	buildCursorPiToolDisplay,
+	formatCursorToolTranscript,
+	getCursorCreatePlanText,
+} from "./cursor-tool-transcript.js";
 import { getToolName } from "./cursor-transcript-utils.js";
 import type { CursorPartialContentEmitter } from "./cursor-partial-content-emitter.js";
 import type { CursorToolDisplaySource } from "./cursor-provider-turn-tool-ledger.js";

package/src/cursor-provider-turn-emit.ts

@@ -1,10 +1,10 @@
 import { CursorLiveRunAbortError } from "./cursor-live-run-coordinator.js";
 import {
+	cursorLiveRuns,
 	drainCursorLiveRunTurn,
 	flushPendingCursorLiveRunTraceEventsToStream,
 	settleCursorLiveToolBatch,
 } from "./cursor-provider-live-run-drain.js";
-import { cursorLiveRuns } from "./cursor-provider-live-run-drain.js";
 import {
 	buildIncompleteCursorToolRunOutcome,
 	type IncompleteCursorToolRunOutcomeInput,

package/src/cursor-provider-turn-lifecycle-emitter.ts

@@ -8,13 +8,9 @@ import {
 	formatCursorToolLifecycleProgressText,
 	isCursorToolLifecycleEligible,
 } from "./cursor-tool-lifecycle.js";
-import { classifyCursorToolVisibility } from "./cursor-tool-visibility.js";
+import { getNormalizedCursorToolName } from "./cursor-tool-visibility.js";
 import { getStartedToolCallFingerprint } from "./cursor-provider-turn-tool-ledger.js";
 
-function getNormalizedCursorToolName(toolCall: unknown): string {
-	return classifyCursorToolVisibility(toolCall).normalizedName;
-}
-
 export interface CursorToolLifecycleEmitterOptions {
 	liveRun?: CursorLiveRun;
 	resolvedApiKey?: string;

package/src/cursor-provider-turn-prepare.ts

@@ -8,23 +8,27 @@ import {
 	resetSessionCursorAgent,
 } from "./cursor-session-agent.js";
 import type { CursorPiBridgeToolRequest } from "./cursor-pi-tool-bridge.js";
-import { estimateCursorPromptInputTokens, getCursorPromptOptions } from "./cursor-usage-accounting.js";
+import { estimateCursorPromptTokens } from "./context.js";
+import { getCursorPromptOptions } from "./cursor-usage-accounting.js";
 import { getActiveContextToolNames } from "./cursor-context-tools.js";
 import type { CursorLiveRun } from "./cursor-live-run-coordinator.js";
-import { abandonSessionCursorAgent, cursorLiveRuns } from "./cursor-provider-live-run-drain.js";
-import { createCursorNativeReplayId } from "./cursor-provider-live-run-drain.js";
-import { getEffectiveCursorAgentMode, getEffectiveFastForModelId } from "./cursor-state.js";
+import {
+	abandonSessionCursorAgent,
+	createCursorNativeReplayId,
+	cursorLiveRuns,
+} from "./cursor-provider-live-run-drain.js";
+import { getCursorProviderAgentModeOrThrow, getEffectiveFastForModelId } from "./cursor-state.js";
 import { buildCursorModelSelection } from "./model-discovery.js";
 import { getEffectiveCursorSettingSources } from "./cursor-setting-sources.js";
-import { resolveCursorPiToolBridgeEnabled } from "./cursor-pi-tool-bridge-snapshot.js";
+import { resolveCursorPiToolBridgeEnabled } from "./cursor-pi-tool-bridge-env.js";
 import {
 	buildCursorToolManifestText,
 	resolveCursorToolManifestEnabled,
 } from "./cursor-tool-manifest.js";
-import { isCursorNativeToolDisplayRuntimeEnabled } from "./cursor-native-tool-display.js";
+import { isCursorNativeToolDisplayRuntimeEnabled } from "./cursor-native-tool-display-state.js";
 import { MISSING_CURSOR_API_KEY_MESSAGE } from "./cursor-provider-errors.js";
 import { CursorSdkTurnCoordinator } from "./cursor-provider-turn-coordinator.js";
-import { resolveCursorApiKey } from "./cursor-provider-turn-api-key.js";
+import { resolveCursorApiKey } from "./cursor-api-key.js";
 import { loadCursorSdk } from "./cursor-sdk-runtime.js";
 import type {
 	CursorProviderTurnPrepareResult,
@@ -53,7 +57,7 @@ export async function prepareCursorProviderTurn(
 
 	try {
 		const fastEnabled = getEffectiveFastForModelId(model.id);
-		const agentMode = getEffectiveCursorAgentMode();
+		const agentMode = getCursorProviderAgentModeOrThrow();
 		const selection = buildCursorModelSelection(model.id, options?.reasoning ?? "off", fastEnabled);
 		const settingSources = getEffectiveCursorSettingSources();
 		const { Agent } = await loadCursorSdk();
@@ -116,7 +120,7 @@ export async function prepareCursorProviderTurn(
 			images: prompt.images.length > 0 ? prompt.images : undefined,
 		};
 		const sessionBridgeRun = bridgeRun;
-		const promptInputTokens = estimateCursorPromptInputTokens(prompt, promptOptions);
+		const promptInputTokens = estimateCursorPromptTokens(prompt, promptOptions);
 		const useNativeToolReplay = isCursorNativeToolDisplayRuntimeEnabled();
 		const activeToolNames = getActiveContextToolNames(context);
 		sdkEventDebug?.recordProviderMeta({

package/src/cursor-provider-turn-runner.ts

@@ -1,6 +1,6 @@
 import { CursorLiveRunAbortError } from "./cursor-live-run-coordinator.js";
 import { drainExistingCursorLiveRunBeforeSend } from "./cursor-provider-live-run-drain.js";
-import { getCursorSessionCwd } from "./cursor-session-cwd.js";
+import { getCursorSessionCwd } from "./cursor-session-scope.js";
 import { installCursorSdkProcessErrorGuard } from "./cursor-sdk-process-error-guard.js";
 import { CursorSdkEventDebugSink } from "./cursor-sdk-event-debug.js";
 import { awaitFinalizeCursorRunOutcome } from "./cursor-provider-turn-finalize.js";
@@ -17,7 +17,6 @@ import type {
 	CursorProviderTurnSendResult,
 } from "./cursor-provider-turn-types.js";
 
-export { resolveCursorApiKey } from "./cursor-provider-turn-api-key.js";
 export type { CursorProviderTurnRunnerParams } from "./cursor-provider-turn-types.js";
 
 export class CursorProviderTurnRunner {
@@ -34,13 +33,6 @@ export class CursorProviderTurnRunner {
 		if (this.options?.signal?.aborted) throw new CursorLiveRunAbortError();
 	}
 
-	private discardIncompleteTools(
-		prepared: CursorProviderTurnPrepareResult | undefined,
-		outcome: import("./cursor-incomplete-tool-visibility.js").IncompleteCursorToolRunOutcomeInput,
-	): void {
-		discardIncompleteToolsFromPrepared(prepared, outcome);
-	}
-
 	async run(sdkProcessErrorGuard: ReturnType<typeof installCursorSdkProcessErrorGuard>): Promise<void> {
 		const { stream, partial, model, context, options, sdkEventDebugRef } = this.params;
 		let prepared: CursorProviderTurnPrepareResult | undefined;
@@ -94,13 +86,13 @@ export class CursorProviderTurnRunner {
 					send,
 					prepared,
 					modelId: model.id,
-					discardIncompleteTools: (outcome) => this.discardIncompleteTools(prepared, outcome),
+					discardIncompleteTools: (outcome) => discardIncompleteToolsFromPrepared(prepared, outcome),
 				});
 				await emitCursorLiveTurn({
 					params: this.params,
 					prepared,
 					sdkEventDebug: this.sdkEventDebug,
-					discardIncompleteTools: (outcome) => this.discardIncompleteTools(prepared, outcome),
+					discardIncompleteTools: (outcome) => discardIncompleteToolsFromPrepared(prepared, outcome),
 				});
 				return;
 			}

package/src/cursor-provider-turn-sdk-normalizer.ts

@@ -1,4 +1,4 @@
-import { mergeCursorToolCalls } from "./cursor-tool-transcript.js";
+import { asRecord } from "./cursor-record-utils.js";
 import type { CursorLiveRun } from "./cursor-live-run-coordinator.js";
 import {
 	mergeShellOutputDeltasIntoCursorToolCall,
@@ -8,6 +8,22 @@ import type { CursorToolCompletionLedger } from "./cursor-provider-turn-tool-led
 
 export type CursorToolCompletionSource = "delta" | "step";
 
+function mergeCursorToolCalls(startedToolCall: unknown, completedToolCall: unknown): unknown {
+	const started = asRecord(startedToolCall);
+	const completed = asRecord(completedToolCall);
+	if (!started) return completedToolCall;
+	if (!completed) return startedToolCall;
+	return {
+		...started,
+		...completed,
+		name: completed.name ?? started.name,
+		type: completed.type ?? started.type,
+		args: completed.args ?? started.args,
+		input: completed.input ?? started.input,
+		result: completed.result ?? started.result,
+	};
+}
+
 export type ToolCompletionResolution =
 	| { action: "ignore-bridge"; identity?: string }
 	| {
@@ -47,15 +63,22 @@ export function resolveCursorToolCompletion(options: ResolveCursorToolCompletion
 		const callId = options.callId;
 		identity = typeof callId === "string" ? `cursor-tool:${callId}` : undefined;
 		resolvedToolCall = mergeCursorToolCalls(options.startedToolCall, options.toolCall);
-		if (typeof callId === "string") {
+		if (typeof callId === "string" && options.ledger.hasStartedToolCall(callId)) {
 			options.onClearStartedCallId?.(callId);
 			options.ledger.clearStartedToolCall(callId);
+		} else {
+			matchedStartedCallId = options.ledger.removeStartedToolCallForStep(options.toolCall, callId);
+			if (matchedStartedCallId) options.onClearStartedCallId?.(matchedStartedCallId);
 		}
 		resolvedToolCall = mergeShellOutputDeltasIntoCursorToolCall(
 			resolvedToolCall,
-			typeof callId === "string" ? options.shellOutput.takeDeltasForCall(callId) : undefined,
+			matchedStartedCallId
+				? options.shellOutput.takeDeltasForCall(matchedStartedCallId)
+				: typeof callId === "string"
+					? options.shellOutput.takeDeltasForCall(callId)
+					: undefined,
 		);
-		source = identity ? "started" : "fallback";
+		source = identity || matchedStartedCallId ? "started" : "fallback";
 	} else {
 		matchedStartedCallId = options.ledger.removeStartedToolCallForStep(options.toolCall, options.callId);
 		if (matchedStartedCallId) {
@@ -77,7 +100,7 @@ export function resolveCursorToolCompletion(options: ResolveCursorToolCompletion
 	}
 
 	if (options.source === "delta") {
-		return { action: "handle", toolCall: resolvedToolCall, identity, source };
+		return { action: "handle", toolCall: resolvedToolCall, identity, source, matchedStartedCallId };
 	}
 	return {
 		action: "handle",

package/src/cursor-provider-turn-send.ts

@@ -1,7 +1,7 @@
 import type { SendOptions } from "@cursor/sdk";
+import { countCursorAgentMessages } from "./cursor-agent-message-web-tools.js";
 import { CursorLiveRunAbortError } from "./cursor-live-run-coordinator.js";
 import { cursorLiveRuns } from "./cursor-provider-live-run-drain.js";
-import { getCursorAgentMessageOffset } from "./cursor-provider-turn-message-offset.js";
 import type { installCursorSdkProcessErrorGuard } from "./cursor-sdk-process-error-guard.js";
 import type {
 	CursorProviderTurnRunnerParams,
@@ -41,7 +41,12 @@ export async function sendCursorProviderTurn(sendParams: SendCursorProviderTurnP
 	try {
 		abortRegistration?.signal.addEventListener("abort", abortListener, { once: true });
 		throwIfAborted();
-		const cursorAgentMessageOffset = await getCursorAgentMessageOffset(agent.agentId, cwd, sdkEventDebug);
+		let cursorAgentMessageOffset: number | undefined;
+		try {
+			cursorAgentMessageOffset = await countCursorAgentMessages(agent.agentId, cwd);
+		} catch (error) {
+			sdkEventDebug?.recordError("cursor_agent_message_count", error);
+		}
 		throwIfAborted();
 		sdkEventDebug?.recordSendMeta({
 			mode: meta.sendPlan.mode,

package/src/cursor-provider-turn-types.ts

@@ -61,7 +61,7 @@ export type CursorProviderTurnRuntime = DirectCursorProviderTurnRuntime | LiveCu
  * Send, finalize, and cleanup phases receive this immutable object instead of
  * keeping parallel liveRun/turnCoordinator/resource bags in sync by convention.
  */
-export interface PreparedCursorProviderTurn {
+export interface CursorProviderTurnPrepareResult {
 	agent: SDKAgent;
 	cwd: string;
 	payload: CursorProviderTurnSendPayload;
@@ -74,8 +74,6 @@ export interface PreparedCursorProviderTurn {
 	runtime: CursorProviderTurnRuntime;
 }
 
-export type CursorProviderTurnPrepareResult = PreparedCursorProviderTurn;
-
 export interface CursorProviderTurnSend {
 	run: Awaited<ReturnType<SDKAgent["send"]>>;
 	cursorAgentMessageOffset: number | undefined;

package/src/cursor-provider.ts

@@ -8,6 +8,7 @@ import {
 	type SimpleStreamOptions,
 } from "@earendil-works/pi-ai";
 import {
+	cursorLiveRuns,
 	DEFAULT_CURSOR_NATIVE_REPLAY_IDLE_DISPOSE_MS,
 	getPendingCursorLiveRun,
 	hasTrailingUserMessagesAfterToolResults,
@@ -15,12 +16,12 @@ import {
 	resetCursorNativeReplayIdleDisposeMs,
 	setCursorNativeReplayIdleDisposeMs,
 } from "./cursor-provider-live-run-drain.js";
-import { cursorLiveRuns } from "./cursor-provider-live-run-drain.js";
 import { disposeAllSessionCursorAgents } from "./cursor-session-agent.js";
 import { attachCursorSdkEventDebugPiStreamTap, type CursorSdkEventDebugSink } from "./cursor-sdk-event-debug.js";
 import { installCursorSdkProcessErrorGuard } from "./cursor-sdk-process-error-guard.js";
 import { sanitizeCursorProviderError } from "./cursor-provider-errors.js";
-import { CursorProviderTurnRunner, resolveCursorApiKey } from "./cursor-provider-turn-runner.js";
+import { resolveCursorApiKey } from "./cursor-api-key.js";
+import { CursorProviderTurnRunner } from "./cursor-provider-turn-runner.js";
 
 function makeInitialMessage(model: Model<Api>): AssistantMessage {
 	return {

package/src/cursor-question-tool.ts

@@ -1,8 +1,9 @@
-import type { BeforeAgentStartEvent, ExtensionAPI, ExtensionContext, ExtensionHandler, SessionStartEvent, TurnStartEvent } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import { isCursorModel } from "./cursor-model.js";
-import { resolveCursorPiToolBridgeEnabled } from "./cursor-pi-tool-bridge.js";
+import { registerCursorModelLifecycle, type CursorModelLifecycleExtensionApi } from "./cursor-model-lifecycle.js";
+import { resolveCursorPiToolBridgeEnabled } from "./cursor-pi-tool-bridge-env.js";
 
 export const CURSOR_ASK_QUESTION_TOOL_NAME = "cursor_ask_question";
 
@@ -35,12 +36,7 @@ interface CursorQuestionDetails {
 	cancelled: boolean;
 }
 
-interface CursorQuestionToolExtensionApi extends Pick<ExtensionAPI, "getActiveTools" | "registerTool" | "setActiveTools"> {
-	on(event: "session_start", handler: ExtensionHandler<SessionStartEvent>): void;
-	on(event: "before_agent_start", handler: ExtensionHandler<BeforeAgentStartEvent>): void;
-	on(event: "turn_start", handler: ExtensionHandler<TurnStartEvent>): void;
-	on(event: "model_select", handler: (event: { model: ExtensionContext["model"] }, ctx: ExtensionContext) => Promise<void> | void): void;
-}
+interface CursorQuestionToolExtensionApi extends Pick<ExtensionAPI, "getActiveTools" | "registerTool" | "setActiveTools">, CursorModelLifecycleExtensionApi {}
 
 type RawQuestionOption = string | { label?: string; value?: string; description?: string };
 
@@ -232,16 +228,7 @@ export function registerCursorQuestionTool(pi: CursorQuestionToolExtensionApi):
 		},
 	});
 
-	pi.on("session_start", (_event, ctx) => {
-		syncCursorQuestionToolForModel(pi, ctx.model);
-	});
-	pi.on("before_agent_start", (_event, ctx) => {
+	registerCursorModelLifecycle(pi, (ctx) => {
 		syncCursorQuestionToolForModel(pi, ctx.model);
 	});
-	pi.on("turn_start", (_event, ctx) => {
-		syncCursorQuestionToolForModel(pi, ctx.model);
-	});
-	pi.on("model_select", (event) => {
-		syncCursorQuestionToolForModel(pi, event.model);
-	});
 }

package/src/cursor-record-utils.ts

@@ -10,6 +10,48 @@ export function hasUsableText(value: string | undefined): value is string {
 	return typeof value === "string" && value.trim().length > 0;
 }
 
+export function getString(record: Record<string, unknown> | undefined, key: string): string | undefined {
+	const value = record?.[key];
+	return typeof value === "string" ? value : undefined;
+}
+
+export function getNumber(record: Record<string, unknown> | undefined, key: string): number | undefined {
+	const value = record?.[key];
+	return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+}
+
+export function getBoolean(record: Record<string, unknown> | undefined, key: string): boolean | undefined {
+	const value = record?.[key];
+	return typeof value === "boolean" ? value : undefined;
+}
+
+export function getRecord(record: Record<string, unknown> | undefined, key: string): Record<string, unknown> | undefined {
+	return asRecord(record?.[key]);
+}
+
+export function getArray(record: Record<string, unknown> | undefined, key: string): unknown[] | undefined {
+	const value = record?.[key];
+	return Array.isArray(value) ? value : undefined;
+}
+
+export function firstNonEmptyString(...values: Array<string | undefined>): string | undefined {
+	for (const value of values) {
+		const trimmed = value?.trim();
+		if (trimmed) return trimmed;
+	}
+	return undefined;
+}
+
+export function stringifyUnknown(value: unknown, options: { pretty?: boolean } = {}): string {
+	if (value === undefined) return "";
+	if (typeof value === "string") return value;
+	try {
+		return JSON.stringify(value, null, options.pretty ? 2 : undefined) ?? String(value);
+	} catch {
+		return String(value);
+	}
+}
+
 export function getFirstStringByKeys(
 	record: Record<string, unknown> | undefined,
 	keys: readonly string[],

package/src/cursor-replay-activity-builders.ts

@@ -1,4 +1,3 @@
-import { scrubSensitiveText } from "./cursor-sensitive-text.js";
 import type {
 	CursorReplayGenerateImageSummaryArgs,
 	CursorReplayMcpSummaryArgs,
@@ -13,16 +12,20 @@ import type {
 	CursorReplayWebSearchSummaryArgs,
 } from "./cursor-replay-summary-args.js";
 import type { CursorReplayGenerateImageDetailFields } from "./cursor-replay-tool-details.js";
-import { asRecord } from "./cursor-record-utils.js";
+import { asRecord, getArray, getNumber, getString } from "./cursor-record-utils.js";
+import { firstNonEmptyLine, formatDisplayPath, truncateArg } from "./cursor-transcript-utils.js";
 import {
-	firstNonEmptyLine,
-	formatDisplayPath,
-	getArray,
-	getNumber,
-	getRecord,
-	getString,
-	truncateArg,
-} from "./cursor-transcript-utils.js";
+	collectTaskText,
+	getGenerateImageDisplayPath,
+	getGenerateImagePath,
+	readMcpDisplayResult,
+	getReadLintDiagnostics,
+	getReadLintPaths,
+	getTaskDescription,
+	getTodoItems,
+	getTodoTotalCount,
+	inferImageMimeType,
+} from "./cursor-tool-result-display-readers.js";
 import { extractWebFetchTarget, extractWebSearchQuery } from "./cursor-web-tool-args.js";
 
 export interface CursorReplayActivityBuildContext {
@@ -48,14 +51,6 @@ export function buildDeleteReplayDetailFields({ args, result, options }: CursorR
 	};
 }
 
-export function buildEmptyReplayDetailFields(): Record<string, never> {
-	return {};
-}
-
-export function buildCollapsedReplayDetailFields(): { collapseDetailsByDefault: true } {
-	return { collapseDetailsByDefault: true };
-}
-
 export function buildReadLintsReplaySummaryArgs({
 	args,
 	result,
@@ -75,7 +70,7 @@ export function buildTodoReplaySummaryArgs(
 	result: CursorReplayActivityBuildContext["result"],
 ): CursorReplayTodoSummaryArgs {
 	const todos = getTodoItems(args, result);
-	const totalCount = getNumber(asRecord(result.value), "totalCount") ?? getNumber(args, "totalCount") ?? todos.length;
+	const totalCount = getTodoTotalCount(args, result, todos);
 	const completedCount = todos.filter((todo) => todo.status === "completed").length;
 	const inProgressCount = todos.filter((todo) => todo.status === "inProgress").length;
 	const pendingCount = todos.filter((todo) => todo.status === "pending").length;
@@ -94,7 +89,7 @@ export function buildCreatePlanReplaySummaryArgs({ args, result }: CursorReplayA
 }
 
 export function buildTaskReplaySummaryArgs({ args, result }: CursorReplayActivityBuildContext): CursorReplayTaskSummaryArgs {
-	const description = getString(args, "description") ?? getString(asRecord(result.value), "description") ?? "task";
+	const description = getTaskDescription(args, result);
 	const preview = firstNonEmptyLine(collectTaskText(result));
 	return {
 		description: truncateArg(description),
@@ -117,7 +112,7 @@ export function buildGenerateImageReplaySummaryArgs({
 
 export function buildMcpReplaySummaryArgs({ args, result }: CursorReplayActivityBuildContext): CursorReplayMcpSummaryArgs {
 	const toolName = getString(args, "toolName") ?? "mcp";
-	const preview = getMcpResultPreview(result);
+	const preview = readMcpDisplayResult(result).preview;
 	return {
 		toolName: truncateArg(toolName),
 		...(preview ? { preview } : {}),
@@ -173,104 +168,3 @@ export function buildGenerateImageReplayDetailFields(
 		expandedText: contentText,
 	};
 }
-
-function getReadLintPaths(args: Record<string, unknown>, result: CursorReplayActivityBuildContext["result"], options: CursorReplayActivityBuildContext["options"]): string[] {
-	const explicitPaths = Array.isArray(args.paths)
-		? args.paths.filter((entry): entry is string => typeof entry === "string")
-		: typeof args.path === "string"
-			? [args.path]
-			: [];
-	const resultPaths = (getArray(asRecord(result.value), "fileDiagnostics") ?? [])
-		.map((file) => getString(asRecord(file), "path"))
-		.filter((entry): entry is string => Boolean(entry));
-	return [...new Set([...explicitPaths, ...resultPaths].map((entry) => formatDisplayPath(entry, options.cwd)))];
-}
-
-function getReadLintDiagnostics(result: CursorReplayActivityBuildContext["result"], options: CursorReplayActivityBuildContext["options"]): string[] {
-	const value = asRecord(result.value);
-	const files = getArray(value, "fileDiagnostics") ?? [];
-	const lines: string[] = [];
-	for (const file of files) {
-		const fileRecord = asRecord(file);
-		const pathValue = getString(fileRecord, "path");
-		const path = pathValue ? formatDisplayPath(pathValue, options.cwd) : "unknown";
-		const diagnostics = getArray(fileRecord, "diagnostics") ?? [];
-		for (const diagnostic of diagnostics) {
-			const diagnosticRecord = asRecord(diagnostic);
-			const severity = getString(diagnosticRecord, "severity") ?? "diagnostic";
-			const message = getString(diagnosticRecord, "message") ?? "";
-			const source = getString(diagnosticRecord, "source");
-			lines.push(`${path}: ${severity}${source ? ` ${source}` : ""}: ${message}`);
-		}
-	}
-	return lines;
-}
-
-function getTodoItems(args: Record<string, unknown>, result: CursorReplayActivityBuildContext["result"]): Array<{ content: string; status?: string }> {
-	const value = asRecord(result.value);
-	const rawTodos = getArray(value, "todos") ?? getArray(args, "todos") ?? [];
-	const todos: Array<{ content: string; status?: string }> = [];
-	for (const todo of rawTodos) {
-		const record = asRecord(todo);
-		const content = getString(record, "content");
-		if (!content) continue;
-		const status = getString(record, "status");
-		todos.push(status ? { content, status } : { content });
-	}
-	return todos;
-}
-
-function collectTaskText(result: CursorReplayActivityBuildContext["result"]): string {
-	const value = asRecord(result.value);
-	const success = getRecord(getRecord(value, "result"), "success");
-	const command = getString(success, "command");
-	const stdout = getString(success, "stdout");
-	const interleavedOutput = getString(success, "interleavedOutput");
-	const assistantMessages = (getArray(value, "conversationSteps") ?? [])
-		.map((step) => getString(getRecord(asRecord(step), "assistantMessage"), "text"))
-		.filter((entry): entry is string => Boolean(entry));
-	const parts = [command ? `$ ${command}` : undefined, stdout || interleavedOutput, ...assistantMessages].filter((part): part is string => Boolean(part));
-	return parts.join("\n");
-}
-
-function getGenerateImagePath(args: Record<string, unknown>, result: CursorReplayActivityBuildContext["result"]): string | undefined {
-	const value = asRecord(result.value);
-	return getString(value, "filePath") ?? getString(args, "filePath") ?? getString(args, "path");
-}
-
-function getGenerateImageDisplayPath(args: Record<string, unknown>, result: CursorReplayActivityBuildContext["result"], options: CursorReplayActivityBuildContext["options"]): string | undefined {
-	const path = getGenerateImagePath(args, result);
-	return path ? formatDisplayPath(path, options.cwd) : undefined;
-}
-
-function inferImageMimeType(path: string | undefined): string | undefined {
-	const lower = path?.toLowerCase();
-	if (!lower) return undefined;
-	if (lower.endsWith(".png")) return "image/png";
-	if (lower.endsWith(".jpg") || lower.endsWith(".jpeg")) return "image/jpeg";
-	if (lower.endsWith(".gif")) return "image/gif";
-	if (lower.endsWith(".webp")) return "image/webp";
-	return undefined;
-}
-
-function getMcpContentText(entry: unknown): string | undefined {
-	const record = asRecord(entry);
-	const directText = getString(record, "text");
-	if (directText) return directText;
-	const nestedText = getRecord(record, "text");
-	return getString(nestedText, "text");
-}
-
-function getMcpResultPreview(result: CursorReplayActivityBuildContext["result"]): string | undefined {
-	if (result.status === "error") return undefined;
-	const value = asRecord(result.value);
-	const content = getArray(value, "content") ?? [];
-	for (const entry of content) {
-		const text = getMcpContentText(entry);
-		if (text) {
-			const line = firstNonEmptyLine(text);
-			if (line) return truncateArg(scrubSensitiveText(line), 120);
-		}
-	}
-	return undefined;
-}