@oh-my-pi/pi-tui 18.2.11 → 18.3.0

package/src/overlays/annotation-types.ts

@@ -0,0 +1,78 @@
+export type ReviewSourceRowKind = "context" | "added" | "removed";
+
+export interface ReviewSourceRow {
+	kind: ReviewSourceRowKind;
+	raw: string;
+	content: string;
+	oldLine?: number;
+	newLine?: number;
+	hunkHeader: string;
+}
+
+export type ReviewDiffRow =
+	| ReviewSourceRow
+	| { kind: "hunk"; raw: string; hunkHeader: string }
+	| { kind: "no-newline"; raw: string; hunkHeader: string };
+
+export interface ReviewDiffFile {
+	path: string;
+	oldPath?: string;
+	newPath?: string;
+	occurrence: number;
+	rawDiff: string;
+	rows: ReviewDiffRow[];
+	linesAdded: number;
+	linesRemoved: number;
+	isBinary: boolean;
+}
+
+export interface CodeReviewAnnotationBase {
+	path: string;
+	oldPath?: string;
+	newPath?: string;
+	occurrence: number;
+	note: string;
+}
+
+export type CodeReviewAnnotation =
+	| (CodeReviewAnnotationBase & {
+			scope: "file";
+	  })
+	| (CodeReviewAnnotationBase & {
+			scope: "line";
+			hunkHeader: string;
+			oldLine?: number;
+			newLine?: number;
+			rawLine: string;
+	  });
+
+export interface CodeReviewOverlayResult {
+	action: "review" | "paste";
+	annotations: CodeReviewAnnotation[];
+}
+
+export type TextReviewSourceProvenance =
+	| { kind: "latest-assistant"; entryId: string }
+	| { kind: "session"; entryId: string }
+	| { kind: "file"; path: string }
+	| { kind: "prompt" };
+
+export interface TextReviewSource {
+	/** Identifies the source within this annotation run. */
+	id: string;
+	kind: "message" | "code" | "quote" | "command" | "file" | "prompt";
+	label: string;
+	text: string;
+	/** Identifies the active session entry that supplied this source, when applicable. */
+	provenance?: TextReviewSourceProvenance;
+	sessionId?: string;
+}
+
+export type TextReviewAnnotation =
+	| { scope: "text"; note: string }
+	| { scope: "line"; line: number; quote: string; note: string };
+
+export interface TextReviewOverlayResult {
+	action: "paste";
+	annotations: TextReviewAnnotation[];
+}

package/src/overlays/copy-selector.ts

@@ -49,19 +49,37 @@ export interface CopySelectorDeps {
 	proseOnlyThinking?: () => boolean;
 	linkTargets?: ReadonlyMap<string, string>;
 	requestRender: () => void;
-	/** The outlined content was chosen — copy it. `label` feeds the status line. */
-	onPick: (content: string, label: string) => void;
+	/** Replaces the "Copy" header when the picker is reused for another purpose. */
+	title?: string;
+	/** Verb shown for the pick action in hints and block controls (default "copy"). */
+	actionLabel?: string;
+	/**
+	 * The outlined content was chosen — copy it. `label` feeds the status line;
+	 * `source` names the transcript entry (and inner block, when descended) it came from.
+	 */
+	onPick: (content: string, label: string, source: CopyPickSource) => void;
 	/** `o` on a link block — open `href` with the system opener. Absent: `o` is ignored. */
 	onOpen?: (href: string, label: string) => void;
 	onCancel: () => void;
 }
 
+/** Where picked content came from in the transcript. */
+export interface CopyPickSource {
+	entry: TranscriptEntry;
+	/** The inner block, when the pick happened in the descended block view. */
+	block?: CopyBlock;
+}
+
 /** One copyable inner block of a transcript turn. */
