@hieplp/pi-account-switcher 0.2.4 → 0.3.0

package/README.md

@@ -64,14 +64,16 @@ The local commands will be registered as `/dev:accounts:list`, `/dev:accounts:ad
 
 ### Accounts
 
-| Command            | Description                                                     |
-| ------------------ | --------------------------------------------------------------- |
-| `/accounts:add`    | Add a new account interactively                                 |
-| `/accounts:list`   | List all accounts and activate the selected one                 |
-| `/accounts:switch` | Switch to another account within the current provider           |
-| `/accounts:edit`   | Edit label, provider, id, or credential source                  |
-| `/accounts:remove` | Delete an account                                               |
-| `/accounts:oauth`  | Import the current Pi `/login` OAuth session as a named account |
+| Command              | Description                                                     |
+| -------------------- | --------------------------------------------------------------- |
+| `/accounts:add`      | Add a new account interactively                                 |
+| `/accounts:switch`   | Switch to any account (interactive picker or by ID)             |
+| `/accounts:peers`    | Switch to another account within the current provider           |
+| `/accounts:subagent` | Set account for the next spawned subagent                       |
+| `/accounts:edit`     | Edit label, provider, id, or credential source                  |
+| `/accounts:remove`   | Delete an account                                               |
+| `/accounts:oauth`    | Import the current Pi `/login` OAuth session as a named account |
+| `/accounts:dirs`     | Manage working directories for CWD-based auto-select            |
 
 ### Providers
 
@@ -133,12 +135,20 @@ Complete browser/device login, then:
 /accounts:oauth
 ```
 
-Give it a label like `Claude — Work`. Repeat for as many accounts as you need — each gets its own saved credentials. Switch between them any time with `/accounts:list`.
+Give it a label like `Claude — Work`. Repeat for as many accounts as you need — each gets its own saved credentials. Switch between them any time with `/accounts:switch`.
 
 OAuth credentials are read from `~/.pi/agent/auth.json` and written back to Pi's live auth storage on switch.
 
 ---
 
+## Directory-based Auto-Select
+
+The extension can automatically activate the right account based on your current working directory. Each account can list directory paths (`dirs`) — the longest prefix match wins. A `defaultAccountId` at the config level serves as the fallback. Use `/accounts:dirs` to manage directories interactively.
+
+See **USAGE.md** for full details on the activation cascade, configuration, and examples.
+
+---
+
 ## Custom Providers
 
 Define a provider once, reuse it across accounts:
@@ -196,11 +206,13 @@ The export file contains all accounts, providers, and active-selection state as
 ```json
 {
   "switchMode": "env",
+  "defaultAccountId": "claude-work",
   "accounts": [
     {
       "id": "claude-work",
       "label": "Claude — Work",
       "provider": "anthropic",
+      "dirs": ["/home/user/Development/Work"],
       "env": {
         "ANTHROPIC_API_KEY": { "type": "env", "name": "ANTHROPIC_WORK_API_KEY" }
       }
@@ -209,6 +221,7 @@ The export file contains all accounts, providers, and active-selection state as
       "id": "openai-personal",
       "label": "OpenAI — Personal",
       "provider": "openai",
+      "dirs": ["/home/user/Projects/Client-A"],
       "env": {
         "OPENAI_API_KEY": { "type": "file", "path": "~/.keys/openai-personal.txt" }
       }
@@ -231,7 +244,22 @@ A plain string is treated as a literal; strings starting with `op://` are resolv
 
 ### State — `~/.pi/account-switcher/state.json`
 
-Tracks the selected account and model across sessions. Restored automatically on `session_start`.
+Tracks the selected account and model **per Pi session**. Each Pi session gets its own key — no global active-account state.
+
+```json
+{
+  "sessions": {
+    "abc123": { "activeAccountId": "claude-work" },
+    "def456": { "activeAccountId": "openai-personal", "activeModelId": "gpt-4", "activeModelProvider": "openai" }
+  }
+}
+```
+
+When Pi starts, the extension derives a session key from Pi's session file and restores that session's saved state. Sessions with no saved state fall back to CWD-based auto-select or `defaultAccountId`.
+
+Legacy flat-format state (`{ "activeAccountId": "..." }`) is automatically migrated to the session-keyed format on first load.
+
+Session entries are automatically cleaned up: entries inactive for `stateCleanupDays` (default 30, configurable in `accounts.json`) are pruned, with a hard cap of 500 entries.
 
 ---
 

