@astralyn/pi 1.4.7 → 1.4.9

package/dist/extensions/shell-paths/index.js

@@ -0,0 +1,74 @@
+import { execFile } from "node:child_process";
+import { posix, win32 } from "node:path";
+import { normalizePath, normalizeWindowsShellPath } from "../../utils/paths.js";
+import { getShellConfig } from "../../utils/shell.js";
+/** Built-in tools whose `path` argument names a file or directory. */
+const PATH_TOOLS = new Set(["read", "write", "edit", "ls", "grep", "find"]);
+/** `<Windows path> on <mount point> type <fs> (<flags>)`, as printed by Git Bash, MSYS2, and Cygwin `mount`. */
+const MOUNT_LINE = /^(.+?) on (\/.*) type \S+ \([^)]*\)$/;
+const MOUNT_TIMEOUT_MS = 5000;
+function parseMounts(output) {
+    const mounts = [];
+    for (const line of output.split(/\r?\n/)) {
+        const match = MOUNT_LINE.exec(line.trim());
+        // Native file tools reach only Windows directories, which also skips virtual mounts.
+        if (!match || !/^[a-z]:(?:[\\/]|$)/i.test(match[1]))
+            continue;
+        const [, source, point] = match;
+        mounts.push({ point, target: win32.normalize(source.length === 2 ? `${source}\\` : source) });
+    }
+    // The longest mount point wins, so /tmp is matched before /.
+    return mounts.sort((a, b) => b.point.length - a.point.length);
+}
+function readMounts(shellPath) {
+    return new Promise((resolve) => {
+        try {
+            const shell = getShellConfig(shellPath ? normalizePath(shellPath) : undefined);
+            // Legacy WSL bash mounts live inside Linux; core already maps its /mnt/<drive> paths.
+            if (shell.commandTransport === "stdin")
+                return resolve([]);
+            execFile(shell.shell, [...shell.args, "mount"], { timeout: MOUNT_TIMEOUT_MS, windowsHide: true }, (error, stdout) => resolve(error ? [] : parseMounts(stdout)));
+        }
+        catch {
+            resolve([]);
+        }
+    });
+}
+function toWindowsPath(path, mounts) {
+    const normalized = posix.normalize(path);
+    const mount = mounts.find(({ point }) => point === "/" || normalized === point || normalized.startsWith(`${point}/`));
+    return mount && win32.join(mount.target, posix.relative(mount.point, normalized));
+}
+/**
+ * Bash on Windows reports paths under its own mount table (`/tmp`, `/usr`, ...), which native file
+ * tools would otherwise resolve against the current drive root. Rewrite them to the Windows
+ * directories bash means. Drive paths such as `/c/...` stay with core path normalization.
+ */
+export default function shellPathsExtension(pi) {
+    if (process.platform !== "win32")
+        return;
+    const mountsByShellPath = new Map();
+    function getMounts() {
+        const shellPath = pi.getSettings().shellPath;
+        let mounts = mountsByShellPath.get(shellPath);
+        if (!mounts) {
+            mounts = readMounts(shellPath);
+            mountsByShellPath.set(shellPath, mounts);
+        }
+        return mounts;
+    }
+    pi.on("tool_call", async (event) => {
+        if (!PATH_TOOLS.has(event.toolName))
+            return;
+        const input = event.input;
+        const path = input.path;
+        if (typeof path !== "string" || !path.startsWith("/") || path.startsWith("//"))
+            return;
+        if (normalizeWindowsShellPath(path) !== path)
+            return;
+        const windowsPath = toWindowsPath(path, await getMounts());
+        if (windowsPath)
+            input.path = windowsPath;
+    });
+}
+//# sourceMappingURL=index.js.map

