@brimveyn/aimux 1.21.0 → 1.22.2

package/src/state/validation.ts

@@ -1,11 +1,11 @@
 import type {
-  SessionRecord,
+  ProjectRecord,
+  ProjectSnapshotV1,
   SnippetRecord,
   TerminalLine,
   TerminalModeState,
   TerminalSnapshot,
-  WorkspaceSnapshotV1,
-  WorktreeRecord,
+  WorkspaceRecord,
 } from './types'
 
 function isObjectRecord(value: unknown): value is Record<string, unknown> {
@@ -107,7 +107,7 @@ function isStringRecord(value: unknown): boolean {
   return Object.values(value).every(isString)
 }
 
-export function isWorktreeRecord(value: unknown): value is WorktreeRecord {
+export function isWorkspaceRecord(value: unknown): value is WorkspaceRecord {
   return (
     isObjectRecord(value) &&
     isString(value.id) &&
@@ -121,11 +121,13 @@ export function isWorktreeRecord(value: unknown): value is WorktreeRecord {
     isBoolean(value.createdByAimux) &&
     (value.color === undefined || isString(value.color)) &&
     isString(value.createdAt) &&
-    isString(value.updatedAt)
+    isString(value.updatedAt) &&
+    (value.setupRanAt === undefined || isString(value.setupRanAt)) &&
+    (value.setupExitCode === undefined || isFiniteNumber(value.setupExitCode))
   )
 }
 
-export function isWorkspaceSnapshotV1(value: unknown): value is WorkspaceSnapshotV1 {
+export function isProjectSnapshotV1(value: unknown): value is ProjectSnapshotV1 {
   return (
     isObjectRecord(value) &&
     value.version === 1 &&
@@ -152,7 +154,7 @@ export function isWorkspaceSnapshotV1(value: unknown): value is WorkspaceSnapsho
         (tab.viewport === undefined || isTerminalSnapshot(tab.viewport)) &&
         (tab.errorMessage === undefined || isString(tab.errorMessage)) &&
         (tab.exitCode === undefined || isFiniteNumber(tab.exitCode)) &&
-        (tab.worktreeId === undefined || isString(tab.worktreeId)) &&
+        (tab.workspaceId === undefined || isString(tab.workspaceId)) &&
         (tab.workerName === undefined || isString(tab.workerName)) &&
         (tab.autoRenameStatus === undefined ||
           tab.autoRenameStatus === 'eligible' ||
@@ -164,7 +166,7 @@ export function isWorkspaceSnapshotV1(value: unknown): value is WorkspaceSnapsho
   )
 }
 
-export function isSessionRecord(value: unknown): value is SessionRecord {
+export function isProjectRecord(value: unknown): value is ProjectRecord {
   return (
     isObjectRecord(value) &&
     isString(value.id) &&
@@ -175,10 +177,10 @@ export function isSessionRecord(value: unknown): value is SessionRecord {
     isString(value.lastOpenedAt) &&
     (value.order === undefined ||
       (typeof value.order === 'number' && Number.isFinite(value.order))) &&
-    (value.workspaceSnapshot === undefined || isWorkspaceSnapshotV1(value.workspaceSnapshot)) &&
-    (value.worktrees === undefined ||
-      (Array.isArray(value.worktrees) && value.worktrees.every(isWorktreeRecord))) &&
-    (value.activeWorktreeId === undefined || isString(value.activeWorktreeId))
+    (value.projectSnapshot === undefined || isProjectSnapshotV1(value.projectSnapshot)) &&
+    (value.workspaces === undefined ||
+      (Array.isArray(value.workspaces) && value.workspaces.every(isWorkspaceRecord))) &&
+    (value.activeWorkspaceId === undefined || isString(value.activeWorkspaceId))
   )
 }
 

package/src/terminal-manager/manager-client.ts

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'node:events'
 import { connect, type Socket } from 'node:net'
 
-import type { TerminalModeState, TerminalSnapshot, WorkspaceSnapshotV1 } from '../state/types'
+import type { ProjectSnapshotV1, TerminalModeState, TerminalSnapshot } from '../state/types'
 
 import { getTerminalManagerSocketPath } from '../daemon/runtime-paths'
 import { logDebug } from '../debug/input-log'
@@ -23,13 +23,13 @@ import {
 
 interface ManagerClientEvents {
   render: [
-    sessionId: string,
+    projectId: string,
     tabId: string,
     viewport: TerminalSnapshot,
     terminalModes: TerminalModeState,
   ]
-  exit: [sessionId: string, tabId: string, exitCode: number]
-  error: [sessionId: string, tabId: string, message: string]
+  exit: [projectId: string, tabId: string, exitCode: number]
+  error: [projectId: string, tabId: string, message: string]
 }
 
 const REQUEST_TIMEOUT_MS = 10_000
@@ -126,7 +126,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
 
   private handleManagerEvent(message: ManagerEvent): void {
     logDebug('managerClient.event', {
-      sessionId: message.payload.sessionId,
+      projectId: message.payload.projectId,
       tabId: message.payload.tabId,
       type: message.type,
     })
@@ -134,7 +134,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
       case 'tabRender':
         this.emit(
           'render',
-          message.payload.sessionId,
+          message.payload.projectId,
           message.payload.tabId,
           message.payload.viewport,
           message.payload.terminalModes
@@ -143,7 +143,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
       case 'tabExit':
         this.emit(
           'exit',
-          message.payload.sessionId,
+          message.payload.projectId,
           message.payload.tabId,
           message.payload.exitCode
         )
@@ -151,7 +151,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
       case 'tabError':
         this.emit(
           'error',
-          message.payload.sessionId,
+          message.payload.projectId,
           message.payload.tabId,
           message.payload.message
         )
@@ -253,16 +253,16 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
   }
 
   async attachSession(options: {
-    sessionId: string
+    projectId: string
     cols: number
     rows: number
-    workspaceSnapshot?: WorkspaceSnapshotV1
+    projectSnapshot?: ProjectSnapshotV1
   }): Promise<ManagerAttachResult> {
     logDebug('managerClient.attach.start', {
       cols: options.cols,
+      projectId: options.projectId,
       rows: options.rows,
-      sessionId: options.sessionId,
-      snapshotTabs: options.workspaceSnapshot?.tabs.length ?? 0,
+      snapshotTabs: options.projectSnapshot?.tabs.length ?? 0,
     })
     await this.connect()
     const response = await this.send({
@@ -282,7 +282,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
 
     logDebug('managerClient.attach.success', {
       activeTabId: response.payload.activeTabId,
-      sessionId: options.sessionId,
+      projectId: options.projectId,
       tabs: response.payload.tabs.length,
     })
     return response.payload
@@ -293,7 +293,7 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
   ): Promise<void> {
     logDebug('managerClient.createTab', {
       command: options.command,
-      sessionId: options.sessionId,
+      projectId: options.projectId,
       tabId: options.tabId,
       title: options.title,
     })
@@ -309,79 +309,79 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
     return this.sendExpectOk({ id: crypto.randomUUID(), payload, type: 'createTab' })
   }
 
-  async write(sessionId: string, tabId: string, data: string): Promise<void> {
+  async write(projectId: string, tabId: string, data: string): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
-      payload: { data, sessionId, tabId },
+      payload: { data, projectId, tabId },
       type: 'write',
     })
   }
 
   async updateTabMetadata(
-    sessionId: string,
+    projectId: string,
     tabId: string,
     patch: { title?: string; autoRenameStatus?: 'eligible' | 'attempted' }
   ): Promise<void> {
     if (!this.serverCapabilities.has(MANAGER_CAPABILITY_TAB_METADATA)) return
     return this.sendExpectOk({
       id: crypto.randomUUID(),
-      payload: { ...patch, sessionId, tabId },
+      payload: { ...patch, projectId, tabId },
       type: 'updateTabMetadata',
     })
   }
 
-  async resize(sessionId: string, cols: number, rows: number): Promise<void> {
+  async resize(projectId: string, cols: number, rows: number): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
-      payload: { cols, rows, sessionId },
+      payload: { cols, projectId, rows },
       type: 'resizeClient',
     })
   }
 
-  async resizeTab(sessionId: string, tabId: string, cols: number, rows: number): Promise<void> {
+  async resizeTab(projectId: string, tabId: string, cols: number, rows: number): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
-      payload: { cols, rows, sessionId, tabId },
+      payload: { cols, projectId, rows, tabId },
       type: 'resizeTab',
     })
   }
 
-  async scroll(sessionId: string, tabId: string, deltaLines: number): Promise<void> {
+  async scroll(projectId: string, tabId: string, deltaLines: number): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
-      payload: { deltaLines, sessionId, tabId },
+      payload: { deltaLines, projectId, tabId },
       type: 'scroll',
     })
   }
 
-  async scrollToBottom(sessionId: string, tabId: string): Promise<void> {
+  async scrollToBottom(projectId: string, tabId: string): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
-      payload: { sessionId, tabId },
+      payload: { projectId, tabId },
       type: 'scrollToBottom',
     })
   }
 
-  async setActiveTab(sessionId: string, tabId: string | null): Promise<void> {
+  async setActiveTab(projectId: string, tabId: string | null): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
-      payload: { sessionId, tabId },
+      payload: { projectId, tabId },
       type: 'setActiveTab',
     })
   }
 
