@mrclrchtr/supi-ask-user 1.3.1 → 1.4.0

package/src/ui/ui-rich-state.ts

@@ -1,179 +0,0 @@
-// Shared state types and pure helpers for the rich overlay.
-
-import type { Editor } from "@earendil-works/pi-tui";
-import type { QuestionnaireFlow } from "../flow.ts";
-import type { OverlayRenderState, SubMode } from "../render/ui-rich-render-types.ts";
-import type {
-  NormalizedQuestion,
-  NormalizedStructuredQuestion,
-  NormalizedTextQuestion,
-  QuestionnaireOutcome,
-} from "../types.ts";
-import { isStructuredQuestion, primaryRecommendationIndex } from "../types.ts";
-
-export interface NoteTargetSingle {
-  mode: "single";
-  questionId: string;
-}
-
-export interface NoteTargetMulti {
-  mode: "multi";
-  questionId: string;
-  optionIndex: number;
-}
-
-export type NoteTarget = NoteTargetSingle | NoteTargetMulti;
-
-export interface OverlayState extends OverlayRenderState {
-  noteTarget?: NoteTarget;
-  cachedLines: string[] | undefined;
-  cachedWidth: number | undefined;
-  maxHeight: number;
-}
-
-export interface OverlayDeps {
-  flow: QuestionnaireFlow;
-  state: OverlayState;
-  editor: Editor;
-  refresh: () => void;
-  finish: (o: QuestionnaireOutcome) => void;
-}
-
-export type InteractiveRow =
-  | { kind: "option"; optionIndex: number }
-  | { kind: "other" }
-  | { kind: "discuss" };
-
-export function interactiveRows(question: NormalizedStructuredQuestion): InteractiveRow[] {
-  const rows: InteractiveRow[] = question.options.map((_, optionIndex) => ({
-    kind: "option",
-    optionIndex,
-  }));
-  if (question.allowOther) rows.push({ kind: "other" });
-  if (question.allowDiscuss) rows.push({ kind: "discuss" });
-  return rows;
-}
-
-export function rowCount(question: NormalizedQuestion): number {
-  return isStructuredQuestion(question) ? interactiveRows(question).length : 0;
-}
-
-export function hasPreview(question: NormalizedQuestion): boolean {
-  return isStructuredQuestion(question) && question.options.some((option) => !!option.preview);
-}
-
-export function initialSubMode(question: NormalizedQuestion | undefined): SubMode {
-  if (!question) return "select";
-  return question.type === "text" ? "text-input" : "select";
-}
-
-export function textDefaultOrAnswer(
-  flow: Pick<QuestionnaireFlow, "getAnswer">,
-  question: NormalizedTextQuestion,
-): string {
-  const answer = flow.getAnswer(question.id);
-  if (answer?.source === "text") return answer.value;
-  return question.default ?? "";
-}
-
-export function resetStateForCurrent(deps: OverlayDeps): void {
-  const question = deps.flow.currentQuestion;
-  deps.state.subMode = deps.flow.currentMode === "reviewing" ? "select" : initialSubMode(question);
-  deps.state.selectedIndex = selectedRowIndex(deps.flow, question);
-  deps.state.noteTarget = undefined;
-  deps.state.maxHeight = 0;
-  const editorText = question?.type === "text" ? textDefaultOrAnswer(deps.flow, question) : "";
-  deps.editor.setText(editorText);
-}
-
-export function existingStructuredInputValue(
-  flow: QuestionnaireFlow,
-  questionId: string,
-  kind: "other" | "discuss",
-): string {
-  const answer = flow.getAnswer(questionId);
-  if (kind === "other") return answer?.source === "other" ? answer.value : "";
-  return answer?.source === "discuss" ? (answer.value ?? "") : "";
-}
-
-export function singleNoteFromAnswer(
-  flow: Pick<QuestionnaireFlow, "getAnswer">,
-  questionId: string,
-): string | undefined {
-  const answer = flow.getAnswer(questionId);
-  if (!answer || answer.source !== "choice") return undefined;
-  return answer.selections[0]?.note;
-}
-
-export function multiNoteMapFromAnswer(
-  flow: Pick<QuestionnaireFlow, "getAnswer">,
-  questionId: string,
-): Map<number, string> {
-  const answer = flow.getAnswer(questionId);
-  const map = new Map<number, string>();
-  if (!answer || answer.source !== "choice") return map;
-  for (const selection of answer.selections) {
-    if (selection.note) map.set(selection.optionIndex, selection.note);
-  }
-  return map;
-}
-
-export function mergedMultiNoteMap(deps: OverlayDeps, questionId: string): Map<number, string> {
-  const answerMap = multiNoteMapFromAnswer(deps.flow, questionId);
-  const staged = deps.state.stagedMultiNotes.get(questionId);
-  if (!staged) return answerMap;
-  const merged = new Map(answerMap);
-  for (const [optionIndex, note] of staged.entries()) merged.set(optionIndex, note);
-  return merged;
-}
-
-export function isEditorMode(mode: SubMode): boolean {
-  return (
-    mode === "text-input" ||
-    mode === "other-input" ||
-    mode === "discuss-input" ||
-    mode === "note-input"
-  );
-}
-
-export function selectedIndexesForQuestion(
-  flow: Pick<QuestionnaireFlow, "getAnswer">,
-  state: Pick<OverlayRenderState, "stagedSelections">,
-  question: NormalizedStructuredQuestion,
-): number[] {
-  const answer = flow.getAnswer(question.id);
-  if (answer?.source === "other" || answer?.source === "discuss") return [];
-  const staged = state.stagedSelections.get(question.id);
-  if (staged) return [...staged];
-  if (!answer) {
-    if (question.defaultIndexes.length > 0) return [...question.defaultIndexes];
-    return [];
-  }
-  if (answer.source === "choice") return answer.selections.map((s) => s.optionIndex);
-  return [];
-}
-
-export function selectedRowIndex(
-  flow: Pick<QuestionnaireFlow, "getAnswer">,
-  question: NormalizedQuestion | undefined,
-): number {
-  if (!question || question.type === "text") return 0;
-  const rows = interactiveRows(question);
-  const answer = flow.getAnswer(question.id);
-  if (!answer) {
-    const defaultIdx = isStructuredQuestion(question) ? question.defaultIndexes[0] : undefined;
-    if (defaultIdx !== undefined) return defaultIdx;
-    const recommended = primaryRecommendationIndex(question);
-    return recommended ?? 0;
-  }
-  switch (answer.source) {
-    case "choice":
-      return answer.selections[0]?.optionIndex ?? 0;
-    case "other":
-      return rows.findIndex((row) => row.kind === "other");
-    case "discuss":
-      return rows.findIndex((row) => row.kind === "discuss");
-    case "text":
-      return 0;
-  }
-}

