feat(multi-account): new-session account picker + claude tab completion (Batch 2c-lite) #126
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -461,10 +461,25 @@ and **(d)** for CodeV, backed by the same `projectMap` in the registry so both a | |
| real `.app` location in the registry (`appPath`) on every launch and refreshes | ||
| accounts.sh, so app moves and generator updates self-heal. CLI is tsc-compiled | ||
| into `resources/cli` (extraResource) at build time. | ||
| - *2c-lite (✅, branch `feat/new-session-account-picker`):* NEW-session account | ||
| picker — ⌥⌘+Enter on a project opens a picker (⌘+Enter unchanged → global | ||
|
grimmerk marked this conversation as resolved.
|
||
| default; single-account setups never see it); launches with explicit | ||
| `CLAUDE_CONFIG_DIR` + `command claude`. Cross-account *resume* (the other half | ||
| of §6.G) stays deferred to Batch 3 as explicit copy-fork — a transcript lives in | ||
| its own account's projects dir, so "resume under another account" must copy, never | ||
| link. "This repo always opens under X" belongs to 2d's projectMap. | ||
| - *2d — ❌ dropped (2026-07-10):* pyenv-style folder auto-switch (§6.H). Rationale: | ||
| in practice one folder hosts sessions from MULTIPLE accounts (we test exactly this | ||
| way), so a folder→account default would guess wrong precisely where the account | ||
| choice matters; stacking a third decision layer (global default → folder default → | ||
| picker) adds "why did bare claude open work here?" confusion for thin value. The | ||
| need is covered by 2e (global default) + 2c-lite (explicit per-launch picker). | ||
| Technically it was feasible (a default, not a constraint — resume always follows | ||
| the session's own account); dropped on value, not feasibility. | ||
| - *2e — ✅ shipped with 2a (PR #123, v1.0.77):* configurable global-default — | ||
|
There was a problem hiding this comment. P2: The 2e description overstates that all 'CodeV resume/launch' operations bypass the dispatcher. In fact, bare ⌘+Enter (no explicit account label) continues to use 'claude', routed through the accounts.sh dispatcher to respect the configurable global default. Only explicit account picks/resumes use 'command claude' to bypass the dispatcher. The wording should be narrowed to 'explicit account resume/launch' to avoid implying the default path also bypasses the dispatcher. Prompt for AI agents |
||
| `codev account default <label>` / Settings → Set default routes bare `claude` | ||
| through the dispatcher `*)` to the chosen account; CodeV resume/launch bypass the | ||
| dispatcher with `command claude` so explicit account choices can't be re-routed. | ||
| - **Batch 3 — later:** cross-account symlink reuse of global files | ||
| (CLAUDE.md / skills / commands / plugins / settings, §5). | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "name": "CodeV", | ||
| "productName": "CodeV", | ||
| "version": "1.0.80", | ||
| "description": "Quick switcher for VS Code, Cursor, and Claude Code sessions", | ||
| "repository": { | ||
| "type": "git", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,11 @@ import * as path from 'path'; | |
| import * as os from 'os'; | ||
| import * as fs from 'fs'; | ||
| import { getCurrentIDEBundleId } from './vscode-based-ide-utility'; | ||
| import { | ||
| getScannableAccounts, | ||
| getProjectsDir, | ||
| getAccountByLabel, | ||
| } from './accounts'; | ||
|
|
||
| export interface ClaudeSession { | ||
| sessionId: string; | ||
|
|
@@ -1389,6 +1393,7 @@ export const launchNewClaudeSession = ( | |
| projectPath: string, | ||
| terminalApp: string = 'iterm2', | ||
| terminalMode: string = 'tab', | ||
| accountLabel?: string, | ||
| ): void => { | ||
| if (terminalApp === 'vscode') { | ||
| const { execFile } = require('child_process'); | ||
|
|
@@ -1411,12 +1416,33 @@ export const launchNewClaudeSession = ( | |
| return; | ||
| } | ||
| if (terminalApp === 'codev') { | ||
| // Embedded terminal spawns the user's shell; the account override isn't | ||
| // threaded through it yet (the 2c-lite picker targets external terminals). | ||
| if (accountLabel) { | ||
| console.log( | ||
| '[launchNewClaudeSession] account override ignored for codev terminal:', | ||
| accountLabel, | ||
| ); | ||
| } | ||
| if (launchInCodevTerminalCallback) { | ||
| launchInCodevTerminalCallback(projectPath); | ||
| } | ||
| return; | ||
| } | ||
| // No accountLabel: bare `claude` → the accounts.sh dispatcher → the user's | ||
| // global default (2e). With an explicit account (2c-lite picker): bypass the | ||
| // dispatcher via `command claude` + explicit env, like buildResumeCommand. | ||
| let claudeCmd = 'claude'; | ||
| if (accountLabel) { | ||
| const account = getAccountByLabel(accountLabel); | ||
| claudeCmd = account?.configDirEnv | ||
| ? `CLAUDE_CONFIG_DIR='${account.configDirEnv.replace(/'/g, "'\\''")}' command claude` | ||
| : 'command claude'; | ||
| } | ||
| // Pass claudeCmd as the 2nd arg too — Ghostty/cmux build their launch | ||
| // scripts from it (iTerm2/Terminal.app use fullCommand), so the account | ||
| // env prefix must be present in both. | ||
| runCommandInTerminal(`cd "${projectPath}" && ${claudeCmd}`, claudeCmd, projectPath, terminalApp, terminalMode); | ||
|
There was a problem hiding this comment. P1: When Additionally, the default-account branch uses bare Prompt for AI agents |
||
| }; | ||
|
|
||
| /** | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -142,13 +142,24 @@ describe('generateAccountsSh', () => { | |
| expect(sh).toContain('_codev() {'); | ||
| expect(sh).toContain('compdef _codev codev'); | ||
| expect(sh).toContain( | ||
| 'compadd list add default remove rm rename regenerate show install uninstall help', | ||
| ); | ||
| expect(sh).toContain('default|rename) compadd personal work ;;'); | ||
| // anchor (personal) is not removable | ||
| expect(sh).toContain('remove|rm) compadd work ;;'); | ||
| }); | ||
|
|
||
| it('completes account labels for `claude <TAB>` without clobbering', () => { | ||
| // Works even without appPath — the dispatcher exists whenever accounts do. | ||
| const sh = generateAccountsSh(reg()); | ||
| expect(sh).toContain('_claude_codev_accounts() {'); | ||
| expect(sh).toContain('compadd personal work'); | ||
| // polite registration: only when nothing else completes `claude` | ||
| expect(sh).toContain('[ -z "${_comps[claude]:-}" ]'); | ||
| // non-label positions keep the default file completion | ||
| expect(sh).toContain('_files'); | ||
| }); | ||
|
|
||
| it('uses the recorded appExec so a renamed .app bundle still works', () => { | ||
| const sh = generateAccountsSh( | ||
| reg({ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -331,11 +331,11 @@ export function generateAccountsSh(reg: Registry): string { | |||||
| L.push(' compadd account'); | ||||||
| L.push(' elif (( CURRENT == 3 )) && [ "${words[2]}" = "account" ]; then'); | ||||||
| L.push( | ||||||
| ' compadd list add default remove rm rename regenerate show install uninstall help', | ||||||
| ); | ||||||
| L.push(' elif (( CURRENT == 4 )) && [ "${words[2]}" = "account" ]; then'); | ||||||
| L.push(' case "${words[3]}" in'); | ||||||
| if (allLabels) L.push(` default|rename) compadd ${allLabels} ;;`); | ||||||
| if (removable) L.push(` remove|rm) compadd ${removable} ;;`); | ||||||
| L.push(' esac'); | ||||||
| L.push(' fi'); | ||||||
|
|
@@ -346,6 +346,29 @@ export function generateAccountsSh(reg: Registry): string { | |||||
| L.push(' compdef _codev codev'); | ||||||
| L.push('fi'); | ||||||
| } | ||||||
| // Account-label completion for the `claude <label>` dispatcher. Registered | ||||||
| // only when nothing else completes `claude` (checked via _comps), so an | ||||||
| // official Claude Code completion — if one ever ships — wins automatically. | ||||||
| // Independent of appPath — the dispatcher exists whenever accounts do. | ||||||
| const allLabelsForClaude = accounts.map((a) => a.label).join(' '); | ||||||
| if (allLabelsForClaude) { | ||||||
| L.push(''); | ||||||
| L.push('# Complete account names for `claude <TAB>` (labels only; native'); | ||||||
| L.push('# claude flags/subcommands still work — just not suggested).'); | ||||||
| L.push('_claude_codev_accounts() {'); | ||||||
| L.push(' if (( CURRENT == 2 )); then'); | ||||||
| L.push(` compadd ${allLabelsForClaude}`); | ||||||
|
There was a problem hiding this comment. P2: The zsh completion for Use Prompt for AI agents
Suggested change
|
||||||
| L.push(' else'); | ||||||
| L.push(' # keep the default file completion for every other position'); | ||||||
| L.push(' _files'); | ||||||
| L.push(' fi'); | ||||||
| L.push('}'); | ||||||
| L.push( | ||||||
| 'if [ -n "${ZSH_VERSION:-}" ] && (( ${+functions[compdef]} )) && [ -z "${_comps[claude]:-}" ]; then', | ||||||
| ); | ||||||
| L.push(' compdef _claude_codev_accounts claude'); | ||||||
| L.push('fi'); | ||||||
| } | ||||||
| L.push(''); | ||||||
| return L.join('\n'); | ||||||
| } | ||||||
|
|
@@ -477,6 +500,31 @@ export function removeAccount(label: string): string | undefined { | |||||
| return reassignedDefault; | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * Rename an account's label (the folder is NOT moved — `dir` is stored in the | ||||||
| * registry, so extra accounts keep working even when label ≠ folder suffix). | ||||||
| * This is also the only way to rename the anchor (~/.claude) account, whose | ||||||
| * auto-seeded "personal" label can't be changed via remove+add (the anchor is | ||||||
| * protected from removal). | ||||||
| */ | ||||||
| export function renameAccount(oldLabel: string, newLabel: string): void { | ||||||
| if (!newLabel || !LABEL_RE.test(newLabel)) { | ||||||
| throw new Error( | ||||||
| `Invalid label "${newLabel}" — use a letter followed by letters/digits/-/_`, | ||||||
| ); | ||||||
| } | ||||||
| const reg = readRegistry(); | ||||||
| const acct = reg.accounts.find((a) => a.label === oldLabel); | ||||||
| if (!acct) throw new Error(`No account "${oldLabel}"`); | ||||||
| if (reg.accounts.some((a) => a.label === newLabel)) { | ||||||
| throw new Error(`Account "${newLabel}" already exists`); | ||||||
| } | ||||||
| acct.label = newLabel; | ||||||
|
There was a problem hiding this comment. P2: Consider adding a directory-collision check in Prompt for AI agents |
||||||
| if (reg.defaultAccount === oldLabel) reg.defaultAccount = newLabel; | ||||||
| writeRegistry(reg); | ||||||
| regenerate(reg); | ||||||
| } | ||||||
|
|
||||||
| export function setDefault(label: string): void { | ||||||
| const reg = readRegistry(); | ||||||
| if (!reg.accounts.some((a) => a.label === label)) { | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,7 @@ Usage: | |
| codev account add <label> [--dir D] Register a new account (default dir ~/.claude-<label>) | ||
| codev account default <label> Set which account bare \`claude\` resolves to | ||
| codev account remove <label> Unregister an account (leaves its dir on disk) | ||
| codev account rename <old> <new> Rename an account's label (folder is not moved) | ||
| codev account regenerate Rewrite ~/.config/codev/accounts.sh from the registry | ||
| codev account show Print the generated accounts.sh (dry run, writes nothing) | ||
| codev account install Add the source line to ~/.zshrc (idempotent) | ||
|
|
@@ -102,6 +103,14 @@ function main(): number { | |
| return 0; | ||
| } | ||
|
|
||
| case 'rename': { | ||
| const [oldLabel, newLabel] = rest; | ||
| manager.renameAccount(oldLabel, newLabel); | ||
|
There was a problem hiding this comment. P3: The Prompt for AI agents |
||
| console.log(`✓ Renamed "${oldLabel}" → "${newLabel}" (folder unchanged)`); | ||
| reloadHint(); | ||
| return 0; | ||
| } | ||
|
|
||
| case 'remove': | ||
| case 'rm': { | ||
| const label = rest[0]; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -98,7 +98,7 @@ interface IElectronAPI { | |
| scanClosedVSCodeSessions: (activeSessionIds: string[]) => Promise<any[]>; | ||
| refreshSessionPreview: (sessions: any[]) => Promise<Record<string, { lastUserMessage: string; lastAssistantMessage: string }>>; | ||
| openClaudeSession: (sessionId: string, projectPath: string, isActive: boolean, activePid?: number, customTitle?: string) => void; | ||
| launchNewClaudeSession: (projectPath: string, accountLabel?: string) => void; | ||
| launchNewClaudeSessionInCodev: (projectPath: string) => void; | ||
| copyClaudeSessionCommand: (sessionId: string, projectPath: string) => void; | ||
| loadSessionEnrichment: (sessions: any[]) => Promise<{ titles: Record<string, string>; branches: Record<string, string>; prLinks: Record<string, { prNumber: number; prUrl: string }> }>; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2276,14 +2276,14 @@ ipcMain.on('open-claude-session', async (_event, sessionId: string, projectPath: | |
| openSession(sessionId, projectPath, isActive, activePid, terminalApp, terminalMode, customTitle); | ||
| }); | ||
|
|
||
| ipcMain.on('launch-new-claude-session', async (_event, projectPath: string, accountLabel?: string) => { | ||
| if (!existsSync(projectPath)) { | ||
| console.log('[launch-new-claude-session] path does not exist:', projectPath); | ||
| return; | ||
| } | ||
| const terminalApp = ((await settings.get('session-terminal-app')) || 'iterm2') as string; | ||
| const terminalMode = ((await settings.get('session-terminal-mode')) || 'tab') as string; | ||
| launchNewClaudeSession(projectPath, terminalApp, terminalMode, accountLabel); | ||
| }); | ||
|
|
||
| ipcMain.on('launch-new-claude-session-in-codev', (_event, projectPath: string) => { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P2: The changelog overstates the launch behavior for default-account selections. When the user picks the default/anchor account from the picker, the implementation intentionally omits
CLAUDE_CONFIG_DIR(falling back to barecommand claudebecause the default account's identity lives at~/.claude.json, not under aCLAUDE_CONFIG_DIR). The release note should clarify that only non-default accounts launch with explicitCLAUDE_CONFIG_DIR, or reword to avoid implying the default account behaves the same way.Prompt for AI agents