@sayknow-cli/coding-agent 0.2.3 → 0.2.5

package/src/migrate/skill-normalizer.ts

@@ -0,0 +1,80 @@
+/**
+ * Normalize a skill from another agent into a native SKC `SKILL.md`.
+ *
+ * SKC derives a skill's loaded name from its directory (`<slug>/SKILL.md`) when no
+ * frontmatter `name` is present, and requires a `description`. To guarantee the
+ * effective loaded name equals the lowercase-hyphen slug, we drop any frontmatter
+ * `name` and place the file at `<slug>/SKILL.md`, synthesizing a `description`
+ * when the source lacks one.
+ */
+
+import { parseFrontmatter } from "@sayknow-cli/utils";
+import { YAML } from "bun";
+
+export interface NormalizeSkillInput {
+	/** Raw name from the source (filename stem, frontmatter name, etc.). */
+	rawName: string;
+	/** Full source markdown (may or may not have frontmatter). */
+	content: string;
+}
+
+export interface NormalizedSkill {
+	slug: string;
+	content: string;
+	warnings: string[];
+}
+
+/** Convert an arbitrary name into a lowercase-hyphen slug. */
+export function slugify(name: string): string {
+	const slug = name
+		.normalize("NFKD")
+		.replace(/[^\w\s-]/g, "")
+		.trim()
+		.toLowerCase()
+		.replace(/[\s_]+/g, "-")
+		.replace(/-+/g, "-")
+		.replace(/^-+|-+$/g, "");
+	return slug;
+}
+
+function firstNonEmptyLine(body: string): string | undefined {
+	for (const raw of body.split("\n")) {
+		const line = raw.replace(/^#+\s*/, "").trim();
+		if (line) return line;
+	}
+	return undefined;
+}
+
+/**
+ * Produce a `{ slug, content }` pair whose effective SKC-loaded name equals `slug`.
+ * Throws only on an unusable name (cannot produce a slug).
+ */
+export function normalizeSkill(input: NormalizeSkillInput): NormalizedSkill {
+	const warnings: string[] = [];
+	const { frontmatter, body } = parseFrontmatter(input.content, { level: "off" });
+
+	const sourceName =
+		typeof frontmatter.name === "string" && frontmatter.name.trim() ? frontmatter.name : input.rawName;
+	const slug = slugify(sourceName);
+	if (!slug) {
+		throw new Error(`cannot derive a valid slug from skill name "${input.rawName}"`);
+	}
+	if (slugify(input.rawName) !== slug && typeof frontmatter.name === "string") {
+		warnings.push(`renamed skill "${input.rawName}" to slug "${slug}"`);
+	}
+
+	// Build the destination frontmatter: drop `name` (loaded name comes from the dir),
+	// keep other fields, and ensure a non-empty description.
+	const { name: _droppedName, description: rawDescription, ...rest } = frontmatter;
+	let description = typeof rawDescription === "string" ? rawDescription.trim() : "";
+	if (!description) {
+		description = firstNonEmptyLine(body) ?? `Imported ${slug} skill.`;
+		warnings.push(`synthesized description for skill "${slug}"`);
+	}
+
+	const fm: Record<string, unknown> = { description, ...rest };
+	const yaml = YAML.stringify(fm).trimEnd();
+	const content = `---\n${yaml}\n---\n\n${body.trim()}\n`;
+
+	return { slug, content, warnings };
+}

package/src/migrate/types.ts

@@ -0,0 +1,163 @@
+/**
+ * Shared types for `skc migrate`.
+ *
+ * Imports MCP servers and skills from other coding agents (Claude Code, Codex,
+ * OpenCode) into native SKC config. See the consensus plan under
+ * `.skc/plans/ralplan/` for the full taxonomy and force/collision semantics.
+ */
+import type { MCPServerConfig } from "../runtime-mcp/types";
+
+/** Supported migration sources. */
+export type MigrateSource = "claude-code" | "codex" | "opencode";
+
+export const MIGRATE_SOURCES: readonly MigrateSource[] = ["claude-code", "codex", "opencode"];
+
+/** Canonical, deterministic ordering used when expanding `--from all` / repeated `--from`. */
+export const CANONICAL_SOURCE_ORDER: readonly MigrateSource[] = MIGRATE_SOURCES;
+
+/** What kind of thing an action/coverage row is about. */
+export type MigrateItemType = "mcp" | "skill" | "source";
+
+/**
+ * Per-item outcome taxonomy.
+ *
+ * `skipped_*` outcomes are non-fatal (exit 0). Any `failed_*` outcome sets
+ * `ok=false` and a non-zero process exit code.
+ */
+export type MigrationStatus =
+	| "imported"
+	| "updated"
+	| "skipped_exists"
+	| "skipped_absent_source"
+	| "skipped_unmappable"
+	| "failed_invalid_source"
+	| "failed_invalid_destination"
+	| "failed_io";
+
+export const MIGRATION_STATUSES: readonly MigrationStatus[] = [
+	"imported",
+	"updated",
+	"skipped_exists",
+	"skipped_absent_source",
+	"skipped_unmappable",
+	"failed_invalid_source",
+	"failed_invalid_destination",
+	"failed_io",
+];
+
+/** Statuses that represent a hard failure (drive `ok=false` + non-zero exit). */
+export const FAILURE_STATUSES: ReadonlySet<MigrationStatus> = new Set<MigrationStatus>([
+	"failed_invalid_source",
+	"failed_invalid_destination",
+	"failed_io",
+]);
+
+export function isFailureStatus(status: MigrationStatus): boolean {
+	return FAILURE_STATUSES.has(status);
+}
+
+/** Operation the planner decided for an item. */
+export type MigrateOperation = "create" | "update" | "skip" | "fail";
+
+/** A raw MCP server candidate parsed from a source, before mapping/destination planning. */
+export interface McpCandidate {
+	source: MigrateSource;
+	name: string;
+	/** The raw, unmapped server entry from the source config (mapped by the planner). */
+	raw: unknown;
+}
+
+/** A raw skill candidate parsed from a source, before normalization/destination planning. */
+export interface SkillCandidate {
+	source: MigrateSource;
+	/** Slug used as the destination directory and effective loaded name. */
+	slug: string;
+	/** Full SKILL.md content (frontmatter already normalized so loaded name == slug). */
+	content: string;
+	warnings: string[];
+}
+
+/**
+ * Source-level diagnostic for a single source/type pair (e.g. "codex mcp config
+ * was malformed"). Distinct from per-item actions so absent/unreadable sources
+ * are reported once instead of per item.
+ */
+export interface SourceDiagnostic {
+	source: MigrateSource;
+	type: Exclude<MigrateItemType, "source"> | "source";
+	status: Extract<MigrationStatus, "skipped_absent_source" | "failed_invalid_source" | "failed_io">;
+	message: string;
+}
+
+/** Normalized candidates + diagnostics returned by an adapter. */
+export interface AdapterResult {
+	mcpCandidates: McpCandidate[];
+	skillCandidates: SkillCandidate[];
+	diagnostics: SourceDiagnostic[];
+}
+
+/** A single planned action consumed identically by dry-run and live execution. */
+export interface MigrateAction {
+	source: MigrateSource;
+	type: MigrateItemType;
+	name?: string;
+	/** For skills: the effective SKC-loaded name (== slug). */
+	effectiveName?: string;
+	/** Absolute destination path (mcp.json for MCP, <skillsDir>/<slug>/SKILL.md for skills). */
+	destination?: string;
+	operation: MigrateOperation;
+	status: MigrationStatus;
+	reason?: string;
+	warnings?: string[];
+	/** Resolved payload the executor needs; never serialized to the report. */
+	mcp?: { config: MCPServerConfig; force: boolean };
+	skill?: { content: string };
+}
+
+export interface MigrateWarning {
+	source: MigrateSource;
+	type: string;
+	name?: string;
+	message: string;
+}
+
+export type StatusCounts = Record<MigrationStatus, number>;
+
+export interface MigrateDestinations {
+	mcpConfigPath: string;
+	skillsDir: string;
+}
+
+/** The full machine-readable report emitted with `--json`. */
+export interface MigrateReport {
+	ok: boolean;
+	dryRun: boolean;
+	project: boolean;
+	force: boolean;
+	sources: MigrateSource[];
+	destinations: MigrateDestinations;
+	summary: {
+		total: StatusCounts;
+		byType: { mcp: StatusCounts; skill: StatusCounts; source: StatusCounts };
+		bySource: Record<MigrateSource, StatusCounts>;
+	};
+	actions: Array<{
+		source: MigrateSource;
+		type: MigrateItemType;
+		name?: string;
+		effectiveName?: string;
+		destination?: string;
+		operation: MigrateOperation;
+		status: MigrationStatus;
+		reason?: string;
+		warnings?: string[];
+	}>;
+	warnings: MigrateWarning[];
+}
+
+/** Create a zeroed status-count record. */
+export function emptyStatusCounts(): StatusCounts {
+	const counts = {} as StatusCounts;
+	for (const status of MIGRATION_STATUSES) counts[status] = 0;
+	return counts;
+}

package/src/modes/bridge/bridge-mode.ts

@@ -1,7 +1,7 @@
-import * as path from "node:path";
 import type { ExtensionUIContext } from "../../extensibility/extensions";
 import type { AgentSession } from "../../session/agent-session";
 import type { ClientBridgePermissionOutcome } from "../../session/client-bridge";
+import { workflowGatePath } from "../../skc-runtime/session-layout";
 import type { RpcCommand, RpcResponse, RpcWorkflowGateResponse } from "../rpc/rpc-types";
 import { dispatchRpcCommand } from "../shared/agent-wire/command-dispatch";
 import { isRpcCommand } from "../shared/agent-wire/command-validation";
@@ -611,7 +611,7 @@ export async function runBridgeMode(
 		});
 	};
 	const gateStore = new FileGateStore(
-		path.join(session.sessionManager.getCwd(), ".skc", "state", "workflow-gates", `${session.sessionId}.json`),
+		workflowGatePath(session.sessionManager.getCwd(), session.sessionId, session.sessionId),
 	);
 	const unattendedControlPlane = new UnattendedSessionControlPlane({
 		runId: session.sessionId,

package/src/modes/components/custom-editor.ts

@@ -1,6 +1,6 @@
 import { Editor, type KeyId, matchesKey, parseKittySequence } from "@sayknow-cli/tui";
 import { BracketedPasteHandler } from "@sayknow-cli/tui/bracketed-paste";
-import type { AppKeybinding } from "../../config/keybindings";
+import { type AppKeybinding, KEYBINDINGS } from "../../config/keybindings";
 
 type ConfigurableEditorAction = Extract<
 	AppKeybinding,
@@ -23,25 +23,35 @@ type ConfigurableEditorAction = Extract<
 	| "app.clipboard.copyPrompt"
 >;
 
-const DEFAULT_ACTION_KEYS: Record<ConfigurableEditorAction, KeyId[]> = {
-	"app.interrupt": ["escape"],
-	"app.clear": ["ctrl+c"],
-	"app.exit": ["ctrl+d"],
-	"app.suspend": ["ctrl+z"],
-	"app.thinking.cycle": ["shift+tab"],
-	"app.model.cycleForward": ["ctrl+p"],
-	"app.model.cycleBackward": ["shift+ctrl+p"],
-	"app.model.select": ["ctrl+l"],
-	"app.model.selectTemporary": ["alt+p"],
-	"app.tools.expand": ["ctrl+o"],
-	"app.thinking.toggle": ["ctrl+t"],
-	"app.editor.external": ["ctrl+g"],
-	"app.history.search": ["ctrl+r"],
-	"app.message.queue": ["alt+enter"],
-	"app.message.dequeue": ["alt+up"],
-	"app.clipboard.pasteImage": ["ctrl+v"],
-	"app.clipboard.copyPrompt": ["alt+shift+c"],
-};
+// Editor-configurable app actions. Defaults are derived from the central
+// KEYBINDINGS registry so there is a single source of truth (e.g. the
+// platform-aware app.clipboard.pasteImage default is not duplicated here).
+const CONFIGURABLE_EDITOR_ACTIONS = [
+	"app.interrupt",
+	"app.clear",
+	"app.exit",
+	"app.suspend",
+	"app.thinking.cycle",
+	"app.model.cycleForward",
+	"app.model.cycleBackward",
+	"app.model.select",
+	"app.model.selectTemporary",
+	"app.tools.expand",
+	"app.thinking.toggle",
+	"app.editor.external",
+	"app.history.search",
+	"app.message.queue",
+	"app.message.dequeue",
+	"app.clipboard.pasteImage",
+	"app.clipboard.copyPrompt",
+] as const satisfies readonly ConfigurableEditorAction[];
+
+const DEFAULT_ACTION_KEYS = Object.fromEntries(
+	CONFIGURABLE_EDITOR_ACTIONS.map(action => {
+		const defaultKeys = KEYBINDINGS[action].defaultKeys;
+		return [action, Array.isArray(defaultKeys) ? [...defaultKeys] : [defaultKeys]];
+	}),
+) as Record<ConfigurableEditorAction, KeyId[]>;
 
 const PASTE_DECISION_TIMEOUT_MS = 5_000;
 const PENDING_PASTE_INPUT_MAX = 64;

package/src/modes/components/model-selector.ts

@@ -29,6 +29,7 @@ import {
 	type ScopedModelSelection,
 } from "../../config/model-resolver";
 import type { Settings } from "../../config/settings";
+import { t } from "../../i18n";
 import { type ThemeColor, theme } from "../../modes/theme/theme";
 import { formatModelOnboardingInlineHint } from "../../setup/model-onboarding-guidance";
 import { formatClampedModelSelector, getThinkingLevelMetadata, parseThinkingLevel } from "../../thinking";
@@ -190,7 +191,7 @@ const PROFILE_ROLE_PREVIEW_ORDER: SkcModelAssignmentTargetId[] = [
 	"critic",
 	"architect",
 ];
-const PRESET_SCOPE_LABELS = ["Apply for this session", "Set as default"];
+const presetScopeLabels = (): readonly string[] => [t("modelSelector.applySession"), t("modelSelector.setDefault")];
 
 function isPrintableCharacter(keyData: string): boolean {
 	return keyData.length === 1 && keyData >= " " && keyData !== "\x7f";
@@ -290,8 +291,7 @@ export class ModelSelectorComponent extends Container {
 		this.addChild(new Spacer(1));
 
 		// Add hint about model filtering
-		const hintText =
-			scopedModels.length > 0 ? "Showing models from --models scope" : formatModelOnboardingInlineHint();
+		const hintText = scopedModels.length > 0 ? t("modelSelector.showingScoped") : formatModelOnboardingInlineHint();
 		this.addChild(new Text(theme.fg("warning", hintText), 0, 0));
 		this.addChild(new Spacer(1));
 
@@ -594,7 +594,7 @@ export class ModelSelectorComponent extends Container {
 		this.#headerContainer.clear();
 
 		const tabs: Tab[] = this.#providers.map(provider => ({ id: provider.id, label: provider.label }));
-		const tabBar = new TabBar("Models", tabs, getTabBarTheme(), this.#activeTabIndex);
+		const tabBar = new TabBar(t("modelSelector.modelsTab"), tabs, getTabBarTheme(), this.#activeTabIndex);
 		tabBar.onTabChange = (_tab, index) => {
 			this.#activeTabIndex = index;
 			this.#selectedIndex = 0;
@@ -830,19 +830,19 @@ export class ModelSelectorComponent extends Container {
 		this.#headerContainer.clear();
 		this.#tabBar = null;
 		this.#listContainer.clear();
-		this.#headerContainer.addChild(new Text(theme.fg("accent", "Model presets"), 0, 0));
+		this.#headerContainer.addChild(new Text(theme.fg("accent", t("modelSelector.presets")), 0, 0));
 		const rows = this.#getPresetRows();
 		for (let i = 0; i < rows.length; i++) {
 			const row = rows[i];
 			const selected = i === this.#presetCursor;
 			const prefix = selected ? theme.fg("accent", `${theme.nav.cursor} `) : "  ";
 			if (row.kind === "create") {
-				const label = "Create custom preset";
+				const label = t("modelSelector.createCustom");
 				this.#listContainer.addChild(new Text(`${prefix}${selected ? theme.fg("accent", label) : label}`, 0, 0));
 				continue;
 			}
 			if (row.kind === "browse") {
-				const label = "Browse all models";
+				const label = t("modelSelector.browseAll");
 				this.#listContainer.addChild(new Text(`${prefix}${selected ? theme.fg("accent", label) : label}`, 0, 0));
 				continue;
 			}
@@ -872,7 +872,14 @@ export class ModelSelectorComponent extends Container {
 	#renderPresetPreview(profile: ModelProfileDefinition): void {
 		this.#listContainer.addChild(new Spacer(1));
 		this.#listContainer.addChild(
-			new Text(theme.fg("muted", `  Preset preview: ${getModelProfilePresentation(profile).displayName}`), 0, 0),
+			new Text(
+				theme.fg(
+					"muted",
+					`  ${t("modelSelector.presetPreview", { name: getModelProfilePresentation(profile).displayName })}`,
+				),
+				0,
+				0,
+			),
 		);
 		for (const role of PROFILE_ROLE_PREVIEW_ORDER) {
 			const selector = profile.modelMapping[role];
@@ -889,15 +896,15 @@ export class ModelSelectorComponent extends Container {
 		}
 		this.#listContainer.addChild(new Spacer(1));
 		if (this.#presetScopeMenuOpen) {
-			for (let i = 0; i < PRESET_SCOPE_LABELS.length; i++) {
-				const label = PRESET_SCOPE_LABELS[i] ?? "";
+			for (let i = 0; i < presetScopeLabels().length; i++) {
+				const label = presetScopeLabels()[i] ?? "";
 				const prefix = i === this.#presetScopeIndex ? theme.fg("accent", `${theme.nav.cursor} `) : "  ";
 				this.#listContainer.addChild(
 					new Text(`${prefix}${i === this.#presetScopeIndex ? theme.fg("accent", label) : label}`, 0, 0),
 				);
 			}
 		} else {
-			this.#listContainer.addChild(new Text(theme.fg("muted", "  Press Enter to apply this preset"), 0, 0));
+			this.#listContainer.addChild(new Text(theme.fg("muted", `  ${t("modelSelector.pressEnterApply")}`), 0, 0));
 		}
 	}
 
@@ -1050,7 +1057,10 @@ export class ModelSelectorComponent extends Container {
 			const statusMessage = this.#getProviderEmptyStateMessage();
 			this.#listContainer.addChild(
 				new Text(
-					theme.fg("muted", statusMessage ?? `  No matching models. ${formatModelOnboardingInlineHint()}`),
+					theme.fg(
+						"muted",
+						statusMessage ?? `  ${t("modelSelector.noMatching")} ${formatModelOnboardingInlineHint()}`,
+					),
 					0,
 					0,
 				),
@@ -1065,7 +1075,11 @@ export class ModelSelectorComponent extends Container {
 				? ` (${selected.model.provider}/${selected.model.id}, ${(selected as CanonicalModelItem).variantCount} variants)`
 				: "";
 			this.#listContainer.addChild(
-				new Text(theme.fg("muted", `  Model Name: ${selected.model.name}${suffix}`), 0, 0),
+				new Text(
+					theme.fg("muted", `  ${t("modelSelector.modelName", { value: selected.model.name })}${suffix}`),
+					0,
+					0,
+				),
 			);
 			if (this.#pendingThinkingChoice) {
 				this.#renderThinkingMenu(this.#pendingThinkingChoice);
@@ -1077,7 +1091,9 @@ export class ModelSelectorComponent extends Container {
 
 	#renderActionMenu(item: ModelItem | CanonicalModelItem): void {
 		this.#listContainer.addChild(new Spacer(1));
-		this.#listContainer.addChild(new Text(theme.fg("muted", `  Action for: ${item.model.id}`), 0, 0));
+		this.#listContainer.addChild(
+			new Text(theme.fg("muted", `  ${t("modelSelector.actionFor", { id: item.model.id })}`), 0, 0),
+		);
 		this.#listContainer.addChild(new Spacer(1));
 		const actionCount = this.#getActionCount(item.model);
 		for (let i = 0; i < actionCount; i++) {
@@ -1091,10 +1107,18 @@ export class ModelSelectorComponent extends Container {
 	}
 
 	#renderThinkingMenu(choice: PendingThinkingChoice): void {
-		const targetLabel = choice.role === null ? "temporary model" : SKC_MODEL_ASSIGNMENT_TARGETS[choice.role].name;
+		const targetLabel =
+			choice.role === null ? t("modelSelector.temporaryModel") : SKC_MODEL_ASSIGNMENT_TARGETS[choice.role].name;
 		this.#listContainer.addChild(new Spacer(1));
 		this.#listContainer.addChild(
-			new Text(theme.fg("muted", `  Reasoning for ${targetLabel}: ${choice.item.model.id}`), 0, 0),
+			new Text(
+				theme.fg(
+					"muted",
+					`  ${t("modelSelector.reasoningFor", { target: targetLabel, id: choice.item.model.id })}`,
+				),
+				0,
+				0,
+			),
 		);
 		this.#listContainer.addChild(new Spacer(1));
 		for (let i = 0; i < choice.levels.length; i++) {
@@ -1188,7 +1212,7 @@ export class ModelSelectorComponent extends Container {
 			if (rows.length === 0) return;
 			if (this.#presetScopeMenuOpen) {
 				this.#presetScopeIndex =
-					this.#presetScopeIndex === 0 ? PRESET_SCOPE_LABELS.length - 1 : this.#presetScopeIndex - 1;
+					this.#presetScopeIndex === 0 ? presetScopeLabels().length - 1 : this.#presetScopeIndex - 1;
 			} else {
 				this.#presetCursor = this.#presetCursor === 0 ? rows.length - 1 : this.#presetCursor - 1;
 				this.#previewProfileName = undefined;
@@ -1202,7 +1226,7 @@ export class ModelSelectorComponent extends Container {
 			const rows = this.#getPresetRows();
 			if (rows.length === 0) return;
 			if (this.#presetScopeMenuOpen) {
-				this.#presetScopeIndex = (this.#presetScopeIndex + 1) % PRESET_SCOPE_LABELS.length;
+				this.#presetScopeIndex = (this.#presetScopeIndex + 1) % presetScopeLabels().length;
 			} else {
 				this.#presetCursor = (this.#presetCursor + 1) % rows.length;
 				this.#previewProfileName = undefined;

package/src/modes/components/welcome.ts

@@ -14,6 +14,8 @@ export interface LspServerInfo {
 	fileTypes: string[];
 }
 
+export type WelcomeLogoMode = "unicode" | "square" | "ascii";
+
 /**
  * Sayknow-CLI launch surface: a blue-gradient SAYKNOW wordmark, compact
  * command affordances, and project signals — a distinct identity, not a
@@ -29,6 +31,7 @@ export class WelcomeComponent implements Component {
 		private providerName: string,
 		private recentSessions: RecentSession[] = [],
 		private lspServers: LspServerInfo[] = [],
+		private readonly logoMode: WelcomeLogoMode = "unicode",
 	) {}
 
 	invalidate(): void {}
@@ -85,7 +88,8 @@ export class WelcomeComponent implements Component {
 		const minRightCol = 20;
 		const modelPill = this.#pill(theme.icon.model || "model", this.modelName, "statusLineModel");
 		const providerPill = this.#pill(theme.icon.package || "provider", this.providerName, "statusLinePath");
-		const logoMinWidth = Math.max(...BRAND_LOGO.map(line => visibleWidth(line)));
+		const logoLines = this.#logoLines();
+		const logoMinWidth = Math.max(...logoLines.map(line => visibleWidth(line)));
 		const leftMinContentWidth = Math.max(
 			minLeftCol,
 			logoMinWidth,
@@ -103,8 +107,7 @@ export class WelcomeComponent implements Component {
 		const leftCol = showRightColumn ? dualLeftCol : boxWidth - 2;
 		const rightCol = showRightColumn ? dualRightCol : 0;
 
-		// Logo: pick a frame from the intro animation if active, else the resting frame.
-		const logoColored = this.#currentLogoFrame();
+		const logoColored = this.#currentLogoFrame(logoLines);
 
 		// When no model is resolved yet, guide the user instead of showing "Unknown".
 		const hasModel = this.modelName !== "Unknown" && this.modelName.length > 0;
@@ -281,10 +284,10 @@ export class WelcomeComponent implements Component {
 	}
 
 	/** Pick the logo frame for the current intro phase, or the resting frame. */
-	#currentLogoFrame(): readonly string[] {
-		if (this.#animStart == null) return REST_FRAME;
+	#currentLogoFrame(logoLines: readonly string[]): readonly string[] {
+		if (this.#animStart == null) return REST_FRAMES[this.logoMode];
 		const elapsed = performance.now() - this.#animStart;
-		if (elapsed >= INTRO_MS) return REST_FRAME;
+		if (elapsed >= INTRO_MS) return REST_FRAMES[this.logoMode];
 		// Ease-out cubic so the spin decelerates into the resting state.
 		const progress = elapsed / INTRO_MS;
 		const eased = 1 - (1 - progress) ** 3;
@@ -296,7 +299,11 @@ export class WelcomeComponent implements Component {
 		// the same ease-out curve so the highlight is gone by the resting frame.
 		const shinePos = (((progress * INTRO_SHINE_TRAVERSALS) % 1) + 1) % 1;
 		const shineStrength = (1 - eased) ** 1.5;
-		return gradientLogo(BRAND_LOGO, phase, { strength: shineStrength, pos: shinePos });
+		return gradientLogo(logoLines, phase, { strength: shineStrength, pos: shinePos });
+	}
+
+	#logoLines(): readonly string[] {
+		return BRAND_LOGO;
 	}
 }
 
@@ -405,5 +412,9 @@ const INTRO_SWEEPS = 2.5;
 /** Number of times the shine highlight crosses the diagonal across the intro. */
 const INTRO_SHINE_TRAVERSALS = 3;
 
-/** Resting gradient frame, cached for re-renders outside of the intro. */
-const REST_FRAME = gradientLogo(BRAND_LOGO, 0);
+/** Resting gradient frames, cached for re-renders outside of the intro. */
+const REST_FRAMES: Record<WelcomeLogoMode, readonly string[]> = {
+	unicode: gradientLogo(BRAND_LOGO, 0),
+	square: gradientLogo(BRAND_LOGO, 0),
+	ascii: gradientLogo(BRAND_LOGO, 0),
+};

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

@@ -199,6 +199,9 @@ export class InputController {
 		this.ctx.editor.onDequeue = () => this.handleDequeue();
 		this.ctx.editor.setActionKeys("app.message.queue", this.ctx.keybindings.getKeys("app.message.queue"));
 		this.ctx.editor.onQueue = () => void this.handleQueueSubmit();
+		this.ctx.editor.onTabDeclined = () => {
+			if (this.ctx.session.isStreaming) void this.handleQueueSubmit();
+		};
 
 		this.ctx.editor.clearCustomKeyHandlers();
 		// Wire up extension shortcuts
@@ -228,7 +231,11 @@ export class InputController {
 			});
 		}
 		for (const key of this.ctx.keybindings.getKeys("app.message.followUp")) {
-			this.ctx.editor.setCustomKeyHandler(key, () => void this.handleFollowUp());
+			this.ctx.editor.setCustomKeyHandler(key, () => {
+				if (!this.#isFollowUpShortcutActive()) return false;
+				void this.handleFollowUp();
+				return true;
+			});
 		}
 		for (const key of this.ctx.keybindings.getKeys("app.stt.toggle")) {
 			this.ctx.editor.setCustomKeyHandler(key, () => void this.ctx.handleSTTToggle());
@@ -503,6 +510,15 @@ export class InputController {
 		return this.ctx.settings.get("busyPromptMode") === "steer" ? "steer" : "followUp";
 	}
 
+	#isFollowUpShortcutActive(): boolean {
+		return (
+			this.ctx.session.isStreaming ||
+			this.ctx.session.isCompacting ||
+			this.ctx.session.isBashRunning ||
+			this.ctx.session.isEvalRunning
+		);
+	}
+
 	/**
 	 * Dispatch skill slash invocation(s) (`/skill:<name>`) through custom messages
 	 * using the supplied `streamingBehavior`. Returns true if the text was a
@@ -824,8 +840,9 @@ export class InputController {
 				this.ctx.ui.requestRender();
 				return true;
 			}
-			// No image in clipboard - show hint
-			this.ctx.showStatus("No image in clipboard (use terminal paste for text)");
+			this.ctx.showStatus(
+				"No image in clipboard. Use #paste-image, paste a copied image, or attach an image file with @path/to/image.png.",
+			);
 			return false;
 		} catch {
 			this.ctx.showStatus("Failed to read clipboard");
@@ -840,6 +857,7 @@ export class InputController {
 			keybindings: this.ctx.keybindings,
 			copyCurrentLine: () => this.handleCopyCurrentLine(),
 			copyPrompt: () => this.handleCopyPrompt(),
+			pasteImage: () => void this.handleImagePaste(),
 			undo: prefix => this.ctx.editor.undoPastTransientText(prefix),
 			moveCursorToMessageEnd: () => this.ctx.editor.moveToMessageEnd(),
 			moveCursorToMessageStart: () => this.ctx.editor.moveToMessageStart(),