@otto-assistant/bridge 0.4.96 → 0.4.97

package/dist/anthropic-account-identity.js

@@ -0,0 +1,62 @@
+// Helpers for extracting and normalizing Anthropic OAuth account identity.
+const identityHintKeys = new Set(['user', 'profile', 'account', 'viewer']);
+const idKeys = ['user_id', 'userId', 'account_id', 'accountId', 'id', 'sub'];
+export function normalizeAnthropicAccountIdentity(identity) {
+    const email = typeof identity?.email === 'string' && identity.email.trim()
+        ? identity.email.trim().toLowerCase()
+        : undefined;
+    const accountId = typeof identity?.accountId === 'string' && identity.accountId.trim()
+        ? identity.accountId.trim()
+        : undefined;
+    if (!email && !accountId)
+        return undefined;
+    return {
+        ...(email ? { email } : {}),
+        ...(accountId ? { accountId } : {}),
+    };
+}
+function getCandidateFromRecord(record, path) {
+    const email = typeof record.email === 'string' ? record.email : undefined;
+    const accountId = idKeys
+        .map((key) => {
+        const value = record[key];
+        return typeof value === 'string' ? value : undefined;
+    })
+        .find((value) => {
+        return Boolean(value);
+    });
+    const normalized = normalizeAnthropicAccountIdentity({ email, accountId });
+    if (!normalized)
+        return undefined;
+    const hasIdentityHint = path.some((segment) => {
+        return identityHintKeys.has(segment);
+    });
+    return {
+        ...normalized,
+        score: (normalized.email ? 4 : 0) + (normalized.accountId ? 2 : 0) + (hasIdentityHint ? 2 : 0),
+    };
+}
+function collectIdentityCandidates(value, path = []) {
+    if (!value || typeof value !== 'object')
+        return [];
+    if (Array.isArray(value)) {
+        return value.flatMap((entry) => {
+            return collectIdentityCandidates(entry, path);
+        });
+    }
+    const record = value;
+    const nested = Object.entries(record).flatMap(([key, entry]) => {
+        return collectIdentityCandidates(entry, [...path, key]);
+    });
+    const current = getCandidateFromRecord(record, path);
+    return current ? [current, ...nested] : nested;
+}
+export function extractAnthropicAccountIdentity(value) {
+    const candidates = collectIdentityCandidates(value);
+    const best = candidates.sort((a, b) => {
+        return b.score - a.score;
+    })[0];
+    if (!best)
+        return undefined;
+    return normalizeAnthropicAccountIdentity(best);
+}

package/dist/anthropic-account-identity.test.js

@@ -0,0 +1,38 @@
+// Tests Anthropic OAuth account identity parsing and normalization.
+import { describe, expect, test } from 'vitest';
+import { extractAnthropicAccountIdentity, normalizeAnthropicAccountIdentity, } from './anthropic-account-identity.js';
+describe('normalizeAnthropicAccountIdentity', () => {
+    test('normalizes email casing and drops empty values', () => {
+        expect(normalizeAnthropicAccountIdentity({
+            email: '  User@Example.com ',
+            accountId: '  user_123  ',
+        })).toEqual({
+            email: 'user@example.com',
+            accountId: 'user_123',
+        });
+        expect(normalizeAnthropicAccountIdentity({ email: '   ' })).toBeUndefined();
+    });
+});
+describe('extractAnthropicAccountIdentity', () => {
+    test('prefers nested user profile identity from client_data responses', () => {
+        expect(extractAnthropicAccountIdentity({
+            organizations: [{ id: 'org_123', name: 'Workspace' }],
+            user: {
+                id: 'usr_123',
+                email: 'User@Example.com',
+            },
+        })).toEqual({
+            accountId: 'usr_123',
+            email: 'user@example.com',
+        });
+    });
+    test('falls back to profile-style payloads without email', () => {
+        expect(extractAnthropicAccountIdentity({
+            profile: {
+                user_id: 'usr_456',
+            },
+        })).toEqual({
+            accountId: 'usr_456',
+        });
+    });
+});

package/dist/anthropic-auth-plugin.js

@@ -23,6 +23,7 @@
  * - https://github.com/badlogic/pi-mono/blob/main/packages/ai/src/providers/anthropic.ts
  */
 import { loadAccountStore, rememberAnthropicOAuth, rotateAnthropicAccount, saveAccountStore, setAnthropicAuth, shouldRotateAuth, upsertAccount, withAuthStateLock, } from './anthropic-auth-state.js';
