@sayknow-cli/coding-agent 0.6.5 → 0.6.6

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

@@ -112,6 +112,9 @@ export class InputController {
 			"app.session.tree": () => this.ctx.showTreeSelector(),
 			"app.session.fork": () => this.ctx.showUserMessageSelector(),
 			"app.session.resume": () => this.ctx.showSessionSelector(),
+			"app.session.continue": async () => {
+				await this.ctx.continueRecentSession();
+			},
 			"app.session.observe": async () => {
 				await this.ctx.showSessionObserver();
 			},
@@ -710,6 +713,16 @@ export class InputController {
 				return true;
 			});
 		}
+		this.#registerCommandPaletteAction("app.session.continue", () => {
+			void this.ctx.continueRecentSession();
+			return undefined;
+		});
+		for (const key of this.ctx.keybindings.getKeys("app.session.continue")) {
+			this.ctx.editor.setCustomKeyHandler(key, () => {
+				this.#executeAction("app.session.continue");
+				return true;
+			});
+		}
 		this.#registerCommandPaletteAction(
 			"app.message.followUp",
 			() => this.#executeAction("app.message.followUp"),

package/src/modes/interactive-mode.ts

@@ -1,3 +1,4 @@
+import * as fs from "node:fs";
 import * as path from "node:path";
 import { type Agent, type AgentMessage, ThinkingLevel } from "@sayknow-cli/agent-core";
 import type { CompactionOutcome } from "@sayknow-cli/agent-core/compaction";
@@ -25,7 +26,6 @@ import {
 	KeybindingsManager,
 	type KeyDisplayContext,
 } from "../config/keybindings";