package/USAGE.md

@@ -109,7 +109,7 @@ To add another OAuth account for the same provider, run `/login` again with the
 Switch OAuth accounts with:
 
 ```txt
-/accounts:list
+/accounts:switch
 ```
 
 OAuth credentials are captured from Pi's auth file:
@@ -191,12 +191,14 @@ Example config:
 
 ```json
 {
-  "switchMode": "env",
+  "defaultAccountId": "claude-work",
+  "stateCleanupDays": 30,
   "accounts": [
     {
       "id": "claude-work",
       "label": "Claude — Work",
       "provider": "anthropic",
+      "dirs": ["/home/user/Development/Work"],
       "env": {
         "ANTHROPIC_API_KEY": { "type": "env", "name": "ANTHROPIC_WORK_API_KEY" }
       }
@@ -273,26 +275,13 @@ A plain string is treated as a literal value, except strings beginning with `op:
 
 ## 9. Commands
 
-### Pick account for current provider
-
-```txt
-/accounts:list
-```
-
-The extension tries to detect the current model provider and shows matching accounts.
-
-### Pick account for a specific provider
-
-```txt
-/accounts:list
-```
-
-Useful if Pi cannot detect the active provider.
-
-### List accounts
+### Switch accounts
 
 ```txt
-/accounts:list
+/accounts:switch       # interactive picker from all accounts
+/accounts:switch <id>  # activate by ID directly (agent-facing)
+/accounts:peers        # picker from same-provider accounts
+/accounts:subagent     # set account for next spawned subagent
 ```
 
 ### Import current Pi OAuth login
@@ -366,44 +355,102 @@ Typical usage:
 3. Later, switch accounts:
 
    ```txt
-   /accounts:list
+   /accounts:switch
    ```
 
 Alternative manual config flow: edit `~/.pi/account-switcher/accounts.json` directly, then reload Pi:
 
-6. If needed, reload Pi runtime:
+1. If needed, reload Pi runtime:
 
    ```txt
    /reload
    ```
 
-## 11. State Persistence
+## 11. Directory-based Auto-Select
 
-Selected accounts are saved at:
+The extension can automatically activate the right account based on your current working directory.
+
+### `dirs` on accounts
+
+Add directory paths to an account in `accounts.json`. The longest matching prefix of the current working directory wins. On tie, the first account in the array wins.
+
+```json
+{
+  "id": "claude-work",
+  "label": "Claude — Work",
+  "provider": "anthropic",
+  "dirs": ["/home/user/Development/Work"],
+  "env": {
+    "ANTHROPIC_API_KEY": { "type": "env", "name": "ANTHROPIC_WORK_API_KEY" }
+  }
+}
+```
+
+### `defaultAccountId` config fallback
+
+If no session state exists and no directory matches, the extension falls back to `defaultAccountId` at the top of `accounts.json`:
+
+```json
+{
+  "switchMode": "env",
+  "defaultAccountId": "claude-work",
+  "accounts": [...]
+}
+```
+
+### Activation cascade (session start)
+
+1. **Saved session state** — account previously selected for this Pi session
+2. **CWD-based auto-select** — longest matching directory prefix
+3. **`defaultAccountId`** — config-level fallback
+4. **None** — no account activated until you pick one
+
+### Manage dirs with `/accounts:dirs`
+
+The `/accounts:dirs` command opens an interactive wizard. When an active account and current working directory are detected, it offers **Auto-save** (one-step: saves current dir to active account) and **Manual** (pick account, then add via recursive directory browser or remove configured dirs).
+
+Dirs are stored per account in `~/.pi/account-switcher/accounts.json`.
+
+---
+
+## 12. State Persistence
+
+Selected accounts are saved **per Pi session** at:
 
 ```txt
 ~/.pi/account-switcher/state.json
 ```
 
-Example:
+Each Pi session gets its own key — no global active-account state:
 
 ```json
 {
-  "activeAccountId": "claude-work",
-  "activeModelId": "claude-sonnet-4",
-  "activeModelProvider": "anthropic"
+  "sessions": {
+    "abc123": { "activeAccountId": "claude-work" },
+    "def456": { "activeAccountId": "openai-personal", "activeModelId": "gpt-4", "activeModelProvider": "openai" }
+  }
 }
 ```
 
