@alexleekt/pi-ask-user-glimpse 0.3.2 → 0.4.1

package/index.ts

@@ -4,15 +4,36 @@
 
 import {
     type CustomJournalEntry,
-    isCustomEntry,
+    isCustomEntry as _isCustomEntry,
 } from "@alexleekt/pi-shared/types";
+
+/* ── Defensive: isCustomEntry may resolve to undefined in some jiti cache states ── */
+const isCustomEntry: typeof _isCustomEntry =
+    typeof _isCustomEntry === "function"
+        ? _isCustomEntry
+        : (e: unknown): e is CustomJournalEntry => {
+              if (!e || typeof e !== "object") return false;
+              const entry = e as Record<string, unknown>;
+              return (
+                  entry.type === "custom" &&
+                  typeof entry.customType === "string" &&
+                  typeof entry.data === "object" &&
+                  entry.data !== null
+              );
+          };
 import { StringEnum, Type } from "@earendil-works/pi-ai";
 import type {
     BuildSystemPromptOptions,
     ExtensionAPI,
+    ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
 import { defineTool } from "@earendil-works/pi-coding-agent";
 import { type AskUserParams, askUserHandler } from "./tool/ask-user.js";
+import type { AnimationLevel, ThemeMode } from "./shared/ask-user.js";
+import { PROTECTED_ABBREVIATIONS } from "./constants/abbreviations.js";
+
+/* ── Module-level reference to ExtensionAPI for tool execute closure ── */
+let _pi: ExtensionAPI | undefined;
 
 /* ── Generic question-session detection ── */
 
@@ -70,50 +91,142 @@ function getStyleMode(entries: unknown[]): boolean | null {
     return typeof enabled === "boolean" ? enabled : null;
 }
 
+function getThemeSettings(entries: unknown[]): { theme?: ThemeMode; animationLevel?: AnimationLevel } {
+    const entry = entries.find(
+        (e): e is CustomJournalEntry =>
+            isCustomEntry(e) && e.customType === "ask-user-theme",
+    );
+    const data = entry?.data as Record<string, unknown> | undefined;
+    const theme = typeof data?.theme === "string" ? data.theme : undefined;
+    const animationLevel = typeof data?.animationLevel === "string" ? data.animationLevel : undefined;
+    return {
+        theme: theme === "light" || theme === "dark" || theme === "system" ? theme : undefined,
+        animationLevel: animationLevel === "none" || animationLevel === "minimal" || animationLevel === "all" ? animationLevel : undefined,
+    };
+}
+
+/* ── Shared helpers for consistent ask_user UX across all entry points ── */
+
+/** Enrich raw ask_user params with persisted theme/animation settings. */
+function enrichWithThemeSettings(
+    params: AskUserParams,
+    entries: unknown[],
+): AskUserParams {
+    const { theme, animationLevel } = getThemeSettings(entries);
+    return { ...params, theme, animationLevel };
+}
+
+/** Build a metadata saver that writes theme changes back to the session journal. */
+function createThemeSaver(): (metadata: import("./tool/ask-user.js").AskUserMetadata) => void {
+    return (metadata) => {
+        if ((metadata.theme || metadata.animationLevel) && _pi) {
+            _pi.appendEntry("ask-user-theme", {
+                theme: metadata.theme,
+                animationLevel: metadata.animationLevel,
+            });
+        }
+    };
+}
+
+/** Execute ask_user with full enrichment + persistence, used by tool and commands alike. */
+async function runAskUserWithTheme(
+    rawParams: AskUserParams,
+    signal: AbortSignal | undefined,
+    ctx: ExtensionContext,
+): Promise<ReturnType<typeof askUserHandler>> {
+    const entries = ctx.sessionManager.getEntries();
+    const params = enrichWithThemeSettings(rawParams, entries);
+    const saveTheme = createThemeSaver();
+    let metadata: import("./tool/ask-user.js").AskUserMetadata = {};
+
+    // Capture the agent's preceding message as additional context
+    const preamble = buildAgentPreamble(params, entries);
+    const enrichedParams: AskUserParams = preamble
+        ? {
+              ...params,
+              context: params.context
+                  ? `${preamble}\n\n---\n\n${params.context}`
+                  : preamble,
+          }
+        : params;
+
+    const result = await askUserHandler(enrichedParams, signal, ctx, (m) => {
+        metadata = m;
+    });
+    saveTheme(metadata);
+    return result;
+}
+
+/** Extract plain text from a Pi journal assistant entry. */
 function extractTextFromAssistantEntry(entry: unknown): string {
-    const message = (entry as unknown as Record<string, unknown>)?.message;
-    const content = (message as unknown as Record<string, unknown>)?.content;
+    if (!entry || typeof entry !== "object") return "";
+    const e = entry as Record<string, unknown>;
+    const message = e.message;
+    if (!message || typeof message !== "object") return "";
+    const msg = message as Record<string, unknown>;
+
+    const content = msg.content;
     if (typeof content === "string") return content;
     if (!Array.isArray(content)) return "";
+
     return content
         .filter(
             (c): c is { type: string; text: string } =>
-                typeof (c as Record<string, unknown>)?.type === "string" &&
-                typeof (c as Record<string, unknown>)?.text === "string",
+                typeof c === "object" &&
+                c !== null &&
+                typeof (c as Record<string, unknown>).type === "string" &&
+                typeof (c as Record<string, unknown>).text === "string",
         )
         .map((c) => c.text)
         .join("\n");
 }
 
-/* ── /ask-last: extract questions & implicit requests ── */
-
-const PROTECTED_ABBREVIATIONS = new Set([
-    "etc",
-    "vs",
-    "fig",
-    "dr",
-    "mr",
-    "mrs",
-    "ms",
-    "prof",
-    "jr",
-    "sr",
-    "inc",
-    "ltd",
-    "corp",
-    "co",
-    "llc",
-    "al",
-    "et",
-    "vol",
-    "vols",
-    "pg",
-    "pp",
-    "ch",
-    "chap",
-    "sec",
-    "secs",
-]);
+/** Find the most recent assistant entry in the session journal. */
+function findLastAssistantEntry(entries: unknown[]): unknown | undefined {
+    return [...entries].reverse().find((e) => {
+        if (!e || typeof e !== "object") return false;
+        const entry = e as unknown as Record<string, unknown>;
+        const msg = entry.message;
+        if (!msg || typeof msg !== "object" || msg === null) return false;
+        return (msg as Record<string, unknown>).role === "assistant";
+    });
+}
+
+/**
+ * Extract the agent's introductory text from the most recent assistant
+ * message, excluding text that is already duplicated in the question or
+ * context fields.
+ */
+function buildAgentPreamble(
+    params: AskUserParams,
+    entries: unknown[],
+): string | undefined {
+    const lastAssistant = findLastAssistantEntry(entries);
+    if (!lastAssistant) return undefined;
+
+    const text = extractTextFromAssistantEntry(lastAssistant).trim();
+    if (!text) return undefined;
+
+    const question = params.question.trim();
+
+    // Skip if the assistant text is just the question itself
+    if (text === question) return undefined;
+
+    // If the text ends with the question, take only the prefix
+    if (text.endsWith(question)) {
+        const prefix = text.slice(0, text.length - question.length).trim();
+        return prefix || undefined;
+    }
+
+    // Skip if the assistant text is already fully contained in the context
+    if (params.context?.trim().includes(text)) return undefined;
+
+    return text;
+}
+
+/* ── /ask: extract questions & implicit requests ── */
+
+
 
 function splitSentences(text: string): string[] {
     const PLACEHOLDER = "\x00";
@@ -171,7 +284,7 @@ function extractQuestions(text: string): string[] {
         if (sentence.endsWith("?")) {
             if (hasQuotedQuestion(sentence)) continue;
             if (looksLikeTernary(sentence)) continue;
-            if (sentence.length < 10) continue;
+            if (sentence.length < 3) continue;
             explicit.push(sentence);
             continue;
         }
@@ -449,11 +562,12 @@ const askUserTool = defineTool({
     }),
 
     async execute(_toolCallId, params, signal, _onUpdate, ctx) {
-        return askUserHandler(params, signal, ctx);
+        return runAskUserWithTheme(params, signal, ctx);
     },
 });
 
 export default function (pi: ExtensionAPI) {
+    _pi = pi;
     pi.registerTool(askUserTool);
 
     // ── Auto-detect question sessions and force ask_user usage ──
@@ -502,26 +616,19 @@ export default function (pi: ExtensionAPI) {
         },
     });
 
