@brimveyn/aimux 1.21.0 → 1.22.2

package/src/input/modes/bridge.ts

@@ -6,18 +6,22 @@ type SupportedModalType = Exclude<ModalType, null>
 const DIRECT_FOCUS_MODE_IDS: Partial<Record<FocusMode, ModeId>> = {
   'git': 'git-mode',
   'navigation': 'navigation',
+  'settings': 'settings',
   'terminal-input': 'terminal-input',
 }
 
 const COMMAND_EDIT_MODE_IDS: Partial<Record<SupportedModalType, ModeId>> = {
-  'create-session': 'modal.create-session',
+  'create-project': 'modal.create-project',
+  'create-workspace': 'modal.create-workspace',
   'git-commit': 'modal.git-commit',
   'help': 'modal.help.filtering',
   'new-tab': 'modal.new-tab.command-edit',
+  'project-name': 'modal.project-name',
+  'project-picker': 'modal.project-picker.filtering',
   'rename-tab': 'modal.rename-tab',
-  'rename-worktree': 'modal.rename-worktree',
-  'session-name': 'modal.session-name',
-  'session-picker': 'modal.session-picker.filtering',
+  'rename-workspace': 'modal.rename-workspace',
+  'setting-text': 'modal.setting-text',
+  'settings-search': 'modal.settings-search.filtering',
   'snippet-editor': 'modal.snippet-editor',
   'snippet-picker': 'modal.snippet-picker.filtering',
   'split-picker': 'modal.split-picker',
@@ -27,9 +31,9 @@ const COMMAND_EDIT_MODE_IDS: Partial<Record<SupportedModalType, ModeId>> = {
 const MODAL_MODE_IDS: Partial<Record<SupportedModalType, ModeId>> = {
   'ai-usage': 'modal.ai-usage',
   'update-available': 'modal.update-available',
-  'worktree-delete-confirm': 'modal.worktree-delete-confirm',
-  'worktree-move': 'modal.worktree-move',
-  'worktree-move-confirm': 'modal.worktree-move-confirm',
+  'workspace-delete-confirm': 'modal.workspace-delete-confirm',
+  'workspace-move': 'modal.workspace-move',
+  'workspace-move-confirm': 'modal.workspace-move-confirm',
 }
 
 export function deriveModeId(state: AppState): ModeId {
@@ -41,8 +45,8 @@ export function deriveModeId(state: AppState): ModeId {
 
   // Overlay on top of git mode without flipping focusMode (like help) — route
   // input to the picker while it's open even though focus stays 'git'.
-  if (state.modal.type === 'worktree-move') {
-    return 'modal.worktree-move'
+  if (state.modal.type === 'workspace-move') {
+    return 'modal.workspace-move'
   }
 
   // Flash-jump overlay: same pattern — renders on top of navigation, all
@@ -60,9 +64,6 @@ export function deriveModeId(state: AppState): ModeId {
     if (state.modal.type === 'new-tab' && state.modal.editingCommand !== null) {
       return 'modal.new-tab.editing-command'
     }
-    if (state.modal.type === 'new-tab' && state.modal.worktreeDeletePrompt !== null) {
-      return 'modal.new-tab.worktree-delete-confirm'
-    }
     if (state.modal.type === 'git-commit' && state.modal.stage === 'confirm') {
       return 'modal.git-commit.confirm'
     }

package/src/input/modes/handlers/shared.ts

@@ -1,4 +1,4 @@
-import type { AppAction } from '../../../state/types'
+import type { AppAction } from '../../../state/actions'
 import type { KeyInput, KeyResult, ModeId, SideEffect } from '../types'
 
 type SelectionDelta = -1 | 1

package/src/input/modes/transitions.ts

@@ -1,51 +1,64 @@
 import type { ModeId } from './types'
 
 const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
-  'git-mode': ['navigation', 'modal.git-commit', 'modal.worktree-move'],
+  'git-mode': ['navigation', 'modal.git-commit', 'modal.workspace-move'],
   'modal.ai-usage': ['navigation', 'terminal-input'],
-  'modal.create-session': ['navigation', 'modal.session-picker.filtering'],
+  'modal.create-project': ['navigation', 'modal.project-picker.filtering'],
+  'modal.create-workspace': ['navigation', 'terminal-input'],
   'modal.flash-jump': ['navigation'],
   'modal.git-commit': ['git-mode', 'modal.git-commit.confirm', 'modal.git-commit.generating'],
   'modal.git-commit.confirm': ['modal.git-commit', 'git-mode'],
   'modal.git-commit.generating': ['modal.git-commit', 'modal.git-commit.confirm', 'git-mode'],
   'modal.help.filtering': ['navigation'],
-  'modal.new-tab.command-edit': [
-    'navigation',
-    'modal.new-tab.editing-command',
-    'modal.new-tab.worktree-delete-confirm',
-  ],
+  'modal.new-tab.command-edit': ['navigation', 'modal.new-tab.editing-command'],
   'modal.new-tab.editing-command': ['navigation', 'modal.new-tab.command-edit'],
-  'modal.new-tab.worktree-delete-confirm': ['navigation', 'modal.new-tab.command-edit'],
+  'modal.project-name': ['modal.project-picker.filtering', 'navigation'],
+  'modal.project-picker.filtering': ['navigation', 'modal.project-name', 'modal.create-project'],
   'modal.rename-tab': ['navigation'],
-  'modal.rename-worktree': ['navigation'],
-  'modal.session-name': ['modal.session-picker.filtering', 'navigation'],
-  'modal.session-picker.filtering': ['navigation', 'modal.session-name', 'modal.create-session'],
+  'modal.rename-workspace': ['navigation'],
+  'modal.setting-text': ['settings'],
+  'modal.settings-search.filtering': ['settings'],
   'modal.snippet-editor': ['navigation', 'modal.snippet-picker.filtering'],
-  'modal.snippet-picker.filtering': ['navigation', 'modal.snippet-editor'],
+  // Both pickers are reachable from the settings screen as well as from the
+  // panes, and `returnTo` sends each one back where it came from.
+  'modal.snippet-picker.filtering': ['navigation', 'settings', 'modal.snippet-editor'],
   'modal.split-picker': ['navigation', 'terminal-input'],
-  'modal.theme-picker.filtering': ['navigation'],
+  'modal.theme-picker.filtering': ['navigation', 'settings'],
   'modal.update-available': ['navigation'],
-  'modal.worktree-delete-confirm': ['navigation'],
-  'modal.worktree-move': ['git-mode', 'navigation'],
-  'modal.worktree-move-confirm': ['navigation'],
+  'modal.workspace-delete-confirm': ['navigation'],
+  'modal.workspace-move': ['git-mode', 'navigation'],
+  'modal.workspace-move-confirm': ['navigation'],
   'navigation': [
     'terminal-input',
+    'modal.create-workspace',
     'modal.new-tab.command-edit',
     'modal.new-tab.editing-command',
-    'modal.session-picker.filtering',
+    'modal.project-picker.filtering',
     'modal.help.filtering',
     'modal.snippet-picker.filtering',
     'modal.theme-picker.filtering',
     'modal.rename-tab',
-    'modal.rename-worktree',
+    'modal.rename-workspace',
     'modal.update-available',
     'modal.ai-usage',
-    'modal.worktree-delete-confirm',
-    'modal.worktree-move-confirm',
+    'modal.workspace-delete-confirm',
+    'modal.workspace-move-confirm',
     'modal.flash-jump',
     'git-mode',
+    'settings',
+  ],
+  // The help overlay opens over settings without a transition (it leaves
+  // focusMode alone). The two pickers an action row hands over to are dispatched
+  // directly rather than through a KeyResult, but they are listed because that is
+  // what this table is for: saying where a mode can go.
+  'settings': [
+    'navigation',
+    'modal.setting-text',
+    'modal.settings-search.filtering',
+    'modal.theme-picker.filtering',
+    'modal.snippet-picker.filtering',
   ],
-  'terminal-input': ['navigation', 'modal.split-picker', 'modal.ai-usage'],
+  'terminal-input': ['navigation', 'modal.split-picker', 'modal.ai-usage', 'settings'],
 }
 
 export function isValidTransition(from: ModeId, to: ModeId): boolean {

package/src/input/modes/types.ts

@@ -1,7 +1,8 @@
 import type { KeyEvent } from '@opentui/core'
 
+import type { AppAction } from '../../state/actions'
 import type { SplitDirection } from '../../state/layout-tree'
-import type { AppAction, AppState, GitFileListMode, TabSession } from '../../state/types'
+import type { AppState, GitFileListMode, TabSession } from '../../state/types'
 
 export type ModeId =
   | 'navigation'
@@ -9,13 +10,15 @@ export type ModeId =
   | 'git-mode'
   | 'modal.new-tab.command-edit'
   | 'modal.new-tab.editing-command'
-  | 'modal.new-tab.worktree-delete-confirm'
-  | 'modal.worktree-delete-confirm'
-  | 'modal.session-picker.filtering'
-  | 'modal.session-name'
-  | 'modal.create-session'
+  | 'modal.workspace-delete-confirm'
+  | 'modal.project-picker.filtering'
+  | 'modal.project-name'
+  | 'modal.create-project'
+  | 'modal.create-workspace'
   | 'modal.rename-tab'
-  | 'modal.rename-worktree'
+  | 'modal.rename-workspace'
+  | 'modal.setting-text'
+  | 'modal.settings-search.filtering'
   | 'modal.snippet-picker.filtering'
   | 'modal.snippet-editor'
   | 'modal.theme-picker.filtering'
@@ -25,20 +28,23 @@ export type ModeId =
   | 'modal.git-commit.confirm'
   | 'modal.git-commit.generating'
   | 'modal.update-available'
-  | 'modal.worktree-move'
-  | 'modal.worktree-move-confirm'
+  | 'modal.workspace-move'
+  | 'modal.workspace-move-confirm'
   | 'modal.ai-usage'
   | 'modal.flash-jump'
+  | 'settings'
 
 export type SideEffect =
   | { type: 'quit'; state: AppState }
+  | { type: 'open-new-tab' }
   | { type: 'launch-selected-assistant' }
-  | { type: 'load-new-tab-base-branches' }
   | { type: 'edit-selected-assistant' }
-  | { type: 'confirm-selected-session' }
-  | { type: 'delete-selected-session' }
-  | { type: 'open-rename-selected-session' }
-  | { type: 'create-session'; name: string; projectPath?: string }
+  | { type: 'confirm-selected-project' }
+  | { type: 'delete-selected-project' }
+  | { type: 'open-rename-selected-project' }
+  | { type: 'create-project'; name: string; projectPath?: string }
+  | { type: 'create-workspace' }
+  | { type: 'load-create-workspace-base-branches' }
   | { type: 'close-tab'; tabId: string }
   | { type: 'restart-tab'; tab: TabSession }
   | { type: 'paste-selected-snippet' }
@@ -51,7 +57,7 @@ export type SideEffect =
   | { type: 'apply-theme'; action: 'restore' }
   | { type: 'apply-theme'; action: 'confirm' }
   | { type: 'apply-theme'; action: 'preview'; delta: 1 | -1 }
-  | { type: 'rename-session'; sessionId: string; name: string }
+  | { type: 'rename-project'; projectId: string; name: string }
   | { type: 'rename-tab'; tabId: string; title: string }
   | {
       type: 'split-pane'
@@ -71,40 +77,51 @@ export type SideEffect =
   | { type: 'git-rm'; path: string }
   | { type: 'git-commit'; title: string; body: string }
   | { type: 'git-commit-auto'; title: string; body: string }
-  | { type: 'generate-auto-commit-now'; sessionId: string }
+  | { type: 'generate-auto-commit-now'; projectId: string }
   | { type: 'git-push' }
   | { type: 'confirm-update-selection' }
-  | { type: 'switch-session-by-index'; index: number; worktreeId?: string }
+  | { type: 'switch-project-by-index'; index: number; workspaceId?: string }
   | { type: 'cycle-sidebar-item'; direction: 1 | -1 }
   | { type: 'switch-tab-by-index'; index: number }
-  | { type: 'delete-session'; sessionId: string }
+  | { type: 'delete-project'; projectId: string }
   | {
-      type: 'delete-worktree'
-      sessionId: string
-      worktreeId: string
+      type: 'delete-workspace'
+      projectId: string
+      workspaceId: string
       // Force the git worktree removal (discards uncommitted changes in the
-      // worktree). Also implies closing the worktree's tabs.
+      // workspace). Also implies closing the workspace's tabs.
       force?: boolean
-      // Close the worktree's tabs without forcing the git removal. Lets the
-      // sidebar "Remove worktree" clean up tabs (avoiding orphans) while still
-      // refusing to discard uncommitted work in a temp worktree.
+      // Close the workspace's tabs without forcing the git removal. Lets the
+      // sidebar "Remove workspace" clean up tabs (avoiding orphans) while still
+      // refusing to discard uncommitted work in a temp workspace.
       closeTabs?: boolean
     }
   | {
-      type: 'move-worktree'
-      sessionId: string
-      sourceWorktreeId: string
-      targetWorktreeId: string
+      type: 'move-workspace'
+      projectId: string
+      sourceWorkspaceId: string
+      targetWorkspaceId: string
       deleteSource?: boolean
-      // Retry flags set by the worktree-move-confirm dialog.
+      // Retry flags set by the workspace-move-confirm dialog.
       stashTarget?: boolean
       keepConflicts?: boolean
     }
-  | { type: 'load-worktree-move-stats' }
+  | { type: 'load-workspace-move-stats' }
   | { type: 'toggle-transparent' }
   | { type: 'toggle-mode' }
   | { type: 'open-file-in-editor'; path: string }
   | { type: 'open-selected-snippet-source-in-editor' }
+  | { type: 'run-setup' }
+  | { type: 'stop-setup' }
+  | { type: 'configure-setup-script'; projectId?: string }
+  | { type: 'ask-agent-for-setup-script' }
+  | { type: 'promote-setup-tab' }
+  /** Toggle a checkbox, cycle an enum, run a row's action — whatever the row is. */
+  | { type: 'activate-settings-row' }
+  | { type: 'adjust-settings-row'; delta: 1 | -1 }
+  | { type: 'reset-settings-row' }
+  | { type: 'confirm-settings-search' }
+  | { type: 'commit-setting-text'; settingId: string; value: string }
 
 export interface KeyResult {
   actions: AppAction[]

package/src/ipc/manager-protocol.ts

@@ -1,11 +1,11 @@
 import type {
+  ProjectSnapshotV1,
   TabSession,
   TerminalModeState,
   TerminalSnapshot,
-  WorkspaceSnapshotV1,
 } from '../state/types'
 
-import { isWorkspaceSnapshotV1 } from '../state/validation'
+import { isProjectSnapshotV1 } from '../state/validation'
 import {
   getProcessVersion,
   IpcProtocolError,
@@ -36,13 +36,13 @@ import {
 // v9: additive — `tabMetadata` updates titles and auto-rename state without
 // restarting PTYs. Capability-gated; MIN remains at 8.
 //
-// v10: additive — `workerName` persists a workspace-scoped orchestration
+// v10: additive — `workerName` persists a project-scoped orchestration
 // handle on tabs created through the headless worker facade.
 //
 // v11: breaking release boundary — force a fresh terminal-manager so named
 // worker metadata is guaranteed to survive daemon reattach and process swaps.
-export const MANAGER_PROTOCOL_MIN_VERSION = 11
-export const MANAGER_PROTOCOL_VERSION = 11
+export const MANAGER_PROTOCOL_MIN_VERSION = 12
+export const MANAGER_PROTOCOL_VERSION = 12
 
 /**
  * Capability strings advertised by *this* process in its `helloResult`. New
@@ -52,7 +52,7 @@ export const MANAGER_PROTOCOL_VERSION = 11
  */
 export const MANAGER_PROTOCOL_CAPABILITIES: readonly string[] = [
   'setBroadcastEnabled',
-  'createTabWorktreeId',
+  'createTabWorkspaceId',
   'tabMetadata',
   'workerMetadata',
 ]
@@ -96,10 +96,10 @@ export interface ManagerHelloResult {
 
 export interface ManagerAttachRequest {
   protocolVersion: number
-  sessionId: string
+  projectId: string
   cols: number
   rows: number
-  workspaceSnapshot?: WorkspaceSnapshotV1
+  projectSnapshot?: ProjectSnapshotV1
 }
 
 export interface ManagerAttachResult {
@@ -115,7 +115,7 @@ export type ManagerRequest =
       id: string
       type: 'createTab'
       payload: {
-        sessionId: string
+        projectId: string
         tabId: string
         assistant: TabSession['assistant']
         title: string
@@ -127,22 +127,22 @@ export type ManagerRequest =
         /** Extra env vars merged into the spawned PTY's environment. */
         env?: Record<string, string>
         /**
-         * Worktree this tab belongs to (UI grouping). Capability-gated on
-         * `createTabWorktreeId`. Pre-cap TMs silently drop the field, which
+         * Workspace this tab belongs to (UI grouping). Capability-gated on
+         * `createTabWorkspaceId`. Pre-cap TMs silently drop the field, which
          * matches the previous behaviour where every new tab had
-         * `worktreeId = undefined`.
+         * `workspaceId = undefined`.
          */
-        worktreeId?: string
+        workspaceId?: string
         workerName?: string
         autoRenameStatus?: 'eligible' | 'attempted'
       }
     }
-  | { id: string; type: 'write'; payload: { sessionId: string; tabId: string; data: string } }
+  | { id: string; type: 'write'; payload: { projectId: string; tabId: string; data: string } }
   | {
       id: string
       type: 'updateTabMetadata'
       payload: {
-        sessionId: string
+        projectId: string
         tabId: string
         title?: string
         autoRenameStatus?: 'eligible' | 'attempted'
@@ -152,7 +152,7 @@ export type ManagerRequest =
       id: string
       type: 'resizeClient'
       payload: {
-        sessionId: string
+        projectId: string
         cols: number
         rows: number
       }
@@ -161,7 +161,7 @@ export type ManagerRequest =
       id: string
       type: 'resizeTab'
       payload: {
-        sessionId: string
+        projectId: string
         tabId: string
         cols: number
         rows: number
@@ -170,16 +170,16 @@ export type ManagerRequest =
   | {
       id: string
       type: 'scrollToBottom'
-      payload: { sessionId: string; tabId: string }
+      payload: { projectId: string; tabId: string }
     }
   | {
       id: string
       type: 'scroll'
-      payload: { sessionId: string; tabId: string; deltaLines: number }
+      payload: { projectId: string; tabId: string; deltaLines: number }
     }
-  | { id: string; type: 'setActiveTab'; payload: { sessionId: string; tabId: string | null } }
-  | { id: string; type: 'closeTab'; payload: { sessionId: string; tabId: string } }
-  | { id: string; type: 'disposeSession'; payload: { sessionId: string } }
+  | { id: string; type: 'setActiveTab'; payload: { projectId: string; tabId: string | null } }
+  | { id: string; type: 'closeTab'; payload: { projectId: string; tabId: string } }
+  | { id: string; type: 'disposeSession'; payload: { projectId: string } }
   | { id: string; type: 'ping'; payload: Record<string, never> }
   | { id: string; type: 'setBroadcastEnabled'; payload: { enabled: boolean } }
 
@@ -193,14 +193,14 @@ export type ManagerEvent =
   | {
       type: 'tabRender'
       payload: {
-        sessionId: string
+        projectId: string
         tabId: string
         viewport: TerminalSnapshot
         terminalModes: TerminalModeState
       }
     }
-  | { type: 'tabExit'; payload: { sessionId: string; tabId: string; exitCode: number } }
-  | { type: 'tabError'; payload: { sessionId: string; tabId: string; message: string } }
+  | { type: 'tabExit'; payload: { projectId: string; tabId: string; exitCode: number } }
+  | { type: 'tabError'; payload: { projectId: string; tabId: string; message: string } }
 
 export type ManagerMessage = ManagerRequest | ManagerResponse | ManagerEvent
 
@@ -354,17 +354,17 @@ export function parseManagerRequest(value: unknown): ManagerRequest {
         isFiniteNumber(value.payload.protocolVersion),
         'attachSession.protocolVersion must be a number'
       )
-      assert(isString(value.payload.sessionId), 'attachSession.sessionId must be a string')
+      assert(isString(value.payload.projectId), 'attachSession.projectId must be a string')
       assert(isFiniteNumber(value.payload.cols), 'attachSession.cols must be a number')
       assert(isFiniteNumber(value.payload.rows), 'attachSession.rows must be a number')
       assert(
-        value.payload.workspaceSnapshot === undefined ||
-          isWorkspaceSnapshotV1(value.payload.workspaceSnapshot),
-        'attachSession.workspaceSnapshot must be a valid workspace snapshot'
+        value.payload.projectSnapshot === undefined ||
+          isProjectSnapshotV1(value.payload.projectSnapshot),
+        'attachSession.projectSnapshot must be a valid project snapshot'
       )
       return value as ManagerRequest
     case 'createTab':
-      assert(isString(value.payload.sessionId), 'createTab.sessionId must be a string')
+      assert(isString(value.payload.projectId), 'createTab.projectId must be a string')
       assert(isString(value.payload.tabId), 'createTab.tabId must be a string')
       assert(
         isString(value.payload.assistant) && value.payload.assistant.length > 0,
@@ -387,8 +387,8 @@ export function parseManagerRequest(value: unknown): ManagerRequest {
         'createTab.env must be a string-keyed string record'
       )
       assert(
-        value.payload.worktreeId === undefined || isString(value.payload.worktreeId),
-        'createTab.worktreeId must be a string when present'
+        value.payload.workspaceId === undefined || isString(value.payload.workspaceId),
+        'createTab.workspaceId must be a string when present'
       )
       assert(
         value.payload.workerName === undefined || isString(value.payload.workerName),
@@ -402,12 +402,12 @@ export function parseManagerRequest(value: unknown): ManagerRequest {
       )
       return value as ManagerRequest
     case 'write':
-      assert(isString(value.payload.sessionId), 'write.sessionId must be a string')
+      assert(isString(value.payload.projectId), 'write.projectId must be a string')
       assert(isString(value.payload.tabId), 'write.tabId must be a string')
       assert(isString(value.payload.data), 'write.data must be a string')
       return value as ManagerRequest
     case 'updateTabMetadata':
-      assert(isString(value.payload.sessionId), 'updateTabMetadata.sessionId must be a string')
+      assert(isString(value.payload.projectId), 'updateTabMetadata.projectId must be a string')
       assert(isString(value.payload.tabId), 'updateTabMetadata.tabId must be a string')
       assert(
         value.payload.title === undefined || isString(value.payload.title),
@@ -421,35 +421,35 @@ export function parseManagerRequest(value: unknown): ManagerRequest {
       )
       return value as ManagerRequest
     case 'resizeClient':
-      assert(isString(value.payload.sessionId), 'resizeClient.sessionId must be a string')
+      assert(isString(value.payload.projectId), 'resizeClient.projectId must be a string')
       assert(isFiniteNumber(value.payload.cols), 'resizeClient.cols must be a number')
       assert(isFiniteNumber(value.payload.rows), 'resizeClient.rows must be a number')
       return value as ManagerRequest
     case 'resizeTab':
-      assert(isString(value.payload.sessionId), 'resizeTab.sessionId must be a string')
+      assert(isString(value.payload.projectId), 'resizeTab.projectId must be a string')
       assert(isString(value.payload.tabId), 'resizeTab.tabId must be a string')
       assert(isFiniteNumber(value.payload.cols), 'resizeTab.cols must be a number')
       assert(isFiniteNumber(value.payload.rows), 'resizeTab.rows must be a number')
       return value as ManagerRequest
     case 'scroll':
-      assert(isString(value.payload.sessionId), 'scroll.sessionId must be a string')
+      assert(isString(value.payload.projectId), 'scroll.projectId must be a string')
       assert(isString(value.payload.tabId), 'scroll.tabId must be a string')
       assert(isFiniteNumber(value.payload.deltaLines), 'scroll.deltaLines must be a number')
       return value as ManagerRequest
     case 'scrollToBottom':
-      assert(isString(value.payload.sessionId), 'scrollToBottom.sessionId must be a string')
+      assert(isString(value.payload.projectId), 'scrollToBottom.projectId must be a string')
       assert(isString(value.payload.tabId), 'scrollToBottom.tabId must be a string')
       return value as ManagerRequest
     case 'setActiveTab':
-      assert(isString(value.payload.sessionId), 'setActiveTab.sessionId must be a string')
+      assert(isString(value.payload.projectId), 'setActiveTab.projectId must be a string')
       assert(isNullableString(value.payload.tabId), 'setActiveTab.tabId must be a string or null')
       return value as ManagerRequest
     case 'closeTab':
-      assert(isString(value.payload.sessionId), 'closeTab.sessionId must be a string')
+      assert(isString(value.payload.projectId), 'closeTab.projectId must be a string')
       assert(isString(value.payload.tabId), 'closeTab.tabId must be a string')
       return value as ManagerRequest
     case 'disposeSession':
-      assert(isString(value.payload.sessionId), 'disposeSession.sessionId must be a string')
+      assert(isString(value.payload.projectId), 'disposeSession.projectId must be a string')
       return value as ManagerRequest
     case 'ping':
       return value as ManagerRequest
@@ -488,18 +488,18 @@ export function parseManagerMessage(value: unknown): ManagerResponse | ManagerEv
       assert(isString(value.payload.message), 'error.message must be a string')
       return value as ManagerResponse
     case 'tabRender':
-      assert(isString(value.payload.sessionId), 'tabRender.sessionId must be a string')
+      assert(isString(value.payload.projectId), 'tabRender.projectId must be a string')
       assert(isString(value.payload.tabId), 'tabRender.tabId must be a string')
       assert(isTerminalSnapshot(value.payload.viewport), 'tabRender.viewport is invalid')
       assert(isTerminalModeState(value.payload.terminalModes), 'tabRender.terminalModes is invalid')
       return value as ManagerEvent
     case 'tabExit':
-      assert(isString(value.payload.sessionId), 'tabExit.sessionId must be a string')
+      assert(isString(value.payload.projectId), 'tabExit.projectId must be a string')
       assert(isString(value.payload.tabId), 'tabExit.tabId must be a string')
       assert(isFiniteNumber(value.payload.exitCode), 'tabExit.exitCode must be a number')
       return value as ManagerEvent
     case 'tabError':
-      assert(isString(value.payload.sessionId), 'tabError.sessionId must be a string')
+      assert(isString(value.payload.projectId), 'tabError.projectId must be a string')
       assert(isString(value.payload.tabId), 'tabError.tabId must be a string')
       assert(isString(value.payload.message), 'tabError.message must be a string')
       return value as ManagerEvent