fix(app): recover prompt text from editor dom; route v1 follow-ups to their session directory

packages/app/src/components/prompt-input/submit.test.ts

@@ -135,6 +135,13 @@ beforeAll(async () => {
   mock.module("@opencode-ai/ui/toast", () => ({
     Toast: { Region: () => null },
     showToast: () => 0,
+    toaster: { dismiss: () => undefined },
+  }))
+
+  mock.module("@opencode-ai/ui/v2/toast-v2", () => ({
+    ToastV2: { Region: () => null },
+    showToastV2: () => 0,
+    toasterV2: { dismiss: () => undefined },
   }))
 
   mock.module("@opencode-ai/core/util/encode", () => ({
@@ -595,4 +602,36 @@ describe("prompt submit worktree selection", () => {
     expect(storedSessions["/repo/worktree-a"]?.[0]).toMatchObject({ id: "session-1", title: "New session 1" })
     expect(optimisticSeeded).toEqual([true])
   })
+
+  test("synchronizes text from DOM editor element if target.current is empty", async () => {
+    params = { id: "session-1" }
+    promptValue = [{ type: "text", content: "", start: 0, end: 0 }]
+    const domEditor = document.createElement("div")
+    domEditor.textContent = "Hello from DOM editor"
+
+    const submit = createPromptSubmit({
+      prompt,
+      info: () => ({ id: "session-1" }),
+      imageAttachments: () => [],
+      commentCount: () => 0,
+      autoAccept: () => false,
+      mode: () => "normal",
+      working: () => false,
+      editor: () => domEditor,
+      queueScroll: () => undefined,
+      promptLength: (value) => value.reduce((sum, part) => sum + ("content" in part ? part.content.length : 0), 0),
+      addToHistory: () => undefined,
+      resetHistoryNavigation: () => undefined,
+      setMode: () => undefined,
+      setPopover: () => undefined,
+    })
+
+    await submit.handleSubmit({ preventDefault: () => undefined } as unknown as Event)
+
+    expect(sentPrompts).toContain("/repo/main")
+    expect(promptInputs[promptInputs.length - 1]).toMatchObject({
+      sessionID: "session-1",
+      text: "Hello from DOM editor",
+    })
+  })
 })

packages/app/src/components/prompt-input/submit.ts

@@ -15,6 +15,7 @@ import { useSDK, type DirectorySDK } from "@/context/sdk"
 import { useSync, type DirectorySync } from "@/context/sync"
 import { Identifier } from "@/utils/id"
 import { Worktree as WorktreeState } from "@/utils/worktree"
+import { parsePromptInputV2Editor } from "@opencode-ai/session-ui/v2/prompt-input/editor-dom"
 import { buildRequestParts } from "./build-request-parts"
 import { setCursorPosition } from "./editor-dom"
 import { formatServerError } from "@/utils/server-errors"
@@ -167,6 +168,7 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
 
     await input.api.prompt({
       sessionID: input.draft.sessionID,
+      sessionDirectory: input.draft.sessionDirectory,
       id: messageID,
       agent: input.draft.agent,
       model: input.draft.model,
@@ -324,12 +326,25 @@ export function createPromptSubmit(input: PromptSubmitInput) {
       prompt: target.current(),
       context: target.context.items().slice(),
     })
-    const currentPrompt = submission.prompt
+    let currentPrompt = submission.prompt
     const context = submission.context
-    const text = currentPrompt.map((part) => ("content" in part ? part.content : "")).join("")
+    let text = currentPrompt.map((part) => ("content" in part ? part.content : "")).join("")
     const images = input.imageAttachments().slice()
     const mode = input.mode()
 
+    if (text.trim().length === 0 && images.length === 0 && input.commentCount() === 0) {
+      const editor = input.editor()
+      if (editor) {
+        const domPrompt = parsePromptInputV2Editor(editor as HTMLDivElement)
+        const domText = domPrompt.map((p) => ("content" in p ? p.content : "")).join("")
+        if (domText.trim().length > 0) {
+          currentPrompt = domPrompt as Prompt
+          text = domText
+          target.set(domPrompt as Prompt, domText.length)
+        }
+      }
+    }
+
     if (text.trim().length === 0 && images.length === 0 && input.commentCount() === 0) {
       if (input.working()) void abort()
       return
@@ -616,7 +631,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
       return true
     }
 
-    void sendFollowupDraft({
+    await sendFollowupDraft({
       api: sdk().api.session,
       sync: sync(),
       serverSync: serverSync(),

packages/app/src/utils/server-compat.ts

@@ -44,6 +44,8 @@ type LegacyPrompt = {
   model?: { providerID: string; modelID: string }
   variant?: string
   legacyParts?: (TextPartInput | FilePartInput | AgentPartInput)[]
+  sessionDirectory?: string
+  location?: { directory?: string }
 }
 type LegacyLocation = { directory?: string }
 type CompatibleInput = {
@@ -198,7 +200,8 @@ function createV1Api(input: CompatibleInput): CompatibleApi {
         await legacy().session.abort(value)
       },
       async prompt(value: SessionPromptInput & LegacyPrompt) {
-        await legacy().session.promptAsync({
+        const loc = value.location ?? (value.sessionDirectory ? { directory: value.sessionDirectory } : undefined)
+        await legacy(loc).session.promptAsync({
           sessionID: value.sessionID,
           messageID: value.id ?? undefined,
           agent: value.agent,

packages/session-ui/package.json

@@ -20,6 +20,7 @@
     "./v2/*.css": "./src/v2/components/*.css",
     "./v2/*": "./src/v2/components/*.tsx",
     "./v2/prompt-input": "./src/v2/components/prompt-input/index.tsx",
+    "./v2/prompt-input/editor-dom": "./src/v2/components/prompt-input/editor-dom.ts",
     "./v2/prompt-input/interaction": "./src/v2/components/prompt-input/interaction.ts",
     "./v2/prompt-input/store": "./src/v2/components/prompt-input/store.ts",
     "./v2/prompt-input/types": "./src/v2/components/prompt-input/types.ts"

packages/session-ui/src/v2/components/prompt-input/editor-dom.ts

@@ -0,0 +1,69 @@
+import type { PromptInputV2Attachment, PromptInputV2Prompt } from "./types"
+
+export function parsePromptInputV2Editor(editor: HTMLDivElement) {
+  const parts: Exclude<PromptInputV2Prompt[number], PromptInputV2Attachment>[] = []
+  let buffer = ""
+  let position = 0
+
+  const flush = () => {
+    if (!buffer) return
+    parts.push({ type: "text", content: buffer, start: position, end: position + buffer.length })
+    position += buffer.length
+    buffer = ""
+  }
+  const mention = (element: HTMLElement) => {
+    flush()
+    const content = element.textContent ?? ""
+    if (element.dataset.mention === "agent") {
+      parts.push({
+        type: "agent",
+        name: element.dataset.name ?? content.slice(1),
+        content,
+        start: position,
+        end: position + content.length,
+      })
+      position += content.length
+      return
+    }
+    parts.push({
+      type: "file",
+      path: element.dataset.path ?? content.slice(1),
+      content,
+      start: position,
+      end: position + content.length,
+      ...(element.dataset.mime ? { mime: element.dataset.mime } : {}),
+      ...(element.dataset.filename ? { filename: element.dataset.filename } : {}),
+    })
+    position += content.length
+  }
+  const visit = (node: Node) => {
+    if (node.nodeType === Node.TEXT_NODE) {
+      buffer += node.textContent ?? ""
+      return
+    }
+    if (!(node instanceof HTMLElement)) return
+    if (node.dataset.mention) {
+      mention(node)
+      return
+    }
+    if (node.tagName === "BR") {
+      buffer += "\n"
+      return
+    }
+    Array.from(node.childNodes).forEach(visit)
+  }
+
+  Array.from(editor.childNodes).forEach((node, index, nodes) => {
+    visit(node)
+    if (node instanceof HTMLElement && ["DIV", "P"].includes(node.tagName) && index < nodes.length - 1) buffer += "\n"
+  })
+  flush()
+  if (
+    parts.every((part) => part.type === "text") &&
+    parts.every((part) => part.content.replace(/[\n\u200B]/g, "") === "")
+  ) {
+    return [{ type: "text" as const, content: "", start: 0, end: 0 }]
+  }
+  if (parts.length > 0) return parts
+  return [{ type: "text" as const, content: "", start: 0, end: 0 }]
+}