package/dist/extensions/shell-paths/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/extensions/shell-paths/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { execFile } from \"node:child_process\";\nimport { posix, win32 } from \"node:path\";\nimport type { ExtensionAPI } from \"../../core/extensions/types.ts\";\nimport { normalizePath, normalizeWindowsShellPath } from \"../../utils/paths.ts\";\nimport { getShellConfig } from \"../../utils/shell.ts\";\n\n/** Built-in tools whose `path` argument names a file or directory. */\nconst PATH_TOOLS = new Set([\"read\", \"write\", \"edit\", \"ls\", \"grep\", \"find\"]);\n/** `<Windows path> on <mount point> type <fs> (<flags>)`, as printed by Git Bash, MSYS2, and Cygwin `mount`. */\nconst MOUNT_LINE = /^(.+?) on (\\/.*) type \\S+ \\([^)]*\\)$/;\nconst MOUNT_TIMEOUT_MS = 5000;\n\ninterface Mount {\n\tpoint: string;\n\ttarget: string;\n}\n\nfunction parseMounts(output: string): Mount[] {\n\tconst mounts: Mount[] = [];\n\tfor (const line of output.split(/\\r?\\n/)) {\n\t\tconst match = MOUNT_LINE.exec(line.trim());\n\t\t// Native file tools reach only Windows directories, which also skips virtual mounts.\n\t\tif (!match || !/^[a-z]:(?:[\\\\/]|$)/i.test(match[1])) continue;\n\t\tconst [, source, point] = match;\n\t\tmounts.push({ point, target: win32.normalize(source.length === 2 ? `${source}\\\\` : source) });\n\t}\n\t// The longest mount point wins, so /tmp is matched before /.\n\treturn mounts.sort((a, b) => b.point.length - a.point.length);\n}\n\nfunction readMounts(shellPath: string | undefined): Promise<Mount[]> {\n\treturn new Promise((resolve) => {\n\t\ttry {\n\t\t\tconst shell = getShellConfig(shellPath ? normalizePath(shellPath) : undefined);\n\t\t\t// Legacy WSL bash mounts live inside Linux; core already maps its /mnt/<drive> paths.\n\t\t\tif (shell.commandTransport === \"stdin\") return resolve([]);\n\t\t\texecFile(\n\t\t\t\tshell.shell,\n\t\t\t\t[...shell.args, \"mount\"],\n\t\t\t\t{ timeout: MOUNT_TIMEOUT_MS, windowsHide: true },\n\t\t\t\t(error, stdout) => resolve(error ? [] : parseMounts(stdout)),\n\t\t\t);\n\t\t} catch {\n\t\t\tresolve([]);\n\t\t}\n\t});\n}\n\nfunction toWindowsPath(path: string, mounts: readonly Mount[]): string | undefined {\n\tconst normalized = posix.normalize(path);\n\tconst mount = mounts.find(\n\t\t({ point }) => point === \"/\" || normalized === point || normalized.startsWith(`${point}/`),\n\t);\n\treturn mount && win32.join(mount.target, posix.relative(mount.point, normalized));\n}\n\n/**\n * Bash on Windows reports paths under its own mount table (`/tmp`, `/usr`, ...), which native file\n * tools would otherwise resolve against the current drive root. Rewrite them to the Windows\n * directories bash means. Drive paths such as `/c/...` stay with core path normalization.\n */\nexport default function shellPathsExtension(pi: ExtensionAPI): void {\n\tif (process.platform !== \"win32\") return;\n\tconst mountsByShellPath = new Map<string | undefined, Promise<Mount[]>>();\n\n\tfunction getMounts(): Promise<Mount[]> {\n\t\tconst shellPath = pi.getSettings().shellPath;\n\t\tlet mounts = mountsByShellPath.get(shellPath);\n\t\tif (!mounts) {\n\t\t\tmounts = readMounts(shellPath);\n\t\t\tmountsByShellPath.set(shellPath, mounts);\n\t\t}\n\t\treturn mounts;\n\t}\n\n\tpi.on(\"tool_call\", async (event) => {\n\t\tif (!PATH_TOOLS.has(event.toolName)) return;\n\t\tconst input = event.input as { path?: unknown };\n\t\tconst path = input.path;\n\t\tif (typeof path !== \"string\" || !path.startsWith(\"/\") || path.startsWith(\"//\")) return;\n\t\tif (normalizeWindowsShellPath(path) !== path) return;\n\t\tconst windowsPath = toWindowsPath(path, await getMounts());\n\t\tif (windowsPath) input.path = windowsPath;\n\t});\n}\n"]}

package/dist/modes/interactive/chat-viewport.d.ts

@@ -1,6 +1,8 @@
 import { type Component, ScrollView, type ScrollViewScrollbar } from "@earendil-works/pi-tui";
