@minniexcode/codex-switch 0.0.11 → 0.0.12

package/README.md

@@ -1,89 +1,78 @@
-## @minniexcode/codex-switch
+# @minniexcode/codex-switch
 
-`codex-switch` is a local-first CLI for managing and switching Codex provider/profile configuration safely.
+`@minniexcode/codex-switch` is a local-first CLI for managing and switching Codex provider and profile configuration safely.
 
-It is designed for users who work with multiple Codex providers, API keys, or profiles and want a repeatable, backup-first workflow instead of manually editing files under `~/.codex/`.
+It keeps `codex-switch` tool state separate from the target Codex runtime, so provider management, backup flow, and runtime projection stay explicit instead of relying on manual file edits.
 
-中文版: [README.CN.md](./README.CN.md)
+Chinese version: [README.CN.md](./README.CN.md)
 
-## Overview
+## Version
 
-What it does in `0.0.11`:
+Current package version: `0.0.12`
 
-- Initializes a dedicated `codex-switch` tool home
-- Adopts unmanaged runtime profiles from an existing Codex directory
-- Lists, shows, adds, edits, and removes provider records
-- Switches the active provider/profile safely
-- Supports explicit GitHub Copilot upstream onboarding
-- Manages the local Copilot bridge runtime explicitly
-- Imports and exports provider definitions
-- Runs diagnostics and detects local drift
-- Lists backups and rolls back to a previous managed state
-- Inspects `config.toml` profiles through structured read commands
-
-Current version: `0.0.11`
+This repository is still on a development-version line. The current release focuses on making the primary workflows, help text, and operational boundaries consistent with the implementation.
 
 ## Install
 
-Install globally:
-
 ```bash
 npm install -g @minniexcode/codex-switch
 ```
 
-Or run directly:
+Run without a global install:
 
 ```bash
 npx @minniexcode/codex-switch --help
 ```
 
-CLI entry:
+Built CLI entrypoint:
 
 ```bash
 codexs --help
 ```
 
-## Quick Start
+## Primary Workflows
 
-Initialize tool state and adopt an existing Codex runtime:
+Direct provider workflow:
 
 ```bash
 codexs init
-codexs migrate
-```
-
-Inspect managed providers and config:
-
-```bash
-codexs list
-codexs show my-provider
-codexs config show
-```
-
-Add and switch a direct provider:
-
-```bash
 codexs add my-provider --profile my-provider --api-key sk-xxx
 codexs switch my-provider
+codexs status
+codexs doctor
 ```
 
-Prepare GitHub Copilot and manage its bridge:
+GitHub Copilot workflow:
 
 ```bash
+codexs init
 codexs login copilot
 codexs add copilot-main --copilot --profile copilot-main
-codexs bridge start copilot-main
+codexs switch copilot-main
+codexs status
+codexs doctor
 ```
 
-Check runtime state:
+Notes:
+
+- `init` prepares the `codex-switch` tool home and managed state.
+- `login copilot` handles upstream Copilot onboarding and auth readiness.
+- `add --copilot` does not perform login for you; it assumes Copilot login is already ready.
+- `status` is the main read command after switching.
+- `doctor` is the main repair-oriented diagnostic command.
+
+## Advanced Adopt Workflow
+
+Use `migrate` only when you already have Codex runtime state that should be adopted into managed `providers.json` state:
 
 ```bash
-codexs current
-codexs status
-codexs doctor
+codexs init
+codexs migrate
 ```
 
-## Common Commands
+`migrate` is an advanced adopt helper. It is not the default first step for a fresh install.
+
+## Command Surface
 
 ```bash
 codexs init
@@ -99,31 +88,22 @@ codexs add <provider> --profile <name> --api-key <key>
 codexs add <provider> --copilot --profile <name>
 codexs edit <provider>
 codexs switch <provider>
+codexs remove <provider> [--force] [--switch-to <profile>]
+codexs import <file>
+codexs export <file> [--force]
 codexs bridge start [provider]
 codexs bridge status [provider]
 codexs bridge stop [provider]
-codexs remove <provider> [--force] [--switch-to <profile>]
-codexs import <file> [--merge]
-codexs export <file> [--force]
 codexs backups list
 codexs rollback [backup-id]
 codexs doctor
 ```
 