-    pi.registerCommand("ask-last", {
+    pi.registerCommand("ask", {
         description:
             "Extract questions from the last assistant message and ask them via ask_user",
         handler: async (_args, ctx) => {
             if (!ctx.hasUI) {
                 console.warn(
-                    "[pi-ask-user-glimpse] ask-last requires interactive mode",
+                    "[pi-ask-user-glimpse] /ask requires interactive mode",
                 );
                 return;
             }
 
             const entries = ctx.sessionManager.getEntries();
-            const lastAssistant = [...entries].reverse().find((e) => {
-                const msg = (e as unknown as Record<string, unknown>).message;
-                return (
-                    typeof msg === "object" &&
-                    msg !== null &&
-                    (msg as Record<string, unknown>).role === "assistant"
-                );
-            });
+            const lastAssistant = findLastAssistantEntry(entries);
 
             if (!lastAssistant) {
                 ctx.ui.notify(
@@ -542,7 +649,7 @@ export default function (pi: ExtensionAPI) {
 
             const questions = extractQuestions(fullText);
 
-            const result = await askUserHandler(
+            const result = await runAskUserWithTheme(
                 buildAskLastParams(questions, fullText),
                 undefined,
                 ctx,
@@ -591,7 +698,7 @@ export default function (pi: ExtensionAPI) {
             const params = buildDebugParams(mode);
             if (!params) return;
 
-            const result = await askUserHandler(params, undefined, ctx);
+            const result = await runAskUserWithTheme(params, undefined, ctx);
             const textContent = result.content[0];
             const text =
                 textContent.type === "text" ? textContent.text : "No response";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alexleekt/pi-ask-user-glimpse",
-    "version": "0.3.2",
+    "version": "0.4.1",
     "description": "Pi extension that replaces ask_user with rich native WebView dialogs via glimpseui and shadcn/ui",
     "type": "module",
     "keywords": [
@@ -30,6 +30,7 @@
     },
     "files": [
         "index.ts",
+        "constants",
         "tool",
         "fallback",
         "shared",
@@ -49,7 +50,8 @@
         "prepack": "npm run build",
         "dev:webview": "npx vite --config ./webview/vite.config.ts",
         "validate": "npx tsx scripts/validate.ts",
-        "validate:gui": "npx tsx scripts/validate.ts --gui"
+        "validate:gui": "npx tsx scripts/validate.ts --gui",
+        "test:with-context": "npx tsx scripts/test-with-context.ts"
     },
     "dependencies": {
         "@alexleekt/pi-shared": "^0.1.0",

package/shared/ask-user.ts

@@ -18,6 +18,9 @@ export interface Question {
     allowMultiple?: boolean;
 }
 
+export type ThemeMode = "light" | "dark" | "system";
+export type AnimationLevel = "none" | "minimal" | "all";
+
 export interface AskUserPayload {
     type: "single-select" | "multi-select" | "questionnaire" | "freeform";
     question: string;
@@ -28,6 +31,9 @@ export interface AskUserPayload {
     allowFreeform: boolean;
     allowComment: boolean;
     allowSkip?: boolean;
+    sessionName?: string;
+    theme?: ThemeMode;
+    animationLevel?: AnimationLevel;
 }
 
 export interface QuestionnaireDetail {

package/tool/ask-user.ts

@@ -5,299 +5,13 @@ import { fileURLToPath } from "node:url";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { prompt } from "glimpseui";
 import { terminalPrompt } from "../fallback/terminal-prompt.js";
-import type { AskUserPayload, Question } from "../shared/ask-user.js";
+import type { AnimationLevel, AskUserPayload, Question, ThemeMode } from "../shared/ask-user.js";
 import { formatResponse } from "./response-formatter.js";
 
 const _require = createRequire(import.meta.url);
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
-/** ~100 common English stopwords for title extraction. */
-const STOPWORDS = new Set([
-    "a",
-    "an",
-    "the",
-    "is",
-    "are",
-    "was",
-    "were",
-    "be",
-    "been",
-    "being",
-    "have",
-    "has",
-    "had",
-    "do",
-    "does",
-    "did",
-    "will",
-    "would",
-    "could",
-    "should",
-    "may",
-    "might",
-    "must",
-    "shall",
-    "can",
-    "need",
-    "ought",
-    "used",
-    "to",
-    "of",
-    "in",
-    "for",
-    "on",
-    "with",
-    "at",
-    "by",
-    "from",
-    "as",
-    "into",
-    "through",
-    "during",
-    "before",
-    "after",
-    "above",
-    "below",
-    "between",
-    "under",
-    "again",
-    "further",
-    "then",
-    "once",
-    "here",
-    "there",
-    "when",
-    "where",
-    "why",
-    "how",
-    "all",
-    "each",
-    "few",
-    "more",
-    "most",
-    "other",
-    "some",
-    "such",
-    "no",
-    "nor",
-    "not",
-    "only",
-    "own",
-    "same",
-    "so",
-    "than",
-    "too",
-    "very",
-    "just",
-    "and",
-    "but",
-    "if",
-    "or",
-    "because",
-    "until",
-    "while",
-    "which",
-    "what",
-    "who",
-    "whom",
-    "this",
-    "that",
-    "these",
-    "those",
-    "am",
-    "it",
-    "its",
-    "we",
-    "our",
-    "you",
-    "your",
-    "they",
-    "their",
-    "them",
-    "he",
-    "him",
-    "his",
-    "she",
-    "her",
-    "i",
-    "me",
-    "my",
-    "mine",
-    "us",
-    "any",
-    "both",
-    "either",
-    "neither",
-    "one",
-    "two",
-    "first",
-    "last",
-    "another",
-    "every",
-    "many",
-    "much",
-    "several",
-    "let",
-    "new",
-    "use",
-    "using",
-    "make",
-    "made",
-    "get",
-    "got",
-    "go",
-    "going",
-    "want",
-    "wanted",
-    "like",
-    "liked",
-    "know",
-    "knew",
-    "known",
-    "think",
-    "thought",
-    "see",
-    "saw",
-    "seen",
-    "come",
-    "came",
-    "give",
-    "gave",
-    "given",
-    "take",
-    "took",
-    "taken",
-    "find",
-    "found",
-    "say",
-    "said",
-    "tell",
-    "told",
-    "ask",
-    "asked",
-    "work",
-    "worked",
-    "seem",
-    "seemed",
-    "feel",
-    "felt",
-    "try",
-    "tried",
-    "leave",
-    "left",
-    "call",
-    "called",
-    "good",
-    "well",
-    "better",
-    "best",
-    "bad",
-    "worse",
-    "worst",
-    "old",
-    "long",
-    "great",
-    "little",
-    "right",
-    "left",
-    "big",
-    "high",
-    "different",
-    "important",
-    "same",
-    "able",
-    "next",
-    "early",
-    "young",
-    "public",
-    "free",
-    "real",
-    "easy",
-    "clear",
-    "recent",
-    "local",
-    "social",
-    "full",
-    "small",
-    "large",
-    "possible",
-    "particular",
-    "available",
-    "special",
-    "certain",
-    "personal",
-    "open",
-    "general",
-    "enough",
-    "probably",
-    "actually",
-    "especially",
-    "finally",
-    "usually",
-    "perhaps",
-    "almost",
-    "simply",
-    "quickly",
-    "recently",
-    "already",
-    "eventually",
-    "suddenly",
-    "certainly",
-    "definitely",
-    "absolutely",
-    "completely",
-    "totally",
-    "entirely",
-    "exactly",
-    "specifically",
-    "particularly",
-    "especially",
-    "mainly",
-    "mostly",
-    "partly",
-    "fully",
-    "nearly",
-    "quite",
-    "rather",
-    "pretty",
-    "fairly",
-    "really",
-    "even",
-    "still",
-    "yet",
-    "ever",
-    "never",
-    "always",
-    "sometimes",
-    "often",
-    "usually",
-    "frequently",
-    "rarely",
-    "generally",
-    "typically",
-    "normally",
-    "largely",
-    "potentially",
-    "theoretically",
-    "practically",
-    "basically",
-    "essentially",
-    "fundamentally",
-    "primarily",
-    "chiefly",
-    "principally",
-    "partially",
-    "half",
-    "quarter",
-    "double",
-    "single",
-    "multiple",
-    "various",
-    "hundred",
-    "thousand",
-    "million",
-    "billion",
-]);
+import { STOPWORDS } from "../constants/stopwords.js";
 
 /** Extract a short title from a question by removing stopwords.
  *  Falls back to first 5 words if nothing meaningful remains.
@@ -356,12 +70,20 @@ export interface AskUserParams {
     allowSkip?: boolean;
     displayMode?: string;
     followCursor?: boolean;
+    theme?: ThemeMode;
+    animationLevel?: AnimationLevel;
+}
+
+export interface AskUserMetadata {
+    theme?: string;
+    animationLevel?: string;
 }
 
 export async function askUserHandler(
     params: AskUserParams,
     signal: AbortSignal | undefined,
     ctx: ExtensionContext,
+    onMetadata?: (metadata: AskUserMetadata) => void,
 ) {
     if (signal?.aborted) {
         return {
@@ -419,6 +141,9 @@ export async function askUserHandler(
         allowFreeform,
         allowComment,
         allowSkip: params.allowSkip,
+        sessionName: ctx.sessionManager.getSessionName(),
+        theme: params.theme,
+        animationLevel: params.animationLevel,
     };
 
     let result: Record<string, unknown> | null = null;
@@ -435,10 +160,16 @@ export async function askUserHandler(
                 .replace(/&/g, "\\u0026"),
         );
 
+        const sessionName = ctx.sessionManager.getSessionName();
+        const questionTitle = summarizeTitle(params.question);
+        const title = sessionName
+            ? `Pi · ${sessionName} · ${questionTitle}`
+            : `Pi · ${questionTitle}`;
+
         const options: Record<string, unknown> = {
             width: 1200,
             height: 900,
-            title: summarizeTitle(params.question),
+            title: title.length > 60 ? `${title.slice(0, 57)}…` : title,
         };
 
         if (params.followCursor) {
@@ -452,6 +183,11 @@ export async function askUserHandler(
         if (result === null || result?.__cancelled === true) {
             cancelled = true;
             result = null;
+        } else if (result && onMetadata) {
+            onMetadata({
+                theme: result.__theme as string | undefined,
+                animationLevel: result.__animationLevel as string | undefined,
+            });
         }
     } catch (err) {
         // Glimpse unavailable — fall back to terminal prompt