@yagni-app/code-staging 1.2.1-staging.1521.1 → 1.2.2-staging.1525.1

package/dist/extension/askUserQuestionTool.d.ts

@@ -17,6 +17,11 @@
  * No backend changes; no new dependencies. Only pi's TUI primitives. When
  * there is no interactive UI (print / headless), execute() returns a short
  * message so the tool never hangs waiting for a keyboard.
+ *
+ * Hosts that drive pi over RPC (YAGNI Desktop) report `hasUI` but cannot
+ * mount a custom component: pi's RPC `ui.custom` resolves `undefined` without
+ * ever calling the factory. When that happens the question is re-asked through
+ * the plain `select` / `input` dialogs every host can render.
  */
 import type { ToolDefinition } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";

package/dist/extension/askUserQuestionTool.js

@@ -17,6 +17,11 @@
  * No backend changes; no new dependencies. Only pi's TUI primitives. When
  * there is no interactive UI (print / headless), execute() returns a short
  * message so the tool never hangs waiting for a keyboard.
+ *
+ * Hosts that drive pi over RPC (YAGNI Desktop) report `hasUI` but cannot
+ * mount a custom component: pi's RPC `ui.custom` resolves `undefined` without
+ * ever calling the factory. When that happens the question is re-asked through
+ * the plain `select` / `input` dialogs every host can render.
  */
 import { truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
@@ -34,6 +39,11 @@ const ASK_TIMEOUT_MS = 120_000;
 const OTHER_KEY = "__other__";
 /** Label on the multi-select submit row (mirrors Claude's Submit button). */
 const SUBMIT_LABEL = "Submit";
+/** Dialog-fallback row that opens a free-text input (the "Other" answer). */
+const DIALOG_OTHER = "Other (type your own answer)";
+/** Dialog-fallback marks for multi-select rows, toggled on each pick. */
+const DIALOG_CHECKED = "[x] ";
+const DIALOG_UNCHECKED = "[ ] ";
 const optionParameters = Type.Object({
     label: Type.String({
         description: "The display text for this option that the user sees and selects. Concise (1-5 words) and clearly describes the choice.",
@@ -513,7 +523,7 @@ async function askOne(ctx, q, qIndex) {
     if (!ctx.hasUI) {
         return { answer: undefined, cancelled: false };
     }
-    const resolution = await new Promise((resolve) => {
+    const outcome = await new Promise((resolve) => {
         let settled = false;
         let close;
         const settle = (r) => {
@@ -521,7 +531,8 @@ async function askOne(ctx, q, qIndex) {
                 return;
             settled = true;
             ctx.signal?.removeEventListener("abort", onAbort);
-            close?.(r); // also closes the overlay (resolves the .custom promise)
+            if (r.status !== "unsupported")
+                close?.(r); // also closes the overlay (resolves the .custom promise)
             resolve(r);
         };
         const onAbort = () => settle({ status: "cancelled" });
@@ -547,6 +558,19 @@ async function askOne(ctx, q, qIndex) {
         })
             .then(() => {
             clearTimeout(timer);
+            // The promise resolved but nothing settled the question. If the
+            // factory never ran, this host cannot mount custom UI (pi RPC mode):
+            // fall back to plain dialogs. Otherwise the overlay was dismissed from
+            // outside: treat it as a cancel. Either way the turn never hangs.
+            if (settled)
+                return;
+            if (close) {
+                logAskQuestion({ event: "dismissed", detail: "overlay closed without an answer", qIndex });
+                settle({ status: "cancelled" });
+            }
+            else {
+                settle({ status: "unsupported" });
+            }
         })
             .catch((err) => {
             logAskQuestion({
@@ -557,6 +581,26 @@ async function askOne(ctx, q, qIndex) {
             settle({ status: "cancelled" });
         });
     });
+    let resolution;
+    if (outcome.status === "unsupported") {
+        logAskQuestion({ event: "fallback", detail: "ui.custom unsupported; using dialogs", multi: q.multiSelect === true, qIndex });
+        try {
+            resolution = await askViaDialogs(ctx, q, qIndex);
+        }
+        catch (err) {
+            // Named separately so a failing dialog host is not mistaken for the
+            // fallback itself breaking.
+            logAskQuestion({
+                event: "fallback_error",
+                detail: err instanceof Error ? `dialog threw: ${err.message}` : "dialog rejected",
+                qIndex,
+            });
+            resolution = { status: "cancelled" };
+        }
+    }
+    else {
+        resolution = outcome;
+    }
     if (resolution.status === "cancelled") {
         logAskQuestion({ event: "resolved", status: "cancelled", qIndex });
         return { answer: undefined, cancelled: true };
@@ -569,6 +613,75 @@ async function askOne(ctx, q, qIndex) {
     logAskQuestion({ event: "resolved", status: "selected", detail: `values:${resolution.values.length}`, qIndex });
     return { answer: resolution.values.join(", "), cancelled: false };
 }
+/**
+ * Dialog rows must be distinct: `select` answers with the row's text, so a
+ * pick is mapped back by position in this list. Labels are unique, but two
+ * "label: description" rows can still read the same, and an option can read
+ * like a control row ("Submit"). If any collide, number every row.
+ */
+function distinctRows(rows) {
+    return new Set(rows).size === rows.length ? rows : rows.map((row, i) => `${i + 1}. ${row}`);
+}
+/**
+ * Ask ONE question through the plain `select` / `input` dialogs, for hosts
+ * that cannot mount a custom component. Options show as "label: description";
+ * a trailing row opens a free-text input. Multi-select re-shows the list with
+ * [x] marks until the user picks Submit. Answers match the TUI component:
+ * an empty Other or an empty Submit is an empty answer (the tool moves on),
+ * and multi-select Other keeps the options already checked. Only Skip or
+ * Stop cancels. No timeout: a dialog is a visible card the user can Skip,
+ * and a host-side timeout would leave that card stranded.
+ */
+async function askViaDialogs(ctx, q, qIndex) {
+    const title = q.header ? `${q.header}: ${q.question}` : q.question;
+    const opts = { signal: ctx.signal };
+    const rowFor = (o) => (o.description ? `${o.label}: ${o.description}` : o.label);
+    const otherIndex = q.options.length;
+    const submitIndex = q.options.length + 1;
+    /** Show the rows; the picked row's index, or undefined on Skip/Stop or an answer no row matches. */
+    const pick = async (rows) => {
+        const shown = distinctRows(rows);
+        const picked = await ctx.ui.select(title, shown, opts);
+        if (picked === undefined)
+            return undefined;
+        const idx = shown.indexOf(picked);
+        if (idx < 0)
+            logAskQuestion({ event: "error", detail: "dialog answered with a value no row matches", qIndex });
+        return idx < 0 ? undefined : idx;
+    };
+    /** The typed Other text ("" when submitted empty), or undefined on Skip/Stop. */
+    const typeOther = async () => (await ctx.ui.input(q.question, "Type your answer", opts))?.trim();
+    if (!q.multiSelect) {
+        const idx = await pick([...q.options.map(rowFor), DIALOG_OTHER]);
+        if (idx === undefined)
+            return { status: "cancelled" };
+        if (idx < otherIndex)
+            return { status: "selected", values: [q.options[idx].label] };
+        const text = await typeOther();
+        return text === undefined ? { status: "cancelled" } : { status: "other", text };
+    }
+    const checked = new Set();
+    const checkedLabels = () => [...checked].sort((a, b) => a - b).map((i) => q.options[i].label);
+    for (;;) {
+        const rows = q.options.map((o, i) => `${checked.has(i) ? DIALOG_CHECKED : DIALOG_UNCHECKED}${rowFor(o)}`);
+        const idx = await pick([...rows, DIALOG_OTHER, SUBMIT_LABEL]);
+        if (idx === undefined)
+            return { status: "cancelled" };
+        if (idx === otherIndex) {
+            const text = await typeOther();
+            if (text === undefined)
+                return { status: "cancelled" };
+            return { status: "other", text: [...checkedLabels(), ...(text ? [text] : [])].join(", ") };
+        }
+        if (idx === submitIndex) {
+            return checked.size > 0 ? { status: "selected", values: checkedLabels() } : { status: "other", text: "" };
+        }
+        if (checked.has(idx))
+            checked.delete(idx);
+        else
+            checked.add(idx);
+    }
+}
 function buildTool(grounded = true) {
     return {
         name: TOOL_NAME,

package/dist/extension/diagnostics.d.ts

@@ -37,7 +37,7 @@ export interface ImagePasteEvent {
  */
 export declare function logImagePaste(ev: ImagePasteEvent): void;
 export interface AskQuestionEvent {
-    /** Stable event name: "key" | "finish" | "render" | "navigate" | "other_key". */
+    /** Stable event name: "key" | "finish" | "render" | "navigate" | "other_key" | "fallback" | "fallback_error" | "dismissed". */
     event: string;
     /** Human-readable description; NEVER user-typed text or question content. */
     detail?: string;

package/dist/extension/feedbackCommand.d.ts

@@ -17,6 +17,13 @@
  * turn is captured unless it verifiably is.
  */
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+/**
+ * This session's error trail. The sink keys every line by the launcher's
+ * `YAGNI_SESSION_ID` unless the caller passes one (errorSink `sessionIdFor`),
+ * and that is NOT pi's own session id, so reading by pi's id alone found
+ * nothing and every report shipped an empty trail. Read both.
+ */
+export declare function readFeedbackTrail(piSessionId: string, env: NodeJS.ProcessEnv, maxBytes?: number): string;
 export interface FeedbackDeps {
     baseUrl: string;
     getToken: () => string | undefined;

package/dist/extension/feedbackCommand.js

@@ -19,7 +19,20 @@
 import { readFileSync } from "node:fs";
 import { scrubSecrets } from "./pipeline/scrubSecrets.js";
 import { readSessionTrail } from "./errorSink.js";
+import { isDesktopSurface } from "./surface.js";
 const MAX_DESCRIPTION = 512;
+const MAX_TRAIL_BYTES = 64 * 1024;
+/**
+ * This session's error trail. The sink keys every line by the launcher's
+ * `YAGNI_SESSION_ID` unless the caller passes one (errorSink `sessionIdFor`),
+ * and that is NOT pi's own session id, so reading by pi's id alone found
+ * nothing and every report shipped an empty trail. Read both.
+ */
+export function readFeedbackTrail(piSessionId, env, maxBytes = MAX_TRAIL_BYTES) {
+    const ids = [...new Set([env.YAGNI_SESSION_ID, piSessionId].filter((id) => !!id))];
+    const trail = ids.map((id) => readSessionTrail(id, maxBytes)).filter(Boolean).join("\n");
+    return trail.length > maxBytes ? trail.slice(trail.length - maxBytes) : trail;
+}
 const MAX_TRANSCRIPT_READ_BYTES = 512 * 1024;
 const notify = (ctx, message, type) => {
     if (ctx.hasUI)
@@ -46,7 +59,11 @@ function readTranscript(sessionFile) {
     }
 }
 async function handleFeedback(args, ctx, deps) {
-    const sessionId = ctx.sessionManager.getSessionId?.() ?? deps.env?.YAGNI_SESSION_ID ?? "";
+    // The extension's production wiring passes no env (tests inject one), so
+    // fall back to the process env: without it the version and surface the
+    // launcher forwards were never read, and every report said cli/unknown.
+    const env = deps.env ?? process.env;
+    const sessionId = ctx.sessionManager.getSessionId?.() ?? env.YAGNI_SESSION_ID ?? "";
     const sessionFile = ctx.sessionManager.getSessionFile?.();
     const cwd = ctx.cwd;
     const description = args.trim()
@@ -61,7 +78,7 @@ async function handleFeedback(args, ctx, deps) {
         return;
     }
     const transcript = readTranscript(sessionFile);
-    const trail = readSessionTrail(sessionId);
+    const trail = readFeedbackTrail(sessionId, env);
     const doctorReport = deps.getDoctorReport
         ? await deps.getDoctorReport().catch(() => undefined)
         : undefined;
@@ -86,8 +103,8 @@ async function handleFeedback(args, ctx, deps) {
         return;
     }
     const payload = {
-        client: "cli",
-        clientVersion: deps.env?.YAGNI_CODE_VERSION?.trim() || "unknown",
+        client: isDesktopSurface(env) ? "desktop" : "cli",
+        clientVersion: env.YAGNI_CODE_VERSION?.trim() || "unknown",
         platform: `${process.platform} ${process.arch}`,
         description: redact(description).slice(0, MAX_DESCRIPTION),
         sessionId,
@@ -136,8 +153,9 @@ export function registerFeedbackCommands(pi, deps) {
     pi.registerCommand("diagnostics", {
         description: "Show recent error-trail lines for this session.",
         handler: async (_args, ctx) => {
-            const sessionId = ctx.sessionManager.getSessionId?.() ?? deps.env?.YAGNI_SESSION_ID ?? "";
-            const trail = readSessionTrail(sessionId, 16 * 1024);
+            const env = deps.env ?? process.env;
+            const sessionId = ctx.sessionManager.getSessionId?.() ?? env.YAGNI_SESSION_ID ?? "";
+            const trail = readFeedbackTrail(sessionId, env, 16 * 1024);
             if (!trail) {
                 notify(ctx, "No recent diagnostics for this session.", "info");
                 return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yagni-app/code-staging",
-  "version": "1.2.1-staging.1521.1",
+  "version": "1.2.2-staging.1525.1",
   "description": "YAGNI Code: a terminal coding agent that already knows your company. One YAGNI login routes the model and grounds the agent in your team's context.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "YAGNI, Inc. <jack@yagni.app> (https://yagni.app)",
@@ -58,5 +58,5 @@
     "turndown": "^7.2.4",
     "typebox": "^1.3.15"
   },
-  "yagniSourceSha": "d59214b05a4a1c9c33efa56559d684239e0865ac"
+  "yagniSourceSha": "46dd7c10b5f8d5f1bb1f82e6e789d61397fbd42f"
 }