@oh-my-pi/pi-coding-agent 13.5.6 → 13.5.7

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "13.5.6",
+	"version": "13.5.7",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -41,12 +41,12 @@
 	},
 	"dependencies": {
 		"@mozilla/readability": "^0.6",
-		"@oh-my-pi/omp-stats": "13.5.6",
-		"@oh-my-pi/pi-agent-core": "13.5.6",
-		"@oh-my-pi/pi-ai": "13.5.6",
-		"@oh-my-pi/pi-natives": "13.5.6",
-		"@oh-my-pi/pi-tui": "13.5.6",
-		"@oh-my-pi/pi-utils": "13.5.6",
+		"@oh-my-pi/omp-stats": "13.5.7",
+		"@oh-my-pi/pi-agent-core": "13.5.7",
+		"@oh-my-pi/pi-ai": "13.5.7",
+		"@oh-my-pi/pi-natives": "13.5.7",
+		"@oh-my-pi/pi-tui": "13.5.7",
+		"@oh-my-pi/pi-utils": "13.5.7",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/src/extensibility/extensions/loader.ts

@@ -174,7 +174,7 @@ class ConcreteExtensionAPI implements ExtensionAPI, IExtensionRuntime {
 	}
 
 	sendMessage<T = unknown>(
-		message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details">,
+		message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details" | "attribution">,
 		options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" | "nextTurn" },
 	): void {
 		this.runtime.sendMessage(message, options);

package/src/extensibility/extensions/types.ts

@@ -824,7 +824,7 @@ export interface ToolResultEventResult {
 }
 
 export interface BeforeAgentStartEventResult {
-	message?: Pick<CustomMessage, "customType" | "content" | "display" | "details">;
+	message?: Pick<CustomMessage, "customType" | "content" | "display" | "details" | "attribution">;
 	/** Replace the system prompt for this turn. If multiple extensions return this, they are chained. */
 	systemPrompt?: string;
 }
@@ -1015,7 +1015,7 @@ export interface ExtensionAPI {
 
 	/** Send a custom message to the session. */
 	sendMessage<T = unknown>(
-		message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details">,
+		message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details" | "attribution">,
 		options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" | "nextTurn" },
 	): void;
 
@@ -1184,7 +1184,7 @@ export interface ExtensionShortcut {
 type HandlerFn = (...args: unknown[]) => Promise<unknown>;
 
 export type SendMessageHandler = <T = unknown>(
-	message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details">,
+	message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details" | "attribution">,
 	options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" | "nextTurn" },
 ) => void;
 

package/src/extensibility/hooks/loader.ts

@@ -23,7 +23,7 @@ type HandlerFn = (...args: unknown[]) => Promise<unknown>;
  * Send message handler type for pi.sendMessage().
  */
 export type SendMessageHandler = <T = unknown>(
-	message: Pick<HookMessage<T>, "customType" | "content" | "display" | "details">,
+	message: Pick<HookMessage<T>, "customType" | "content" | "display" | "details" | "attribution">,
 	options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" },
 ) => void;
 

package/src/extensibility/hooks/types.ts

@@ -585,7 +585,7 @@ export interface ToolResultEventResult {
  */
 export interface BeforeAgentStartEventResult {
 	/** Message to inject into context (persisted to session, visible in TUI) */
-	message?: Pick<HookMessage, "customType" | "content" | "display" | "details">;
+	message?: Pick<HookMessage, "customType" | "content" | "display" | "details" | "attribution">;
 }
 
 /** Return type for session_before_switch handlers */
@@ -733,12 +733,13 @@ export interface HookAPI {
 	 * @param message.content - Message content (string or TextContent/ImageContent array)
 	 * @param message.display - Whether to show in TUI (true = styled display, false = hidden)
 	 * @param message.details - Optional hook-specific metadata (not sent to LLM)
+	 * @param message.attribution - Who initiated the message for billing/attribution semantics ("user" | "agent")
 	 * @param options.triggerTurn - If true and agent is idle, triggers a new LLM turn. Default: false.
 	 *                              If agent is streaming, message is queued and triggerTurn is ignored.
 	 * @param options.deliverAs - How to deliver the message: "steer" or "followUp".
 	 */
 	sendMessage<T = unknown>(
-		message: Pick<HookMessage<T>, "customType" | "content" | "display" | "details">,
+		message: Pick<HookMessage<T>, "customType" | "content" | "display" | "details" | "attribution">,
 		options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" },
 	): void;
 

package/src/modes/components/bash-execution.ts

@@ -3,9 +3,10 @@
  */
 
 import { sanitizeText } from "@oh-my-pi/pi-natives";
-import { Container, Loader, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
+import { Container, ImageProtocol, Loader, Spacer, TERMINAL, Text, type TUI } from "@oh-my-pi/pi-tui";
 import { getSymbolTheme, theme } from "../../modes/theme/theme";
 import { formatTruncationMetaNotice, type TruncationMeta } from "../../tools/output-meta";
+import { getSixelLineMask, sanitizeWithOptionalSixelPassthrough } from "../../utils/sixel";
 import { DynamicBorder } from "./dynamic-border";
 import { truncateToVisualLines } from "./visual-truncate";
 
@@ -75,18 +76,18 @@ export class BashExecutionComponent extends Container {
 	}
 
 	appendOutput(chunk: string): void {
-		const clean = sanitizeText(chunk);
+		const clean = sanitizeWithOptionalSixelPassthrough(chunk, sanitizeText);
 
 		// Append to output lines
-		const newLines = clean.split("\n").map(line => this.#clampDisplayLine(line));
-		if (this.#outputLines.length > 0 && newLines.length > 0) {
-			// Append first chunk to last line (incomplete line continuation)
-			this.#outputLines[this.#outputLines.length - 1] = this.#clampDisplayLine(
-				`${this.#outputLines[this.#outputLines.length - 1]}${newLines[0]}`,
-			);
-			this.#outputLines.push(...newLines.slice(1));
+		const incomingLines = clean.split("\n");
+		if (this.#outputLines.length > 0 && incomingLines.length > 0) {
+			const lastIndex = this.#outputLines.length - 1;
+			const mergedLines = [`${this.#outputLines[lastIndex]}${incomingLines[0]}`, ...incomingLines.slice(1)];
+			const clampedMergedLines = this.#clampLinesPreservingSixel(mergedLines);
+			this.#outputLines[lastIndex] = clampedMergedLines[0] ?? "";
+			this.#outputLines.push(...clampedMergedLines.slice(1));
 		} else {
-			this.#outputLines.push(...newLines);
+			this.#outputLines.push(...this.#clampLinesPreservingSixel(incomingLines));
 		}
 
 		this.#updateDisplay();
@@ -120,6 +121,9 @@ export class BashExecutionComponent extends Container {
 		// Apply preview truncation based on expanded state
 		const previewLogicalLines = availableLines.slice(-PREVIEW_LINES);
 		const hiddenLineCount = availableLines.length - previewLogicalLines.length;
+		const sixelLineMask =
+			TERMINAL.imageProtocol === ImageProtocol.Sixel ? getSixelLineMask(availableLines) : undefined;
+		const hasSixelOutput = sixelLineMask?.some(Boolean) ?? false;
 
 		// Rebuild content container
 		this.#contentContainer.clear();
@@ -130,9 +134,10 @@ export class BashExecutionComponent extends Container {
 
 		// Output
 		if (availableLines.length > 0) {
-			if (this.#expanded) {
-				// Show all lines
-				const displayText = availableLines.map(line => theme.fg("muted", line)).join("\n");
+			if (this.#expanded || hasSixelOutput) {
+				const displayText = availableLines
+					.map((line, index) => (sixelLineMask?.[index] ? line : theme.fg("muted", line)))
+					.join("\n");
 				this.#contentContainer.addChild(new Text(`\n${displayText}`, 1, 0));
 			} else {
 				// Use shared visual truncation utility, recomputed per render width
@@ -155,7 +160,7 @@ export class BashExecutionComponent extends Container {
 			const statusParts: string[] = [];
 
 			// Show how many lines are hidden (collapsed preview)
-			if (hiddenLineCount > 0) {
+			if (hiddenLineCount > 0 && !hasSixelOutput) {
 				statusParts.push(theme.fg("dim", `… ${hiddenLineCount} more lines (ctrl+o to expand)`));
 			}
 
@@ -183,9 +188,18 @@ export class BashExecutionComponent extends Container {
 		return `${line.slice(0, MAX_DISPLAY_LINE_CHARS)}… [${omitted} chars omitted]`;
 	}
 
+	#clampLinesPreservingSixel(lines: string[]): string[] {
+		if (lines.length === 0) return [];
+		const sixelLineMask = getSixelLineMask(lines);
+		if (!sixelLineMask.some(Boolean)) {
+			return lines.map(line => this.#clampDisplayLine(line));
+		}
+		return lines.map((line, index) => (sixelLineMask[index] ? line : this.#clampDisplayLine(line)));
+	}
+
 	#setOutput(output: string): void {
-		const clean = sanitizeText(output);
-		this.#outputLines = clean ? clean.split("\n").map(line => this.#clampDisplayLine(line)) : [];
+		const clean = sanitizeWithOptionalSixelPassthrough(output, sanitizeText);
+		this.#outputLines = clean ? this.#clampLinesPreservingSixel(clean.split("\n")) : [];
 	}
 
 	/**

package/src/modes/components/tool-execution.ts

@@ -34,6 +34,7 @@ import { formatExpandHint, truncateToWidth } from "../../tools/render-utils";
 import { toolRenderers } from "../../tools/renderers";
 import { renderStatusLine } from "../../tui";
 import { convertToPng } from "../../utils/image-convert";
+import { sanitizeWithOptionalSixelPassthrough } from "../../utils/sixel";
 import { renderDiff } from "./diff";
 
 function ensureInvalidate(component: unknown): Component {
@@ -589,7 +590,7 @@ export class ToolExecutionComponent extends Container {
 
 		let output = textBlocks
 			.map((c: any) => {
-				return sanitizeText(c.text || "");
+				return sanitizeWithOptionalSixelPassthrough(c.text || "", sanitizeText);
 			})
 			.join("\n");
 

package/src/modes/controllers/input-controller.ts

@@ -225,6 +225,7 @@ export class InputController {
 								content: message,
 								display: true,
 								details,
+								attribution: "user",
 							},
 							{ streamingBehavior: "followUp" },
 						);

package/src/sdk.ts

@@ -763,6 +763,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 							customType: "async-result",
 							content: message,
 							display: true,
+							attribution: "agent",
 							details: {
 								jobId,
 								type: job?.type,

package/src/session/agent-session.ts

@@ -422,6 +422,7 @@ export class AgentSession {
 				content: reminderText,
 				display: false,
 				details: { toolName: action.sourceToolName },
+				attribution: "agent",
 				timestamp: Date.now(),
 			});
 		});
@@ -597,6 +598,7 @@ export class AgentSession {
 										content: injection.content,
 										display: false,
 										details,
+										attribution: "agent",
 										timestamp: Date.now(),
 									});
 									this.sessionManager.appendCustomMessageEntry(
@@ -604,6 +606,7 @@ export class AgentSession {
 										injection.content,
 										false,
 										details,
+										"agent",
 									);
 									this.#markTtsrInjected(details.rules);
 								}
@@ -642,6 +645,7 @@ export class AgentSession {
 					event.message.content,
 					event.message.display,
 					event.message.details,
+					event.message.attribution ?? "agent",
 				);
 				if (event.message.role === "custom" && event.message.customType === "ttsr-injection") {
 					this.#markTtsrInjected(this.#extractTtsrRuleNames(event.message.details));
@@ -1011,6 +1015,7 @@ export class AgentSession {
 			content: injection.content,
 			display: false,
 			details: { rules: injection.rules.map(rule => rule.name) },
+			attribution: "agent",
 			timestamp: Date.now(),
 		});
 		this.#ensureTtsrResumePromise();
@@ -1809,6 +1814,7 @@ export class AgentSession {
 			customType: "plan-mode-reference",
 			content,
 			display: false,
+			attribution: "agent",
 			timestamp: Date.now(),
 		};
 	}
@@ -1849,6 +1855,7 @@ export class AgentSession {
 			customType: "plan-mode-context",
 			content,
 			display: false,
+			attribution: "agent",
 			timestamp: Date.now(),
 		};
 	}
@@ -1910,8 +1917,8 @@ export class AgentSession {
 		}
 
 		const message = options?.synthetic
-			? { role: "developer" as const, content: userContent, timestamp: Date.now() }
-			: { role: "user" as const, content: userContent, timestamp: Date.now() };
+			? { role: "developer" as const, content: userContent, attribution: "agent" as const, timestamp: Date.now() }
+			: { role: "user" as const, content: userContent, attribution: "user" as const, timestamp: Date.now() };
 
 		await this.#promptWithMessage(message, expandedText, options);
 		if (!options?.synthetic) {
@@ -1920,7 +1927,7 @@ export class AgentSession {
 	}
 
 	async promptCustomMessage<T = unknown>(
-		message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details">,
+		message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details" | "attribution">,
 		options?: Pick<PromptOptions, "streamingBehavior" | "toolChoice">,
 	): Promise<void> {
 		const textContent =
@@ -1945,6 +1952,7 @@ export class AgentSession {
 			content: message.content,
 			display: message.display,
 			details: message.details,
+			attribution: message.attribution ?? "agent",
 			timestamp: Date.now(),
 		};
 
@@ -2033,6 +2041,8 @@ export class AgentSession {
 					this.#baseSystemPrompt,
 				);
 				if (result?.messages) {
+					const promptAttribution: "user" | "agent" | undefined =
+						"attribution" in message ? message.attribution : undefined;
 					for (const msg of result.messages) {
 						messages.push({
 							role: "custom",
@@ -2040,6 +2050,7 @@ export class AgentSession {
 							content: msg.content,
 							display: msg.display,
 							details: msg.details,
+							attribution: msg.attribution ?? promptAttribution ?? (message.role === "user" ? "user" : "agent"),
 							timestamp: Date.now(),
 						});
 					}
@@ -2239,6 +2250,7 @@ export class AgentSession {
 		this.agent.steer({
 			role: "user",
 			content,
+			attribution: "user",
 			timestamp: Date.now(),
 		});
 	}
@@ -2256,6 +2268,7 @@ export class AgentSession {
 		this.agent.followUp({
 			role: "user",
 			content,
+			attribution: "user",
 			timestamp: Date.now(),
 		});
 	}
@@ -2286,7 +2299,7 @@ export class AgentSession {
 	 * - Not streaming + no trigger: appends to state/session, no turn
 	 */
 	async sendCustomMessage<T = unknown>(
-		message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details">,
+		message: Pick<CustomMessage<T>, "customType" | "content" | "display" | "details" | "attribution">,
 		options?: { triggerTurn?: boolean; deliverAs?: "steer" | "followUp" | "nextTurn" },
 	): Promise<void> {
 		const appMessage: CustomMessage<T> = {
@@ -2295,6 +2308,7 @@ export class AgentSession {
 			content: message.content,
 			display: message.display,
 			details: message.details,
+			attribution: message.attribution ?? "agent",
 			timestamp: Date.now(),
 		};
 		if (this.isStreaming) {
@@ -2322,6 +2336,7 @@ export class AgentSession {
 			message.content,
 			message.display,
 			message.details,
+			message.attribution ?? "agent",
 		);
 	}
 
@@ -3212,7 +3227,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 
 			// Inject the handoff document as a custom message
 			const handoffContent = `<handoff-context>\n${handoffText}\n</handoff-context>\n\nThe above is a handoff document from a previous session. Use this context to continue the work seamlessly.`;
-			this.sessionManager.appendCustomMessageEntry("handoff", handoffContent, true);
+			this.sessionManager.appendCustomMessageEntry("handoff", handoffContent, true, undefined, "agent");
 
 			// Rebuild agent messages from session
 			const sessionContext = this.sessionManager.buildSessionContext();
@@ -3309,6 +3324,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 		this.agent.appendMessage({
 			role: "developer",
 			content: [{ type: "text", text: reminder }],
+			attribution: "agent",
 			timestamp: Date.now(),
 		});
 		this.#scheduleAgentContinue({ generation: this.#promptGeneration });
@@ -3339,9 +3355,10 @@ Be thorough - include exact file paths, function names, error messages, and tech
 			content: report,
 			display: false,
 			details,
+			attribution: "agent",
 			timestamp: Date.now(),
 		});
-		this.sessionManager.appendCustomMessageEntry("rewind-report", report, false, details);
+		this.sessionManager.appendCustomMessageEntry("rewind-report", report, false, details, "agent");
 		this.#checkpointState = undefined;
 		this.#pendingRewindReport = undefined;
 	}
@@ -3460,6 +3477,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 		this.agent.appendMessage({
 			role: "developer",
 			content: [{ type: "text", text: reminder }],
+			attribution: "agent",
 			timestamp: Date.now(),
 		});
 		this.#scheduleAgentContinue({ generation: this.#promptGeneration });
@@ -3876,6 +3894,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 					{
 						role: "developer",
 						content: [{ type: "text", text: "Continue if you have next steps." }],
+						attribution: "agent",
 						timestamp: Date.now(),
 					},
 					"Continue if you have next steps.",

package/src/session/compaction/branch-summarization.ts

@@ -149,7 +149,14 @@ function getMessageFromEntry(entry: SessionEntry): AgentMessage | undefined {
 			return entry.message;
 
 		case "custom_message":
-			return createCustomMessage(entry.customType, entry.content, entry.display, entry.details, entry.timestamp);
+			return createCustomMessage(
+				entry.customType,
+				entry.content,
+				entry.display,
+				entry.details,
+				entry.timestamp,
+				entry.attribution,
+			);
 
 		case "branch_summary":
 			return createBranchSummaryMessage(entry.summary, entry.fromId, entry.timestamp);

package/src/session/compaction/compaction.ts

@@ -81,7 +81,14 @@ function getMessageFromEntry(entry: SessionEntry): AgentMessage | undefined {
 		return entry.message;
 	}
 	if (entry.type === "custom_message") {
-		return createCustomMessage(entry.customType, entry.content, entry.display, entry.details, entry.timestamp);
+		return createCustomMessage(
+			entry.customType,
+			entry.content,
+			entry.display,
+			entry.details,
+			entry.timestamp,
+			entry.attribution,
+		);
 	}
 	if (entry.type === "branch_summary") {
 		return createBranchSummaryMessage(entry.summary, entry.fromId, entry.timestamp);

package/src/session/messages.ts

@@ -5,7 +5,7 @@
  * and provides a transformer to convert them to LLM-compatible messages.
  */
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import type { ImageContent, Message, TextContent, ToolResultMessage } from "@oh-my-pi/pi-ai";
+import type { ImageContent, Message, MessageAttribution, TextContent, ToolResultMessage } from "@oh-my-pi/pi-ai";
 import { renderPromptTemplate } from "../config/prompt-templates";
 import branchSummaryContextPrompt from "../prompts/compaction/branch-summary-context.md" with { type: "text" };
 import compactionSummaryContextPrompt from "../prompts/compaction/compaction-summary-context.md" with { type: "text" };
@@ -75,6 +75,8 @@ export interface CustomMessage<T = unknown> {
 	content: string | (TextContent | ImageContent)[];
 	display: boolean;
 	details?: T;
+	/** Who initiated this message for billing/attribution semantics. */
+	attribution?: MessageAttribution;
 	timestamp: number;
 }
 
@@ -87,6 +89,8 @@ export interface HookMessage<T = unknown> {
 	content: string | (TextContent | ImageContent)[];
 	display: boolean;
 	details?: T;
+	/** Who initiated this message for billing/attribution semantics. */
+	attribution?: MessageAttribution;
 	timestamp: number;
 }
 
@@ -206,6 +210,7 @@ export function createCustomMessage(
 	display: boolean,
 	details: unknown | undefined,
 	timestamp: string,
+	attribution?: MessageAttribution,
 ): CustomMessage {
 	return {
 		role: "custom",
@@ -213,6 +218,7 @@ export function createCustomMessage(
 		content,
 		display,
 		details,
+		attribution,
 		timestamp: new Date(timestamp).getTime(),
 	};
 }
@@ -236,6 +242,7 @@ export function convertToLlm(messages: AgentMessage[]): Message[] {
 					return {
 						role: "user",
 						content: [{ type: "text", text: bashExecutionToText(m) }],
+						attribution: "user",
 						timestamp: m.timestamp,
 					};
 				case "pythonExecution":
@@ -245,14 +252,18 @@ export function convertToLlm(messages: AgentMessage[]): Message[] {
 					return {
 						role: "user",
 						content: [{ type: "text", text: pythonExecutionToText(m) }],
+						attribution: "user",
 						timestamp: m.timestamp,
 					};
 				case "custom":
 				case "hookMessage": {
 					const content = typeof m.content === "string" ? [{ type: "text" as const, text: m.content }] : m.content;
+					const role = "user";
+					const attribution = m.attribution;
 					return {
-						role: "user",
+						role,
 						content,
+						attribution,
 						timestamp: m.timestamp,
 					};
 				}
@@ -265,6 +276,7 @@ export function convertToLlm(messages: AgentMessage[]): Message[] {
 								text: renderPromptTemplate(BRANCH_SUMMARY_TEMPLATE, { summary: m.summary }),
 							},
 						],
+						attribution: "agent",
 						timestamp: m.timestamp,
 					};
 				case "compactionSummary":
@@ -276,6 +288,7 @@ export function convertToLlm(messages: AgentMessage[]): Message[] {
 								text: renderPromptTemplate(COMPACTION_SUMMARY_TEMPLATE, { summary: m.summary }),
 							},
 						],
+						attribution: "agent",
 						timestamp: m.timestamp,
 					};
 				case "fileMention": {
@@ -296,17 +309,21 @@ export function convertToLlm(messages: AgentMessage[]): Message[] {
 					return {
 						role: "user",
 						content,
+						attribution: "user",
 						timestamp: m.timestamp,
 					};
 				}
 				case "user":
+					return { ...m, attribution: m.attribution ?? "user" };
 				case "developer":
+					return { ...m, attribution: m.attribution ?? "agent" };
 				case "assistant":
 					return m;
 				case "toolResult":
 					return {
 						...m,
 						content: getPrunedToolResultContent(m as ToolResultMessage),
+						attribution: m.attribution ?? "agent",
 					};
 				default:
 					// biome-ignore lint/correctness/noSwitchDeclarations: fine

package/src/session/session-manager.ts

@@ -2,7 +2,7 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import type { ImageContent, Message, TextContent, Usage } from "@oh-my-pi/pi-ai";
+import type { ImageContent, Message, MessageAttribution, TextContent, Usage } from "@oh-my-pi/pi-ai";
 import { getTerminalId } from "@oh-my-pi/pi-tui";
 import {
 	getBlobsDir,
@@ -151,7 +151,7 @@ export interface ModeChangeEntry extends SessionEntryBase {
  * Use customType to identify your extension's entries.
  *
  * Unlike CustomEntry, this DOES participate in LLM context.
- * The content is converted to a user message in buildSessionContext().
+ * The content participates in LLM context through convertToLlm().
  * Use details for extension-specific metadata (not sent to LLM).
  *
  * display controls TUI rendering:
@@ -164,6 +164,8 @@ export interface CustomMessageEntry<T = unknown> extends SessionEntryBase {
 	content: string | (TextContent | ImageContent)[];
 	details?: T;
 	display: boolean;
+	/** Who initiated this message for billing/attribution semantics. */
+	attribution?: MessageAttribution;
 }
 
 /** Session entry - has id/parentId for tree structure (returned by "read" methods in SessionManager) */
@@ -483,7 +485,14 @@ export function buildSessionContext(
 			messages.push(entry.message);
 		} else if (entry.type === "custom_message") {
 			messages.push(
-				createCustomMessage(entry.customType, entry.content, entry.display, entry.details, entry.timestamp),
+				createCustomMessage(
+					entry.customType,
+					entry.content,
+					entry.display,
+					entry.details,
+					entry.timestamp,
+					entry.attribution,
+				),
 			);
 		} else if (entry.type === "branch_summary" && entry.summary) {
 			messages.push(createBranchSummaryMessage(entry.summary, entry.fromId, entry.timestamp));
@@ -1825,6 +1834,7 @@ export class SessionManager {
 	 * @param content Message content (string or TextContent/ImageContent array)
 	 * @param display Whether to show in TUI (true = styled display, false = hidden)
 	 * @param details Optional extension-specific metadata (not sent to LLM)
+	 * @param attribution Who initiated this message for billing/attribution semantics
 	 * @returns Entry id
 	 */
 	appendCustomMessageEntry<T = unknown>(
@@ -1832,6 +1842,7 @@ export class SessionManager {
 		content: string | (TextContent | ImageContent)[],
 		display: boolean,
 		details?: T,
+		attribution: MessageAttribution = "agent",
 	): string {
 		const entry: CustomMessageEntry<T> = {
 			type: "custom_message",
@@ -1839,6 +1850,7 @@ export class SessionManager {
 			content,
 			display,
 			details,
+			attribution,
 			id: generateId(this.#byId),
 			parentId: this.#leafId,
 			timestamp: new Date().toISOString(),

package/src/session/streaming-output.ts

@@ -1,5 +1,6 @@
 import { sanitizeText } from "@oh-my-pi/pi-natives";
 import { formatBytes } from "../tools/render-utils";
+import { sanitizeWithOptionalSixelPassthrough } from "../utils/sixel";
 
 // =============================================================================
 // Constants
@@ -571,7 +572,7 @@ export class OutputSink {
 	}
 
 	async push(chunk: string): Promise<void> {
-		chunk = sanitizeText(chunk);
+		chunk = sanitizeWithOptionalSixelPassthrough(chunk, sanitizeText);
 		this.#onChunk?.(chunk);
 
 		const dataBytes = Buffer.byteLength(chunk, "utf-8");

package/src/tools/bash-interactive.ts

@@ -14,6 +14,7 @@ import xterm from "@xterm/headless";
 import { NON_INTERACTIVE_ENV } from "../exec/non-interactive-env";
 import type { Theme } from "../modes/theme/theme";
 import { OutputSink, type OutputSummary } from "../session/streaming-output";
+import { sanitizeWithOptionalSixelPassthrough } from "../utils/sixel";
 import { formatStatusIcon, replaceTabs } from "./render-utils";
 
 export interface BashInteractiveResult extends OutputSummary {
@@ -24,7 +25,7 @@ export interface BashInteractiveResult extends OutputSummary {
 
 function normalizeCaptureChunk(chunk: string): string {
 	const normalized = chunk.replace(/\r\n/gu, "\n").replace(/\r/gu, "\n");
-	return sanitizeText(normalized);
+	return sanitizeWithOptionalSixelPassthrough(normalized, sanitizeText);
 }
 
 const XtermTerminal = xterm.Terminal;

package/src/tools/bash.ts

@@ -2,7 +2,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { Component } from "@oh-my-pi/pi-tui";
-import { Text } from "@oh-my-pi/pi-tui";
+import { ImageProtocol, TERMINAL, Text } from "@oh-my-pi/pi-tui";
 import { $env, getProjectDir, isEnoent } from "@oh-my-pi/pi-utils";
 import { Type } from "@sinclair/typebox";
 import { renderPromptTemplate } from "../config/prompt-templates";
@@ -15,6 +15,7 @@ import bashDescription from "../prompts/tools/bash.md" with { type: "text" };
 import { DEFAULT_MAX_BYTES, TailBuffer } from "../session/streaming-output";
 import { renderStatusLine } from "../tui";
 import { CachedOutputBlock } from "../tui/output-block";
+import { getSixelLineMask } from "../utils/sixel";
 import type { ToolSession } from ".";
 import { type BashInteractiveResult, runInteractiveBashPty } from "./bash-interactive";
 import { checkBashInterception } from "./bash-interceptor";
@@ -414,14 +415,21 @@ export const bashToolRenderer = {
 
 				const outputLines: string[] = [];
 				const hasOutput = displayOutput.trim().length > 0;
+				const rawOutputLines = displayOutput.split("\n");
+				const sixelLineMask =
+					TERMINAL.imageProtocol === ImageProtocol.Sixel ? getSixelLineMask(rawOutputLines) : undefined;
+				const hasSixelOutput = sixelLineMask?.some(Boolean) ?? false;
 				if (hasOutput) {
-					if (expanded) {
+					if (hasSixelOutput) {
 						outputLines.push(
-							...displayOutput.split("\n").map(line => uiTheme.fg("toolOutput", replaceTabs(line))),
+							...rawOutputLines.map((line, index) =>
+								sixelLineMask?.[index] ? line : uiTheme.fg("toolOutput", replaceTabs(line)),
+							),
 						);
+					} else if (expanded) {
+						outputLines.push(...rawOutputLines.map(line => uiTheme.fg("toolOutput", replaceTabs(line))));
 					} else {
-						const styledOutput = displayOutput
-							.split("\n")
+						const styledOutput = rawOutputLines
 							.map(line => uiTheme.fg("toolOutput", replaceTabs(line)))
 							.join("\n");
 						const textContent = styledOutput;

package/src/tui/output-block.ts

@@ -1,8 +1,9 @@
 /**
  * Bordered output container with optional header and sections.
  */
-import { padding, visibleWidth } from "@oh-my-pi/pi-tui";
+import { ImageProtocol, padding, TERMINAL, visibleWidth } from "@oh-my-pi/pi-tui";
 import type { Theme } from "../modes/theme/theme";
+import { getSixelLineMask } from "../utils/sixel";
 import type { State } from "./types";
 import type { RenderCache } from "./utils";
 import { getStateBgColor, Hasher, padToWidth, truncateToWidth } from "./utils";
@@ -80,7 +81,13 @@ export function renderOutputBlock(options: OutputBlockOptions, theme: Theme): st
 			);
 		}
 		const allLines = section.lines.flatMap(l => l.split("\n"));
-		for (const line of allLines) {
+		const sixelLineMask = TERMINAL.imageProtocol === ImageProtocol.Sixel ? getSixelLineMask(allLines) : undefined;
+		for (let lineIndex = 0; lineIndex < allLines.length; lineIndex++) {
+			const line = allLines[lineIndex]!;
+			if (sixelLineMask?.[lineIndex]) {
+				lines.push(line);
+				continue;
+			}
 			// Sections may receive content that was already padded to terminal width
 			// (e.g. from Text.render()). Trailing spaces would trigger truncateToWidth()
 			// to append an ellipsis even when the *semantic* content fits.

package/src/utils/sixel.ts

@@ -0,0 +1,69 @@
+import { $env } from "@oh-my-pi/pi-utils";
+
+const SIXEL_START_REGEX = /\x1bP(?:[0-9;]*)q/u;
+const SIXEL_END_SEQUENCE = "\x1b\\";
+const SIXEL_END_BELL = "\x07";
+const SIXEL_SEQUENCE_REGEX = /\x1bP(?:[0-9;]*)q[\s\S]*?(?:\x1b\\|\x07)/gu;
+const SIXEL_PLACEHOLDER_PREFIX = "__OMP_SIXEL_SEQUENCE_";
+
+/**
+ * Returns whether SIXEL passthrough is explicitly enabled.
+ *
+ * Both gates must be enabled to preserve SIXEL control sequences:
+ * - PI_FORCE_IMAGE_PROTOCOL=sixel
+ * - PI_ALLOW_SIXEL_PASSTHROUGH=1
+ */
+export function isSixelPassthroughEnabled(): boolean {
+	const forcedProtocol = $env.PI_FORCE_IMAGE_PROTOCOL?.trim().toLowerCase();
+	return forcedProtocol === "sixel" && $env.PI_ALLOW_SIXEL_PASSTHROUGH === "1";
+}
+/** Returns true when the text contains a SIXEL start sequence. */
+export function containsSixelSequence(text: string): boolean {
+	return SIXEL_START_REGEX.test(text);
+}
+
+/**
+ * Returns a boolean mask indicating which lines belong to a SIXEL sequence block.
+ * Supports multi-line SIXEL payloads generated by libsixel.
+ */
+export function getSixelLineMask(lines: string[]): boolean[] {
+	let inSequence = false;
+	return lines.map(line => {
+		const hasStart = containsSixelSequence(line);
+		if (hasStart) {
+			inSequence = true;
+		}
+		const isSixelLine = inSequence;
+		if (inSequence && (line.includes(SIXEL_END_SEQUENCE) || line.includes(SIXEL_END_BELL))) {
+			inSequence = false;
+		}
+		return isSixelLine;
+	});
+}
+
+/** Returns true when the line contains a SIXEL start sequence. */
+export function isSixelLine(line: string): boolean {
+	return containsSixelSequence(line);
+}
+
+/**
+ * Sanitizes text while preserving embedded SIXEL sequences when passthrough is enabled.
+ */
+export function sanitizeWithOptionalSixelPassthrough(text: string, sanitize: (text: string) => string): string {
+	if (!isSixelPassthroughEnabled() || !containsSixelSequence(text)) {
+		return sanitize(text);
+	}
+
+	const preservedSequences: string[] = [];
+	const tokenized = text.replace(SIXEL_SEQUENCE_REGEX, match => {
+		const token = `${SIXEL_PLACEHOLDER_PREFIX}${preservedSequences.length}__`;
+		preservedSequences.push(match);
+		return token;
+	});
+
+	const sanitized = sanitize(tokenized);
+	return sanitized.replace(/__OMP_SIXEL_SEQUENCE_(\d+)__/gu, (_, indexText: string) => {
+		const index = Number.parseInt(indexText, 10);
+		return preservedSequences[index] ?? "";
+	});
+}

package/src/web/search/providers/anthropic.ts

@@ -66,6 +66,7 @@ function buildSystemBlocks(
 	return buildAnthropicSystemBlocks(systemPrompt, {
 		includeClaudeCodeInstruction: includeClaudeCode,
 		extraInstructions,
+		cacheControl: { type: "ephemeral" },
 	});
 }