-On Pi session start, the extension restores the saved active account and model state.
+On Pi session start, the extension derives a session key and restores that session's saved state. Sessions with no saved state fall back to CWD-based auto-select or `defaultAccountId`. Legacy flat-format state (`{ "activeAccountId": "..." }`) is automatically migrated on first load.
+
+Session entries auto-accumulate as you use Pi. To prevent unbounded growth, the extension automatically prunes entries that haven't been active in `stateCleanupDays` days (default: 30). If there are still more than 500 entries after the TTL sweep, the oldest ones are removed.
+
+Configure the TTL in `~/.pi/account-switcher/accounts.json`:
+
+```json
+{ "accounts": [...], "stateCleanupDays": 60 }
+```
+
+Set to a higher value (e.g. 90) if you frequently resume sessions from weeks ago, or a lower value (e.g. 7) for tighter cleanup. Entries without a `lastActive` timestamp (from previous versions) are automatically timestamped on first write after upgrade.
 
-## 12. Important Note About Credential Caching
+## 13. Important Note About Credential Caching
 
 The extension updates `process.env`, Pi's live runtime API-key overrides, and Pi's live OAuth auth storage when those hooks are available.
 
 If a provider still keeps old credentials cached, run `/reload` or restart Pi.
 
-## 13. Troubleshooting
+## 14. Troubleshooting
 
 ### No accounts configured
 
@@ -414,17 +461,10 @@ Run `/accounts:add` to create one interactively, or create `~/.pi/account-switch
 Run explicitly:
 
 ```txt
