@vanillagreen/pi-qol 1.1.1 → 1.2.0

package/README.md

@@ -63,6 +63,7 @@ Settings are exposed through `pi-extension-manager` under **QOL**.
 - `replaceFooter`: hide Pi's default footer while QOL's compact statusline is active; default on.
 - `compactPrompt`: use the compact `π` prompt editor; default on.
 - `showSessionNameTitle`: show the named session above the prompt, or in tmux's pane title/border; default on.
+- `showSessionNameWindow`: also rename the current tmux window to `π <session>` so it appears in the tmux status line. Disables `automatic-rename` for the window while active and restores it on shutdown. Requires `showSessionNameTitle`; default on.
 - `inputBottomPaddingLines`: blank lines below the compact prompt; default `0`.
 - Git display knobs: `gitRefreshTimeoutMs`, `showDirtyMarker`.
 - If `pi-caveman` is loaded, QOL reads its bridge to show a Caveman icon in the statusline and to make `Alt+C` cycle Caveman modes. The Caveman package's `showStatusBadge` setting also controls this QOL badge.

package/extensions/qol.ts

@@ -1307,6 +1307,14 @@ function setTmuxWindowOption(target: string, option: string, value: string): voi
 	execFile("tmux", ["set-option", "-wq", "-t", target, option, value], { timeout: 1000 }, () => undefined);
 }
 