-interface CopyBlock {
+export interface CopyBlock {
 	/** Short kind label ("code · ts", "bash command", "read result", …). */
 	label: string;
 	/** Exact text placed on the clipboard. */
 	content: string;
+	/** Transcript entry that produced this block. */
+	entry: TranscriptEntry;
+	/** Markdown code/quote block, or a bash/eval tool-call command. */
+	kind?: "code" | "quote" | "command";
 	/** Highlight language for the block preview. */
 	language?: string;
 	/** Set for link blocks: the URL `o` opens. `content` is the same URL. */
@@ -245,13 +263,13 @@ export class CopySelectorComponent implements Component {
 		if (matchesKey(data, "enter") || matchesKey(data, "return") || data === "\n") {
 			if (this.#blocks) {
 				const block = this.#blocks[this.#blockSelected];
-				if (block) this.deps.onPick(block.content, block.label);
+				if (block) this.deps.onPick(block.content, block.label, { entry: block.entry, block });
 				return;
 			}
 			const target = this.#targets[this.#selected];
 			if (!target) return;
 			const item = targetCopy(target, this.#blocksFor(target));
-			this.deps.onPick(item.content, item.label);
+			this.deps.onPick(item.content, item.label, { entry: target.entries[0]! });
 			return;
 		}
 		// Page/home/end/shift+arrow scrolling without moving the selection.
@@ -283,7 +301,7 @@ export class CopySelectorComponent implements Component {
 			if (block.href && this.deps.onOpen) this.deps.onOpen(block.href, block.label);
 			return;
 		}
-		this.deps.onPick(block.content, block.label);
+		this.deps.onPick(block.content, block.label, { entry: block.entry, block });
 	}
 
 	#moveVertical(delta: -1 | 1): void {
@@ -363,9 +381,10 @@ export class CopySelectorComponent implements Component {
 
 		const selectedBlock = this.#blocks?.[this.#blockSelected];
 		const openHint = selectedBlock?.href && this.deps.onOpen ? "  o open" : "";
+		const action = this.deps.actionLabel ?? "copy";
 		const hint = this.#blocks
-			? `${this.#blockSelected + 1}/${this.#blocks.length}  ↑/↓ block  ←/esc back  enter copy${openHint}  click ${theme.cmd.copy}/${theme.cmd.share}`
-			: `${this.#targets.length > 0 ? `${this.#selected + 1}/${this.#targets.length}  ` : ""}↑/↓ step  ${blocks.length > 0 ? "→ blocks  " : ""}enter copy  ${this.#truncated ? "a earlier turns  " : ""}ctrl+o expand  esc close`;
+			? `${this.#blockSelected + 1}/${this.#blocks.length}  ↑/↓ block  ←/esc back  enter ${action}${openHint}  click ${theme.cmd.copy}/${theme.cmd.share}`
+			: `${this.#targets.length > 0 ? `${this.#selected + 1}/${this.#targets.length}  ` : ""}↑/↓ step  ${blocks.length > 0 ? "→ blocks  " : ""}enter ${action}  ${this.#truncated ? "a earlier turns  " : ""}ctrl+o expand  esc close`;
 		const anchorId = target
 			? this.#blocks
 				? `copy:${target.turnId}:block:${this.#blockSelected}`
@@ -373,7 +392,9 @@ export class CopySelectorComponent implements Component {
 			: undefined;
 		return {
 			header: [
-				`${theme.cmd.copy} ${theme.bold("Copy")}${theme.sep.dot}${theme.fg("dim", "pick what to put on the clipboard")}`,
+				this.deps.title
+					? theme.bold(this.deps.title)
+					: `${theme.cmd.copy} ${theme.bold("Copy")}${theme.sep.dot}${theme.fg("dim", "pick what to put on the clipboard")}`,
 			],
 			body: {
 				lines: composed.lines,
@@ -409,7 +430,7 @@ export class CopySelectorComponent implements Component {
 			const selected = index === this.#blockSelected;
 			const captionColor: ThemeColor = selected ? OUTLINE_COLOR : "dim";
 			const controls: Array<{ action: ControlRegion["action"]; text: string }> = [
-				{ action: "copy", text: `${theme.cmd.copy} copy` },
+				{ action: "copy", text: `${theme.cmd.copy} ${this.deps.actionLabel ?? "copy"}` },
 			];
 			if (block.href && this.deps.onOpen) controls.push({ action: "open", text: `${theme.cmd.share} open` });
 			const controlsWidth = controls.reduce((sum, control) => sum + visibleWidth(control.text) + 2, 0);
@@ -497,16 +518,18 @@ function toolResultText(message: Extract<SessionMessageEntry["message"], { role:
 		.trim();
 }
 
-function pushMarkdownBlocks(blocks: CopyBlock[], text: string): void {
+function pushMarkdownBlocks(blocks: CopyBlock[], text: string, entry: TranscriptEntry): void {
 	for (const block of extractBlocks(text)) {
 		if (block.kind === "code") {
 			blocks.push({
 				label: block.lang ? `${block.lang} code` : "code",
 				content: block.code,
+				entry,
+				kind: "code",
 				language: block.lang || undefined,
 			});
 		} else {
-			blocks.push({ label: "quote", content: block.text });
+			blocks.push({ label: "quote", content: block.text, entry, kind: "quote" });
 		}
 	}
 	// Links follow the message's blocks. The preview shows the whole URL on one
@@ -515,6 +538,7 @@ function pushMarkdownBlocks(blocks: CopyBlock[], text: string): void {
 		blocks.push({
 			label: link.text !== link.href ? `link${theme.sep.dot}${link.text}` : "link",
 			content: link.href,
+			entry,
 			href: link.href,
 		});
 	}
@@ -528,10 +552,10 @@ function collectBlocks(entries: readonly TranscriptEntry[]): CopyBlock[] {
 		if (!message) continue;
 		switch (message.role) {
 			case "user":
-				pushMarkdownBlocks(blocks, rawUserText(message));
+				pushMarkdownBlocks(blocks, rawUserText(message), entry);
 				break;
 			case "assistant": {
-				pushMarkdownBlocks(blocks, assistantVisibleText(message));
+				pushMarkdownBlocks(blocks, assistantVisibleText(message), entry);
 				for (const content of message.content) {
 					if (content.type !== "toolCall") continue;
 					const command = commandFromToolCall(content);
@@ -539,6 +563,8 @@ function collectBlocks(entries: readonly TranscriptEntry[]): CopyBlock[] {
 						blocks.push({
 							label: command.kind === "bash" ? "bash command" : "eval code",
 							content: command.code,
+							entry,
+							kind: "command",
 							language: command.language,
 						});
 					}
@@ -547,16 +573,16 @@ function collectBlocks(entries: readonly TranscriptEntry[]): CopyBlock[] {
 			}
 			case "toolResult": {
 				const text = toolResultText(message);
-				if (text) blocks.push({ label: `${message.toolName} result`, content: text });
+				if (text) blocks.push({ label: `${message.toolName} result`, content: text, entry });
 				break;
 			}
 			case "bashExecution":
-				blocks.push({ label: "command", content: message.command, language: "bash" });
-				if (message.output.trim()) blocks.push({ label: "output", content: message.output });
+				blocks.push({ label: "command", content: message.command, entry, language: "bash" });
+				if (message.output.trim()) blocks.push({ label: "output", content: message.output, entry });
 				break;
 			case "pythonExecution":
-				blocks.push({ label: "eval code", content: message.code, language: "python" });
-				if (message.output.trim()) blocks.push({ label: "output", content: message.output });
+				blocks.push({ label: "eval code", content: message.code, entry, language: "python" });
+				if (message.output.trim()) blocks.push({ label: "output", content: message.output, entry });
 				break;
 			default:
 				break;

package/src/overlays/copy-targets.ts

@@ -199,12 +199,12 @@ export function extractLastCommand(messages: readonly AgentMessage[]): LastComma
 	return undefined;
 }
 
-/** Concatenated visible text of an assistant message, or undefined when empty. */
-function assistantText(msg: AgentMessage): string | undefined {
+/** Concatenated visible text of an assistant message, verbatim; undefined when blank. */
+export function assistantText(msg: AgentMessage): string | undefined {
 	if (msg.role !== "assistant") return undefined;
 	let text = "";
 	for (const content of msg.content) {
 		if (content.type === "text") text += content.text;
 	}
-	return text.trim() || undefined;
+	return text.trim() ? text : undefined;
 }

package/src/overlays/model-hub.ts

@@ -11,7 +11,7 @@ import { parseModelString, splitUpstreamRouting, formatModelSelectorValue } from
  * in the compact alt+p picker ({@link ./model-picker}).
  */
 import { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { Model } from "@oh-my-pi/pi-ai";
+import type { KeysApi, Model } from "@oh-my-pi/pi-ai";
 import { getOAuthProviders } from "@oh-my-pi/pi-ai/oauth";
 import { getSupportedEfforts } from "@oh-my-pi/pi-catalog/model-thinking";
 import { providerEntry } from "@oh-my-pi/pi-catalog/compat/providers";
@@ -89,7 +89,7 @@ export interface ModelHubSource extends ModelBrowserSource {
 
 /** Catalog capabilities required by the model hub. */
 export interface ModelHubRegistry extends ModelBrowserRegistry {
-	readonly authStorage: { hasAuth(provider: string): boolean };
+	readonly authStorage: { readonly keys: Pick<KeysApi, "source"> };
 	getDiscoverableProviders(): string[];
 	getProviderDiscoveryState(provider: string):
 		| {
@@ -451,7 +451,8 @@ export class ModelHubComponent implements Component {
 				// Discoverable without stored auth: catalog-backed providers stay
 				// locked; keyless/custom endpoints (ollama, vllm, …) surface as
 				// selectable so discovery can populate them.
-				if (authStorage.hasAuth(provider) || !locked.has(provider)) {
+				const authenticated = authStorage.keys.source(provider) !== undefined;
+				if (authenticated || !locked.has(provider)) {
 					// #2761: implicit local endpoints (optional: true) stay hidden
 					// until discovery actually reaches a server. "idle" means never
 					// probed; "unavailable" means the endpoint is unreachable; both
@@ -459,7 +460,7 @@ export class ModelHubComponent implements Component {
 					// configured. models.yml discovery providers (optional: false)
 					// and providers with stored auth keep their entry so
 					// misconfigurations stay visible and diagnosable.
-					if (!authStorage.hasAuth(provider)) {
+					if (!authenticated) {
 						const discovery = this.#registry.getProviderDiscoveryState(provider);
 						if (discovery?.optional && (discovery.status === "idle" || discovery.status === "unavailable")) {
 							continue;

package/src/overlays/oauth-selector.ts

@@ -1,3 +1,4 @@
+import type { CredentialsApi, KeysApi } from "@oh-my-pi/pi-ai";
 import { getOAuthProviders } from "@oh-my-pi/pi-ai/oauth";
 import type { OAuthProviderInfo } from "@oh-my-pi/pi-ai/oauth/types";
 import {
@@ -19,14 +20,8 @@ const OAUTH_SELECTOR_MAX_VISIBLE = 10;
 
 /** Credential presence and provenance needed by the provider picker. */
 export interface OAuthSelectorAuthSource {
-	has(providerId: string): boolean;
-	hasAuth(providerId: string): boolean;
-	getCredentialOrigin(providerId: string):
-		| {
-				kind: "runtime" | "config" | "oauth" | "api_key" | "env" | "fallback";
-				envVar?: string;
-		  }
-		| undefined;
+	readonly credentials: Pick<CredentialsApi, "has">;
+	readonly keys: Pick<KeysApi, "source">;
 }
 
 /**
@@ -42,7 +37,6 @@ const ORIGIN_LABELS = {
 	oauth: "login",
 	api_key: "api key",
 	env: "env",
-	fallback: "custom provider",
 };
 /**
  * Component that renders an OAuth provider selector.
@@ -122,7 +116,9 @@ export class OAuthSelectorComponent extends OverlayPanel {
 		this.#updateList();
 	}
 	#hasSelectableAuth(providerId: string): boolean {
-		return this.#mode === "logout" ? this.#authStorage.has(providerId) : this.#authStorage.hasAuth(providerId);
+		return this.#mode === "logout"
+			? this.#authStorage.credentials.has(providerId)
+			: this.#authStorage.keys.source(providerId) !== undefined;
 	}
 
 	#loadProviders(disabledProviders: readonly string[] = []): void {
@@ -212,7 +208,7 @@ export class OAuthSelectorComponent extends OverlayPanel {
 	 * the list distinguishes a real login from an env var aliasing the provider.
 	 */
 	#getSourceLabel(providerId: string): string {
-		const origin = this.#authStorage.getCredentialOrigin(providerId);
+		const origin = this.#authStorage.keys.source(providerId);
 		if (!origin) return "";
 		const detail = origin.kind === "env" && origin.envVar ? `env: ${origin.envVar}` : ORIGIN_LABELS[origin.kind];
 		return theme.fg("muted", ` (${detail})`);
@@ -253,7 +249,7 @@ export class OAuthSelectorComponent extends OverlayPanel {
 
 	#getProviderSearchText(provider: OAuthProviderInfo): string {
 		let text = `${provider.name} ${provider.id}`;
-		const origin = this.#authStorage.getCredentialOrigin(provider.id);
+		const origin = this.#authStorage.keys.source(provider.id);
 		if (origin) {
 			text += ` logged in authenticated ${ORIGIN_LABELS[origin.kind]}`;
 			if (origin.envVar) text += ` ${origin.envVar}`;