diff --git a/e2e/global-setup.ts b/e2e/global-setup.ts
index ba3b7a1..815aad0 100644
--- a/e2e/global-setup.ts
+++ b/e2e/global-setup.ts
@@ -5,6 +5,7 @@ import * as os from 'os';
 
 const PID_FILE = '/tmp/autopr-e2e.pid';
 export const FIXTURES_FILE = '/tmp/autopr-e2e-fixtures.json';
+const AUTO_PRD_PATH = process.env.AUTO_PRD_PATH || '/usr/local/bin/auto-prd';
 
 export interface E2EFixtures {
   repoDir: string;
@@ -118,7 +119,7 @@ providers:
 }
 
 async function startDaemon(homeDir: string): Promise<void> {
-  const daemon = spawn('/usr/local/bin/auto-prd', [], {
+  const daemon = spawn(AUTO_PRD_PATH, [], {
     env: { ...process.env, HOME: homeDir },
     stdio: ['ignore', 'pipe', 'pipe'],
     detached: false,
diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
index 0af8e6c..f538d73 100644
--- a/e2e/tsconfig.json
+++ b/e2e/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "ES2022",
     "module": "commonjs",
-    "lib": ["ES2022"],
+    "lib": ["ES2022", "DOM"],
     "strict": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,
diff --git a/web/src/App.tsx b/web/src/App.tsx
index 40c6304..09b68cd 100644
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@@ -19,6 +19,7 @@ import {
 import { AddTicketDialog } from "./AddTicketDialog";
 import { DiscoverTicketsModal } from "./DiscoverTicketsModal";
 import { ExecutionLogsModal } from "./ExecutionLogsModal";
+import { extractOpenQuestions, formatFeedbackMessage } from "./investigationFeedback";
 import { TicketDetailPanel } from "./TicketDetailPanel";
 import { TicketList } from "./TicketList";
 import {
@@ -38,7 +39,9 @@ export function App() {
   const [details, setDetails] = useState<TicketDetails | null>(null);
   const [selectedRunId, setSelectedRunId] = useState("");
   const [selectedArtifactContent, setSelectedArtifactContent] = useState("");
-  const [feedbackMessage, setFeedbackMessage] = useState("");
+  const [currentFeedbackArtifactContent, setCurrentFeedbackArtifactContent] = useState("");
+  const [questionAnswers, setQuestionAnswers] = useState<Record<string, string>>({});
+  const [generalFeedback, setGeneralFeedback] = useState("");
   const [activeJobId, setActiveJobId] = useState("");
   const [activeJob, setActiveJob] = useState<Job | null>(null);
   const [loading, setLoading] = useState(false);
@@ -64,14 +67,80 @@ export function App() {
   const availableRepoPaths = useMemo(() => knownRepoPaths(repositoryOptions, tickets), [repositoryOptions, tickets]);
   const stateRuns = useMemo(() => stateRunsFromDetails(details), [details]);
   const feedbackAction = useMemo(() => getFeedbackAction(details, selectedSummary), [details, selectedSummary]);
+  const currentRunId = details?.state.current_run_id ?? "";
+  const currentRun = useMemo(
+    () => stateRuns.find((run) => run.id === currentRunId) ?? null,
+    [currentRunId, stateRuns]
+  );
+  const openQuestions = useMemo(
+    () => extractOpenQuestions(currentFeedbackArtifactContent),
+    [currentFeedbackArtifactContent]
+  );
 
   const selectedSummaryRef = useRef<TicketSummary | null>(null);
   const activeJobIdRef = useRef("");
   const showLogsModalRef = useRef(false);
   const fullRefreshScheduledRef = useRef(false);
   const prevLastRunIdRef = useRef("");
+  const handleServerEventRef = useRef<(evt: ServerEvent) => Promise<void>>(async () => {});
   const reconnectErrorMessage = "event stream connection lost; reconnecting";
 
+  async function handleServerEvent(evt: ServerEvent) {
+    const selected = selectedSummaryRef.current;
+    const trackedJobID = activeJobIdRef.current;
+    if (evt.type === "job" && evt.job_id && trackedJobID && evt.job_id === trackedJobID) {
+      const status = evt.status ?? "";
+      if (status === "failed") {
+        try {
+          const job = await getJob(evt.job_id);
+          setActiveJob(job);
+        } catch (err) {
+          setError(err instanceof Error ? err.message : "failed to refresh job");
+        } finally {
+          setActiveJobId("");
+        }
+      } else if (status === "done") {
+        setActiveJob(null);
+        setActiveJobId("");
+      } else if (status === "queued" || status === "running") {
+        setActiveJob((current) => {
+          if (!current) {
+            return current;
+          }
+          return { ...current, status };
+        });
+      }
+    }
+
+    let needsFullRefresh = evt.type === "repo_tickets_synced";
+    setTickets((current) => {
+      const ticketUpdate = applyTicketEvent(current, evt);
+      if (ticketUpdate.needsFullRefresh) {
+        needsFullRefresh = true;
+      }
+      return ticketUpdate.tickets;
+    });
+    if (needsFullRefresh) {
+      scheduleFullRefresh();
+    }
+
+    if (
+      selected &&
+      evt.type === "ticket_updated" &&
+      evt.repo_path === selected.repo_path &&
+      evt.ticket_number === selected.ticket_number
+    ) {
+      if ((evt.status ?? "") !== "running" && activeJobIdRef.current) {
+        activeJobIdRef.current = "";
+        setActiveJobId("");
+      }
+      await refreshTicketDetails(selected.repo_path, selected.ticket_number, false);
+      if (showLogsModalRef.current) {
+        await refreshExecutionLogs(selected.repo_path, selected.ticket_number);
+      }
+    }
+  }
+
   useEffect(() => {
     selectedSummaryRef.current = selectedSummary;
   }, [selectedSummary]);
@@ -84,6 +153,10 @@ export function App() {
     showLogsModalRef.current = showLogsModal;
   }, [showLogsModal]);
 
+  useEffect(() => {
+    handleServerEventRef.current = handleServerEvent;
+  });
+
   useEffect(() => {
     void refreshTickets();
     void refreshRepositories();
@@ -92,7 +165,7 @@ export function App() {
       .catch(() => { setDiscoverConfigured(false); });
     const stream = connectEvents(
       (evt) => {
-        void handleServerEvent(evt);
+        void handleServerEventRef.current(evt);
       },
       () => {
         setError(reconnectErrorMessage);
@@ -109,6 +182,9 @@ export function App() {
       setDetails(null);
       setSelectedRunId("");
       setSelectedArtifactContent("");
+      setCurrentFeedbackArtifactContent("");
+      setQuestionAnswers({});
+      setGeneralFeedback("");
       setArtifactLoading(false);
       setShowLogsModal(false);
       setExecutionLogs([]);
@@ -116,7 +192,7 @@ export function App() {
       return;
     }
     void refreshTicketDetails(selectedSummary.repo_path, selectedSummary.ticket_number);
-  }, [selectedSummary?.repo_path, selectedSummary?.ticket_number]);
+  }, [selectedSummary]);
 
   useEffect(() => {
     if (stateRuns.length === 0) {
@@ -182,6 +258,40 @@ export function App() {
     };
   }, [selectedRunId, selectedSummary, stateRuns]);
 
+  useEffect(() => {
+    if (!selectedSummary || !currentRun) {
+      setCurrentFeedbackArtifactContent("");
+      return;
+    }
+    const artifactRef = currentRun.artifact_ref || currentRun.log_ref;
+    if (!artifactRef) {
+      setCurrentFeedbackArtifactContent("");
+      return;
+    }
+
+    let cancelled = false;
+    void getArtifact(selectedSummary.repo_path, selectedSummary.ticket_number, artifactRef)
+      .then((content) => {
+        if (!cancelled) {
+          setCurrentFeedbackArtifactContent(content);
+        }
+      })
+      .catch((err) => {
+        if (!cancelled) {
+          setError(err instanceof Error ? err.message : "failed to load feedback artifact");
+          setCurrentFeedbackArtifactContent("");
+        }
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [currentRun, selectedSummary]);
+
+  useEffect(() => {
+    setQuestionAnswers({});
+    setGeneralFeedback("");
+  }, [selectedSummary?.repo_path, selectedSummary?.ticket_number, currentRunId]);
+
   useEffect(() => {
     if (!showLogsModal || !selectedSummary) {
       return;
@@ -207,7 +317,7 @@ export function App() {
     return () => {
       cancelled = true;
     };
-  }, [showLogsModal, selectedSummary?.repo_path, selectedSummary?.ticket_number]);
+  }, [showLogsModal, selectedSummary]);
 
   async function refreshTickets(showLoader = true) {
     if (showLoader) {
@@ -263,58 +373,6 @@ export function App() {
     }
   }
 
-  async function handleServerEvent(evt: ServerEvent) {
-    const selected = selectedSummaryRef.current;
-    const trackedJobID = activeJobIdRef.current;
-    if (evt.type === "job" && evt.job_id && trackedJobID && evt.job_id === trackedJobID) {
-      const status = evt.status ?? "";
-      if (status === "failed") {
-        try {
-          const job = await getJob(evt.job_id);
-          setActiveJob(job);
-        } catch (err) {
-          setError(err instanceof Error ? err.message : "failed to refresh job");
-        } finally {
-          setActiveJobId("");
-        }
-      } else if (status === "done") {
-        setActiveJob(null);
-        setActiveJobId("");
-      } else if (status === "queued" || status === "running") {
-        setActiveJob((current) => {
-          if (!current) {
-            return current;
-          }
-          return { ...current, status };
-        });
-      }
-    }
-
-    let needsFullRefresh = evt.type === "repo_tickets_synced";
-    setTickets((current) => {
-      const ticketUpdate = applyTicketEvent(current, evt);
-      if (ticketUpdate.needsFullRefresh) {
-        needsFullRefresh = true;
-      }
-      return ticketUpdate.tickets;
-    });
-    if (needsFullRefresh) {
-      scheduleFullRefresh();
-    }
-
-    if (
-      selected &&
-      evt.type === "ticket_updated" &&
-      evt.repo_path === selected.repo_path &&
-      evt.ticket_number === selected.ticket_number
-    ) {
-      await refreshTicketDetails(selected.repo_path, selected.ticket_number, false);
-      if (showLogsModalRef.current) {
-        await refreshExecutionLogs(selected.repo_path, selected.ticket_number);
-      }
-    }
-  }
-
   function scheduleFullRefresh() {
     if (fullRefreshScheduledRef.current) {
       return;
@@ -330,6 +388,7 @@ export function App() {
     setError("");
     try {
       const accepted = await fn();
+      activeJobIdRef.current = accepted.job_id;
       setActiveJobId(accepted.job_id);
       setActiveJob(null);
       return true;
@@ -402,7 +461,11 @@ export function App() {
   }
 
   function submitFeedback() {
-    if (!selectedSummary || !feedbackAction || !feedbackMessage.trim()) {
+    if (!selectedSummary || !feedbackAction) {
+      return;
+    }
+    const message = formatFeedbackMessage(openQuestions, questionAnswers, generalFeedback);
+    if (!message.trim()) {
       return;
     }
     void queueAction(() =>
@@ -410,15 +473,20 @@ export function App() {
         selectedSummary.repo_path,
         selectedSummary.ticket_number,
         feedbackAction.label,
-        feedbackMessage
+        message
       )
     ).then((ok) => {
       if (ok) {
-        setFeedbackMessage("");
+        setQuestionAnswers({});
+        setGeneralFeedback("");
       }
     });
   }
 
+  function updateQuestionAnswer(index: number, value: string) {
+    setQuestionAnswers((current) => ({ ...current, [String(index)]: value }));
+  }
+
   function applyNamedAction(label: string) {
     if (!selectedSummary) {
       return;
@@ -521,9 +589,13 @@ export function App() {
           selectedArtifactContent={selectedArtifactContent}
           artifactLoading={artifactLoading}
           feedbackAction={feedbackAction}
-          feedbackMessage={feedbackMessage}
+          openQuestions={feedbackAction ? openQuestions : []}
+          questionAnswers={questionAnswers}
+          generalFeedback={generalFeedback}
+          isRunning={!!activeJobId}
           onSelectRun={setSelectedRunId}
-          onFeedbackMessageChange={setFeedbackMessage}
+          onQuestionAnswerChange={updateQuestionAnswer}
+          onGeneralFeedbackChange={setGeneralFeedback}
           onSubmitFeedback={submitFeedback}
           onApplyAction={applyNamedAction}
           onOpenLogs={() => setShowLogsModal(true)}
diff --git a/web/src/TicketDetailPanel.tsx b/web/src/TicketDetailPanel.tsx
index ccf2576..13842e6 100644
--- a/web/src/TicketDetailPanel.tsx
+++ b/web/src/TicketDetailPanel.tsx
@@ -12,9 +12,13 @@ type TicketDetailPanelProps = {
   selectedArtifactContent: string;
   artifactLoading: boolean;
   feedbackAction?: ActionInfo;
-  feedbackMessage: string;
+  openQuestions: string[];
+  questionAnswers: Record<string, string>;
+  generalFeedback: string;
+  isRunning: boolean;
   onSelectRun: (runId: string) => void;
-  onFeedbackMessageChange: (value: string) => void;
+  onQuestionAnswerChange: (index: number, value: string) => void;
+  onGeneralFeedbackChange: (value: string) => void;
   onSubmitFeedback: () => void;
   onApplyAction: (label: string) => void;
   onOpenLogs: () => void;
@@ -31,9 +35,13 @@ export function TicketDetailPanel({
   selectedArtifactContent,
   artifactLoading,
   feedbackAction,
-  feedbackMessage,
+  openQuestions,
+  questionAnswers,
+  generalFeedback,
+  isRunning,
   onSelectRun,
-  onFeedbackMessageChange,
+  onQuestionAnswerChange,
+  onGeneralFeedbackChange,
   onSubmitFeedback,
   onApplyAction,
   onOpenLogs,
@@ -71,7 +79,7 @@ export function TicketDetailPanel({
         <div className="detail-actions-wrap">
           <div className="button-row detail-actions">
             {actionButtons.map((action) => (
-              <button key={action.label} onClick={() => onApplyAction(action.label)} disabled={selectedSummary.busy}>
+              <button key={action.label} onClick={() => onApplyAction(action.label)} disabled={isRunning || selectedSummary.busy}>
                 {action.label}
               </button>
             ))}
@@ -89,9 +97,9 @@ export function TicketDetailPanel({
             workflowStates={details?.workflow_states ?? []}
             currentStateName={details?.state.current_state}
             rerunLabel={selectedSummary.status === "failed" ? "Retry" : "Rerun"}
-            rerunDisabled={selectedSummary.busy}
+            rerunDisabled={isRunning || selectedSummary.busy}
             cleanupDisabled={selectedSummary.busy}
-            moveDisabled={selectedSummary.busy}
+            moveDisabled={isRunning || selectedSummary.busy}
           />
         </div>
       </div>
@@ -103,23 +111,6 @@ export function TicketDetailPanel({
       <article className="card">
         <span className="field-label">Timeline</span>
         <StateTimeline runs={stateRuns} selectedRunId={selectedRunId} onSelectRun={onSelectRun} />
-        {feedbackAction ? (
-          <form
-            className="feedback-form"
-            onSubmit={(event) => {
-              event.preventDefault();
-              onSubmitFeedback();
-            }}
-          >
-            <textarea
-              value={feedbackMessage}
-              onChange={(event) => onFeedbackMessageChange(event.target.value)}
-              placeholder={`Send feedback (${feedbackAction.label})`}
-              rows={3}
-            />
-            <button type="submit">{feedbackAction.label}</button>
-          </form>
-        ) : null}
         {selectedRun ? (
           <div className="timeline-content">
             <div className="timeline-content-header">
@@ -139,6 +130,51 @@ export function TicketDetailPanel({
         ) : (
           <p className="meta">No workflow runs available yet.</p>
         )}
+        {feedbackAction ? (
+          <form
+            className="feedback-form"
+            onSubmit={(event) => {
+              event.preventDefault();
+              onSubmitFeedback();
+            }}
+          >
+            {openQuestions.length > 0 ? (
+              <>
+                {openQuestions.map((question, index) => (
+                  <label key={`${index}-${question}`} className="feedback-field">
+                    <span className="field-label">Open Question {index + 1}</span>
+                    <p className="feedback-question">{question}</p>
+                    <textarea
+                      value={questionAnswers[String(index)] ?? ""}
+                      onChange={(event) => onQuestionAnswerChange(index, event.target.value)}
+                      placeholder={`Answer open question ${index + 1}`}
+                      rows={4}
+                    />
+                  </label>
+                ))}
+                <label className="feedback-field">
+                  <span className="field-label">Additional Feedback</span>
+                  <textarea
+                    value={generalFeedback}
+                    onChange={(event) => onGeneralFeedbackChange(event.target.value)}
+                    placeholder="Add any additional context"
+                    rows={4}
+                  />
+                </label>
+              </>
+            ) : (
+              <textarea
+                value={generalFeedback}
+                onChange={(event) => onGeneralFeedbackChange(event.target.value)}
+                placeholder={`Send feedback (${feedbackAction.label})`}
+                rows={3}
+              />
+            )}
+            <div className="feedback-submit">
+              <button type="submit" disabled={isRunning || selectedSummary.busy}>{feedbackAction.label}</button>
+            </div>
+          </form>
+        ) : null}
       </article>
     </section>
   );
diff --git a/web/src/__tests__/App.test.tsx b/web/src/__tests__/App.test.tsx
new file mode 100644
index 0000000..1d260dd
--- /dev/null
+++ b/web/src/__tests__/App.test.tsx
@@ -0,0 +1,138 @@
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { App } from "../App";
+
+const apiMocks = vi.hoisted(() => ({
+  applyAction: vi.fn(),
+  cleanupAll: vi.fn(),
+  cleanupDone: vi.fn(),
+  cleanupTicket: vi.fn(),
+  connectEvents: vi.fn(),
+  discoverTickets: vi.fn(),
+  getArtifact: vi.fn(),
+  getExecutionLogs: vi.fn(),
+  getHealth: vi.fn(),
+  getJob: vi.fn(),
+  getTicket: vi.fn(),
+  listRepositories: vi.fn(),
+  listTickets: vi.fn(),
+  moveToState: vi.fn(),
+  runTicket: vi.fn()
+}));
+
+vi.mock("../api", () => apiMocks);
+
+beforeEach(() => {
+  vi.clearAllMocks();
+  apiMocks.connectEvents.mockReturnValue({ close: vi.fn() });
+  apiMocks.listTickets.mockResolvedValue([
+    {
+      repo_id: "repo1",
+      repo_path: "/repo1",
+      ticket_number: "GH-5",
+      title: "Structured feedback",
+      status: "waiting",
+      busy: false,
+      approved: false,
+      updated_at: "2024-01-01T00:00:00Z"
+    }
+  ]);
+  apiMocks.listRepositories.mockResolvedValue(["/repo1"]);
+  apiMocks.getHealth.mockResolvedValue({ discover_tickets_configured: false });
+  apiMocks.getExecutionLogs.mockResolvedValue([]);
+  apiMocks.getTicket.mockResolvedValue({
+    repo_id: "repo1",
+    repo_path: "/repo1",
+    ticket_number: "GH-5",
+    workflow_states: [],
+    available_actions: [{ label: "Provide Feedback", type: "provide_feedback" }],
+    state: {
+      ticket_number: "GH-5",
+      current_state: "investigation",
+      current_run_id: "run-2",
+      flow_status: "waiting",
+      branch_name: "",
+      worktree_path: "",
+      created_at: "2024-01-01T00:00:00Z",
+      updated_at: "2024-01-01T00:00:00Z",
+      state_history: [
+        {
+          id: "run-1",
+          state_name: "investigation",
+          state_display_name: "Investigation",
+          artifact_ref: "runs/run-1/artifacts/investigation.md",
+          started_at: "2024-01-01T00:00:00Z"
+        },
+        {
+          id: "run-2",
+          state_name: "investigation",
+          state_display_name: "Investigation",
+          artifact_ref: "runs/run-2/artifacts/investigation.md",
+          started_at: "2024-01-02T00:00:00Z"
+        }
+      ]
+    }
+  });
+  apiMocks.getArtifact.mockImplementation(async (_repoPath: string, _ticket: string, artifactRef: string) => {
+    if (artifactRef.includes("run-1")) {
+      return `## Open Questions
+
+1. Old question?
+`;
+    }
+    return `## Open Questions
+
+1. Current question?
+`;
+  });
+  apiMocks.applyAction.mockResolvedValue({
+    status: "accepted",
+    job_id: "job-1",
+    action: "apply_action",
+    repo_id: "repo1",
+    repo_path: "/repo1"
+  });
+});
+
+describe("App structured feedback", () => {
+  it("submits structured feedback from the current run even when an older run is selected", async () => {
+    render(<App />);
+
+    expect(await screen.findByPlaceholderText("Answer open question 1")).toBeInTheDocument();
+    expect(screen.getByText("Current question?")).toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole("button", { name: "Investigation 1" }));
+
+    await waitFor(() => {
+      expect(screen.getByText("Current question?")).toBeInTheDocument();
+    });
+
+    const answerField = screen.getByPlaceholderText("Answer open question 1");
+    const additionalField = screen.getByPlaceholderText("Add any additional context");
+
+    fireEvent.change(answerField, { target: { value: "Current answer" } });
+    fireEvent.change(additionalField, { target: { value: "Extra context" } });
+    fireEvent.click(screen.getByRole("button", { name: "Provide Feedback" }));
+
+    await waitFor(() => {
+      expect(apiMocks.applyAction).toHaveBeenCalledWith(
+        "/repo1",
+        "GH-5",
+        "Provide Feedback",
+        expect.stringContaining("Current question?")
+      );
+    });
+    expect(apiMocks.applyAction).toHaveBeenCalledWith(
+      "/repo1",
+      "GH-5",
+      "Provide Feedback",
+      expect.not.stringContaining("Old question?")
+    );
+    expect(apiMocks.applyAction).toHaveBeenCalledWith(
+      "/repo1",
+      "GH-5",
+      "Provide Feedback",
+      expect.stringContaining("## Additional Feedback")
+    );
+  });
+});
diff --git a/web/src/__tests__/TicketDetailPanel.test.tsx b/web/src/__tests__/TicketDetailPanel.test.tsx
new file mode 100644
index 0000000..0d0a020
--- /dev/null
+++ b/web/src/__tests__/TicketDetailPanel.test.tsx
@@ -0,0 +1,111 @@
+import { fireEvent, render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import { TicketDetailPanel } from "../TicketDetailPanel";
+import type { TicketDetails, TicketSummary } from "../types";
+
+function makeSummary(partial: Partial<TicketSummary> = {}): TicketSummary {
+  return {
+    repo_id: "repo1",
+    repo_path: "/repo1",
+    ticket_number: "GH-5",
+    title: "Structured feedback",
+    status: "waiting",
+    busy: false,
+    approved: false,
+    updated_at: "2024-01-01T00:00:00Z",
+    ...partial
+  };
+}
+
+function makeDetails(): TicketDetails {
+  return {
+    repo_id: "repo1",
+    repo_path: "/repo1",
+    ticket_number: "GH-5",
+    workflow_states: [],
+    available_actions: [{ label: "Provide Feedback", type: "provide_feedback" }],
+    state: {
+      ticket_number: "GH-5",
+      current_state: "investigation",
+      current_run_id: "run-2",
+      flow_status: "waiting",
+      branch_name: "",
+      worktree_path: "",
+      created_at: "2024-01-01T00:00:00Z",
+      updated_at: "2024-01-01T00:00:00Z",
+      state_history: [
+        { id: "run-1", state_name: "investigation", state_display_name: "Investigation", started_at: "2024-01-01T00:00:00Z" },
+        { id: "run-2", state_name: "investigation", state_display_name: "Investigation", started_at: "2024-01-02T00:00:00Z" }
+      ]
+    }
+  };
+}
+
+describe("TicketDetailPanel", () => {
+  it("renders one textarea per open question plus a general feedback textarea", () => {
+    render(
+      <TicketDetailPanel
+        selectedSummary={makeSummary()}
+        details={makeDetails()}
+        stateRuns={makeDetails().state.state_history ?? []}
+        selectedRunId="run-2"
+        selectedArtifactContent="artifact"
+        artifactLoading={false}
+        feedbackAction={{ label: "Provide Feedback", type: "provide_feedback" }}
+        openQuestions={["What should happen first?", "What should happen second?"]}
+        questionAnswers={{ "0": "First answer" }}
+        generalFeedback="General feedback"
+        isRunning={false}
+        onSelectRun={vi.fn()}
+        onQuestionAnswerChange={vi.fn()}
+        onGeneralFeedbackChange={vi.fn()}
+        onSubmitFeedback={vi.fn()}
+        onApplyAction={vi.fn()}
+        onOpenLogs={vi.fn()}
+        onRerun={vi.fn()}
+        onCleanup={vi.fn()}
+        onMoveToState={vi.fn()}
+      />
+    );
+
+    expect(screen.getByText("Open Question 1")).toBeInTheDocument();
+    expect(screen.getByText("What should happen first?")).toBeInTheDocument();
+    expect(screen.getByText("Open Question 2")).toBeInTheDocument();
+    expect(screen.getByText("Additional Feedback")).toBeInTheDocument();
+    expect(screen.getAllByRole("textbox")).toHaveLength(3);
+    expect(screen.getByRole("button", { name: "Provide Feedback" })).toBeInTheDocument();
+  });
+
+  it("falls back to a single general feedback textarea when there are no open questions", () => {
+    const onGeneralFeedbackChange = vi.fn();
+    render(
+      <TicketDetailPanel
+        selectedSummary={makeSummary()}
+        details={makeDetails()}
+        stateRuns={makeDetails().state.state_history ?? []}
+        selectedRunId="run-2"
+        selectedArtifactContent="artifact"
+        artifactLoading={false}
+        feedbackAction={{ label: "Provide Feedback", type: "provide_feedback" }}
+        openQuestions={[]}
+        questionAnswers={{}}
+        generalFeedback=""
+        isRunning={false}
+        onSelectRun={vi.fn()}
+        onQuestionAnswerChange={vi.fn()}
+        onGeneralFeedbackChange={onGeneralFeedbackChange}
+        onSubmitFeedback={vi.fn()}
+        onApplyAction={vi.fn()}
+        onOpenLogs={vi.fn()}
+        onRerun={vi.fn()}
+        onCleanup={vi.fn()}
+        onMoveToState={vi.fn()}
+      />
+    );
+
+    const textarea = screen.getByPlaceholderText("Send feedback (Provide Feedback)");
+    fireEvent.change(textarea, { target: { value: "General note" } });
+    expect(onGeneralFeedbackChange).toHaveBeenCalledWith("General note");
+    expect(screen.getAllByRole("textbox")).toHaveLength(1);
+  });
+});
diff --git a/web/src/__tests__/investigationFeedback.test.ts b/web/src/__tests__/investigationFeedback.test.ts
new file mode 100644
index 0000000..ff0da80
--- /dev/null
+++ b/web/src/__tests__/investigationFeedback.test.ts
@@ -0,0 +1,66 @@
+import { describe, expect, it } from "vitest";
+import { extractOpenQuestions, formatFeedbackMessage } from "../investigationFeedback";
+
+describe("extractOpenQuestions", () => {
+  it("extracts numbered questions from the Open Questions section", () => {
+    const markdown = `## Problem Summary
+
+Text
+
+## Open Questions
+
+1. First question?
+2. Second question?
+
+## Risks
+
+None`;
+
+    expect(extractOpenQuestions(markdown)).toEqual(["First question?", "Second question?"]);
+  });
+
+  it("returns an empty list when the section is not a strict markdown list", () => {
+    const markdown = `## Open Questions
+
+This is prose instead of a list.`;
+
+    expect(extractOpenQuestions(markdown)).toEqual([]);
+  });
+
+  it("supports indented continuation lines for a question", () => {
+    const markdown = `## Open Questions
+
+- How should we handle long answers
+  when the question wraps multiple lines?
+`;
+
+    expect(extractOpenQuestions(markdown)).toEqual([
+      "How should we handle long answers when the question wraps multiple lines?"
+    ]);
+  });
+});
+
+describe("formatFeedbackMessage", () => {
+  it("formats answered questions and appends additional feedback", () => {
+    const message = formatFeedbackMessage(
+      ["Question one?", "Question two?"],
+      { "0": "Answer one", "1": "" },
+      "Extra context"
+    );
+
+    expect(message).toContain("## Answers to Open Questions");
+    expect(message).toContain("1. **Question:** Question one?");
+    expect(message).toContain("**Answer:** Answer one");
+    expect(message).not.toContain("Question two?");
+    expect(message).toContain("## Additional Feedback");
+    expect(message).toContain("Extra context");
+  });
+
+  it("returns general feedback unchanged when there are no answered questions", () => {
+    expect(formatFeedbackMessage(["Question one?"], { "0": "   " }, "General note")).toBe("General note");
+  });
+
+  it("returns an empty string when everything is blank", () => {
+    expect(formatFeedbackMessage(["Question one?"], { "0": "" }, "   ")).toBe("");
+  });
+});
diff --git a/web/src/__tests__/tickets.test.ts b/web/src/__tests__/tickets.test.ts
index 94cbcea..094d1b7 100644
--- a/web/src/__tests__/tickets.test.ts
+++ b/web/src/__tests__/tickets.test.ts
@@ -139,6 +139,13 @@ describe("applyTicketEvent", () => {
     expect(tickets[0].status).toBe("done");
   });
 
+  it("clears busy when ticket_updated moves the ticket out of running", () => {
+    const runningTicket = makeSummary({ repo_id: "r1", ticket_number: "42", status: "running", busy: true });
+    const evt: ServerEvent = { type: "ticket_updated", repo_id: "r1", ticket_number: "42", status: "done" };
+    const { tickets } = applyTicketEvent([runningTicket], evt);
+    expect(tickets[0].busy).toBe(false);
+  });
+
   it("signals needsFullRefresh when an update arrives for an unknown ticket", () => {
     const evt: ServerEvent = { type: "ticket_updated", repo_id: "r1", ticket_number: "unknown" };
     expect(applyTicketEvent([ticket], evt).needsFullRefresh).toBe(true);
diff --git a/web/src/investigationFeedback.ts b/web/src/investigationFeedback.ts
new file mode 100644
index 0000000..16092bb
--- /dev/null
+++ b/web/src/investigationFeedback.ts
@@ -0,0 +1,105 @@
+export function extractOpenQuestions(markdown: string): string[] {
+  const section = extractSection(markdown, "Open Questions");
+  if (!section) {
+    return [];
+  }
+
+  const lines = section.split("\n");
+  const questions: string[] = [];
+  let current = "";
+  let sawListItem = false;
+
+  for (const rawLine of lines) {
+    const line = rawLine.replace(/\s+$/, "");
+    const trimmed = line.trim();
+
+    if (!trimmed) {
+      continue;
+    }
+
+    const listMatch = trimmed.match(/^([-*+]|\d+\.)\s+(.+)$/);
+    if (listMatch) {
+      if (current) {
+        questions.push(current.trim());
+      }
+      current = listMatch[2].trim();
+      sawListItem = true;
+      continue;
+    }
+
+    if (!sawListItem) {
+      return [];
+    }
+
+    if (/^\s{2,}\S/.test(line)) {
+      current = `${current} ${trimmed}`.trim();
+      continue;
+    }
+
+    return [];
+  }
+
+  if (current) {
+    questions.push(current.trim());
+  }
+
+  return questions;
+}
+
+export function formatFeedbackMessage(
+  questions: string[],
+  answers: Record<string, string>,
+  generalFeedback: string
+): string {
+  const answeredQuestions = questions
+    .map((question, index) => ({
+      question,
+      answer: (answers[String(index)] ?? "").trim()
+    }))
+    .filter((entry) => entry.answer);
+  const trimmedGeneralFeedback = generalFeedback.trim();
+
+  if (answeredQuestions.length === 0) {
+    return trimmedGeneralFeedback;
+  }
+
+  const parts = ["## Answers to Open Questions", ""];
+  answeredQuestions.forEach((entry, index) => {
+    parts.push(`${index + 1}. **Question:** ${entry.question}`);
+    parts.push("");
+    parts.push(`   **Answer:** ${entry.answer}`);
+    parts.push("");
+  });
+
+  if (trimmedGeneralFeedback) {
+    parts.push("## Additional Feedback", "");
+    parts.push(trimmedGeneralFeedback);
+  }
+
+  return parts.join("\n").trim();
+}
+
+function extractSection(markdown: string, sectionName: string): string {
+  const lines = markdown.split("\n");
+  const sectionHeader = `## ${sectionName}`.toLowerCase();
+  let inSection = false;
+  const sectionLines: string[] = [];
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!inSection) {
+      if (trimmed.toLowerCase() === sectionHeader) {
+        inSection = true;
+      }
+      continue;
+    }
+
+    if (/^##\s+/.test(trimmed)) {
+      break;
+    }
+
+    sectionLines.push(line);
+  }
+
+  return sectionLines.join("\n").trim();
+}
diff --git a/web/src/styles.css b/web/src/styles.css
index 29430d5..30e8691 100644
--- a/web/src/styles.css
+++ b/web/src/styles.css
@@ -255,11 +255,26 @@ button:disabled {
 
 .feedback-form {
   display: grid;
-  grid-template-columns: 1fr auto;
   gap: 8px;
   margin-bottom: 12px;
 }
 
+.feedback-field {
+  display: grid;
+  gap: 6px;
+}
+
+.feedback-question {
+  margin: 0;
+  font-size: 0.95rem;
+  line-height: 1.45;
+}
+
+.feedback-submit {
+  display: flex;
+  justify-content: flex-end;
+}
+
 .tabs {
   display: flex;
   gap: 8px;
diff --git a/web/src/tickets.ts b/web/src/tickets.ts
index 8334d14..b9ddee6 100644
--- a/web/src/tickets.ts
+++ b/web/src/tickets.ts
@@ -131,10 +131,12 @@ export function applyTicketEvent(current: TicketSummary[], evt: ServerEvent): {
       return { ...ticket, busy: isBusy, jobs: nextJobs };
     }
     if (evt.type === "ticket_updated") {
+      const nextStatus = (evt.status as TicketSummary["status"]) ?? ticket.status;
       return {
         ...ticket,
         title: evt.title ?? ticket.title,
-        status: (evt.status as TicketSummary["status"]) ?? ticket.status,
+        status: nextStatus,
+        busy: nextStatus === "running" ? ticket.busy : false,
         last_error: evt.error ?? ticket.last_error,
         pr_url: evt.pr_url ?? ticket.pr_url,
         updated_at: new Date().toISOString()