ompchamber 0.6.0 → 0.8.0

package/src/client/components/workspace/chat-timeline/index.tsx

@@ -1,6 +1,9 @@
 import { useCallback, useMemo, useState } from 'preact/hooks';
 import { useSearchParams } from '@/client/lib/router/search-params';
-import { AskDialog } from '@/client/components/workspace/chat-timeline/tool-renderers/ask-dialog/Lazy';
+import { ExtensionDialog } from '@/client/components/workspace/chat-timeline/tool-renderers/extension-dialog/Lazy';
+import { AskFramesContext, splitAskFrames, type AskFramesHandle } from '@/client/hooks/chat/timeline/ask-frames';
+import type { ExtensionUiDialogRequest } from '@/shared/types/omp/agent';
+import type { ExtensionDialogResponse } from '@/client/components/workspace/chat-timeline/tool-renderers/extension-dialog/Lazy';
 import { EmptyWorkspacePrompt } from '@/client/components/workspace/chat-timeline/EmptyWorkspacePrompt';
 import { SessionSkeleton } from '@/client/components/workspace/chat-timeline/SessionSkeleton';
 import { UndoConfirmModal } from '@/client/components/workspace/chat-timeline/UndoConfirmModal';
@@ -71,12 +74,27 @@ export function ChatTimeline({ className = '', appSettings = {}, onSessionTitle,
     accessMode,
     handleAccessModeChange,
     composerModelRef,
-    extensionDialog,
-    closeExtensionDialog,
+    extensionDialogs,
+    resolveExtensionDialog,
     respondToExtensionUi,
   } = useChatTimeline({ folders, appSettings });
   const { toasts, pushToast, dismissToast } = useToasts();
 
+  // Ask dialogs render on their own tool card; anything else omp is blocked on
+  // (an approval gate, an extension picker) has no card and keeps the modal.
+  const { framesByTool, modalRequest } = useMemo(
+    () => splitAskFrames(localMessages, extensionDialogs),
+    [localMessages, extensionDialogs],
+  );
+  const respondToFrame = useCallback((request: ExtensionUiDialogRequest, response: ExtensionDialogResponse) => {
+    void respondToExtensionUi(request, response);
+    resolveExtensionDialog(request.id);
+  }, [respondToExtensionUi, resolveExtensionDialog]);
+  const askFrames = useMemo<AskFramesHandle>(
+    () => ({ framesByTool, respond: respondToFrame }),
+    [framesByTool, respondToFrame],
+  );
+
   const [newChatInitialContent, setNewChatInitialContent] = useState<string | null>(null);
   const { pendingUndo, undoing, requestUndo: handleRequestUndo, closeUndoConfirm, confirmUndo } = useUndoConfirmation(handleUndo);
   const [searchParams, setSearchParams] = useSearchParams();
@@ -170,118 +188,114 @@ export function ChatTimeline({ className = '', appSettings = {}, onSessionTitle,
   }
 
   return (
-    <div className={`flex flex-col h-full min-h-0 overflow-hidden bg-canvas relative ${className}`}>
-      {showFullSkeleton ? (
-        <SessionSkeleton />
-      ) : (
-        <>
-          {/* Main chat container wrapper */}
-          <div className="relative flex-1 min-h-0 flex flex-col">
-            {activeSubagent ? (
-              <SubagentView
-                sessionId={sessionId}
-                subagent={activeSubagent}
-                onBack={handleSubagentBack}
-                provider={sessionProvider}
-                providerNames={providerNames}
-              />
-            ) : (
-              <TimelineBody
+    <AskFramesContext.Provider value={askFrames}>
+      <div className={`flex flex-col h-full min-h-0 overflow-hidden bg-canvas relative ${className}`}>
+        {showFullSkeleton ? (
+          <SessionSkeleton />
+        ) : (
+          <>
+            {/* Main chat container wrapper */}
+            <div className="relative flex-1 min-h-0 flex flex-col">
+              {activeSubagent ? (
+                <SubagentView
+                  sessionId={sessionId}
+                  subagent={activeSubagent}
+                  onBack={handleSubagentBack}
+                  provider={sessionProvider}
+                  providerNames={providerNames}
+                />
+              ) : (
+                <TimelineBody
+                  isMobile={isMobile}
+                  userMessages={userMessages}
+                  onScrollTo={handleScrollTo}
+                  scrollRef={scrollRef}
+                  contentRef={contentRef}
+                  handleScroll={handleScroll}
+                  isScrolling={isScrolling}
+                  loadingOlder={loadingOlder}
+                  hasMore={hasMore}
+                  loadOlderError={loadOlderError}
+                  loadOlder={loadOlder}
+                  messages={localMessages}
+                  isGenerating={isGenerating}
+                  provider={sessionProvider}
+                  providerNames={providerNames}
+                  modelName={sessionModelName}
+                  modelNames={modelNames}
+                  thinkingLevel={sessionData?.thinkingLevel}
+                  onUndo={handleRequestUndo}
+                  onRetry={handleRetry}
+                  onNewChat={handleNewChat}
+                  showScrollBottom={showScrollBottom}
+                  jumpToBottom={jumpToBottom}
+                />
+              )}
+            </div>
+
+            {/* Input Area Footer with Docked Generating Indicator (Seamless & Transparent) */}
+            {!activeSubagent && (
+              <ComposerDock
                 isMobile={isMobile}
-                userMessages={userMessages}
-                onScrollTo={handleScrollTo}
-                scrollRef={scrollRef}
-                contentRef={contentRef}
-                handleScroll={handleScroll}
-                isScrolling={isScrolling}
-                loadingOlder={loadingOlder}
-                hasMore={hasMore}
-                loadOlderError={loadOlderError}
-                loadOlder={loadOlder}
-                messages={localMessages}
                 isGenerating={isGenerating}
+                modelName={sessionModelName}
+                generatingVerb={generatingVerb}
                 provider={sessionProvider}
                 providerNames={providerNames}
-                modelName={sessionModelName}
-                modelNames={modelNames}
-                thinkingLevel={sessionData?.thinkingLevel}
-                onUndo={handleRequestUndo}
-                onRetry={handleRetry}
-                onNewChat={handleNewChat}
-                showScrollBottom={showScrollBottom}
-                jumpToBottom={jumpToBottom}
+                messageQueue={messageQueue}
+                setMessageQueue={setMessageQueue}
+                onEditQueueItem={handleEditQueueItem}
+                onSendNowQueueItem={handleSendNowQueueItem}
+                steeringQueue={steeringQueue}
+                setSteeringQueue={setSteeringQueue}
+                inputValue={inputValue}
+                setInputValue={setInputValue}
+                rootPath={composerRoot}
+                attachments={inputAttachments}
+                setAttachments={setInputAttachments}
+                onSend={handleSend}
+                onStop={handleStop}
+                appSettings={appSettings}
+                onThinkingLevelChange={handleThinkingLevelChange}
+                onModelChange={handleModelChange}
+                accessMode={accessMode}
+                onAccessModeChange={handleAccessModeChange}
+                composerModelRef={composerModelRef}
+                sessionModel={typeof sessionData?.model === 'object' ? sessionData.model : null}
+                sessionThinkingLevel={sessionData?.thinkingLevel}
+                variant={variant}
               />
             )}
-          </div>
-
-          {/* Input Area Footer with Docked Generating Indicator (Seamless & Transparent) */}
-          {!activeSubagent && (
-            <ComposerDock
-              isMobile={isMobile}
-              isGenerating={isGenerating}
-              modelName={sessionModelName}
-              generatingVerb={generatingVerb}
-              provider={sessionProvider}
-              providerNames={providerNames}
-              messageQueue={messageQueue}
-              setMessageQueue={setMessageQueue}
-              onEditQueueItem={handleEditQueueItem}
-              onSendNowQueueItem={handleSendNowQueueItem}
-              steeringQueue={steeringQueue}
-              setSteeringQueue={setSteeringQueue}
-              inputValue={inputValue}
-              setInputValue={setInputValue}
-              rootPath={composerRoot}
-              attachments={inputAttachments}
-              setAttachments={setInputAttachments}
-              onSend={handleSend}
-              onStop={handleStop}
-              appSettings={appSettings}
-              onThinkingLevelChange={handleThinkingLevelChange}
-              onModelChange={handleModelChange}
-              accessMode={accessMode}
-              onAccessModeChange={handleAccessModeChange}
-              composerModelRef={composerModelRef}
-              sessionModel={typeof sessionData?.model === 'object' ? sessionData.model : null}
-              sessionThinkingLevel={sessionData?.thinkingLevel}
-              variant={variant}
-            />
-          )}
-        </>
-      )}
+          </>
+        )}
 
-      {pendingUndo && (
-        <UndoConfirmModal
-          isOmpSession={Boolean(sessionId) && !sessionId.startsWith('new-') && Number.isNaN(Number(sessionId))}
-          content={pendingUndo.content}
-          undoing={undoing}
-          onClose={closeUndoConfirm}
-          onConfirm={confirmUndo}
-        />
-      )}
-      {newChatInitialContent !== null && (
-        <NewChatModal
-          initialContent={newChatInitialContent}
-          onClose={() => setNewChatInitialContent(null)}
-          onSend={submitNewChat}
-          appSettings={appSettings}
-          accessMode={accessMode}
-          onAccessModeChange={handleAccessModeChange}
-          composerModelRef={composerModelRef}
-        />
-      )}
+        {pendingUndo && (
+          <UndoConfirmModal
+            isOmpSession={Boolean(sessionId) && !sessionId.startsWith('new-') && Number.isNaN(Number(sessionId))}
+            content={pendingUndo.content}
+            undoing={undoing}
+            onClose={closeUndoConfirm}
+            onConfirm={confirmUndo}
+          />
+        )}
+        {newChatInitialContent !== null && (
+          <NewChatModal
+            initialContent={newChatInitialContent}
+            onClose={() => setNewChatInitialContent(null)}
+            onSend={submitNewChat}
+            appSettings={appSettings}
+            accessMode={accessMode}
+            onAccessModeChange={handleAccessModeChange}
+            composerModelRef={composerModelRef}
+          />
+        )}
 
-      {extensionDialog && (
-        <AskDialog
-          request={extensionDialog}
-          onRespond={(request, response) => {
-            void respondToExtensionUi(request, response);
-            closeExtensionDialog();
-          }}
-        />
-      )}
+        {modalRequest && (
+          <ExtensionDialog request={modalRequest} onRespond={respondToFrame} />
+        )}
 
-      <ToastStack toasts={toasts} onDismiss={dismissToast} />
-    </div>
+        <ToastStack toasts={toasts} onDismiss={dismissToast} />
+      </div>
+    </AskFramesContext.Provider>
   );
 }

package/src/client/components/workspace/chat-timeline/tool-renderers/ask-panel/FrameControl.tsx

@@ -0,0 +1,172 @@
+/**
+ * @license
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * The control for the dialog omp is currently blocked on.
+ *
+ * The option list is rendered from the FRAME, never from the tool arguments:
+ * omp decorates it on its way out — ` (Recommended)` on the suggested choice,
+ * `Other (type your own)` appended to every question, and whichever label ends a
+ * multi-select sweep — and those exact strings are what omp compares a response
+ * against. Reproducing them locally would only risk sending a label omp does not
+ * recognise.
+ */
+
+import { useEffect, useState } from 'preact/hooks';
+import { Check, CornerDownLeft } from 'lucide-preact';
+import type { ExtensionUiDialogRequest } from '@/shared/types/omp/agent';
+import { isOtherOption } from '@/shared/lib/chat/ask-questions';
+import type { ExtensionDialogResponse } from '@/client/components/workspace/chat-timeline/tool-renderers/extension-dialog/Lazy';
+
+interface FrameControlProps {
+  frame: ExtensionUiDialogRequest;
+  /** Question picks several options, so every row toggles instead of answering. */
+  multi: boolean;
+  /** Labels already toggled on a multi-select question — display only. */
+  selected: string[];
+  /** Commit a single-choice answer; sent as soon as omp is listening for it. */
+  onAnswer: (value: string) => void;
+  /** Send one multi-select toggle. */
+  onToggle: (label: string) => void;
+  /** Answer a dialog that is not a choice list (confirm / input / editor). */
+  onRespond: (response: ExtensionDialogResponse) => void;
+}
+
+const RECOMMENDED = / \(recommended\)$/i;
+const DONE_ROW = /\bdone\b/i;
+
+export function FrameControl({ frame, multi, selected, onAnswer, onToggle, onRespond }: FrameControlProps) {
+  const [text, setText] = useState('');
+  // A new dialog reuses this component; text left over from the previous one
+  // must not read as an answer the user just typed.
+  useEffect(() => {
+    setText(frame.method === 'editor' ? frame.prefill ?? '' : '');
+  }, [frame.id, frame.method, frame.prefill]);
+
+  if (frame.method === 'confirm') {
+    return (
+      <div className="mt-2 flex items-center gap-2">
+        <button
+          type="button"
+          onClick={() => onRespond({ confirmed: true })}
+          className="flex cursor-pointer items-center gap-1.5 rounded-md bg-ink px-3 py-1 text-[11.5px] font-semibold text-paper transition-opacity hover:opacity-90"
+        >
+          <Check size={11} />
+          <span>Confirm</span>
+        </button>
+        <button
+          type="button"
+          onClick={() => onRespond({ confirmed: false })}
+          className="cursor-pointer rounded-md border border-ink/15 px-3 py-1 text-[11.5px] font-medium text-ink/70 transition-colors hover:border-ink/30 hover:text-ink"
+        >
+          Decline
+        </button>
+      </div>
+    );
+  }
+
+  if (frame.method === 'input' || frame.method === 'editor') {
+    return (
+      <div className="mt-2 space-y-1.5">
+        {frame.title && <div className="text-[10.5px] text-ink/45">{frame.title}</div>}
+        {frame.method === 'editor' ? (
+          <textarea
+            autoFocus
+            value={text}
+            onChange={(event) => setText(event.currentTarget.value)}
+            rows={4}
+            placeholder={frame.placeholder || 'Type your answer…'}
+            className="w-full rounded-md border border-ink/15 bg-canvas/40 px-2.5 py-1.5 font-mono text-[11.5px] leading-relaxed text-ink outline-none focus:border-ink"
+          />
+        ) : (
+          <input
+            autoFocus
+            value={text}
+            placeholder={frame.placeholder || 'Type your answer…'}
+            onChange={(event) => setText(event.currentTarget.value)}
+            onKeyDown={(event) => {
+              if (event.key !== 'Enter') return;
+              event.preventDefault();
+              onRespond({ value: text });
+            }}
+            className="w-full rounded-md border border-ink/15 bg-canvas/40 px-2.5 py-1.5 text-[11.5px] text-ink outline-none focus:border-ink"
+          />
+        )}
+        <button
+          type="button"
+          onClick={() => onRespond({ value: text })}
+          className="flex cursor-pointer items-center gap-1.5 rounded-md bg-ink px-3 py-1 text-[11.5px] font-semibold text-paper transition-opacity hover:opacity-90"
+        >
+          <span>Submit</span>
+          <CornerDownLeft size={11} className="opacity-70" />
+        </button>
+      </div>
+    );
+  }
+
+  const options = frame.options ?? [];
+  const details = frame.optionDetails ?? [];
+  if (frame.method !== 'select' || options.length === 0) return null;
+
+  return (
+    <div className="mt-2 space-y-1" role={multi ? 'group' : 'radiogroup'}>
+      {options.map((label, index) => {
+        // A single-choice question resolves "Other" to the typed text, so the
+        // row itself is a prompt to type — never a literal answer.
+        if (!multi && isOtherOption(label)) return null;
+        const description = details[index]?.description;
+        const checked = multi && selected.includes(label);
+        const finish = multi && DONE_ROW.test(label);
+        return (
+          <button
+            key={label}
+            type="button"
+            onClick={() => (multi ? (finish ? onRespond({ value: label }) : onToggle(label)) : onAnswer(label))}
+            className={`flex w-full cursor-pointer items-start gap-2 rounded-md border px-2.5 py-1.5 text-left text-[11.5px] transition-colors ${
+              checked
+                ? 'border-ink/30 bg-ink/5 text-ink'
+                : finish
+                  ? 'border-ink/20 bg-canvas/60 font-medium text-ink hover:border-ink/40'
+                  : 'border-ink/8 bg-canvas/30 text-ink/80 hover:border-ink/25 hover:bg-ink/5 hover:text-ink'
+            }`}
+          >
+            <span
+              className={`mt-1 h-3 w-3 shrink-0 ${multi ? 'rounded-[3px]' : 'rounded-full'} border ${
+                checked ? 'border-ink bg-ink' : 'border-ink/30'
+              }`}
+            />
+            <span className="min-w-0 flex-1">
+              <span className="flex items-center gap-1.5 font-medium">
+                <span className="truncate">{label}</span>
+                {RECOMMENDED.test(label) && !multi && (
+                  <span className="shrink-0 rounded-full bg-ink/5 px-1.5 py-px font-mono text-[9px] uppercase tracking-wider text-ink/45">
+                    Suggested
+                  </span>
+                )}
+              </span>
+              {description && (
+                <span className="mt-0.5 block text-[10.5px] leading-relaxed text-ink/50">{description}</span>
+              )}
+            </span>
+          </button>
+        );
+      })}
+
+      {!multi && (
+        <input
+          value={text}
+          placeholder="Other — type your own answer…"
+          onChange={(event) => setText(event.currentTarget.value)}
+          onKeyDown={(event) => {
+            if (event.key !== 'Enter' || !text.trim()) return;
+            event.preventDefault();
+            onAnswer(text.trim());
+          }}
+          className="w-full rounded-md border border-ink/15 bg-canvas/40 px-2.5 py-1.5 text-[11.5px] text-ink outline-none focus:border-ink"
+        />
+      )}
+    </div>
+  );
+}

package/src/client/components/workspace/chat-timeline/tool-renderers/ask-panel/QuestionBlock.tsx

@@ -0,0 +1,155 @@
+/**
+ * @license
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * One question of an `ask` call, in whichever of its three states it is in:
+ * answered (omp already recorded it), asking (its dialog is live) or still
+ * queued behind an earlier question — omp asks them strictly in order, so the
+ * later ones can only be previewed until their turn comes.
+ */
+
+import { CheckCircle2, Clock } from 'lucide-preact';
+import { MarkdownRenderer } from '@/client/components/common/MarkdownRenderer';
+import type { ExtensionUiDialogRequest } from '@/shared/types/omp/agent';
+import type { AskAnswer, AskQuestion } from '@/shared/lib/chat/ask-questions';
+import { FrameControl } from '@/client/components/workspace/chat-timeline/tool-renderers/ask-panel/FrameControl';
+import type { ExtensionDialogResponse } from '@/client/components/workspace/chat-timeline/tool-renderers/extension-dialog/Lazy';
+
+interface QuestionBlockProps {
+  index: number;
+  total: number;
+  question: AskQuestion;
+  /** Dialogs this question raised, oldest first; the last one is live. */
+  frames: ExtensionUiDialogRequest[];
+  recorded: AskAnswer | null;
+  /** Answer picked locally for a question omp has not reached yet. */
+  draft?: string;
+  /** Unanswered, but omp has already moved past it — its dialog is gone. */
+  passed: boolean;
+  /** Labels toggled locally on a multi-select question. */
+  multiSelected: string[];
+  onAnswer: (value: string) => void;
+  onToggle: (label: string) => void;
+  onRespond: (response: ExtensionDialogResponse) => void;
+}
+
+function answerParts(answer: AskAnswer): string[] {
+  const parts = [...answer.selectedOptions];
+  if (answer.customInput) parts.push(answer.customInput);
+  return parts;
+}
+
+export function QuestionBlock({
+  index,
+  total,
+  question,
+  frames,
+  recorded,
+  draft,
+  passed,
+  multiSelected,
+  onAnswer,
+  onToggle,
+  onRespond,
+}: QuestionBlockProps) {
+  const live = frames.length > 0 ? frames[frames.length - 1] : null;
+  const answered = recorded ? answerParts(recorded) : draft ? [draft] : multiSelected;
+  const asking = Boolean(live) && !recorded && (question.multi || !draft);
+
+  return (
+    <div className="rounded-lg border border-ink/10 bg-paper p-2.5 shadow-xs">
+      <div className="flex items-start gap-2">
+        <span className="mt-px flex h-4 w-4 shrink-0 items-center justify-center rounded bg-ink/5 font-mono text-[9px] font-semibold text-ink/60">
+          {index + 1}
+        </span>
+        <div className="min-w-0 flex-1">
+          <div className="flex items-center gap-1.5">
+            <span className="text-[9px] font-semibold uppercase tracking-wider text-ink/40">
+              {question.header ?? `Question ${index + 1}`}
+            </span>
+            {question.multi && (
+              <span className="rounded-full bg-ink/5 px-1.5 py-px font-mono text-[8.5px] text-ink/45">multi</span>
+            )}
+            {total > 1 && (
+              <span className="ml-auto font-mono text-[9px] text-ink/35">
+                {index + 1}/{total}
+              </span>
+            )}
+          </div>
+
+          <div className="mt-1 text-[12.5px] leading-relaxed text-ink/90 select-text">
+            <MarkdownRenderer content={question.question} />
+          </div>
+
+          {asking && live && (
+            <FrameControl
+              frame={live}
+              multi={question.multi}
+              selected={multiSelected}
+              onAnswer={onAnswer}
+              onToggle={onToggle}
+              onRespond={onRespond}
+            />
+          )}
+
+          {answered.length > 0 && (
+            <div className="mt-2 flex flex-wrap items-center gap-1.5">
+              <CheckCircle2 size={11} className="shrink-0 text-success" />
+              {answered.map((part) => (
+                <span
+                  key={part}
+                  className="rounded-md border border-ink/12 bg-canvas/40 px-2 py-0.5 text-[11.5px] font-medium text-ink select-text"
+                >
+                  {part}
+                </span>
+              ))}
+              {recorded?.timedOut && (
+                <span className="rounded-full bg-ink/5 px-1.5 py-px font-mono text-[9px] text-ink/45">
+                  auto-selected on timeout
+                </span>
+              )}
+            </div>
+          )}
+
+          {!asking && answered.length === 0 && passed && (
+            <div className="mt-2 flex items-center gap-1.5 text-[10.5px] text-ink/45">
+              <CheckCircle2 size={11} className="shrink-0 text-ink/35" />
+              <span>Answered earlier in this run.</span>
+            </div>
+          )}
+
+          {!asking && answered.length === 0 && !passed && (
+            <div className="mt-2 space-y-1 border-t border-ink/6 pt-2">
+              {question.options.map((option, optionIndex) => (
+                <div key={option.label} className="flex items-start gap-2 px-0.5 text-[11.5px] text-ink/45">
+                  <span className="mt-1 h-3 w-3 shrink-0 rounded-full border border-ink/20" />
+                  <span className="min-w-0 flex-1">
+                    <span className="block truncate">
+                      {option.label}
+                      {question.recommended === optionIndex && (
+                        <span className="ml-1.5 font-mono text-[9px] uppercase tracking-wider text-ink/35">
+                          suggested
+                        </span>
+                      )}
+                    </span>
+                    {option.description && (
+                      <span className="mt-0.5 block text-[10.5px] leading-relaxed text-ink/35">
+                        {option.description}
+                      </span>
+                    )}
+                  </span>
+                </div>
+              ))}
+              <div className="flex items-center gap-1.5 pt-0.5 text-[10.5px] text-ink/40">
+                <Clock size={10} className="shrink-0" />
+                <span>Waiting for the previous answer…</span>
+              </div>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}