cflx 0.6.11

Conflux – a spec-driven parallel coding orchestrator that runs AI agents on git worktrees
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
import React, { useState, useCallback, useRef } from 'react';
import { Plus } from 'lucide-react';
import { Toaster, toast } from 'sonner';
import { Header } from './components/Header';
import { ProjectsPanel } from './components/ProjectsPanel';
import { ChangesPanel } from './components/ChangesPanel';
import { WorktreesPanel } from './components/WorktreesPanel';
import { LogsPanel } from './components/LogsPanel';
import { FileViewPanel } from './components/FileViewPanel';
import { DeleteDialog } from './components/DeleteDialog';
import { DeleteWorktreeDialog } from './components/DeleteWorktreeDialog';
import { AddProjectDialog } from './components/AddProjectDialog';
import { CreateWorktreeDialog } from './components/CreateWorktreeDialog';
import { ProposalChat } from './components/ProposalChat';
import { ProposalSessionTabs } from './components/ProposalSessionTabs';
import { CloseSessionDialog } from './components/CloseSessionDialog';
import { OverviewDashboard } from './components/OverviewDashboard';
import { useAppStore } from './store/useAppStore';
import { useWebSocket } from './hooks/useWebSocket';
import {
  controlRun,
  controlStop,
  gitSync,
  deleteProject as deleteProjectAPI,
  addProject as addProjectAPI,
  createWorktree as createWorktreeAPI,
  deleteWorktree as deleteWorktreeAPI,
  mergeWorktree as mergeWorktreeAPI,
  refreshWorktrees as refreshWorktreesAPI,
  createProposalSession as createProposalSessionAPI,
  listProposalSessions as listProposalSessionsAPI,
  deleteProposalSession as deleteProposalSessionAPI,
  mergeProposalSession as mergeProposalSessionAPI,
  setUiState,
  deleteUiState,
  APIError,
} from './api/restClient';
import {
  DesktopCenterTab,
  DesktopRightTab,
  TabName,
  UI_STATE_KEYS,
  parsePersistedTabState,
  resolvePersistedBrowseSelection,
  serializeFileBrowseContext,
} from './lib/uiStatePersistence';