-Command help:
+`setup` still exists only as a deprecated compatibility entry that points callers to `init` or `migrate`.
 
-```bash
-codexs help init
-codexs help login
-codexs help add
-codexs help bridge
-codexs help config
-codexs help migrate
-```
-
-## How It Works
+## Runtime Model
 
-Starting in `0.0.11`, `codex-switch` uses a dual-path model.
+`codex-switch` uses a dual-path model.
 
 Tool home:
 
@@ -144,32 +124,26 @@ Target Codex runtime:
   auth.json
 ```
 
-Notes:
-
-- `providers.json` is the managed provider registry and now lives under the tool home
-- `codex-switch.json` stores tool-level metadata such as `defaultCodexDir`
-- `config.toml` is still the active runtime-routing file in the target Codex directory
-- `auth.json` is the active auth projection file
-- direct-provider switches rewrite `OPENAI_API_KEY`
-- Copilot bridge providers keep upstream login in the official Copilot runtime while `codex-switch` manages the local bridge secret, bridge state, and routing
-- mutating commands back up before writing and rollback stays available after failed or undesired changes
+Key points:
 
-Path overrides and resolution:
+- `providers.json` is the managed provider registry and lives under the tool home.
+- `codex-switch.json` stores tool-level metadata such as `defaultCodexDir`.
+- `config.toml` remains the active runtime routing file in the target Codex directory.
+- `auth.json` remains the active auth projection file in the target Codex directory.
+- Direct providers rewrite `OPENAI_API_KEY` into the active runtime projection.
+- Copilot providers keep upstream GitHub authentication in the official Copilot runtime while `codex-switch` manages local bridge state and routing.
 
-- `--codex-dir <path>` explicitly targets a Codex runtime directory
-- `CODEXS_CODEX_DIR` sets the default target when `--codex-dir` is not passed
-- `CODEXS_HOME` overrides the tool home location
+Path controls:
 
-## Automation
+- `--codex-dir <path>` targets a specific Codex runtime directory.
+- `CODEXS_CODEX_DIR` provides the default target runtime when `--codex-dir` is not passed.
+- `CODEXS_HOME` overrides the tool home location.
 
-This CLI supports both human TTY use and non-interactive automation.
+## Automation Notes
 
-Current exceptions:
+This CLI supports both human TTY usage and non-interactive automation.
 
-- `login copilot` requires a real TTY and does not support `--json`
-- `migrate` remains intentionally interactive for adopt profile selection and provider detail collection
-
-Recommended global flags:
+Global flags:
 
 ```bash
 --json
@@ -178,29 +152,22 @@ Recommended global flags:
 --version
 ```
 
-Recommendations:
-
-- use `--json` for stable machine-readable output
-- pass all required arguments explicitly in scripts or CI
-- use `--codex-dir <path>` for sandbox or test environments
-- use `CODEXS_HOME` when you want tool state isolated from your default workstation setup
+Operational limits:
 
-## Testing
+- `login copilot` requires a real TTY and does not support `--json`.
+- `migrate` still depends on interactive profile selection and provider-detail collection in this release.
+- Automation should pass explicit arguments and prefer `--json` for stable parsing.
 
-Build and test locally:
+## Local Development
 
 ```bash
 npm run build
 npm test
 npx tsc --noEmit
