Merge pull request #114 from Marve10s/fix/pending-user-input-stale-advance

Fix empty answers from pending user-input auto-advance

Author: Emanuele-web04

apps/server/src/orchestration/Layers/ProviderCommandReactor.ts

@@ -44,6 +44,7 @@ import { TextGeneration } from "../../git/Services/TextGeneration.ts";
 import { ProviderService } from "../../provider/Services/ProviderService.ts";
 import { clearWorkspaceIndexCache } from "../../workspaceEntries.ts";
 import {
+  buildPriorTranscriptBootstrapText,
   buildForkBootstrapText,
   buildHandoffBootstrapText,
   hasNativeAssistantMessagesBefore,
@@ -793,6 +794,11 @@ const make = Effect.gen(function* () {
     if (!thread) {
       return;
     }
+    const activeSessionBeforeEnsure = yield* providerService
+      .listSessions()
+      .pipe(
+        Effect.map((sessions) => sessions.find((session) => session.threadId === input.threadId)),
+      );
     yield* ensureSessionForThread(input.threadId, input.createdAt, {
       ...(input.modelSelection !== undefined ? { modelSelection: input.modelSelection } : {}),
       ...(input.providerOptions !== undefined ? { providerOptions: input.providerOptions } : {}),
@@ -825,13 +831,29 @@ const make = Effect.gen(function* () {
       shouldBootstrapSidechatContext && availableBootstrapChars > 0
         ? buildForkBootstrapText(thread, availableBootstrapChars)
         : null;
+    const selectedProvider =
+      input.modelSelection?.provider ??
+      threadModelSelections.get(input.threadId)?.provider ??
+      thread.session?.providerName ??
+      thread.modelSelection.provider;
+    const shouldBootstrapPriorTranscriptContext =
+      (selectedProvider === "kilo" || selectedProvider === "opencode") &&
+      activeSessionBeforeEnsure === undefined &&
+      !handoffBootstrapText &&
+      !sidechatBootstrapText;
+    const priorTranscriptBootstrapText =
+      shouldBootstrapPriorTranscriptContext && availableBootstrapChars > 0
+        ? buildPriorTranscriptBootstrapText(thread, input.messageId, availableBootstrapChars)
+        : null;
     const boundaryMessageText = thread.sidechatSourceThreadId
       ? wrapSidechatInput(input.messageText)
       : input.messageText;
     const providerInput = handoffBootstrapText
       ? `<handoff_context>\n${handoffBootstrapText}\n</handoff_context>\n\n<latest_user_message>\n${boundaryMessageText}\n</latest_user_message>`
       : sidechatBootstrapText
         ? `<sidechat_context>\n${sidechatBootstrapText}\n</sidechat_context>\n\n${boundaryMessageText}`
+        : priorTranscriptBootstrapText
+          ? `<thread_context>\n${priorTranscriptBootstrapText}\n</thread_context>\n\n<latest_user_message>\n${boundaryMessageText}\n</latest_user_message>`
         : boundaryMessageText;
     const normalizedInput = toNonEmptyProviderInput(providerInput);
     const normalizedAttachments = input.attachments ?? [];

apps/server/src/orchestration/handoff.ts

@@ -73,6 +73,24 @@ export function hasNativeAssistantMessagesBefore(
   });
 }
 
+export function listPriorTranscriptMessages(
+  thread: Pick<OrchestrationThread, "messages">,
+  currentMessageId: string,
+): ReadonlyArray<OrchestrationMessage> {
+  const currentIndex = thread.messages.findIndex((message) => message.id === currentMessageId);
+  if (currentIndex <= 0) {
+    return [];
+  }
+
+  return thread.messages.slice(0, currentIndex).filter((message) => {
+    return (
+      (message.role === "user" || message.role === "assistant") &&
+      message.streaming === false &&
+      normalizeMessageText(message.text).length > 0
+    );
+  });
+}
+
 function buildImportedMessagesBootstrapText(input: {
   thread: Pick<OrchestrationThread, "title" | "branch" | "worktreePath">;
   importedMessages: ReadonlyArray<OrchestrationMessage>;
@@ -143,6 +161,25 @@ export function buildHandoffBootstrapText(
   });
 }
 
+export function buildPriorTranscriptBootstrapText(
+  thread: Pick<OrchestrationThread, "title" | "branch" | "worktreePath" | "messages">,
+  currentMessageId: string,
+  maxChars = HANDOFF_BOOTSTRAP_CHAR_BUDGET,
+): string | null {
+  const priorMessages = listPriorTranscriptMessages(thread, currentMessageId);
+  if (priorMessages.length === 0) {
+    return null;
+  }
+
+  return buildImportedMessagesBootstrapText({
+    thread,
+    importedMessages: priorMessages,
+    intro:
+      "This provider session may have been restarted without native conversation state. Use this prior DP Code transcript as context for the latest user message.",
+    maxChars,
+  });
+}
+
 export function buildForkBootstrapText(
   thread: Pick<OrchestrationThread, "title" | "branch" | "worktreePath" | "messages">,
   maxChars = HANDOFF_BOOTSTRAP_CHAR_BUDGET,

apps/server/src/provider/Layers/OpenCodeAdapter.ts

@@ -1755,9 +1755,18 @@ export function makeOpenCodeAdapterLive(options?: OpenCodeAdapterLiveOptions) {
         if (text === undefined) {
           return;
         }
-        const previousText = context.emittedTextByPartId.get(part.id);
+        const nextTextItemId =
+          turnId && part.type === "text" ? openCodeNextTextItemId(turnId) : undefined;
+        const itemId =
+          nextTextItemId && context.emittedTextByPartId.has(nextTextItemId)
+            ? nextTextItemId
+            : part.id;
+        const previousText = context.emittedTextByPartId.get(itemId);
         const { latestText, deltaToEmit } = mergeOpenCodeAssistantText(previousText, text);
-        context.emittedTextByPartId.set(part.id, latestText);
+        context.emittedTextByPartId.set(itemId, latestText);
+        if (itemId !== part.id) {
+          context.emittedTextByPartId.set(part.id, latestText);
+        }
         if (latestText !== text) {
           context.partById.set(
             part.id,
@@ -1771,7 +1780,7 @@ export function makeOpenCodeAdapterLive(options?: OpenCodeAdapterLiveOptions) {
             ...buildEventBase({
               threadId: context.session.threadId,
               turnId,
-              itemId: part.id,
+              itemId,
               createdAt:
                 part.type === "text" || part.type === "reasoning"
                   ? isoFromEpochMs(part.time?.start)
@@ -1789,9 +1798,12 @@ export function makeOpenCodeAdapterLive(options?: OpenCodeAdapterLiveOptions) {
         if (
           part.type === "text" &&
           part.time?.end !== undefined &&
-          !context.completedAssistantPartIds.has(part.id)
+          !context.completedAssistantPartIds.has(itemId)
         ) {
-          context.completedAssistantPartIds.add(part.id);
+          context.completedAssistantPartIds.add(itemId);
+          if (itemId !== part.id) {
+            context.completedAssistantPartIds.add(part.id);
+          }
           const proposedPlanMarkdown =
             context.activeInteractionMode === "plan"
               ? extractProposedPlanMarkdown(latestText)
@@ -1801,7 +1813,7 @@ export function makeOpenCodeAdapterLive(options?: OpenCodeAdapterLiveOptions) {
               ...buildEventBase({
                 threadId: context.session.threadId,
                 turnId,
-                itemId: part.id,
+                itemId,
                 createdAt: isoFromEpochMs(part.time.end),
                 raw,
               }),
@@ -1815,7 +1827,7 @@ export function makeOpenCodeAdapterLive(options?: OpenCodeAdapterLiveOptions) {
             ...buildEventBase({
               threadId: context.session.threadId,
               turnId,
-              itemId: part.id,
+              itemId,
               createdAt: isoFromEpochMs(part.time.end),
               raw,
             }),

apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx

@@ -1,5 +1,5 @@
 import { type ApprovalRequestId } from "@t3tools/contracts";
-import { memo, useCallback, useEffect, useRef } from "react";
+import { memo, useEffect, useEffectEvent, useRef } from "react";
 import { type PendingUserInput } from "../../session-logic";
 import {
   derivePendingUserInputProgress,
@@ -61,32 +61,36 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(
   const progress = derivePendingUserInputProgress(prompt.questions, answers, questionIndex);
   const activeQuestion = progress.activeQuestion;
   const autoAdvanceTimerRef = useRef<number | null>(null);
+  const onAdvanceRef = useRef(onAdvance);
+  useEffect(() => {
+    onAdvanceRef.current = onAdvance;
+  }, [onAdvance]);
 
-  // Clear auto-advance timer on unmount
+  // Cancel a pending auto-advance on unmount, and whenever the active question
+  // changes or a response goes in flight — otherwise a manual Next/Submit landing
+  // inside the 200ms window leaves a stale timer that advances or submits again.
   useEffect(() => {
     return () => {
       if (autoAdvanceTimerRef.current !== null) {
         window.clearTimeout(autoAdvanceTimerRef.current);
+        autoAdvanceTimerRef.current = null;
       }
     };
-  }, []);
+  }, [activeQuestion?.id, isResponding]);
 
-  const handleOptionSelection = useCallback(
-    (questionId: string, optionLabel: string) => {
-      onToggleOption(questionId, optionLabel);
-      if (activeQuestion?.multiSelect) {
-        return;
-      }
-      if (autoAdvanceTimerRef.current !== null) {
-        window.clearTimeout(autoAdvanceTimerRef.current);
-      }
-      autoAdvanceTimerRef.current = window.setTimeout(() => {
-        autoAdvanceTimerRef.current = null;
-        onAdvance();
-      }, 200);
-    },
-    [activeQuestion?.multiSelect, onAdvance, onToggleOption],
-  );
+  const handleOptionSelection = useEffectEvent((questionId: string, optionLabel: string) => {
+    onToggleOption(questionId, optionLabel);
+    if (activeQuestion?.multiSelect) {
+      return;
+    }
+    if (autoAdvanceTimerRef.current !== null) {
+      window.clearTimeout(autoAdvanceTimerRef.current);
+    }
+    autoAdvanceTimerRef.current = window.setTimeout(() => {
+      autoAdvanceTimerRef.current = null;
+      onAdvanceRef.current();
+    }, 200);
+  });
 
   // Keyboard shortcut: digits toggle options for multi-select prompts and preserve
   // the current auto-advance behavior for single-select questions.
@@ -117,7 +121,7 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(
     };
     document.addEventListener("keydown", handler);
     return () => document.removeEventListener("keydown", handler);
-  }, [activeQuestion, handleOptionSelection, isResponding]);
+  }, [activeQuestion, isResponding]);
 
   if (!activeQuestion) {
     return null;