sanchitrk · Sep 30, 2026 · Sep 24, 2026 · Sep 25, 2026 · Sep 26, 2026 · Sep 26, 2026
diff --git a/AGENTS.md b/AGENTS.md
@@ -7,9 +7,9 @@
 
 ## Commands
 
-- Don't run dev server commands (e.g `pnpm run dev`) - assume it's already running.
+- Don't run dev server commands (e.g `pnpm run dev`, `bun run dev`) - assume it's already running.
 - Don't run build commands unless specifically told to.
-- Focus on checking commands like `pnpm run typecheck`, `pnpm run check`, `bun run lint`, etc
+- Focus on checking commands like `pnpm run check`, `bun run lint` `bun run typecheck`, etc.
 
 ## Package Managers
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,16 @@ This file is the canonical source for unreleased changes and published release n
 
 ## [Unreleased]
 
+## [@codeworksh/aikit@0.9.3]
+
+### Added
+
+- Added the `getEnvApiKey` export, so a caller can check whether a provider has an API key in the environment using the same lookup aikit applies when it opens that provider.
+
+### Fixed
+
+- Fixed images reaching models that cannot read them. For a model whose `input` does not include `"image"`, each image in a user message is now replaced with `(image omitted: model does not support images)` and each image in a tool result with `(tool image omitted: model does not support images)`; consecutive images collapse to one placeholder. The message and tool result are kept, so the model still knows an image was there. Previously a user image was silently dropped, which removed an image-only message entirely, and a tool-result image was sent anyway, which providers often reject. Vision models are unchanged.
+
 ## [@codeworksh/aikit@0.9.2]
 
 ### Added

diff --git a/CLAUDE.md b/CLAUDE.md
@@ -7,9 +7,9 @@
 
 ## Commands
 
-- Don't run dev server commands (e.g `bun run dev`, `pnpm run dev`) - assume it's already running.
+- Don't run dev server commands (e.g `pnpm run dev`, `bun run dev`) - assume it's already running.
 - Don't run build commands unless specifically told to.
-- Focus on checking commands like `bun run typecheck`, `pnpm run check`, `bun run lint`, etc.
+- Focus on checking commands like `pnpm run check`, `bun run lint` `bun run typecheck`, etc.
 
 ## Package Managers
 
@@ -30,7 +30,7 @@ When uncertain, prefer: Effect, Tailwind, TypeScript, React, Clerk, TanStack, Ve
 ## General Preferences
 
 - If asked to do too much work at once, stop and state that clearly.
-- If computer use is helpful for completing or verifying work, shell out to gpt-5.6 with Codex for it
+- After you yourself have verified the work, get the work peer reviewed by another agent: `codex` for `code reviews`, `focused deep checks`, `tweaks`, `tests review` shell out to `gpt-6.1-sol` with thinking `low` or `medium` depending on complexity.
 - Avoid defensive future-facing design. This leads to pre-mature assumptions which are never true.
 
 ## Maintainability

diff --git a/packages/aikit/package.json b/packages/aikit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@codeworksh/aikit",
-	"version": "0.9.2",
+	"version": "0.9.3",
 	"description": "TypeScript SDK that provides a unified API for working with multiple LLM providers, automatic model discovery, and more.",
 	"keywords": [
 		"agent",

diff --git a/packages/aikit/src/index.ts b/packages/aikit/src/index.ts
@@ -2,6 +2,7 @@ export * as Event from "./event/event.ts";
 export { llm } from "./llm.ts";
 export * as Failure from "./llm/failure.ts";
 export * as Protocol from "./llm/protocol.ts";
+export { getEnvApiKey } from "./llm/runtime.ts";
 export { ThinkingBudgets } from "./llm/shared.ts";
 export * as Message from "./message/message.ts";
 export * as Model from "./model/model.ts";

diff --git a/packages/aikit/src/llm/runtime.ts b/packages/aikit/src/llm/runtime.ts
@@ -1,4 +1,5 @@
-type ApiKeyProvider = {
+/** Where a provider's API key may come from: its catalog `key` and `env` variable names. */
+export type ApiKeyProvider = {
 	env?: string[];
 	key?: string;
 };
@@ -15,6 +16,7 @@ export function mergeHeaders(
 	return merged;
 }
 
+/** The provider's API key from the environment, checking its `key` then each `env` name. */
 export function getEnvApiKey(provider: ApiKeyProvider): string | undefined {
 	if (typeof process === "undefined") return;
 

diff --git a/packages/aikit/src/llm/transform.ts b/packages/aikit/src/llm/transform.ts
@@ -43,7 +43,7 @@ export function createAssistantMessage(model: Model.Info): Message.AssistantMess
 	});
 }
 