function App() {
  const store = useAppStore();
  const hasHydratedFromUiStateRef = useRef(false);

  const persistUiState = useCallback((key: string, value: string | null) => {
    if (value === null) {
      void deleteUiState(key).catch((err) => {
        console.warn(`Failed to delete ui-state key '${key}':`, err);
      });
      return;
    }

    void setUiState(key, value).catch((err) => {
      console.warn(`Failed to persist ui-state key '${key}':`, err);
    });
  }, []);

  const clearPersistedBrowseState = useCallback((keys?: string[]) => {
    const browseKeys = keys ?? [
      UI_STATE_KEYS.fileBrowseContext,
      UI_STATE_KEYS.desktopCenterTab,
      UI_STATE_KEYS.desktopRightTab,
      UI_STATE_KEYS.mobileActiveTab,
    ];

    browseKeys.forEach((key) => {
      persistUiState(key, null);
    });
  }, [persistUiState]);

  const [activeTab, setActiveTab] = useState<TabName>('projects');
  const [desktopCenterTab, setDesktopCenterTab] = useState<DesktopCenterTab>('changes');
  const [desktopRightTab, setDesktopRightTab] = useState<DesktopRightTab>('logs');
  const [isLoading, setIsLoading] = useState(false);
  const [deleteTarget, setDeleteTarget] = useState<{ id: string; name: string } | null>(null);
  const [isAddProjectOpen, setIsAddProjectOpen] = useState(false);
  const [isCreateWorktreeOpen, setIsCreateWorktreeOpen] = useState(false);
  const [deleteWorktreeTarget, setDeleteWorktreeTarget] = useState<string | null>(null);
  const [closeSessionTarget, setCloseSessionTarget] = useState<string | null>(null);

  const selectDesktopCenterTab = useCallback((tab: DesktopCenterTab) => {
    setDesktopCenterTab(tab);
    persistUiState(UI_STATE_KEYS.desktopCenterTab, tab);
  }, [persistUiState]);

  const selectDesktopRightTab = useCallback((tab: DesktopRightTab) => {
    setDesktopRightTab(tab);
    persistUiState(UI_STATE_KEYS.desktopRightTab, tab);
  }, [persistUiState]);

  const selectMobileTab = useCallback((tab: TabName) => {
    setActiveTab(tab);
    persistUiState(UI_STATE_KEYS.mobileActiveTab, tab);
  }, [persistUiState]);

  useWebSocket({
    onStateUpdate: (state) => {
      store.setFullState(state);

      if (hasHydratedFromUiStateRef.current) {
        return;
      }

      const restoredTabs = parsePersistedTabState(state.ui_state);
      if (restoredTabs.desktopCenterTab) {
        setDesktopCenterTab(restoredTabs.desktopCenterTab);
      }
      if (restoredTabs.desktopRightTab) {
        setDesktopRightTab(restoredTabs.desktopRightTab);
      }
      if (restoredTabs.mobileActiveTab) {
        setActiveTab(restoredTabs.mobileActiveTab);
      }

      const persistedProjectId = state.ui_state?.[UI_STATE_KEYS.selectedProjectId];
      const selectedProjectId =
        persistedProjectId && state.projects.some((project) => project.id === persistedProjectId)
          ? persistedProjectId
          : null;

      if (!selectedProjectId) {
        if (persistedProjectId) {
          persistUiState(UI_STATE_KEYS.selectedProjectId, null);
        }
        store.selectProject(null);
        store.setFileBrowseContext(null);
        clearPersistedBrowseState();
        hasHydratedFromUiStateRef.current = true;
        return;
      }

      if (store.state.selectedProjectId !== selectedProjectId) {
        store.selectProject(selectedProjectId);
      }

      const browseRestore = resolvePersistedBrowseSelection({
        uiState: state.ui_state,
        selectedProjectId,
        projects: state.projects,
        worktreesByProjectId: state.worktrees,
      });

      if (browseRestore.status === 'restored') {
        store.setFileBrowseContext(browseRestore.context);
        setDesktopCenterTab(browseRestore.tabs.desktopCenterTab);
        setDesktopRightTab(browseRestore.tabs.desktopRightTab);
        setActiveTab(browseRestore.tabs.mobileActiveTab);
      } else if (browseRestore.status === 'stale') {
        clearPersistedBrowseState(browseRestore.keysToClear);
        store.setFileBrowseContext(null);
      }

      if (browseRestore.status === 'defer') {
        return;
      }

      listProposalSessionsAPI(selectedProjectId)
        .then((sessions) => {
          store.setProposalSessions(selectedProjectId, sessions);
          const persistedSessionId = state.ui_state?.[UI_STATE_KEYS.activeProposalSessionId];
          if (persistedSessionId) {
            const exists = sessions.some((session) => session.id === persistedSessionId);
            if (exists) {
              store.setActiveProposalSession(persistedSessionId);
            } else {
              persistUiState(UI_STATE_KEYS.activeProposalSessionId, null);
            }
          }
          hasHydratedFromUiStateRef.current = true;
        })
        .catch((err) => {
          console.error('Failed to restore proposal sessions:', err);
          hasHydratedFromUiStateRef.current = true;
        });
    },
    onLogEntry: (entry) => store.appendLog(entry),
    onConnectionChange: (status) => store.setConnectionStatus(status),
    onError: (error) => {
      console.error('WebSocket error:', error);
      toast.error(`Connection error: ${error.message}`);
    },
  });

  // Global Run handler (starts orchestration across all projects)
  const handleRun = useCallback(async () => {
    setIsLoading(true);
    try {
      await controlRun();
      toast.success('Orchestration started');
    } catch (err) {
      toast.error(`Failed to start: ${err instanceof APIError ? err.message : String(err)}`);
    } finally {
      setIsLoading(false);
    }
  }, []);

  // Global Stop handler (stops orchestration across all projects)
  const handleStop = useCallback(async () => {
    setIsLoading(true);
    try {
      await controlStop();
      toast.success('Orchestration stopped');
    } catch (err) {
      toast.error(`Failed to stop: ${err instanceof APIError ? err.message : String(err)}`);
    } finally {
      setIsLoading(false);
    }
  }, []);

  const handleGitSync = useCallback(async (projectId: string) => {
    setIsLoading(true);
    try {
      await gitSync(projectId);
      toast.success('Git sync completed');
    } catch (err) {
      toast.error(`Failed to sync: ${err instanceof APIError ? err.message : String(err)}`);
    } finally {
      setIsLoading(false);
    }
  }, []);

  const handleDeleteClick = useCallback((projectId: string) => {
    const project = store.state.projects.find((p) => p.id === projectId);
    const name = project ? `${project.repo}/${project.branch}` : projectId;
    setDeleteTarget({ id: projectId, name });
  }, [store.state.projects]);

  const handleDeleteConfirm = useCallback(async () => {
    if (!deleteTarget) return;
    setIsLoading(true);
    try {
      await deleteProjectAPI(deleteTarget.id);
      toast.success('Project deleted');
      setDeleteTarget(null);
    } catch (err) {
      toast.error(`Failed to delete: ${err instanceof APIError ? err.message : String(err)}`);
    } finally {
      setIsLoading(false);
    }
  }, [deleteTarget]);

  const handleAddProject = useCallback(async (remoteUrl: string, branch: string) => {
    setIsLoading(true);
    try {
      await addProjectAPI(remoteUrl, branch);
      toast.success('Project added');
      setIsAddProjectOpen(false);
    } catch (err) {
      toast.error(`Failed to add project: ${err instanceof APIError ? err.message : String(err)}`);
    } finally {
      setIsLoading(false);
    }
  }, []);

  // Worktree handlers
  const handleCreateWorktree = useCallback(async (changeId: string) => {
    const projectId = store.state.selectedProjectId;
    if (!projectId) return;
    setIsLoading(true);
    try {
      await createWorktreeAPI(projectId, changeId);
      toast.success('Worktree created');
      setIsCreateWorktreeOpen(false);
      // Refresh worktree list
      const updated = await refreshWorktreesAPI(projectId);
      store.setWorktrees(projectId, updated);
    } catch (err) {
      toast.error(`Failed to create worktree: ${err instanceof APIError ? err.message : String(err)}`);
    } finally {
      setIsLoading(false);
    }
  }, [store]);

  const handleDeleteWorktreeClick = useCallback((branchName: string) => {
    setDeleteWorktreeTarget(branchName);
  }, []);

  const handleDeleteWorktreeConfirm = useCallback(async () => {
    const projectId = store.state.selectedProjectId;
    if (!projectId || !deleteWorktreeTarget) return;
    setIsLoading(true);
    try {
      await deleteWorktreeAPI(projectId, deleteWorktreeTarget);
      toast.success('Worktree deleted');
      if (store.state.fileBrowseContext?.type === 'worktree' && store.state.fileBrowseContext.worktreeBranch === deleteWorktreeTarget) {
        store.setFileBrowseContext(null);
        clearPersistedBrowseState();
      }
      setDeleteWorktreeTarget(null);
      // Refresh worktree list
      const updated = await refreshWorktreesAPI(projectId);
      store.setWorktrees(projectId, updated);
    } catch (err) {
      toast.error(`Failed to delete worktree: ${err instanceof APIError ? err.message : String(err)}`);
    } finally {
      setIsLoading(false);
    }
  }, [store, deleteWorktreeTarget]);

  const handleMergeWorktree = useCallback(async (branchName: string) => {
    const projectId = store.state.selectedProjectId;
    if (!projectId) return;
    setIsLoading(true);
    try {
      await mergeWorktreeAPI(projectId, branchName);
      toast.success('Branch merged successfully');
      // Refresh worktree list
      const updated = await refreshWorktreesAPI(projectId);
      store.setWorktrees(projectId, updated);
    } catch (err) {
      toast.error(`Failed to merge: ${err instanceof APIError ? err.message : String(err)}`);
    } finally {
      setIsLoading(false);
    }
  }, [store]);

  const handleClickChange = useCallback((changeId: string) => {
    const context = { type: 'change', changeId } as const;
    store.setFileBrowseContext(context);
    persistUiState(UI_STATE_KEYS.fileBrowseContext, serializeFileBrowseContext(context));
    selectDesktopCenterTab('changes');
    selectDesktopRightTab('files');
    selectMobileTab('files');
  }, [persistUiState, selectDesktopCenterTab, selectDesktopRightTab, selectMobileTab, store]);

  const handleClickWorktree = useCallback((branch: string) => {
    const context = { type: 'worktree', worktreeBranch: branch } as const;
    store.setFileBrowseContext(context);
    persistUiState(UI_STATE_KEYS.fileBrowseContext, serializeFileBrowseContext(context));
    selectDesktopCenterTab('worktrees');
    selectDesktopRightTab('files');
    selectMobileTab('files');
  }, [persistUiState, selectDesktopCenterTab, selectDesktopRightTab, selectMobileTab, store]);

  // ─── Proposal Session Handlers ────────────────────────────────────────────

  const handleCreateProposalSession = useCallback(async () => {
    const projectId = store.state.selectedProjectId;
    if (!projectId) return;
    setIsLoading(true);
    try {
      const session = await createProposalSessionAPI(projectId);
      store.addProposalSession(projectId, session);
      store.setActiveProposalSession(session.id);
      persistUiState(UI_STATE_KEYS.activeProposalSessionId, session.id);
      toast.success('Proposal session created');
    } catch (err) {
      toast.error(`Failed to create session: ${err instanceof APIError ? err.message : String(err)}`);
    } finally {
      setIsLoading(false);
    }
  }, [persistUiState, store]);

  const handleMergeProposalSession = useCallback(async () => {
    const projectId = store.state.selectedProjectId;
    const sessionId = store.state.activeProposalSessionId;
    if (!projectId || !sessionId) return;
    setIsLoading(true);
    try {
      await mergeProposalSessionAPI(projectId, sessionId);
      store.removeProposalSession(projectId, sessionId);
      persistUiState(UI_STATE_KEYS.activeProposalSessionId, null);
      toast.success('Session merged successfully');
    } catch (err) {
      toast.error(`Failed to merge: ${err instanceof APIError ? err.message : String(err)}`);
    } finally {
      setIsLoading(false);
    }
  }, [persistUiState, store]);

  const handleCloseProposalSession = useCallback(() => {
    const sessionId = store.state.activeProposalSessionId;
    if (!sessionId) return;

    // Find the session to check if dirty
    const projectId = store.state.selectedProjectId;
    if (!projectId) return;
    const sessions = store.state.proposalSessionsByProjectId[projectId] || [];
    const session = sessions.find((s) => s.id === sessionId);

    if (session?.is_dirty) {
      setCloseSessionTarget(sessionId);
    } else {
      handleForceCloseSession(sessionId);
    }
  }, [store]);

  const handleForceCloseSession = useCallback(async (sessionId?: string) => {
    const projectId = store.state.selectedProjectId;
    const targetId = sessionId || closeSessionTarget;
    if (!projectId || !targetId) return;
    setIsLoading(true);
    try {
      await deleteProposalSessionAPI(projectId, targetId, true);
      store.removeProposalSession(projectId, targetId);
      if (store.state.activeProposalSessionId === targetId) {
        persistUiState(UI_STATE_KEYS.activeProposalSessionId, null);
      }
      setCloseSessionTarget(null);
      toast.success('Session closed');
    } catch (err) {
      toast.error(`Failed to close session: ${err instanceof APIError ? err.message : String(err)}`);
    } finally {
      setIsLoading(false);
    }
  }, [store, closeSessionTarget]);

  const handleBackFromProposal = useCallback(() => {
    store.setActiveProposalSession(null);
    persistUiState(UI_STATE_KEYS.activeProposalSessionId, null);
  }, [persistUiState, store]);

  // Load proposal sessions when project is selected
  const handleSelectProjectWithSessions = useCallback((projectId: string | null) => {
    store.selectProject(projectId);
    store.setActiveProposalSession(null);
    store.setFileBrowseContext(null);
    persistUiState(UI_STATE_KEYS.selectedProjectId, projectId);
    persistUiState(UI_STATE_KEYS.activeProposalSessionId, null);
    clearPersistedBrowseState();

    if (projectId) {
      listProposalSessionsAPI(projectId)
        .then((sessions) => {
          store.setProposalSessions(projectId, sessions);
          const persistedSessionId = store.state.uiState[UI_STATE_KEYS.activeProposalSessionId];
          if (persistedSessionId) {
            const exists = sessions.some((session) => session.id === persistedSessionId);
            if (exists) {
              store.setActiveProposalSession(persistedSessionId);
            } else {
              persistUiState(UI_STATE_KEYS.activeProposalSessionId, null);
            }
          }
        })
        .catch((err) => console.error('Failed to load proposal sessions:', err));
    }
  }, [clearPersistedBrowseState, persistUiState, store]);

  const handleRefreshWorktrees = useCallback(async () => {
    const projectId = store.state.selectedProjectId;
    if (!projectId) return;
    setIsLoading(true);
    try {
      const updated = await refreshWorktreesAPI(projectId);
      store.setWorktrees(projectId, updated);
    } catch (err) {
      toast.error(`Failed to refresh worktrees: ${err instanceof APIError ? err.message : String(err)}`);
    } finally {
      setIsLoading(false);
    }
  }, [store]);

  const selectedProject = store.state.projects.find(
    (p) => p.id === store.state.selectedProjectId,
  );
  const allLogs = Object.values(store.state.logsByProjectId)
    .flat()
    .sort((a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime());
  const selectedProjectLogs = store.state.selectedProjectId
    ? store.state.logsByProjectId[store.state.selectedProjectId] || []
    : allLogs;
  const selectedProjectWorktrees = store.state.selectedProjectId
    ? store.state.worktreesByProjectId[store.state.selectedProjectId] || []
    : [];

  // Derived state for proposal sessions
  const currentProjectSessions = store.state.selectedProjectId
    ? store.state.proposalSessionsByProjectId[store.state.selectedProjectId] || []
    : [];
  const activeProposalSession = currentProjectSessions.find(
    (s) => s.id === store.state.activeProposalSessionId,
  );

  // Get close target session for dialog
  const closeTargetSession = closeSessionTarget
    ? currentProjectSessions.find((s) => s.id === closeSessionTarget)
    : null;

  const panelProps = {
    projects: store.state.projects,
    selectedProjectId: store.state.selectedProjectId,
    onSelectProject: handleSelectProjectWithSessions,
    onGitSync: handleGitSync,
    onDelete: handleDeleteClick,
    isLoading,
    syncAvailable: store.state.syncAvailable,
    activeCommands: store.state.activeCommands,
  };

  // Active commands for the currently selected project
  const selectedProjectActiveCommands = store.state.activeCommands.filter(
    (cmd) => cmd.project_id === store.state.selectedProjectId
  );

  return (
    <div className="flex h-screen flex-col bg-[#09090b] text-[#fafafa]">
      <Header
        connectionStatus={store.state.connectionStatus}
        orchestrationStatus={store.state.orchestrationStatus}
        onRun={handleRun}
        onStop={handleStop}
        isLoading={isLoading}
      />

      <div className="flex flex-1 overflow-hidden">
        {/* Desktop layout */}
        <aside className="hidden w-72 shrink-0 flex-col border-r border-[#27272a] md:flex">
          <div className="flex items-center justify-between border-b border-[#27272a] px-3 py-2">
            <span className="text-xs font-medium text-[#52525b] uppercase tracking-wider">Projects</span>
            <button
              onClick={() => setIsAddProjectOpen(true)}
              className="rounded p-0.5 text-[#52525b] transition-colors hover:text-[#6366f1]"
              aria-label="Add project"
            >
              <Plus className="size-4" />
            </button>
          </div>
          <div className="flex-1 overflow-y-auto">
            <ProjectsPanel {...panelProps} />
          </div>
        </aside>

        <main className="hidden flex-col md:flex md:flex-1 overflow-hidden">
          <div className="border-b border-[#27272a] px-4 py-2.5">
            {selectedProject ? (
              <div className="flex items-center justify-between">
                <div className="flex items-center gap-1.5">
                  <span className="text-sm font-medium text-[#fafafa]">{selectedProject.repo}</span>
                  <span className="text-[#3f3f46]">/</span>
                  <span className="text-sm text-[#71717a]">{selectedProject.branch}</span>
                </div>
                {!activeProposalSession && (
                  <button
                    onClick={handleCreateProposalSession}
                    disabled={isLoading}
                    className="flex items-center gap-1.5 rounded-md bg-[#6366f1] px-2.5 py-1 text-xs font-medium text-white transition-colors hover:bg-[#4f46e5] disabled:opacity-50"
                  >
                    <Plus className="size-3" />
                    Add Proposal
                  </button>
                )}
              </div>
            ) : (
              <span className="text-sm text-[#52525b]">Orchestration overview</span>
            )}
          </div>

          {selectedProject && (
            <>
              {/* Proposal session tabs */}
              {currentProjectSessions.length > 0 && (
                <ProposalSessionTabs
                  sessions={currentProjectSessions}
                  activeSessionId={store.state.activeProposalSessionId}
                  onSelectSession={(sessionId) => {
                    store.setActiveProposalSession(sessionId);
                    persistUiState(UI_STATE_KEYS.activeProposalSessionId, sessionId);
                  }}
                  onCreateSession={handleCreateProposalSession}
                  onCloseSession={(sid) => {
                    const s = currentProjectSessions.find((x) => x.id === sid);
                    if (s?.is_dirty) {
                      setCloseSessionTarget(sid);
                    } else {
                      handleForceCloseSession(sid);
                    }
                  }}
                />
              )}
            </>
          )}

          {/* Show ProposalChat when a session is active, otherwise show overview/normal panels */}
          {activeProposalSession && store.state.selectedProjectId ? (
            <ProposalChat
              projectId={store.state.selectedProjectId}
              sessionId={activeProposalSession.id}
              onBack={handleBackFromProposal}
              onMerge={handleMergeProposalSession}
              onClose={handleCloseProposalSession}
              onClickChange={handleClickChange}
              isLoading={isLoading}
            />
          ) : selectedProject ? (
            <div className="flex flex-1 overflow-hidden">
              <div className="flex w-72 shrink-0 flex-col border-r border-[#27272a]">
                {/* Tab switcher for Changes/Worktrees */}
                <div className="flex border-b border-[#27272a]">
                  {(['changes', 'worktrees'] as DesktopCenterTab[]).map((tab) => (
                    <button
                      key={tab}
                      onClick={() => selectDesktopCenterTab(tab)}
                      className={`flex-1 py-2 text-xs font-medium transition-colors ${
                        desktopCenterTab === tab
                          ? 'border-b-2 border-[#6366f1] text-[#fafafa]'
                          : 'text-[#52525b] hover:text-[#a1a1aa]'
                      }`}
                    >
                      {tab.charAt(0).toUpperCase() + tab.slice(1)}
                    </button>
                  ))}
                </div>
                <div className="flex-1 overflow-y-auto">
                  {desktopCenterTab === 'changes' ? (
                    <ChangesPanel
                      projects={store.state.projects}
                      selectedProjectId={store.state.selectedProjectId}
                      onClickChange={handleClickChange}
                      selectedChangeId={store.state.fileBrowseContext?.type === 'change' ? store.state.fileBrowseContext.changeId : null}
                    />
                  ) : (
                    <WorktreesPanel
                      worktrees={selectedProjectWorktrees}
                      selectedProjectId={store.state.selectedProjectId}
                      onMerge={handleMergeWorktree}
                      onDelete={handleDeleteWorktreeClick}
                      onCreate={() => setIsCreateWorktreeOpen(true)}
                      onRefresh={handleRefreshWorktrees}
                      onClickWorktree={handleClickWorktree}
                      selectedWorktreeBranch={store.state.fileBrowseContext?.type === 'worktree' ? store.state.fileBrowseContext.worktreeBranch : null}
                      isLoading={isLoading}
                      activeCommands={selectedProjectActiveCommands}
                    />
                  )}
                </div>
              </div>

              <div className="flex flex-1 flex-col overflow-hidden">
                {/* Right pane tab switcher: Logs / Files (Logs hidden when worktree selected) */}
                {store.state.fileBrowseContext?.type === 'worktree' ? (
                  <>
                    <div className="flex border-b border-[#27272a]">
                      <div className="flex-1 py-2 text-xs font-medium border-b-2 border-[#6366f1] text-[#fafafa] text-center">
                        Files
                      </div>
                    </div>
                    <div className="flex flex-1 overflow-hidden">
                      <FileViewPanel
                        projectId={store.state.selectedProjectId}
                        context={store.state.fileBrowseContext}
                      />
                    </div>
                  </>
                ) : (
                  <>
                    <div className="flex border-b border-[#27272a]">
                      {(['logs', 'files'] as DesktopRightTab[]).map((tab) => (
                        <button
                          key={tab}
                          onClick={() => selectDesktopRightTab(tab)}
                          className={`flex-1 py-2 text-xs font-medium transition-colors ${
                            desktopRightTab === tab
                              ? 'border-b-2 border-[#6366f1] text-[#fafafa]'
                              : 'text-[#52525b] hover:text-[#a1a1aa]'
                          }`}
                        >
                          {tab.charAt(0).toUpperCase() + tab.slice(1)}
                        </button>
                      ))}
                    </div>
                    <div className="flex flex-1 overflow-hidden">
                      {desktopRightTab === 'logs' ? (
                        <LogsPanel
                          logs={selectedProjectLogs}
                          selectedProjectId={store.state.selectedProjectId}
                        />
                      ) : (
                        <FileViewPanel
                          projectId={store.state.selectedProjectId}
                          context={store.state.fileBrowseContext}
                        />
                      )}
                    </div>
                  </>
                )}
              </div>
            </div>
          ) : (
            <OverviewDashboard />
          )}
        </main>

        {/* Mobile layout */}
        <div className="flex flex-1 flex-col md:hidden">
          <div className="flex border-b border-[#27272a]">
            {((['projects', 'changes', 'worktrees', 'logs', 'files'] as TabName[])
              .filter((tab) => !(tab === 'logs' && store.state.fileBrowseContext?.type === 'worktree'))
            ).map((tab) => (
              <button
                key={tab}
                onClick={() => selectMobileTab(tab)}
                className={`flex-1 py-2.5 text-xs font-medium transition-colors ${
                  activeTab === tab
                    ? 'border-b-2 border-[#6366f1] text-[#fafafa]'
                    : 'text-[#52525b] hover:text-[#a1a1aa]'
                }`}
              >
                {tab.charAt(0).toUpperCase() + tab.slice(1)}
              </button>
            ))}
          </div>

          <div className="flex-1 overflow-hidden">
            {!selectedProject ? (
              <OverviewDashboard />
            ) : (
              <>
                {activeTab === 'projects' && (
                  <div className="flex h-full flex-col">
                    <div className="flex items-center justify-between border-b border-[#27272a] px-3 py-2">
                      <span className="text-xs font-medium text-[#52525b] uppercase tracking-wider">Projects</span>
                      <button
                        onClick={() => setIsAddProjectOpen(true)}
                        className="rounded p-0.5 text-[#52525b] transition-colors hover:text-[#6366f1]"
                        aria-label="Add project"
                      >
                        <Plus className="size-4" />
                      </button>
                    </div>
                    <div className="flex-1 overflow-y-auto">
                      <ProjectsPanel {...panelProps} />
                    </div>
                  </div>
                )}
                {activeTab === 'changes' && (
                  <ChangesPanel
                    projects={store.state.projects}
                    selectedProjectId={store.state.selectedProjectId}
                    onClickChange={handleClickChange}
                    selectedChangeId={store.state.fileBrowseContext?.type === 'change' ? store.state.fileBrowseContext.changeId : null}
                  />
                )}
                {activeTab === 'worktrees' && (
                  <WorktreesPanel
                    worktrees={selectedProjectWorktrees}
                    selectedProjectId={store.state.selectedProjectId}
                    onMerge={handleMergeWorktree}
                    onDelete={handleDeleteWorktreeClick}
                    onCreate={() => setIsCreateWorktreeOpen(true)}
                    onRefresh={handleRefreshWorktrees}
                    onClickWorktree={handleClickWorktree}
                    selectedWorktreeBranch={store.state.fileBrowseContext?.type === 'worktree' ? store.state.fileBrowseContext.worktreeBranch : null}
                    isLoading={isLoading}
                    activeCommands={selectedProjectActiveCommands}
                  />
                )}
                {activeTab === 'logs' && (
                  <LogsPanel
                    logs={selectedProjectLogs}
                    selectedProjectId={store.state.selectedProjectId}
                  />
                )}
                {activeTab === 'files' && (
                  <FileViewPanel
                    projectId={store.state.selectedProjectId}
                    context={store.state.fileBrowseContext}
                  />
                )}
              </>
            )}
          </div>
        </div>
      </div>

      <DeleteDialog
        isOpen={deleteTarget !== null}
        projectName={deleteTarget?.name || ''}
        onConfirm={handleDeleteConfirm}
        onCancel={() => setDeleteTarget(null)}
        isLoading={isLoading}
      />

      <DeleteWorktreeDialog
        isOpen={deleteWorktreeTarget !== null}
        branchName={deleteWorktreeTarget || ''}
        onConfirm={handleDeleteWorktreeConfirm}
        onCancel={() => setDeleteWorktreeTarget(null)}
        isLoading={isLoading}
      />

      <AddProjectDialog
        isOpen={isAddProjectOpen}
        onSubmit={handleAddProject}
        onCancel={() => setIsAddProjectOpen(false)}
        isLoading={isLoading}
      />

      <CreateWorktreeDialog
        isOpen={isCreateWorktreeOpen}
        onSubmit={handleCreateWorktree}
        onCancel={() => setIsCreateWorktreeOpen(false)}
        isLoading={isLoading}
      />

      <CloseSessionDialog
        isOpen={closeSessionTarget !== null}
        uncommittedFiles={closeTargetSession?.uncommitted_files || []}
        onForceClose={() => handleForceCloseSession()}
        onCancel={() => setCloseSessionTarget(null)}
        isLoading={isLoading}
      />

      <Toaster
        position="bottom-right"
        theme="dark"
        toastOptions={{
          style: {
            background: '#18181b',
            border: '1px solid #27272a',
            color: '#fafafa',
          },
        }}
      />
    </div>
  );
}

export default App;