@alexleekt/pi-ask-user-glimpse 0.3.1 → 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;
         }
@@ -284,10 +397,19 @@ function buildDebugParams(mode: string): AskUserParams | null {
                 ],
                 allowComment: true,
             };
+        case "long-question":
+            return {
+                question: "This is a very long question that exceeds one hundred and twenty characters so it should trigger the auto-split behavior. The first sentence becomes the dialog title, and the rest flows to the context panel.",
+                options: [
+                    { title: "Split worked", description: "Title is short, context has the rest" },
+                    { title: "Not split", description: "Everything is still in the title" },
+                ],
+                allowComment: true,
+            };
         case "mermaid":
             return {
                 question: "Test: Mermaid Diagrams",
-                context: `This prompt includes a Mermaid diagram to test rendering.
+                context: `This prompt includes Mermaid diagrams to test rendering in the left context panel.
 
 \`\`\`mermaid
 graph TD
@@ -323,21 +445,23 @@ const askUserTool = defineTool({
     name: "ask_user",
     label: "Ask User",
     description:
-        "Ask the user a question with optional multiple-choice answers. Use this to gather information interactively. Ask exactly one focused question per call. Before calling, gather context with tools (read/web/ref) and pass a short summary via the context field.",
+        "Ask the user a question with optional multiple-choice answers. Use this to gather information interactively. Ask exactly one focused question per call. Before calling, gather context with tools (read/web/ref) and pass a short summary via the context field. The context panel supports Mermaid diagrams (flowcharts, sequence diagrams, etc.) — include them when visualizing architecture, flows, or relationships would aid understanding.",
     promptSnippet:
         "Ask the user one focused question with optional multiple-choice answers to gather information interactively",
     promptGuidelines: [
         "Always use ask_user instead of guessing when user input would improve the answer.",
+        "Keep the question field short and focused (ideally one sentence). Put background, examples, or elaboration in the context field.",
+        "Include Mermaid diagrams in the context field when visualizing architecture, data flows, or decision trees would help the user understand the question.",
         "Pass a concise question and, when applicable, a list of options with short titles and optional longer descriptions.",
         "Set allowMultiple: true when more than one choice is valid.",
         "Set allowFreeform: true (default) when the user might want to answer in their own words.",
     ],
     parameters: Type.Object({
-        question: Type.String({ description: "The question to ask the user" }),
+        question: Type.String({ description: "A short, focused question (ideally one sentence). Put background detail in context." }),
         context: Type.Optional(
             Type.String({
                 description:
-                    "Additional context to help the user understand the question",
+                    "Background, examples, or elaboration that helps the user understand the question. Shown in a side panel, so keep the question itself concise. Supports Mermaid diagrams (flowcharts, sequence diagrams, etc.) — wrap them in ```mermaid code blocks.",
             }),
         ),
         options: Type.Optional(
@@ -438,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 ──
@@ -491,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(
@@ -531,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,
@@ -572,6 +690,7 @@ export default function (pi: ExtensionAPI) {
                 "multi-select",
                 "freeform",
                 "questionnaire",
+                "long-question",
                 "mermaid",
             ]);
             if (!mode) return;
@@ -579,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.1",
+    "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 {