@brimveyn/aimux 1.20.4 → 1.22.0

package/src/state/store.ts

@@ -1,131 +1,154 @@
-import type { WorktreeTemplate } from '../config'
+import type { AppAction } from './actions'
 
+import { clampBarWidth, KNOWN_WIDGET_IDS } from './bars'
 import { reduceAutoCommit } from './reducers/auto-commit-state'
 import { emptyGitMode, reduceGitModeState } from './reducers/git-mode-state'
 import { emptyGitPanel, reduceGitPanelState } from './reducers/git-panel-state'
 import { emptyModal, reduceModalState } from './reducers/modal-state'
 import { reduceMultiRepoState } from './reducers/multi-repo-state'
-import { reduceSessionState } from './reducers/session-state'
+import { reduceProjectState } from './reducers/project-state'
+import { emptySettingsUI, reduceSettingsState } from './reducers/settings-state'
 import { reduceTabState } from './reducers/tab-state'
 import { reduceUIState } from './reducers/ui-state'
 import { filterSnippets } from './selectors'
 import {
-  type AppAction,
   type AppState,
+  type BarsState,
   EMPTY_AUTO_COMMIT_STATE,
   EMPTY_MULTI_REPO_STATE,
   type GitModeState,
-  type GitPaneMode,
-  type GitPanePosition,
   type GitPaneState,
-  type SessionRecord,
+  type ProjectRecord,
   type SnippetRecord,
 } from './types'
 
-const DEFAULT_SIDEBAR_WIDTH = 28
-const DEFAULT_SIDEBAR_MIN_WIDTH = 18
-const DEFAULT_SIDEBAR_MAX_WIDTH = 42
 const DEFAULT_TERMINAL_COLS = 80
 const DEFAULT_TERMINAL_ROWS = 24
 
 export interface InitialStateOverrides {
   gitMode?: Partial<GitModeState>
   gitPane?: Partial<GitPaneState>
-  sidebar?: Pick<AppState['sidebar'], 'visible' | 'width'>
-  sessionBarVisible?: boolean
-  worktreeTemplates?: WorktreeTemplate[]
+  bars?: BarsState
+  projectBarVisible?: boolean
 }
 
 const DEFAULT_GIT_PANE: GitPaneState = {
   diffCount: { enabled: true },
   diffModeRatio: 0.35,
-  embeddedRatio: 0.5,
   fileListMode: 'tree',
-  mode: 'embedded',
-  paneRatio: 0.5,
   path: { enabled: true },
-  position: 'bottom',
   prefetchRadius: 5,
   treeCompaction: true,
-  visible: true,
 }
 
