pi-code 1.0.77 → 1.1.0

package/extensions/question.ts

@@ -4,8 +4,11 @@
  * only), or space-toggled checkboxes when `multiSelect` is set. An optional `header`
  * labels the question. Escape in the editor returns to options; Escape in options cancels.
  * Multiple questions per call are not batched; ask sequentially.
+ * On the TUI each question is also offered to a remote responder over pi.events
+ * (REMOTE_QUESTION_CHANNEL); the first answer, local or remote, wins.
  */
 
+import { randomUUID } from 'node:crypto'
 import * as os from 'node:os'
 import * as path from 'node:path'
 import type { ExtensionAPI, ExtensionContext, Theme } from '@earendil-works/pi-coding-agent'
@@ -64,6 +67,26 @@ export interface QuestionSpec {
   multiSelect?: boolean
 }
 
+/** In-process, question-owned offer; arbitrary custom TUI components are not sent. */
+export const REMOTE_QUESTION_CHANNEL = 'pi-code:question:v1'
+export type RemoteQuestionOutcome = { action: 'answer'; indices: number[] } | { action: 'text'; text: string } | { action: 'cancel' } | { action: 'pass' }
+
+export interface RemoteQuestionOffer {
+  version: 1
+  requestId: string
+  sessionId: string
+  question: string
+  header?: string
+  options: OptionWithDesc[]
+  multiSelect: boolean
+  allowFreeText: boolean
+  signal: AbortSignal
+  /** Must be called during event emission; only one listener receives a settle handle. */
+  claim: () => ((outcome: RemoteQuestionOutcome) => boolean) | undefined
+  /** The claimed responder reports input activity to reset a configured idle timer. */
+  touch: () => boolean
+}
+
 /** Normalize either accepted shape into the list of questions to ask. */
 function questionList(params: Partial<QuestionSpec> & { questions?: QuestionSpec[] }): QuestionSpec[] {
   if (params.questions && params.questions.length > 0) return params.questions
@@ -194,19 +217,19 @@ export default function question(pi: ExtensionAPI) {
     // parallel leave the first unanswerable and the run unable to finish.
     executionMode: 'sequential',
 
-    async execute(_toolCallId, rawParams, _signal, _onUpdate, ctx) {
+    async execute(_toolCallId, rawParams, signal, _onUpdate, ctx) {
       const specs = questionList(rawParams as Partial<QuestionSpec> & { questions?: QuestionSpec[] })
       if (specs.length === 0) {
         return { content: [{ type: 'text', text: 'Error: No question provided' }], details: { question: '', options: [], answer: null } as QuestionDetails }
       }
-      if (specs.length === 1) return await askOne(specs[0], ctx)
+      if (specs.length === 1) return await askOne(specs[0], ctx, pi.events, signal)
 
       // Several questions are asked in sequence; a cancel ends the run, since the
       // remaining answers would be guesses about a flow the user just declined.
       const texts: string[] = []
       const collected: QuestionDetails[] = []
       for (const spec of specs) {
-        const result = await askOne(spec, ctx)
+        const result = await askOne(spec, ctx, pi.events, signal)
         const detail = result.details as QuestionDetails
         collected.push(detail)
         texts.push(`${spec.question}\n${result.content[0].text}`)
@@ -258,7 +281,135 @@ export default function question(pi: ExtensionAPI) {
   })
 }
 
-async function askOne(params: QuestionSpec, ctx: ExtensionContext): Promise<{ content: Array<{ type: 'text'; text: string }>; details: QuestionDetails }> {
+type QuestionAnswer = Awaited<ReturnType<typeof askViaOverlay>>
+
+/** A claimed offer raced against the open overlay: whichever answers first wins. */
+interface RemoteQuestion {
+  /** Routes remote answers into the overlay and remote activity into its idle timer. */
+  attach: (answer: (value: QuestionAnswer) => void, touch: () => void) => void
+  /** Ends the offer; the responder's settle handle and touch are rejected from then on. */
+  close: () => void
+}
+type RemoteOffer = { kind: 'settled'; value: QuestionAnswer } | { kind: 'claimed'; remote: RemoteQuestion }
+
+function validIndices(indices: unknown, count: number, multiSelect: boolean): indices is number[] {
+  if (!Array.isArray(indices) || (!multiSelect && indices.length !== 1)) return false
+  return new Set(indices).size === indices.length && indices.every((index) => Number.isInteger(index) && index >= 1 && index <= count)
+}
+
+/** A remote outcome as the answer it stands for: null is a cancel, undefined is a
+ * pass or anything this question cannot accept, which must never become an answer. */
+function remoteAnswer(outcome: RemoteQuestionOutcome, options: DisplayOption[], multiSelect: boolean): QuestionAnswer | undefined {
+  if (outcome === null || typeof outcome !== 'object') return undefined
+  if (outcome.action === 'cancel') return null
+  if (outcome.action === 'text') {
+    const text = typeof outcome.text === 'string' ? outcome.text.trim() : ''
+    return !multiSelect && text ? { answer: text, wasCustom: true } : undefined
+  }
+  if (outcome.action !== 'answer') return undefined
+  // Read once and copied, so a getter or Proxy cannot answer with other indices
+  // than the ones that passed validation.
+  const raw: unknown = outcome.indices
+  const indices: unknown = Array.isArray(raw) ? [...raw] : undefined
+  if (!validIndices(indices, options.length, multiSelect)) return undefined
+  const checked = options.map((_, index) => indices.includes(index + 1))
+  return { answer: selectedLabels(options, checked), wasCustom: false, ...(multiSelect ? {} : { index: indices[0] }) }
+}
+
+/** Undefined when nobody claims synchronously, so the overlay opens with no async gap. */
+function offerRemoteQuestion(params: QuestionSpec, allOptions: DisplayOption[], ctx: ExtensionContext, events: ExtensionAPI['events'] | undefined, signal: AbortSignal | undefined): RemoteOffer | undefined {
+  if (!events) return undefined
+  if (signal?.aborted) return { kind: 'settled', value: null }
+
+  const multiSelect = params.multiSelect === true
+  const controller = new AbortController()
+  let claimed = false
+  let early: { value: QuestionAnswer } | undefined
+  let deliver: ((value: QuestionAnswer) => void) | undefined
+  let touchOverlay: (() => void) | undefined
+  const close = (): void => {
+    controller.abort()
+    signal?.removeEventListener('abort', abort)
+  }
+  const settle = (value: QuestionAnswer): void => {
+    close()
+    if (deliver) deliver(value)
+    else early = { value }
+  }
+  // Pi aborts the turn before a session replacement invalidates ctx, so this is
+  // also the session-replacement path; ctx is never read after emission.
+  const abort = (): void => settle(null)
+  signal?.addEventListener('abort', abort, { once: true })
+
+  const offer: RemoteQuestionOffer = {
+    version: 1,
+    requestId: randomUUID(),
+    sessionId: ctx.sessionManager.getSessionId(),
+    question: params.question,
+    header: shortHeader(params.header),
+    options: params.options.map(({ label, description }) => ({ label, ...(description === undefined ? {} : { description }) })),
+    multiSelect,
+    allowFreeText: allOptions.some((option) => option.isOther === true),
+    signal: controller.signal,
+    claim: () => {
+      if (claimed || controller.signal.aborted) return undefined
+      claimed = true
+      return (outcome) => {
+        if (controller.signal.aborted) return false
+        const value = remoteAnswer(outcome, params.options, multiSelect)
+        if (value !== undefined) {
+          settle(value)
+          return true
+        }
+        // A pass or invalid reply only withdraws the remote side; the overlay stays
+        // open, and a turn abort must still cancel it.
+        controller.abort()
+        return outcome?.action === 'pass'
+      }
+    },
+    touch: () => {
+      if (!claimed || controller.signal.aborted) return false
+      touchOverlay?.()
+      return true
+    },
+  }
+
+  events.emit(REMOTE_QUESTION_CHANNEL, offer)
+  if (early) return { kind: 'settled', value: early.value }
+  if (!claimed || controller.signal.aborted) {
+    close()
+    return undefined
+  }
+  return {
+    kind: 'claimed',
+    remote: {
+      attach: (answer, touch) => {
+        deliver = answer
+        touchOverlay = touch
+      },
+      close,
+    },
+  }
+}
+
+/** ui.custom() is terminal-only: with a UI but no terminal (RPC mode) it resolves
+ * undefined immediately, which would read as a cancel without ever asking. Ask
+ * through the dialog primitives there instead. askUserQuestionTimeout is a TUI
+ * concept (a countdown, a keypress resetting it): the dialog-primitive fallback
+ * has no keyboard or visible countdown to drive it, so it is not applied there. */
+async function collectAnswer(params: QuestionSpec, ctx: ExtensionContext, allOptions: DisplayOption[], multiSelect: boolean, events?: ExtensionAPI['events'], signal?: AbortSignal): Promise<QuestionAnswer> {
+  if (ctx.mode !== 'tui') return askViaDialogs(params, ctx, allOptions, multiSelect)
+  const offer = offerRemoteQuestion(params, allOptions, ctx, events, signal)
+  if (offer?.kind === 'settled') return offer.value
+  const remote = offer?.remote
+  try {
+    return await askViaOverlay(params, ctx, allOptions, multiSelect, askUserQuestionTimeoutMs(), remote)
+  } finally {
+    remote?.close()
+  }
+}
+
+async function askOne(params: QuestionSpec, ctx: ExtensionContext, events?: ExtensionAPI['events'], signal?: AbortSignal): Promise<{ content: Array<{ type: 'text'; text: string }>; details: QuestionDetails }> {
   if (!ctx.hasUI) {
     return {
       content: [{ type: 'text', text: 'Error: UI not available (running in non-interactive mode)' }],
@@ -281,12 +432,7 @@ async function askOne(params: QuestionSpec, ctx: ExtensionContext): Promise<{ co
   // The free-text option does not compose with checkbox selection, so it is single-select only.
   const allOptions: DisplayOption[] = multiSelect ? [...params.options] : [...params.options, { label: 'Type something.', isOther: true }]
 
-  // ui.custom() is terminal-only: with a UI but no terminal (RPC mode) it resolves
-  // undefined immediately, which would read as a cancel without ever asking. Ask
-  // through the dialog primitives there instead. askUserQuestionTimeout is a TUI
-  // concept (a countdown, a keypress resetting it): the dialog-primitive fallback
-  // has no keyboard or visible countdown to drive it, so it is not applied there.
-  const result = ctx.mode === 'tui' ? await askViaOverlay(params, ctx, allOptions, multiSelect, askUserQuestionTimeoutMs()) : await askViaDialogs(params, ctx, allOptions, multiSelect)
+  const result = await collectAnswer(params, ctx, allOptions, multiSelect, events, signal)
 
   // Build simple options list for details; header/multiSelect appear only when set,
   // so single-select details are unchanged.
@@ -345,7 +491,7 @@ const IDLE_TICK_MS = 250
  * mechanics are testable directly, independent of where timeoutMs itself is read
  * from (askUserQuestionTimeoutMs, tested separately).
  */
-export function askViaOverlay(params: QuestionSpec, ctx: ExtensionContext, allOptions: DisplayOption[], multiSelect: boolean, timeoutMs?: number): Promise<{ answer: string; wasCustom: boolean; index?: number; timedOut?: boolean } | null> {
+export function askViaOverlay(params: QuestionSpec, ctx: ExtensionContext, allOptions: DisplayOption[], multiSelect: boolean, timeoutMs?: number, remote?: RemoteQuestion): Promise<{ answer: string; wasCustom: boolean; index?: number; timedOut?: boolean } | null> {
   return ctx.ui.custom<{ answer: string; wasCustom: boolean; index?: number; timedOut?: boolean } | null>((tui: Parameters<Parameters<ExtensionContext['ui']['custom']>[0]>[0], theme: Theme, _kb: unknown, done: (value: { answer: string; wasCustom: boolean; index?: number; timedOut?: boolean } | null) => void) => {
     let optionIndex = 0
     let editMode = false
@@ -368,6 +514,8 @@ export function askViaOverlay(params: QuestionSpec, ctx: ExtensionContext, allOp
      * here, so the interval can never outlive the overlay it belongs to. */
     function finish(value: { answer: string; wasCustom: boolean; index?: number; timedOut?: boolean } | null): void {
       stopIdleTimer()
+      // Closed before done, so a remote reply racing a local answer is rejected.
+      remote?.close()
       done(value)
     }
 
@@ -376,6 +524,8 @@ export function askViaOverlay(params: QuestionSpec, ctx: ExtensionContext, allOp
       deadline = Date.now() + timeoutMs
     }
 
+    remote?.attach(finish, resetIdleTimer)
+
     function fireTimeout(): void {
       // Claude: "submits any options you'd already selected". Single-select has
       // nothing pre-committed (a selection only exists once Enter confirms it), so

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-code",
-  "version": "1.0.77",
+  "version": "1.1.0",
   "description": "Claude Code experience for the pi coding agent: reads your .claude config (rules, commands, skills, hooks, output styles, MCP servers, agents) and adds todo, checkpoints, memory, web, subagents, and goals",
   "keywords": [
     "pi",