pi-pier 0.3.0 → 0.4.1

package/src/ask-user.ts

@@ -1,30 +1,31 @@
 /**
- * ask_user_question I/O: normalize params, select+Other dialog, result envelope.
- *
- * Why: the herdr gate (blocked / pi-ask / widget collapse) stays in index.ts.
- * This module is the questionnaire — authored options plus a runtime Other row —
- * so the model cannot forget a free-text escape and Esc is a real decline.
+ * ask_user_question I/O: normalize params, select+Other dialog, result envelope. The herdr gate
+ * (blocked / pi-ask / widget collapse) stays in index.ts; this module owns the questionnaire — authored
+ * options plus a runtime Other row, so the model cannot forget a free-text escape and Esc is a real decline.
  */
 import { Type } from 'typebox';
-import { runMultiSelect } from './ask-multi.ts';
+import { OTHER_ROW_LABEL, numberedOptionLine, runSelectDialog } from './ask-dialog.ts';
 
 export const ASK_TOOL_NAME = 'ask_user_question';
-export const OTHER_OPTION = 'Other (type your own)';
-export const OTHER_ANSWER = 'Other';
-export const RECOMMENDED_SUFFIX = ' (Recommended)';
-export const MIN_OPTIONS = 2;
-export const MAX_OPTIONS = 5;
-export const MAX_QUESTIONS = 4;
-export const MAX_LABEL_CHARS = 60;
+export const OTHER_OPTION = OTHER_ROW_LABEL;
 
 export const DECLINE_TEXT =
   'User declined to answer the questions. Continue with your best judgment, or ask different questions.';
 export const NO_UI_TEXT =
   'Error: UI not available (running in non-interactive mode). The user never saw the questions — do NOT treat this as a decline. Ask the questions as plain chat text instead, without using this tool.';
 
+/** Answer kind reported for the free-text row (the questions themselves are the detail). */
+const OTHER_ANSWER = 'Other';
+const MIN_OPTIONS = 2;
+const MAX_OPTIONS = 5;
+const MAX_QUESTIONS = 4;
+const MAX_LABEL_CHARS = 60;
+
 const CUSTOM_ANSWER_TITLE = 'Type your answer:';
 const MULTI_INSTRUCTIONS =
   'Enter the numbers of all that apply, comma-separated (e.g. "1,3"), or type a custom answer as plain text.';