+node dist/cli.js --help
+npm pack --dry-run
 ```
 
-The repository includes a development fixture under `dev-codex/local-sandbox` plus dedicated test docs:
-
-- [Testing Guide](./docs/Tests/testing.md)
-- [Bridge Testing Notes](./docs/Tests/testing-bridge-v0.0.9.md)
-- [Test Report for 0.0.7](./docs/Tests/test-report-0.0.7.md)
-
 ## Documentation
 
 - [Chinese README](./README.CN.md)
@@ -208,9 +175,8 @@ The repository includes a development fixture under `dev-codex/local-sandbox` pl
 - [Detailed CLI Usage](./docs/cli-usage.md)
 - [Testing Guide](./docs/Tests/testing.md)
 - [Product Overview](./docs/codex-switch-product-overview.md)
-- [Technical Architecture](./docs/codex-switch-technical-architecture.md)
-- [PRD 0.0.11](./docs/PRD/codex-switch-prd-v0.0.11.md)
-- [Design Doc 0.0.11](./docs/Design/codex-switch-v0.0.11-design.md)
+- [PRD 0.0.12](./docs/PRD/codex-switch-prd-v0.0.12.md)
+- [Release Gate PRD 0.1.0](./docs/PRD/codex-switch-prd-v0.1.0.md)
 
 ## License
 

package/dist/app/get-status.js

@@ -67,8 +67,10 @@ async function getStatus(codexDir, configPath, providersPath, authPath, options)
         }
     }
     const liveState = (0, runtime_state_1.inspectLiveStateDrift)(currentProfile, providers);
-    const activeProviderCandidates = currentProfile && providers ? (0, providers_1.findProvidersByProfile)(providers, currentProfile) : [];
-    const activeProvider = activeProviderCandidates.length === 1 && providers ? providers.providers[activeProviderCandidates[0]] : null;
+    const activeProviderCandidates = liveState.mappedProviders;
+    const activeProvider = liveState.providerResolvable && providers && liveState.mappedProvider
+        ? providers.providers[liveState.mappedProvider]
+        : null;
     const copilotInstall = (0, copilot_installer_1.probeCopilotSdkInstall)(options?.runtimesDir);
     const runtimeStateInspection = (0, runtime_state_repo_1.inspectCopilotBridgeState)(options?.runtimeDir);
     const runtimeState = runtimeStateInspection.state;
@@ -108,6 +110,9 @@ async function getStatus(codexDir, configPath, providersPath, authPath, options)
         // Surface unmanaged live state without mutating anything during a read-only status call.
         warnings.push("Current config profile is not mapped in providers.json. Backfill would be required before treating live state as managed.");
     }
+    if (liveState.reason === "shared-profile") {
+        warnings.push(`Current config profile "${currentProfile}" is shared by multiple providers in providers.json, so the active provider cannot be resolved uniquely.`);
+    }
     if (runtimeStateInspection.exists && !runtimeStateInspection.valid) {
         warnings.push(`Copilot bridge runtime state is unreadable: ${runtimeStateInspection.parseError ?? "unknown parse failure"}`);
     }
@@ -128,7 +133,7 @@ async function getStatus(codexDir, configPath, providersPath, authPath, options)
             currentProfile,
             currentProfileMapped: liveState.profileMapped,
             provider: liveState.mappedProvider,
-            activeProviderResolvable: activeProviderCandidates.length === 1,
+            activeProviderResolvable: liveState.providerResolvable,
             activeProviderCandidates,
             runtimeProvider: activeProvider && (0, providers_1.isCopilotBridgeProvider)(activeProvider) ? activeProvider.runtime?.kind ?? null : null,
             copilotSdk: {

package/dist/app/list-providers.js

@@ -1,16 +1,59 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listProviders = listProviders;
+const fs = __importStar(require("node:fs"));
+const providers_1 = require("../domain/providers");
+const runtime_state_1 = require("../domain/runtime-state");
+const config_repo_1 = require("../storage/config-repo");
 const providers_repo_1 = require("../storage/providers-repo");
 /**
  * Returns the sorted list of configured providers for display.
  */
-function listProviders(providersPath) {
+function listProviders(providersPath, configPath) {
     const providers = (0, providers_repo_1.readProvidersFile)(providersPath);
     const names = Object.keys(providers.providers).sort();
+    const currentProfile = configPath && fs.existsSync(configPath)
+        ? (0, config_repo_1.readStructuredConfig)(configPath).activeProfile
+        : null;
+    const liveState = (0, runtime_state_1.inspectLiveStateDrift)(currentProfile, providers);
     const items = names.map((name) => ({
         name,
         profile: providers.providers[name].profile,
+        providerType: (0, providers_1.isCopilotBridgeProvider)(providers.providers[name]) ? "copilot" : "direct",
+        isActive: liveState.providerResolvable && liveState.mappedProvider === name,
         note: providers.providers[name].note ?? null,
         tags: providers.providers[name].tags ?? [],
     }));
@@ -18,6 +61,10 @@ function listProviders(providersPath) {
         data: {
             providers: items,
             count: items.length,
+            currentProfile,
+            activeProvider: liveState.mappedProvider,
+            activeProviderResolvable: liveState.providerResolvable,
+            activeProviderCandidates: liveState.mappedProviders,
         },
     };
 }

package/dist/cli/output.js

@@ -85,12 +85,22 @@ function renderHumanSuccess(command, data, warnings) {
                 lines.push("No providers configured.");
             }
             else {
+                const currentProfile = typeof data?.currentProfile === "string" ? data.currentProfile : null;
+                const activeProviderResolvable = data?.activeProviderResolvable !== false;
+                const activeCandidates = Array.isArray(data?.activeProviderCandidates) ? data?.activeProviderCandidates : [];
+                if (currentProfile) {
+                    lines.push(`Current profile: ${currentProfile}`);
+                    if (!activeProviderResolvable && activeCandidates.length > 1) {
+                        lines.push(`Current provider: ambiguous (${activeCandidates.join(", ")})`);
+                    }
+                }
                 for (const provider of providers) {
                     const tags = Array.isArray(provider.tags) && provider.tags.length > 0
                         ? ` tags=${provider.tags.join(",")}`
                         : "";
                     const note = provider.note ? ` note=${provider.note}` : "";
-                    lines.push(`${provider.name} -> ${provider.profile}${tags}${note}`);
+                    const current = provider.isActive ? " current" : "";
+                    lines.push(`${provider.name} [${String(provider.providerType ?? "direct")}]${current} -> ${provider.profile}${tags}${note}`);
                 }
             }
             break;
@@ -115,17 +125,15 @@ function renderHumanSuccess(command, data, warnings) {
             lines.push(`Current profile: ${String(data?.profile ?? "")}`);
             break;
         case "status":
-            lines.push(`codexDir: ${String(data?.codexDir ?? "")}`);
-            lines.push(`configExists: ${String(data?.configExists ?? false)}`);
-            lines.push(`providersExists: ${String(data?.providersExists ?? false)}`);
-            lines.push(`currentProfile: ${String(data?.currentProfile ?? "")}`);
-            lines.push(`mappedProvider: ${String(data?.provider ?? "")}`);
-            lines.push(`activeProviderResolvable: ${String(data?.activeProviderResolvable ?? false)}`);
-            const auth = data?.auth ?? {};
-            lines.push(`authExists: ${String(auth.exists ?? false)}`);
-            lines.push(`authValid: ${String(auth.valid ?? false)}`);
-            lines.push(`authMode: ${String(auth.authMode ?? "")}`);
-            lines.push(`issues: ${Array.isArray(data?.issues) ? (data?.issues).length : 0}`);
+            lines.push("Status summary:");
+            lines.push(`  target runtime: ${String(data?.codexDir ?? "")}`);
+            lines.push(`  tool home: ${String(data?.storage?.toolHome?.root ?? "")}`);
+            lines.push(`  current profile: ${String(data?.currentProfile ?? "(none)")}`);
+            lines.push(`  mapped provider: ${renderStatusMappedProvider(data)}`);
+            lines.push(`  provider path: ${renderStatusProviderPath(data)}`);
+            lines.push(`  runtime health: ${renderStatusHealth(data)}`);
+            lines.push(`  warnings: ${warnings.length}`);
+            lines.push(`  next step: ${renderStatusNextStep(data, warnings)}`);
             break;
         case "config-show": {
             lines.push(`activeProfile: ${String(data?.activeProfile ?? "")}`);
@@ -153,10 +161,26 @@ function renderHumanSuccess(command, data, warnings) {
             lines.push(`Exported providers to ${String(data?.exportedTo ?? "")}.`);
             break;
         case "init":
-            lines.push(`Initialized Codex directory ${String(data?.codexDir ?? "")}.`);
-            lines.push(`Created codexDir: ${String(data?.createdCodexDir ?? false)}`);
-            lines.push(`Created providers.json: ${String(data?.createdProvidersFile ?? false)}`);
-            lines.push(`providersAlreadyExisted: ${String(data?.providersAlreadyExisted ?? false)}`);
+            lines.push("Initialized codex-switch tool home.");
+            lines.push(`tool home: ${String(data?.toolHomeDir ?? "")}`);
+            lines.push(`tool config: ${String(data?.toolConfigPath ?? "")}`);
+            lines.push(`providers registry: ${String(data?.providersPath ?? "")}`);
+            lines.push(`tool home created: ${String(data?.createdToolHomeDir ?? false)}`);
+            lines.push(`tool config created: ${String(data?.createdToolConfigFile ?? false)}`);
+            lines.push(`providers registry created: ${String(data?.createdProvidersFile ?? false)}`);
+            lines.push("next step: run `codexs add ...` for a direct provider, or `codexs login copilot` before `add --copilot`.");
+            break;
+        case "login":
+            lines.push(`Copilot login ready: ${String(data?.authReady ?? false)}`);
+            lines.push(`upstream: ${String(data?.upstream ?? "")}`);
+            lines.push(`sdk installed: ${String(data?.sdkInstalled ?? false)}${data?.sdkInstalledNow ? " (installed now)" : ""}`);
+            lines.push(`copilot cli source: ${String(data?.cliSource ?? "not-needed")}`);
+            if (data?.cliCommand) {
+                lines.push(`copilot cli command: ${String(data?.cliCommand)}`);
+            }
+            lines.push(`login launched: ${String(data?.loginLaunched ?? false)}`);
+            lines.push(`auth ready: ${String(data?.authReady ?? false)}`);
+            lines.push("next step: run `codexs add <provider> --copilot --profile <name>` and then `codexs switch <provider>`.");
             break;
         case "migrate":
             lines.push(`Migrated providers in ${String(data?.codexDir ?? "")} using ${String(data?.strategy ?? "")}.`);
@@ -185,10 +209,12 @@ function renderHumanSuccess(command, data, warnings) {
             break;
         case "doctor": {
             const healthy = Boolean(data?.healthy);
-            lines.push(healthy ? "No issues found." : "Issues found:");
             const issues = data?.issues ?? [];
+            lines.push(healthy ? "Doctor summary: healthy. No action required." : `Doctor summary: ${issues.length} issue(s) need attention.`);
+            lines.push(`target runtime: ${String(data?.codexDir ?? "")}`);
             for (const issue of issues) {
-                lines.push(`${issue.code}: ${issue.message}`);
+                lines.push(`- ${String(issue.code)}: ${String(issue.message)}`);
+                lines.push(`  next step: ${renderDoctorIssueNextStep(issue)}`);
             }
             break;
         }
@@ -212,6 +238,107 @@ function renderHumanSuccess(command, data, warnings) {
     }
     return lines;
 }
+/**
+ * Summarizes runtime health for the human-readable status output.
+ */
+function renderStatusHealth(data) {
+    const configExists = Boolean(data?.configExists);
+    const providersExists = Boolean(data?.providersExists);
+    const auth = data?.auth ?? {};
+    const bridge = data?.copilotBridge ?? null;
+    const issues = Array.isArray(data?.issues) ? data?.issues : [];
+    const activeProviderResolvable = data?.activeProviderResolvable !== false;
+    const liveState = data?.liveState ?? {};
+    const copilotSdk = data?.copilotSdk ?? {};
+    const copilotAuth = data?.copilotAuth ?? null;
+    const runtimeProvider = typeof data?.runtimeProvider === "string" ? data.runtimeProvider : null;
+    const activePathUsesCopilot = runtimeProvider === "copilot-sdk-bridge";
+    if (!configExists || !providersExists) {
+        return "incomplete local state";
+    }
+    if (!activeProviderResolvable || liveState.reason === "shared-profile") {
+        return "active provider ambiguous";
+    }
+    if (issues.some((issue) => issue.code === "UNMANAGED_ACTIVE_PROFILE")) {
+        return "active profile unmanaged";
+    }
+    if (issues.some((issue) => issue.code === "ACTIVE_PROVIDER_UNRESOLVED")) {
+        return "active provider ambiguous";
+    }
+    if (activePathUsesCopilot && copilotSdk.installed === false) {
+        return "copilot sdk missing";
+    }
+    if (activePathUsesCopilot && copilotAuth && copilotAuth.ready === false) {
+        return "copilot auth required";
+    }
+    if (activePathUsesCopilot && bridge && bridge.ok === false) {
+        return "copilot runtime needs repair";
+    }
+    if (auth.exists === false) {
+        return "auth projection missing";
+    }
+    if (auth.valid === false) {
+        return "auth projection invalid";
+    }
+    return "ok";
+}
+/**
+ * Renders the mapped provider line without claiming a unique winner for shared profiles.
+ */
+function renderStatusMappedProvider(data) {
+    if (typeof data?.provider === "string" && data.provider.length > 0) {
+        return data.provider;
+    }
+    const candidates = Array.isArray(data?.activeProviderCandidates) ? data?.activeProviderCandidates : [];
+    if (candidates.length > 1) {
+        return `(ambiguous: ${candidates.join(", ")})`;
+    }
+    return "(unmanaged or unresolved)";
+}
+/**
+ * Renders the active workflow path in status output.
+ */
+function renderStatusProviderPath(data) {
+    return typeof data?.runtimeProvider === "string" && data.runtimeProvider === "copilot-sdk-bridge" ? "copilot" : "direct";
+}
+/**
+ * Suggests the next operator action for the human-readable status output.
+ */
+function renderStatusNextStep(data, warnings) {
+    if (warnings.length > 0) {
+        return "run `codexs doctor` to inspect warnings before the next write command";
+    }
+    if (!data?.provider) {
+        return "run `codexs switch <provider>` after adding or adopting a managed provider";
+    }
+    return "run `codexs doctor` if you need a deeper diagnostic pass";
+}
+/**
+ * Turns structured doctor issue codes into repair-oriented next steps.
+ */
+function renderDoctorIssueNextStep(issue) {
+    switch (issue.code) {
+        case "CONFIG_NOT_FOUND":
+            return "restore or create config.toml before switching providers";
+        case "PROVIDERS_NOT_FOUND":
+            return "run `codexs init` and then add or migrate providers";
+        case "COPILOT_SDK_MISSING":
+            return "run `codexs login copilot` to install the optional Copilot runtime";
+        case "COPILOT_AUTH_REQUIRED":
+            return "run `codexs login copilot` to complete upstream authentication";
+        case "BRIDGE_STATE_STALE":
+        case "BRIDGE_STATE_MISSING":
+        case "BRIDGE_HEALTHCHECK_FAILED":
+            return "reselect the provider with `codexs switch <provider>` or inspect bridge state";
+        case "UNMANAGED_ACTIVE_PROFILE":
+            return "switch to a managed provider or adopt the active profile with `codexs migrate`";
+        case "ACTIVE_PROVIDER_UNRESOLVED":
+        case "SHARED_PROFILE_REFERENCE":
+            return "make provider-to-profile mappings unique before relying on current-provider detection";
+        default:
+            return "inspect the issue details and rerun `codexs doctor` after fixing the state";
+    }
+}
 /**
  * Writes one rendered line to either stdout or stderr.
  */

package/dist/commands/handlers.js

@@ -79,11 +79,11 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
     const paths = setupPaths;
     switch (ctx.command) {
         case "list":
-            return (0, list_providers_1.listProviders)(paths.providersPath);
+            return (0, list_providers_1.listProviders)(paths.providersPath, paths.configPath);
         case "show": {
             let providerName = parsed.positionals[0] ?? null;
             if (!providerName && (0, interactive_1.canPrompt)(runtime, ctx.options.json)) {
-                providerName = await (0, interactive_1.promptForProviderSelection)(runtime, paths.providersPath, "Choose a provider to show");
+                providerName = await (0, interactive_1.promptForProviderSelection)(runtime, paths.providersPath, paths.configPath, "Choose a provider to show");
             }
             if (!providerName) {
                 throw (0, errors_1.cliError)("INVALID_ARGUMENT", "Missing provider name for show command.");
@@ -172,6 +172,7 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
                 (0, copilot_installer_1.installCopilotSdk)(paths.runtimesDir);
                 installedNow = true;
             }
+            const availability = (0, copilot_cli_1.checkCopilotCliAvailable)(paths.runtimesDir);
             try {
                 await (0, copilot_adapter_1.readCopilotAuthState)(paths.runtimesDir);
                 return {
@@ -181,6 +182,8 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
                         sdkInstalledNow: installedNow,
                         authReady: true,
                         loginLaunched: false,
+                        cliSource: availability.ok ? availability.source ?? null : null,
+                        cliCommand: availability.command ?? null,
                     },
                 };
             }
@@ -190,7 +193,6 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
                     throw error;
                 }
             }
-            const availability = (0, copilot_cli_1.checkCopilotCliAvailable)(paths.runtimesDir);
             if (!availability.ok) {
                 throw (0, errors_1.cliError)("COPILOT_CLI_MISSING", "The official Copilot CLI could not be resolved from the installed runtime or PATH.", {
                     cause: availability.cause,
@@ -225,6 +227,8 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
                     sdkInstalledNow: installedNow,
                     authReady: true,
                     loginLaunched: true,
+                    cliSource: availability.source ?? null,
+                    cliCommand: availability.command ?? null,
                 },
             };
         }
@@ -242,7 +246,7 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
         case "switch": {
             let providerName = parsed.positionals[0] ?? null;
             if (!providerName && (0, interactive_1.canPrompt)(runtime, ctx.options.json)) {
-                providerName = await (0, interactive_1.promptForProviderSelection)(runtime, paths.providersPath, "Choose a provider to switch to");
+                providerName = await (0, interactive_1.promptForProviderSelection)(runtime, paths.providersPath, paths.configPath, "Choose a provider to switch to");
             }
             if (!providerName) {
                 throw (0, errors_1.cliError)("PROVIDER_NOT_FOUND", "Missing provider name for switch command.");
@@ -413,7 +417,7 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
         case "edit": {
             let providerName = parsed.positionals[0] ?? null;
             if (!providerName && (0, interactive_1.canPrompt)(runtime, ctx.options.json)) {
-                providerName = await (0, interactive_1.promptForProviderSelection)(runtime, paths.providersPath, "Choose a provider to edit");
+                providerName = await (0, interactive_1.promptForProviderSelection)(runtime, paths.providersPath, paths.configPath, "Choose a provider to edit");
             }
             if (!providerName) {
                 throw (0, errors_1.cliError)("INVALID_ARGUMENT", "Missing provider name for edit command.");
@@ -472,7 +476,7 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
             const force = (0, args_1.hasFlag)(parsed.commandOptions, "--force");
             const switchToProfile = (0, args_1.getSingleOption)(parsed.commandOptions, "--switch-to", false) ?? undefined;
             if (!providerName && (0, interactive_1.canPrompt)(runtime, ctx.options.json)) {
-                providerName = await (0, interactive_1.promptForProviderSelection)(runtime, paths.providersPath, "Choose a provider to remove");
+                providerName = await (0, interactive_1.promptForProviderSelection)(runtime, paths.providersPath, paths.configPath, "Choose a provider to remove");
             }
             if (!providerName) {
                 throw (0, errors_1.cliError)("PROVIDER_NOT_FOUND", "Missing provider name for remove command.");