@agimon-ai/doompi-user-feedback 0.0.1-alpha.34 → 0.0.1-alpha.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agimon-ai/doompi-user-feedback",
-  "version": "0.0.1-alpha.34",
+  "version": "0.0.1-alpha.35",
   "description": "Structured user questions with interactive and autonomous Voice handoff for Pi agents.",
   "keywords": [
     "ai",
@@ -27,7 +27,8 @@
   },
   "files": [
     "dist",
-    "web",
+    "src/web",
+    "src/exports/webClient.ts",
     "src/types/askUserWire.ts",
     "src/types/questionnaire.ts",
     "README.md",
@@ -57,10 +58,10 @@
   "dependencies": {
     "@deepseek-ai/cordis": "4.0.1",
     "typebox": "1.3.19",
-    "@agimon-ai/doompi-extension-contracts": "0.0.1-alpha.44",
-    "@agimon-ai/doompi-web-components": "0.0.1-alpha.5",
-    "@agimon-ai/doompi-web-contracts": "0.0.1-alpha.8",
-    "@agimon-ai/doompi-ui": "0.0.1-alpha.45"
+    "@agimon-ai/doompi-extension-contracts": "0.0.1-alpha.45",
+    "@agimon-ai/doompi-ui": "0.0.1-alpha.46",
+    "@agimon-ai/doompi-web-components": "0.0.1-alpha.6",
+    "@agimon-ai/doompi-web-contracts": "0.0.1-alpha.9"
   },
   "devDependencies": {
     "@earendil-works/pi-coding-agent": "0.84.4",
@@ -93,7 +94,7 @@
   "doompiWeb": {
     "pluginId": "ask-user",
     "channels": [],
-    "client": "./web/index.ts"
+    "client": "./src/exports/webClient.ts"
   },
   "pi": {
     "extensions": [
@@ -103,7 +104,7 @@
   "scripts": {
     "build": "tsdown",
     "test": "vitest --run",
-    "typecheck": "tsc --noEmit && tsc --noEmit -p web/tsconfig.json",
+    "typecheck": "tsc --noEmit && tsc --noEmit -p src/web/tsconfig.json",
     "lint": "oxlint . && oxfmt . --check",
     "fixcode": "oxlint . --fix && oxfmt ."
   }

package/src/exports/webClient.ts

@@ -0,0 +1 @@
+export { webPlugin } from '../web/index.ts';

package/{web → src/web}/QuestionnairePrompt.tsx

@@ -10,8 +10,8 @@ import {
   Textarea,
 } from '@agimon-ai/doompi-web-components';
 import type { ToolPromptRenderProps } from '@agimon-ai/doompi-web-contracts';
-import { useEffect, useMemo, useRef, useState } from 'react';
-import { encodeAnswerEnvelope } from '../src/types/askUserWire.ts';
+import { type KeyboardEvent, useEffect, useMemo, useRef, useState } from 'react';
+import { encodeAnswerEnvelope } from '../types/askUserWire.ts';
 import {
   chooseOption,
   CUSTOM_LABEL,
@@ -70,6 +70,23 @@ function StepBar({
   );
 }
 
+/**
+ * The frame's shortcuts stop at a text field: while the caret is in one the
+ * arrows and Enter belong to the field, so they are kept from bubbling. Enter
+ * commits the field the way the terminal editor does, Shift+Enter writes a
+ * newline, and Escape and Cmd/Ctrl+Enter still reach the frame.
+ */
+function fieldKeys(commit: () => void) {
+  return (event: KeyboardEvent<HTMLTextAreaElement>): void => {
+    if (event.key === 'Escape') return;
+    if (event.key === 'Enter' && (event.metaKey || event.ctrlKey)) return;
+    event.stopPropagation();
+    if (event.key !== 'Enter' || event.shiftKey) return;
+    event.preventDefault();
+    commit();
+  };
+}
+
 /** One question's options, its typed-answer row, and the preview of whatever is focused. */
 function QuestionBody({
   question,
@@ -78,6 +95,7 @@ function QuestionBody({
   cursor,
   onCursor,
   onDraft,
+  onCommit,
 }: {
   question: PromptQuestion;
   index: number;
@@ -86,6 +104,8 @@ function QuestionBody({
   onCursor: (cursor: number) => void;
   /** `settles` is true only for an edit that finishes the question, which is what may move on. */
   onDraft: (draft: QuestionnaireDraft, settles: boolean) => void;
+  /** Enter in a text field: hands the keyboard back to the frame, settling the question or not. */
+  onCommit: (settles: boolean) => void;
 }) {
   const entry = draftEntry(draft, index);
   const typing = entry.custom !== null;
@@ -152,6 +172,7 @@ function QuestionBody({
             value={entry.custom ?? ''}
             placeholder="type your answer…"
             onChange={(event) => onDraft(setCustom(draft, index, event.target.value), false)}
+            onKeyDown={fieldKeys(() => onCommit(true))}
             className="text-[12px]"
           />
         </div>
@@ -174,6 +195,7 @@ function QuestionBody({
           value={entry.notes}
           placeholder="anything the options do not cover"
           onChange={(event) => onDraft(setNotes(draft, index, event.target.value), false)}
+          onKeyDown={fieldKeys(() => onCommit(false))}
           className="text-[11px]"
         />
       </div>
@@ -199,6 +221,9 @@ export function QuestionnairePrompt({ args, dialog, answer, cancel }: ToolPrompt
 
   // A new request is a new questionnaire; nothing from the last one carries over.
   useEffect(() => {
+    // Remounting on dialog.id would be the alternative, but the prompt host owns the
+    // element, so the reset lives here.
+    // oxlint-disable-next-line react/set-state-in-effect
     setDraft(emptyDraft(questions.length));
     setCurrent(0);
     setCursor(0);
@@ -262,6 +287,11 @@ export function QuestionnairePrompt({ args, dialog, answer, cancel }: ToolPrompt
           cancel();
           return;
         }
+        if (event.key === 'Enter' && (event.metaKey || event.ctrlKey)) {
+          event.preventDefault();
+          submit();
+          return;
+        }
         // While typing an answer the arrows belong to the textarea.
         if (typing) return;
         if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {
@@ -279,7 +309,7 @@ export function QuestionnairePrompt({ args, dialog, answer, cancel }: ToolPrompt
         if (event.key === 'Enter') {
           event.preventDefault();
           const option = question.options[cursor];
-          if (event.metaKey || event.ctrlKey || option === undefined) {
+          if (option === undefined) {
             submit();
             return;
           }
@@ -305,6 +335,10 @@ export function QuestionnairePrompt({ args, dialog, answer, cancel }: ToolPrompt
           cursor={cursor}
           onCursor={setCursor}
           onDraft={(next, settles) => move(next, current, settles)}
+          onCommit={(settles) => {
+            frame.current?.focus();
+            move(draft, current, settles);
+          }}
         />
       </div>
 

package/{web → src/web}/questionnaireDraft.ts

@@ -10,7 +10,7 @@
  * A step the reader goes back to still has what they chose, and the agent is
  * asked once rather than once per question.
  */
-import type { QuestionAnswer } from '../src/types/questionnaire.ts';
+import type { QuestionAnswer } from '../types/questionnaire.ts';
 
 /** The row every question gets, so a reader always has a way past a bad set of options. */
 export const CUSTOM_LABEL = 'Type something.';

package/{web → src/web}/tsconfig.json

@@ -19,5 +19,5 @@
     "forceConsistentCasingInFileNames": true,
     "types": ["node"]
   },
-  "include": [".", "../src/types"]
+  "include": [".", "../types", "../exports/webClient.ts"]
 }