-/accounts:list
+/accounts:switch
 ```
 
-Also check that account `provider` values match supported providers:
-
-- `anthropic` / `claude`
-- `openai`
-- `openai-codex` / `codex`
-- `google` / `gemini`
-- `xai`
-- `openrouter`
+Also check that account `provider` values match a supported built-in provider or a custom provider added via `/providers:add`. Built-in providers include anthropic, openai, openai-codex, google, xai, openrouter, opencode, opencode-go, github-copilot, amazon-bedrock, and others. Use the `list_accounts` tool or check `@/constants/providers.ts` for the full list.
 
 ### Secret resolves empty
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hieplp/pi-account-switcher",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "type": "module",
   "description": "Pi extension for quickly switching between multiple accounts/API keys per provider.",
   "license": "MIT",
@@ -45,12 +45,13 @@
     "@earendil-works/pi-coding-agent": "latest",
     "@types/node": "latest",
     "prettier": "^3.8.3",
+    "typebox": "^1.2.14",
     "typescript": "latest",
     "vitest": "latest"
   },
   "pi": {
     "extensions": [
-      "./src/extension.ts"
+      "./src/index.ts"
     ]
   },
   "packageManager": "pnpm@11.5.0+sha512.dbfcc4f81cf48597afd4bc391ffdf12c11f1a9fb83a395bfa6b0a2d9cc2fd8ffebafdb1ccbd529632153f793904c2615b7f09fe1a345473fd1c35845172a8eb1"

package/src/commands/accounts/add.ts

@@ -20,7 +20,15 @@ class AddAccountCommand extends AccountCommand {
       await this.runtime.load();
       const providers = this.runtime.getProviders();
 
-      const account = await new AccountConfigBuilder(ctx.ui, providers).collect();
+      // Get all provider IDs registered in Pi from the model registry
+      const piModels = ctx.modelRegistry.getAll();
+      const piProviderIds = [...new Set(piModels.map((m) => m.provider))];
+
+      const getOAuthEntry = async (p: string) => {
+        return this.runtime.getPiAuthEntry(p);
+      };
+
+      const account = await new AccountConfigBuilder(ctx.ui, providers, piProviderIds, getOAuthEntry).collect();
       if (!account) return;
 
       await this.saveProvider(ctx, account);

package/src/commands/accounts/edit.ts

@@ -19,7 +19,21 @@ class EditAccountCommand extends AccountCommand {
       const original = await this.loadAndSelectAccount(ctx, "Select account to edit");
       if (!original) return;
 
-      const updated = await new AccountConfigBuilder(ctx.ui, this.runtime.getProviders(), original).collect(true);
+      // Pass dynamic providers from Pi so editing can also see all options
+      const piModels = ctx.modelRegistry.getAll();
+      const piProviderIds = [...new Set(piModels.map((m) => m.provider))];
+
+      const getOAuthEntry = async (p: string) => {
+        return this.runtime.getPiAuthEntry(p);
+      };
+
+      const updated = await new AccountConfigBuilder(
+        ctx.ui,
+        this.runtime.getProviders(),
+        piProviderIds,
+        getOAuthEntry,
+        original,
+      ).collect(true);
       if (!updated) return;
 
       await this.runtime.editAccount(original, updated);

package/src/commands/accounts/index.ts

@@ -2,19 +2,25 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import { useAddAccountCommand } from "./add";
 import { useEditAccountCommand } from "./edit";
-import { useListAccountsCommand } from "./list";
+import { useListAccountsTool } from "./list";
 import { useOAuthImportCommand } from "./oauth";
 import { useRemoveAccountCommand } from "./remove";
 import { useSwitchAccountCommand } from "./switch";
+import { useSubagentAccountCommand } from "./subagent";
+import { usePeersCommand } from "./peers";
+import { useSetSubagentAccountTool } from "./set-subagent-account";
 import { useVerifyAccountsCommand } from "./verify";
 
 const useAccountCommands = (pi: ExtensionAPI, runtime: AccountSwitcher) => {
   useAddAccountCommand(pi, runtime);
   useEditAccountCommand(pi, runtime);
-  useListAccountsCommand(pi, runtime);
+  useListAccountsTool(pi, runtime);
   useOAuthImportCommand(pi, runtime);
   useRemoveAccountCommand(pi, runtime);
   useSwitchAccountCommand(pi, runtime);
+  useSubagentAccountCommand(pi, runtime);
+  useSetSubagentAccountTool(pi, runtime);
+  usePeersCommand(pi, runtime);
   useVerifyAccountsCommand(pi, runtime);
 };
 

package/src/commands/accounts/list.ts

@@ -1,31 +1,49 @@
+import { Type } from "typebox";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
-import type { AccountSwitcherContext } from "@/types";
-import { COMMANDS } from "@/constants";
-import { errorUtil } from "@/utils";
-import { AccountCommand } from "./shared";
+import type { AccountConfig } from "@/types";
 
-export const useListAccountsCommand = (pi: ExtensionAPI, runtime: AccountSwitcher) => {
-  new ListAccountsCommand(pi, runtime).register();
-};
-
-class ListAccountsCommand extends AccountCommand {
-  constructor(pi: ExtensionAPI, runtime: AccountSwitcher) {
-    super(pi, runtime, COMMANDS.accounts.list);
-  }
-
-  async handler(ctx: AccountSwitcherContext): Promise<void> {
-    try {
-      const accounts = await this.loadAccounts(ctx);
-      if (!accounts) return;
+/** Tool name for agent-facing account discovery */
+export const LIST_ACCOUNTS_TOOL = "list_accounts";
 
-      const account = await this.pickGroupedAccount(ctx, accounts, "Pick account to activate");
-      if (!account) return;
+/**
+ * Format a list of accounts as structured text for agent consumption.
+ * Output format: `id | label | provider | status` (one line per account, sorted by label).
+ */
+export function formatAccountList(accounts: AccountConfig[], active?: AccountConfig): string {
+  if (accounts.length === 0) return "No accounts configured.";
 
-      const applied = await this.runtime.activateAccount(account, ctx);
-      ctx.ui.notify(`Switched to ${account.label} (${applied}).`, "info");
-    } catch (error) {
-      ctx.ui.notify(`Failed to list accounts: ${errorUtil.format(error)}`, "error");
-    }
-  }
+  const sorted = [...accounts].sort((a, b) => a.label.localeCompare(b.label));
+  return sorted
+    .map((account) => {
+      const status = active && active.id === account.id ? "active" : "inactive";
+      return `${account.id} | ${account.label} | ${account.provider} | ${status}`;
+    })
+    .join("\n");
 }
+
+export const useListAccountsTool = (pi: ExtensionAPI, runtime: AccountSwitcher) => {
+  pi.registerTool({
+    name: LIST_ACCOUNTS_TOOL,
+    label: "List Accounts",
+    description:
+      "List all configured accounts. Returns ID, label, provider, and active/inactive status for each account. " +
+      "Use the ID with accounts:switch <id> to activate a specific account.",
+    promptSnippet: "List my configured accounts",
+    promptGuidelines: [
+      "Use list_accounts when the user asks what accounts are configured or wants to switch accounts.",
+      "The output shows one line per account: id | label | provider | status.",
+    ],
+    parameters: Type.Object({}),
+    execute: async (_toolCallId, _params, _signal, _onUpdate, _ctx) => {
+      await runtime.load();
+      const accounts = runtime.getAccounts();
+      const active = runtime.getActiveAccount();
+      const output = formatAccountList(accounts, active);
+      return {
+        content: [{ type: "text", text: output }],
+        details: {},
+      };
+    },
+  });
+};

package/src/commands/accounts/peers.ts

@@ -0,0 +1,59 @@
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { AccountSwitcher } from "@/runtime";
+import type { AccountSwitcherContext, AccountConfig, ProviderConfig } from "@/types";
+import { COMMANDS } from "@/constants";
+import { commandUtil, errorUtil, providerUtil } from "@/utils";
+import { AccountCommand } from "./shared";
+
+/**
+ * Filter accounts to those sharing the same auth provider as the active account,
+ * excluding the active account itself.
+ */
+export function filterPeers(accounts: AccountConfig[], active: AccountConfig): AccountConfig[] {
+  const normalize = (a: AccountConfig): string =>
+    providerUtil.normalizeProvider(a.piAuth?.provider ?? a.provider);
+
+  return accounts.filter((a) => normalize(a) === normalize(active) && a.id !== active.id);
+}
+
+export const usePeersCommand = (pi: ExtensionAPI, runtime: AccountSwitcher) => {
+  new PeersCommand(pi, runtime).register();
+};
+
+class PeersCommand extends AccountCommand {
+  constructor(pi: ExtensionAPI, runtime: AccountSwitcher) {
+    super(pi, runtime, {
+      name: "accounts:peers",
+      description: "Switch to another account sharing the same provider",
+    });
+  }
+
+  async handler(ctx: AccountSwitcherContext): Promise<void> {
+    try {
+      await this.runtime.load();
+
+      const active = this.runtime.getActiveAccount();
+      if (!active) {
+        ctx.ui.notify(
+          `No active account. Use ${commandUtil.name("accounts:switch")} to activate one first.`,
+          "info",
+        );
+        return;
+      }
+
+      const peers = filterPeers(this.runtime.getAccounts(), active);
+      if (peers.length === 0) {
+        ctx.ui.notify(`No other accounts for provider "${active.provider}".`, "info");
+        return;
+      }
+
+      const account = await this.pickGroupedAccount(ctx, peers, `Switch account (${active.provider})`);
+      if (!account) return;
+
+      const applied = await this.runtime.activateAccount(account, ctx);
+      ctx.ui.notify(`Switched to ${account.label} (${applied}).`, "info");
+    } catch (e) {
+      ctx.ui.notify(`Failed to switch account: ${errorUtil.format(e)}`, "error");
+    }
+  }
+}

package/src/commands/accounts/set-subagent-account.ts

@@ -0,0 +1,64 @@
+import { Type } from "typebox";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { AccountSwitcher } from "@/runtime";
+
+export const SET_SUBAGENT_ACCOUNT_TOOL = "set_subagent_account";
+
+export const useSetSubagentAccountTool = (pi: ExtensionAPI, runtime: AccountSwitcher) => {
+  pi.registerTool({
+    name: SET_SUBAGENT_ACCOUNT_TOOL,
+    label: "Set Subagent Account",
+    description:
+      "Set the account for spawned subagents. Does not affect the current session. " +
+      "By default (oneshot=true), the override applies only to the next subagent and is consumed. " +
+      "With oneshot=false, the override persists until cleared. " +
+      "Provide the account ID from list_accounts. Pass empty string to clear.",
+    promptSnippet: "Set the account for subagents",
+    promptGuidelines: [
+      "Use set_subagent_account before spawning a subagent when it needs a specific account.",
+      "With oneshot=true (default): the next subagent uses this account, then reverts.",
+      "With oneshot=false: all subsequent subagents use this account until cleared.",
+      "Use list_accounts first to discover available account IDs.",
+    ],
+    parameters: Type.Object({
+      id: Type.String({ description: "Account ID to use for subagents. Empty string to clear." }),
+      oneshot: Type.Optional(Type.Boolean({ default: true, description: "If true (default), applies only to the next subagent. If false, persists until cleared." })),
+    }),
+    execute: async (_toolCallId, params: { id: string; oneshot?: boolean }, _signal, _onUpdate, _ctx) => {
+      const isOneShot = params.oneshot !== false;
+
+      if (!params.id) {
+        delete process.env.PI_ACCOUNT_SWITCHER_NEXT_ID;
+        delete process.env.PI_ACCOUNT_SWITCHER_ACTIVE_ID;
+        return {
+          content: [{ type: "text", text: "Subagent override cleared. Subagents will inherit the parent's active account." }],
+          details: {},
+        };
+      }
+
+      const accounts = runtime.getAccounts();
+      const match = accounts.find((a) => a.id === params.id);
+      if (!match) {
+        return {
+          content: [{ type: "text", text: `Account not found: "${params.id}". Use the list_accounts tool to see available accounts.` }],
+          isError: true,
+          details: {},
+        };
+      }
+
+      if (isOneShot) {
+        process.env.PI_ACCOUNT_SWITCHER_NEXT_ID = params.id;
+        return {
+          content: [{ type: "text", text: `One-shot set to: ${match.label} (${params.id}). The next subagent will use this account, then revert.` }],
+          details: {},
+        };
+      }
+
+      process.env.PI_ACCOUNT_SWITCHER_ACTIVE_ID = params.id;
+      return {
+        content: [{ type: "text", text: `Persistent override set to: ${match.label} (${params.id}). All subagents will use this account until cleared.` }],
+        details: {},
+      };
+    },
+  });
+};

package/src/commands/accounts/shared/prompts.ts

@@ -1,7 +1,7 @@
 import type { ExtensionUIContext } from "@earendil-works/pi-coding-agent";
-import type { AccountConfig, ProviderConfig, SecretSource } from "@/types";
+import type { AccountConfig, PiAuthEntry, ProviderConfig, SecretSource } from "@/types";
 import { commonUtil, providerUtil, uiUtil } from "@/utils";
-import { ACCOUNTS_PATH } from "@/constants";
+import { ACCOUNTS_PATH, OAUTH_PROVIDER_IDS } from "@/constants";
 
 export const SECRET_SOURCE_CHOICES = {
   literal: "Paste API key now (stored in config)",
@@ -25,6 +25,8 @@ export class AccountConfigBuilder {
   constructor(
     private readonly ui: ExtensionUIContext,
     private readonly customProviders: ProviderConfig[] = [],
+    private readonly piProviderIds: string[] = [],
+    private readonly getOAuthEntry?: (provider: string) => Promise<PiAuthEntry | undefined>,
     original?: Partial<AccountConfig>,
   ) {
     this.prompt = uiUtil.prompt(ui);
@@ -37,7 +39,7 @@ export class AccountConfigBuilder {
   }
 
   async withProvider(): Promise<this> {
-    const choices = providerUtil.providerChoices(this.customProviders);
+    const choices = providerUtil.providerChoices(this.customProviders, this.piProviderIds);
     const choice = await uiUtil.filteredSelect(this.ui, "Provider", choices);
     if (!choice) return this;
 
@@ -65,14 +67,22 @@ export class AccountConfigBuilder {
   }
 
   async withId(): Promise<this> {
-    const suggested = commonUtil.slugify(this.config.label ?? "");
-    const hint = this.config.id ?? suggested;
-    const id = (await this.prompt("Account id", hint).asText()) || hint;
-    if (!id) {
-      throw new Error("Account id is required");
+    // Auto-generate ID from label in add mode to reduce UX friction
+    if (!this.config.id) {
+      const suggested = commonUtil.slugify(this.config.label ?? "");
+      if (suggested) {
+        this.config.id = suggested;
+        return this;
+      }
+      // Fallback: prompt when label produces empty slug
+      const id = (await this.prompt("Account id", "account").asText()) || "account";
+      if (!id) {
+        throw new Error("Account id is required");
+      }
+      this.config.id = id;
+      return this;
     }
-    this.config.id = id;
-
+    // Edit mode: keep existing id
     return this;
   }
 
@@ -122,6 +132,21 @@ export class AccountConfigBuilder {
       }
     }
 
+    // OAuth-capable provider: check if Pi has stored credentials
+    if (!hasExistingCredentials && this.getOAuthEntry && (OAUTH_PROVIDER_IDS as readonly string[]).includes(provider)) {
+      const entry = await this.getOAuthEntry(provider);
+      if (entry) {
+        const useOAuth = await this.ui.confirm(
+          "Import Pi OAuth?",
+          `Pi has OAuth credentials for ${provider}. Import and use them for this account?`,
+        );
+        if (useOAuth) {
+          this.config.piAuth = { provider, entry };
+          return this;
+        }
+      }
+    }
+
     const envKeys = providerUtil.requiredEnvKeysForProvider(provider, this.customProviders);
     const envChoice = await this.ui.select("Credential env var", [
       ...envKeys,