ompchamber 1.2.1 → 2.0.1

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

@@ -26,6 +26,13 @@ interface AiMessageFooterProps {
   onRetry?: (msgId: string) => void;
   onNewChat?: (content: string) => void;
   isMobile?: boolean;
+  /**
+   * Whether the row offers Retry / New-chat. Both act on the CHAT (re-run a chat
+   * turn, branch a chat session from an answer), so a footer that describes a
+   * row the chat does not own — the BTW panel's side answer — turns them off
+   * instead of rendering buttons that do nothing.
+   */
+  showActions?: boolean;
 }
 
 export function AiMessageFooter({
@@ -41,6 +48,7 @@ export function AiMessageFooter({
   onRetry,
   onNewChat,
   isMobile = false,
+  showActions = true,
 }: AiMessageFooterProps) {
   const [isMenuOpen, setIsMenuOpen] = useState(false);
 
@@ -198,14 +206,18 @@ export function AiMessageFooter({
                   wrapLabel
                   onClick={() => setIsMenuOpen(false)}
                 />
-                <button type="button" onClick={handleRetry} className="flex min-h-12 w-full items-center gap-3 rounded-lg px-3 text-left text-sm text-ink transition-colors hover:bg-ink/5 cursor-pointer">
-                  <RotateCcw size={20} className="shrink-0 text-ink/55" />
-                  <span>Retry response</span>
-                </button>
-                <button type="button" onClick={handleNewChat} className="flex min-h-12 w-full items-center gap-3 rounded-lg px-3 text-left text-sm text-ink transition-colors hover:bg-ink/5 cursor-pointer">
-                  <MessageSquarePlus size={20} className="shrink-0 text-ink/55" />
-                  <span>Start new chat from this answer</span>
-                </button>
+                {showActions && (
+                  <>
+                    <button type="button" onClick={handleRetry} className="flex min-h-12 w-full items-center gap-3 rounded-lg px-3 text-left text-sm text-ink transition-colors hover:bg-ink/5 cursor-pointer">
+                      <RotateCcw size={20} className="shrink-0 text-ink/55" />
+                      <span>Retry response</span>
+                    </button>
+                    <button type="button" onClick={handleNewChat} className="flex min-h-12 w-full items-center gap-3 rounded-lg px-3 text-left text-sm text-ink transition-colors hover:bg-ink/5 cursor-pointer">
+                      <MessageSquarePlus size={20} className="shrink-0 text-ink/55" />
+                      <span>Start new chat from this answer</span>
+                    </button>
+                  </>
+                )}
               </div>
             </div>
           </div>
@@ -232,18 +244,22 @@ export function AiMessageFooter({
       </div>
 
       <div className="flex items-center space-x-1 shrink-0">
-        <button type="button" className="flex items-center hover:text-ink transition-colors p-1 rounded hover:bg-ink/5 cursor-pointer" title="Re-run / Retry generation" onClick={handleRetry}>
-          <RotateCcw size={12} />
-        </button>
+        {showActions && (
+          <button type="button" className="flex items-center hover:text-ink transition-colors p-1 rounded hover:bg-ink/5 cursor-pointer" title="Re-run / Retry generation" onClick={handleRetry}>
+            <RotateCcw size={12} />
+          </button>
+        )}
         <CopyButton
           text={content}
           className="flex items-center hover:text-ink transition-colors p-1 rounded hover:bg-ink/5 cursor-pointer"
           iconSize={12}
           title="Copy response"
         />
-        <button type="button" className="flex items-center hover:text-ink transition-colors p-1 rounded hover:bg-ink/5 cursor-pointer" title="New Chat from here" onClick={handleNewChat}>
-          <MessageSquarePlus size={12} />
-        </button>
+        {showActions && (
+          <button type="button" className="flex items-center hover:text-ink transition-colors p-1 rounded hover:bg-ink/5 cursor-pointer" title="New Chat from here" onClick={handleNewChat}>
+            <MessageSquarePlus size={12} />
+          </button>
+        )}
       </div>
     </div>
   );

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

@@ -118,7 +118,16 @@ export function ComposerDock({
           isSteering
         />
         {btw.open ? (
-          <BtwForm mode={btw} modelName={modelName} provider={provider} providerNames={providerNames} />
+          <BtwForm
+            mode={btw}
+            appSettings={appSettings}
+            composerModelRef={composerModelRef}
+            rootPath={rootPath}
+            variant={variant}
+            modelName={modelName}
+            provider={provider}
+            providerNames={providerNames}
+          />
         ) : (
           <ChatInput
             value={inputValue}

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

@@ -7,6 +7,12 @@ interface GeneratingIndicatorProps {
   generatingVerb?: string;
   provider?: string;
   providerNames?: Record<string, string>;
+  /**
+   * DOM id for the docked row. Two indicators can be mounted at once — the chat
+   * run and a side question both streaming — so a second caller must pass its
+   * own id rather than duplicating the default one.
+   */
+  id?: string;
 }
 
 const COOL_VERBS = [
@@ -18,7 +24,7 @@ const COOL_VERBS = [
   'Compiling edge routes'
 ];
 
-export function GeneratingIndicator({ modelName, generatingVerb, provider, providerNames }: GeneratingIndicatorProps) {
+export function GeneratingIndicator({ modelName, generatingVerb, provider, providerNames, id = 'generating-docked-indicator' }: GeneratingIndicatorProps) {
   const [activeVerbIndex, setActiveVerbIndex] = useState(0);
 
   // Rotate action verb every 2.8s
@@ -38,7 +44,7 @@ export function GeneratingIndicator({ modelName, generatingVerb, provider, provi
 
   return (
     <div 
-      id="generating-docked-indicator"
+      id={id}
       className="w-full flex items-center px-1 py-1 bg-transparent border-0 border-none text-[11px] font-mono select-none animate-in fade-in duration-200"
     >
       <style>{`

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

@@ -23,6 +23,12 @@ interface ChatMessageItemProps {
   className?: string;
   /** Whether the message immediately preceding this one was also an assistant message. */
   isPrevAssistant?: boolean;
+  /**
+   * Whether a user row offers Undo / New-chat. Both act on the CHAT, so a row
+   * that is not a chat turn (the BTW panel's question row) turns them off
+   * instead of rendering buttons that do nothing.
+   */
+  userActions?: boolean;
 }
 
 export const ChatMessageItem = memo(function ChatMessageItem({
@@ -32,6 +38,7 @@ export const ChatMessageItem = memo(function ChatMessageItem({
   onNewChat,
   className = '',
   isPrevAssistant = false,
+  userActions = true,
 }: ChatMessageItemProps) {
   const isUser = msg.role === 'user';
 
@@ -107,14 +114,16 @@ export const ChatMessageItem = memo(function ChatMessageItem({
           
           <div className="flex items-center space-x-1">
             {/* Undo Button (to the left of copy button) */}
-            <button 
-              type="button"
-              className="flex items-center hover:text-ink transition-colors p-1 rounded hover:bg-ink/5 cursor-pointer" 
-              title="Undo / Edit message"
-              onClick={handleUndo}
-            >
-              <Undo2 size={12} />
-            </button>
+            {userActions && (
+              <button 
+                type="button"
+                className="flex items-center hover:text-ink transition-colors p-1 rounded hover:bg-ink/5 cursor-pointer" 
+                title="Undo / Edit message"
+                onClick={handleUndo}
+              >
+                <Undo2 size={12} />
+              </button>
+            )}
 
             {/* Copy Button */}
             <CopyButton
@@ -125,14 +134,16 @@ export const ChatMessageItem = memo(function ChatMessageItem({
             />
 
             {/* New Chat Button */}
-            <button 
-              type="button"
-              className="flex items-center hover:text-ink transition-colors p-1 rounded hover:bg-ink/5 cursor-pointer" 
-              title="New Chat from here"
-              onClick={handleNewChat}
-            >
-              <MessageSquarePlus size={12} />
-            </button>
+            {userActions && (
+              <button 
+                type="button"
+                className="flex items-center hover:text-ink transition-colors p-1 rounded hover:bg-ink/5 cursor-pointer" 
+                title="New Chat from here"
+                onClick={handleNewChat}
+              >
+                <MessageSquarePlus size={12} />
+              </button>
+            )}
           </div>
         </div>
       </div>

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

@@ -21,6 +21,14 @@ export interface MessageListProps {
   onRetry?: (id: string) => void;
   onNewChat?: (content: string) => void;
   isMobile?: boolean;
+  /**
+   * Whether chat-owning actions render: a USER row's Undo / New-chat, and the
+   * run footer's Retry / New-chat. All of them act on the CHAT (rewind a chat
+   * turn, re-run it, branch a session from it), so a renderer that draws rows
+   * the chat does not own — the BTW panel's side question and its answer — turns
+   * them off instead of showing buttons that do nothing.
+   */
+  userActions?: boolean;
 }
 
 /**
@@ -49,6 +57,7 @@ export const MessageList = memo(function MessageList({
   onRetry,
   onNewChat,
   isMobile = false,
+  userActions = true,
 }: MessageListProps) {
   const { streamingIdx, footers, prevNonNoticeIdx } = useMemo(() => {
     return {
@@ -79,6 +88,7 @@ export const MessageList = memo(function MessageList({
               onUndo={onUndo}
               onNewChat={onNewChat}
               isPrevAssistant={isPrevAssistant}
+              userActions={userActions}
               className={isNoticeRow(msg) ? 'mt-3 mb-1' : isAiFragment ? 'mt-1' : 'mt-3'}
             />
             {footer && (
@@ -93,6 +103,7 @@ export const MessageList = memo(function MessageList({
                 onRetry={onRetry}
                 onNewChat={onNewChat}
                 isMobile={isMobile}
+                showActions={userActions}
               />
             )}
           </Fragment>

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

@@ -19,6 +19,12 @@ interface RunFooterProps {
   onNewChat?: (content: string) => void;
   /** Mobile uses a compact provider/model footer with a bottom-sheet menu. */
   isMobile?: boolean;
+  /**
+   * Whether the footer offers Retry / New-chat. Both act on the CHAT, so a
+   * footer describing a row the chat does not own (the BTW panel's side answer)
+   * turns them off rather than rendering dead buttons.
+   */
+  showActions?: boolean;
 }
 
 /**
@@ -38,6 +44,7 @@ export function RunFooter({
   onRetry,
   onNewChat,
   isMobile = false,
+  showActions = true,
 }: RunFooterProps) {
   return (
     <div className="mt-2">
@@ -54,6 +61,7 @@ export function RunFooter({
         onRetry={onRetry}
         onNewChat={onNewChat}
         isMobile={isMobile}
+        showActions={showActions}
       />
     </div>
   );

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

@@ -33,6 +33,8 @@ export function ChatInput({
   variant = 'desktop',
   accessMode,
   onAccessModeChange,
+  enablePicker = true,
+  placeholder,
   /** Written on every model/thinking pick so the send path can snapshot the
    *  selection into queued items without lifting ChatInput state. */
   composerModelRef,
@@ -62,6 +64,14 @@ export function ChatInput({
   rootPath?: string | null;
   accessMode: ApprovalMode;
   onAccessModeChange: (mode: ApprovalMode) => void;
+  /**
+   * Whether the `@` / `/` / `!` / `#` autocomplete runs. Off for the
+   * side-question form, which has no file tree, commands or skills to offer —
+   * and whose text is never run through the mention translator.
+   */
+  enablePicker?: boolean;
+  /** Overrides the default hint text (the side-question form names its own). */
+  placeholder?: string;
   /**
    * `mobile` sizes the composer for a phone: 16px text (iOS Safari zooms the
    * viewport when focusing an input below that), thumb-sized send/stop
@@ -292,7 +302,8 @@ export function ChatInput({
         disabled={disabled}
         appSettings={appSettings}
         rootPath={rootPath}
-        placeholder={disabled ? "Please select a workspace above to start prompting..." : "@ for files/agents; / for commands and skills; ! for shell; # for snippets (Paste images/files here)"}
+        enablePicker={enablePicker}
+        placeholder={placeholder ?? (disabled ? "Please select a workspace above to start prompting..." : "@ for files/agents; / for commands and skills; ! for shell; # for snippets (Paste images/files here)")}
         className={`w-full bg-transparent border-none focus:outline-none resize-none text-ink placeholder-ink/40 disabled:opacity-50 disabled:cursor-not-allowed ${
           isMobile ? 'px-3 py-3 text-base min-h-[68px] max-h-40' : 'px-3 py-3 text-sm min-h-[80px]'
         }`}

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

@@ -88,9 +88,14 @@ export function ChatTimeline({ className = '', appSettings = {}, onSessionTitle,
 
   // 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.
+  // The modal also waits for the session's committed history: a dialog replayed
+  // on open (the agent probe answers from local flags, long before the JSONL
+  // fetch lands) has no card to be matched against yet, so deciding "no card
+  // owns this" during that window painted the ask modal and then took it back —
+  // the flash on switching to a session parked on a question.
   const { framesByTool, modalRequest } = useMemo(
-    () => splitAskFrames(localMessages, extensionDialogs),
-    [localMessages, extensionDialogs],
+    () => splitAskFrames(localMessages, extensionDialogs, !sessionLoading),
+    [localMessages, extensionDialogs, sessionLoading],
   );
   const respondToFrame = useCallback((request: ExtensionUiDialogRequest, response: ExtensionDialogResponse) => {
     void respondToExtensionUi(request, response);

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

@@ -4,13 +4,14 @@
  */
 
 /**
- * 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.
+ * One question of an `ask` call, in whichever of its four states it is in:
+ * answered (omp already recorded it), asking (its dialog is live), still queued
+ * behind an earlier question (omp asks them strictly in order, so the later
+ * ones can only be previewed until their turn comes) or abandoned — the ask
+ * ended without reaching it, so no dialog can arrive again.
  */
 
-import { CheckCircle2, Clock } from 'lucide-preact';
+import { Ban, 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';
@@ -28,6 +29,12 @@ interface QuestionBlockProps {
   draft?: string;
   /** Unanswered, but omp has already moved past it — its dialog is gone. */
   passed: boolean;
+  /**
+   * The ask's tool call already failed or was aborted: omp withdrew its dialog
+   * and cannot raise another, so an unanswered question is not queued behind
+   * anything.
+   */
+  settled: boolean;
   /** Labels toggled locally on a multi-select question. */
   multiSelected: string[];
   onAnswer: (value: string) => void;
@@ -49,14 +56,24 @@ export function QuestionBlock({
   recorded,
   draft,
   passed,
+  settled,
   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);
+  // A recorded answer with no labels is still an answer — omp accepts an empty
+  // multi-select as "select none" — so presence, never the rendered part count,
+  // decides whether a question is answered. Reading the parts made such a
+  // question fall through to the queued state and claim a dialog was live.
+  const hasAnswer = recorded !== null || draft !== undefined || multiSelected.length > 0;
+  const parts = recorded ? answerParts(recorded) : draft ? [draft] : multiSelected;
+  const chips = parts.length > 0 ? parts : ['none selected'];
+  // A settled ask has no live dialog by construction, even if a frame this
+  // client never saw withdrawn is still in its queue: answering it would post
+  // a response for a tool call omp has already finished.
+  const asking = !settled && Boolean(live) && !recorded && (question.multi || !draft);
 
   return (
     <div className="rounded-lg border border-ink/10 bg-paper p-2.5 shadow-xs">
@@ -94,10 +111,10 @@ export function QuestionBlock({
             />
           )}
 
-          {answered.length > 0 && (
+          {hasAnswer && (
             <div className="mt-2 flex flex-wrap items-center gap-1.5">
               <CheckCircle2 size={11} className="shrink-0 text-success" />
-              {answered.map((part) => (
+              {chips.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"
@@ -113,14 +130,14 @@ export function QuestionBlock({
             </div>
           )}
 
-          {!asking && answered.length === 0 && passed && (
+          {!asking && !hasAnswer && 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 && (
+          {!asking && !hasAnswer && !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">
@@ -142,10 +159,20 @@ export function QuestionBlock({
                   </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>
+              {/* "Waiting for the previous answer" is only true while the ask
+                  is still running: once it settles nothing is being asked, and
+                  the question was abandoned unanswered. */}
+              {settled ? (
+                <div className="flex items-center gap-1.5 pt-0.5 text-[10.5px] text-ink/40">
+                  <Ban size={10} className="shrink-0" />
+                  <span>Not answered — the ask was cut short.</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>

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

@@ -46,7 +46,18 @@ export function AskPanel({ tool }: { tool: ToolCallData }) {
     return tool.output ? <FallbackOutput text={tool.output} /> : null;
   }
 
-  const waiting = groups.some((frames, index) => frames.length > 0 && !recorded[index]);
+  // An ask whose tool call failed or was aborted is OVER: omp cancels the live
+  // dialog on abort (the client drops it on that `cancel` frame) and the result
+  // records no answer, so after the queue empties every unanswered question
+  // falls out of the "passed" branch with nothing left to say it was
+  // abandoned — the card read "Waiting for the previous answer…" over a run the
+  // user had already stopped. Only a terminal status counts: a session reloaded
+  // mid-ask reads its still-blocking tool call back from the JSONL as
+  // `success` (omp writes no result until the question is answered), and that
+  // question must stay answerable.
+  const settled =
+    tool.status === 'error' || tool.status === 'aborted' || tool.status === 'skipped';
+  const waiting = !settled && groups.some((frames, index) => frames.length > 0 && !recorded[index]);
   // omp asks in order and blocks on each, so the earliest question holding a
   // dialog is the only open one: everything before it is answered, whether or
   // not this client still has the text.
@@ -71,6 +82,7 @@ export function AskPanel({ tool }: { tool: ToolCallData }) {
           recorded={recorded[index] ?? null}
           draft={drafts[index]}
           passed={askingIndex !== -1 && index < askingIndex}
+          settled={settled}
           multiSelected={multiSelected[index] ?? NO_LABELS}
           onAnswer={(value) => commit(index, value)}
           onToggle={(label) => toggleMulti(index, label)}

package/src/client/components/workspace/chat-timeline/tool-renderers/extension-dialog/index.tsx

@@ -35,12 +35,21 @@ export function ExtensionDialog({ request, onRespond }: ExtensionDialogProps) {
   const options = request.options ?? [];
   const optionDetails = request.optionDetails ?? [];
 
+  // Reset for a NEW dialog only. `request` is the identity to depend on —
+  // `options`/`optionDetails` above are derived arrays, re-created on every
+  // render, so listing one as a dependency re-ran this effect after every
+  // commit and threw away whatever had just been typed: an editor/input frame
+  // carries no `options` at all, so the reset fired on every keystroke and the
+  // dialog could not be typed into.
   useEffect(() => {
+    const items = request.options ?? [];
     setValue(request.method === 'editor' ? request.prefill ?? '' : '');
-    setSelectedOption(options.length > 0 ? options[0] : null);
+    setSelectedOption(items.length > 0 ? items[0] : null);
     setCustomValue('');
-  }, [request, options]);
+  }, [request]);
 
+  // Focus once per dialog, for the same reason: a fresh dependency on every
+  // render also pulls the caret back into the field the user just left.
   useEffect(() => {
     panelRef.current?.focus();
     if (request.method === 'input') {
@@ -50,12 +59,12 @@ export function ExtensionDialog({ request, onRespond }: ExtensionDialogProps) {
     } else if (request.method === 'select') {
       // When the AI offers an "Other"-style option, the intended interaction
       // is typing a custom answer — focus the input right away.
-      const hasOther = options.some((option) => /^other\b/i.test(option.trim()));
+      const hasOther = (request.options ?? []).some((option) => /^other\b/i.test(option.trim()));
       if (hasOther) {
         customInputRef.current?.focus();
       }
     }
-  }, [request.id, request.method, options]);
+  }, [request]);
 
   const cancel = useCallback(() => {
     onRespond(request, { cancelled: true });

package/src/client/components/workspace/diff-panel/SplitView.tsx

@@ -44,7 +44,10 @@ export function SplitView({ rows, language }: SplitViewProps) {
 
   return (
     <div className="w-full h-full overflow-auto font-mono text-xs select-text bg-paper text-ink code-surface">
-      <div className="w-max min-w-full min-w-[700px]">
+      {/* The room under the last row belongs to the content, not the scroller:
+          a scroll container's own bottom padding is not part of its scrollable
+          overflow, so the padding has to sit inside it to have any effect. */}
+      <div className="w-max min-w-full min-w-[700px] pb-4">
         <div className="grid grid-cols-2 sticky top-0 z-10 bg-canvas border-b border-ink/10 text-[11px] text-ink/70 font-sans select-none shadow-xs">
           <div className="px-3 py-1 font-medium border-r border-ink/10 flex items-center justify-between">
             <span>Original (HEAD / Base)</span>