+import type { TranscriptLayoutContainer } from "./transcript-layout.ts";
 export interface ChatViewportOptions {
-    readonly document: Component;
+    readonly document: TranscriptLayoutContainer;
+    readonly chat: TranscriptLayoutContainer;
     readonly pendingMessages: Component;
     readonly status: Component;
     readonly editor: Component;
@@ -10,11 +12,12 @@ export interface ChatViewportOptions {
     readonly scrollbar?: ScrollViewScrollbar;
     readonly scrollbarTrackStyle?: (text: string) => string;
     readonly scrollbarThumbStyle?: (text: string) => string;
+    readonly outputPad?: () => number;
 }
 export interface ChatViewport {
     readonly root: Component;
     readonly transcript: ScrollView;
 }
-/** Shared fullscreen transcript and fixed input-dock layout. */
+/** Shared fullscreen transcript, sticky prompt, and fixed input-dock layout. */
 export declare function createChatViewport(options: ChatViewportOptions): ChatViewport;
 //# sourceMappingURL=chat-viewport.d.ts.map

package/dist/modes/interactive/chat-viewport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-viewport.d.ts","sourceRoot":"","sources":["../../../src/modes/interactive/chat-viewport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,UAAU,EAAE,KAAK,mBAAmB,EAAU,MAAM,wBAAwB,CAAC;AAEtG,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,SAAS,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,CAAC;IAClC,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,CAAC;IAClC,QAAQ,CAAC,SAAS,CAAC,EAAE,mBAAmB,CAAC;IACzC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACxD,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CACxD;AAED,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;CAChC;AAED,gEAAgE;AAChE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,YAAY,CAwB7E"}
+{"version":3,"file":"chat-viewport.d.ts","sourceRoot":"","sources":["../../../src/modes/interactive/chat-viewport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,UAAU,EAAE,KAAK,mBAAmB,EAAkB,MAAM,wBAAwB,CAAC;AAO9G,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAExE,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,QAAQ,EAAE,yBAAyB,CAAC;IAC7C,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC;IACzC,QAAQ,CAAC,eAAe,EAAE,SAAS,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,CAAC;IAClC,QAAQ,CAAC,YAAY,CAAC,EAAE,SAAS,CAAC;IAClC,QAAQ,CAAC,SAAS,CAAC,EAAE,mBAAmB,CAAC;IACzC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACxD,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACxD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,MAAM,CAAC;CAClC;AAED,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;CAChC;AA+ED,gFAAgF;AAChF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,YAAY,CAiB7E"}

package/dist/modes/interactive/chat-viewport.js

@@ -1,14 +1,74 @@
-import { ScrollView, VStack } from "@earendil-works/pi-tui";
-/** Shared fullscreen transcript and fixed input-dock layout. */
+import { ScrollView, Spacer, VStack } from "@earendil-works/pi-tui";
+import { findStickyUserMessage, StickyUserMessageComponent, } from "./components/sticky-user-message.js";
+import { UserMessageComponent } from "./components/user-message.js";
+class TranscriptScrollView extends ScrollView {
+    updateLayout(contentHeight, viewportHeight, requestRender) {
+        super.updateLayout(contentHeight, viewportHeight, requestRender);
+        this.onLayout?.(requestRender);
+    }
+}
+class ChatTranscriptView {
+    constructor(options) {
+        this.padding = new Spacer(1);
+        this.paddingTop = 1;
+        this.document = options.document;
+        this.chat = options.chat;
+        this.sticky = new StickyUserMessageComponent(options.outputPad ?? (() => 1), (row) => this.scrollView.scrollTo(row));
+        const content = new VStack([this.padding, this.document]);
+        this.scrollView = new TranscriptScrollView(content, {
+            follow: "end",
+            primary: true,
+            overscroll: "chain",
+            scrollbar: options.scrollbar ?? "auto",
+            ...(options.scrollbarTrackStyle === undefined ? {} : { scrollbarTrackStyle: options.scrollbarTrackStyle }),
+            ...(options.scrollbarThumbStyle === undefined ? {} : { scrollbarThumbStyle: options.scrollbarThumbStyle }),
+        });
+        this.scrollView.onLayout = (requestRender) => {
+            if (this.updateStickyMessage())
+                requestRender();
+        };
+        this.root = new VStack([
+            { component: this.sticky, shrink: 0, minSize: 0 },
+            { component: this.scrollView, basis: 0, grow: 1, shrink: 1, minSize: 1 },
+        ]);
+    }
+    updateStickyMessage() {
+        const judgment = this.scrollView.viewportHeight < 2
+            ? undefined
+            : findStickyUserMessage(this.getUserMessageAnchors(), this.scrollView.scrollTop - 1);
+        const paddingTop = judgment ? 0 : 1;
+        let changed = this.sticky.setJudgment(judgment);
+        if (paddingTop !== this.paddingTop) {
+            this.paddingTop = paddingTop;
+            this.padding.setLines(paddingTop);
+            changed = true;
+        }
+        return changed;
+    }
+    getUserMessageAnchors() {
+        const documentLayout = this.document.getRenderedLayout();
+        const chatLayout = this.chat.getRenderedLayout();
+        const chatRow = documentLayout?.children.find((child) => child.component === this.chat)?.row;
+        if (chatRow === undefined || !chatLayout)
+            return [];
+        const anchors = [];
+        for (const child of chatLayout.children) {
+            if (!(child.component instanceof UserMessageComponent))
+                continue;
+            const summary = child.component.getNavigationSummary();
+            if (!summary)
+                continue;
+            anchors.push({
+                row: chatRow + child.row + child.component.getNavigationAnchorOffset(chatLayout.width),
+                summary,
+            });
+        }
+        return anchors;
+    }
+}
+/** Shared fullscreen transcript, sticky prompt, and fixed input-dock layout. */
 export function createChatViewport(options) {
-    const transcript = new ScrollView(options.document, {
-        follow: "end",
-        primary: true,
-        overscroll: "chain",
-        scrollbar: options.scrollbar ?? "auto",
-        ...(options.scrollbarTrackStyle === undefined ? {} : { scrollbarTrackStyle: options.scrollbarTrackStyle }),
-        ...(options.scrollbarThumbStyle === undefined ? {} : { scrollbarThumbStyle: options.scrollbarThumbStyle }),
-    });
+    const transcriptView = new ChatTranscriptView(options);
     const dock = new VStack([
         { component: options.pendingMessages, shrink: 1, minSize: 0 },
         { component: options.status, shrink: 1, minSize: 0 },
@@ -18,9 +78,9 @@ export function createChatViewport(options) {
         { component: options.footer, shrink: 1, minSize: 0 },
     ]);
     return {
-        transcript,
+        transcript: transcriptView.scrollView,
         root: new VStack([
-            { component: transcript, basis: 0, grow: 1, shrink: 1, minSize: 1 },
+            { component: transcriptView.root, basis: 0, grow: 1, shrink: 1, minSize: 1 },
             { component: dock, basis: "auto", grow: 0, shrink: 1, minSize: 1 },
         ]),
     };

package/dist/modes/interactive/chat-viewport.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat-viewport.js","sourceRoot":"","sources":["../../../src/modes/interactive/chat-viewport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,UAAU,EAA4B,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAoBtG,gEAAgE;AAChE,MAAM,UAAU,kBAAkB,CAAC,OAA4B;IAC9D,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE;QACnD,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,OAAO;QACnB,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,MAAM;QACtC,GAAG,CAAC,OAAO,CAAC,mBAAmB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAC1G,GAAG,CAAC,OAAO,CAAC,mBAAmB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,EAAE,CAAC;KAC1G,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,IAAI,MAAM,CAAC;QACvB,EAAE,SAAS,EAAE,OAAO,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE;QAC7D,EAAE,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE;QACpD,GAAG,CAAC,OAAO,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3G,EAAE,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE;QACpD,GAAG,CAAC,OAAO,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3G,EAAE,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE;KACpD,CAAC,CAAC;IACH,OAAO;QACN,UAAU;QACV,IAAI,EAAE,IAAI,MAAM,CAAC;YAChB,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE;YACnE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE;SAClE,CAAC;KACF,CAAC;AACH,CAAC","sourcesContent":["import { type Component, ScrollView, type ScrollViewScrollbar, VStack } from \"@earendil-works/pi-tui\";\n\nexport interface ChatViewportOptions {\n\treadonly document: Component;\n\treadonly pendingMessages: Component;\n\treadonly status: Component;\n\treadonly editor: Component;\n\treadonly footer: Component;\n\treadonly widgetsAbove?: Component;\n\treadonly widgetsBelow?: Component;\n\treadonly scrollbar?: ScrollViewScrollbar;\n\treadonly scrollbarTrackStyle?: (text: string) => string;\n\treadonly scrollbarThumbStyle?: (text: string) => string;\n}\n\nexport interface ChatViewport {\n\treadonly root: Component;\n\treadonly transcript: ScrollView;\n}\n\n/** Shared fullscreen transcript and fixed input-dock layout. */\nexport function createChatViewport(options: ChatViewportOptions): ChatViewport {\n\tconst transcript = new ScrollView(options.document, {\n\t\tfollow: \"end\",\n\t\tprimary: true,\n\t\toverscroll: \"chain\",\n\t\tscrollbar: options.scrollbar ?? \"auto\",\n\t\t...(options.scrollbarTrackStyle === undefined ? {} : { scrollbarTrackStyle: options.scrollbarTrackStyle }),\n\t\t...(options.scrollbarThumbStyle === undefined ? {} : { scrollbarThumbStyle: options.scrollbarThumbStyle }),\n\t});\n\tconst dock = new VStack([\n\t\t{ component: options.pendingMessages, shrink: 1, minSize: 0 },\n\t\t{ component: options.status, shrink: 1, minSize: 0 },\n\t\t...(options.widgetsAbove === undefined ? [] : [{ component: options.widgetsAbove, shrink: 1, minSize: 0 }]),\n\t\t{ component: options.editor, shrink: 1, minSize: 3 },\n\t\t...(options.widgetsBelow === undefined ? [] : [{ component: options.widgetsBelow, shrink: 1, minSize: 0 }]),\n\t\t{ component: options.footer, shrink: 1, minSize: 0 },\n\t]);\n\treturn {\n\t\ttranscript,\n\t\troot: new VStack([\n\t\t\t{ component: transcript, basis: 0, grow: 1, shrink: 1, minSize: 1 },\n\t\t\t{ component: dock, basis: \"auto\", grow: 0, shrink: 1, minSize: 1 },\n\t\t]),\n\t};\n}\n"]}
+{"version":3,"file":"chat-viewport.js","sourceRoot":"","sources":["../../../src/modes/interactive/chat-viewport.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Component, ScrollView, type ScrollViewScrollbar, Spacer, VStack } from \"@earendil-works/pi-tui\";\nimport {\n\tfindStickyUserMessage,\n\ttype StickyUserMessageAnchor,\n\tStickyUserMessageComponent,\n} from \"./components/sticky-user-message.ts\";\nimport { UserMessageComponent } from \"./components/user-message.ts\";\nimport type { TranscriptLayoutContainer } from \"./transcript-layout.ts\";\n\nexport interface ChatViewportOptions {\n\treadonly document: TranscriptLayoutContainer;\n\treadonly chat: TranscriptLayoutContainer;\n\treadonly pendingMessages: Component;\n\treadonly status: Component;\n\treadonly editor: Component;\n\treadonly footer: Component;\n\treadonly widgetsAbove?: Component;\n\treadonly widgetsBelow?: Component;\n\treadonly scrollbar?: ScrollViewScrollbar;\n\treadonly scrollbarTrackStyle?: (text: string) => string;\n\treadonly scrollbarThumbStyle?: (text: string) => string;\n\treadonly outputPad?: () => number;\n}\n\nexport interface ChatViewport {\n\treadonly root: Component;\n\treadonly transcript: ScrollView;\n}\n\nclass TranscriptScrollView extends ScrollView {\n\tonLayout: ((requestRender: () => void) => void) | undefined;\n\n\toverride updateLayout(contentHeight: number, viewportHeight: number, requestRender: () => void): void {\n\t\tsuper.updateLayout(contentHeight, viewportHeight, requestRender);\n\t\tthis.onLayout?.(requestRender);\n\t}\n}\n\nclass ChatTranscriptView {\n\treadonly root: VStack;\n\treadonly scrollView: TranscriptScrollView;\n\tprivate readonly document: TranscriptLayoutContainer;\n\tprivate readonly chat: TranscriptLayoutContainer;\n\tprivate readonly padding = new Spacer(1);\n\tprivate readonly sticky: StickyUserMessageComponent;\n\tprivate paddingTop = 1;\n\n\tconstructor(options: ChatViewportOptions) {\n\t\tthis.document = options.document;\n\t\tthis.chat = options.chat;\n\t\tthis.sticky = new StickyUserMessageComponent(options.outputPad ?? (() => 1), (row) =>\n\t\t\tthis.scrollView.scrollTo(row),\n\t\t);\n\t\tconst content = new VStack([this.padding, this.document]);\n\t\tthis.scrollView = new TranscriptScrollView(content, {\n\t\t\tfollow: \"end\",\n\t\t\tprimary: true,\n\t\t\toverscroll: \"chain\",\n\t\t\tscrollbar: options.scrollbar ?? \"auto\",\n\t\t\t...(options.scrollbarTrackStyle === undefined ? {} : { scrollbarTrackStyle: options.scrollbarTrackStyle }),\n\t\t\t...(options.scrollbarThumbStyle === undefined ? {} : { scrollbarThumbStyle: options.scrollbarThumbStyle }),\n\t\t});\n\t\tthis.scrollView.onLayout = (requestRender) => {\n\t\t\tif (this.updateStickyMessage()) requestRender();\n\t\t};\n\t\tthis.root = new VStack([\n\t\t\t{ component: this.sticky, shrink: 0, minSize: 0 },\n\t\t\t{ component: this.scrollView, basis: 0, grow: 1, shrink: 1, minSize: 1 },\n\t\t]);\n\t}\n\n\tprivate updateStickyMessage(): boolean {\n\t\tconst judgment =\n\t\t\tthis.scrollView.viewportHeight < 2\n\t\t\t\t? undefined\n\t\t\t\t: findStickyUserMessage(this.getUserMessageAnchors(), this.scrollView.scrollTop - 1);\n\t\tconst paddingTop = judgment ? 0 : 1;\n\t\tlet changed = this.sticky.setJudgment(judgment);\n\t\tif (paddingTop !== this.paddingTop) {\n\t\t\tthis.paddingTop = paddingTop;\n\t\t\tthis.padding.setLines(paddingTop);\n\t\t\tchanged = true;\n\t\t}\n\t\treturn changed;\n\t}\n\n\tprivate getUserMessageAnchors(): StickyUserMessageAnchor[] {\n\t\tconst documentLayout = this.document.getRenderedLayout();\n\t\tconst chatLayout = this.chat.getRenderedLayout();\n\t\tconst chatRow = documentLayout?.children.find((child) => child.component === this.chat)?.row;\n\t\tif (chatRow === undefined || !chatLayout) return [];\n\n\t\tconst anchors: StickyUserMessageAnchor[] = [];\n\t\tfor (const child of chatLayout.children) {\n\t\t\tif (!(child.component instanceof UserMessageComponent)) continue;\n\t\t\tconst summary = child.component.getNavigationSummary();\n\t\t\tif (!summary) continue;\n\t\t\tanchors.push({\n\t\t\t\trow: chatRow + child.row + child.component.getNavigationAnchorOffset(chatLayout.width),\n\t\t\t\tsummary,\n\t\t\t});\n\t\t}\n\t\treturn anchors;\n\t}\n}\n\n/** Shared fullscreen transcript, sticky prompt, and fixed input-dock layout. */\nexport function createChatViewport(options: ChatViewportOptions): ChatViewport {\n\tconst transcriptView = new ChatTranscriptView(options);\n\tconst dock = new VStack([\n\t\t{ component: options.pendingMessages, shrink: 1, minSize: 0 },\n\t\t{ component: options.status, shrink: 1, minSize: 0 },\n\t\t...(options.widgetsAbove === undefined ? [] : [{ component: options.widgetsAbove, shrink: 1, minSize: 0 }]),\n\t\t{ component: options.editor, shrink: 1, minSize: 3 },\n\t\t...(options.widgetsBelow === undefined ? [] : [{ component: options.widgetsBelow, shrink: 1, minSize: 0 }]),\n\t\t{ component: options.footer, shrink: 1, minSize: 0 },\n\t]);\n\treturn {\n\t\ttranscript: transcriptView.scrollView,\n\t\troot: new VStack([\n\t\t\t{ component: transcriptView.root, basis: 0, grow: 1, shrink: 1, minSize: 1 },\n\t\t\t{ component: dock, basis: \"auto\", grow: 0, shrink: 1, minSize: 1 },\n\t\t]),\n\t};\n}\n"]}

package/dist/modes/interactive/components/config-selector.d.ts

@@ -2,8 +2,8 @@
  * TUI component for managing package resources (enable/disable)
  */
 import { type Component, Container, type Focusable } from "@earendil-works/pi-tui";
-import type { PathMetadata, ResolvedPaths } from "../../../core/package-manager.ts";
-import type { SettingsManager, SkillInvocationOverride } from "../../../core/settings-manager.ts";
+import { type PathMetadata, type ResolvedPaths } from "../../../core/package-manager.ts";
+import type { SettingsManager } from "../../../core/settings-manager.ts";
 type ResourceType = "extensions" | "skills" | "prompts" | "themes";
 type ConfigWriteScope = "global" | "project";
 export type ScopedResolvedPaths = Record<ConfigWriteScope, ResolvedPaths>;
@@ -15,7 +15,6 @@ interface ResourceItem {
     displayName: string;
     groupKey: string;
     subgroupKey: string;
-    skillInvocationOverride?: SkillInvocationOverride;
     frontmatterDisableModelInvocation?: boolean;
 }
 interface ResourceSubgroup {
@@ -43,7 +42,8 @@ declare class ResourceList implements Component, Focusable {
     private agentDir;
     private writeScope;
     private inheritedEnabledByKey;
-    private inheritedSkillStateByKey;
+    private packageManager;
+    private skillInvocation;
     onCancel?: () => void;
     onExit?: () => void;
     onToggle?: (item: ResourceItem, newEnabled: boolean) => void;
@@ -55,7 +55,6 @@ declare class ResourceList implements Component, Focusable {
     setWriteScope(writeScope: ConfigWriteScope): void;
     private get groups();
     private buildInheritedEnabledMap;
-    private buildInheritedSkillStateMap;
     private buildFlatList;
     private findNextItem;
     private filterItems;
@@ -69,15 +68,16 @@ declare class ResourceList implements Component, Focusable {
     private togglePackageResource;
     private setGlobalSkillEffectiveState;
     private setProjectSkillOverride;
+    /** Runs after the load write, which creates the package entry a project override needs. */
     private setSkillInvocationOverride;
     private renderCheckbox;
     private getItemSuffix;
     private isDimmedItem;
+    /** The state settings give a skill in the current mode; global mode ignores project settings. */
     private getSkillEffectiveState;
     private getInheritedSkillEffectiveState;
     private getNextProjectSkillOverrideState;
     private getProjectSkillOverrideState;
-    private getSkillInvocationOverrideFromMap;
     private setProjectResourceOverride;
     private setProjectTopLevelOverride;
     private setProjectTopLevelPaths;
@@ -90,7 +90,8 @@ declare class ResourceList implements Component, Focusable {
     private getTopLevelOverridePatterns;
     private getResourcePatternForScope;
     private createPackageOverrideSource;
-    private packageSourceStringMatches;
+    /** Package entries match by the identity package loading dedupes on, so `npm:pkg@1` and `npm:pkg` are one package. */
+    private isSamePackage;
     private findMatchingPackageSource;
     private getPatternEntryTarget;
     private getResourceItemKey;
@@ -98,7 +99,8 @@ declare class ResourceList implements Component, Focusable {
     private getTopLevelBaseDir;
     private getResourcePattern;
     private getPackageResourcePattern;
-    private getPackageSkillInvocationOverridePatterns;
+    /** Package filter entries that name an item; a skill can also be named by its absolute path or directory. */
+    private getPackageOverridePatterns;
 }
 export declare class ConfigSelectorComponent extends Container implements Focusable {
     private header;

package/dist/modes/interactive/components/config-selector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-selector.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/components/config-selector.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EACN,KAAK,SAAS,EACd,SAAS,EACT,KAAK,SAAS,EAOd,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAoB,MAAM,kCAAkC,CAAC;AACtG,OAAO,KAAK,EAEX,eAAe,EACf,uBAAuB,EAEvB,MAAM,mCAAmC,CAAC;AAoB3C,KAAK,YAAY,GAAG,YAAY,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAC;AACnE,KAAK,gBAAgB,GAAG,QAAQ,GAAG,SAAS,CAAC;AAI7C,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;AAW1E,UAAU,YAAY;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAClD,iCAAiC,CAAC,EAAE,OAAO,CAAC;CAC5C;AAED,UAAU,gBAAgB;IACzB,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,YAAY,EAAE,CAAC;CACtB;AAED,UAAU,aAAa;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,CAAC;IACxC,MAAM,EAAE,SAAS,GAAG,WAAW,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,gBAAgB,EAAE,CAAC;CAC9B;AAqKD,cAAM,YAAa,YAAW,SAAS,EAAE,SAAS;IACjD,OAAO,CAAC,aAAa,CAA4C;IACjE,OAAO,CAAC,SAAS,CAAmB;IACpC,OAAO,CAAC,aAAa,CAAmB;IACxC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,UAAU,CAAmB;IACrC,OAAO,CAAC,qBAAqB,CAAuB;IACpD,OAAO,CAAC,wBAAwB,CAAmC;IAE5D,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7D,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;IAEjC,OAAO,CAAC,QAAQ,CAAS;IACzB,IAAI,OAAO,IAAI,OAAO,CAErB;IACD,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAGzB;gBAGA,aAAa,EAAE,MAAM,CAAC,gBAAgB,EAAE,aAAa,EAAE,CAAC,EACxD,eAAe,EAAE,eAAe,EAChC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,MAAM,EACvB,UAAU,GAAE,gBAA2B;IAiBxC,aAAa,CAAC,UAAU,EAAE,gBAAgB,GAAG,IAAI;IAMjD,OAAO,KAAK,MAAM,GAEjB;IAED,OAAO,CAAC,wBAAwB;IAYhC,OAAO,CAAC,2BAA2B;IAanC,OAAO,CAAC,aAAa;IAgBrB,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,WAAW;IAmDnB,OAAO,CAAC,eAAe;IAKvB,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAoBtD,UAAU,IAAI,IAAI;IAElB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;IA4D/B,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IA8D/B,OAAO,CAAC,cAAc;IAkCtB,OAAO,CAAC,sBAAsB;IAgD9B,OAAO,CAAC,qBAAqB;IA2D7B,OAAO,CAAC,4BAA4B;IAWpC,OAAO,CAAC,uBAAuB;IAW/B,OAAO,CAAC,0BAA0B;IA6DlC,OAAO,CAAC,cAAc;IA+BtB,OAAO,CAAC,aAAa;IAoBrB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,+BAA+B;IAWvC,OAAO,CAAC,gCAAgC;IAWxC,OAAO,CAAC,4BAA4B;IAoCpC,OAAO,CAAC,iCAAiC;IAWzC,OAAO,CAAC,0BAA0B;IAMlC,OAAO,CAAC,0BAA0B;IAoBlC,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,yBAAyB;IAsCjC,OAAO,CAAC,oBAAoB;IAQ5B,OAAO,CAAC,uBAAuB;IAoB/B,OAAO,CAAC,2BAA2B;IAenC,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,2BAA2B;IAiBnC,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,0BAA0B;IAalC,OAAO,CAAC,yBAAyB;IAejC,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,yBAAyB;IAKjC,OAAO,CAAC,yCAAyC;CASjD;AAED,qBAAa,uBAAwB,SAAQ,SAAU,YAAW,SAAS;IAC1E,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,UAAU,CAAmB;IAErC,OAAO,CAAC,QAAQ,CAAS;IACzB,IAAI,OAAO,IAAI,OAAO,CAErB;IACD,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAGzB;gBAGA,aAAa,EAAE,mBAAmB,EAClC,eAAe,EAAE,eAAe,EAChC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,IAAI,EACnB,MAAM,EAAE,MAAM,IAAI,EAClB,aAAa,EAAE,MAAM,IAAI,EACzB,cAAc,CAAC,EAAE,MAAM,EACvB,UAAU,GAAE,gBAA2B,EACvC,oBAAoB,UAAO;IA2C5B,OAAO,CAAC,gBAAgB;IAMxB,eAAe,IAAI,YAAY;CAG/B"}
+{"version":3,"file":"config-selector.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/components/config-selector.ts"],"names":[],"mappings":"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"}