@bastani/atomic 0.9.3-alpha.1 → 0.9.3-alpha.2

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+## [0.9.3-alpha.2] - 2026-06-27
+
+### Fixed
+
+- Fixed custom tool renderer disposal to honor renderer-owned cleanup callbacks, preventing stale animation registry entries after terminal workflow tool rows are finalized ([#1518](https://github.com/bastani-inc/atomic/issues/1518)).
+- Hardened session replay and LLM conversion so persisted context-compaction filters cannot leave orphaned `toolResult` messages after deleting their paired assistant `toolCall`, preventing GitHub Copilot Claude/Anthropic replay failures after repeated subagent runs ([#1527](https://github.com/bastani-inc/atomic/issues/1527)).
+
 ## [0.9.3-alpha.1] - 2026-06-25
 
 ### Breaking Changes
@@ -13,6 +20,7 @@
 
 - Added one-time first-run onboarding that explains Atomic workflows, uses an onboarding editor placeholder, lets users opt into normal chat with `/chat`, preserves other slash commands, saves a pre-login pasted task in memory only, and hands the first ready ticket/spec/task to the normal coding-agent session with `goal`/`ralph` workflow-routing guidance.
 - Added first-run onboarding routing guidance that raises the parent session to high reasoning when supported, asks the coding agent to first make a text-only scope estimate from tickets/GitHub issues/specs, routes directly when the task is clearly tiny or small with high confidence, and only uses targeted read-only `codebase-locator`/`codebase-analyzer`/`codebase-pattern-finder` probing when referenced context must be read or scope is medium, large, unclear, risky, or not obviously tiny before choosing `goal` or `ralph`.
+- Excluded workflow-created (internal) sessions from the standard `/resume`, `atomic -r`, and `--continue` history by marking their `SessionHeader` with `internal: true` and optional `workflow: { runId, stageId, stageName }` linkage, while keeping them resumable via `/workflow resume`/`workflow({ action: "resume" })` and direct `--session <path>` access; added `includeInternal` opt-ins to `SessionManager.list`/`listAll`/`continueRecent`, a `markSessionInternal` method, robust full-line `readSessionHeader`, and regression tests ([#1504](https://github.com/bastani-inc/atomic/issues/1504)).
 - Added a first-class `search` built-in and exposed `find`/`search` in normal coding sessions ([#1483](https://github.com/bastani-inc/atomic/issues/1483)).
 - Added hashline snapshot anchors across `read`, `search`, `write`, and successful `edit` results, plus hashline line-range/block/multi-section edit scripts with stale-tag safety checks and snapshot-based recovery for non-overlapping file drift, empty-replace validation, and fresh post-mutation tags for follow-up edits ([#1483](https://github.com/bastani-inc/atomic/issues/1483)).
 - Added disabled-by-default `bashInterceptor.enabled` settings support with built-in shell anti-pattern rules, a `/settings` **Bash Interceptor** toggle, and optional `user_bash` extension routing, without changing the default local-execution behavior ([#1483](https://github.com/bastani-inc/atomic/issues/1483)).
@@ -30,6 +38,7 @@
 
 ### Fixed
 
+- Fixed extension loading in Windows package tests by lazy-initializing compiled-binary virtual modules, avoiding eager source-barrel resolution before Jiti aliases are installed.
 - Fixed the first-run onboarding input placeholder so it uses muted TUI text and still renders a visible cursor while empty, making the startup composer read as an editable field instead of static copy.
 - Fixed `@` file-reference autocomplete in the first-run onboarding editor before the asynchronous `fd` readiness check completes by falling back to the built-in synchronous path completer while preserving `@` prefixes and quoted paths.
 - Fixed workflow config/discovery isolation so `ATOMIC_CODING_AGENT_DIR` prevents home-global workflows from shadowing the bundled first-run onboarding `goal` and `ralph` targets.

package/dist/builtin/cursor/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## [Unreleased]
 
+## [0.9.3-alpha.2] - 2026-06-27
+
+### Added
+
+- Added scoped Cursor image-input support for known multimodal Claude, Composer, Gemini, GPT, and Kimi model families (`claude-`, `composer-`, `gemini-`, `gpt-`, `kimi-`), plus `cursor/grok-4.3`, including selected-image request serialization and mixed text/image MCP tool-result serialization.
+- Added `cursor/grok-4.3` to the estimated fallback catalog.
+
+### Fixed
+
+- Rejected empty or malformed base64 image payloads during Cursor selected-image and MCP image serialization with sanitized local errors, while accepting valid MIME-wrapped base64 with line whitespace.
+
+### Removed
+
+- Removed outdated Cursor Grok 4.20 entries from the estimated fallback catalog and no longer advertise Grok-family Cursor IDs as image-capable.
+
 ## [0.9.2] - 2026-06-23
 
 ### Changed

package/dist/builtin/cursor/README.md

@@ -12,7 +12,8 @@ The unavoidable Atomic-specific integration difference is the provider surface:
 
 ## Limitations
 
-- Text input only. Vision/image content is rejected.
+- Image input is supported only for known multimodal Cursor Claude, Composer, Gemini, GPT, and Kimi model families (IDs beginning `claude-`, `composer-`, `gemini-`, `gpt-`, or `kimi-`), plus `grok-4.3`; text-only Cursor models still reject images.
+- User images and mixed text/image MCP tool results are serialized for image-capable Cursor models. Image payloads must be non-empty standard base64; MIME-style line wrapping whitespace is accepted and stripped before serialization.
 - Cursor's private API may change without notice.
 - HTTP/2 transport requires the bundled `@bastani/atomic-natives` Rust/N-API native client for the current platform.
 - Credentials are OAuth-only. Do not pass Cursor tokens via command-line args, environment variables, logs, or local proxy processes.

package/dist/builtin/cursor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/cursor",
-  "version": "0.9.3-alpha.1",
+  "version": "0.9.3-alpha.2",
   "private": true,
   "description": "Experimental first-party Atomic extension for Cursor OAuth, model discovery, and streaming provider registration.",
   "contributors": [
@@ -40,7 +40,7 @@
     }
   },
   "dependencies": {
-    "@bastani/atomic-natives": "0.9.3-alpha.1",
+    "@bastani/atomic-natives": "0.9.3-alpha.2",
     "@bufbuild/protobuf": "^2.0.0"
   }
 }

package/dist/builtin/cursor/src/cursor-models-raw.json

@@ -560,15 +560,8 @@
     "maxTokens": 64000
   },
   {
-    "id": "grok-4-20",
-    "name": "Grok 4.20",
-    "reasoning": false,
-    "contextWindow": 200000,
-    "maxTokens": 64000
-  },
-  {
-    "id": "grok-4-20-thinking",
-    "name": "Grok 4.20 Thinking",
+    "id": "grok-4.3",
+    "name": "Grok 4.3",
     "reasoning": false,
     "contextWindow": 200000,
     "maxTokens": 64000

package/dist/builtin/cursor/src/model-mapper.ts

@@ -22,6 +22,8 @@ export interface CursorModelCatalog {
 	readonly models: readonly CursorUsableModel[];
 }
 
+export type CursorModelInput = ["text"] | ["text", "image"];
+
 export interface CursorProviderModelDefinition {
 	readonly id: string;
 	readonly name: string;
@@ -29,7 +31,7 @@ export interface CursorProviderModelDefinition {
 	readonly baseUrl?: string;
 	readonly reasoning: boolean;
 	readonly thinkingLevelMap?: ThinkingLevelMap;
-	readonly input: ["text"];
+	readonly input: CursorModelInput;
 	readonly cost: { readonly input: number; readonly output: number; readonly cacheRead: number; readonly cacheWrite: number };
 	readonly contextWindow: number;
 	readonly maxTokens: number;
@@ -95,7 +97,7 @@ export function mapCursorCatalogToProviderModels(catalog: CursorModelCatalog): C
 			baseUrl: CURSOR_API_BASE_URL,
 			reasoning: supportsReasoning,
 			thinkingLevelMap: supportsEffort ? buildThinkingLevelMap(effortVariants, group.primaryId) : undefined,
-			input: ["text"],
+			input: cursorModelInput(group.primaryId),
 			cost: subscriptionCost(),
 			contextWindow: chooseLargestNumber(group.variants.map((variant) => variant.contextWindow)) ?? ESTIMATED_CONTEXT_WINDOW,
 			maxTokens: chooseLargestNumber(group.variants.map((variant) => variant.maxTokens)) ?? ESTIMATED_MAX_TOKENS,
@@ -250,11 +252,20 @@ function chooseDisplayName(variants: readonly CursorVariant[], baseId: string, p
 		?? titleCaseModelId(baseId);
 }
 
+function cursorModelInput(id: string): CursorModelInput {
+	return supportsImageInputModelId(id) ? ["text", "image"] : ["text"];
+}
+
+function supportsImageInputModelId(id: string): boolean {
+	const variant = parseCursorVariant({ id });
+	return variant.baseId === "grok-4.3" || /^(claude|composer|gemini|gpt|kimi)(-|$)/iu.test(variant.baseId);
+}
+
 function supportsReasoningModelId(id: string): boolean {
 	const variant = parseCursorVariant({ id });
 	if (variant.effort || variant.thinking) return true;
 	if (variant.baseId === "default") return true;
-	return /^(claude|composer|gemini|gpt|grok|kimi)(-|$)/iu.test(variant.baseId);
+	return /^(claude|composer|gemini|gpt|kimi)(-|$)/iu.test(variant.baseId);
 }
 
 function titleCaseModelId(id: string): string {

package/dist/builtin/cursor/src/proto/protobuf-codec-base64.ts

@@ -0,0 +1,22 @@
+export interface CursorImageBase64Context {
+	readonly kind: string;
+	readonly mimeType: string;
+	readonly index?: number;
+}
+
+// Cursor image protobuf serialization accepts canonical standard base64 after MIME line wrapping is removed.
+const BASE64_WHITESPACE_PATTERN = /[\t\n\f\r ]+/gu;
+const STANDARD_BASE64_PATTERN = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/u;
+
+export function decodeStrictBase64ImageData(data: string, context: CursorImageBase64Context): Uint8Array {
+	const normalized = data.replace(BASE64_WHITESPACE_PATTERN, "");
+	if (normalized.length === 0 || normalized.length % 4 !== 0 || !STANDARD_BASE64_PATTERN.test(normalized)) {
+		throwInvalidBase64ImageData(context);
+	}
+	return Buffer.from(normalized, "base64");
+}
+
+function throwInvalidBase64ImageData(context: CursorImageBase64Context): never {
+	const index = context.index === undefined ? "" : ` at index ${context.index}`;
+	throw new Error(`Invalid ${context.kind} base64 image data${index} for MIME type ${context.mimeType}`);
+}

package/dist/builtin/cursor/src/proto/protobuf-codec-request.ts

@@ -1,7 +1,8 @@
 import { createHash, randomUUID } from "node:crypto";
 import { create, fromBinary, toBinary } from "@bufbuild/protobuf";
+import type { ImageContent } from "@earendil-works/pi-ai";
 import { parseJsonObject, type JsonObject } from "../config.js";
-import type { CursorRunRequest } from "../transport.js";
+import type { CursorRunRequest, CursorToolResultContent } from "../transport.js";
 import {
 	AgentClientMessageSchema,
 	AgentConversationTurnStructureSchema,
@@ -16,14 +17,17 @@ import {
 	McpToolDefinitionSchema,
 	ModelDetailsSchema,
 	SelectedContextSchema,
+	SelectedImageSchema,
 	ToolCallSchema,
 	UserMessageActionSchema,
 	UserMessageSchema,
 	type ConversationStateStructure,
 	type McpToolDefinition,
+	type SelectedImage,
 	type UserMessage,
 } from "./agent_pb.js";
 import { encodeMcpArgsMap, encodeProtobufValue, serializableJsonValue } from "./protobuf-codec-json.js";
+import { decodeStrictBase64ImageData } from "./protobuf-codec-base64.js";
 import { createMcpToolCallResult } from "./protobuf-codec-wire.js";
 
 export interface ParsedAssistantTextStep {
@@ -36,13 +40,14 @@ export interface ParsedToolCallStep {
 	readonly toolCallId: string;
 	readonly toolName: string;
 	readonly arguments: JsonObject;
-	result?: { readonly content: string; readonly isError: boolean };
+	result?: { readonly content: string | readonly CursorToolResultContent[]; readonly isError: boolean; readonly fallbackText?: string };
 }
 
 export type ParsedTurnStep = ParsedAssistantTextStep | ParsedToolCallStep;
 
 export interface ParsedTurn {
 	readonly userText: string;
+	readonly userImages: readonly ImageContent[];
 	readonly steps: ParsedTurnStep[];
 }
 
@@ -69,6 +74,7 @@ export function buildCursorRequest(
 	conversationId: string,
 	checkpoint: Uint8Array | null,
 	existingBlobStore?: Map<string, Uint8Array>,
+	userImages: readonly ImageContent[] = [],
 ): { readonly requestBytes: Uint8Array; readonly blobStore: Map<string, Uint8Array> } {
 	const blobStore = new Map<string, Uint8Array>(existingBlobStore ?? []);
 	const systemBlobId = storeAsBlob(textEncoder.encode(JSON.stringify({ role: "system", content: systemPrompt })), blobStore);
@@ -76,7 +82,7 @@ export function buildCursorRequest(
 	const conversationState = checkpoint
 		? fromBinary(ConversationStateStructureSchema, checkpoint)
 		: buildConversationState(turns, blobStore, systemBlobId, selectedContextBlob);
-	const userMessage = createUserMessage(userText, selectedContextBlob);
+	const userMessage = createUserMessage(userText, selectedContextBlob, userImages);
 	const action = create(ConversationActionSchema, {
 		action: { case: "userMessageAction", value: create(UserMessageActionSchema, { userMessage }) },
 	});
@@ -96,7 +102,7 @@ function buildConversationState(
 ): ConversationStateStructure {
 	const turnBlobIds: Uint8Array[] = [];
 	for (const turn of turns) {
-		const userMessage = createUserMessage(turn.userText, selectedContextBlob);
+		const userMessage = createUserMessage(turn.userText, selectedContextBlob, turn.userImages);
 		const userMessageBlobId = storeAsBlob(toBinary(UserMessageSchema, userMessage), blobStore);
 		const stepBlobIds = turn.steps.map((step) => storeAsBlob(buildTurnStepBytes(step), blobStore));
 		const agentTurn = create(AgentConversationTurnStructureSchema, {
@@ -127,18 +133,39 @@ function buildConversationState(
 	});
 }
 
-function createUserMessage(text: string, selectedContextBlob: Uint8Array): UserMessage {
+function createUserMessage(text: string, selectedContextBlob: Uint8Array, images: readonly ImageContent[] = []): UserMessage {
 	const messageId = randomUUID();
+	const selectedImages = images.map((image, index) => createSelectedImage(image, index));
 	return create(UserMessageSchema, {
 		text,
 		messageId,
-		selectedContext: create(SelectedContextSchema, {}),
+		selectedContext: create(SelectedContextSchema, { selectedImages }),
 		mode: 1,
 		selectedContextBlob,
 		correlationId: messageId,
 	});
 }
 
+function createSelectedImage(image: ImageContent, index: number): SelectedImage {
+	const data = decodeStrictBase64ImageData(image.data, { kind: "selected image", mimeType: image.mimeType, index });
+	const hash = createHash("sha256").update(data).digest("hex").slice(0, 16);
+	return create(SelectedImageSchema, {
+		uuid: randomUUID(),
+		path: `/atomic/inline-images/${hash}-${index}.${extensionForMimeType(image.mimeType)}`,
+		mimeType: image.mimeType,
+		dataOrBlobId: { case: "data", value: data },
+	});
+}
+
+function extensionForMimeType(mimeType: string): string {
+	const normalized = mimeType.toLowerCase();
+	if (normalized === "image/jpeg" || normalized === "image/jpg") return "jpg";
+	if (normalized === "image/png") return "png";
+	if (normalized === "image/gif") return "gif";
+	if (normalized === "image/webp") return "webp";
+	return "img";
+}
+
 function buildTurnStepBytes(step: ParsedTurnStep): Uint8Array {
 	if (step.kind === "assistantText") {
 		return toBinary(ConversationStepSchema, create(ConversationStepSchema, {
@@ -154,7 +181,7 @@ function buildTurnStepBytes(step: ParsedTurnStep): Uint8Array {
 			providerIdentifier: CURSOR_PROTO_CLIENT_NAME,
 			toolName,
 		}),
-		...(step.result ? { result: createMcpToolCallResult(step.result.content, step.result.isError) } : {}),
+		...(step.result ? { result: createMcpToolCallResult(step.result.content, step.result.isError, step.result.fallbackText ?? "") } : {}),
 	});
 	return toBinary(ConversationStepSchema, create(ConversationStepSchema, {
 		message: {
@@ -166,20 +193,22 @@ function buildTurnStepBytes(step: ParsedTurnStep): Uint8Array {
 
 export function parseHistoricalTurns(messages: readonly CursorRunRequest["context"]["messages"][number][]): readonly ParsedTurn[] {
 	const turns: ParsedTurn[] = [];
-	let currentTurn: { userText: string; steps: ParsedTurnStep[]; toolCallById: Map<string, ParsedToolCallStep> } | undefined;
-	const ensureTurn = (): { userText: string; steps: ParsedTurnStep[]; toolCallById: Map<string, ParsedToolCallStep> } => {
-		currentTurn ??= { userText: "", steps: [], toolCallById: new Map() };
+	let currentTurn: { userText: string; userImages: readonly ImageContent[]; steps: ParsedTurnStep[]; toolCallById: Map<string, ParsedToolCallStep> } | undefined;
+	const ensureTurn = (): { userText: string; userImages: readonly ImageContent[]; steps: ParsedTurnStep[]; toolCallById: Map<string, ParsedToolCallStep> } => {
+		currentTurn ??= { userText: "", userImages: [], steps: [], toolCallById: new Map() };
 		return currentTurn;
 	};
 	const flushTurn = (): void => {
 		if (!currentTurn) return;
-		if (currentTurn.userText || currentTurn.steps.length > 0) turns.push({ userText: currentTurn.userText, steps: currentTurn.steps });
+		if (currentTurn.userText || currentTurn.userImages.length > 0 || currentTurn.steps.length > 0) {
+			turns.push({ userText: currentTurn.userText, userImages: currentTurn.userImages, steps: currentTurn.steps });
+		}
 		currentTurn = undefined;
 	};
 	for (const message of messages) {
 		if (message.role === "user") {
 			flushTurn();
-			currentTurn = { userText: textFromMessage(message), steps: [], toolCallById: new Map() };
+			currentTurn = { userText: textFromMessage(message), userImages: imagesFromUserMessage(message), steps: [], toolCallById: new Map() };
 		} else if (message.role === "assistant") {
 			const turn = ensureTurn();
 			for (const part of message.content) {
@@ -199,7 +228,7 @@ export function parseHistoricalTurns(messages: readonly CursorRunRequest["contex
 				turn.steps.push(step);
 				turn.toolCallById.set(step.toolCallId, step);
 			}
-			step.result = { content: rawToolResultText(message), isError: message.isError };
+			step.result = { content: message.content, isError: message.isError, fallbackText: rawToolResultText(message) };
 		}
 	}
 	flushTurn();
@@ -221,6 +250,17 @@ export function extractCurrentActionText(request: CursorRunRequest): string {
 	return last ? textFromMessage(last) : "";
 }
 
+export function extractCurrentActionImages(request: CursorRunRequest): readonly ImageContent[] {
+	const last = request.context.messages.at(-1);
+	if (!last || last.role !== "user") return [];
+	return imagesFromUserMessage(last);
+}
+
+function imagesFromUserMessage(message: Extract<CursorRunRequest["context"]["messages"][number], { readonly role: "user" }>): readonly ImageContent[] {
+	if (typeof message.content === "string") return [];
+	return message.content.filter((part): part is ImageContent => part.type === "image");
+}
+
 function rawToolResultText(message: Extract<CursorRunRequest["context"]["messages"][number], { readonly role: "toolResult" }>): string {
 	return message.content.flatMap((part) => part.type === "text" ? [part.text] : []).join("\n");
 }

package/dist/builtin/cursor/src/proto/protobuf-codec-wire.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
 import { create, toBinary } from "@bufbuild/protobuf";
-import type { CursorControlMessage, CursorProtocolMessage, CursorServerMessage } from "../transport.js";
+import type { CursorControlMessage, CursorProtocolMessage, CursorServerMessage, CursorToolResultContent } from "../transport.js";
 import {
 	AgentClientMessageSchema,
 	BackgroundShellSpawnResultSchema,
@@ -17,6 +17,7 @@ import {
 	LsRejectedSchema,
 	LsResultSchema,
 	McpErrorSchema,
+	McpImageContentSchema,
 	McpResultSchema,
 	McpSuccessSchema,
 	McpTextContentSchema,
@@ -40,6 +41,7 @@ import {
 	type KvServerMessage,
 	type McpToolDefinition,
 } from "./agent_pb.js";
+import { decodeStrictBase64ImageData } from "./protobuf-codec-base64.js";
 import { decodeMcpArgsMap } from "./protobuf-codec-json.js";
 
 const NATIVE_EXEC_REJECT_REASON = "Tool not available in this environment. Use the MCP tools provided instead.";
@@ -203,29 +205,44 @@ export function encodeExecClientMessage(execNumericId: number | undefined, execI
 	return toBinary(AgentClientMessageSchema, clientMessage);
 }
 
-export function createMcpToolResult(text: string, isError: boolean): ReturnType<typeof create<typeof McpResultSchema>> {
+export function createMcpToolResult(content: string | readonly CursorToolResultContent[], isError: boolean, fallbackText = ""): ReturnType<typeof create<typeof McpResultSchema>> {
+	const text = typeof content === "string" ? content : fallbackText;
 	if (isError) {
 		return create(McpResultSchema, { result: { case: "error", value: create(McpErrorSchema, { error: text }) } });
 	}
 	return create(McpResultSchema, {
 		result: {
 			case: "success",
-			value: createMcpSuccess(text),
+			value: createMcpSuccess(content, fallbackText),
 		},
 	});
 }
 
-export function createMcpToolCallResult(text: string, isError: boolean): ReturnType<typeof create<typeof McpToolResultSchema>> {
+export function createMcpToolCallResult(content: string | readonly CursorToolResultContent[], isError: boolean, fallbackText = ""): ReturnType<typeof create<typeof McpToolResultSchema>> {
+	const text = typeof content === "string" ? content : fallbackText;
 	if (isError) {
 		return create(McpToolResultSchema, { result: { case: "error", value: create(McpToolErrorSchema, { error: text }) } });
 	}
-	return create(McpToolResultSchema, { result: { case: "success", value: createMcpSuccess(text) } });
+	return create(McpToolResultSchema, { result: { case: "success", value: createMcpSuccess(content, fallbackText) } });
 }
 
-function createMcpSuccess(text: string): ReturnType<typeof create<typeof McpSuccessSchema>> {
+function createMcpSuccess(content: string | readonly CursorToolResultContent[], fallbackText: string): ReturnType<typeof create<typeof McpSuccessSchema>> {
+	const items = typeof content === "string"
+		? [createTextContentItem(content)]
+		: content.map((part, index) => part.type === "text" ? createTextContentItem(part.text) : createImageContentItem(part.data, part.mimeType, index));
 	return create(McpSuccessSchema, {
-		content: [create(McpToolResultContentItemSchema, { content: { case: "text", value: create(McpTextContentSchema, { text }) } })],
+		content: items.length > 0 ? items : [createTextContentItem(fallbackText)],
 		isError: false,
 	});
 }
 
+function createTextContentItem(text: string): ReturnType<typeof create<typeof McpToolResultContentItemSchema>> {
+	return create(McpToolResultContentItemSchema, { content: { case: "text", value: create(McpTextContentSchema, { text }) } });
+}
+
+function createImageContentItem(data: string, mimeType: string, index: number): ReturnType<typeof create<typeof McpToolResultContentItemSchema>> {
+	return create(McpToolResultContentItemSchema, {
+		content: { case: "image", value: create(McpImageContentSchema, { data: decodeStrictBase64ImageData(data, { kind: "MCP image", mimeType, index }), mimeType }) },
+	});
+}
+

package/dist/builtin/cursor/src/proto/protobuf-codec.ts

@@ -15,7 +15,7 @@ import {
 	type McpToolDefinition,
 	type ModelDetails,
 } from "./agent_pb.js";
-import { blobKey, buildCursorRequest, buildMcpToolDefinitions, extractCurrentActionText, parseHistoricalTurns } from "./protobuf-codec-request.js";
+import { blobKey, buildCursorRequest, buildMcpToolDefinitions, extractCurrentActionImages, extractCurrentActionText, parseHistoricalTurns } from "./protobuf-codec-request.js";
 import { createMcpToolResult, decodeAgentServerMessage, encodeExecClientMessage, encodeKvClientMessage, encodeNativeExecRejection, encodeRequestContextResult } from "./protobuf-codec-wire.js";
 
 // Cursor protocol codec intentionally follows the MIT-licensed
@@ -67,6 +67,7 @@ export class CursorProtobufProtocolCodec implements CursorProtocolCodec {
 			conversationIdValue,
 			storedState?.checkpoint ?? null,
 			storedState?.blobStore,
+			extractCurrentActionImages(request),
 		);
 		this.#blobStores.set(request.requestId, payload.blobStore);
 		this.#toolDefinitions.set(request.requestId, buildMcpToolDefinitions(request));
@@ -141,7 +142,7 @@ export class CursorProtobufProtocolCodec implements CursorProtocolCodec {
 	}
 
 	encodeToolResult(result: CursorToolResultMessage): Uint8Array {
-		const mcpResult = createMcpToolResult(result.text, result.isError);
+		const mcpResult = createMcpToolResult(result.content ?? result.text, result.isError, result.text);
 		return encodeExecClientMessage(result.execNumericId, result.execId, "mcpResult", mcpResult);
 	}
 

package/dist/builtin/cursor/src/stream.ts

@@ -88,8 +88,8 @@ export class CursorStreamAdapter {
 			if (!options?.apiKey) {
 				throw new Error("Cursor OAuth credentials are required. Run /login and select Cursor.");
 			}
-			if (hasImageInput(context)) {
-				throw new Error("Cursor provider currently supports text input only; vision/image content is unsupported.");
+			if (hasImageInput(context) && !model.input.includes("image")) {
+				throw new Error(`Cursor model ${model.id} does not support image input.`);
 			}
 			if (options.signal?.aborted) {
 				throw new CursorStreamAbortError();
@@ -216,16 +216,10 @@ export class CursorStreamAdapter {
 	}
 }
 class CursorStreamAbortError extends Error {
-	constructor() {
-		super("Cursor stream aborted.");
-		this.name = "CursorStreamAbortError";
-	}
+	constructor() { super("Cursor stream aborted."); this.name = "CursorStreamAbortError"; }
 }
 class CursorStreamTimeoutError extends Error {
-	constructor() {
-		super("Cursor stream timed out while waiting for provider output.");
-		this.name = "CursorStreamTimeoutError";
-	}
+	constructor() { super("Cursor stream timed out while waiting for provider output."); this.name = "CursorStreamTimeoutError"; }
 }
 interface CursorPendingMessageRead {
 	readonly promise: Promise<IteratorResult<CursorServerMessage>>;
@@ -329,7 +323,7 @@ function getTrailingToolResults(context: Context): CursorToolResultMessage[] {
 	for (let index = context.messages.length - 1; index >= 0; index--) {
 		const message = context.messages[index];
 		if (!message || message.role !== "toolResult") break;
-		results.unshift({ toolCallId: message.toolCallId, toolName: message.toolName, text: textFromToolResult(message), isError: message.isError });
+		results.unshift({ toolCallId: message.toolCallId, toolName: message.toolName, text: textFromToolResult(message), content: message.content, isError: message.isError });
 	}
 	return results;
 }

package/dist/builtin/cursor/src/transport-types.ts

@@ -47,10 +47,13 @@ export type CursorControlMessage =
 
 export type CursorProtocolMessage = CursorServerMessage | CursorControlMessage;
 
+export type CursorToolResultContent = Extract<Context["messages"][number], { role: "toolResult" }>["content"][number];
+
 export interface CursorToolResultMessage {
 	readonly toolCallId: string;
 	readonly toolName: string;
 	readonly text: string;
+	readonly content?: readonly CursorToolResultContent[];
 	readonly isError: boolean;
 	readonly execId?: string;
 	readonly execNumericId?: number;

package/dist/builtin/cursor/src/transport.ts

@@ -18,6 +18,7 @@ export type {
 	CursorRunStream,
 	CursorServerMessage,
 	CursorToolCallMessage,
+	CursorToolResultContent,
 	CursorToolResultMessage,
 	CursorTransportLifecycleSnapshot,
 	CursorWriteOptions,

package/dist/builtin/intercom/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/intercom",
-  "version": "0.9.3-alpha.1",
+  "version": "0.9.3-alpha.2",
   "private": true,
   "description": "Atomic extension providing a private coordination channel between parent and child agent sessions. Fork of: https://github.com/nicobailon/pi-intercom",
   "contributors": [

package/dist/builtin/mcp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/mcp",
-  "version": "0.9.3-alpha.1",
+  "version": "0.9.3-alpha.2",
   "private": true,
   "description": "Atomic extension that adapts MCP (Model Context Protocol) servers into the coding agent. Fork of: https://github.com/nicobailon/pi-mcp-adapter",
   "contributors": [

package/dist/builtin/subagents/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## [Unreleased]
 
+## [0.9.3-alpha.2] - 2026-06-27
+
+### Fixed
+
+- Prevented the async subagent status widget from briefly unmounting during reset-and-hydrate cycles when active background runs are still present, including Atomic host updates that deliver fresh UI context wrappers for the same logical session ([#1517](https://github.com/bastani-inc/atomic/issues/1517)).
+- Fixed live subagent result animation cleanup to register a host-row disposer, so terminal workflow cleanup evicts animation registry entries instead of only clearing intervals ([#1518](https://github.com/bastani-inc/atomic/issues/1518)).
+- Synced recent upstream subagent hardening so compact delegated tool-call summaries are preserved, fanout children keep their live nested subagent call/result history, duplicate concurrent subagent dispatches are rejected, provider-hostile chain schema conditionals are removed, and failed foreground runs include captured child output for diagnostics ([#1527](https://github.com/bastani-inc/atomic/issues/1527)).
+- Eliminated the foreground subagent widget flicker that appeared once a running subagent panel grew tall enough to reach or exceed the terminal viewport. The live compact result no longer animates its spinner on an 80ms wall-clock timer; instead it shows an activity "pulse" glyph that advances exactly once per real progress update. Because the panel renders into chat scrollback, a timer-driven spinner cell that scrolled above pi-tui's viewport fold forced a destructive full-screen + scrollback clear on every tick — driving the indicator off genuine updates keeps line diffs tied to content that actually changed, so the differential renderer repaints only when progress does and never strobes.
+
 ## [0.9.3-alpha.1] - 2026-06-25
 
 ### Changed

package/dist/builtin/subagents/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/subagents",
-  "version": "0.9.3-alpha.1",
+  "version": "0.9.3-alpha.2",
   "private": true,
   "description": "Atomic extension for delegating tasks to subagents with chains, parallel execution, and TUI clarification. Fork of: https://github.com/nicobailon/pi-subagents",
   "contributors": [

package/dist/builtin/subagents/src/extension/fanout-child.ts

@@ -34,6 +34,7 @@ export function createChildSafeState(): SubagentState {
 		baseCwd: "",
 		currentSessionId: null,
 		asyncJobs: new Map(),
+		subagentInProgress: false,
 		foregroundRuns: new Map(),
 		foregroundControls: new Map(),
 		lastForegroundControlId: null,

package/dist/builtin/subagents/src/extension/index.ts

@@ -10,7 +10,7 @@ import { discoverAgents } from "../agents/agents.ts";
 import { cleanupAllArtifactDirs, cleanupOldArtifacts, getArtifactsDir } from "../shared/artifacts.ts";
 import { resolveCurrentSessionId } from "../shared/session-identity.ts";
 import { cleanupOldChainDirs } from "../shared/settings.ts";
-import { renderLiveSubagentResult, renderSubagentResult, stopResultAnimations, stopWidgetAnimation, type SubagentResultRenderState } from "../tui/render.ts";
+import { advanceResultPulseFrame, renderLiveSubagentResult, renderSubagentResult, stopResultAnimations, stopWidgetAnimation, type SubagentResultRenderState } from "../tui/render.ts";
 import { SubagentParams } from "./schemas.ts";
 import { createSubagentExecutor, type SubagentParamsLike } from "../runs/foreground/subagent-executor.ts";
 import { createAsyncJobTracker } from "../runs/background/async-job-tracker.ts";
@@ -69,7 +69,7 @@ type SubagentToolRenderState = SubagentResultRenderState;
 function rebuildSlashResultContainer(
 	container: Container,
 	result: AgentToolResult<Details>,
-	options: { expanded: boolean; now?: number },
+	options: { expanded: boolean; now?: number; pulseFrame?: number },
 	theme: ExtensionContext["ui"]["theme"],
 ): void {
 	container.clear();
@@ -87,12 +87,14 @@ function createSlashResultComponent(
 	const container = new Container();
 	let lastVersion = -1;
 	let lastSnapshotNow = 0;
+	let pulseFrame = 0;
 	container.render = (width: number): string[] => {
 		const snapshot = getSlashRenderableSnapshot(details);
 		if (snapshot.version !== lastVersion) {
 			lastVersion = snapshot.version;
 			lastSnapshotNow = Date.now();
-			rebuildSlashResultContainer(container, snapshot.result, { ...options, now: lastSnapshotNow }, theme);
+			pulseFrame = advanceResultPulseFrame(pulseFrame);
+			rebuildSlashResultContainer(container, snapshot.result, { ...options, now: lastSnapshotNow, pulseFrame }, theme);
 		}
 		return Container.prototype.render.call(container, width);
 	};
@@ -179,6 +181,7 @@ export default function registerSubagentExtension(pi: ExtensionAPI): void {
 		baseCwd: "",
 		currentSessionId: null,
 		asyncJobs: new Map(),
+		subagentInProgress: false,
 		foregroundRuns: new Map(),
 		foregroundControls: new Map(),
 		lastForegroundControlId: null,

package/dist/builtin/subagents/src/extension/schemas.ts

@@ -137,11 +137,6 @@ const ChainItem = Type.Object({
 }, {
 	description: "Chain step: use {agent, task?, ...} for sequential, {parallel: [...]} for static concurrent execution, or {expand, parallel: {...}, collect} for dynamic fanout.",
 	additionalProperties: false,
-	allOf: [
-		{ if: { required: ["expand"] }, then: { required: ["parallel", "collect"], properties: { parallel: { type: "object" } } } },
-		{ if: { required: ["collect"] }, then: { required: ["expand", "parallel"], properties: { parallel: { type: "object" } } } },
-		{ not: { required: ["expand"], properties: { parallel: { type: "array", items: {} } } } },
-	],
 });
 
 const ControlOverrides = Type.Object({

package/dist/builtin/subagents/src/runs/background/async-job-tracker.ts

@@ -395,10 +395,7 @@ export function createAsyncJobTracker(pi: Pick<ExtensionAPI, "events">, state: S
 		state.foregroundControls?.clear();
 		state.lastForegroundControlId = null;
 		state.resultFileCoalescer.clear();
-		if (ctx?.hasUI) {
-			state.lastUiContext = ctx;
-			rerenderWidget(ctx, []);
-		}
+		if (ctx?.hasUI) state.lastUiContext = ctx;
 	};
 
 	return { ensurePoller, handleStarted, handleComplete, resetJobs, hydrateActiveJobs };