-  async closeTab(sessionId: string, tabId: string): Promise<void> {
+  async closeTab(projectId: string, tabId: string): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
-      payload: { sessionId, tabId },
+      payload: { projectId, tabId },
       type: 'closeTab',
     })
   }
 
-  async disposeSession(sessionId: string): Promise<void> {
+  async disposeSession(projectId: string): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
-      payload: { sessionId },
+      payload: { projectId },
       type: 'disposeSession',
     })
   }

package/src/terminal-manager/terminal-manager.ts

@@ -95,23 +95,23 @@ export async function runTerminalManager(): Promise<void> {
   // attached — re-evaluate idle state in that case too.
   sessionManager.on('exit', () => scheduleIdleExitIfApplicable())
 
-  sessionManager.on('render', (sessionId, tabId, viewport, terminalModes) => {
+  sessionManager.on('render', (projectId, tabId, viewport, terminalModes) => {
     const event: ManagerEvent = {
-      payload: { sessionId, tabId, terminalModes, viewport },
+      payload: { projectId, tabId, terminalModes, viewport },
       type: 'tabRender',
     }
     for (const socket of sockets) {
       send(socket, event)
     }
   })
-  sessionManager.on('exit', (sessionId, tabId, exitCode) => {
-    const event: ManagerEvent = { payload: { exitCode, sessionId, tabId }, type: 'tabExit' }
+  sessionManager.on('exit', (projectId, tabId, exitCode) => {
+    const event: ManagerEvent = { payload: { exitCode, projectId, tabId }, type: 'tabExit' }
     for (const socket of sockets) {
       send(socket, event)
     }
   })
-  sessionManager.on('error', (sessionId, tabId, message) => {
-    const event: ManagerEvent = { payload: { message, sessionId, tabId }, type: 'tabError' }
+  sessionManager.on('error', (projectId, tabId, message) => {
+    const event: ManagerEvent = { payload: { message, projectId, tabId }, type: 'tabError' }
     for (const socket of sockets) {
       send(socket, event)
     }
@@ -154,9 +154,9 @@ export async function runTerminalManager(): Promise<void> {
               case 'attachSession': {
                 logDebug('terminalManager.request.attach.start', {
                   cols: message.payload.cols,
+                  projectId: message.payload.projectId,
                   rows: message.payload.rows,
-                  sessionId: message.payload.sessionId,
-                  snapshotTabs: message.payload.workspaceSnapshot?.tabs.length ?? 0,
+                  snapshotTabs: message.payload.projectSnapshot?.tabs.length ?? 0,
                 })
                 const negotiatedVersion = requireNegotiatedVersion(socket, negotiatedVersions)
                 if (message.payload.protocolVersion !== negotiatedVersion) {
@@ -165,13 +165,13 @@ export async function runTerminalManager(): Promise<void> {
                   )
                 }
                 sessionManager.resize(
-                  message.payload.sessionId,
+                  message.payload.projectId,
                   message.payload.cols,
                   message.payload.rows
                 )
                 const attachResult = sessionManager.attachSession(
-                  message.payload.sessionId,
-                  message.payload.workspaceSnapshot
+                  message.payload.projectId,
+                  message.payload.projectSnapshot
                 )
                 send(socket, {
                   id: message.id,
@@ -180,7 +180,7 @@ export async function runTerminalManager(): Promise<void> {
                 })
                 logDebug('terminalManager.request.attach.success', {
                   activeTabId: attachResult.activeTabId,
-                  sessionId: message.payload.sessionId,
+                  projectId: message.payload.projectId,
                   tabs: attachResult.tabs.length,
                 })
                 break
@@ -189,21 +189,21 @@ export async function runTerminalManager(): Promise<void> {
                 requireNegotiatedVersion(socket, negotiatedVersions)
                 logDebug('terminalManager.request.createTab.start', {
                   command: message.payload.command,
-                  sessionId: message.payload.sessionId,
+                  projectId: message.payload.projectId,
                   tabId: message.payload.tabId,
                   title: message.payload.title,
                 })
-                sessionManager.createTab(message.payload.sessionId, message.payload)
+                sessionManager.createTab(message.payload.projectId, message.payload)
                 sendOk(socket, message.id)
                 logDebug('terminalManager.request.createTab.success', {
-                  sessionId: message.payload.sessionId,
+                  projectId: message.payload.projectId,
                   tabId: message.payload.tabId,
                 })
                 break
               case 'write':
                 requireNegotiatedVersion(socket, negotiatedVersions)
                 sessionManager.write(
-                  message.payload.sessionId,
+                  message.payload.projectId,
                   message.payload.tabId,
                   message.payload.data
                 )
@@ -212,7 +212,7 @@ export async function runTerminalManager(): Promise<void> {
               case 'updateTabMetadata':
                 requireNegotiatedVersion(socket, negotiatedVersions)
                 sessionManager.updateTabMetadata(
-                  message.payload.sessionId,
+                  message.payload.projectId,
                   message.payload.tabId,
                   message.payload
                 )
@@ -221,7 +221,7 @@ export async function runTerminalManager(): Promise<void> {
               case 'resizeClient': {
                 requireNegotiatedVersion(socket, negotiatedVersions)
                 sessionManager.resize(
-                  message.payload.sessionId,
+                  message.payload.projectId,
                   message.payload.cols,
                   message.payload.rows
                 )
@@ -231,7 +231,7 @@ export async function runTerminalManager(): Promise<void> {
               case 'resizeTab':
                 requireNegotiatedVersion(socket, negotiatedVersions)
                 sessionManager.resizeTab(
-                  message.payload.sessionId,
+                  message.payload.projectId,
                   message.payload.tabId,
                   message.payload.cols,
                   message.payload.rows
@@ -241,7 +241,7 @@ export async function runTerminalManager(): Promise<void> {
               case 'scroll':
                 requireNegotiatedVersion(socket, negotiatedVersions)
                 sessionManager.scroll(
-                  message.payload.sessionId,
+                  message.payload.projectId,
                   message.payload.tabId,
                   message.payload.deltaLines
                 )
@@ -249,22 +249,22 @@ export async function runTerminalManager(): Promise<void> {
                 break
               case 'scrollToBottom':
                 requireNegotiatedVersion(socket, negotiatedVersions)
-                sessionManager.scrollToBottom(message.payload.sessionId, message.payload.tabId)
+                sessionManager.scrollToBottom(message.payload.projectId, message.payload.tabId)
                 sendOk(socket, message.id)
                 break
               case 'setActiveTab':
                 requireNegotiatedVersion(socket, negotiatedVersions)
-                sessionManager.setActiveTab(message.payload.sessionId, message.payload.tabId)
+                sessionManager.setActiveTab(message.payload.projectId, message.payload.tabId)
                 sendOk(socket, message.id)
                 break
               case 'closeTab':
                 requireNegotiatedVersion(socket, negotiatedVersions)
-                sessionManager.closeTab(message.payload.sessionId, message.payload.tabId)
+                sessionManager.closeTab(message.payload.projectId, message.payload.tabId)
                 sendOk(socket, message.id)
                 break
               case 'disposeSession':
                 requireNegotiatedVersion(socket, negotiatedVersions)
-                sessionManager.disposeSession(message.payload.sessionId)
+                sessionManager.disposeSession(message.payload.projectId)
                 sendOk(socket, message.id)
                 break
               case 'ping':

package/src/ui/components/git/git-panel.tsx

@@ -29,7 +29,7 @@ interface GitPanelProps {
   pathConfig?: GitPanePathConfig
   diffCountConfig?: GitPaneDiffCountConfig
   headOffset?: number
-  // When set, the single changed-files section is a worktree fork-point review
+  // When set, the single changed-files section is a workspace fork-point review
   // ("vs <base>") rather than a HEAD~N history walk.
   baseLabel?: string
   compact?: boolean
@@ -361,7 +361,7 @@ function computeStatusPlaceholder(
 ): StatusPlaceholder | null {
   const t = getCurrentTheme()
   if (!hasProjectPath) {
-    return { label: 'No active session', labelColor: t.textMuted }
+    return { label: 'No active project', labelColor: t.textMuted }
   }
   if (gitPanel.error === 'not-a-repo') {
     return { label: 'Not a git repository', labelColor: t.textMuted }

package/src/ui/components/git/git-view.tsx

@@ -15,14 +15,14 @@ import { useRepoDiscovery } from '../../../git/use-repo-discovery'
 import { useAppStore } from '../../../state/app-store'
 import { dispatchGlobal } from '../../../state/dispatch-ref'
 import { getSelectedGitFile, gitFileKey } from '../../../state/git-tree'
-import { getActiveWorktree, getSessionProjectPath } from '../../../state/session-worktrees'
+import { getActiveWorkspace, getActiveWorkspacePath } from '../../../state/project-workspaces'
 import { setGitDiffScroller } from '../../git-view-controls'
+import { formatBytes } from '../../terminal-graphics/dimensions'
 import { useTheme } from '../../theme'
 import { PierreDiff, type PierreDiffHandle } from './diff-renderer'
 import { useDiffPrefetch } from './diff-renderer/use-diff-prefetch'
 import { GitPanel } from './git-panel'
 import { ImageDiffView } from './image-diff'
-import { formatBytes } from './image-diff/dimensions'
 import { GitPaneHeader } from './pane/git-pane-header'
 
 interface DiffStageProps {
@@ -131,23 +131,23 @@ export const GitView = memo(function GitView({ themeId }: GitViewProps) {
   const gitPane = useAppStore((s) => s.gitPane)
   const gitPanel = useAppStore((s) => s.gitPanel)
   const gitMode = useAppStore((s) => s.gitMode)
-  const currentSessionId = useAppStore((s) => s.currentSessionId)
-  const sessions = useAppStore((s) => s.sessions)
+  const currentProjectId = useAppStore((s) => s.currentProjectId)
+  const projects = useAppStore((s) => s.projects)
   const focusMode = useAppStore((s) => s.focusMode)
   const diffRef = useRef<PierreDiffHandle | null>(null)
 
-  const currentSession =
-    currentSessionId != null && currentSessionId !== ''
-      ? sessions.find((s) => s.id === currentSessionId)
+  const currentProject =
+    currentProjectId != null && currentProjectId !== ''
+      ? projects.find((s) => s.id === currentProjectId)
       : undefined
-  const projectPath = getSessionProjectPath(currentSession)
+  const projectPath = getActiveWorkspacePath(currentProject)
 
-  // Review-vs-base: when toggled on for a worktree that records a baseRef,
+  // Review-vs-base: when toggled on for a workspace that records a baseRef,
   // resolve the fork point and diff the working tree against it.
-  const activeWorktree = getActiveWorktree(currentSession)
+  const activeWorkspace = getActiveWorkspace(currentProject)
   const reviewBaseRef =
-    gitMode.reviewBase && activeWorktree?.baseRef != null && activeWorktree.baseRef !== ''
-      ? activeWorktree.baseRef
+    gitMode.reviewBase && activeWorkspace?.baseRef != null && activeWorkspace.baseRef !== ''
+      ? activeWorkspace.baseRef
       : null
   const [compareRef, setCompareRef] = useState<string | undefined>(undefined)
   useEffect(() => {

package/src/ui/components/git/image-diff/image-diff-view.tsx

@@ -8,8 +8,8 @@ import {
   isInsideTmux,
   terminalLabel,
 } from '../../../terminal-graphics/capabilities'
+import { formatBytes, readImageDimensions } from '../../../terminal-graphics/dimensions'
 import { useTheme } from '../../../theme'
-import { formatBytes, readImageDimensions } from './dimensions'
 import { TerminalImagePane } from './terminal-image-pane'
 
 interface ImageDiffViewProps {

package/src/ui/components/git/pane/git-pane-widget.tsx

@@ -6,7 +6,7 @@ import { useGitPanelPolling } from '../../../../git/git-poller'
 import { usePrStatusPolling } from '../../../../git/pr-status-poller'
 import { useRepoDiscovery } from '../../../../git/use-repo-discovery'
 import { useAppStore } from '../../../../state/app-store'
-import { getSessionProjectPath } from '../../../../state/session-worktrees'
+import { getActiveWorkspacePath } from '../../../../state/project-workspaces'
 import { GitPanel } from '../git-panel'
 import { GitPaneHeader, type GitPaneTab } from './git-pane-header'
 import { PrChecksPanel } from './pr-checks-panel'
@@ -26,13 +26,13 @@ export const GitPaneWidget = memo(function GitPaneWidget({
   const treeCompaction = useAppStore((s) => s.gitPane.treeCompaction)
   const pathConfig = useAppStore((s) => s.gitPane.path)
   const diffCountConfig = useAppStore((s) => s.gitPane.diffCount)
-  const currentSessionId = useAppStore((s) => s.currentSessionId)
-  const sessions = useAppStore((s) => s.sessions)
-  const currentSession =
-    currentSessionId != null && currentSessionId !== ''
-      ? sessions.find((s) => s.id === currentSessionId)
+  const currentProjectId = useAppStore((s) => s.currentProjectId)
+  const projects = useAppStore((s) => s.projects)
+  const currentProject =
+    currentProjectId != null && currentProjectId !== ''
+      ? projects.find((s) => s.id === currentProjectId)
       : undefined
-  const projectPath = getSessionProjectPath(currentSession)
+  const projectPath = getActiveWorkspacePath(currentProject)
 
   const [tab, setTab] = useState<GitPaneTab>('files')