+import { extractAnthropicAccountIdentity, } from './anthropic-account-identity.js';
 // PKCE (Proof Key for Code Exchange) using Web Crypto API.
 // Reference: https://github.com/badlogic/pi-mono/blob/main/packages/ai/src/utils/oauth/pkce.ts
 function base64urlEncode(bytes) {
@@ -52,6 +53,8 @@ const CLIENT_ID = (() => {
 })();
 const TOKEN_URL = 'https://platform.claude.com/v1/oauth/token';
 const CREATE_API_KEY_URL = 'https://api.anthropic.com/api/oauth/claude_cli/create_api_key';
+const CLIENT_DATA_URL = 'https://api.anthropic.com/api/oauth/claude_cli/client_data';
+const PROFILE_URL = 'https://api.anthropic.com/api/oauth/profile';
 const CALLBACK_PORT = 53692;
 const CALLBACK_PATH = '/callback';
 const REDIRECT_URI = `http://localhost:${CALLBACK_PORT}${CALLBACK_PATH}`;
@@ -64,6 +67,7 @@ const CLAUDE_CODE_BETA = 'claude-code-20250219';
 const OAUTH_BETA = 'oauth-2025-04-20';
 const FINE_GRAINED_TOOL_STREAMING_BETA = 'fine-grained-tool-streaming-2025-05-14';
 const INTERLEAVED_THINKING_BETA = 'interleaved-thinking-2025-05-14';
+const TOAST_SESSION_HEADER = 'x-kimaki-session-id';
 const ANTHROPIC_HOSTS = new Set([
     'api.anthropic.com',
     'claude.ai',
@@ -227,6 +231,29 @@ async function createApiKey(accessToken) {
     const json = JSON.parse(responseText);
     return { type: 'success', key: json.raw_key };
 }
+async function fetchAnthropicAccountIdentity(accessToken) {
+    const urls = [CLIENT_DATA_URL, PROFILE_URL];
+    for (const url of urls) {
+        const responseText = await requestText(url, {
+            method: 'GET',
+            headers: {
+                Accept: 'application/json',
+                authorization: `Bearer ${accessToken}`,
+                'user-agent': process.env.OPENCODE_ANTHROPIC_USER_AGENT || `claude-cli/${CLAUDE_CODE_VERSION}`,
+                'x-app': 'cli',
+            },
+        }).catch(() => {
+            return undefined;
+        });
+        if (!responseText)
+            continue;
+        const parsed = JSON.parse(responseText);
+        const identity = extractAnthropicAccountIdentity(parsed);
+        if (identity)
+            return identity;
+    }
+    return undefined;
+}
 async function startCallbackServer(expectedState) {
     return new Promise((resolve, reject) => {
         let settle;
@@ -376,12 +403,13 @@ function buildAuthorizeHandler(mode) {
             if (mode === 'apikey') {
                 return createApiKey(creds.access);
             }
+            const identity = await fetchAnthropicAccountIdentity(creds.access);
             await rememberAnthropicOAuth({
                 type: 'oauth',
                 refresh: creds.refresh,
                 access: creds.access,
                 expires: creds.expires,
-            });
+            }, identity);
             return creds;
         };
         if (!isRemote) {
@@ -395,8 +423,7 @@ function buildAuthorizeHandler(mode) {
                             const result = await waitForCallback(auth.callbackServer);
                             return await finalize(result);
                         }
-                        catch (error) {
-                            console.error(`[anthropic-auth] ${error}`);
+                        catch {
                             return { type: 'failed' };
                         }
                     })();
@@ -414,8 +441,7 @@ function buildAuthorizeHandler(mode) {
                         const result = await waitForCallback(auth.callbackServer, input);
                         return await finalize(result);
                     }
-                    catch (error) {
-                        console.error(`[anthropic-auth] ${error}`);
+                    catch {
                         return { type: 'failed' };
                     }
                 })();
@@ -577,6 +603,12 @@ function wrapResponseStream(response, reverseToolNameMap) {
         headers: response.headers,
     });
 }
+function appendToastSessionMarker({ message, sessionId, }) {
+    if (!sessionId) {
+        return message;
+    }
+    return `${message} ${sessionId}`;
+}
 // --- Beta headers ---
 function getRequiredBetas(modelId) {
     const betas = [CLAUDE_CODE_BETA, OAUTH_BETA, FINE_GRAINED_TOOL_STREAMING_BETA];
@@ -624,7 +656,19 @@ async function getFreshOAuth(getAuth, client) {
         await setAnthropicAuth(refreshed, client);
         const store = await loadAccountStore();
         if (store.accounts.length > 0) {
-            upsertAccount(store, refreshed);
+            const identity = (() => {
+                const currentIndex = store.accounts.findIndex((account) => {
+                    return account.refresh === latest.refresh || account.access === latest.access;
+                });
+                const current = currentIndex >= 0 ? store.accounts[currentIndex] : undefined;
+                if (!current)
+                    return undefined;
+                return {
+                    ...(current.email ? { email: current.email } : {}),
+                    ...(current.accountId ? { accountId: current.accountId } : {}),
+                };
+            })();
+            upsertAccount(store, { ...refreshed, ...identity });
             await saveAccountStore(store);
         }
         return refreshed;
@@ -637,6 +681,12 @@ async function getFreshOAuth(getAuth, client) {
 // --- Plugin export ---
 const AnthropicAuthPlugin = async ({ client }) => {
     return {
+        'chat.headers': async (input, output) => {
+            if (input.model.providerID !== 'anthropic') {
+                return;
+            }
+            output.headers[TOAST_SESSION_HEADER] = input.sessionID;
+        },
         auth: {
             provider: 'anthropic',
             async loader(getAuth, provider) {
@@ -668,11 +718,6 @@ const AnthropicAuthPlugin = async ({ client }) => {
                                     .text()
                                     .catch(() => undefined)
                                 : undefined;
-                        const rewritten = rewriteRequestPayload(originalBody, (msg) => {
-                            client.tui.showToast({
-                                body: { message: msg, variant: 'error' },
-                            }).catch(() => { });
-                        });
                         const headers = new Headers(init?.headers);
                         if (input instanceof Request) {
                             input.headers.forEach((v, k) => {
@@ -680,9 +725,19 @@ const AnthropicAuthPlugin = async ({ client }) => {
                                     headers.set(k, v);
                             });
                         }
+                        const sessionId = headers.get(TOAST_SESSION_HEADER) ?? undefined;
+                        const rewritten = rewriteRequestPayload(originalBody, (msg) => {
+                            client.tui.showToast({
+                                body: {
+                                    message: appendToastSessionMarker({ message: msg, sessionId }),
+                                    variant: 'error',
+                                },
+                            }).catch(() => { });
+                        });
                         const betas = getRequiredBetas(rewritten.modelId);
                         const runRequest = async (auth) => {
                             const requestHeaders = new Headers(headers);
+                            requestHeaders.delete(TOAST_SESSION_HEADER);
                             requestHeaders.set('accept', 'application/json');
                             requestHeaders.set('anthropic-beta', mergeBetas(requestHeaders.get('anthropic-beta'), betas));
                             requestHeaders.set('anthropic-dangerous-direct-browser-access', 'true');
@@ -711,7 +766,10 @@ const AnthropicAuthPlugin = async ({ client }) => {
                                     // Show toast notification so Discord thread shows the rotation
                                     client.tui.showToast({
                                         body: {
-                                            message: `Switching from account ${rotated.fromLabel} to account ${rotated.toLabel}`,
+                                            message: appendToastSessionMarker({
+                                                message: `Switching from account ${rotated.fromLabel} to account ${rotated.toLabel}`,
+                                                sessionId,
+                                            }),
                                             variant: 'info',
                                         },
                                     }).catch(() => { });

package/dist/anthropic-auth-state.js

@@ -1,6 +1,7 @@
 import * as fs from 'node:fs/promises';
 import { homedir } from 'node:os';
 import path from 'node:path';
+import { normalizeAnthropicAccountIdentity, } from './anthropic-account-identity.js';
 const AUTH_LOCK_STALE_MS = 30_000;
 const AUTH_LOCK_RETRY_MS = 100;
 async function readJson(filePath, fallback) {
@@ -80,6 +81,8 @@ export function normalizeAccountStore(input) {
             typeof account.refresh === 'string' &&
             typeof account.access === 'string' &&
             typeof account.expires === 'number' &&
+            (typeof account.email === 'undefined' || typeof account.email === 'string') &&
+            (typeof account.accountId === 'undefined' || typeof account.accountId === 'string') &&
             typeof account.addedAt === 'number' &&
             typeof account.lastUsed === 'number')
         : [];
@@ -96,8 +99,13 @@ export async function saveAccountStore(store) {
 }
 /** Short label for an account: first 8 + last 4 chars of refresh token. */
 export function accountLabel(account, index) {
+    const accountWithIdentity = account;
+    const identity = accountWithIdentity.email || accountWithIdentity.accountId;
     const r = account.refresh;
     const short = r.length > 12 ? `${r.slice(0, 8)}...${r.slice(-4)}` : r;
+    if (identity) {
+        return index !== undefined ? `#${index + 1} (${identity})` : identity;
+    }
     return index !== undefined ? `#${index + 1} (${short})` : short;
 }
 function findCurrentAccountIndex(store, auth) {
@@ -116,14 +124,29 @@ function findCurrentAccountIndex(store, auth) {
     return store.activeIndex;
 }
 export function upsertAccount(store, auth, now = Date.now()) {
+    const authWithIdentity = auth;
+    const identity = normalizeAnthropicAccountIdentity({
+        email: authWithIdentity.email,
+        accountId: authWithIdentity.accountId,
+    });
     const index = store.accounts.findIndex((account) => {
-        return account.refresh === auth.refresh || account.access === auth.access;
+        if (account.refresh === auth.refresh || account.access === auth.access) {
+            return true;
+        }
+        if (identity?.accountId && account.accountId === identity.accountId) {
+            return true;
+        }
+        if (identity?.email && account.email === identity.email) {
+            return true;
+        }
+        return false;
     });
     const nextAccount = {
         type: 'oauth',
         refresh: auth.refresh,
         access: auth.access,
         expires: auth.expires,
+        ...identity,
         addedAt: now,
         lastUsed: now,
     };
@@ -139,14 +162,16 @@ export function upsertAccount(store, auth, now = Date.now()) {
         ...existing,
         ...nextAccount,
         addedAt: existing.addedAt,
+        email: nextAccount.email || existing.email,
+        accountId: nextAccount.accountId || existing.accountId,
     };
     store.activeIndex = index;
     return index;
 }
-export async function rememberAnthropicOAuth(auth) {
+export async function rememberAnthropicOAuth(auth, identity) {
     await withAuthStateLock(async () => {
         const store = await loadAccountStore();
-        upsertAccount(store, auth);
+        upsertAccount(store, { ...auth, ...normalizeAnthropicAccountIdentity(identity) });
         await saveAccountStore(store);
     });
 }

package/dist/{anthropic-auth-plugin.test.js → anthropic-auth-state.test.js}

@@ -1,9 +1,9 @@
-// Tests for Anthropic OAuth multi-account persistence and rotation.
+// Tests Anthropic OAuth account persistence, deduplication, and rotation.
 import { mkdtemp, readFile, rm, mkdir, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import path from 'node:path';
 import { afterEach, beforeEach, describe, expect, test } from 'vitest';
-import { authFilePath, loadAccountStore, rememberAnthropicOAuth, removeAccount, rotateAnthropicAccount, saveAccountStore, shouldRotateAuth, } from './anthropic-auth-state.js';
+import { accountLabel, authFilePath, loadAccountStore, rememberAnthropicOAuth, removeAccount, rotateAnthropicAccount, saveAccountStore, shouldRotateAuth, } from './anthropic-auth-state.js';
 const firstAccount = {
     type: 'oauth',
     refresh: 'refresh-first',
@@ -45,6 +45,25 @@ describe('rememberAnthropicOAuth', () => {
             expires: 3,
         });
     });
+    test('deduplicates new tokens by email or account ID', async () => {
+        await rememberAnthropicOAuth(firstAccount, {
+            email: 'user@example.com',
+            accountId: 'usr_123',
+        });
+        await rememberAnthropicOAuth(secondAccount, {
+            email: 'User@example.com',
+            accountId: 'usr_123',
+        });
+        const store = await loadAccountStore();
+        expect(store.accounts).toHaveLength(1);
+        expect(store.accounts[0]).toMatchObject({
+            refresh: 'refresh-second',
+            access: 'access-second',
+            email: 'user@example.com',
+            accountId: 'usr_123',
+        });
+        expect(accountLabel(store.accounts[0])).toBe('user@example.com');
+    });
 });
 describe('rotateAnthropicAccount', () => {
     test('rotates to the next stored account and syncs auth state', async () => {

package/dist/cli-parsing.test.js

@@ -22,8 +22,8 @@ function createCliForIdParsing() {
         .command('add-project', 'Add a project')
         .option('-g, --guild <guildId>', 'Discord guild/server ID');
     cli.command('task delete <id>', 'Delete task');
-    cli.command('anthropic-accounts list', 'List stored Anthropic accounts').hidden();
-    cli.command('anthropic-accounts remove <index>', 'Remove stored Anthropic account').hidden();
+    cli.command('anthropic-accounts list', 'List stored Anthropic accounts');
+    cli.command('anthropic-accounts remove <indexOrEmail>', 'Remove stored Anthropic account');
     return cli;
 }
 describe('goke CLI ID parsing', () => {
@@ -113,13 +113,16 @@ describe('goke CLI ID parsing', () => {
         expect(result.args[0]).toBe(taskId);
         expect(typeof result.args[0]).toBe('string');
     });
-    test('hidden anthropic account commands still parse', () => {
+    test('anthropic account remove parses index and email as strings', () => {
         const cli = createCliForIdParsing();
-        const result = cli.parse(['node', 'kimaki', 'anthropic-accounts', 'remove', '2'], { run: false });
-        expect(result.args[0]).toBe('2');
-        expect(typeof result.args[0]).toBe('string');
+        const indexResult = cli.parse(['node', 'kimaki', 'anthropic-accounts', 'remove', '2'], { run: false });
+        const emailResult = cli.parse(['node', 'kimaki', 'anthropic-accounts', 'remove', 'user@example.com'], { run: false });
+        expect(indexResult.args[0]).toBe('2');
+        expect(typeof indexResult.args[0]).toBe('string');
+        expect(emailResult.args[0]).toBe('user@example.com');
+        expect(typeof emailResult.args[0]).toBe('string');
     });
-    test('hidden anthropic account commands are excluded from help output', () => {
+    test('anthropic account commands are included in help output', () => {
         const stdout = {
             text: '',
             write(data) {
@@ -128,10 +131,10 @@ describe('goke CLI ID parsing', () => {
         };
         const cli = goke('kimaki', { stdout: stdout });
         cli.command('send', 'Send a message');
-        cli.command('anthropic-accounts list', 'List stored Anthropic accounts').hidden();
+        cli.command('anthropic-accounts list', 'List stored Anthropic accounts');
         cli.help();
         cli.parse(['node', 'kimaki', '--help'], { run: false });
         expect(stdout.text).toContain('send');
-        expect(stdout.text).not.toContain('anthropic-accounts');
+        expect(stdout.text).toContain('anthropic-accounts');
     });
 });

package/dist/cli.js

@@ -662,7 +662,8 @@ async function resolveCredentials({ forceRestartOnboarding, forceGateway, gatewa
                 options: [
                     {
                         value: 'gateway',
-                        label: 'Gateway (pre-built Kimaki bot — no setup needed)',
+                        disabled: true,
+                        label: 'Gateway (pre-built Kimaki bot, currently disabled because of Discord verification process. will be re-enabled soon)',
                     },
                     {
                         value: 'self_hosted',
@@ -2224,7 +2225,6 @@ cli
 });
 cli
     .command('anthropic-accounts list', 'List stored Anthropic OAuth accounts used for automatic rotation')
-    .hidden()
     .action(async () => {
     const store = await loadAccountStore();
     console.log(`Store: ${accountsFilePath()}`);
@@ -2239,16 +2239,29 @@ cli
     process.exit(0);
 });
 cli
-    .command('anthropic-accounts remove <index>', 'Remove a stored Anthropic OAuth account from the rotation pool')
-    .hidden()
-    .action(async (index) => {
-    const value = Number(index);
-    if (!Number.isInteger(value) || value < 1) {
-        cliLogger.error('Usage: kimaki anthropic-accounts remove <index>');
+    .command('anthropic-accounts remove <indexOrEmail>', 'Remove a stored Anthropic OAuth account from the rotation pool by index or email')
+    .action(async (indexOrEmail) => {
+    const value = Number(indexOrEmail);
+    const store = await loadAccountStore();
+    const resolvedIndex = (() => {
+        if (Number.isInteger(value) && value >= 1) {
+            return value - 1;
+        }
+        const email = indexOrEmail.trim().toLowerCase();
+        if (!email) {
+            return -1;
+        }
+        return store.accounts.findIndex((account) => {
+            return account.email?.toLowerCase() === email;
+        });
+    })();
+    if (resolvedIndex < 0) {
+        cliLogger.error('Usage: kimaki anthropic-accounts remove <index-or-email>');
         process.exit(EXIT_NO_RESTART);
     }
-    await removeAccount(value - 1);
-    cliLogger.log(`Removed Anthropic account ${value}`);
+    const removed = store.accounts[resolvedIndex];
+    await removeAccount(resolvedIndex);
+    cliLogger.log(`Removed Anthropic account ${removed ? accountLabel(removed, resolvedIndex) : indexOrEmail}`);
     process.exit(0);
 });
 cli

package/dist/discord-command-registration.js

@@ -110,7 +110,7 @@ export async function registerCommands({ token, appId, guildIds, userCommands =
             .toJSON(),
         new SlashCommandBuilder()
             .setName('new-worktree')
-            .setDescription(truncateCommandDescription('Create a git worktree branch from origin/HEAD (or main). Optionally pick a base branch.'))
+            .setDescription(truncateCommandDescription('Create a git worktree branch from HEAD by default. Optionally pick a base branch.'))
             .addStringOption((option) => {
             option
                 .setName('name')
@@ -121,7 +121,7 @@ export async function registerCommands({ token, appId, guildIds, userCommands =
             .addStringOption((option) => {
             option
                 .setName('base-branch')
-                .setDescription(truncateCommandDescription('Branch to create the worktree from (default: origin/HEAD or main)'))
+                .setDescription(truncateCommandDescription('Branch to create the worktree from (default: HEAD)'))
                 .setRequired(false)
                 .setAutocomplete(true);
             return option;

package/dist/system-message.js

@@ -450,7 +450,7 @@ kimaki send --channel ${channelId} --prompt "your task description" --worktree w
 
 This creates a new Discord thread with an isolated git worktree and starts a session in it. The worktree name should be kebab-case and descriptive of the task.
 
-By default, worktrees are created from \`origin/HEAD\` (the remote's default branch). To change the base branch for a project, the user can run \`git remote set-head origin <branch>\` in the project directory. For example, \`git remote set-head origin dev\` makes all new worktrees branch off \`origin/dev\` instead of \`origin/main\`.
+By default, worktrees are created from \`HEAD\`, which means whatever commit or branch the current checkout is on. If you want a different base, pass \`--base-branch\` or use the slash command option explicitly.
 
 Critical recursion guard:
 - If you already are in a worktree thread, do not create another worktree unless the user explicitly asks for a nested worktree.

package/dist/system-message.test.js

@@ -217,7 +217,7 @@ describe('system-message', () => {
 
       This creates a new Discord thread with an isolated git worktree and starts a session in it. The worktree name should be kebab-case and descriptive of the task.
 
-      By default, worktrees are created from \`origin/HEAD\` (the remote's default branch). To change the base branch for a project, the user can run \`git remote set-head origin <branch>\` in the project directory. For example, \`git remote set-head origin dev\` makes all new worktrees branch off \`origin/dev\` instead of \`origin/main\`.
+      By default, worktrees are created from \`HEAD\`, which means whatever commit or branch the current checkout is on. If you want a different base, pass \`--base-branch\` or use the slash command option explicitly.
 
       Critical recursion guard:
       - If you already are in a worktree thread, do not create another worktree unless the user explicitly asks for a nested worktree.

package/dist/worktrees.js

@@ -394,39 +394,6 @@ async function validateSubmodulePointers(directory) {
     return new Error(`Submodule validation failed: ${validationIssues.join('; ')}`);
 }
 async function resolveDefaultWorktreeTarget(directory) {
-    const remoteHead = await execAsync('git symbolic-ref refs/remotes/origin/HEAD', {
-        cwd: directory,
-    }).catch(() => {
-        return null;
-    });
-    const remoteRef = remoteHead?.stdout.trim();
-    if (remoteRef?.startsWith('refs/remotes/')) {
-        return remoteRef.replace('refs/remotes/', '');
-    }
-    const hasMain = await execAsync('git show-ref --verify --quiet refs/heads/main', {
-        cwd: directory,
-    })
-        .then(() => {
-        return true;
-    })
-        .catch(() => {
-        return false;
-    });
-    if (hasMain) {
-        return 'main';
-    }
-    const hasMaster = await execAsync('git show-ref --verify --quiet refs/heads/master', {
-        cwd: directory,
-    })
-        .then(() => {
-        return true;
-    })
-        .catch(() => {
-        return false;
-    });
-    if (hasMaster) {
-        return 'master';
-    }
     return 'HEAD';
 }
 function getManagedWorktreeDirectory({ directory, name, }) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@otto-assistant/bridge",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.96",
+  "version": "0.4.97",
   "scripts": {
     "dev": "tsx src/bin.ts",
     "prepublishOnly": "pnpm generate && pnpm tsc",

package/src/anthropic-account-identity.test.ts

@@ -0,0 +1,52 @@
+// Tests Anthropic OAuth account identity parsing and normalization.
+
+import { describe, expect, test } from 'vitest'
+import {
+  extractAnthropicAccountIdentity,
+  normalizeAnthropicAccountIdentity,
+} from './anthropic-account-identity.js'
+
+describe('normalizeAnthropicAccountIdentity', () => {
+  test('normalizes email casing and drops empty values', () => {
+    expect(
+      normalizeAnthropicAccountIdentity({
+        email: '  User@Example.com ',
+        accountId: '  user_123  ',
+      }),
+    ).toEqual({
+      email: 'user@example.com',
+      accountId: 'user_123',
+    })
+
+    expect(normalizeAnthropicAccountIdentity({ email: '   ' })).toBeUndefined()
+  })
+})
+
+describe('extractAnthropicAccountIdentity', () => {
+  test('prefers nested user profile identity from client_data responses', () => {
+    expect(
+      extractAnthropicAccountIdentity({
+        organizations: [{ id: 'org_123', name: 'Workspace' }],
+        user: {
+          id: 'usr_123',
+          email: 'User@Example.com',
+        },
+      }),
+    ).toEqual({
+      accountId: 'usr_123',
+      email: 'user@example.com',
+    })
+  })
+
+  test('falls back to profile-style payloads without email', () => {
+    expect(
+      extractAnthropicAccountIdentity({
+        profile: {
+          user_id: 'usr_456',
+        },
+      }),
+    ).toEqual({
+      accountId: 'usr_456',
+    })
+  })
+})

package/src/anthropic-account-identity.ts

@@ -0,0 +1,77 @@
+// Helpers for extracting and normalizing Anthropic OAuth account identity.
+
+export type AnthropicAccountIdentity = {
+  email?: string
+  accountId?: string
+}
+
+type IdentityCandidate = AnthropicAccountIdentity & {
+  score: number
+}
+
+const identityHintKeys = new Set(['user', 'profile', 'account', 'viewer'])
+const idKeys = ['user_id', 'userId', 'account_id', 'accountId', 'id', 'sub']
+
+export function normalizeAnthropicAccountIdentity(
+  identity: AnthropicAccountIdentity | null | undefined,
+) {
+  const email =
+    typeof identity?.email === 'string' && identity.email.trim()
+      ? identity.email.trim().toLowerCase()
+      : undefined
+  const accountId =
+    typeof identity?.accountId === 'string' && identity.accountId.trim()
+      ? identity.accountId.trim()
+      : undefined
+  if (!email && !accountId) return undefined
+  return {
+    ...(email ? { email } : {}),
+    ...(accountId ? { accountId } : {}),
+  }
+}
+
+function getCandidateFromRecord(record: Record<string, unknown>, path: string[]) {
+  const email = typeof record.email === 'string' ? record.email : undefined
+  const accountId = idKeys
+    .map((key) => {
+      const value = record[key]
+      return typeof value === 'string' ? value : undefined
+    })
+    .find((value) => {
+      return Boolean(value)
+    })
+  const normalized = normalizeAnthropicAccountIdentity({ email, accountId })
+  if (!normalized) return undefined
+  const hasIdentityHint = path.some((segment) => {
+    return identityHintKeys.has(segment)
+  })
+  return {
+    ...normalized,
+    score: (normalized.email ? 4 : 0) + (normalized.accountId ? 2 : 0) + (hasIdentityHint ? 2 : 0),
+  } satisfies IdentityCandidate
+}
+
+function collectIdentityCandidates(value: unknown, path: string[] = []): IdentityCandidate[] {
+  if (!value || typeof value !== 'object') return []
+  if (Array.isArray(value)) {
+    return value.flatMap((entry) => {
+      return collectIdentityCandidates(entry, path)
+    })
+  }
+
+  const record = value as Record<string, unknown>
+  const nested = Object.entries(record).flatMap(([key, entry]) => {
+    return collectIdentityCandidates(entry, [...path, key])
+  })
+  const current = getCandidateFromRecord(record, path)
+  return current ? [current, ...nested] : nested
+}
+
+export function extractAnthropicAccountIdentity(value: unknown) {
+  const candidates = collectIdentityCandidates(value)
+  const best = candidates.sort((a, b) => {
+    return b.score - a.score
+  })[0]
+  if (!best) return undefined
+  return normalizeAnthropicAccountIdentity(best)
+}

package/src/anthropic-auth-plugin.ts

@@ -35,6 +35,10 @@ import {
   upsertAccount,
   withAuthStateLock,
 } from './anthropic-auth-state.js'
+import {
+  extractAnthropicAccountIdentity,
+  type AnthropicAccountIdentity,
+} from './anthropic-account-identity.js'
 // PKCE (Proof Key for Code Exchange) using Web Crypto API.
 // Reference: https://github.com/badlogic/pi-mono/blob/main/packages/ai/src/utils/oauth/pkce.ts
 function base64urlEncode(bytes: Uint8Array): string {
@@ -68,6 +72,8 @@ const CLIENT_ID = (() => {
 
 const TOKEN_URL = 'https://platform.claude.com/v1/oauth/token'
 const CREATE_API_KEY_URL = 'https://api.anthropic.com/api/oauth/claude_cli/create_api_key'
+const CLIENT_DATA_URL = 'https://api.anthropic.com/api/oauth/claude_cli/client_data'
+const PROFILE_URL = 'https://api.anthropic.com/api/oauth/profile'
 const CALLBACK_PORT = 53692
 const CALLBACK_PATH = '/callback'
 const REDIRECT_URI = `http://localhost:${CALLBACK_PORT}${CALLBACK_PATH}`
@@ -81,6 +87,7 @@ const CLAUDE_CODE_BETA = 'claude-code-20250219'
 const OAUTH_BETA = 'oauth-2025-04-20'
 const FINE_GRAINED_TOOL_STREAMING_BETA = 'fine-grained-tool-streaming-2025-05-14'
 const INTERLEAVED_THINKING_BETA = 'interleaved-thinking-2025-05-14'
+const TOAST_SESSION_HEADER = 'x-kimaki-session-id'
 
 const ANTHROPIC_HOSTS = new Set([
   'api.anthropic.com',
@@ -298,6 +305,28 @@ async function createApiKey(accessToken: string): Promise<ApiKeySuccess> {
   return { type: 'success', key: json.raw_key }
 }
 
+async function fetchAnthropicAccountIdentity(accessToken: string) {
+  const urls = [CLIENT_DATA_URL, PROFILE_URL]
+  for (const url of urls) {
+    const responseText = await requestText(url, {
+      method: 'GET',
+      headers: {
+        Accept: 'application/json',
+        authorization: `Bearer ${accessToken}`,
+        'user-agent': process.env.OPENCODE_ANTHROPIC_USER_AGENT || `claude-cli/${CLAUDE_CODE_VERSION}`,
+        'x-app': 'cli',
+      },
+    }).catch(() => {
+      return undefined
+    })
+    if (!responseText) continue
+    const parsed = JSON.parse(responseText) as unknown
+    const identity = extractAnthropicAccountIdentity(parsed)
+    if (identity) return identity
+  }
+  return undefined
+}
+
 // --- Localhost callback server ---
 
 type CallbackResult = { code: string; state: string }
@@ -469,12 +498,13 @@ function buildAuthorizeHandler(mode: 'oauth' | 'apikey') {
       if (mode === 'apikey') {
         return createApiKey(creds.access)
       }
+      const identity = await fetchAnthropicAccountIdentity(creds.access)
       await rememberAnthropicOAuth({
         type: 'oauth',
         refresh: creds.refresh,
         access: creds.access,
         expires: creds.expires,
-      })
+      }, identity)
       return creds
     }
 
@@ -489,8 +519,7 @@ function buildAuthorizeHandler(mode: 'oauth' | 'apikey') {
             try {
               const result = await waitForCallback(auth.callbackServer)
               return await finalize(result)
-            } catch (error) {
-              console.error(`[anthropic-auth] ${error}`)
+            } catch {
               return { type: 'failed' }
             }
           })()
@@ -509,8 +538,7 @@ function buildAuthorizeHandler(mode: 'oauth' | 'apikey') {
           try {
             const result = await waitForCallback(auth.callbackServer, input)
             return await finalize(result)
-          } catch (error) {
-            console.error(`[anthropic-auth] ${error}`)
+          } catch {
             return { type: 'failed' }
           }
         })()
@@ -682,6 +710,19 @@ function wrapResponseStream(response: Response, reverseToolNameMap: Map<string,
   })
 }
 
+function appendToastSessionMarker({
+  message,
+  sessionId,
+}: {
+  message: string
+  sessionId: string | undefined
+}) {
+  if (!sessionId) {
+    return message
+  }
+  return `${message} ${sessionId}`
+}
+
 // --- Beta headers ---
 
 function getRequiredBetas(modelId: string | undefined) {
@@ -737,7 +778,18 @@ async function getFreshOAuth(
     await setAnthropicAuth(refreshed, client)
     const store = await loadAccountStore()
     if (store.accounts.length > 0) {
-      upsertAccount(store, refreshed)
+      const identity: AnthropicAccountIdentity | undefined = (() => {
+        const currentIndex = store.accounts.findIndex((account) => {
+          return account.refresh === latest.refresh || account.access === latest.access
+        })
+        const current = currentIndex >= 0 ? store.accounts[currentIndex] : undefined
+        if (!current) return undefined
+        return {
+          ...(current.email ? { email: current.email } : {}),
+          ...(current.accountId ? { accountId: current.accountId } : {}),
+        }
+      })()
+      upsertAccount(store, { ...refreshed, ...identity })
       await saveAccountStore(store)
     }
     return refreshed
@@ -752,6 +804,12 @@ async function getFreshOAuth(
 
 const AnthropicAuthPlugin: Plugin = async ({ client }) => {
   return {
+    'chat.headers': async (input, output) => {
+      if (input.model.providerID !== 'anthropic') {
+        return
+      }
+      output.headers[TOAST_SESSION_HEADER] = input.sessionID
+    },
     auth: {
       provider: 'anthropic',
       async loader(
@@ -788,21 +846,27 @@ const AnthropicAuthPlugin: Plugin = async ({ client }) => {
                       .catch(() => undefined)
                   : undefined
 
-            const rewritten = rewriteRequestPayload(originalBody, (msg) => {
-              client.tui.showToast({
-                body: { message: msg, variant: 'error' },
-              }).catch(() => {})
-            })
             const headers = new Headers(init?.headers)
             if (input instanceof Request) {
               input.headers.forEach((v, k) => {
                 if (!headers.has(k)) headers.set(k, v)
               })
             }
+            const sessionId = headers.get(TOAST_SESSION_HEADER) ?? undefined
+
+            const rewritten = rewriteRequestPayload(originalBody, (msg) => {
+              client.tui.showToast({
+                body: {
+                  message: appendToastSessionMarker({ message: msg, sessionId }),
+                  variant: 'error',
+                },
+              }).catch(() => {})
+            })
             const betas = getRequiredBetas(rewritten.modelId)
 
             const runRequest = async (auth: OAuthStored) => {
               const requestHeaders = new Headers(headers)
+              requestHeaders.delete(TOAST_SESSION_HEADER)
               requestHeaders.set('accept', 'application/json')
               requestHeaders.set(
                 'anthropic-beta',
@@ -839,9 +903,13 @@ const AnthropicAuthPlugin: Plugin = async ({ client }) => {
                   // Show toast notification so Discord thread shows the rotation
                   client.tui.showToast({
                     body: {
-                      message: `Switching from account ${rotated.fromLabel} to account ${rotated.toLabel}`,
+                      message: appendToastSessionMarker({
+                        message: `Switching from account ${rotated.fromLabel} to account ${rotated.toLabel}`,
+                        sessionId,
+                      }),
                       variant: 'info',
                     },
+
                   }).catch(() => {})
                   const retryAuth = await getFreshOAuth(getAuth, client)
                   if (retryAuth) {

package/src/{anthropic-auth-plugin.test.ts → anthropic-auth-state.test.ts}

@@ -1,10 +1,11 @@
-// Tests for Anthropic OAuth multi-account persistence and rotation.
+// Tests Anthropic OAuth account persistence, deduplication, and rotation.
 
 import { mkdtemp, readFile, rm, mkdir, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import path from 'node:path'
 import { afterEach, beforeEach, describe, expect, test } from 'vitest'
 import {
+  accountLabel,
   authFilePath,
   loadAccountStore,
   rememberAnthropicOAuth,
@@ -60,6 +61,27 @@ describe('rememberAnthropicOAuth', () => {
       expires: 3,
     })
   })
+
+  test('deduplicates new tokens by email or account ID', async () => {
+    await rememberAnthropicOAuth(firstAccount, {
+      email: 'user@example.com',
+      accountId: 'usr_123',
+    })
+    await rememberAnthropicOAuth(secondAccount, {
+      email: 'User@example.com',
+      accountId: 'usr_123',
+    })
+
+    const store = await loadAccountStore()
+    expect(store.accounts).toHaveLength(1)
+    expect(store.accounts[0]).toMatchObject({
+      refresh: 'refresh-second',
+      access: 'access-second',
+      email: 'user@example.com',
+      accountId: 'usr_123',
+    })
+    expect(accountLabel(store.accounts[0]!)).toBe('user@example.com')
+  })
 })
 
 describe('rotateAnthropicAccount', () => {

package/src/anthropic-auth-state.ts

@@ -2,6 +2,10 @@ import type { Plugin } from '@opencode-ai/plugin'
 import * as fs from 'node:fs/promises'
 import { homedir } from 'node:os'
 import path from 'node:path'
+import {
+  normalizeAnthropicAccountIdentity,
+  type AnthropicAccountIdentity,
+} from './anthropic-account-identity.js'
 
 const AUTH_LOCK_STALE_MS = 30_000
 const AUTH_LOCK_RETRY_MS = 100
@@ -14,6 +18,8 @@ export type OAuthStored = {
 }
 
 type AccountRecord = OAuthStored & {
+  email?: string
+  accountId?: string
   addedAt: number
   lastUsed: number
 }
@@ -114,6 +120,8 @@ export function normalizeAccountStore(
           typeof account.refresh === 'string' &&
           typeof account.access === 'string' &&
           typeof account.expires === 'number' &&
+          (typeof account.email === 'undefined' || typeof account.email === 'string') &&
+          (typeof account.accountId === 'undefined' || typeof account.accountId === 'string') &&
           typeof account.addedAt === 'number' &&
           typeof account.lastUsed === 'number',
       )
@@ -135,8 +143,13 @@ export async function saveAccountStore(store: AccountStore) {
 
 /** Short label for an account: first 8 + last 4 chars of refresh token. */
 export function accountLabel(account: OAuthStored, index?: number): string {
+  const accountWithIdentity = account as OAuthStored & AnthropicAccountIdentity
+  const identity = accountWithIdentity.email || accountWithIdentity.accountId
   const r = account.refresh
   const short = r.length > 12 ? `${r.slice(0, 8)}...${r.slice(-4)}` : r
+  if (identity) {
+    return index !== undefined ? `#${index + 1} (${identity})` : identity
+  }
   return index !== undefined ? `#${index + 1} (${short})` : short
 }
 
@@ -162,14 +175,29 @@ function findCurrentAccountIndex(store: AccountStore, auth: OAuthStored) {
 }
 
 export function upsertAccount(store: AccountStore, auth: OAuthStored, now = Date.now()) {
+  const authWithIdentity = auth as OAuthStored & AnthropicAccountIdentity
+  const identity = normalizeAnthropicAccountIdentity({
+    email: authWithIdentity.email,
+    accountId: authWithIdentity.accountId,
+  })
   const index = store.accounts.findIndex((account) => {
-    return account.refresh === auth.refresh || account.access === auth.access
+    if (account.refresh === auth.refresh || account.access === auth.access) {
+      return true
+    }
+    if (identity?.accountId && account.accountId === identity.accountId) {
+      return true
+    }
+    if (identity?.email && account.email === identity.email) {
+      return true
+    }
+    return false
   })
   const nextAccount: AccountRecord = {
     type: 'oauth',
     refresh: auth.refresh,
     access: auth.access,
     expires: auth.expires,
+    ...identity,
     addedAt: now,
     lastUsed: now,
   }
@@ -186,15 +214,20 @@ export function upsertAccount(store: AccountStore, auth: OAuthStored, now = Date
     ...existing,
     ...nextAccount,
     addedAt: existing.addedAt,
+    email: nextAccount.email || existing.email,
+    accountId: nextAccount.accountId || existing.accountId,
   }
   store.activeIndex = index
   return index
 }
 
-export async function rememberAnthropicOAuth(auth: OAuthStored) {
+export async function rememberAnthropicOAuth(
+  auth: OAuthStored,
+  identity?: AnthropicAccountIdentity,
+) {
   await withAuthStateLock(async () => {
     const store = await loadAccountStore()
-    upsertAccount(store, auth)
+    upsertAccount(store, { ...auth, ...normalizeAnthropicAccountIdentity(identity) })
     await saveAccountStore(store)
   })
 }

package/src/cli-parsing.test.ts

@@ -27,8 +27,8 @@ function createCliForIdParsing() {
     .option('-g, --guild <guildId>', 'Discord guild/server ID')
 
   cli.command('task delete <id>', 'Delete task')
-  cli.command('anthropic-accounts list', 'List stored Anthropic accounts').hidden()
-  cli.command('anthropic-accounts remove <index>', 'Remove stored Anthropic account').hidden()
+  cli.command('anthropic-accounts list', 'List stored Anthropic accounts')
+  cli.command('anthropic-accounts remove <indexOrEmail>', 'Remove stored Anthropic account')
 
   return cli
 }
@@ -163,19 +163,26 @@ describe('goke CLI ID parsing', () => {
     expect(typeof result.args[0]).toBe('string')
   })
 
-  test('hidden anthropic account commands still parse', () => {
+  test('anthropic account remove parses index and email as strings', () => {
     const cli = createCliForIdParsing()
 
-    const result = cli.parse(
+    const indexResult = cli.parse(
       ['node', 'kimaki', 'anthropic-accounts', 'remove', '2'],
       { run: false },
     )
 
-    expect(result.args[0]).toBe('2')
-    expect(typeof result.args[0]).toBe('string')
+    const emailResult = cli.parse(
+      ['node', 'kimaki', 'anthropic-accounts', 'remove', 'user@example.com'],
+      { run: false },
+    )
+
+    expect(indexResult.args[0]).toBe('2')
+    expect(typeof indexResult.args[0]).toBe('string')
+    expect(emailResult.args[0]).toBe('user@example.com')
+    expect(typeof emailResult.args[0]).toBe('string')
   })
 
-  test('hidden anthropic account commands are excluded from help output', () => {
+  test('anthropic account commands are included in help output', () => {
     const stdout = {
       text: '',
       write(data: string | Uint8Array) {
@@ -185,11 +192,11 @@ describe('goke CLI ID parsing', () => {
 
     const cli = goke('kimaki', { stdout: stdout as never })
     cli.command('send', 'Send a message')
-    cli.command('anthropic-accounts list', 'List stored Anthropic accounts').hidden()
+    cli.command('anthropic-accounts list', 'List stored Anthropic accounts')
     cli.help()
     cli.parse(['node', 'kimaki', '--help'], { run: false })
 
     expect(stdout.text).toContain('send')
-    expect(stdout.text).not.toContain('anthropic-accounts')
+    expect(stdout.text).toContain('anthropic-accounts')
   })
 })

package/src/cli.ts

@@ -1024,7 +1024,8 @@ async function resolveCredentials({
           options: [
             {
               value: 'gateway' as const,
-              label: 'Gateway (pre-built Kimaki bot — no setup needed)',
+              disabled: true,
+              label: 'Gateway (pre-built Kimaki bot, currently disabled because of Discord verification process. will be re-enabled soon)',
             },
             {
               value: 'self_hosted' as const,
@@ -3168,7 +3169,6 @@ cli
     'anthropic-accounts list',
     'List stored Anthropic OAuth accounts used for automatic rotation',
   )
-  .hidden()
   .action(async () => {
     const store = await loadAccountStore()
     console.log(`Store: ${accountsFilePath()}`)
@@ -3187,19 +3187,37 @@ cli
 
 cli
   .command(
-    'anthropic-accounts remove <index>',
-    'Remove a stored Anthropic OAuth account from the rotation pool',
+    'anthropic-accounts remove <indexOrEmail>',
+    'Remove a stored Anthropic OAuth account from the rotation pool by index or email',
   )
-  .hidden()
-  .action(async (index: string) => {
-    const value = Number(index)
-    if (!Number.isInteger(value) || value < 1) {
-      cliLogger.error('Usage: kimaki anthropic-accounts remove <index>')
+  .action(async (indexOrEmail: string) => {
+    const value = Number(indexOrEmail)
+    const store = await loadAccountStore()
+    const resolvedIndex = (() => {
+      if (Number.isInteger(value) && value >= 1) {
+        return value - 1
+      }
+      const email = indexOrEmail.trim().toLowerCase()
+      if (!email) {
+        return -1
+      }
+      return store.accounts.findIndex((account) => {
+        return account.email?.toLowerCase() === email
+      })
+    })()
+
+    if (resolvedIndex < 0) {
+      cliLogger.error(
+        'Usage: kimaki anthropic-accounts remove <index-or-email>',
+      )
       process.exit(EXIT_NO_RESTART)
     }
 
-    await removeAccount(value - 1)
-    cliLogger.log(`Removed Anthropic account ${value}`)
+    const removed = store.accounts[resolvedIndex]
+    await removeAccount(resolvedIndex)
+    cliLogger.log(
+      `Removed Anthropic account ${removed ? accountLabel(removed, resolvedIndex) : indexOrEmail}`,
+    )
     process.exit(0)
   })
 

package/src/discord-command-registration.ts

@@ -182,7 +182,7 @@ export async function registerCommands({
     new SlashCommandBuilder()
       .setName('new-worktree')
       .setDescription(
-        truncateCommandDescription('Create a git worktree branch from origin/HEAD (or main). Optionally pick a base branch.'),
+        truncateCommandDescription('Create a git worktree branch from HEAD by default. Optionally pick a base branch.'),
       )
       .addStringOption((option) => {
         option
@@ -198,7 +198,7 @@ export async function registerCommands({
         option
           .setName('base-branch')
           .setDescription(
-            truncateCommandDescription('Branch to create the worktree from (default: origin/HEAD or main)'),
+            truncateCommandDescription('Branch to create the worktree from (default: HEAD)'),
           )
           .setRequired(false)
           .setAutocomplete(true)

package/src/system-message.test.ts

@@ -224,7 +224,7 @@ describe('system-message', () => {
 
       This creates a new Discord thread with an isolated git worktree and starts a session in it. The worktree name should be kebab-case and descriptive of the task.
 
-      By default, worktrees are created from \`origin/HEAD\` (the remote's default branch). To change the base branch for a project, the user can run \`git remote set-head origin <branch>\` in the project directory. For example, \`git remote set-head origin dev\` makes all new worktrees branch off \`origin/dev\` instead of \`origin/main\`.
+      By default, worktrees are created from \`HEAD\`, which means whatever commit or branch the current checkout is on. If you want a different base, pass \`--base-branch\` or use the slash command option explicitly.
 
       Critical recursion guard:
       - If you already are in a worktree thread, do not create another worktree unless the user explicitly asks for a nested worktree.

package/src/system-message.ts

@@ -559,7 +559,7 @@ kimaki send --channel ${channelId} --prompt "your task description" --worktree w
 
 This creates a new Discord thread with an isolated git worktree and starts a session in it. The worktree name should be kebab-case and descriptive of the task.
 
-By default, worktrees are created from \`origin/HEAD\` (the remote's default branch). To change the base branch for a project, the user can run \`git remote set-head origin <branch>\` in the project directory. For example, \`git remote set-head origin dev\` makes all new worktrees branch off \`origin/dev\` instead of \`origin/main\`.
+By default, worktrees are created from \`HEAD\`, which means whatever commit or branch the current checkout is on. If you want a different base, pass \`--base-branch\` or use the slash command option explicitly.
 
 Critical recursion guard:
 - If you already are in a worktree thread, do not create another worktree unless the user explicitly asks for a nested worktree.

package/src/worktrees.test.ts

@@ -220,4 +220,5 @@ describe('worktrees', () => {
       fs.rmSync(sandbox, { recursive: true, force: true })
     }
   })
+
 })

package/src/worktrees.ts

@@ -527,52 +527,6 @@ type WorktreeResult = {
 async function resolveDefaultWorktreeTarget(
   directory: string,
 ): Promise<string> {
-  const remoteHead = await execAsync(
-    'git symbolic-ref refs/remotes/origin/HEAD',
-    {
-      cwd: directory,
-    },
-  ).catch(() => {
-    return null
-  })
-
-  const remoteRef = remoteHead?.stdout.trim()
-  if (remoteRef?.startsWith('refs/remotes/')) {
-    return remoteRef.replace('refs/remotes/', '')
-  }
-
-  const hasMain = await execAsync(
-    'git show-ref --verify --quiet refs/heads/main',
-    {
-      cwd: directory,
-    },
-  )
-    .then(() => {
-      return true
-    })
-    .catch(() => {
-      return false
-    })
-  if (hasMain) {
-    return 'main'
-  }
-
-  const hasMaster = await execAsync(
-    'git show-ref --verify --quiet refs/heads/master',
-    {
-      cwd: directory,
-    },
-  )
-    .then(() => {
-      return true
-    })
-    .catch(() => {
-      return false
-    })
-  if (hasMaster) {
-    return 'master'
-  }
-
   return 'HEAD'
 }
 
@@ -608,7 +562,7 @@ export async function createWorktreeWithSubmodules({
 }: {
   directory: string
   name: string
-  /** Override the base branch to create the worktree from. Defaults to origin/HEAD → main → master → HEAD. */
+  /** Override the base branch to create the worktree from. Defaults to HEAD. */
   baseBranch?: string
   /** Called with a short phase label so callers can update UI (e.g. Discord status message). */
   onProgress?: (phase: string) => void