pi-ui-extend 0.1.18 → 0.1.20

package/dist/app/rendering/render-controller.js

@@ -6,10 +6,6 @@ import { ANSI_RESET, colorLine, colorize } from "../../theme.js";
 import { stringDisplayWidth } from "../../terminal-width.js";
 import { padOrTrimPlain } from "./render-text.js";
 const INPUT_FRAME = {
-    topLeft: "╭",
-    topRight: "╮",
-    bottomLeft: "╰",
-    bottomRight: "╯",
     horizontal: "─",
 };
 export class AppRenderController {
@@ -129,6 +125,11 @@ export class AppRenderController {
             setRenderedBackground(row, rendered?.backgroundOverride);
             appendFrameOutput("conversation", row, this.renderFrameRow(row, this.deps.screenStyler.styleBaseLine(row, rendered, conversationColumns)));
         }
+        const loadingConversationOverlay = this.renderConversationLoadingOverlay(this.deps.loadingConversationOverlayText?.(), conversationColumns, topReservedRows, bodyHeight);
+        if (loadingConversationOverlay) {
+            this.deps.mouseController.renderedRowTexts.set(loadingConversationOverlay.row, loadingConversationOverlay.text);
+            appendFrameOutput("conversation", loadingConversationOverlay.row, this.renderFrameRow(loadingConversationOverlay.row, loadingConversationOverlay.output));
+        }
         const aboveEditorStartRow = inputSeparatorRow + 1;
         for (let index = 0; index < aboveEditorLines.length; index += 1) {
             const rendered = frameRenderedLine(aboveEditorLines[index], columns, this.deps.theme, this.deps.screenStyler);
@@ -149,7 +150,7 @@ export class AppRenderController {
             if (row < statusRow) {
                 this.deps.mouseController.renderedRowTexts.set(row, separatorText);
                 appendFrameOutput("inputStatus", row, this.renderFrameRow(row, this.deps.screenStyler.styleLine(row, separatorText, columns, {
-                    foreground: this.deps.theme.colors.inputBorder,
+                    foreground: this.deps.theme.colors.tabBorder,
                 })));
             }
         }
@@ -160,7 +161,7 @@ export class AppRenderController {
             const row = toScreenRow(inputStartRow + index);
             this.deps.mouseController.renderedRowTexts.set(row, inputLine);
             const tagColor = this.deps.theme.colors.accent;
-            const styledLine = this.deps.screenStyler.styleInputLine(row, inputLine, tagSpans, suggestionSpans, columns, tagColor, this.deps.theme.colors.muted, this.deps.theme.colors.inputBorder);
+            const styledLine = this.deps.screenStyler.styleInputLine(row, inputLine, tagSpans, suggestionSpans, columns, tagColor, this.deps.theme.colors.muted);
             appendFrameOutput("inputStatus", row, this.renderFrameRow(row, styledLine));
         }
         if (renderedInput.scrollBar && columns > 0) {
@@ -175,7 +176,15 @@ export class AppRenderController {
                 })}`);
             }
         }
-        const belowEditorStartRow = inputStartRow + renderedInput.lines.length;
+        if (inputBottomSeparatorRow && inputBottomSeparatorRow > inputSeparatorRow && inputBottomSeparatorRow < statusRow) {
+            const separatorText = inputFrameLine(columns, "bottom");
+            const row = toScreenRow(inputBottomSeparatorRow);
+            this.deps.mouseController.renderedRowTexts.set(row, separatorText);
+            appendFrameOutput("inputStatus", row, this.renderFrameRow(row, this.deps.screenStyler.styleLine(row, separatorText, columns, {
+                foreground: this.deps.theme.colors.tabBorder,
+            })));
+        }
+        const belowEditorStartRow = (inputBottomSeparatorRow ?? (inputStartRow + renderedInput.lines.length - 1)) + 1;
         for (let index = 0; index < belowEditorLines.length; index += 1) {
             const rendered = frameRenderedLine(belowEditorLines[index], columns, this.deps.theme, this.deps.screenStyler);
             const row = toScreenRow(belowEditorStartRow + index);
@@ -190,25 +199,7 @@ export class AppRenderController {
             appendFrameOutput("inputStatus", row, this.renderFrameRow(row, rendered.output(row)));
         }
         const statusLayout = this.deps.statusLineRenderer.layout(columns);
-        const statusLineRenderer = this.deps.statusLineRenderer;
-        const inputBorderWidgetsLayout = statusLineRenderer.inputBorderWidgetsLayout?.(columns);
-        if (inputBottomSeparatorRow > 1) {
-            const separatorText = inputFrameLine(columns, "bottom");
-            const row = toScreenRow(inputBottomSeparatorRow);
-            if (row < statusRow) {
-                const text = inputBorderWidgetsLayout
-                    ? overlayText(separatorText, inputBorderWidgetsLayout.inputBorderWidgetStartColumn ?? 1, inputBorderWidgetsLayout.text)
-                    : separatorText;
-                this.deps.mouseController.renderedRowTexts.set(row, text);
-                const output = inputBorderWidgetsLayout && statusLineRenderer.renderInputBorderWidgets
-                    ? statusLineRenderer.renderInputBorderWidgets(row, inputBorderWidgetsLayout, separatorText, columns)
-                    : this.deps.screenStyler.styleLine(row, separatorText, columns, {
-                        foreground: this.deps.theme.colors.inputBorder,
-                    });
-                appendFrameOutput("inputStatus", row, this.renderFrameRow(row, output));
-            }
-        }
-        this.updateStatusMouseState(statusLayout, statusRow, inputBorderWidgetsLayout, toScreenRow(inputBottomSeparatorRow));
+        this.updateStatusMouseState(statusLayout, statusRow);
         appendFrameOutput("inputStatus", statusRow, this.renderFrameRow(statusRow, this.deps.statusLineRenderer.render(statusRow, statusLayout, columns)));
         const voiceProgressOverlay = this.renderVoiceProgressOverlay(this.deps.voiceProgressOverlayText(), columns, statusRow);
         if (voiceProgressOverlay) {
@@ -286,9 +277,9 @@ export class AppRenderController {
         const text = fixedCellText(flash.text, width);
         return `\x1b[${flash.y};${flash.startColumn}H\x1b[7m${text}${ANSI_RESET}`;
     }
-    updateStatusMouseState(statusLayout, statusRow, inputBorderWidgetsLayout, inputBorderWidgetsRow) {
-        const widgetLayout = inputBorderWidgetsLayout;
-        const widgetRow = inputBorderWidgetsRow ?? statusRow;
+    updateStatusMouseState(statusLayout, statusRow) {
+        const widgetLayout = statusLayout;
+        const widgetRow = statusRow;
         this.deps.mouseController.statusModelTarget = this.deps.statusLineRenderer.modelTarget(statusLayout.text, statusRow);
         this.deps.mouseController.statusThinkingTarget = this.deps.statusLineRenderer.thinkingTarget(statusLayout.text, statusRow);
         this.deps.mouseController.statusContextTarget = this.deps.statusLineRenderer.contextTarget(statusLayout.text, statusRow, statusLayout);
@@ -327,40 +318,40 @@ export class AppRenderController {
         ].join("");
         return { row: Math.min(2, rows - 1), text, output };
     }
+    renderConversationLoadingOverlay(message, width, topReservedRows, bodyHeight) {
+        if (!message || width <= 0 || bodyHeight <= 0)
+            return undefined;
+        const overlayWidth = Math.min(stringDisplayWidth(message), width);
+        const leftWidth = Math.max(0, Math.floor((width - overlayWidth) / 2));
+        const rightWidth = Math.max(0, width - leftWidth - overlayWidth);
+        const text = `${" ".repeat(leftWidth)}${padOrTrimPlain(message, overlayWidth)}${" ".repeat(rightWidth)}`;
+        const row = topReservedRows + Math.floor((bodyHeight + 1) / 2);
+        const output = this.deps.screenStyler.styleLine(row, text, width, {
+            foreground: this.deps.theme.colors.muted,
+        });
+        return { row, text, output };
+    }
 }
 function visibleToastStates(toastController) {
     const candidate = toastController;
     return typeof candidate.visibleStates === "function" ? candidate.visibleStates() : candidate.toast?.visibleStates ?? [];
 }
 function inputFrameLine(width, edge) {
+    void edge;
     if (width <= 0)
         return "";
-    if (width === 1)
-        return edge === "top" ? INPUT_FRAME.topLeft : INPUT_FRAME.bottomLeft;
-    const left = edge === "top" ? INPUT_FRAME.topLeft : INPUT_FRAME.bottomLeft;
-    const right = edge === "top" ? INPUT_FRAME.topRight : INPUT_FRAME.bottomRight;
-    return `${left}${INPUT_FRAME.horizontal.repeat(Math.max(0, width - 2))}${right}`;
+    return INPUT_FRAME.horizontal.repeat(width);
 }
 function frameRenderedLine(line, width, theme, screenStyler) {
     if (width <= 0)
         return { line, text: "", output: () => "" };
-    if (width === 1) {
-        const border = colorize("│", {
-            foreground: theme.colors.inputBorder,
-        });
-        return { line, text: "│", output: () => border };
-    }
-    const innerWidth = Math.max(0, width - 2);
-    const innerText = padOrTrimPlain(line?.text ?? "", innerWidth);
-    const innerLine = line ? frameInnerRenderedLine(line, innerText, innerWidth) : undefined;
-    const leftBorder = colorize("│", {
-        foreground: theme.colors.inputBorder,
-    });
-    const rightBorder = leftBorder;
+    void theme;
+    const text = padOrTrimPlain(line?.text ?? "", width);
+    const outputLine = line ? frameInnerRenderedLine(line, text, width) : undefined;
     return {
         line,
-        text: `│${innerText}│`,
-        output: (row) => `${leftBorder}${screenStyler.styleBaseLine(row, innerLine, innerWidth)}${rightBorder}`,
+        text,
+        output: (row) => screenStyler.styleBaseLine(row, outputLine, width),
     };
 }
 function frameInnerRenderedLine(line, text, width) {

package/dist/app/rendering/render-text.js

@@ -98,8 +98,8 @@ export function padOrTrimPlain(text, width) {
 }
 export function horizontalPaddingLayout(width) {
     const safeWidth = Math.max(1, width);
-    const left = safeWidth > 1 ? 1 : 0;
-    const right = safeWidth > 2 ? 1 : 0;
+    const left = 0;
+    const right = 0;
     return { left, right, contentWidth: Math.max(1, safeWidth - left - right) };
 }
 export function padHorizontalText(text, width) {

package/dist/app/rendering/status-line-renderer.d.ts

@@ -53,6 +53,8 @@ export declare class StatusLineRenderer {
     terminalBellSoundTarget(layout: StatusLineLayout, row: number): StatusTerminalBellSoundTarget | undefined;
     sessionTarget(statusText: string, row: number, label: string, workspaceLabel: string): StatusSessionTarget | undefined;
     private segments;
+    private fitWorkspaceLabel;
+    private pushStatusWidgetSegments;
     private pushPromptEnhancerWidgetSegment;
     private pushUserJumpWidgetSegment;
     private pushDraftQueueWidgetSegment;

package/dist/app/rendering/status-line-renderer.js

@@ -1,12 +1,10 @@
 import { compactProgressBarSegments, formatCompactProgressBar } from "../../context-progress-bar.js";
-import { padOrTrimPlain } from "./render-text.js";
+import { ellipsizeDisplay, padOrTrimPlain } from "./render-text.js";
 import { displayIndexForColumn, stringDisplayWidth } from "../../terminal-width.js";
 import { APP_ICONS } from "../icons.js";
 import { resolveColor, resolveModelColor } from "../../config.js";
 const MODEL_USAGE_PROGRESS_BAR_WIDTH = stringDisplayWidth(formatCompactProgressBar(100));
-const INPUT_BORDER_WIDGET_INSET = 2;
-const INPUT_BORDER_WIDGET_SEPARATOR = "─";
-const STATUS_ICON_BUTTON_WIDTH = 3;
+const STATUS_WIDGET_GAP = " ";
 export class StatusLineRenderer {
     host;
     constructor(host) {
@@ -18,17 +16,29 @@ export class StatusLineRenderer {
         const baseStatus = this.host.currentStatus();
         const workspaceLabel = this.host.statusWorkspaceLabel();
         const modelUsageLabel = this.host.modelUsageStatusLabel();
-        const workspaceDetailsLabel = modelUsageLabel ? `${workspaceLabel} ${modelUsageLabel}` : workspaceLabel;
-        const contextBarLabel = this.contextBarLabel(baseStatus, contentWidth, workspaceDetailsLabel);
+        const widgetsLayout = this.inputBorderWidgetsLayout(contentWidth);
+        const leftWidth = widgetsLayout?.inputBorderWidgetStartColumn
+            ? Math.max(0, widgetsLayout.inputBorderWidgetStartColumn - 2)
+            : contentWidth;
+        const fullWorkspaceDetailsLabel = modelUsageLabel ? `${workspaceLabel} ${modelUsageLabel}` : workspaceLabel;
+        const contextBarLabel = this.contextBarLabel(baseStatus, leftWidth, fullWorkspaceDetailsLabel);
         const status = contextBarLabel ? `${baseStatus} ${contextBarLabel}` : baseStatus;
         const sessionLabel = "";
-        const details = `${status} ${workspaceDetailsLabel}`;
-        const text = padOrTrimPlain(`${statusDot} ${details}`, width);
+        const fittedWorkspaceLabel = this.fitWorkspaceLabel(statusDot, status, workspaceLabel, modelUsageLabel, leftWidth);
+        const workspaceDetailsLabel = modelUsageLabel
+            ? `${fittedWorkspaceLabel ? `${fittedWorkspaceLabel} ` : ""}${modelUsageLabel}`
+            : fittedWorkspaceLabel;
+        const details = workspaceDetailsLabel ? `${status} ${workspaceDetailsLabel}` : status;
+        const leftText = padOrTrimPlain(`${statusDot} ${details}`, leftWidth);
+        const text = widgetsLayout?.inputBorderWidgetStartColumn
+            ? overlayText(padOrTrimPlain(leftText, contentWidth), widgetsLayout.inputBorderWidgetStartColumn, widgetsLayout.text)
+            : padOrTrimPlain(leftText, contentWidth);
         return {
+            ...widgetsLayout,
             details,
             text,
             sessionLabel,
-            workspaceLabel,
+            workspaceLabel: fittedWorkspaceLabel,
             ...(modelUsageLabel ? { modelUsageLabel } : {}),
             ...(contextBarLabel ? { contextBarLabel } : {}),
         };
@@ -76,17 +86,18 @@ export class StatusLineRenderer {
         if (!hasParts)
             return undefined;
         const parts = [];
-        const totalWidth = widgets.reduce((total, widget, index) => total + (index > 0 ? 1 : 0) + stringDisplayWidth(widget.text), 0);
-        const endColumn = Math.max(1, width - INPUT_BORDER_WIDGET_INSET);
+        const gapWidth = stringDisplayWidth(STATUS_WIDGET_GAP);
+        const totalWidth = widgets.reduce((total, widget, index) => total + stringDisplayWidth(widget.text) + (index > 0 ? gapWidth : 0), 0);
+        const endColumn = Math.max(1, width + 1);
         const startColumn = endColumn - totalWidth;
-        if (startColumn < 2)
+        if (startColumn < 1)
             return undefined;
         layout.inputBorderWidgetStartColumn = startColumn;
         let nextColumn = startColumn;
         for (const [index, widget] of widgets.entries()) {
             if (index > 0) {
-                parts.push(INPUT_BORDER_WIDGET_SEPARATOR);
-                nextColumn += 1;
+                parts.push(STATUS_WIDGET_GAP);
+                nextColumn += gapWidth;
             }
             parts.push(widget.text);
             widget.assign(nextColumn, widget.text);
@@ -110,7 +121,6 @@ export class StatusLineRenderer {
     }
     inputBorderWidgetSegments(layout, text) {
         const colors = this.host.theme.colors;
-        const background = colors.inputBorder;
         const segments = [];
         const pushWidgetSegment = (widget, foreground) => {
             if (!widget)
@@ -119,7 +129,6 @@ export class StatusLineRenderer {
                 start: displayIndexForColumn(text, widget.startColumn),
                 end: displayIndexForColumn(text, widget.endColumn),
                 foreground,
-                background,
             });
         };
         pushWidgetSegment(layout.draftQueueWidget, colors.info);
@@ -138,14 +147,12 @@ export class StatusLineRenderer {
                 start: displayIndexForColumn(text, voiceWidget.startColumn),
                 end: displayIndexForColumn(text, voiceWidget.micEndColumn),
                 foreground: this.host.voiceStatusWidgetActive() ? colors.error : colors.muted,
-                background,
             });
             if (voiceWidget.languageEndColumn > voiceWidget.languageStartColumn) {
                 segments.push({
                     start: displayIndexForColumn(text, voiceWidget.languageStartColumn),
                     end: displayIndexForColumn(text, voiceWidget.languageEndColumn),
                     foreground: colors.statusForeground,
-                    background,
                 });
             }
         }
@@ -271,16 +278,10 @@ export class StatusLineRenderer {
                 end: statusDotStart + APP_ICONS.record.length,
                 foreground: this.statusDotColor(),
             }] : [];
-        this.pushDraftQueueWidgetSegment(segments, statusText);
-        this.pushUserJumpWidgetSegment(segments, statusText);
-        this.pushThinkingExpandWidgetSegment(segments, statusText, layout);
-        this.pushCompactToolsWidgetSegment(segments, statusText);
-        this.pushTerminalBellSoundWidgetSegment(segments, statusText);
+        this.pushStatusWidgetSegments(segments, statusText, layout);
         this.pushWorkspaceSegments(segments, statusText, layout.workspaceLabel);
         if (layout.modelUsageLabel)
             this.pushModelUsageSegments(segments, statusText, layout.modelUsageLabel);
-        this.pushPromptEnhancerWidgetSegment(segments, statusText);
-        this.pushVoiceWidgetSegment(segments, statusText);
         const session = this.host.session;
         if (!session)
             return segments;
@@ -304,6 +305,50 @@ export class StatusLineRenderer {
         this.pushSegment(segments, statusText.lastIndexOf(layout.sessionLabel), layout.sessionLabel.length, this.host.theme.colors.selectionForeground);
         return segments;
     }
+    fitWorkspaceLabel(statusDot, status, workspaceLabel, modelUsageLabel, width) {
+        const modelUsageSuffix = modelUsageLabel ? ` ${modelUsageLabel}` : "";
+        const available = width - stringDisplayWidth(`${statusDot} ${status} `) - stringDisplayWidth(modelUsageSuffix);
+        if (available <= 0)
+            return "";
+        return ellipsizeDisplay(workspaceLabel, available);
+    }
+    pushStatusWidgetSegments(segments, statusText, layout) {
+        const colors = this.host.theme.colors;
+        const widgets = [
+            { widget: layout.draftQueueWidget, foreground: colors.info },
+            { widget: layout.promptEnhancerWidget, foreground: this.host.promptEnhancerStatusWidgetActive()
+                    ? colors.warning
+                    : this.host.promptEnhancerStatusWidgetEnabled()
+                        ? colors.info
+                        : colors.muted },
+            { widget: layout.userJumpWidget, foreground: this.host.userMessageJumpMenuActive?.() ? colors.info : colors.muted },
+            { widget: layout.terminalBellSoundWidget, foreground: this.host.terminalBellSoundStatusWidgetEnabled() ? colors.info : colors.muted },
+            { widget: layout.thinkingExpandWidget, foreground: this.host.allThinkingExpandedActive?.() ? colors.info : colors.muted },
+            { widget: layout.compactToolsWidget, foreground: this.host.superCompactToolsActive?.() ? colors.info : colors.muted },
+        ].filter((entry) => Boolean(entry.widget));
+        for (const { widget, foreground } of widgets) {
+            segments.push({
+                start: displayIndexForColumn(statusText, widget.startColumn),
+                end: displayIndexForColumn(statusText, widget.endColumn),
+                foreground,
+            });
+        }
+        const voiceWidget = layout.voiceWidget;
+        if (voiceWidget) {
+            segments.push({
+                start: displayIndexForColumn(statusText, voiceWidget.startColumn),
+                end: displayIndexForColumn(statusText, voiceWidget.micEndColumn),
+                foreground: this.host.voiceStatusWidgetActive() ? colors.error : colors.muted,
+            });
+            if (voiceWidget.languageEndColumn > voiceWidget.languageStartColumn) {
+                segments.push({
+                    start: displayIndexForColumn(statusText, voiceWidget.languageStartColumn),
+                    end: displayIndexForColumn(statusText, voiceWidget.languageEndColumn),
+                    foreground: colors.statusForeground,
+                });
+            }
+        }
+    }
     pushPromptEnhancerWidgetSegment(segments, statusText) {
         const widgetText = this.host.promptEnhancerStatusWidgetText();
         const start = statusText.lastIndexOf(widgetText);
@@ -497,7 +542,7 @@ export class StatusLineRenderer {
         };
     }
     iconButtonText(icon) {
-        return padOrTrimPlain(` ${icon} `, STATUS_ICON_BUTTON_WIDTH);
+        return icon;
     }
     voiceBorderWidgetText(widgetText) {
         const parts = this.voiceBorderWidgetParts(widgetText);
@@ -505,21 +550,22 @@ export class StatusLineRenderer {
             return "";
         const micButton = this.iconButtonText(parts.buttonIconText);
         if (parts.languageText) {
-            return `${micButton}${INPUT_BORDER_WIDGET_SEPARATOR}${parts.languageText}`;
+            return `${micButton}${STATUS_WIDGET_GAP}${parts.languageText}`;
         }
         return micButton;
     }
     voiceWidgetLayout(startColumn, sourceText, widgetText) {
         const parts = this.voiceBorderWidgetParts(sourceText);
+        const micWidth = parts?.buttonIconText ? stringDisplayWidth(parts.buttonIconText) : stringDisplayWidth(widgetText);
         const languageStartOffset = parts?.languageText
-            ? STATUS_ICON_BUTTON_WIDTH + stringDisplayWidth(INPUT_BORDER_WIDGET_SEPARATOR)
+            ? micWidth + stringDisplayWidth(STATUS_WIDGET_GAP)
             : stringDisplayWidth(widgetText);
         const languageEndOffset = parts?.languageText
             ? languageStartOffset + stringDisplayWidth(parts.languageText)
             : languageStartOffset;
         return {
             startColumn,
-            micEndColumn: startColumn + STATUS_ICON_BUTTON_WIDTH,
+            micEndColumn: startColumn + micWidth,
             languageStartColumn: startColumn + languageStartOffset,
             languageEndColumn: startColumn + languageEndOffset,
             endColumn: startColumn + stringDisplayWidth(widgetText),

package/dist/app/rendering/tab-line-renderer.js

@@ -50,7 +50,7 @@ export class TabLineRenderer {
                 segments.push({
                     start: separatorOffset + 1,
                     end: separatorOffset + 2,
-                    foreground: this.host.theme.colors.inputBorder,
+                    foreground: this.host.theme.colors.tabBorder,
                 });
                 displayColumn += separatorWidth;
             }
@@ -89,7 +89,7 @@ export class TabLineRenderer {
         segments.push({
             start: newTabDividerOffset,
             end: newTabDividerOffset + 1,
-            foreground: this.host.theme.colors.inputBorder,
+            foreground: this.host.theme.colors.tabBorder,
         });
         segments.push({
             start: lineText.length - APP_ICONS.plus.length,
@@ -119,7 +119,7 @@ export class TabLineRenderer {
     }
     renderBottom(row, layout, width) {
         return this.host.screenStyler.styleLine(row, this.bottomText(layout, width), width, {
-            foreground: this.host.theme.colors.inputBorder,
+            foreground: this.host.theme.colors.tabBorder,
         });
     }
     bottomText(layout, width) {

package/dist/app/runtime.js

@@ -133,6 +133,32 @@ function isBundledQuestionConflict(error, bundledExtensionPaths) {
     }
     return false;
 }
+const bundledSkillsInstallPromises = new Map();
+const piToolsSuiteInstallPromises = new Map();
+async function ensureBundledSkillsInstalledOnce(options = {}) {
+    const targetPath = resolve(options.targetPath ?? bundledSkillsInstallPath(options.homeDir));
+    const existing = bundledSkillsInstallPromises.get(targetPath);
+    if (existing)
+        return await existing;
+    const pending = ensureBundledSkillsInstalled(options).catch((error) => {
+        bundledSkillsInstallPromises.delete(targetPath);
+        throw error;
+    });
+    bundledSkillsInstallPromises.set(targetPath, pending);
+    return await pending;
+}
+async function ensurePiToolsSuiteExtensionInstalledOnce(options = {}) {
+    const targetPath = resolve(options.targetPath ?? piToolsSuiteExtensionInstallPath(options.agentDir));
+    const existing = piToolsSuiteInstallPromises.get(targetPath);
+    if (existing)
+        return await existing;
+    const pending = ensurePiToolsSuiteExtensionInstalled(options).catch((error) => {
+        piToolsSuiteInstallPromises.delete(targetPath);
+        throw error;
+    });
+    piToolsSuiteInstallPromises.set(targetPath, pending);
+    return await pending;
+}
 export function resolvePixRuntimeModelRef(options, sessionManager, config = loadPixConfig()) {
     if (options.modelRef)
         return options.modelRef;
@@ -176,8 +202,8 @@ export async function createPixRuntime(options, runtimeOptions = {}) {
         const effectiveModelRef = resolvePixRuntimeModelRef(options, sessionManager, config);
         const parsedModel = effectiveModelRef ? parseModelRef(effectiveModelRef) : undefined;
         const initialThinkingLevel = resolvePixRuntimeInitialThinkingLevel(options, sessionManager, config);
-        await ensureBundledSkillsInstalled();
-        await ensurePiToolsSuiteExtensionInstalled({ agentDir });
+        await ensureBundledSkillsInstalledOnce();
+        await ensurePiToolsSuiteExtensionInstalledOnce({ agentDir });
         const bundledExtensionPaths = getBundledExtensionPaths();
         const services = await createAgentSessionServices({
             cwd,
@@ -232,7 +258,7 @@ export async function createPixRuntime(options, runtimeOptions = {}) {
         sessionManager: options.noSession
             ? SessionManager.inMemory(options.cwd)
             : options.sessionPath
-                ? openLazySessionManager(options.sessionPath, { cwdOverride: options.cwd })
+                ? await openLazySessionManager(options.sessionPath, { cwdOverride: options.cwd })
                 : SessionManager.create(options.cwd),
     });
 }

package/dist/app/screen/file-link-opener.d.ts

@@ -3,6 +3,8 @@ import { spawn } from "node:child_process";
 import type { RenderedLink } from "./file-links.js";
 type FileLinkOpenerDeps = {
     existsSync: typeof existsSync;
+    env: NodeJS.ProcessEnv;
+    platform: NodeJS.Platform;
     spawn: typeof spawn;
 };
 export declare function setFileLinkOpenerTestDeps(overrides: Partial<FileLinkOpenerDeps>): () => void;

package/dist/app/screen/file-link-opener.js

@@ -1,8 +1,8 @@
 import { existsSync } from "node:fs";
 import { spawn } from "node:child_process";
-import { delimiter, join } from "node:path";
+import { isAbsolute, posix, win32 } from "node:path";
 import { fileURLToPath } from "node:url";
-let deps = { existsSync, spawn };
+let deps = { existsSync, env: process.env, platform: process.platform, spawn };
 export function setFileLinkOpenerTestDeps(overrides) {
     const previous = deps;
     deps = { ...deps, ...overrides };
@@ -14,13 +14,10 @@ export function openFileLink(link) {
     const filePath = link.filePath ?? filePathFromUrl(link.url);
     if (!filePath)
         return false;
-    const target = zedTarget(filePath, link.line, link.column);
-    const candidates = zedCommandCandidates();
-    if (trySpawnCandidates(candidates, [target]))
+    const editorLaunch = preferredEditorLaunch(filePath, link.line, link.column);
+    if (editorLaunch && trySpawnCandidates(editorLaunch.candidates, editorLaunch.args))
         return true;
-    if (process.platform === "darwin")
-        return spawnDetached("open", ["-a", "Zed", filePath]);
-    return false;
+    return openPathWithSystemViewer(filePath);
 }
 function filePathFromUrl(url) {
     if (!url.startsWith("file://"))
@@ -37,29 +34,99 @@ function zedTarget(filePath, line, column) {
         return filePath;
     return column === undefined ? `${filePath}:${line}` : `${filePath}:${line}:${column}`;
 }
+function gotoTarget(filePath, line, column) {
+    if (line === undefined)
+        return filePath;
+    return column === undefined ? `${filePath}:${line}` : `${filePath}:${line}:${column}`;
+}
+function preferredEditorLaunch(filePath, line, column) {
+    switch (detectEditor(deps.env)) {
+        case "cursor":
+            return { args: ["--goto", gotoTarget(filePath, line, column)], candidates: commandCandidates(deps.env.CURSOR_CLI, "cursor") };
+        case "jetbrains":
+            return {
+                args: jetbrainsTargetArgs(filePath, line),
+                candidates: commandCandidates(deps.env.JETBRAINS_IDE_CLI, "idea", "idea64", "webstorm", "webstorm64", "pycharm", "pycharm64", "goland", "goland64", "clion", "clion64", "phpstorm", "phpstorm64", "rubymine", "rubymine64", "rider", "rider64"),
+            };
+        case "vscode":
+            return { args: ["--goto", gotoTarget(filePath, line, column)], candidates: commandCandidates(deps.env.VSCODE_CLI, "code", "code-insiders") };
+        case "windsurf":
+            return { args: ["--goto", gotoTarget(filePath, line, column)], candidates: commandCandidates(deps.env.WINDSURF_CLI, "windsurf") };
+        case "zed":
+            return { args: [zedTarget(filePath, line, column)], candidates: zedCommandCandidates() };
+        default:
+            return undefined;
+    }
+}
+function detectEditor(env) {
+    const termProgram = env.TERM_PROGRAM?.trim().toLowerCase();
+    const terminalEmulator = env.TERMINAL_EMULATOR?.trim().toLowerCase();
+    const terminalProvider = env.TERMINAL_PROVIDER?.trim().toLowerCase();
+    if (termProgram === "cursor" || env.CURSOR_TRACE_ID || env.CURSOR_TRACE)
+        return "cursor";
+    if (termProgram === "windsurf")
+        return "windsurf";
+    if (termProgram === "zed" || env.ZED_CLI)
+        return "zed";
+    if (termProgram === "vscode" || env.VSCODE_IPC_HOOK_CLI || env.VSCODE_GIT_IPC_HANDLE)
+        return "vscode";
+    if (terminalEmulator?.includes("jetbrains") || terminalProvider === "jetbrains")
+        return "jetbrains";
+    return undefined;
+}
 function zedCommandCandidates() {
-    const candidates = [process.env.ZED_CLI, "zed", "zeditor"];
-    if (process.platform === "darwin")
+    const candidates = [deps.env.ZED_CLI, "zed", "zeditor"];
+    if (deps.platform === "darwin")
         candidates.push("/opt/homebrew/bin/zed", "/usr/local/bin/zed");
     return candidates.filter((candidate) => Boolean(candidate));
 }
+function commandCandidates(primary, ...rest) {
+    return [primary, ...rest].filter((candidate) => Boolean(candidate));
+}
+function jetbrainsTargetArgs(filePath, line) {
+    if (line === undefined)
+        return [filePath];
+    return ["--line", `${line}`, filePath];
+}
 function trySpawnCandidates(candidates, args) {
     for (const command of candidates) {
-        if (command.includes("/") && !deps.existsSync(command))
-            continue;
-        if (!command.includes("/") && !commandOnPath(command))
+        if (!canRunCommand(command))
             continue;
         if (spawnDetached(command, args))
             return true;
     }
     return false;
 }
+function canRunCommand(command) {
+    if (hasPathSeparator(command) || isAbsolute(command))
+        return deps.existsSync(command);
+    return commandOnPath(command);
+}
+function hasPathSeparator(command) {
+    return command.includes("/") || command.includes("\\");
+}
 function commandOnPath(command) {
-    const pathEntries = process.env.PATH?.split(delimiter) ?? [];
-    const extensions = process.platform === "win32"
-        ? (process.env.PATHEXT?.split(";") ?? [".EXE", ".CMD", ".BAT", ".COM"])
+    const pathEntries = deps.env.PATH?.split(pathDelimiter()) ?? [];
+    const extensions = deps.platform === "win32"
+        ? (deps.env.PATHEXT?.split(";") ?? [".EXE", ".CMD", ".BAT", ".COM"])
         : [""];
-    return pathEntries.some((entry) => extensions.some((extension) => deps.existsSync(join(entry, `${command}${extension}`))));
+    return pathEntries.some((entry) => pathCommandCandidates(entry, command, extensions).some((candidate) => deps.existsSync(candidate)));
+}
+function pathDelimiter() {
+    return deps.platform === "win32" ? ";" : ":";
+}
+function pathCommandCandidates(entry, command, extensions) {
+    const pathApi = deps.platform === "win32" ? win32 : posix;
+    if (deps.platform !== "win32" || pathApi.extname(command))
+        return [pathApi.join(entry, command)];
+    return [pathApi.join(entry, command), ...extensions.map((extension) => pathApi.join(entry, `${command}${extension}`))];
+}
+function openPathWithSystemViewer(filePath) {
+    if (deps.platform === "darwin")
+        return spawnDetached("open", [filePath]);
+    if (deps.platform === "win32")
+        return spawnDetached("cmd", ["/c", "start", "", filePath]);
+    return spawnDetached("xdg-open", [filePath]);
 }
 function spawnDetached(command, args) {
     try {

package/dist/app/screen/mouse-controller.d.ts

@@ -20,9 +20,7 @@ export type InputFrameCopyRows = {
     inputStartRow: number;
     inputEndRow: number;
     inputSeparatorRow: number;
-    inputBottomSeparatorRow: number;
-    contentStartColumn: number;
-    contentEndColumn: number;
+    inputBottomSeparatorRow?: number;
 };
 export type AppMouseControllerHost = {
     terminalColumns(): number;