-function userContent(parts: Message.UserMessage["parts"], supportsImages: boolean): ModelMessage[] {
+function userContent(parts: Message.UserMessage["parts"]): ModelMessage[] {
 	const content: Exclude<UserModelMessage["content"], string> = [];
 	for (const part of parts) {
 		if (part.type === "text") {
@@ -53,9 +53,7 @@ function userContent(parts: Message.UserMessage["parts"], supportsImages: boolea
 			}
 			continue;
 		}
-		if (supportsImages) {
-			content.push({ type: "file", data: part.data, mediaType: part.mimeType });
-		}
+		content.push({ type: "file", data: part.data, mediaType: part.mimeType });
 	}
 
 	if (content.length === 0) return [];
@@ -331,7 +329,7 @@ export function convertMessages(context: Message.Context, model: Model.Info): Mo
 
 	for (const msg of transformedMessages) {
 		if (msg.role === "user") {
-			messages.push(...userContent(msg.parts, model.input.includes("image")));
+			messages.push(...userContent(msg.parts));
 			continue;
 		}
 		messages.push(...assistantMessages(msg, model));

diff --git a/packages/aikit/src/message/message.ts b/packages/aikit/src/message/message.ts
@@ -329,17 +329,39 @@ function syntheticSkippedToolCall(toolCall: ToolCallPendingPart | ToolCallRunnin
 	};
 }
 
+const USER_IMAGE_PLACEHOLDER = "(image omitted: model does not support images)";
+const TOOL_IMAGE_PLACEHOLDER = "(tool image omitted: model does not support images)";
+
+// Consecutive images collapse into a single placeholder.
+function omitImages(content: (TextContent | ImageContent)[], placeholder: string): TextContent[] {
+	const result: TextContent[] = [];
+	for (const [index, block] of content.entries()) {
+		if (block.type === "text") result.push(block);
+		else if (content[index - 1]?.type !== "image") result.push({ type: "text", text: placeholder });
+	}
+	return result;
+}
+
+function omitToolImages(toolCall: ToolCall): ToolCall {
+	if (!("result" in toolCall) || !toolCall.result.content.some((content) => content.type === "image")) return toolCall;
+	return {
+		...toolCall,
+		result: { ...toolCall.result, content: omitImages(toolCall.result.content, TOOL_IMAGE_PLACEHOLDER) },
+	} as ToolCall;
+}
+
 export function transformMessages<TProtocol extends Model.KnownProviderEnum>(
 	messages: Message[],
 	model: Model.TModel<TProtocol>,
 	normalizeToolCallId?: (id: string, model: Model.TModel<TProtocol>, source: AssistantMessage) => string,
 ): Message[] {
 	const toolCallIDMap = new Map<string, string>();
+	const supportsImages = model.input.includes("image");
 
 	const transformed: Message[] = [];
 	for (const msg of messages) {
 		if (msg.role === "user") {
-			transformed.push(msg);
+			transformed.push(supportsImages ? msg : { ...msg, parts: omitImages(msg.parts, USER_IMAGE_PLACEHOLDER) });
 			continue;
 		}
 
@@ -394,10 +416,9 @@ export function transformMessages<TProtocol extends Model.KnownProviderEnum>(
 			return block;
 		});
 		const parts = transformedParts.map((block) => {
-			if (block.type === "toolCall" && isUnresolvedToolCall(block)) {
-				return syntheticSkippedToolCall(block);
-			}
-			return block;
+			if (block.type !== "toolCall") return block;
+			const toolCall = isUnresolvedToolCall(block) ? syntheticSkippedToolCall(block) : block;
+			return supportsImages ? toolCall : omitToolImages(toolCall);
 		});
 
 		transformed.push({

diff --git a/packages/aikit/test/e2e/__artifacts__/text-only-images.anthropic.json b/packages/aikit/test/e2e/__artifacts__/text-only-images.anthropic.json
@@ -0,0 +1,49 @@
+[
+	{
+		"role": "user",
+		"content": [
+			{
+				"type": "text",
+				"text": "Here are two photos."
+			},
+			{
+				"type": "text",
+				"text": "(image omitted: model does not support images)"
+			}
+		]
+	},
+	{
+		"role": "assistant",
+		"content": [
+			{
+				"type": "tool-call",
+				"toolCallId": "call_screenshot",
+				"toolName": "screenshot",
+				"input": {}
+			}
+		]
+	},
+	{
+		"role": "tool",
+		"content": [
+			{
+				"type": "tool-result",
+				"toolCallId": "call_screenshot",
+				"toolName": "screenshot",
+				"output": {
+					"type": "text",
+					"value": "rendered\n(tool image omitted: model does not support images)"
+				}
+			}
+		]
+	},
+	{
+		"role": "user",
+		"content": [
+			{
+				"type": "text",
+				"text": "Quote verbatim every parenthesised note in this conversation, one per line, and nothing else."
+			}
+		]
+	}
+]
diff --git a/packages/aikit/test/e2e/__artifacts__/text-only-images.openai-codex.json b/packages/aikit/test/e2e/__artifacts__/text-only-images.openai-codex.json
@@ -0,0 +1,49 @@
+[
+	{
+		"role": "user",
+		"content": [
+			{
+				"type": "text",
+				"text": "Here are two photos."
+			},
+			{
+				"type": "text",
+				"text": "(image omitted: model does not support images)"
+			}
+		]
+	},
+	{
+		"role": "assistant",
+		"content": [
+			{
+				"type": "tool-call",
+				"toolCallId": "call_screenshot",
+				"toolName": "screenshot",
+				"input": {}
+			}
+		]
+	},
+	{
+		"role": "tool",
+		"content": [
+			{
+				"type": "tool-result",
+				"toolCallId": "call_screenshot",
+				"toolName": "screenshot",
+				"output": {
+					"type": "text",
+					"value": "rendered\n(tool image omitted: model does not support images)"
+				}
+			}
+		]
+	},
+	{
+		"role": "user",
+		"content": [
+			{
+				"type": "text",
+				"text": "Quote verbatim every parenthesised note in this conversation, one per line, and nothing else."
+			}
+		]
+	}
+]
diff --git a/packages/aikit/test/e2e/__artifacts__/text-only-images.openai.json b/packages/aikit/test/e2e/__artifacts__/text-only-images.openai.json
@@ -0,0 +1,49 @@
+[
+	{
+		"role": "user",
+		"content": [
+			{
+				"type": "text",
+				"text": "Here are two photos."
+			},
+			{
+				"type": "text",
+				"text": "(image omitted: model does not support images)"
+			}
+		]
+	},
+	{
+		"role": "assistant",
+		"content": [
+			{
+				"type": "tool-call",
+				"toolCallId": "call_screenshot",
+				"toolName": "screenshot",
+				"input": {}
+			}
+		]
+	},
+	{
+		"role": "tool",
+		"content": [
+			{
+				"type": "tool-result",
+				"toolCallId": "call_screenshot",
+				"toolName": "screenshot",
+				"output": {
+					"type": "text",
+					"value": "rendered\n(tool image omitted: model does not support images)"
+				}
+			}
+		]
+	},
+	{
+		"role": "user",
+		"content": [
+			{
+				"type": "text",
+				"text": "Quote verbatim every parenthesised note in this conversation, one per line, and nothing else."
+			}
+		]
+	}
+]
diff --git a/packages/aikit/test/e2e/__artifacts__/text-only-images.openrouter.json b/packages/aikit/test/e2e/__artifacts__/text-only-images.openrouter.json
@@ -0,0 +1,49 @@
+[
+	{
+		"role": "user",
+		"content": [
+			{
+				"type": "text",
+				"text": "Here are two photos."
+			},
+			{
+				"type": "text",
+				"text": "(image omitted: model does not support images)"
+			}
+		]
+	},
+	{
+		"role": "assistant",
+		"content": [
+			{
+				"type": "tool-call",
+				"toolCallId": "call_screenshot",
+				"toolName": "screenshot",
+				"input": {}
+			}
+		]
+	},
+	{
+		"role": "tool",
+		"content": [
+			{
+				"type": "tool-result",
+				"toolCallId": "call_screenshot",
+				"toolName": "screenshot",
+				"output": {
+					"type": "text",
+					"value": "rendered\n(tool image omitted: model does not support images)"
+				}
+			}
+		]
+	},
+	{
+		"role": "user",
+		"content": [
+			{
+				"type": "text",
+				"text": "Quote verbatim every parenthesised note in this conversation, one per line, and nothing else."
+			}
+		]
+	}
+]