@brimveyn/aimux 1.23.6 → 1.23.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.23.6",
+  "version": "1.23.7",
   "description": "A terminal multiplexer for AI CLIs. Run Claude, Codex, OpenCode, Kimi side-by-side with tabbed navigation, split panes, and persistent sessions.",
   "keywords": [
     "ai",

package/src/app-runtime/tab-actions.ts

@@ -10,6 +10,7 @@ import {
   getAssistantOption,
   isCommandAvailable,
   parseCommand,
+  stripInjectedSessionArgs,
 } from '../pty/command-registry'
 import { createTerminalBounds } from '../state/layout-resize'
 import {
@@ -116,6 +117,11 @@ export function startTabSession(
   ctx.startStartupGrace(tab.id, STARTUP_GRACE_MS)
 
   const { args, executable } = parseCommand(tab.command)
+  // `tab.command` is not always the string this client wrote: a hydrate from the
+  // daemon (or a snapshot taken after one) hands back the whole argv of the last
+  // spawn, session flags included. Strip ours back out before adding this
+  // spawn's, or claude exits on the duplicate and takes the tab with it.
+  const baseArgs = stripInjectedSessionArgs(tab.assistant, ctx.state.customCommands, args)
   // Ahead of `extraArgs` because that is where an initial prompt goes, and the
   // prompt is positional — a flag after it would be read as part of it.
   const sessionArgs =
@@ -134,7 +140,7 @@ export function startTabSession(
   }
 
   backend.createSession({
-    args: [...args, ...sessionArgs, ...(extraArgs ?? [])],
+    args: [...baseArgs, ...sessionArgs, ...(extraArgs ?? [])],
     assistant: tab.assistant,
     autoRenameCandidate,
     cols,

package/src/pty/command-registry.ts

@@ -251,6 +251,41 @@ export function buildAssistantSessionArgs(
     : option.session.buildSessionArgs(sessionId)
 }
 
+const SESSION_FLAG = /^(?:-r|--resume|--session-id)$/
+const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+
+/**
+ * Drop the session flags an earlier spawn left inside `tab.command`.
+ *
+ * The daemon stores its tabs as `[command, ...args].join(' ')`, so a client that
+ * hydrated from it — or a snapshot written by one — carries this tab's own
+ * `--session-id <uuid>` in the string the next spawn parses. Re-spawning that
+ * verbatim is `Error: Session ID … is already in use`, and an exiting PTY takes
+ * the tab with it.
+ *
+ * Only a uuid-shaped value is ours, and only when the user's own custom command
+ * does not declare that flag — a `--resume` they wrote themselves is theirs to
+ * keep, and `buildAssistantSessionArgs` already stands aside for it.
+ */
+export function stripInjectedSessionArgs(
+  assistant: AssistantId,
+  customCommands: Record<string, string>,
+  args: string[]
+): string[] {
+  const custom = customCommands[assistant] ?? ''
+  if (/(^|\s)(-r|--resume|--session-id|--continue|-c)(\s|$)/.test(custom)) return args
+  const kept: string[] = []
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i] as string
+    if (SESSION_FLAG.test(arg) && UUID.test(args[i + 1] ?? '')) {
+      i++
+      continue
+    }
+    kept.push(arg)
+  }
+  return kept
+}
+
 export function isCommandAvailable(command: string): boolean {
   return Bun.which(command) !== null
 }

package/src/state/project-persistence.ts

@@ -106,6 +106,21 @@ function pruneOrphanedTabs(
   )
 }
 
+/**
+ * Recover a session id a snapshot lost. Until the client stopped adopting the
+ * daemon's tabs wholesale, `sessionId` was wiped on every attach while the
+ * daemon's argv echo left the uuid sitting in `command` — so the conversation
+ * these tabs own is still recoverable from the very string that broke them.
+ *
+ * ponytail: a migration, not a mechanism. Delete it once no snapshot in the
+ * wild predates the fix.
+ */
+function recoverSessionId(command: string): string | undefined {
+  return /(?:^|\s)(?:-r|--resume|--session-id)\s+([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(?:\s|$)/i.exec(
+    command
+  )?.[1]
+}
+
 export function restoreTabsFromProject(
   snapshot: ProjectSnapshotV1 | undefined,
   options: RestoreOptions = {}
@@ -130,7 +145,7 @@ export function restoreTabsFromProject(
       errorMessage: tab.errorMessage,
       exitCode: tab.exitCode,
       id: tab.id,
-      sessionId: tab.sessionId,
+      sessionId: tab.sessionId ?? recoverSessionId(tab.command),
       status: forceDisconnected ? getDisconnectedStatus(tab.status) : tab.status,
       terminalModes: tab.terminalModes,
       title: tab.title,

package/src/state/reducers/tab-state.ts

@@ -357,7 +357,18 @@ export function reduceTabState(state: AppState, action: AppAction): AppState | n
         state.currentProjectId != null && state.currentProjectId !== ''
           ? state.projects.find((s) => s.id === state.currentProjectId)
           : undefined
-      const visibleForWorkspace = filterTabsForActiveWorkspace(action.tabs, currentProject)
+      // The daemon rebuilds `command` as `[command, ...args].join(' ')` and has
+      // no `sessionId` on the wire at all. Adopting its tabs wholesale bakes this
+      // spawn's `--session-id <uuid>` into the string the *next* spawn parses —
+      // claude exits on "Session ID … is already in use" and takes the tab with
+      // it — and drops the id the resume depends on. Both fields belong to the
+      // client, so keep what it already holds for the tabs it knows.
+      const ownedById = new Map(state.tabs.map((entry) => [entry.id, entry]))
+      const hydratedTabs = action.tabs.map((entry) => {
+        const owned = ownedById.get(entry.id)
+        return owned ? { ...entry, command: owned.command, sessionId: owned.sessionId } : entry
+      })
+      const visibleForWorkspace = filterTabsForActiveWorkspace(hydratedTabs, currentProject)
       const visibleIds = new Set(visibleForWorkspace.map((t) => t.id))
       const hydratedActiveTabId =
         action.activeTabId != null &&
@@ -365,7 +376,7 @@ export function reduceTabState(state: AppState, action: AppAction): AppState | n
         visibleIds.has(action.activeTabId)
           ? action.activeTabId
           : (visibleForWorkspace[0]?.id ?? null)
-      const tabIds = new Set(action.tabs.map((t) => t.id))
+      const tabIds = new Set(hydratedTabs.map((t) => t.id))
 
       // Restore from new multi-tree format or migrate from legacy single tree
       const hydratedTrees: Record<string, LayoutNode> = {}
@@ -402,7 +413,7 @@ export function reduceTabState(state: AppState, action: AppAction): AppState | n
           focusMode: 'navigation',
           layoutTrees: hydratedTrees,
           tabGroupMap: hydratedGroupMap,
-          tabs: normalizeGroupedTabOrder(action.tabs, hydratedTrees, hydratedGroupMap),
+          tabs: normalizeGroupedTabOrder(hydratedTabs, hydratedTrees, hydratedGroupMap),
         },
         hydratedActiveTabId,
         { onlyIfMissing: true }

package/src/ui/components/git/pane/pr-checks-panel.tsx

@@ -291,9 +291,14 @@ export const PrChecksPanel = memo(function PrChecksPanel({
               No checks
             </text>
           ) : (
-            checks.map((check) => (
+            // GitHub can list the same workflow/name twice (a job that ran on
+            // both `push` and `pull_request`), so the pair is not a unique key
+            // and the duplicate crashes the reconciler. The rows hold no state
+            // and the list is the API's own order, so the index is the key.
+            checks.map((check, i) => (
               <CheckRow
-                key={`${check.workflow}/${check.name}`}
+                // oxlint-disable-next-line no-array-index-key
+                key={`${i}:${check.workflow}/${check.name}`}
                 bg={bg}
                 check={check}
                 showWorkflow={innerWidth >= WORKFLOW_MIN_WIDTH}