@brimveyn/aimux 1.12.2 → 1.13.0

package/src/ui/components/layout/sidebar/sidebar.tsx

@@ -1,12 +1,23 @@
-import {
-  type BoxRenderable,
-  type MouseEvent as OtuiMouseEvent,
-  type ScrollBoxRenderable,
+import type {
+  BoxRenderable,
+  MouseEvent as OtuiMouseEvent,
+  ScrollBoxRenderable,
 } from '@opentui/core'
+
 import { memo, useMemo, useRef } from 'react'
 
+import type { BranchDivergence } from '../../../../state/types'
+
+import { useWorktreeDivergencePolling } from '../../../../git/worktree-divergence-poller'
 import { useAppStore } from '../../../../state/app-store'
 import { dispatchGlobal } from '../../../../state/dispatch-ref'
+import {
+  getActiveWorktree,
+  getRenderedTabWorktreeId,
+  getSessionProjectPath,
+  getWorktreeColor,
+  orderTabsByWorktree,
+} from '../../../../state/session-worktrees'
 import { getCurrentTheme, type ResolvedTuiTheme, useTheme } from '../../../theme'
 import { buildGitPaneContextMenu } from '../../git/pane/git-pane-context-menu'
 import { GitPaneWidget } from '../../git/pane/git-pane-widget'
@@ -33,6 +44,28 @@ const GUTTER_END = '╰'
 const GUTTER_PAD = '│'
 const RESIZE_HANDLE = '─'
 
+// Left accent strip + trailing space for a worktree group header.
+const WORKTREE_STRIP = '▍ '
+
+// Compact "↑ahead ↓behind" label for a worktree group header; empty when the
+// branch is level with its base (or divergence isn't known yet).
+function formatDivergence(divergence: BranchDivergence | undefined): string {
+  if (divergence == null) return ''
+  const parts: string[] = []
+  if (divergence.ahead > 0) parts.push(`↑${divergence.ahead}`)
+  if (divergence.behind > 0) parts.push(`↓${divergence.behind}`)
+  return parts.join(' ')
+}
+
+// Fit a worktree label into `max` columns, ellipsizing when it would overflow.
+// Branch names are ASCII, so character count tracks rendered column width.
+function truncateLabel(label: string, max: number): string {
+  if (max <= 0) return ''
+  if (label.length <= max) return label
+  if (max === 1) return '…'
+  return `${label.slice(0, max - 1)}…`
+}
+
 function getRowBackground({
   alternate,
   isActive,
@@ -51,10 +84,12 @@ const SidebarTop = memo(function SidebarTop({ contentWidth }: { contentWidth: nu
   const t = useTheme()
   const currentSessionId = useAppStore((s) => s.currentSessionId)
   const sessions = useAppStore((s) => s.sessions)
-  const currentSession = currentSessionId
-    ? sessions.find((s) => s.id === currentSessionId)
-    : undefined
-  const projectPath = currentSession?.projectPath
+  const currentSession =
+    currentSessionId != null && currentSessionId !== ''
+      ? sessions.find((s) => s.id === currentSessionId)
+      : undefined
+  const activeWorktree = getActiveWorktree(currentSession)
+  const projectPath = getSessionProjectPath(currentSession)
   const branch = useSidebarBranch(projectPath)
 
   return (
@@ -65,14 +100,20 @@ const SidebarTop = memo(function SidebarTop({ contentWidth }: { contentWidth: nu
       <text fg={t.text} selectable={false}>
         {currentSession ? currentSession.name : 'No workspace selected'}
       </text>
-      {branch ? (
+      {(branch != null && branch !== '') || activeWorktree ? (
         <box flexDirection="row">
           <text fg={t.text} selectable={false}>
             {'\u{e702}'}{' '}
           </text>
           <text fg={t.text} selectable={false}>
-            {branch}
+            {branch ?? activeWorktree?.branch ?? activeWorktree?.name}
           </text>
+          {activeWorktree?.source === 'aimux-temp' ? (
+            <text fg={t.textMuted} selectable={false}>
+              {' '}
+              tmp
+            </text>
+          ) : null}
         </box>
       ) : null}
       <box
@@ -114,25 +155,54 @@ function renderGroupGutter(isGroupStart: boolean, isGroupMiddle: boolean, isGrou
 
 interface TabsBodyProps {
   onTabActivate?: (tabId: string) => void
+  contentWidth: number
 }
 
-const TabsBody = memo(function TabsBody({ onTabActivate }: TabsBodyProps) {
+const TabsBody = memo(function TabsBody({ contentWidth, onTabActivate }: TabsBodyProps) {
   const t = useTheme()
   const tabs = useAppStore((s) => s.tabs)
   const activeTabId = useAppStore((s) => s.activeTabId)
   const focusMode = useAppStore((s) => s.focusMode)
   const layoutTrees = useAppStore((s) => s.layoutTrees)
   const sidebarVisible = useAppStore((s) => s.sidebar.visible)
+  const currentSessionId = useAppStore((s) => s.currentSessionId)
+  const sessions = useAppStore((s) => s.sessions)
+  const worktreeDivergence = useAppStore((s) => s.worktreeDivergence)
+  const currentSession =
+    currentSessionId != null && currentSessionId !== ''
+      ? sessions.find((s) => s.id === currentSessionId)
+      : undefined
+  const worktrees = useMemo(() => currentSession?.worktrees ?? [], [currentSession?.worktrees])
+  const worktreeById = useMemo(
+    () => new Map(worktrees.map((worktree) => [worktree.id, worktree])),
+    [worktrees]
+  )
+  const groupedTabs = useMemo(() => {
+    return orderTabsByWorktree(tabs, currentSession)
+  }, [currentSession, tabs])
+  const showWorktreeSeparators = useMemo(() => {
+    const ids = new Set<string>()
+    for (const tab of groupedTabs) {
+      ids.add(getRenderedTabWorktreeId(tab, worktrees))
+    }
+    const activeWorktreeId =
+      currentSession?.activeWorktreeId ?? getActiveWorktree(currentSession)?.id
+    if (activeWorktreeId != null && activeWorktreeId !== '') ids.add(activeWorktreeId)
+    return ids.size >= 2
+  }, [currentSession, groupedTabs, worktrees])
 
   const scrollRef = useRef<ScrollBoxRenderable | null>(null)
-  const activeIndex = tabs.findIndex((tab) => tab.id === activeTabId)
-  const tabGroupInfo = useMemo(() => buildTabGroupInfo(layoutTrees, tabs), [layoutTrees, tabs])
+  const activeIndex = groupedTabs.findIndex((tab) => tab.id === activeTabId)
+  const tabGroupInfo = useMemo(
+    () => buildTabGroupInfo(layoutTrees, groupedTabs),
+    [layoutTrees, groupedTabs]
+  )
 
   useSidebarAutoScroll({
     activeIndex,
     activeTabId,
     scrollRef,
-    tabCount: tabs.length,
+    tabCount: groupedTabs.length,
     visible: sidebarVisible,
   })
 
@@ -152,35 +222,90 @@ const TabsBody = memo(function TabsBody({ onTabActivate }: TabsBodyProps) {
           </text>
         </box>
       ) : (
-        tabs.map((tab, index) => {
+        groupedTabs.map((tab, index) => {
           const isActive = tab.id === activeTabId
           const alternate = index % 2 === 1
           const info = tabGroupInfo.get(tab.id)
-          const inLayout = !!info?.inLayout
+          const inLayout = !!(info?.inLayout === true)
           const inGroup = info ? index >= info.groupStart && index <= info.groupEnd : false
           const isGroupStart = info ? index === info.groupStart : false
           const isGroupEnd = info ? index === info.groupEnd : false
           const isGroupMiddle = inGroup && !isGroupStart && !isGroupEnd
+          const tabOwnWorktree =
+            tab.worktreeId != null && tab.worktreeId !== ''
+              ? worktreeById.get(tab.worktreeId)
+              : undefined
+          let tabWorktree = tabOwnWorktree
+          if (!tabWorktree && worktrees.length > 1) {
+            tabWorktree = worktrees[0]
+          }
+          // A tab's worktree can be moved when it has a branch (squash needs one,
+          // so not the primary) and there's at least one other worktree to land in.
+          const moveWorktreeId =
+            tabOwnWorktree?.branch != null && tabOwnWorktree.branch !== '' && worktrees.length > 1
+              ? tabOwnWorktree.id
+              : undefined
+          const prevTab = groupedTabs[index - 1]
+          const startsWorktreeGroup =
+            !prevTab ||
+            getRenderedTabWorktreeId(prevTab, worktrees) !==
+              getRenderedTabWorktreeId(tab, worktrees)
+          const worktreeColor = tabWorktree
+            ? (tabWorktree.color ?? getWorktreeColor(tabWorktree.id))
+            : t.textMuted
+          const worktreeLabel = tabWorktree?.branch ?? tabWorktree?.name ?? 'main'
+          const aheadBehind = formatDivergence(
+            tabWorktree != null ? worktreeDivergence[tabWorktree.id] : undefined
+          )
+          const aheadBehindText = aheadBehind === '' ? '' : ` ${aheadBehind}`
+          // Reserve room for the strip, the ahead/behind chip and a 1-col gap so
+          // the header never wraps; the divider fills whatever remains (min 0).
+          const labelBudget = Math.max(
+            0,
+            contentWidth - WORKTREE_STRIP.length - aheadBehindText.length - 1
+          )
+          const headerLabel = truncateLabel(worktreeLabel, labelBudget)
 
           return (
-            <box
-              key={tab.id}
-              backgroundColor={getRowBackground({ alternate, isActive, t })}
-              flexDirection="row"
-              onMouseDown={(event) => {
-                event.stopPropagation()
-                onTabActivate?.(tab.id)
-              }}
-            >
-              {inGroup ? renderGroupGutter(isGroupStart, isGroupMiddle, isGroupEnd) : null}
-              <box flexGrow={1}>
-                <TabItem
-                  id={`sidebar-tab-${tab.id}`}
-                  tab={tab}
-                  active={isActive}
-                  focused={focusMode === 'navigation'}
-                  inLayout={inLayout}
-                />
+            <box key={tab.id} flexDirection="column">
+              {showWorktreeSeparators && startsWorktreeGroup ? (
+                <box flexDirection="row" overflow="hidden" paddingTop={index === 0 ? 0 : 1}>
+                  <text selectable={false} wrapMode="none" flexShrink={0}>
+                    <span fg={worktreeColor}>
+                      {WORKTREE_STRIP}
+                      {headerLabel}
+                    </span>
+                    {aheadBehindText !== '' ? (
+                      <span fg={t.textMuted}>{aheadBehindText}</span>
+                    ) : null}
+                  </text>
+                  <box flexGrow={1} flexShrink={1} flexBasis={0} overflow="hidden">
+                    <text fg={t.textMuted} selectable={false} wrapMode="none">
+                      {' '}
+                      {'─'.repeat(contentWidth)}
+                    </text>
+                  </box>
+                </box>
+              ) : null}
+              <box
+                backgroundColor={getRowBackground({ alternate, isActive, t })}
+                flexDirection="row"
+                onMouseDown={(event) => {
+                  event.stopPropagation()
+                  onTabActivate?.(tab.id)
+                }}
+              >
+                {inGroup ? renderGroupGutter(isGroupStart, isGroupMiddle, isGroupEnd) : null}
+                <box flexGrow={1}>
+                  <TabItem
+                    id={`sidebar-tab-${tab.id}`}
+                    tab={tab}
+                    active={isActive}
+                    focused={focusMode === 'navigation'}
+                    inLayout={inLayout}
+                    moveWorktreeId={moveWorktreeId}
+                  />
+                </box>
               </box>
             </box>
           )
@@ -203,6 +328,7 @@ export function Sidebar({
   const gitPane = useAppStore((s) => s.gitPane)
   const focusMode = useAppStore((s) => s.focusMode)
   const bodyRef = useRef<BoxRenderable | null>(null)
+  useWorktreeDivergencePolling(sidebarVisible)
 
   if (!sidebarVisible) {
     return null
@@ -289,7 +415,7 @@ export function Sidebar({
         }
       }}
       onMouseDrag={(event) => {
-        if (onResizeDrag?.(event)) {
+        if (onResizeDrag?.(event) === true) {
           event.preventDefault()
           event.stopPropagation()
         }
@@ -315,7 +441,7 @@ export function Sidebar({
               flexBasis={0}
               overflow="hidden"
             >
-              <TabsBody onTabActivate={onTabActivate} />
+              <TabsBody onTabActivate={onTabActivate} contentWidth={contentWidth} />
             </box>
             {gitOnBottom ? (
               <>

package/src/ui/components/layout/sidebar/tab-item.tsx

@@ -13,6 +13,8 @@ interface TabItemProps {
   active: boolean
   focused: boolean
   inLayout?: boolean
+  /** When set, this tab's worktree can be moved — adds a "Move worktree" entry. */
+  moveWorktreeId?: string
 }
 
 function getStatusColor(status: TabSession['status']): string {
@@ -106,7 +108,7 @@ function ActivityIndicator({ tab }: { tab: TabSession }) {
   )
 }
 
-export function TabItem({ active, focused, id, inLayout, tab }: TabItemProps) {
+export function TabItem({ active, focused, id, inLayout, moveWorktreeId, tab }: TabItemProps) {
   const t = useTheme()
   const label = tab.command.split(' ')[0]
   const isInLayout = inLayout ?? false
@@ -152,6 +154,20 @@ export function TabItem({ active, focused, id, inLayout, tab }: TabItemProps) {
             dispatchGlobal({ delta: 1, type: 'reorder-active-tab' })
           },
         ],
+        // Move this tab's worktree into another one. Opened from here it overlays
+        // the normal view (no git mode) since the open action doesn't touch focus.
+        ...(moveWorktreeId != null && moveWorktreeId !== ''
+          ? [
+              [
+                'Move worktree',
+                () =>
+                  dispatchGlobal({
+                    sourceWorktreeId: moveWorktreeId,
+                    type: 'open-worktree-move-modal',
+                  }),
+              ] as [string, () => void],
+            ]
+          : []),
       ]}
       onMouseOver={() => setHovered(true)}
       onMouseOut={() => setHovered(false)}

package/src/ui/components/layout/sidebar/use-sidebar-auto-scroll.ts

@@ -36,7 +36,7 @@ export function useSidebarAutoScroll({
       return
     }
 
-    if (!previousVisibilityRef.current && activeTabId) {
+    if (!previousVisibilityRef.current && activeTabId != null && activeTabId !== '') {
       scrollbox.scrollChildIntoView(`sidebar-tab-${activeTabId}`)
       previousVisibilityRef.current = true
       previousActiveIndexRef.current = activeIndex
@@ -53,7 +53,7 @@ export function useSidebarAutoScroll({
       scrollbox.scrollTo({ x: 0, y: 0 })
     } else if (scrollTarget === 'bottom') {
       scrollbox.scrollTo({ x: 0, y: scrollbox.scrollHeight })
-    } else if (scrollTarget === 'active-item' && activeTabId) {
+    } else if (scrollTarget === 'active-item' && activeTabId != null && activeTabId !== '') {
       scrollbox.scrollChildIntoView(`sidebar-tab-${activeTabId}`)
     }
 

package/src/ui/components/layout/sidebar/use-sidebar-branch.ts

@@ -8,7 +8,7 @@ export function useSidebarBranch(projectPath: string | undefined): string | null
   const [branch, setBranch] = useState<string | null>(null)
 
   useEffect(() => {
-    if (!projectPath) {
+    if (!(projectPath != null && projectPath !== '')) {
       setBranch(null)
       return
     }

package/src/ui/components/layout/split-layout.tsx

@@ -161,7 +161,7 @@ export function SplitLayout({
           e.preventDefault()
           if (!onSeparatorDragStart) return
           const leafId = getFirstLeafId(node.first)
-          if (!leafId) return
+          if (!(leafId != null && leafId !== '')) return
           onSeparatorDragStart({
             direction: node.direction,
             screenStart:

package/src/ui/components/layout/terminal-pane.tsx

@@ -3,7 +3,7 @@ import type { MouseEvent as OtuiMouseEvent } from '@opentui/core'
 import { memo, type ReactNode } from 'react'
 
 import type { TerminalContentOrigin } from '../../../input/raw-input-handler'
-import type { TabSession, TerminalSnapshot, TerminalSpan } from '../../../state/types'
+import type { FocusMode, TabSession, TerminalSnapshot, TerminalSpan } from '../../../state/types'
 
 import { type MeasuredPaneRect, usePaneSizeReport } from '../../../app-runtime/use-pane-size-report'
 import { logInputDebug } from '../../../debug/input-log'
@@ -15,7 +15,7 @@ import { ContextMenuBox } from '../overlays/context-menu/context-menu-box'
 interface TerminalPaneProps {
   tab?: TabSession
   tabId?: string
-  focusMode: import('../../../state/types').FocusMode
+  focusMode: FocusMode
   isActive?: boolean
   contentOrigin: TerminalContentOrigin
   mouseForwardingEnabled: boolean
@@ -61,15 +61,15 @@ function getBorderColor(isActive: boolean, focusMode: TerminalPaneProps['focusMo
 function renderSpan(span: TerminalSpan, key: string): ReactNode {
   let node: ReactNode = span.text
 
-  if (span.underline) {
+  if (span.underline === true) {
     node = <u>{node}</u>
   }
 
-  if (span.italic) {
+  if (span.italic === true) {
     node = <em>{node}</em>
   }
 
-  if (span.bold) {
+  if (span.bold === true) {
     node = <strong>{node}</strong>
   }
 
@@ -132,35 +132,36 @@ export function TerminalPane({
   const paneIsActive = isActive ?? true
   const canForwardMouse = focusMode === 'terminal-input' && !!tab && mouseForwardingEnabled
   const canUseLocalScrollback = focusMode === 'terminal-input' && !!tab && localScrollbackEnabled
-  const rightClickMenu: ContextMenuItem[] | undefined = tabId
-    ? [
-        [
-          'Split vertically',
-          () =>
-            runSideEffectGlobal({
-              direction: 'vertical',
-              sourceTabId: tabId,
-              type: 'split-pane',
-            }),
-        ],
-        [
-          'Split horizontally',
-          () =>
-            runSideEffectGlobal({
-              direction: 'horizontal',
-              sourceTabId: tabId,
-              type: 'split-pane',
-            }),
-        ],
-        [
-          'Close pane',
-          () => {
-            dispatchGlobal({ tabId, type: 'close-pane' })
-            runSideEffectGlobal({ tabId, type: 'close-tab' })
-          },
-        ],
-      ]
-    : undefined
+  const rightClickMenu: ContextMenuItem[] | undefined =
+    tabId != null && tabId !== ''
+      ? [
+          [
+            'Split vertically',
+            () =>
+              runSideEffectGlobal({
+                direction: 'vertical',
+                sourceTabId: tabId,
+                type: 'split-pane',
+              }),
+          ],
+          [
+            'Split horizontally',
+            () =>
+              runSideEffectGlobal({
+                direction: 'horizontal',
+                sourceTabId: tabId,
+                type: 'split-pane',
+              }),
+          ],
+          [
+            'Close pane',
+            () => {
+              dispatchGlobal({ tabId, type: 'close-pane' })
+              runSideEffectGlobal({ tabId, type: 'close-tab' })
+            },
+          ],
+        ]
+      : undefined
   const isOnPaneBorder = (event: OtuiMouseEvent) =>
     event.x === contentOrigin.x - 1 ||
     event.x === contentOrigin.x + contentOrigin.cols ||
@@ -206,22 +207,22 @@ export function TerminalPane({
       })
     }
     if (event.type === 'drag') {
-      if (onTerminalDrag?.(event, contentOrigin, tabId)) {
+      if (onTerminalDrag?.(event, contentOrigin, tabId) === true) {
         event.preventDefault()
         return
       }
-      if (onSeparatorDrag?.(event)) {
+      if (onSeparatorDrag?.(event) === true) {
         event.preventDefault()
         return
       }
     }
     if (event.type === 'up') {
-      if (onTerminalMouseUp?.(event)) {
+      if (onTerminalMouseUp?.(event) === true) {
         event.preventDefault()
       }
       onSeparatorDragEnd?.()
     }
-    if (tabId && onPaneActivate && event.type === 'down') {
+    if (tabId != null && tabId !== '' && onPaneActivate && event.type === 'down') {
       onPaneActivate(tabId)
     }
     if (!canForwardMouse) {
@@ -308,7 +309,7 @@ export function TerminalPane({
           </box>
         )}
       </ContextMenuBox>
-      {tab?.status === 'disconnected' || tab?.errorMessage ? (
+      {tab?.status === 'disconnected' || (tab?.errorMessage != null && tab.errorMessage !== '') ? (
         // Absolutely positioned so it overlays the bordered box instead of
         // consuming a flex row. If it took a row, the rendered terminal area
         // would be one line shorter than the size sent to the PTY/xterm,
@@ -317,7 +318,9 @@ export function TerminalPane({
           {tab?.status === 'disconnected' ? (
             <text fg={t.warning}>Restored snapshot. Press Ctrl+r to restart this workspace.</text>
           ) : null}
-          {tab?.errorMessage ? <text fg={t.error}>{tab.errorMessage}</text> : null}
+          {tab?.errorMessage != null && tab?.errorMessage !== '' ? (
+            <text fg={t.error}>{tab.errorMessage}</text>
+          ) : null}
         </box>
       ) : null}
     </box>

package/src/ui/components/modals/app/ai-usage-modal.tsx

@@ -93,7 +93,7 @@ interface ToolSectionProps {
 
 function ToolSection({ snap, tool }: ToolSectionProps) {
   const t = useTheme()
-  const isHardError = Boolean(snap.error) && !snap.stale
+  const isHardError = Boolean(snap.error) && !(snap.stale === true)
   const relative = formatRelative(snap.lastUpdated)
 
   let body: ReactNode
@@ -119,7 +119,7 @@ function ToolSection({ snap, tool }: ToolSectionProps) {
         <text fg={t.text} selectable={false}>
           {TOOL_TITLE[tool]}
         </text>
-        {snap.planTier ? (
+        {snap.planTier != null && snap.planTier !== '' ? (
           <text fg={t.textMuted} selectable={false}>
             {snap.planTier}
           </text>
@@ -145,7 +145,10 @@ function WindowRow({ window }: { window: UsageWindow }) {
   }
 
   const pctText = percent === null ? '—' : `${Math.round(percent)}% used`
-  const resetText = window.timeRemaining ? `Resets in ${window.timeRemaining}` : null
+  const resetText =
+    window.timeRemaining != null && window.timeRemaining !== ''
+      ? `Resets in ${window.timeRemaining}`
+      : null
 
   return (
     <box flexDirection="column" paddingTop={1}>
@@ -164,7 +167,7 @@ function WindowRow({ window }: { window: UsageWindow }) {
         <text fg={t.textMuted} selectable={false}>
           {pctText}
         </text>
-        {resetText ? (
+        {resetText != null && resetText !== '' ? (
           <text fg={t.textMuted} selectable={false}>
             {resetText}
           </text>
@@ -181,7 +184,7 @@ function PaceLine({ pace }: { pace: NonNullable<UsageWindow['pace']> }) {
   if (paceStageIsBehind(pace.stage)) color = t.warning
   else if (paceStageIsAhead(pace.stage)) color = t.success
 
-  const suffix = pace.rightText ? ` · ${pace.rightText}` : ''
+  const suffix = pace.rightText != null && pace.rightText !== '' ? ` · ${pace.rightText}` : ''
   return (
     <text fg={color} selectable={false}>
       {`Pace: ${pace.label}${suffix}`}

package/src/ui/components/modals/app/help-modal.tsx

@@ -19,7 +19,7 @@ interface HelpModalProps {
 function matchesFilter(needle: string, ...fields: (string | undefined)[]): boolean {
   if (!needle) return true
   const lower = needle.toLowerCase()
-  return fields.some((f) => f?.toLowerCase().includes(lower))
+  return fields.some((f) => f?.toLowerCase().includes(lower) === true)
 }
 
 export function HelpModal({ cursorPos, filter, scope, selectedIndex }: HelpModalProps) {
@@ -75,7 +75,9 @@ export function HelpModal({ cursorPos, filter, scope, selectedIndex }: HelpModal
       items={items}
       selectedIndex={selectedIndex}
       emptyState={
-        <text fg={t.textMuted}>{filter ? 'No matching bindings.' : 'No bindings registered.'}</text>
+        <text fg={t.textMuted}>
+          {filter != null && filter !== '' ? 'No matching bindings.' : 'No bindings registered.'}
+        </text>
       }
       onHover={(index) => dispatchGlobal({ index, type: 'set-modal-selection-index' })}
     />

package/src/ui/components/modals/git/git-commit-modal.tsx

@@ -90,7 +90,7 @@ export function GitCommitModal({
   const currentSessionId = useAppStore((s) => s.currentSessionId)
   const bgKind = useAppStore((s) => {
     const id = s.currentSessionId
-    return id ? s.autoCommit.bySession[id]?.kind : undefined
+    return id != null && id !== '' ? s.autoCommit.bySession[id]?.kind : undefined
   })
   const isBgGenerating = bgKind === 'generating'
   const showBgSpinner = isBgGenerating && !isConfirm && !isGenerating
@@ -101,7 +101,7 @@ export function GitCommitModal({
 
   const onAutoCommitClick = (): void => {
     const hasTitle = title.trim().length > 0
-    if (hasTitle || !currentSessionId) {
+    if (hasTitle || !(currentSessionId != null && currentSessionId !== '')) {
       dispatchGlobal({ type: 'git-commit-enter-confirm' })
       return
     }

package/src/ui/components/modals/sessions/create-session-modal.tsx

@@ -62,7 +62,11 @@ export function CreateSessionModal({
         label="Search projects"
         placeholder="Type a project name..."
         value={directoryQuery}
-        displayValue={pendingProjectPath ? abbreviatePath(pendingProjectPath) : directoryQuery}
+        displayValue={
+          pendingProjectPath != null && pendingProjectPath !== ''
+            ? abbreviatePath(pendingProjectPath)
+            : directoryQuery
+        }
         items={items}
         selectedIndex={selectedIndex}
         maxVisibleRows={VISIBLE_ROWS}

package/src/ui/components/modals/sessions/session-picker-modal.tsx

@@ -47,7 +47,7 @@ export function SessionPickerModal({
   const ordered = orderSessionsForDisplay(sessions)
   const baselineOrder = ordered.map((s) => s.id)
   const filtered = filterSessions(ordered, filter)
-  const hasFilter = !!filter
+  const hasFilter = !!(filter != null && filter !== '')
 
   const sessionItems: PickerItem[] = filtered.map((session, index) => {
     const active = index === selectedIndex
@@ -56,9 +56,10 @@ export function SessionPickerModal({
       key: session.id,
       onClick: () => runSideEffectGlobal({ type: 'confirm-selected-session' }),
       onDelete: () => runSideEffectGlobal({ type: 'delete-selected-session' }),
-      subtitle: session.projectPath ? (
-        <text fg={t.textMuted}>{abbreviatePath(session.projectPath)}</text>
-      ) : undefined,
+      subtitle:
+        session.projectPath != null && session.projectPath !== '' ? (
+          <text fg={t.textMuted}>{abbreviatePath(session.projectPath)}</text>
+        ) : undefined,
       title: (
         <text fg={active ? t.text : t.textMuted}>
           {formatSessionLine(session, currentSessionId, currentTabCount, displayIndex)}