package/src/ui/ui-rich.ts

@@ -1,144 +0,0 @@
-// Rich questionnaire UI built on `ctx.ui.custom()`. Supports explicit choice
-// (single and multi-select), notes, other, discuss, preview, and review flows. Returns a
-// QuestionnaireOutcome whose terminal state is owned by the shared flow.
-
-import type { Theme } from "@earendil-works/pi-coding-agent";
-import { type Component, Editor, type EditorTheme, type TUI } from "@earendil-works/pi-tui";
-import { QuestionnaireFlow } from "../flow.ts";
-import { renderOverlay } from "../render/ui-rich-render.ts";
-import type { NormalizedQuestionnaire, QuestionnaireOutcome } from "../types.ts";
-import { handleOverlayInput, onEditorSubmit } from "./ui-rich-handlers.ts";
-import {
-  initialSubMode,
-  type OverlayState,
-  selectedRowIndex,
-  textDefaultOrAnswer,
-} from "./ui-rich-state.ts";
-
-export interface RichCustomOptions {
-  overlay?: boolean;
-}
-
-export interface RichUiHost {
-  custom<T>(
-    factory: (
-      tui: TUI,
-      theme: Theme,
-      // biome-ignore lint/suspicious/noExplicitAny: keybindings parameter type isn't needed here
-      keybindings: any,
-      done: (result: T) => void,
-    ) => Component & { dispose?(): void },
-    options?: RichCustomOptions,
-  ): Promise<T> | undefined;
-}
-
-export interface RunRichOptions {
-  ui: RichUiHost;
-  signal?: AbortSignal;
-}
-
-export async function runRichQuestionnaire(
-  questionnaire: NormalizedQuestionnaire,
-  opts: RunRichOptions,
-): Promise<QuestionnaireOutcome | "unsupported"> {
-  const flow = new QuestionnaireFlow(questionnaire.questions, questionnaire.allowSkip);
-  // Short-circuit before opening the overlay if we were already aborted.
-  // Otherwise signal.addEventListener("abort", …) would never fire and the
-  // overlay would stay open until the user dismissed it manually.
-  if (opts.signal?.aborted) {
-    flow.abort();
-    return flow.outcome();
-  }
-  // pi-tui's declarative keybinding system is not used here — the overlay
-  // implements its own dynamic input handling because footer hints change
-  // per mode and question type (e.g. Space toggle in multi-select vs Enter
-  // confirm in choice).
-  const promise = opts.ui.custom<QuestionnaireOutcome>((tui, theme, _kb, done) =>
-    buildOverlay({ tui, theme, flow, signal: opts.signal, done }),
-  );
-  if (!promise) return "unsupported";
-  return promise;
-}
-
-interface BuildOverlayArgs {
-  tui: TUI;
-  theme: Theme;
-  flow: QuestionnaireFlow;
-  signal: AbortSignal | undefined;
-  done: (result: QuestionnaireOutcome) => void;
-}
-
-function buildOverlay(args: BuildOverlayArgs): Component {
-  const { tui, theme, flow, signal, done } = args;
-  const state: OverlayState = {
-    selectedIndex: selectedRowIndex(flow, flow.currentQuestion),
-    subMode: initialSubMode(flow.currentQuestion),
-    stagedSelections: new Map(),
-    stagedSingleNotes: new Map(),
-    stagedMultiNotes: new Map(),
-    noteTarget: undefined,
-    cachedLines: undefined,
-    cachedWidth: undefined,
-    maxHeight: 0,
-  };
-  const editor = new Editor(tui, makeEditorTheme(theme));
-  const initialQuestion = flow.currentQuestion;
-  if (initialQuestion?.type === "text") {
-    editor.setText(textDefaultOrAnswer(flow, initialQuestion));
-  }
-  const refresh = () => {
-    state.cachedLines = undefined;
-    tui.requestRender();
-  };
-  const finish = (outcome: QuestionnaireOutcome) => done(outcome);
-
-  signal?.addEventListener("abort", () => {
-    flow.abort();
-    done(flow.outcome());
-  });
-
-  const deps = { flow, state, editor, refresh, finish };
-  editor.onSubmit = (value) => onEditorSubmit(value, deps);
-
-  return {
-    render: (width) => {
-      // pi's TUI does not call invalidate() on terminal resize, so a width
-      // change has to invalidate the cache here or we'd return stale lines
-      // truncated for the previous width.
-      if (state.cachedWidth !== width) {
-        state.cachedLines = undefined;
-        state.cachedWidth = width;
-        state.maxHeight = 0;
-      }
-      if (!state.cachedLines) {
-        state.cachedLines = renderOverlay({ width, theme, flow, state, editor });
-        // Stabilize height — prevent shrinkage that triggers pi-tui's
-        // viewport tracking bug with differential rendering.
-        if (state.cachedLines.length > state.maxHeight) {
-          state.maxHeight = state.cachedLines.length;
-        }
-        while (state.cachedLines.length < state.maxHeight) {
-          state.cachedLines.push("");
-        }
-      }
-      return state.cachedLines;
-    },
-    invalidate: () => {
-      state.cachedLines = undefined;
-    },
-    handleInput: (data: string) => handleOverlayInput(data, deps),
-  };
-}
-
-function makeEditorTheme(theme: Theme): EditorTheme {
-  return {
-    borderColor: (text) => theme.fg("accent", text),
-    selectList: {
-      selectedPrefix: (text) => theme.fg("accent", text),
-      selectedText: (text) => theme.fg("accent", text),
-      description: (text) => theme.fg("muted", text),
-      scrollInfo: (text) => theme.fg("dim", text),
-      noMatch: (text) => theme.fg("warning", text),
-    },
-  };
-}