+const MULTI_NO_OTHER_INSTRUCTIONS =
+  'Enter the numbers of all that apply, comma-separated (e.g. "1,3"). There is no free-text answer for this question.';
 const NUMBERED_HINT = 'Enter a number, or type a custom answer.';
 
 const RESERVED_LOWER: Record<string, true> = {
@@ -72,7 +73,6 @@ export const ASK_TOOL_DESCRIPTION = [
   'Use recommended (0-based) to mark the default; "(Recommended)" is added automatically — do NOT write it in the label.',
   'Use multi: true when several options can apply — the TUI opens an interactive toggle list (space toggles a row, a toggles all, enter confirms, esc declines) instead of making the human type numbers.',
   'Set allowOther: false when the authored choices are exhaustive and a free-text answer would be misleading.',
-  'The answer comes back as the tool result; then continue your work.',
 ].join(' ');
 
 export const ASK_PROMPT_GUIDELINES = [
@@ -121,6 +121,9 @@ export type AskUi = {
   input: (title: string, placeholder?: string, opts?: { signal?: AbortSignal }) => Promise<string | undefined>;
   /** TUI-only: full custom components (absent in RPC mode, where it returns undefined). */
   custom?: (factory: unknown) => Promise<unknown>;
+  /** TUI-only helpers from pi's extension UI context; wired for ctrl+o parity with pi's selector. */
+  getToolsExpanded?: () => boolean;
+  setToolsExpanded?: (expanded: boolean) => void;
 };
 
 export type PrepareAskResult =
@@ -179,9 +182,7 @@ function parseOptions(raw: unknown): { ok: true; options: AskOption[] } | { ok:
   for (const item of raw) {
     const rec = asRecord(item);
     const rawLabel = typeof rec?.label === 'string' ? rec.label.trim() : '';
-    // B3: models often repeat the UI's own marker (`label: 'Redis (Recommended)'`), which rendered
-    // as "Redis (Recommended) (Recommended)". Only a trailing bracketed marker is stripped, so a
-    // label that merely mentions the word ("Recommended approach") survives untouched.
+    // B3: models repeat the marker the UI appends ("Redis (Recommended)"); strip only a trailing one.
     const label = rawLabel.replace(/\s*[([]\s*recommended\s*[)\]]\s*$/i, '').trim();
     if (!label) {
       return fail(
@@ -290,15 +291,10 @@ export function gateLabel(spec: AskSpec): string {
   return extra > 0 ? `${first} (+${extra})` : first;
 }
 
-export function formatAuthoredLine(option: AskOption, index: number, recommended?: number): string {
-  const rec = recommended === index ? RECOMMENDED_SUFFIX : '';
-  const desc = option.description ? ` — ${option.description}` : '';
-  return `${index + 1}. ${option.label}${rec}${desc}`;
-}
-
+/** Typed-prompt list: numbered authored options plus the Other row when it is offered. */
 export function optionLines(question: AskQuestion): string[] {
-  const lines = question.options.map((option, i) => formatAuthoredLine(option, i, question.recommended));
-  if (question.allowOther !== false) lines.push(`${question.options.length + 1}. ${OTHER_OPTION}`);
+  const lines = question.options.map((option, i) => numberedOptionLine(option, i, question.recommended));
+  if (question.allowOther) lines.push(`${question.options.length + 1}. ${OTHER_OPTION}`);
   return lines;
 }
 
@@ -316,89 +312,55 @@ function withId(question: AskQuestion, answer: AskAnswer): AskAnswer {
   return question.id ? { ...answer, id: question.id } : answer;
 }
 
-async function askSingle(ui: AskUi, question: AskQuestion, signal?: AbortSignal): Promise<AskAnswer | undefined> {
-  const lines = optionLines(question);
-  const opts = signal ? { signal } : undefined;
-  const chosen = ui.select
-    ? await ui.select(question.question, lines, opts)
-    : await ui.input(`${question.question}\n\n${lines.join('\n')}\n\n${NUMBERED_HINT}`, '1', opts);
-  if (chosen == null) return undefined;
-  const trimmed = chosen.trim();
-  if (!trimmed) return undefined;
-  const idx = parseChoice(trimmed, lines);
-  if (idx != null && idx < question.options.length) {
-    return withId(question, {
-      question: question.question,
-      kind: 'option',
-      answer: question.options[idx]!.label,
-    });
-  }
-  if (idx === question.options.length) {
-    const typed = await ui.input(`${question.question}\n\n${CUSTOM_ANSWER_TITLE}`, '', opts);
-    if (typed == null || !typed.trim()) return undefined;
-    return withId(question, {
-      question: question.question,
-      kind: 'custom',
-      answer: OTHER_ANSWER,
-      customInput: typed.trim(),
-    });
-  }
-  if (!ui.select) {
-    return withId(question, {
-      question: question.question,
-      kind: 'custom',
-      answer: OTHER_ANSWER,
-      customInput: trimmed,
-    });
-  }
-  return undefined;
+/** Free-text answer behind the Other row; shared by the dialog and the typed-prompt fallback. */
+async function askOtherText(ui: AskUi, question: AskQuestion, signal?: AbortSignal): Promise<AskAnswer | undefined> {
+  const typed = await ui.input(`${question.question}\n\n${CUSTOM_ANSWER_TITLE}`, '', signal ? { signal } : undefined);
+  if (typed == null || !typed.trim()) return undefined;
+  return withId(question, {
+    question: question.question,
+    kind: 'custom',
+    answer: OTHER_ANSWER,
+    customInput: typed.trim(),
+  });
 }
 
-async function askMulti(ui: AskUi, question: AskQuestion, signal?: AbortSignal): Promise<AskAnswer | undefined> {
-  // TUI path: a real toggle list. ctx.ui.custom is absent in RPC mode (or returns undefined),
-  // in which case we fall through to the typed-index prompt below.
-  if (typeof ui.custom === 'function') {
-    const outcome = await runMultiSelect(ui.custom, question.question, {
-      options: question.options,
-      allowOther: question.allowOther,
-      ...(question.recommended !== undefined ? { recommended: question.recommended } : {}),
-    });
-    if (outcome?.kind === 'cancel') return undefined;
-    if (outcome?.kind === 'other') {
-      const typed = await ui.input(`${question.question}\n\n${CUSTOM_ANSWER_TITLE}`, '', signal ? { signal } : undefined);
-      if (typed == null || !typed.trim()) return undefined;
-      return withId(question, {
-        question: question.question,
-        kind: 'custom',
-        answer: OTHER_ANSWER,
-        customInput: typed.trim(),
-      });
-    }
-    if (outcome?.kind === 'selected') {
-      return withId(question, { question: question.question, kind: 'multi', answer: null, selected: outcome.labels });
-    }
-  }
-  const list = question.options
-    .map((option, i) => formatAuthoredLine(option, i, question.recommended))
-    .join('\n');
-  const hint = question.allowOther === false
-    ? `Enter the numbers of all that apply, comma-separated (e.g. "1,3"). There is no free-text answer for this question.`
-    : MULTI_INSTRUCTIONS;
-  const value = await ui.input(
-    `${question.question}\n\n${list}\n\n${hint}`,
-    '1,3',
-    signal ? { signal } : undefined,
-  );
-  if (value == null) return undefined;
-  const trimmed = value.trim();
+/**
+ * Interpret one typed answer. Single-select: a listed line or its number takes that option, the Other
+ * number opens the free-text prompt, anything else is a custom answer — but only on the typed fallback,
+ * since a real select dialog can only return a listed row. Multi-select: comma/space separated numbers,
+ * the Other number alone opens free text, an empty submission is an empty selection. Returns 'other' to
+ * ask for free text, undefined to decline.
+ */
+function parseTypedPicks(
+  question: AskQuestion,
+  lines: readonly string[],
+  raw: string,
+  typedFallback: boolean,
+): AskAnswer[] | 'other' | undefined {
+  const trimmed = raw.trim();
+  const otherIndex = question.options.length;
   if (!trimmed) {
-    return withId(question, { question: question.question, kind: 'multi', answer: null, selected: [] });
+    return question.multi
+      ? [withId(question, { question: question.question, kind: 'multi', answer: null, selected: [] })]
+      : undefined;
+  }
+  if (!question.multi) {
+    const idx = parseChoice(trimmed, lines);
+    if (idx === otherIndex) return 'other';
+    if (idx != null && idx < otherIndex) {
+      return [withId(question, { question: question.question, kind: 'option', answer: question.options[idx]!.label })];
+    }
+    return typedFallback
+      ? [withId(question, { question: question.question, kind: 'custom', answer: OTHER_ANSWER, customInput: trimmed })]
+      : undefined;
   }
+  // The Other row is numbered like the authored options; typing it alone opens the free-text prompt.
+  if (trimmed.split(/[,\s]+/).length === 1 && parseChoice(trimmed, lines) === otherIndex) return 'other';
   const tokens = trimmed.split(/[,\s]+/).filter((tok) => tok.length > 0);
   const indices = tokens.map((tok) => {
     if (!/^\d+\.?$/.test(tok)) return null;
     const idx = Number.parseInt(tok, 10) - 1;
-    return idx >= 0 && idx < question.options.length ? idx : null;
+    return idx >= 0 && idx < otherIndex ? idx : null;
   });
   if (indices.every((i): i is number => i != null)) {
     const selected: string[] = [];
@@ -406,16 +368,57 @@ async function askMulti(ui: AskUi, question: AskQuestion, signal?: AbortSignal):
       const label = question.options[i]!.label;
       if (!selected.includes(label)) selected.push(label);
     }
-    return withId(question, { question: question.question, kind: 'multi', answer: null, selected });
+    return [withId(question, { question: question.question, kind: 'multi', answer: null, selected })];
   }
-  // Unparsable input is a free-text answer only when the free-text row was offered.
-  if (question.allowOther === false) return undefined;
-  return withId(question, {
-    question: question.question,
-    kind: 'custom',
-    answer: OTHER_ANSWER,
-    customInput: trimmed,
-  });
+  return question.allowOther
+    ? [withId(question, { question: question.question, kind: 'custom', answer: OTHER_ANSWER, customInput: trimmed })]
+    : undefined;
+}
+
+/** Ask one question, both modes: the pier dialog, then the host's select dialog (single only), then
+ *  the typed prompt. `ui.custom` is absent (or resolves undefined) in RPC mode, hence every rung. */
+async function askQuestion(ui: AskUi, question: AskQuestion, signal?: AbortSignal): Promise<AskAnswer | undefined> {
+  const { multi } = question;
+  if (typeof ui.custom === 'function') {
+    const toggleToolsExpanded = ui.getToolsExpanded && ui.setToolsExpanded
+      ? (): void => ui.setToolsExpanded!(!ui.getToolsExpanded!())
+      : undefined;
+    const outcome = await runSelectDialog(
+      ui.custom,
+      question.question,
+      {
+        options: question.options,
+        allowOther: question.allowOther,
+        multi,
+        ...(question.recommended !== undefined ? { recommended: question.recommended } : {}),
+      },
+      { ...(signal ? { signal } : {}), ...(toggleToolsExpanded ? { toggleToolsExpanded } : {}) },
+    );
+    if (outcome?.kind === 'cancel') return undefined;
+    if (outcome?.kind === 'other') return askOtherText(ui, question, signal);
+    if (outcome?.kind === 'selected') {
+      return withId(
+        question,
+        multi
+          ? { question: question.question, kind: 'multi', answer: null, selected: outcome.labels }
+          : { question: question.question, kind: 'option', answer: outcome.labels[0]! },
+      );
+    }
+  }
+  const lines = optionLines(question);
+  const opts = signal ? { signal } : undefined;
+  // A multi question has no single-pick host dialog; its typed prompt is always the fallback.
+  const select = multi ? undefined : ui.select;
+  const hint = multi
+    ? (question.allowOther ? MULTI_INSTRUCTIONS : MULTI_NO_OTHER_INSTRUCTIONS)
+    : NUMBERED_HINT;
+  const raw = select
+    ? await select(question.question, lines, opts)
+    : await ui.input(`${question.question}\n\n${lines.join('\n')}\n\n${hint}`, multi ? '1,3' : '1', opts);
+  if (raw == null) return undefined;
+  const picks = parseTypedPicks(question, lines, raw, select === undefined);
+  if (picks === 'other') return askOtherText(ui, question, signal);
+  return picks?.[0];
 }
 
 export function formatAskContent(details: AskDetails): string {
@@ -448,9 +451,7 @@ export async function runAsk(spec: AskSpec, ui: AskUi, signal?: AbortSignal): Pr
   }
   const answers: AskAnswer[] = [];
   for (const question of spec.questions) {
-    const answer = question.multi
-      ? await askMulti(ui, question, signal)
-      : await askSingle(ui, question, signal);
+    const answer = await askQuestion(ui, question, signal);
     if (!answer) return okResult({ answers, cancelled: true });
     answers.push(answer);
   }

package/src/bootstrap.ts

@@ -1,13 +1,10 @@
 /**
  * Bootstrap the master Cordis tree (D78 mount topology, D80 ecosystem adoption, D81 split).
  *
- * Load the group, timer, and HMR plugins in order so declarations resolve and HMR stays a
- * development-only path (`--expose-internals` plus PI_HERDR_HMR=1); production has no watcher.
- *
- * Workers bypass this module (C3/D81) because short-lived processes mount manually without
- * loader or HMR; this module and subagent-scope.ts are master-only dynamic imports.
- *
- * Core modules will gradually become loader entries; manual mounts remain non-hot-reloaded (D80③).
+ * Loads group, timer and HMR plugins in order so declarations resolve, with HMR as a development-only
+ * path (`--expose-internals` plus PIER_HMR=1); production has no watcher. Workers bypass this module
+ * (C3/D81): short-lived processes mount manually, and this module plus subagent-poller.ts are the
+ * master-only dynamic imports.
  */
 import { Context } from '@deepseek-ai/cordis';
 import Loader from '@deepseek-ai/cordis-plugin-loader';
@@ -15,6 +12,7 @@ import Group from '@deepseek-ai/cordis-plugin-group';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import * as path from 'node:path';
 import { DisposeLedger } from './ledger.ts';
+import { cordisProvide } from './cordis-services.ts';
 import { pierOption } from './pier-options.ts';
 
 export interface BootstrapHooks {
@@ -24,9 +22,8 @@ export interface BootstrapHooks {
 export interface CordisApp {
   /** Root owns subagent scopes and lifecycle effects. */
   root: Context;
-  /** False preserves the bare-tree fallback, matching the baseline behavior. */
+  /** False means the loader was not mounted (bare-tree fallback). */
   loaderReady: boolean;
-  /** HMR is enabled only in the development posture. */
   hmrActive: boolean;
   /** Shared ledger compensates HMR disposal and handles session_shutdown cleanup. */
   ledger: DisposeLedger;
@@ -41,11 +38,11 @@ export async function createCordisApp(hooks: BootstrapHooks = {}): Promise<Cordi
   const root = new Context();
   const ledger = new DisposeLedger();
   // Inject the ledger through Cordis DI because loader transforms entry config and cannot carry live instances.
-  root.provide('pi-herdr.ledger', ledger);
+  cordisProvide(root, 'pi-herdr.ledger', ledger);
   if (hooks.onDispose) {
     root.effect(() => () => { hooks.onDispose?.(); }, 'session-root');
   }
-  // Resolve relative entry names (./core/...) from this module's directory.
+  // Resolve relative entry names (./plugins/...) from this module's directory.
   root.baseUrl = pathToFileURL(path.dirname(fileURLToPath(import.meta.url))).href + '/';
 
   let loaderReady = false;
@@ -78,8 +75,8 @@ export async function createCordisApp(hooks: BootstrapHooks = {}): Promise<Cordi
       });
       hmrActive = true;
       console.error('[pi-herdr] hmr active (dev posture: --expose-internals + PI_HERDR_HMR=1)');
-      // D80⑤: HMR already disposes old fiber effects; this hook additionally retires old pi-surface generations.
-      // d87 keeps generations registered after the reload boundary alive; disposeKey retires only older entries.
+      // HMR already disposes old fiber effects; disposeKey additionally retires the older pi-surface
+      // generations while keeping generations registered after the reload boundary alive (D80⑤/d87).
       // Cordis' own HMR boundary event (not part of pi's typed Events map).
       (root as unknown as { on(name: string, fn: (reloads: unknown) => void): void }).on('hmr/reload', (reloads: unknown) => {
         try {