fix(dexdex): align plan shortcuts and subtask dispatch contracts (#289)

## Summary
- align plan decision keyboard contract to `A=Approve`, `V=Revise`,
`Shift+X=Reject/Cancel` and move plan shortcut handling into the plan
decision surface
- fix waiting-session global shortcut flow by restoring immediate
session input context on `/tasks?waitingSession=<session_id>`
- add an explicit dispatcher path for executing already-created subtasks
and wire `CreateSubTask`/`RetrySubTask` to dispatch the same created
subtask ID
- make `RunAutoFixNow` create and immediately dispatch a `PR_REVIEW_FIX`
subtask (manual auto-fix path)
- sync DexDex docs for shortcut semantics and clarify that poller-driven
`auto_fix_enabled` auto-dispatch remains planned

## Validation
- `go test ./servers/dexdex-main-server/...`
- `cd apps/dexdex && pnpm test`

## Notes
- no external proto/API schema changes
- `buf generate` for dexdex web plugins is currently blocked in this
environment due missing local protoc plugins (`protoc-gen-es`,
`protoc-gen-connect-query`)

Author: kdy1

apps/dexdex/src/App.test.tsx

@@ -36,6 +36,7 @@ import {
   PrStatus,
   AgentCliType,
   WorkspaceType,
+  PlanDecision as ProtoPlanDecision,
   PullRequestRecordSchema,
 } from "./gen/v1/dexdex_pb";
 import { AUTO_REPOSITORY_GROUP_PREFIX } from "./lib/repository-target";
@@ -268,6 +269,13 @@ let lastCreateUnitTaskRequest:
       repositoryId?: string;
     }
   | null = null;
+let lastSubmitPlanDecisionRequest:
+  | {
+      subTaskId?: string;
+      decision?: ProtoPlanDecision;
+      revisionNote?: string;
+    }
+  | null = null;
 
 interface TestTransportOptions {
   workspaces?: Array<{
@@ -321,10 +329,17 @@ function createTestTransport(options: TestTransportOptions = {}) {
           }),
         };
       },
-      submitPlanDecision: () => ({
-        updatedSubTask: undefined,
-        createdSubTask: undefined,
-      }),
+      submitPlanDecision: (req) => {
+        lastSubmitPlanDecisionRequest = {
+          subTaskId: req.subTaskId,
+          decision: req.decision,
+          revisionNote: req.revisionNote,
+        };
+        return {
+          updatedSubTask: undefined,
+          createdSubTask: undefined,
+        };
+      },
     });
     router.service(NotificationService, {
       listNotifications: () => ({ notifications: mockNotifications }),
@@ -489,6 +504,7 @@ function renderWithProviders(
 beforeEach(() => {
   localStorageMock.clear();
   lastCreateUnitTaskRequest = null;
+  lastSubmitPlanDecisionRequest = null;
   document.documentElement.classList.remove("dark");
   localStorageMock.setItem("dexdex-active-workspace-id", DEFAULT_WORKSPACE_ID);
 });
@@ -793,6 +809,37 @@ describe("App", () => {
     });
   });
 
+  it("submits revise plan decision with keyboard shortcut using sub_task_id", async () => {
+    const user = userEvent.setup();
+    renderWithProviders(<App />);
+
+    await screen.findByTestId("task-row-task-002");
+    await user.click(screen.getByTestId("task-row-task-002"));
+    await user.keyboard("v");
+
+    const reviseInput = await screen.findByTestId("revision-note-input");
+    await user.type(reviseInput, "Please add rollback verification tests.");
+    await user.keyboard("{Meta>}{Enter}{/Meta}");
+
+    await waitFor(() => {
+      expect(lastSubmitPlanDecisionRequest?.subTaskId).toBe("sub-002-1");
+      expect(lastSubmitPlanDecisionRequest?.decision).toBe(ProtoPlanDecision.REVISE);
+      expect(lastSubmitPlanDecisionRequest?.revisionNote).toBe("Please add rollback verification tests.");
+    });
+  });
+
+  it("shows waiting-session input context on tasks route", async () => {
+    renderWithProviders(<App />, {
+      initialEntries: ["/tasks?waitingSession=sess-004-1"],
+    });
+
+    expect(await screen.findByTestId("waiting-session-context")).toBeTruthy();
+    const sessionInput = await screen.findByTestId("session-input-textarea");
+    await waitFor(() => {
+      expect(document.activeElement).toBe(sessionInput);
+    });
+  });
+
   it("auto-focuses session input for waiting-for-input subtasks", async () => {
     const user = userEvent.setup();
     renderWithProviders(<App />);

apps/dexdex/src/App.tsx

@@ -20,6 +20,7 @@ import { PrDetailPage } from "./features/prs/pr-detail-page";
 import { SettingsPage } from "./features/settings/settings-page";
 import { RepositoryGroupsPage } from "./features/repositories/repository-groups-page";
 import { RepositoriesPage } from "./features/repositories/repositories-page";
+import { SessionInputForm } from "./features/sessions/session-input-form";
 import { useKeyboardShortcuts } from "./hooks/use-keyboard-shortcuts";
 import { useWorkspaceStream } from "./hooks/use-workspace-stream";
 import { useTrayStatus } from "./hooks/use-tray-status";
@@ -267,25 +268,6 @@ function App() {
         handleTabClick(nextTab);
       }
     },
-    onApprovePlan: () => {
-      // Context-sensitive: only if on task detail with waiting subtask
-      if (!currentPath.startsWith("/tasks/")) return;
-      const taskId = currentPath.replace("/tasks/", "");
-      const task = tasks.find((t) => t.unitTaskId === taskId);
-      if (task) {
-        // We need to find a waiting subtask - delegate to handlePlanDecision
-        // This is a simplified version - the full version would need subtask data
-        handlePlanDecision(taskId, PlanDecision.APPROVE);
-      }
-    },
-    onRevisePlan: () => {
-      // For V key - context sensitive
-      if (!currentPath.startsWith("/tasks/")) return;
-    },
-    onRejectPlan: () => {
-      // For Shift+X - context sensitive: cancel task if in progress, reject plan if waiting
-      if (!currentPath.startsWith("/tasks/")) return;
-    },
   });
 
   // Task detail renderer (used by route)