+function readTmuxWindowName(target: string, callback: (name: string | undefined) => void): void {
+	execFile("tmux", ["display-message", "-p", "-t", target, "#{window_name}"], { timeout: 1000 }, (error, stdout) => callback(error ? undefined : stdout.replace(/\r?\n$/, "")));
+}
+
+function setTmuxWindowName(target: string, name: string): void {
+	execFile("tmux", ["rename-window", "-t", target, name], { timeout: 1000 }, () => undefined);
+}
+
 function cavemanIconTone(mode: string, active: boolean): "muted" | "text" | "success" | "thinkingHigh" | "error" {
 	if (!active) return "muted";
 	switch (mode) {
@@ -1371,6 +1379,32 @@ function compactionProfileInstructions(profile: QolSummaryProfile): string {
 	return "Be complete but not verbose. Preserve enough detail for a future assistant to continue without the old transcript.";
 }
 
+function stripThinkingForSummary(messages: Message[]): Message[] {
+	return messages.map((message) => {
+		if (message.role !== "assistant" || !Array.isArray(message.content)) return message;
+		return {
+			...message,
+			content: message.content.filter((part: any) => part?.type !== "thinking"),
+		};
+	});
+}
+
+function serializeMessagesForSummary(messages: AgentMessage[]): string {
+	return serializeConversation(stripThinkingForSummary(convertToLlm(messages)));
+}
+
+function customMessageContentToText(content: unknown): string {
+	if (typeof content === "string") return content;
+	if (!Array.isArray(content)) return "";
+	const parts: string[] = [];
+	for (const part of content) {
+		if (part?.type === "text" && typeof part.text === "string") parts.push(part.text);
+		else if (part?.type === "image") parts.push(`[image${typeof part.mimeType === "string" ? ` ${part.mimeType}` : ""}]`);
+		else if (part?.type) parts.push(`[${String(part.type)}]`);
+	}
+	return parts.join("\n").trim();
+}
+
 function buildSummaryPrompt(options: {
 	conversationText: string;
 	customInstructions?: string;
@@ -1497,7 +1531,7 @@ async function handleQolCompaction(event: any, ctx: ExtensionContext): Promise<a
 	const tokensBefore = typeof preparation.tokensBefore === "number" ? preparation.tokensBefore : 0;
 	compactionNotify(ctx, `QOL compaction: summarizing ${messages.length} message(s), ${tokensBefore.toLocaleString()} token(s).`, "info");
 	try {
-		const conversationText = serializeConversation(convertToLlm(messages));
+		const conversationText = serializeMessagesForSummary(messages);
 		const result = await generateQolSummary(ctx, {
 			conversationText,
 			customInstructions: event.customInstructions,
@@ -1529,10 +1563,10 @@ async function handleQolCompaction(event: any, ctx: ExtensionContext): Promise<a
 }
 
 function summarizeEntryForBranch(entry: any): string[] {
-	if (entry?.type === "message" && entry.message) return [serializeConversation(convertToLlm([entry.message]))];
+	if (entry?.type === "message" && entry.message) return [serializeMessagesForSummary([entry.message])];
 	if (entry?.type === "compaction" && typeof entry.summary === "string") return [`[Compaction summary]: ${entry.summary}`];
 	if (entry?.type === "branch_summary" && typeof entry.summary === "string") return [`[Branch summary]: ${entry.summary}`];
-	if (entry?.type === "custom_message") return [`[Custom message${entry.customType ? `:${entry.customType}` : ""}]: ${typeof entry.content === "string" ? entry.content : JSON.stringify(entry.data ?? {})}`];
+	if (entry?.type === "custom_message") return [`[Custom message${entry.customType ? `:${entry.customType}` : ""}]: ${customMessageContentToText(entry.content) || "[empty]"}`];
 	return [];
 }
 
@@ -2131,39 +2165,6 @@ function getQuestionService(): QuestionServiceLike | undefined {
 	return undefined;
 }
 
-function entryToHandoffMessage(entry: SessionEntry): AgentMessage | undefined {
-	if (entry.type === "message") return entry.message;
-	if (entry.type === "compaction") {
-		return {
-			role: "compactionSummary",
-			summary: entry.summary,
-			tokensBefore: entry.tokensBefore,
-			timestamp: new Date(entry.timestamp).getTime(),
-		};
-	}
-	return undefined;
-}
-
-function getHandoffMessages(branch: SessionEntry[]): AgentMessage[] {
-	let compactionIndex = -1;
-	for (let i = branch.length - 1; i >= 0; i -= 1) {
-		if (branch[i]?.type === "compaction") {
-			compactionIndex = i;
-			break;
-		}
-	}
-	if (compactionIndex < 0) return branch.map(entryToHandoffMessage).filter((message): message is AgentMessage => message !== undefined);
-
-	const compaction = branch[compactionIndex];
-	const firstKeptIndex = compaction?.type === "compaction" ? branch.findIndex((entry) => entry.id === compaction.firstKeptEntryId) : -1;
-	const compactedBranch = [
-		compaction,
-		...(firstKeptIndex >= 0 ? branch.slice(firstKeptIndex, compactionIndex) : []),
-		...branch.slice(compactionIndex + 1),
-	];
-	return compactedBranch.map(entryToHandoffMessage).filter((message): message is AgentMessage => message !== undefined);
-}
-
 async function runHandoff(args: string, ctx: ExtensionCommandContext): Promise<void> {
 	if (!ctx.hasUI) {
 		ctx.ui.notify("handoff requires interactive mode", "error");
@@ -2181,15 +2182,15 @@ async function runHandoff(args: string, ctx: ExtensionCommandContext): Promise<v
 		return;
 	}
 
-	const messages = getHandoffMessages(ctx.sessionManager.getBranch());
+	const built = (ctx.sessionManager as any).buildSessionContext?.();
+	const messages = Array.isArray(built?.messages) ? built.messages as AgentMessage[] : [];
 
 	if (messages.length === 0) {
 		ctx.ui.notify("No conversation to hand off", "error");
 		return;
 	}
 
-	const llmMessages = convertToLlm(messages);
-	const conversationText = serializeConversation(llmMessages);
+	const conversationText = serializeMessagesForSummary(messages);
 	const currentSessionFile = ctx.sessionManager.getSessionFile();
 
 	const releaseModalLock = acquireVstackModalLock();
@@ -2377,10 +2378,24 @@ interface QolSessionSearchPendingMessage {
 interface QolSessionPaletteAction {
 	type: "cancel" | "resume" | "fork" | "copy" | "summarize" | "newSession";
 	customPrompt?: string;
+	keepCurrentModel?: boolean;
 	message?: QolSessionUserMessage;
 	result?: QolSessionSearchResult;
 }
 
+function pinSessionModel(sessionPath: string, model: NonNullable<ExtensionContext["model"]>, thinkingLevel?: string): void {
+	const manager = SessionManager.open(sessionPath);
+	const context = manager.buildSessionContext();
+	if (context.model?.provider !== model.provider || context.model?.modelId !== model.id) {
+		manager.appendModelChange(model.provider, model.id);
+	}
+	if (thinkingLevel) {
+		const branch = manager.getBranch();
+		const lastThinking = [...branch].reverse().find((entry: any) => entry?.type === "thinking_level_change") as { thinkingLevel?: string } | undefined;
+		if (lastThinking?.thinkingLevel !== thinkingLevel) manager.appendThinkingLevelChange(thinkingLevel as any);
+	}
+}
+
 let qolSessionSearchCache: QolSessionSearchSession[] = [];
 let qolSessionSearchLoadedAt = 0;
 let qolSessionSearchLoading: Promise<QolSessionSearchSession[]> | undefined;
@@ -3561,6 +3576,11 @@ class QolSessionSearchComponent {
 			if (hit) this.done({ result: hit.result, type: "resume" });
 			return;
 		}
+		if (matchesKey(data, "alt+m")) {
+			const hit = state.results[state.selected];
+			if (hit) this.done({ keepCurrentModel: true, result: hit.result, type: "resume" });
+			return;
+		}
 		if (matchesKey(data, "alt+i")) {
 			const hit = state.results[state.selected];
 			if (hit) this.openContextConfirm("summarize", hit.result, hit.message, "search");
@@ -3655,6 +3675,10 @@ class QolSessionSearchComponent {
 			this.done({ result: state.result, type: "resume" });
 			return;
 		}
+		if (matchesKey(data, "alt+m")) {
+			this.done({ keepCurrentModel: true, result: state.result, type: "resume" });
+			return;
+		}
 		if (matchesKey(data, "alt+c")) {
 			const message = state.messages[state.selected];
 			if (message) this.done({ message, result: state.result, type: "copy" });
@@ -3719,6 +3743,10 @@ class QolSessionSearchComponent {
 			this.done({ result: state.result, type: "resume" });
 			return;
 		}
+		if (matchesKey(data, "alt+m")) {
+			this.done({ keepCurrentModel: true, result: state.result, type: "resume" });
+			return;
+		}
 		if (matchesKey(data, "alt+i")) {
 			this.openContextConfirm("summarize", state.result, state.message, "actions");
 			return;
@@ -3801,10 +3829,10 @@ class QolSessionSearchComponent {
 
 		lines.push(divider());
 		if (compact) {
-			lines.push(row(`${ansiYellow("alt+c/f/r/i/n/a")} ${dim("actions")}  ${ansiYellow("tab")} ${dim("scope")}`));
+			lines.push(row(`${ansiYellow("alt+c/f/r/m/i/n/a")} ${dim("actions")}  ${ansiYellow("tab")} ${dim("scope")}`));
 		} else {
 			lines.push(row(`${ansiYellow("-/=")} ${dim("page")}  ${ansiYellow("alt+c")} ${dim("copy")}  ${ansiYellow("alt+f")} ${dim("fork")}  ${ansiYellow("alt+r")} ${dim("resume")}`));
-			lines.push(row(`${ansiYellow("alt+i")} ${dim("inject+ctx")}  ${ansiYellow("alt+n")} ${dim("new+ctx")}  ${ansiYellow("alt+a")} ${dim("actions")}  ${ansiYellow("tab")} ${dim("scope")}`));
+			lines.push(row(`${ansiYellow("alt+m")} ${dim("resume+model")}  ${ansiYellow("alt+i")} ${dim("inject+ctx")}  ${ansiYellow("alt+n")} ${dim("new+ctx")}  ${ansiYellow("alt+a")} ${dim("actions")}  ${ansiYellow("tab")} ${dim("scope")}`));
 		}
 		lines.push(bottom());
 		return lines;
@@ -3930,7 +3958,7 @@ class QolSessionSearchComponent {
 		}
 		lines.push(divider(), empty());
 		lines.push(row(`${ansiYellow("-/=")} ${dim("page")}  ${ansiYellow("alt+c")} ${dim("copy")}  ${ansiYellow("alt+f")} ${dim("fork")}  ${ansiYellow("alt+r")} ${dim("resume")}`));
-		lines.push(row(`${ansiYellow("alt+i")} ${dim("inject+ctx")}  ${ansiYellow("alt+n")} ${dim("new+ctx")}`));
+		lines.push(row(`${ansiYellow("alt+m")} ${dim("resume+model")}  ${ansiYellow("alt+i")} ${dim("inject+ctx")}  ${ansiYellow("alt+n")} ${dim("new+ctx")}`));
 		lines.push(bottom());
 		return lines;
 	}
@@ -3959,7 +3987,7 @@ class QolSessionSearchComponent {
 			for (const line of wrapVisible(dim(help), inner, 2)) lines.push(row(line));
 		}
 		lines.push(empty(), divider(), empty());
-		lines.push(row(`${ansiYellow("alt+c")} ${dim("copy")}  ${ansiYellow("alt+f")} ${dim("fork")}  ${ansiYellow("alt+r")} ${dim("resume")}`));
+		lines.push(row(`${ansiYellow("alt+c")} ${dim("copy")}  ${ansiYellow("alt+f")} ${dim("fork")}  ${ansiYellow("alt+r")} ${dim("resume")}  ${ansiYellow("alt+m")} ${dim("resume+model")}`));
 		lines.push(row(`${ansiYellow("alt+i")} ${dim("inject+ctx")}  ${ansiYellow("alt+n")} ${dim("new+ctx")}`));
 		lines.push(bottom());
 		return lines;
@@ -4131,7 +4159,7 @@ function messagesForSessionSummary(sessionPath: string): AgentMessage[] {
 async function buildSessionSearchContextMessage(ctx: ExtensionContext, result: QolSessionSearchResult, customPrompt?: string, signal?: AbortSignal): Promise<QolSessionSearchPendingMessage> {
 	const messages = messagesForSessionSummary(result.path);
 	const fallbackText = result.allMessagesText || result.firstMessage;
-	const conversationText = messages.length > 0 ? serializeConversation(convertToLlm(messages)) : fallbackText;
+	const conversationText = messages.length > 0 ? serializeMessagesForSummary(messages) : fallbackText;
 	if (!conversationText.trim()) throw new Error("Selected session has no text content to summarize");
 	const focus = customPrompt?.trim();
 	const summary = await generateQolSummary(ctx, {
@@ -4229,17 +4257,21 @@ function queueSessionSearchCommandAction(ctx: ExtensionContext, action: QolSessi
 	ctx.ui.notify(`${sessionDisplayName(action.result!)} — press Enter to ${action.type === "fork" ? "fork" : "resume"}`, "info");
 }
 
-async function runSessionSearchResumeOrFork(ctx: ExtensionContext, action: QolSessionPaletteAction): Promise<boolean> {
+async function runSessionSearchResumeOrFork(pi: ExtensionAPI, ctx: ExtensionContext, action: QolSessionPaletteAction): Promise<boolean> {
 	if (!action.result || (action.type !== "resume" && action.type !== "fork")) return true;
 	const commandCtx = asCommandContext(ctx);
 	if (typeof commandCtx.switchSession !== "function") return false;
 	const targetTitle = sessionDisplayName(action.result);
 	const selectedMessage = action.type === "fork" ? action.message : undefined;
+	const currentModel = action.keepCurrentModel ? ctx.model : undefined;
+	const currentThinking = action.keepCurrentModel && typeof pi.getThinkingLevel === "function" ? pi.getThinkingLevel() : undefined;
+	if (currentModel) pinSessionModel(action.result.path, currentModel, currentThinking);
 	let replacementStarted = false;
 	try {
 		const result = await commandCtx.switchSession(action.result.path, {
 			withSession: async (replacementCtx: any) => {
 				replacementStarted = true;
+				if (currentModel) replacementCtx.ui.notify(`Using current model: ${currentModel.provider}/${currentModel.id}`, "info");
 				if (selectedMessage) {
 					const manager = replacementCtx.sessionManager as any;
 					if (selectedMessage.entryId && selectedMessage.parentId && typeof manager?.branch === "function") manager.branch(selectedMessage.parentId);
@@ -4251,7 +4283,7 @@ async function runSessionSearchResumeOrFork(ctx: ExtensionContext, action: QolSe
 					timer.unref?.();
 					return;
 				}
-				replacementCtx.ui.notify(`Resumed session: ${targetTitle}`, "info");
+				replacementCtx.ui.notify(`Resumed session: ${targetTitle}${currentModel ? " with current model" : ""}`, "info");
 			},
 		});
 		if (result.cancelled) ctx.ui.notify(selectedMessage ? "Fork cancelled" : "Resume cancelled", "info");
@@ -4327,7 +4359,7 @@ async function openQolSessionSearch(pi: ExtensionAPI, ctx: ExtensionContext, ini
 	}
 	if (!action || action.type === "cancel" || !action.result) return;
 	if (action.type === "resume" || action.type === "fork") {
-		if (!(await runSessionSearchResumeOrFork(ctx, action))) queueSessionSearchCommandAction(ctx, action);
+		if (!(await runSessionSearchResumeOrFork(pi, ctx, action))) queueSessionSearchCommandAction(ctx, action);
 		return;
 	}
 	if (action.type === "copy") {
@@ -4552,6 +4584,10 @@ export default function qol(pi: ExtensionAPI): void {
 	let tmuxChangedPaneBorderStatus = false;
 	let tmuxChangedPaneBorderFormat = false;
 	let tmuxLastPaneTitle: string | undefined;
+	let tmuxOriginalWindowNameTitle: string | undefined;
+	let tmuxOriginalAutomaticRename: string | undefined;
+	let tmuxChangedAutomaticRename = false;
+	let tmuxLastWindowNameTitle: string | undefined;
 	let lastSessionTitle: string | undefined;
 
 	const requestRender = () => activeTui?.requestRender();
@@ -4578,9 +4614,17 @@ export default function qol(pi: ExtensionAPI): void {
 		const target = tmuxPaneTitleTarget;
 		if (!target) return;
 		const nextTitle = sessionTitle ? formatTmuxSessionTitle(sessionTitle) : tmuxOriginalPaneTitle;
-		if (nextTitle === undefined || nextTitle === tmuxLastPaneTitle) return;
-		tmuxLastPaneTitle = nextTitle;
-		setTmuxPaneTitle(target, nextTitle);
+		if (nextTitle !== undefined && nextTitle !== tmuxLastPaneTitle) {
+			tmuxLastPaneTitle = nextTitle;
+			setTmuxPaneTitle(target, nextTitle);
+		}
+		if (settingBoolean("showSessionNameWindow", true, ctx.cwd)) {
+			const nextWindow = sessionTitle ? formatTmuxSessionTitle(sessionTitle) : tmuxOriginalWindowNameTitle;
+			if (nextWindow !== undefined && nextWindow !== tmuxLastWindowNameTitle) {
+				tmuxLastWindowNameTitle = nextWindow;
+				setTmuxWindowName(target, nextWindow);
+			}
+		}
 	};
 
 	const installSessionTitle = (ctx: ExtensionContext) => {
@@ -4609,6 +4653,21 @@ export default function qol(pi: ExtensionAPI): void {
 					setTmuxWindowOption(tmuxTarget, "pane-border-format", TMUX_SESSION_TITLE_BORDER_FORMAT);
 				}
 			});
+			if (settingBoolean("showSessionNameWindow", true, ctx.cwd)) {
+				readTmuxWindowName(tmuxTarget, (name) => {
+					if (tmuxPaneTitleTarget !== tmuxTarget) return;
+					tmuxOriginalWindowNameTitle = name;
+					syncSessionTitle(ctx);
+				});
+				readTmuxWindowOption(tmuxTarget, "automatic-rename", (value) => {
+					if (tmuxPaneTitleTarget !== tmuxTarget) return;
+					tmuxOriginalAutomaticRename = value;
+					if (value !== "off") {
+						tmuxChangedAutomaticRename = true;
+						setTmuxWindowOption(tmuxTarget, "automatic-rename", "off");
+					}
+				});
+			}
 			return;
 		}
 		ctx.ui.setHeader((tui, theme) => {
@@ -4634,6 +4693,8 @@ export default function qol(pi: ExtensionAPI): void {
 		if (tmuxPaneTitleTarget && tmuxOriginalPaneTitle !== undefined) setTmuxPaneTitle(tmuxPaneTitleTarget, tmuxOriginalPaneTitle);
 		if (tmuxPaneTitleTarget && tmuxChangedPaneBorderStatus && tmuxOriginalPaneBorderStatus !== undefined) setTmuxWindowOption(tmuxPaneTitleTarget, "pane-border-status", tmuxOriginalPaneBorderStatus);
 		if (tmuxPaneTitleTarget && tmuxChangedPaneBorderFormat && tmuxOriginalPaneBorderFormat !== undefined) setTmuxWindowOption(tmuxPaneTitleTarget, "pane-border-format", tmuxOriginalPaneBorderFormat);
+		if (tmuxPaneTitleTarget && tmuxOriginalWindowNameTitle !== undefined && tmuxLastWindowNameTitle !== undefined) setTmuxWindowName(tmuxPaneTitleTarget, tmuxOriginalWindowNameTitle);
+		if (tmuxPaneTitleTarget && tmuxChangedAutomaticRename && tmuxOriginalAutomaticRename !== undefined) setTmuxWindowOption(tmuxPaneTitleTarget, "automatic-rename", tmuxOriginalAutomaticRename);
 		tmuxPaneTitleTarget = undefined;
 		tmuxOriginalPaneTitle = undefined;
 		tmuxOriginalPaneBorderStatus = undefined;
@@ -4641,6 +4702,10 @@ export default function qol(pi: ExtensionAPI): void {
 		tmuxChangedPaneBorderStatus = false;
 		tmuxChangedPaneBorderFormat = false;
 		tmuxLastPaneTitle = undefined;
+		tmuxOriginalWindowNameTitle = undefined;
+		tmuxOriginalAutomaticRename = undefined;
+		tmuxChangedAutomaticRename = false;
+		tmuxLastWindowNameTitle = undefined;
 		lastSessionTitle = undefined;
 		ctx.ui.setStatus(SESSION_MANAGER_STATUS_KEY, undefined);
 		ctx.ui.setWidget("statusline", undefined);
@@ -4953,7 +5018,7 @@ export default function qol(pi: ExtensionAPI): void {
 					return;
 				}
 				qolSessionSearchPendingActions.delete(id);
-				if (!(await runSessionSearchResumeOrFork(ctx, action))) ctx.ui.notify("Session resume/fork is unavailable in this context.", "error");
+				if (!(await runSessionSearchResumeOrFork(pi, ctx, action))) ctx.ui.notify("Session resume/fork is unavailable in this context.", "error");
 			},
 		});
 		const shortcut = sessionSearchShortcut();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanillagreen/pi-qol",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Pi quality-of-life extension: compact statusline/π prompt, reliable multiline input, styled pasted-image chips, session naming/search/context import, handoff, permission prompts, notifications, custom compaction, and a collapsed-thinking timer.",
   "license": "MIT",
   "keywords": [
@@ -60,6 +60,16 @@
           "apply": "reload",
           "requiresReload": true
         },
+        {
+          "key": "showSessionNameWindow",
+          "label": "Sync session name to tmux window name",
+          "description": "Also rename the current tmux window to \"π <session>\" so the session name shows in the tmux status line. Disables tmux automatic-rename for this window while active and restores the original window name and automatic-rename setting on shutdown.",
+          "type": "boolean",
+          "default": true,
+          "category": "Statusline",
+          "apply": "reload",
+          "requiresReload": true
+        },
         {
           "key": "inputBottomPaddingLines",
           "label": "Input bottom padding",