pi-ui-extend 0.1.13 → 0.1.15

package/dist/app/popup/menu-items-controller.js

@@ -3,11 +3,15 @@ import { fuzzySearch } from "../../fuzzy.js";
 import { PI_FAVORITE_MODEL_REFS, THINKING_LEVELS } from "../constants.js";
 import { APP_ICONS } from "../icons.js";
 import { parseScopedModelRef } from "../model/model-ref.js";
-import { buildUserMessageJumpItems, createSessionInfoMenuItemsLoader } from "./popup-menu-controller.js";
+import { buildUserMessageJumpItems, createSessionInfoMenuItemsLoader, filterUserMessageJumpItems } from "./popup-menu-controller.js";
 import { getResourceSlashCommands, getSlashCommandMatches, parseSlashInput } from "../commands/slash-commands.js";
+import { isRecord } from "../guards.js";
+import { renderUserMessageContent } from "../rendering/message-content.js";
+import { sessionHistoryFullBranchEntries } from "../session/pix-system-message.js";
 export class AppMenuItemsController {
     host;
     resumeMenuLoaderCache;
+    userMessageJumpItems;
     constructor(host) {
         this.host = host;
     }
@@ -65,8 +69,7 @@ export class AppMenuItemsController {
     getThinkingMenuItems(query) {
         const session = this.host.runtime()?.session;
         const currentLevel = session?.thinkingLevel ?? "off";
-        const availableLevels = session ? session.getAvailableThinkingLevels() : [...THINKING_LEVELS];
-        const levels = availableLevels.includes("off") ? availableLevels : ["off", ...availableLevels];
+        const levels = session ? normalizeAvailableThinkingLevels(session.getAvailableThinkingLevels()) : [...THINKING_LEVELS];
         const items = levels.map((level) => ({
             value: { level, current: level === currentLevel },
             label: level,
@@ -79,18 +82,40 @@ export class AppMenuItemsController {
         return fuzzySearch(items, query).map((match) => ({
             value: match.value,
             label: `${match.value.level}${match.value.current ? ` ${APP_ICONS.check}` : ""}`,
-            description: this.thinkingLevelDescription(match.value.level),
+            description: this.thinkingLevelDescription(match.value.level, levels),
         }));
     }
     getUserMessageMenuItems() {
         return [
             { value: "copy", label: "Copy message", description: "Copy the full user message" },
             { value: "fork", label: "Fork", description: "Create a new session before this message" },
+            { value: "fork-new-tab", label: "Fork in new tab", description: "Create a fork in a new tab" },
             { value: "undo", label: "Undo changes", description: "Revert recorded commands and cut session here" },
         ];
     }
     getUserMessageJumpMenuItems(query) {
-        return buildUserMessageJumpItems(this.host.getEntries(), query);
+        return filterUserMessageJumpItems(this.userMessageJumpItems ?? buildUserMessageJumpItems(this.host.getEntries()), query);
+    }
+    async refreshUserMessageJumpMenuItems() {
+        const runtime = this.host.runtime();
+        if (!runtime) {
+            this.userMessageJumpItems = undefined;
+            return;
+        }
+        const entries = await sessionHistoryFullBranchEntries(runtime.session);
+        const loadedBySessionEntryId = new Map(this.host.getEntries()
+            .filter((entry) => entry.kind === "user" && typeof entry.sessionEntryId === "string")
+            .map((entry) => [entry.sessionEntryId, entry]));
+        const sources = entries.flatMap((entry) => {
+            if (entry.type !== "message" || !isRecord(entry.message) || entry.message.role !== "user")
+                return [];
+            const text = renderUserMessageContent(entry.message.content);
+            if (!text)
+                return [];
+            const loaded = loadedBySessionEntryId.get(entry.id);
+            return [{ text, ...(loaded ? { entryId: loaded.id } : {}), sessionEntryId: entry.id }];
+        });
+        this.userMessageJumpItems = buildUserMessageJumpItems(sources);
     }
     getQueueMessageMenuItems() {
         return [
@@ -163,7 +188,7 @@ export class AppMenuItemsController {
             return (refreshed ?? scoped.model);
         });
     }
-    thinkingLevelDescription(level) {
+    thinkingLevelDescription(level, _availableLevels) {
         switch (level) {
             case "off":
                 return "No reasoning/thinking";
@@ -180,3 +205,17 @@ export class AppMenuItemsController {
         }
     }
 }
+function normalizeAvailableThinkingLevels(levels) {
+    const seen = new Set();
+    const normalized = [];
+    for (const level of levels ?? THINKING_LEVELS) {
+        if (!isAvailableThinkingLevel(level) || seen.has(level))
+            continue;
+        seen.add(level);
+        normalized.push(level);
+    }
+    return normalized.length > 0 ? normalized : ["off"];
+}
+function isAvailableThinkingLevel(value) {
+    return THINKING_LEVELS.includes(value);
+}

package/dist/app/popup/popup-action-controller.d.ts

@@ -3,7 +3,7 @@ import type { AppCommandController } from "../commands/command-controller.js";
 import type { AppMenuItemsController } from "./menu-items-controller.js";
 import type { AppPopupMenuController } from "./popup-menu-controller.js";
 import type { AppQueuedMessageController } from "../session/queued-message-controller.js";
-import type { Entry, SlashCommand } from "../types.js";
+import type { Entry, SlashCommand, UserMessageJumpMenuValue } from "../types.js";
 import type { AppWorkspaceActionsController } from "../workspace/workspace-actions-controller.js";
 export type AppPopupActionControllerHost = {
     runtime(): AgentSessionRuntime | undefined;
@@ -19,6 +19,7 @@ export type AppPopupActionControllerHost = {
     bindCurrentSession(): Promise<void>;
     loadSessionHistory(): void;
     scrollToConversationEntry(entryId: string): boolean;
+    scrollToUserMessageJumpTarget(target: UserMessageJumpMenuValue): Promise<boolean>;
 };
 export declare class AppPopupActionController {
     private readonly host;

package/dist/app/popup/popup-action-controller.js

@@ -24,7 +24,7 @@ export class AppPopupActionController {
         if (active === "user-message")
             return await this.submitSelectedUserMessageAction();
         if (active === "user-message-jump")
-            return this.submitSelectedUserMessageJump();
+            return await this.submitSelectedUserMessageJump();
         if (active === "resume")
             return await this.submitSelectedResume();
         if (active === "model")
@@ -155,6 +155,10 @@ export class AppPopupActionController {
                 await this.workspaceActions.forkFromUserMessage(selected.entryId);
                 return true;
             }
+            if (selected.value === "fork-new-tab") {
+                await this.workspaceActions.forkFromUserMessageInNewTab(selected.entryId);
+                return true;
+            }
             await this.workspaceActions.undoChangesFromUserMessage(selected.entryId);
             return true;
         }
@@ -165,13 +169,12 @@ export class AppPopupActionController {
             return true;
         }
     }
-    submitSelectedUserMessageJump() {
+    async submitSelectedUserMessageJump() {
         const selected = this.popupMenus.selectedUserMessageJump();
         if (!selected)
             return false;
-        const entryId = selected.entryId;
         this.popupMenus.closeUserMessageJumpMenu();
-        if (!this.host.scrollToConversationEntry(entryId)) {
+        if (!await this.host.scrollToUserMessageJumpTarget(selected)) {
             this.host.showToast("User message not found", "error");
             this.host.setSessionStatus(this.host.runtime()?.session);
             return true;

package/dist/app/popup/popup-menu-controller.d.ts

@@ -1,6 +1,4 @@
-import { type Theme } from "../../theme.js";
 import { PopupMenu, type PopupMenuItem } from "../../ui.js";
-import type { ScreenStyler } from "../screen/screen-styler.js";
 import type { ActivePopupMenu, Entry, ModelMenuValue, ParsedSlashInput, PixMenuController, PixMenuItem, PixMenuOptions, PixMenuSelectOptions, PopupMenuPlacement, QueueMessageMenuValue, RenderedLine, ResumeMenuValue, SlashCommand, ThinkingMenuValue, UserMessageJumpMenuValue, UserMessageMenuValue } from "../types.js";
 import type { AgentSession, SessionInfo } from "@earendil-works/pi-coding-agent";
 type SlashCommandMenuValue = SlashCommand;
@@ -10,10 +8,34 @@ type ResumePopupMenuValue = ResumeMenuValue;
 type UserMessagePopupMenuValue = UserMessageMenuValue;
 type UserMessageJumpPopupMenuValue = UserMessageJumpMenuValue;
 type QueueMessagePopupMenuValue = QueueMessageMenuValue;
+type SdkPopupMenuValue = PixMenuItem<unknown>;
+type PopupMenuRendererPort = {
+    popupMenuWidth(columns: number): number;
+    popupMenuMargin(columns: number): number;
+    effectivePopupMenuWidth(columns: number): number;
+    styleOverlayLine(row: number, line: RenderedLine, width: number, activeMenu: PopupMenu<unknown>): string;
+    overlayPlainText(line: RenderedLine, width: number): string;
+    renderInlineUserMessageMenu(options: {
+        userContentWidth: number;
+        userContentLeft: number;
+        userLine: (text: string, entryId?: string, syntaxHighlight?: RenderedLine["syntaxHighlight"]) => RenderedLine;
+    }, menu: PopupMenu<UserMessagePopupMenuValue>): RenderedLine[];
+    renderSlashCommandMenu(width: number, menu: PopupMenu<SlashCommandMenuValue>): RenderedLine[];
+    renderModelMenu(width: number, menu: PopupMenu<ModelPopupMenuValue>): RenderedLine[];
+    renderThinkingMenu(width: number, menu: PopupMenu<ThinkingPopupMenuValue>): RenderedLine[];
+    renderResumeMenu(width: number, menu: PopupMenu<ResumePopupMenuValue>, state: {
+        directQuery: string;
+        allSessionsLoaded: boolean;
+        loadedSessionCount: number;
+    }): RenderedLine[];
+    renderUserMessageJumpMenu(width: number, menu: PopupMenu<UserMessageJumpPopupMenuValue>, directQuery: string): RenderedLine[];
+    renderQueueMessageMenu(width: number, menu: PopupMenu<QueueMessagePopupMenuValue>): RenderedLine[];
+    renderSdkMenu(width: number, menu: PopupMenu<SdkPopupMenuValue>, request: {
+        options: PixMenuOptions;
+    } | undefined, directQuery: string): RenderedLine[];
+};
 export type DirectPopupMenu = Exclude<ActivePopupMenu, "slash">;
 export type AppPopupMenuControllerHost = {
-    readonly theme: Theme;
-    readonly screenStyler: ScreenStyler;
     readonly entries: readonly Entry[];
     readonly session: AgentSession | undefined;
     readonly resumeLoading: boolean;
@@ -37,6 +59,7 @@ export type AppPopupMenuControllerHost = {
 };
 export declare class AppPopupMenuController {
     private readonly host;
+    private readonly renderer;
     readonly menuController: PixMenuController;
     private readonly slashCommandMenu;
     private readonly modelMenu;
@@ -62,7 +85,7 @@ export declare class AppPopupMenuController {
     private resumeMenuAllSessionsLoaded;
     private activeUserMessageEntryId;
     private activeQueuedMessageEntryId;
-    constructor(host: AppPopupMenuControllerHost);
+    constructor(host: AppPopupMenuControllerHost, renderer: PopupMenuRendererPort);
     get directMenu(): DirectPopupMenu | undefined;
     get directQuery(): string;
     setDirectMenu(menu: DirectPopupMenu | undefined): void;
@@ -95,6 +118,7 @@ export declare class AppPopupMenuController {
     closeModelSelection(): void;
     closeThinkingSelection(): void;
     closeSlashCommandSelection(): void;
+    closeMenusForTabSwitch(): void;
     cancelActivePopupMenu(): void;
     autocompleteSlashCommand(): void;
     autocompleteModel(): boolean;
@@ -137,19 +161,12 @@ export declare class AppPopupMenuController {
         userContentLeft: number;
         userLine: (text: string, entryId?: string, syntaxHighlight?: RenderedLine["syntaxHighlight"]) => RenderedLine;
     }): RenderedLine[];
-    private hasPopupActionItems;
     private withoutCloseMenuItems;
     private resetPopupMenuSelection;
     private resetResumeMenuLazyState;
     private maybeGrowResumeMenuWindow;
     private updateResumeMenuLoadedState;
     private resumeMenuLoadedSessionCount;
-    private userMessageActionForeground;
-    private selectableItemVariant;
-    private queueMessageItemVariant;
-    private sdkItemVariant;
-    private resumeMenuItemSegments;
-    private popupMenuHeader;
     private syncModelMenu;
     private syncThinkingMenu;
     private syncResumeMenu;
@@ -160,17 +177,7 @@ export declare class AppPopupMenuController {
     private syncSlashCommandMenu;
     private closeMenusExcept;
     private getSdkMenuItems;
-    private renderSlashCommandMenu;
-    private renderModelMenu;
-    private renderThinkingMenu;
-    private renderResumeMenu;
-    private renderUserMessageJumpMenu;
-    private renderQueueMessageMenu;
-    private renderSdkMenu;
-    private popupLineForeground;
-    private popupLineBackground;
 }
-export declare function formatPopupMenuHeader(title: string, width: number): string;
 export type SessionInfoMenuItemsLoader = {
     readonly total: number;
     items(limit?: number): PopupMenuItem<SessionInfo>[];
@@ -179,5 +186,11 @@ export declare function createSessionInfoMenuItemsLoader(sessions: readonly Sess
 export declare function formatSessionInfoMenuItems(sessions: readonly SessionInfo[], currentSessionFile: string | undefined, query: string, options?: {
     limit?: number;
 }): PopupMenuItem<SessionInfo>[];
-export declare function buildUserMessageJumpItems(entries: readonly Entry[], query: string): PopupMenuItem<UserMessageJumpMenuValue>[];
+export type UserMessageJumpSourceItem = {
+    text: string;
+    entryId?: string;
+    sessionEntryId?: string;
+};
+export declare function buildUserMessageJumpItems(entries: readonly Entry[] | readonly UserMessageJumpSourceItem[]): PopupMenuItem<UserMessageJumpMenuValue>[];
+export declare function filterUserMessageJumpItems(items: readonly PopupMenuItem<UserMessageJumpMenuValue>[], query: string): PopupMenuItem<UserMessageJumpMenuValue>[];
 export type { ModelPopupMenuValue, QueueMessagePopupMenuValue, ResumePopupMenuValue, SlashCommandMenuValue, ThinkingPopupMenuValue, UserMessageJumpPopupMenuValue, UserMessagePopupMenuValue, };