-import { getModelProfilePresentation } from "../config/model-profiles";
 import { isSettingsInitialized, type Settings, settings } from "../config/settings";
 import { DEFAULT_SKC_DEFINITION_NAMES } from "../defaults/skc-defaults";
 import type {
@@ -48,7 +48,6 @@ import type { AgentSession, AgentSessionEvent } from "../session/agent-session";
 import { HistoryStorage } from "../session/history-storage";
 import type { SessionContext, SessionManager } from "../session/session-manager";
 import { getRecentSessions, getSessionMessageEntryId } from "../session/session-manager";
-import { loadProjectContextFiles } from "../system-prompt";
 import type { LspStartupServerInfo } from "../tools";
 import { shortenPath } from "../tools/render-utils";
 import { formatPhaseDisplayName } from "../tools/todo-write";
@@ -72,19 +71,12 @@ import {
 	isPetCapabilityProbePending,
 	warnWhenPetCapabilitySettled,
 } from "./components/pet-capability";
-import { type PetMode, SayknowPetWidget } from "./components/sayknow-pet-widget";
+import { type PetMode, type PetSkinId, SayknowPetWidget } from "./components/sayknow-pet-widget";
 import { resolveCurrentBranch } from "./components/status-line/git-utils";
 import type { ToolExecutionHandle } from "./components/tool-execution";
 import { StatusLineComponent } from "./components/tool-status-header";
 import { composeToolText } from "./components/tool-transcript-format";
-import {
-	type RecentSession,
-	WelcomeComponent,
-	type WelcomeLogoMode,
-	type LspServerInfo as WelcomeLspServerInfo,
-	type WelcomeRoleBinding,
-	type WelcomeSnapshot,
-} from "./components/welcome";
+import { type RecentSession, WelcomeComponent, type WelcomeLogoMode, type WelcomeSnapshot } from "./components/welcome";
 import { BtwController } from "./controllers/btw-controller";
 import { CommandController } from "./controllers/command-controller";
 import { EventController } from "./controllers/event-controller";
@@ -107,7 +99,14 @@ import { shouldShowExtensionCommand } from "./slash-command-visibility";
 import { TasksAggregator } from "./tasks-aggregator";
 import { type ShimmerPalette, shimmerSegments, shimmerText } from "./theme/shimmer";
 import type { Theme } from "./theme/theme";
-import { getEditorTheme, getSymbolTheme, onTerminalAppearanceChange, onThemeChange, theme } from "./theme/theme";
+import {
+	getCurrentThemeName,
+	getEditorTheme,
+	getSymbolTheme,
+	onTerminalAppearanceChange,
+	onThemeChange,
+	theme,
+} from "./theme/theme";
 import { type RegisterTranscriptItem, TranscriptItemRegistry, transcriptItemId } from "./transcript-item-registry";
 import {
 	type CompactionQueuedMessage,
@@ -211,6 +210,15 @@ function getShellInputPrefix(isNoContext: boolean): string {
 	return `${shellLabel} `;
 }
 
+/**
+ * The pet on the launch card: the one the user keeps beside the composer, or —
+ * with the pet off — the skin that matches the theme (blue for blue-octopus).
+ */
+export function resolveWelcomePetSkin(petMode: PetMode, themeName: string | undefined): PetSkinId {
+	if (petMode !== "off") return petMode;
+	return themeName?.startsWith("blue") ? "blue" : "red";
+}
+
 /**
  * The composer is an open rail, not a box: every input row starts with the same
  * rail glyph a submitted prompt keeps in the transcript, colored by the editor's
@@ -743,7 +751,6 @@ export class InteractiveMode implements InteractiveModeContext {
 				modelName,
 				providerName,
 				recentSessions,
-				this.#getWelcomeLspServers(),
 				welcomeLogoMode,
 				{
 					getViewportRows: () => this.ui.terminal.rows,
@@ -755,6 +762,8 @@ export class InteractiveMode implements InteractiveModeContext {
 					skipLogoAnimation,
 					snapshot: this.#buildWelcomeSnapshot(),
 					resumeKey: this.keybindings.getKeys("app.session.resume")[0],
+					continueKey: this.keybindings.getKeys("app.session.continue")[0],
+					petSkin: resolveWelcomePetSkin(settings.get("pet.mode"), getCurrentThemeName()),
 				},
 			);
 
@@ -1611,36 +1620,13 @@ export class InteractiveMode implements InteractiveModeContext {
 	}
 
 	#handleLspStartupEvent(event: LspStartupEvent): void {
-		this.#updateWelcomeLspServers();
-
 		const warningMessage = getLspStartupWarningMessage(event);
 		if (warningMessage) {
 			this.showWarning(warningMessage);
 		}
 	}
 
-	#getWelcomeLspServers(): WelcomeLspServerInfo[] {
-		return (
-			this.lspServers?.map(server => ({
-				name: server.name,
-				status: server.status,
-				fileTypes: server.fileTypes,
-			})) ?? []
-		);
-	}
-
-	#updateWelcomeLspServers(): void {
-		if (!this.#welcomeComponent) {
-			return;
-		}
-
-		this.#welcomeComponent.setLspServers(this.#getWelcomeLspServers());
-		// LSP startup settles around the same time the MCP connections do.
-		this.#welcomeComponent.setSnapshot({ mcp: this.#welcomeMcpSummary() });
-		this.ui.requestRender();
-	}
-
-	/** Facts the launch ledger can show synchronously, before any probe runs. */
+	/** Facts the launch card can show synchronously, before the git probe runs. */
 	#buildWelcomeSnapshot(): WelcomeSnapshot {
 		const projectDir = getProjectDir();
 		let branch: string | null = null;
@@ -1649,68 +1635,19 @@ export class InteractiveMode implements InteractiveModeContext {
 		} catch {
 			branch = null;
 		}
-		const profileName = this.session.getActiveModelProfile() ?? settings.get("modelProfile.default");
-		return {
-			cwd: shortenPath(projectDir),
-			branch,
-			thinkingLevel: this.session.thinkingLevel,
-			profile: profileName ? getModelProfilePresentation(profileName).displayName : undefined,
-			roles: this.#welcomeRoleBindings(),
-			mcp: this.#welcomeMcpSummary(),
-			skills: this.session.skills.length,
-		};
-	}
-
-	/** Role agents in their canonical order, with the provider prefix dropped for width. */
-	#welcomeRoleBindings(): WelcomeRoleBinding[] {
-		const overrides = settings.get("task.agentModelOverrides") as Record<string, unknown> | undefined;
-		if (!overrides) return [];
-		const bindings: WelcomeRoleBinding[] = [];
-		for (const role of ["executor", "planner", "critic", "architect"]) {
-			const selector = overrides[role];
-			if (typeof selector !== "string" || selector.length === 0) continue;
-			const slash = selector.indexOf("/");
-			bindings.push({ role, model: slash >= 0 ? selector.slice(slash + 1) : selector });
-		}
-		return bindings;
-	}
-
-	#welcomeMcpSummary(): { connected: number; total: number } {
-		const manager = this.mcpManager;
-		if (!manager) return { connected: 0, total: 0 };
-		return { connected: manager.getConnectedServers().length, total: manager.getAllServerNames().length };
+		return { cwd: shortenPath(projectDir), branch, thinkingLevel: this.session.thinkingLevel };
 	}
 
