diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0385f042a10..e75c2183809 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -115,6 +115,34 @@ This runs `bun run --cwd packages/desktop build` automatically via Tauri’s `be
 
 Please try to follow the [style guide](./STYLE_GUIDE.md)
 
+### Running Tests
+
+Run the test suite from the `packages/opencode` directory:
+
+```bash
+bun test
+```
+
+To run a specific test file:
+
+```bash
+bun test test/tool/tool.test.ts
+```
+
+#### Test Environment Variables
+
+Environment variables prefixed with `OPENCODE_TEST_` can be used to alter test behavior. When tests start, any such variables are printed to the console for visibility.
+
+| Variable                 | Description                                                                                  |
+| ------------------------ | -------------------------------------------------------------------------------------------- |
+| `OPENCODE_TEST_SKIP_GIT` | Skip git repository initialization in test fixtures (useful when commit signing is required) |
+
+Example:
+
+```bash
+OPENCODE_TEST_SKIP_GIT=1 bun test
+```
+
 ### Setting up a Debugger
 
 Bun debugging is currently rough around the edges. We hope this guide helps you get set up and avoid some pain points.
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 10e340d7f8f..0e84f1af524 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -27,7 +27,15 @@ import {
   RGBA,
 } from "@opentui/core"
 import { Prompt, type PromptRef } from "@tui/component/prompt"
-import type { AssistantMessage, Part, ToolPart, UserMessage, TextPart, ReasoningPart } from "@opencode-ai/sdk/v2"
+import type {
+  AssistantMessage,
+  Part,
+  ToolPart,
+  UserMessage,
+  TextPart,
+  ReasoningPart,
+  Session as SessionType,
+} from "@opencode-ai/sdk/v2"
 import { useLocal } from "@tui/context/local"
 import { Locale } from "@/util/locale"
 import type { Tool } from "@/tool/tool"
@@ -111,6 +119,31 @@ export function Session() {
   const { theme } = useTheme()
   const promptRef = usePromptRef()
   const session = createMemo(() => sync.session.get(route.sessionID))
+  const descendants = createMemo(() => {
+    const rootID = session()?.parentID ?? session()?.id
+    if (!rootID) return []
+
+    const result: SessionType[] = []
+    const visited = new Set<string>()
+    const queue = [rootID]
+
+    while (queue.length > 0) {
+      const currentID = queue.shift()!
+      if (visited.has(currentID)) continue
+      visited.add(currentID)
+
+      const current = sync.data.session.find((x) => x.id === currentID)
+      if (current) result.push(current)
+
+      for (const s of sync.data.session) {
+        if (s.parentID === currentID && !visited.has(s.id)) {
+          queue.push(s.id)
+        }
+      }
+    }
+
+    return result.toSorted((a, b) => (a.id < b.id ? -1 : a.id > b.id ? 1 : 0))
+  })
   const children = createMemo(() => {
     const parentID = session()?.parentID ?? session()?.id
     return sync.data.session
@@ -120,11 +153,13 @@ export function Session() {
   const messages = createMemo(() => sync.data.message[route.sessionID] ?? [])
   const permissions = createMemo(() => {
     if (session()?.parentID) return []
-    return children().flatMap((x) => sync.data.permission[x.id] ?? [])
+    return descendants().flatMap((x) => sync.data.permission[x.id] ?? [])
   })
   const questions = createMemo(() => {
     if (session()?.parentID) return []
-    return children().flatMap((x) => sync.data.question[x.id] ?? [])
+    return descendants()
+      .flatMap((x) => sync.data.question[x.id] ?? [])
+      .toSorted((a, b) => (a.id < b.id ? -1 : a.id > b.id ? 1 : 0))
   })
 
   const pending = createMemo(() => {
@@ -1838,29 +1873,75 @@ function TodoWrite(props: ToolProps<typeof TodoWriteTool>) {
 }
 
 function Question(props: ToolProps<typeof QuestionTool>) {
-  const { theme } = useTheme()
+  const { theme, syntax } = useTheme()
   const count = createMemo(() => props.input.questions?.length ?? 0)
 
-  function format(answer?: string[]) {
-    if (!answer?.length) return "(no answer)"
-    return answer.join(", ")
-  }
-
   return (
     <Switch>
       <Match when={props.metadata.answers}>
-        <BlockTool title="# Questions" part={props.part}>
-          <box>
-            <For each={props.input.questions ?? []}>
-              {(q, i) => (
-                <box flexDirection="row" gap={1}>
-                  <text fg={theme.textMuted}>{q.question}</text>
-                  <text fg={theme.text}>{format(props.metadata.answers?.[i()])}</text>
-                </box>
-              )}
-            </For>
-          </box>
-        </BlockTool>
+        {(() => {
+          const ctx = use()
+          const allAnswers = () => (props.input.questions ?? []).map((_, idx) => props.metadata.answers?.[idx] ?? [])
+          const maxAnswerLen = () => Math.max(20, ...allAnswers().flatMap((answers) => answers.map((a) => a.length)))
+          const tableWidth = () => ctx.width - 6
+          const halfWidth = () => Math.floor(tableWidth() * 0.5)
+          const answerWidth = () => Math.max(20, Math.min(maxAnswerLen() + 2, halfWidth()))
+          return (
+            <BlockTool title="# Questions" part={props.part}>
+              <box width={tableWidth()} border={["top", "left", "right", "bottom"]} borderColor={theme.border}>
+                <For each={props.input.questions ?? []}>
+                  {(q, i) => {
+                    const answers = () => props.metadata.answers?.[i()] ?? []
+                    const isLast = () => i() === (props.input.questions?.length ?? 0) - 1
+                    const isMulti = () => answers().length > 1
+                    return (
+                      <box
+                        flexDirection="row"
+                        width="100%"
+                        border={isLast() ? [] : ["bottom"]}
+                        borderColor={theme.border}
+                      >
+                        <box
+                          flexGrow={1}
+                          paddingLeft={1}
+                          paddingRight={1}
+                          border={["right"]}
+                          borderColor={theme.border}
+                        >
+                          <code
+                            filetype="markdown"
+                            drawUnstyledText={false}
+                            syntaxStyle={syntax()}
+                            content={q.question}
+                            fg={theme.text}
+                          />
+                        </box>
+                        <box width={answerWidth()} paddingLeft={1} paddingRight={1} gap={isMulti() ? 1 : 0}>
+                          <Show
+                            when={answers().length > 0}
+                            fallback={
+                              <text fg={theme.textMuted} wrapMode="word">
+                                (no answer)
+                              </text>
+                            }
+                          >
+                            <For each={answers()}>
+                              {(answer) => (
+                                <text fg={theme.text} wrapMode="word">
+                                  {answer}
+                                </text>
+                              )}
+                            </For>
+                          </Show>
+                        </box>
+                      </box>
+                    )
+                  }}
+                </For>
+              </box>
+            </BlockTool>
+          )
+        })()}
       </Match>
       <Match when={true}>
         <InlineTool icon="→" pending="Asking questions..." complete={count()} part={props.part}>
diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/question.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/question.tsx
index e43f4219b98..f827b3b4d49 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/question.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/question.tsx
@@ -1,6 +1,6 @@
 import { createStore } from "solid-js/store"
-import { createMemo, For, Show } from "solid-js"
-import { useKeyboard } from "@opentui/solid"
+import { createEffect, createMemo, For, on, Show } from "solid-js"
+import { useKeyboard, useTerminalDimensions } from "@opentui/solid"
 import type { TextareaRenderable } from "@opentui/core"
 import { useKeybind } from "../../context/keybind"
 import { useTheme } from "../../context/theme"
@@ -12,7 +12,8 @@ import { useDialog } from "../../ui/dialog"
 
 export function QuestionPrompt(props: { request: QuestionRequest }) {
   const sdk = useSDK()
-  const { theme } = useTheme()
+  const { theme, syntax } = useTheme()
+  const dimensions = useTerminalDimensions()
   const keybind = useKeybind()
   const bindings = useTextareaKeybindings()
 
@@ -41,6 +42,20 @@ export function QuestionPrompt(props: { request: QuestionRequest }) {
     return store.answers[store.tab]?.includes(value) ?? false
   })
 
+  createEffect(
+    on(
+      () => props.request.id,
+      () => {
+        setStore("tab", 0)
+        setStore("answers", [])
+        setStore("custom", [])
+        setStore("selected", 0)
+        setStore("editing", false)
+      },
+      { defer: true },
+    ),
+  )
+
   function submit() {
     const answers = questions().map((_, i) => store.answers[i] ?? [])
     sdk.client.question.reply({
@@ -184,13 +199,9 @@ export function QuestionPrompt(props: { request: QuestionRequest }) {
         setStore("selected", (store.selected + 1) % total)
       }
 
-      if (evt.name === "return") {
+      if (evt.name === "space" && multi()) {
         evt.preventDefault()
         if (other()) {
-          if (!multi()) {
-            setStore("editing", true)
-            return
-          }
           const value = input()
           if (value && customPicked()) {
             toggle(value)
@@ -201,10 +212,29 @@ export function QuestionPrompt(props: { request: QuestionRequest }) {
         }
         const opt = opts[store.selected]
         if (!opt) return
+        toggle(opt.label)
+        return
+      }
+
+      if (evt.name === "return") {
+        evt.preventDefault()
         if (multi()) {
-          toggle(opt.label)
+          const hasSelections = (store.answers[store.tab]?.length ?? 0) > 0
+          if (!hasSelections) return
+          if (single()) {
+            submit()
+            return
+          }
+          setStore("tab", store.tab + 1)
+          setStore("selected", 0)
           return
         }
+        if (other()) {
+          setStore("editing", true)
+          return
+        }
+        const opt = opts[store.selected]
+        if (!opt) return
         pick(opt.label)
       }
 
@@ -222,98 +252,119 @@ export function QuestionPrompt(props: { request: QuestionRequest }) {
       borderColor={theme.accent}
       customBorderChars={SplitBorder.customBorderChars}
     >
-      <box gap={1} paddingLeft={1} paddingRight={3} paddingTop={1} paddingBottom={1}>
-        <Show when={!single()}>
-          <box flexDirection="row" gap={1} paddingLeft={1}>
-            <For each={questions()}>
-              {(q, index) => {
-                const isActive = () => index() === store.tab
-                const isAnswered = () => {
-                  return (store.answers[index()]?.length ?? 0) > 0
-                }
-                return (
-                  <box
-                    paddingLeft={1}
-                    paddingRight={1}
-                    backgroundColor={isActive() ? theme.accent : theme.backgroundElement}
-                  >
-                    <text fg={isActive() ? theme.selectedListItemText : isAnswered() ? theme.text : theme.textMuted}>
-                      {q.header}
-                    </text>
-                  </box>
-                )
-              }}
-            </For>
-            <box paddingLeft={1} paddingRight={1} backgroundColor={confirm() ? theme.accent : theme.backgroundElement}>
-              <text fg={confirm() ? theme.selectedListItemText : theme.textMuted}>Confirm</text>
-            </box>
-          </box>
-        </Show>
-
-        <Show when={!confirm()}>
-          <box paddingLeft={1} gap={1}>
-            <box>
-              <text fg={theme.text}>
-                {question()?.question}
-                {multi() ? " (select all that apply)" : ""}
+      <Show when={props.request.from || !single()}>
+        <box gap={1} paddingLeft={1} paddingRight={3} paddingTop={1} paddingBottom={1} flexShrink={0}>
+          <Show when={props.request.from}>
+            <box paddingLeft={1}>
+              <text fg={theme.textMuted}>
+                Question from <span style={{ fg: theme.accent }}>{props.request.from}</span>
               </text>
             </box>
-            <box>
-              <For each={options()}>
-                {(opt, i) => {
-                  const active = () => i() === store.selected
-                  const picked = () => store.answers[store.tab]?.includes(opt.label) ?? false
+          </Show>
+          <Show when={!single()}>
+            <box flexDirection="row" gap={1} paddingLeft={1}>
+              <For each={questions()}>
+                {(q, index) => {
+                  const isActive = () => index() === store.tab
+                  const isAnswered = () => {
+                    return (store.answers[index()]?.length ?? 0) > 0
+                  }
                   return (
-                    <box>
-                      <box flexDirection="row" gap={1}>
-                        <box backgroundColor={active() ? theme.backgroundElement : undefined}>
-                          <text fg={active() ? theme.secondary : picked() ? theme.success : theme.text}>
-                            {i() + 1}. {opt.label}
-                          </text>
-                        </box>
-                        <text fg={theme.success}>{picked() ? "✓" : ""}</text>
-                      </box>
-                      <box paddingLeft={3}>
-                        <text fg={theme.textMuted}>{opt.description}</text>
-                      </box>
+                    <box
+                      paddingLeft={1}
+                      paddingRight={1}
+                      backgroundColor={isActive() ? theme.accent : theme.backgroundElement}
+                    >
+                      <text fg={isActive() ? theme.selectedListItemText : isAnswered() ? theme.text : theme.textMuted}>
+                        {q.header}
+                      </text>
                     </box>
                   )
                 }}
               </For>
-              <box>
-                <box flexDirection="row" gap={1}>
-                  <box backgroundColor={other() ? theme.backgroundElement : undefined}>
-                    <text fg={other() ? theme.secondary : customPicked() ? theme.success : theme.text}>
-                      {options().length + 1}. Type your own answer
-                    </text>
-                  </box>
-                  <text fg={theme.success}>{customPicked() ? "✓" : ""}</text>
-                </box>
-                <Show when={store.editing}>
-                  <box paddingLeft={3}>
-                    <textarea
-                      ref={(val: TextareaRenderable) => (textarea = val)}
-                      focused
-                      initialValue={input()}
-                      placeholder="Type your own answer"
-                      textColor={theme.text}
-                      focusedTextColor={theme.text}
-                      cursorColor={theme.primary}
-                      keyBindings={bindings()}
-                    />
+              <box
+                paddingLeft={1}
+                paddingRight={1}
+                backgroundColor={confirm() ? theme.accent : theme.backgroundElement}
+              >
+                <text fg={confirm() ? theme.selectedListItemText : theme.textMuted}>Confirm</text>
+              </box>
+            </box>
+          </Show>
+        </box>
+      </Show>
+
+      <Show when={!confirm()}>
+        <box
+          maxHeight={Math.floor(dimensions().height * 0.5)}
+          overflow="scroll"
+          paddingLeft={2}
+          paddingRight={3}
+          backgroundColor={theme.backgroundElement}
+        >
+          <code
+            filetype="markdown"
+            drawUnstyledText={false}
+            syntaxStyle={syntax()}
+            content={"\n" + (question()?.question ?? "") + "\n"}
+            fg={theme.text}
+          />
+        </box>
+        <box paddingLeft={2} paddingRight={3} paddingTop={1} flexShrink={0}>
+          <For each={options()}>
+            {(opt, i) => {
+              const active = () => i() === store.selected
+              const picked = () => store.answers[store.tab]?.includes(opt.label) ?? false
+              const checkbox = () => (multi() ? (picked() ? "■" : "☐") : "")
+              return (
+                <box>
+                  <box flexDirection="row" gap={1}>
+                    <box backgroundColor={active() ? theme.backgroundElement : undefined}>
+                      <text fg={active() ? theme.secondary : picked() ? theme.success : theme.text}>
+                        {multi() ? checkbox() : `${i() + 1}.`} {opt.label}
+                      </text>
+                    </box>
                   </box>
-                </Show>
-                <Show when={!store.editing && input()}>
                   <box paddingLeft={3}>
-                    <text fg={theme.textMuted}>{input()}</text>
+                    <text fg={theme.textMuted}>{opt.description}</text>
                   </box>
-                </Show>
+                </box>
+              )
+            }}
+          </For>
+          <box>
+            <box flexDirection="row" gap={1}>
+              <box backgroundColor={other() ? theme.backgroundElement : undefined}>
+                <text fg={other() ? theme.secondary : customPicked() ? theme.success : theme.text}>
+                  {multi() ? (customPicked() ? "■" : "☐") : `${options().length + 1}.`} Type your own answer
+                </text>
               </box>
             </box>
+            <Show when={store.editing}>
+              <box paddingLeft={3}>
+                <textarea
+                  ref={(val: TextareaRenderable) => (textarea = val)}
+                  focused
+                  initialValue={input()}
+                  placeholder="Type your own answer"
+                  textColor={theme.text}
+                  focusedTextColor={theme.text}
+                  cursorColor={theme.primary}
+                  keyBindings={bindings()}
+                />
+              </box>
+            </Show>
+            <Show when={!store.editing && input()}>
+              <box paddingLeft={3}>
+                <text fg={theme.textMuted}>{input()}</text>
+              </box>
+            </Show>
           </box>
-        </Show>
+        </box>
+      </Show>
 
-        <Show when={confirm() && !single()}>
+      <Show when={confirm() && !single()}>
+        <box paddingLeft={2} paddingRight={3} flexGrow={1}>
           <box paddingLeft={1}>
             <text fg={theme.text}>Review</text>
           </box>
@@ -329,18 +380,25 @@ export function QuestionPrompt(props: { request: QuestionRequest }) {
               )
             }}
           </For>
-        </Show>
-      </box>
+        </box>
+      </Show>
+
       <box
         flexDirection="row"
         flexShrink={0}
         gap={1}
         paddingLeft={2}
         paddingRight={3}
+        paddingTop={1}
         paddingBottom={1}
         justifyContent="space-between"
       >
         <box flexDirection="row" gap={2}>
+          <Show when={!confirm()}>
+            <box paddingLeft={1} paddingRight={1} backgroundColor={theme.backgroundElement}>
+              <text fg={theme.textMuted}>{multi() ? "Multiple" : "Single"}</text>
+            </box>
+          </Show>
           <Show when={!single()}>
             <text fg={theme.text}>
               {"⇆"} <span style={{ fg: theme.textMuted }}>tab</span>
@@ -351,10 +409,15 @@ export function QuestionPrompt(props: { request: QuestionRequest }) {
               {"↑↓"} <span style={{ fg: theme.textMuted }}>select</span>
             </text>
           </Show>
+          <Show when={!confirm() && multi()}>
+            <text fg={theme.text}>
+              space <span style={{ fg: theme.textMuted }}>toggle</span>
+            </text>
+          </Show>
           <text fg={theme.text}>
             enter{" "}
             <span style={{ fg: theme.textMuted }}>
-              {confirm() ? "submit" : multi() ? "toggle" : single() ? "submit" : "confirm"}
+              {confirm() ? "submit" : multi() ? "confirm" : single() ? "submit" : "confirm"}
             </span>
           </text>
 
diff --git a/packages/opencode/src/question/index.ts b/packages/opencode/src/question/index.ts
index 23656b53aa9..e6f4ebdd4cb 100644
--- a/packages/opencode/src/question/index.ts
+++ b/packages/opencode/src/question/index.ts
@@ -35,6 +35,7 @@ export namespace Question {
       id: Identifier.schema("question"),
       sessionID: Identifier.schema("session"),
       questions: z.array(Info).describe("Questions to ask"),
+      from: z.string().optional().describe("Identifier of who is asking the question (e.g. agent name)"),
       tool: z
         .object({
           messageID: z.string(),
@@ -96,18 +97,20 @@ export namespace Question {
   export async function ask(input: {
     sessionID: string
     questions: Info[]
+    from?: string
     tool?: { messageID: string; callID: string }
   }): Promise<Answer[]> {
     const s = await state()
     const id = Identifier.ascending("question")
 
-    log.info("asking", { id, questions: input.questions.length })
+    log.info("asking", { id, questions: input.questions.length, from: input.from })
 
     return new Promise<Answer[]>((resolve, reject) => {
       const info: Request = {
         id,
         sessionID: input.sessionID,
         questions: input.questions,
+        from: input.from,
         tool: input.tool,
       }
       s.pending[id] = {
diff --git a/packages/opencode/src/tool/question.ts b/packages/opencode/src/tool/question.ts
index c6f0b91599b..66b592b0f25 100644
--- a/packages/opencode/src/tool/question.ts
+++ b/packages/opencode/src/tool/question.ts
@@ -7,11 +7,18 @@ export const QuestionTool = Tool.define("question", {
   description: DESCRIPTION,
   parameters: z.object({
     questions: z.array(Question.Info).describe("Questions to ask"),
+    from: z
+      .string()
+      .optional()
+      .describe(
+        "Identifier of who is asking the question (e.g. agent name). Used to inform the user which agent is asking.",
+      ),
   }),
   async execute(params, ctx) {
     const answers = await Question.ask({
       sessionID: ctx.sessionID,
       questions: params.questions,
+      from: params.from,
       tool: ctx.callID ? { messageID: ctx.messageID, callID: ctx.callID } : undefined,
     })
 
diff --git a/packages/opencode/src/tool/question.txt b/packages/opencode/src/tool/question.txt
index a85a4110f50..1722b2db665 100644
--- a/packages/opencode/src/tool/question.txt
+++ b/packages/opencode/src/tool/question.txt
@@ -8,3 +8,5 @@ Usage notes:
 - Users will always be able to select "Other" to provide custom text input
 - Answers are returned as arrays of labels; set `multiple: true` to allow selecting more than one
 - If you recommend a specific option, make that the first option in the list and add "(Recommended)" at the end of the label
+- Use the optional `from` parameter to identify who is asking the question (e.g. your agent name). This helps the user understand which agent is requesting input.
+- The `question` field supports full Markdown syntax including headings, bold, italic, code blocks with syntax highlighting, lists, links, and tables. Use this to format complex questions clearly.
diff --git a/packages/opencode/test/fixture/fixture.ts b/packages/opencode/test/fixture/fixture.ts
index ed8c5e344a8..97d113cb452 100644
--- a/packages/opencode/test/fixture/fixture.ts
+++ b/packages/opencode/test/fixture/fixture.ts
@@ -18,7 +18,7 @@ type TmpDirOptions<T> = {
 export async function tmpdir<T>(options?: TmpDirOptions<T>) {
   const dirpath = sanitizePath(path.join(os.tmpdir(), "opencode-test-" + Math.random().toString(36).slice(2)))
   await fs.mkdir(dirpath, { recursive: true })
-  if (options?.git) {
+  if (options?.git && !process.env["OPENCODE_TEST_SKIP_GIT"]) {
     await $`git init`.cwd(dirpath).quiet()
     await $`git commit --allow-empty -m "root commit ${dirpath}"`.cwd(dirpath).quiet()
   }
diff --git a/packages/opencode/test/preload.ts b/packages/opencode/test/preload.ts
index 35b0b6c7642..98c991b393a 100644
--- a/packages/opencode/test/preload.ts
+++ b/packages/opencode/test/preload.ts
@@ -6,6 +6,24 @@ import fs from "fs/promises"
 import fsSync from "fs"
 import { afterAll } from "bun:test"
 
+// Print all OPENCODE_TEST_* env vars for visibility
+const testEnvVars = Object.entries(process.env)
+  .filter(([key]) => key.startsWith("OPENCODE_TEST_"))
+  .sort(([a], [b]) => a.localeCompare(b))
+
+if (testEnvVars.length > 0) {
+  const title = " Test Environment Variables "
+  const lines = testEnvVars.map(([key, value]) => `│ ${key}=${value}`)
+  const maxContentWidth = Math.max(title.length, ...lines.map((l) => l.length - 1))
+  const width = maxContentWidth + 1
+
+  console.log("\n┌" + "─" + title + "─".repeat(width - title.length - 1) + "┐")
+  for (const line of lines) {
+    console.log(line + " ".repeat(width - line.length + 1) + "│")
+  }
+  console.log("└" + "─".repeat(width) + "┘\n")
+}
+
 const dir = path.join(os.tmpdir(), "opencode-test-data-" + process.pid)
 await fs.mkdir(dir, { recursive: true })
 afterAll(() => {
diff --git a/packages/opencode/test/question/question.test.ts b/packages/opencode/test/question/question.test.ts
index cf24faa7d22..c063de66498 100644
--- a/packages/opencode/test/question/question.test.ts
+++ b/packages/opencode/test/question/question.test.ts
@@ -298,3 +298,54 @@ test("list - returns empty when no pending", async () => {
     },
   })
 })
+
+// from tests
+
+test("ask - includes from in request when provided", async () => {
+  await using tmp = await tmpdir({ git: true })
+  await Instance.provide({
+    directory: tmp.path,
+    fn: async () => {
+      Question.ask({
+        sessionID: "ses_test",
+        questions: [
+          {
+            question: "What would you like to do?",
+            header: "Action",
+            options: [{ label: "Option 1", description: "First option" }],
+          },
+        ],
+        from: "test-agent",
+      })
+
+      const pending = await Question.list()
+
+      expect(pending.length).toBe(1)
+      expect(pending[0].from).toBe("test-agent")
+    },
+  })
+})
+
+test("ask - from is undefined when not provided", async () => {
+  await using tmp = await tmpdir({ git: true })
+  await Instance.provide({
+    directory: tmp.path,
+    fn: async () => {
+      Question.ask({
+        sessionID: "ses_test",
+        questions: [
+          {
+            question: "What would you like to do?",
+            header: "Action",
+            options: [{ label: "Option 1", description: "First option" }],
+          },
+        ],
+      })
+
+      const pending = await Question.list()
+
+      expect(pending.length).toBe(1)
+      expect(pending[0].from).toBeUndefined()
+    },
+  })
+})
diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index e423fecea42..4624c3fc63f 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -554,6 +554,10 @@ export type QuestionRequest = {
    * Questions to ask
    */
   questions: Array<QuestionInfo>
+  /**
+   * Identifier of who is asking the question (e.g. agent name)
+   */
+  from?: string
   tool?: {
     messageID: string
     callID: string