-function resolveGitPanePosition(mode: GitPaneMode, position: GitPanePosition): GitPanePosition {
-  if (mode === 'embedded') {
-    return position === 'top' || position === 'bottom' ? position : 'bottom'
-  }
-  return position === 'left' || position === 'right' ? position : 'left'
+export const DEFAULT_BARS: BarsState = {
+  left: {
+    visible: true,
+    widgets: [
+      { grow: 50, id: 'projects', visible: true },
+      { grow: 50, id: 'git', visible: true },
+      // Opt-in: reachable via the bar's right-click menu ("Show Setup"). Present
+      // here so sanitizeBars places it rather than treating it as corruption.
+      { grow: 50, id: 'setup', visible: false },
+    ],
+    width: 28,
+  },
+  right: { visible: false, widgets: [], width: 40 },
 }
 
-function clampSidebarWidth(width: number): number {
-  return Math.min(DEFAULT_SIDEBAR_MAX_WIDTH, Math.max(DEFAULT_SIDEBAR_MIN_WIDTH, width))
+/**
+ * Persisted widget ids from before the project/workspace rename. Without this
+ * the old id is simply unknown, so the widget is pruned, the bar renders empty
+ * and the emptied layout is written straight back to aimux.json.
+ *
+ * ponytail: drop with the other rename shims.
+ */
+const LEGACY_WIDGET_IDS: Record<string, string> = { workspaces: 'projects' }
+
+/**
+ * Drop widget ids this build cannot render (config written by a newer or
+ * patched version) and normalise widths — the only place unknown ids can enter.
+ */
+function sanitizeBars(bars: BarsState): BarsState {
+  const sanitizeBar = (bar: BarsState[keyof BarsState]): BarsState[keyof BarsState] => ({
+    ...bar,
+    widgets: bar.widgets
+      .map((widget) => ({ ...widget, id: LEGACY_WIDGET_IDS[widget.id] ?? widget.id }))
+      .filter((widget) => (KNOWN_WIDGET_IDS as readonly string[]).includes(widget.id))
+      .map((widget) => ({ ...widget, grow: Math.max(1, Math.round(widget.grow)) })),
+    width: clampBarWidth(bar.width),
+  })
+  const sanitized: BarsState = { left: sanitizeBar(bars.left), right: sanitizeBar(bars.right) }
+
+  // A widget can only ever be moved between bars or hidden, never deleted, so
+  // one that is in neither bar means the persisted layout was corrupted —
+  // which is exactly what the pre-rename `workspaces` id did to older files
+  // before LEGACY_WIDGET_IDS existed. Put it back where it ships by default,
+  // otherwise the bar renders empty forever and re-saves that emptiness.
+  for (const side of ['left', 'right'] as const) {
+    for (const fallback of DEFAULT_BARS[side].widgets) {
+      const present =
+        sanitized.left.widgets.some((w) => w.id === fallback.id) ||
+        sanitized.right.widgets.some((w) => w.id === fallback.id)
+      if (!present) {
+        sanitized[side] = { ...sanitized[side], widgets: [...sanitized[side].widgets, fallback] }
+      }
+    }
+  }
+  return sanitized
 }
 
 export function createInitialState(
   customCommands: Record<string, string> = {},
-  sessions: SessionRecord[] = [],
+  projects: ProjectRecord[] = [],
   snippets: SnippetRecord[] = [],
-  showSessionPicker = false,
+  showProjectPicker = false,
   overrides: InitialStateOverrides = {}
 ): AppState {
-  const gitPaneMode = overrides.gitPane?.mode ?? DEFAULT_GIT_PANE.mode
-  const gitPanePosition = resolveGitPanePosition(
-    gitPaneMode,
-    overrides.gitPane?.position ?? DEFAULT_GIT_PANE.position
-  )
   return {
     activeTabId: null,
     autoCommit: EMPTY_AUTO_COMMIT_STATE,
-    currentSessionId: null,
+    bars: sanitizeBars(overrides.bars ?? DEFAULT_BARS),
+    currentProjectId: null,
     customCommands,
-    focusMode: showSessionPicker ? 'command-edit' : 'navigation',
+    focusMode: showProjectPicker ? 'command-edit' : 'navigation',
     gitMode: { ...emptyGitMode(), ...overrides.gitMode },
-    gitPane: {
-      ...DEFAULT_GIT_PANE,
-      ...overrides.gitPane,
-      mode: gitPaneMode,
-      position: gitPanePosition,
-    },
+    gitPane: { ...DEFAULT_GIT_PANE, ...overrides.gitPane },
     gitPanel: emptyGitPanel(),
-    lastActiveTabByWorktree: {},
+    lastActiveTabByWorkspace: {},
     layout: {
       terminalCols: DEFAULT_TERMINAL_COLS,
       terminalRows: DEFAULT_TERMINAL_ROWS,
     },
     layoutTrees: {},
-    modal: showSessionPicker
+    modal: showProjectPicker
       ? {
           cursorPos: 0,
           editBuffer: '',
+          projectTargetId: null,
           selectedIndex: 0,
-          sessionTargetId: null,
-          type: 'session-picker',
+          type: 'project-picker',
         }
       : emptyModal(),
     multiRepo: EMPTY_MULTI_REPO_STATE,
     pendingChords: null,
-    sessionBar: {
-      visible: overrides.sessionBarVisible ?? true,
-    },
-    sessions,
-    sessionStatuses: {},
-    sidebar: {
-      maxWidth: DEFAULT_SIDEBAR_MAX_WIDTH,
-      minWidth: DEFAULT_SIDEBAR_MIN_WIDTH,
-      visible: overrides.sidebar?.visible ?? true,
-      width: clampSidebarWidth(overrides.sidebar?.width ?? DEFAULT_SIDEBAR_WIDTH),
+    projectBar: {
+      visible: overrides.projectBarVisible ?? true,
     },
+    projects,
+    projectStatuses: {},
+    settings: emptySettingsUI(),
     snippets,
     tabGroupMap: {},
     tabs: [],
-    worktreeDivergence: {},
-    worktreeTemplates: overrides.worktreeTemplates ?? [],
+    workspaceActivity: {},
+    workspaceDivergence: {},
   }
 }
 
 export function appReducer(state: AppState, action: AppAction): AppState {
-  const sessionState = reduceSessionState(state, action)
-  if (sessionState) return sessionState
+  const projectState = reduceProjectState(state, action)
+  if (projectState) return projectState
 
   const tabState = reduceTabState(state, action)
   if (tabState) return tabState
@@ -148,6 +171,9 @@ export function appReducer(state: AppState, action: AppAction): AppState {
   const multiRepoState = reduceMultiRepoState(state, action)
   if (multiRepoState) return multiRepoState
 
+  const settingsState = reduceSettingsState(state, action)
+  if (settingsState) return settingsState
+
   switch (action.type) {
     case 'set-snippets':
       return { ...state, snippets: action.snippets }