-	/** Fill in the ledger facts that need I/O: git change counts and project instruction files. */
+	/** Fill in the git change counts, which need I/O. */
 	#probeWelcomeWorkspace(welcomeComponent: WelcomeComponent): void {
-		const projectDir = getProjectDir();
-		const apply = (patch: WelcomeSnapshot): void => {
-			if (this.#welcomeComponent !== welcomeComponent) return;
-			welcomeComponent.setSnapshot(patch);
-			this.ui.requestRender();
-		};
 		void gitUtils.status
-			.summary(projectDir)
-			.then(gitChanges => apply({ gitChanges }))
-			.catch(() => apply({ gitChanges: null }));
-		void gitUtils.log
-			.onelines(projectDir, 3)
-			.then(recentCommits => apply({ recentCommits }))
+			.summary(getProjectDir())
+			.then(gitChanges => {
+				if (this.#welcomeComponent !== welcomeComponent) return;
+				welcomeComponent.setSnapshot({ gitChanges });
+				this.ui.requestRender();
+			})
 			.catch(() => {});
-		void loadProjectContextFiles({ cwd: projectDir })
-			.then(files =>
-				apply({
-					contextFiles: files.map(file => {
-						const relative = path.relative(projectDir, file.path);
-						return relative.startsWith("..") ? shortenPath(file.path) : relative;
-					}),
-				}),
-			)
-			.catch(error => {
-				logger.debug("Failed to load context files for welcome screen", {
-					error: error instanceof Error ? error.message : String(error),
-				});
-			});
 	}
 
 	#getWorkingMessageAccent(): WorkingMessageAccent | undefined {
@@ -2246,6 +2183,27 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#selectorController.showSessionSelector();
 	}
 
+	async continueRecentSession(): Promise<void> {
+		// Listing returns canonical paths (/private/var on macOS); compare canonically so the
+		// live session is never "continued" into itself.
+		const canonical = (file: string): string => {
+			try {
+				return fs.realpathSync(file);
+			} catch {
+				return path.resolve(file);
+			}
+		};
+		const currentFile = this.sessionManager.getSessionFile();
+		const current = currentFile ? canonical(currentFile) : undefined;
+		const recent = await getRecentSessions(this.sessionManager.getSessionDir());
+		const target = recent.find(session => canonical(session.path) !== current);
+		if (!target) {
+			this.showStatus("No earlier session to continue");
+			return;
+		}
+		await this.handleResumeSession(target.path, { requireIdle: true });
+	}
+
 	handleResumeSession(sessionPath: string, options?: { requireIdle?: boolean }): Promise<boolean> {
 		return this.#selectorController.handleResumeSession(sessionPath, options, () => {
 			this.#btwController.dispose();

package/src/modes/types.ts

@@ -327,6 +327,8 @@ export interface InteractiveModeContext {
 	showUserMessageSelector(): void;
 	showTreeSelector(): void;
 	showSessionSelector(): void;
+	/** Resume the most recent saved session other than this one (the launch card's first row). */
+	continueRecentSession(): Promise<void>;
 	showSessionsDashboard(): void;
 	handleResumeSession(sessionPath: string, options?: { requireIdle?: boolean }): Promise<boolean>;
 	handleSessionDeleteCommand(): Promise<void>;