@@ -307,6 +289,51 @@ function App() {
     );
   }
 
+  function TaskListRoute() {
+    const waitingSessionId = new URLSearchParams(location.search).get("waitingSession")?.trim() ?? "";
+    const hasWaitingSessionContext = waitingSessionId.length > 0;
+
+    return (
+      <div style={{ height: "100%", display: "flex", flexDirection: "column", minHeight: 0 }}>
+        {hasWaitingSessionContext && (
+          <div
+            style={{
+              padding: "var(--space-3) var(--space-6)",
+              borderBottom: "1px solid var(--color-border)",
+              backgroundColor: "var(--color-bg-secondary)",
+            }}
+            data-testid="waiting-session-context"
+          >
+            <div
+              style={{
+                fontSize: "var(--font-size-xs)",
+                color: "var(--color-text-tertiary)",
+                marginBottom: "var(--space-2)",
+              }}
+            >
+              Waiting session: {waitingSessionId}
+            </div>
+            <SessionInputForm
+              workspaceId={activeWorkspaceId}
+              sessionId={waitingSessionId}
+              onSubmitted={() => routerNavigate("/tasks", { replace: true })}
+            />
+          </div>
+        )}
+        <div style={{ flex: 1, minHeight: 0 }}>
+          <TaskList
+            tasks={tasks}
+            isLoading={tasksLoading}
+            onTaskSelect={(taskId) => navigate(`/tasks/${taskId}`)}
+            onCreateTask={() => setCreateDialogOpen(true)}
+            selectedIndex={selectedTaskIndex}
+            onSelectIndex={setSelectedTaskIndex}
+          />
+        </div>
+      </div>
+    );
+  }
+
   // PR detail renderer (used by route)
   function PrDetailRoute() {
     const prTrackingId = currentPath.replace("/prs/", "");
@@ -356,19 +383,7 @@ function App() {
           <div style={contentAreaStyle}>
             <ErrorBoundary>
               <Routes>
-                <Route
-                  path="/tasks"
-                  element={
-                    <TaskList
-                      tasks={tasks}
-                      isLoading={tasksLoading}
-                      onTaskSelect={(taskId) => navigate(`/tasks/${taskId}`)}
-                      onCreateTask={() => setCreateDialogOpen(true)}
-                      selectedIndex={selectedTaskIndex}
-                      onSelectIndex={setSelectedTaskIndex}
-                    />
-                  }
-                />
+                <Route path="/tasks" element={<TaskListRoute />} />
                 <Route path="/tasks/:taskId" element={<TaskDetailRoute />} />
                 <Route
                   path="/inbox"

apps/dexdex/src/features/tasks/plan-decisions.tsx

@@ -2,7 +2,7 @@
  * Plan decision controls for subtasks waiting for plan approval.
  */
 
-import { type CSSProperties, useRef, useState } from "react";
+import { type CSSProperties, useCallback, useEffect, useRef, useState } from "react";
 import { PlanDecision, SubTaskStatus } from "../../lib/status";
 import type { SubTask } from "../../lib/mock-data";
 import { useFocusOnShow } from "../../hooks/use-dialog-accessibility";
@@ -19,6 +19,74 @@ export function PlanDecisions({ subtask, onDecision }: PlanDecisionsProps) {
 
   useFocusOnShow(showReviseInput, revisionInputRef);
 
+  const submitRevision = useCallback(() => {
+    const trimmedRevisionNote = revisionNote.trim();
+    if (!trimmedRevisionNote) {
+      return;
+    }
+    onDecision(subtask.subTaskId, PlanDecision.REVISE, trimmedRevisionNote);
+  }, [onDecision, revisionNote, subtask.subTaskId]);
+
+  useEffect(() => {
+    if (subtask.status !== SubTaskStatus.WAITING_FOR_PLAN_APPROVAL) {
+      return;
+    }
+
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.isComposing || event.keyCode === 229) {
+        return;
+      }
+
+      const activeElement = document.activeElement as HTMLElement | null;
+      const isTextInputFocused =
+        activeElement?.tagName.toLowerCase() === "input" ||
+        activeElement?.tagName.toLowerCase() === "textarea" ||
+        activeElement?.isContentEditable;
+      if (isTextInputFocused) {
+        if (
+          activeElement === revisionInputRef.current &&
+          (event.metaKey || event.ctrlKey) &&
+          event.key === "Enter"
+        ) {
+          event.preventDefault();
+          submitRevision();
+        }
+        return;
+      }
+
+      const isMetaPressed = event.metaKey || event.ctrlKey;
+      const isAltPressed = event.altKey;
+
+      if (!isMetaPressed && !isAltPressed && !event.shiftKey && event.key.toLowerCase() === "a") {
+        event.preventDefault();
+        onDecision(subtask.subTaskId, PlanDecision.APPROVE);
+        return;
+      }
+
+      if (!isMetaPressed && !isAltPressed && !event.shiftKey && event.key.toLowerCase() === "v") {
+        event.preventDefault();
+        if (!showReviseInput) {
+          setShowReviseInput(true);
+        } else {
+          revisionInputRef.current?.focus();
+        }
+        return;
+      }
+
+      if (!isMetaPressed && !isAltPressed && event.shiftKey && event.key === "X") {
+        event.preventDefault();
+        onDecision(subtask.subTaskId, PlanDecision.REJECT);
+        return;
+      }
+
+    };
+
+    document.addEventListener("keydown", handleKeyDown);
+    return () => {
+      document.removeEventListener("keydown", handleKeyDown);
+    };
+  }, [onDecision, showReviseInput, submitRevision, subtask.status, subtask.subTaskId]);
+
   if (subtask.status !== SubTaskStatus.WAITING_FOR_PLAN_APPROVAL) {
     return null;
   }
@@ -89,6 +157,15 @@ export function PlanDecisions({ subtask, onDecision }: PlanDecisionsProps) {
             placeholder="Describe the revisions needed..."
             value={revisionNote}
             onChange={(e) => setRevisionNote(e.target.value)}
+            onKeyDown={(event) => {
+              if (event.isComposing || event.keyCode === 229) {
+                return;
+              }
+              if ((event.metaKey || event.ctrlKey) && event.key === "Enter") {
+                event.preventDefault();
+                submitRevision();
+              }
+            }}
             data-testid="revision-note-input"
           />
         </div>
@@ -126,12 +203,9 @@ export function PlanDecisions({ subtask, onDecision }: PlanDecisionsProps) {
               color: "#fff",
               borderColor: "var(--color-status-action)",
             }}
-            onClick={() => {
-              if (revisionNote.trim()) {
-                onDecision(subtask.subTaskId, PlanDecision.REVISE, revisionNote.trim());
-              }
-            }}
+            onClick={submitRevision}
             disabled={!revisionNote.trim()}
+            data-testid="submit-revision-button"
           >
             Submit Revision
           </button>

apps/dexdex/src/hooks/use-keyboard-shortcuts.ts

@@ -15,9 +15,6 @@ interface KeyboardShortcutsConfig {
   onSwitchTabRight?: () => void;
   onListDown?: () => void;
   onListUp?: () => void;
-  onApprovePlan?: () => void;
-  onRevisePlan?: () => void;
-  onRejectPlan?: () => void;
 }
 
 /**
@@ -35,9 +32,6 @@ interface KeyboardShortcutsConfig {
  * - C: Create new task (when not in an input)
  * - J: Navigate down in task list
  * - K: Navigate up in task list
- * - A: Approve plan (when viewing plan decision)
- * - V: Revise plan
- * - Shift+X: Reject plan
  */
 export function useKeyboardShortcuts(config: KeyboardShortcutsConfig): void {
   const pendingG = useRef(false);
@@ -162,26 +156,6 @@ export function useKeyboardShortcuts(config: KeyboardShortcutsConfig): void {
         return;
       }
 
-      // A: Approve plan (when viewing plan decision)
-      if (e.key === "a" && !meta && !e.altKey && !e.shiftKey) {
-        e.preventDefault();
-        config.onApprovePlan?.();
-        return;
-      }
-
-      // V: Revise plan
-      if (e.key === "v" && !meta && !e.altKey && !e.shiftKey) {
-        e.preventDefault();
-        config.onRevisePlan?.();
-        return;
-      }
-
-      // Shift+X: Reject plan
-      if (e.key === "X" && e.shiftKey && !meta && !e.altKey) {
-        e.preventDefault();
-        config.onRejectPlan?.();
-        return;
-      }
     }
 
     document.addEventListener("keydown", handleKeyDown);

docs/apps-dexdex-desktop-app-foundation.md

@@ -55,9 +55,9 @@ Behavior contracts:
   - `Cmd+T`: create new task
   - `Cmd+W`: close active tab
   - `J` / `K`: navigate up/down in list views
-  - `A`: approve plan or review item
-  - `V`: open diff viewer for selected commit
-  - `Shift+X`: cancel running task
+  - `A`: approve waiting plan
+  - `V`: open revise input for waiting plan
+  - `Shift+X`: reject waiting plan or cancel running task
 - Diff viewer component for inline review of commit changes with side-by-side and unified modes.
 
 Data and UX invariants:

docs/apps-dexdex-ui-contract.md

@@ -54,6 +54,9 @@ Keyboard contracts:
 - list navigation shortcuts (`J`, `K`, `Enter`, `Cmd+Enter`)
 - multiline submit shortcut (`Cmd+Enter`) with IME-safe behavior
 - decision shortcuts for plan mode (`A`, `V`, `Shift+X`)
+  - `A`: approve waiting plan
+  - `V`: open revise input for waiting plan
+  - `Shift+X`: reject waiting plan (or cancel running task when no waiting plan is active)
 
 Accessibility and responsive contracts:
 - keyboard-first operation

docs/project-dexdex.md

@@ -70,6 +70,8 @@ When implementation details differ from documented contracts, follow-up sync wor
 - Workspace CRUD operations: `CreateWorkspace`, `UpdateWorkspace`, `DeleteWorkspace`, `SetActiveWorkspace`.
 - Task cancellation and subtask management: `CancelUnitTask`, `CancelSubTask`, `CreateSubTask`, `ListSubTaskCommits`, `RetrySubTask`.
 - PR tracking and auto-fix control: `TrackPullRequest`, `RunAutoFixNow`, `SetAutoFixPolicy`.
+- `RunAutoFixNow` creates and immediately dispatches a remediation SubTask.
+- Poller-driven automatic remediation for `auto_fix_enabled` policy remains planned.
 - Review assist resolution: `ResolveReviewAssistItem`.
 - Badge theme management: `ListBadgeThemes`, `UpsertBadgeTheme`.
 - Agent session lifecycle: `ListAgentSessions`, `GetAgentSessionLog`, `StopAgentSession`.