Merge branch 'task/make-the-review-plan-button-floating'

* task/make-the-review-plan-button-floating:
  fix(plan): remove opacity from floating Review Plan button
  fix(plan): add path validation, log errors, unexport internal function
  fix(plan): persist planFileName and restore exact file on restart
  fix(plan): restore plan content from disk on app restart
  feat(plan): float Review Plan button over inline plan and shrink dialog

Author: johannesjo

electron/ipc/channels.ts

@@ -80,6 +80,7 @@ export enum IPC {
 
   // Plan
   PlanContent = 'plan_content',
+  ReadPlanContent = 'read_plan_content',
 
   // Ask about code
   AskAboutCode = 'ask_about_code',

electron/ipc/plans.ts

@@ -219,6 +219,25 @@ export function stopPlanWatcher(taskId: string): void {
   watchers.delete(taskId);
 }
 
+/** Read a specific plan file from a worktree, or the newest if no name given. */
+export function readPlanForWorktree(worktreePath: string, fileName?: string): { content: string; fileName: string } | null {
+  const plansDirs = PLAN_DIRS.map((rel) => path.join(worktreePath, rel));
+
+  if (fileName) {
+    for (const dir of plansDirs) {
+      try {
+        const content = fs.readFileSync(path.join(dir, fileName), 'utf-8');
+        return { content, fileName };
+      } catch {
+        // Not in this directory
+      }
+    }
+    return null;
+  }
+
+  return readNewestPlanFromDirs(plansDirs);
+}
+
 /** Stops all plan watchers. */
 export function stopAllPlanWatchers(): void {
   for (const taskId of watchers.keys()) {

electron/ipc/register.ts

@@ -13,7 +13,7 @@ import {
   killAllAgents,
   getAgentMeta,
 } from './pty.js';
-import { ensurePlansDirectory, startPlanWatcher } from './plans.js';
+import { ensurePlansDirectory, startPlanWatcher, readPlanForWorktree } from './plans.js';
 import { startRemoteServer } from '../remote/server.js';
 import {
   getGitIgnoredDirs,
@@ -296,6 +296,14 @@ export function registerAllHandlers(win: BrowserWindow): void {
     return fs.existsSync(args.path);
   });
 
+  // --- Plan content (one-shot read) ---
+  ipcMain.handle(IPC.ReadPlanContent, (_e, args) => {
+    validatePath(args.worktreePath, 'worktreePath');
+    const fileName = typeof args.fileName === 'string' ? args.fileName : undefined;
+    if (fileName) validateRelativePath(fileName, 'fileName');
+    return readPlanForWorktree(args.worktreePath, fileName);
+  });
+
   // --- Ask about code ---
   ipcMain.handle(IPC.AskAboutCode, (_e, args) => {
     assertString(args.requestId, 'requestId');

src/App.tsx

@@ -287,6 +287,21 @@ function App() {
 
     await loadAgents();
     await loadState();
+
+    // Restore plan content for tasks that had a plan file before restart
+    for (const taskId of [...store.taskOrder, ...store.collapsedTaskOrder]) {
+      const task = store.tasks[taskId];
+      if (!task?.worktreePath || !task.planFileName) continue;
+      invoke<{ content: string; fileName: string } | null>(IPC.ReadPlanContent, {
+        worktreePath: task.worktreePath,
+        fileName: task.planFileName,
+      }).then((result) => {
+        if (result) setPlanContent(taskId, result.content, result.fileName);
+      }).catch((err) => {
+        console.warn(`Failed to restore plan for task ${taskId}:`, err);
+      });
+    }
+
     await validateProjectPaths();
     await restoreWindowState();
     await captureWindowState();

src/components/PlanViewerDialog.tsx

@@ -39,10 +39,10 @@ export function PlanViewerDialog(props: PlanViewerDialogProps) {
     <Dialog
       open={props.open}
       onClose={props.onClose}
-      width="90vw"
+      width="70vw"
       panelStyle={{
-        height: '85vh',
-        'max-width': '1400px',
+        height: '70vh',
+        'max-width': '1000px',
         overflow: 'hidden',
         padding: '0',
         gap: '0',

src/components/TaskPanel.tsx

@@ -617,34 +617,27 @@ export function TaskPanel(props: TaskPanelProps) {
                           // eslint-disable-next-line solid/no-innerhtml -- plan files are local, written by Claude Code in the worktree
                           innerHTML={planHtml()}
                         />
-                        <div
+                        <button
+                          ref={reviewPlanBtnRef}
+                          class="btn-secondary"
                           style={{
-                            display: 'flex',
-                            'justify-content': 'center',
-                            padding: '6px 0',
-                            'flex-shrink': '0',
-                            'border-top': `1px solid ${theme.border}`,
-                            background: theme.taskPanelBg,
+                            position: 'absolute',
+                            bottom: '8px',
+                            right: '8px',
+                            padding: '4px 16px',
+                            'font-size': sf(11),
+                            'font-family': "'JetBrains Mono', monospace",
+                            background: theme.bgInput,
+                            color: theme.fgMuted,
+                            border: `1px solid ${theme.border}`,
+                            'border-radius': '6px',
+                            cursor: 'pointer',
+                            'z-index': '1',
                           }}
+                          onClick={() => setPlanFullscreen(true)}
                         >
-                          <button
-                            ref={reviewPlanBtnRef}
-                            class="btn-secondary"
-                            style={{
-                              padding: '4px 16px',
-                              'font-size': sf(11),
-                              'font-family': "'JetBrains Mono', monospace",
-                              background: theme.bgInput,
-                              color: theme.fgMuted,
-                              border: `1px solid ${theme.border}`,
-                              'border-radius': '6px',
-                              cursor: 'pointer',
-                            }}
-                            onClick={() => setPlanFullscreen(true)}
-                          >
-                            Review Plan
-                          </button>
-                        </div>
+                          Review Plan
+                        </button>
                       </div>
                     </Show>
                   </div>

src/store/persistence.ts

@@ -65,6 +65,7 @@ export async function saveState(): Promise<void> {
       skipPermissions: task.skipPermissions,
       githubUrl: task.githubUrl,
       savedInitialPrompt: task.savedInitialPrompt,
+      planFileName: task.planFileName,
     };
   }
 
@@ -88,6 +89,7 @@ export async function saveState(): Promise<void> {
       skipPermissions: task.skipPermissions,
       githubUrl: task.githubUrl,
       savedInitialPrompt: task.savedInitialPrompt,
+      planFileName: task.planFileName,
       collapsed: true,
     };
   }
@@ -334,6 +336,7 @@ export async function loadState(): Promise<void> {
           skipPermissions: pt.skipPermissions === true,
           githubUrl: pt.githubUrl,
           savedInitialPrompt: pt.savedInitialPrompt,
+          planFileName: pt.planFileName,
         };
 
         s.tasks[taskId] = task;
@@ -398,6 +401,7 @@ export async function loadState(): Promise<void> {
           skipPermissions: pt.skipPermissions === true,
           githubUrl: pt.githubUrl,
           savedInitialPrompt: pt.savedInitialPrompt,
+          planFileName: pt.planFileName,
           collapsed: true,
           savedAgentDef: agentDef ?? undefined,
         };

src/store/types.ts

@@ -76,6 +76,7 @@ export interface PersistedTask {
   githubUrl?: string;
   savedInitialPrompt?: string;
   collapsed?: boolean;
+  planFileName?: string;
 }
 
 export interface PersistedTerminal {