@minniexcode/codex-switch 0.1.5 → 0.2.0

package/dist/app/add-provider.js

@@ -40,8 +40,7 @@ const errors_1 = require("../domain/errors");
 const config_repo_1 = require("../storage/config-repo");
 const fs_utils_1 = require("../storage/fs-utils");
 const providers_repo_1 = require("../storage/providers-repo");
-const copilot_adapter_1 = require("../runtime/copilot-adapter");
-const copilot_installer_1 = require("../runtime/copilot-installer");
+const copilot_token_1 = require("../runtime/copilot-token");
 const run_mutation_1 = require("./run-mutation");
 /**
  * Adds a new provider record to the managed providers registry.
@@ -56,34 +55,29 @@ async function addProvider(args) {
     const bridgePort = args.bridgePort ?? 41415;
     const runtime = args.copilot
         ? {
-            kind: "copilot-sdk-bridge",
+            kind: "copilot-http-proxy",
             upstream: "github-copilot",
             bridgeHost,
             bridgePort,
             bridgePath: "/v1",
             premiumRequests: true,
-            authSource: "official-sdk",
-            sdkInstallMode: "lazy",
+            authSource: "github-pat",
         }
         : undefined;
     if (args.copilot) {
-        (0, copilot_installer_1.assertCopilotNodeRuntimeSupported)();
-        const installStatus = (0, copilot_installer_1.probeCopilotSdkInstall)(args.runtimesDir);
-        if (!installStatus.installed) {
-            throw (0, errors_1.cliError)("COPILOT_SDK_MISSING", "The optional Copilot SDK runtime is not installed. Run `codexs login copilot` first.", {
-                installDir: installStatus.installDir,
-                packageName: installStatus.packageName,
-                suggestion: "Run `codexs login copilot` to install the Copilot SDK and complete login.",
+        const githubToken = (0, copilot_token_1.readGithubToken)(args.toolHomeDir);
+        if (!githubToken) {
+            throw (0, errors_1.cliError)("COPILOT_AUTH_REQUIRED", "GitHub Copilot authentication is required. Run `codexs login copilot` first.", {
+                suggestion: "Run `codexs login copilot` to complete GitHub Copilot login.",
             });
         }
         try {
-            await (0, copilot_adapter_1.readCopilotAuthState)(args.runtimesDir);
+            await (0, copilot_token_1.exchangeForCopilotToken)(githubToken);
         }
         catch (error) {
             const normalized = (0, errors_1.normalizeError)(error);
-            if (normalized.code === "COPILOT_AUTH_REQUIRED") {
-                throw (0, errors_1.cliError)("COPILOT_AUTH_REQUIRED", "Copilot authentication is required before a Copilot provider can be added.", {
-                    ...(normalized.details ?? {}),
+            if (normalized.code === "COPILOT_AUTH_REQUIRED" || normalized.code === "COPILOT_TOKEN_EXCHANGE_FAILED") {
+                throw (0, errors_1.cliError)("COPILOT_AUTH_REQUIRED", "GitHub token is invalid or expired. Run `codexs login copilot` to re-authenticate.", {
                     suggestion: "Run `codexs login copilot` to complete GitHub Copilot login.",
                 });
             }

package/dist/app/bridge.js

@@ -10,8 +10,7 @@ const providers_repo_1 = require("../storage/providers-repo");
 const interactive_1 = require("../interaction/interactive");
 const copilot_bridge_1 = require("../runtime/copilot-bridge");
 const runtime_state_repo_1 = require("../storage/runtime-state-repo");
-const copilot_installer_1 = require("../runtime/copilot-installer");
-const copilot_adapter_1 = require("../runtime/copilot-adapter");
+const copilot_token_1 = require("../runtime/copilot-token");
 const DEFAULT_BRIDGE_PORT = 41415;
 /**
  * Starts or reuses the managed Copilot bridge for one provider.
@@ -28,8 +27,8 @@ async function startBridge(args) {
         commandName: "start",
         preferRuntimeState: false,
     });
-    await requireBridgeRuntimeReadiness(args.runtimesDir);
-    const bridge = await (0, copilot_bridge_1.ensureCopilotBridge)(target.providerName, target.provider, args.runtimeDir, args.runtimesDir);
+    await requireBridgeRuntimeReadiness(args.runtimesDir, args.toolHomeDir);
+    const bridge = await (0, copilot_bridge_1.ensureCopilotBridge)(target.providerName, target.provider, args.runtimeDir, args.runtimesDir, args.toolHomeDir);
     const nextProvider = bridge.portChanged ? rewriteBridgeProviderPort(target.provider, bridge.port) : target.provider;
     if (bridge.portChanged) {
         try {
@@ -252,16 +251,12 @@ async function promptForCopilotBridgeSelection(runtime, targets, commandName) {
 /**
  * Verifies that the local Copilot bridge prerequisites are available before startup.
  */
-async function requireBridgeRuntimeReadiness(runtimesDir) {
-    (0, copilot_installer_1.assertCopilotNodeRuntimeSupported)();
-    const installStatus = (0, copilot_installer_1.probeCopilotSdkInstall)(runtimesDir);
-    if (!installStatus.installed) {
-        throw (0, errors_1.cliError)("COPILOT_SDK_MISSING", "The optional Copilot SDK runtime is not installed.", {
-            installDir: installStatus.installDir,
-            packageName: installStatus.packageName,
-        });
+async function requireBridgeRuntimeReadiness(_runtimesDir, toolHomeDir) {
+    const githubToken = (0, copilot_token_1.readGithubToken)(toolHomeDir);
+    if (!githubToken) {
+        throw (0, errors_1.cliError)("COPILOT_AUTH_REQUIRED", "GitHub Copilot authentication is required. Run `codexs login copilot` first.");
     }
-    await (0, copilot_adapter_1.readCopilotAuthState)(runtimesDir);
+    await (0, copilot_token_1.exchangeForCopilotToken)(githubToken);
 }
 /**
  * Rewrites one Copilot bridge provider record with a recovered runtime port.

package/dist/app/get-status.js

@@ -41,9 +41,8 @@ const providers_1 = require("../domain/providers");
 const config_repo_1 = require("../storage/config-repo");
 const providers_repo_1 = require("../storage/providers-repo");
 const auth_repo_1 = require("../storage/auth-repo");
-const copilot_installer_1 = require("../runtime/copilot-installer");
+const copilot_token_1 = require("../runtime/copilot-token");
 const copilot_bridge_1 = require("../runtime/copilot-bridge");
-const copilot_adapter_1 = require("../runtime/copilot-adapter");
 const runtime_state_repo_1 = require("../storage/runtime-state-repo");
 /**
  * Reports the current on-disk runtime state and how it maps back to managed providers.
@@ -73,7 +72,7 @@ async function getStatus(codexDir, configPath, providersPath, authPath, options)
     const activeProvider = liveState.providerResolvable && providers && liveState.mappedProvider
         ? providers.providers[liveState.mappedProvider]
         : null;
-    const copilotInstall = (0, copilot_installer_1.probeCopilotSdkInstall)(options?.runtimesDir);
+    const copilotInstall = { installed: Boolean((0, copilot_token_1.readGithubToken)(options?.toolHomeDir)), source: "github-pat" };
     const runtimeStateInspection = (0, runtime_state_repo_1.inspectCopilotBridgeState)(options?.runtimeDir);
     const runtimeState = runtimeStateInspection.state;
     const runtimeStateProvider = runtimeState && providers ? providers.providers[runtimeState.provider] ?? null : null;
@@ -107,12 +106,18 @@ async function getStatus(codexDir, configPath, providersPath, authPath, options)
                 }
                 : null;
     const copilotAuth = activeProvider && (0, providers_1.isCopilotBridgeProvider)(activeProvider)
-        ? await (0, copilot_adapter_1.readCopilotAuthState)(options?.runtimesDir).catch((error) => ({
-            ready: false,
-            source: "official-sdk",
-            mode: "session",
-            error: error instanceof Error ? error.message : String(error),
-        }))
+        ? await (async () => {
+            const token = (0, copilot_token_1.readGithubToken)(options?.toolHomeDir);
+            if (!token)
+                return { ready: false, source: "github-pat", mode: "token", error: "No GitHub token found" };
+            try {
+                await (0, copilot_token_1.exchangeForCopilotToken)(token);
+                return { ready: true, source: "github-pat", mode: "token" };
+            }
+            catch (error) {
+                return { ready: false, source: "github-pat", mode: "token", error: error instanceof Error ? error.message : String(error) };
+            }
+        })()
         : null;
     if (liveState.canBackfillActiveProvider) {
         // Surface unmanaged live state without mutating anything during a read-only status call.
@@ -147,9 +152,7 @@ async function getStatus(codexDir, configPath, providersPath, authPath, options)
             runtimeProvider: activeProvider && (0, providers_1.isCopilotBridgeProvider)(activeProvider) ? activeProvider.runtime?.kind ?? null : null,
             copilotSdk: {
                 installed: copilotInstall.installed,
-                installDir: copilotInstall.installDir,
-                packageName: copilotInstall.packageName,
-                packageVersion: copilotInstall.packageVersion ?? null,
+                source: copilotInstall.source,
             },
             copilotAuth,
             copilotBridge,

package/dist/app/run-doctor.js

@@ -43,9 +43,8 @@ const errors_1 = require("../domain/errors");
 const codex_probe_1 = require("../runtime/codex-probe");
 const auth_repo_1 = require("../storage/auth-repo");
 const providers_1 = require("../domain/providers");
-const copilot_installer_1 = require("../runtime/copilot-installer");
+const copilot_token_1 = require("../runtime/copilot-token");
 const copilot_bridge_1 = require("../runtime/copilot-bridge");
-const copilot_adapter_1 = require("../runtime/copilot-adapter");
 const runtime_state_repo_1 = require("../storage/runtime-state-repo");
 const codex_version_1 = require("../runtime/codex-version");
 /**
@@ -125,25 +124,25 @@ async function runDoctor(args) {
         if (matches.length === 1) {
             const activeProvider = providers.providers[matches[0]];
             if ((0, providers_1.isCopilotBridgeProvider)(activeProvider)) {
-                const installStatus = (0, copilot_installer_1.probeCopilotSdkInstall)(args.runtimesDir);
-                if (!installStatus.installed) {
+                const githubToken = (0, copilot_token_1.readGithubToken)(args.toolHomeDir);
+                if (!githubToken) {
                     issues.push({
-                        code: "COPILOT_SDK_MISSING",
-                        message: "The optional Copilot SDK runtime is not installed.",
-                        installDir: installStatus.installDir,
-                        packageName: installStatus.packageName,
+                        code: "COPILOT_AUTH_REQUIRED",
+                        message: "GitHub Copilot authentication is required. Run `codexs login copilot`.",
                     });
                 }
-                try {
-                    await (0, copilot_adapter_1.readCopilotAuthState)(args.runtimesDir);
-                }
-                catch (error) {
-                    const normalized = (0, errors_1.normalizeError)(error);
-                    issues.push({
-                        code: normalized.code,
-                        message: normalized.message,
-                        ...(normalized.details ?? {}),
-                    });
+                else {
+                    try {
+                        await (0, copilot_token_1.exchangeForCopilotToken)(githubToken);
+                    }
+                    catch (error) {
+                        const normalized = (0, errors_1.normalizeError)(error);
+                        issues.push({
+                            code: normalized.code,
+                            message: normalized.message,
+                            ...(normalized.details ?? {}),
+                        });
+                    }
                 }
                 const bridge = await (0, copilot_bridge_1.probeCopilotBridgeRuntime)(activeProvider, runtimeState, args.runtimeDir);
                 if (!bridge.ok) {

package/dist/app/switch-provider.js

@@ -6,8 +6,7 @@ const config_repo_1 = require("../storage/config-repo");
 const auth_repo_1 = require("../storage/auth-repo");
 const providers_repo_1 = require("../storage/providers-repo");
 const copilot_bridge_1 = require("../runtime/copilot-bridge");
-const copilot_installer_1 = require("../runtime/copilot-installer");
-const copilot_adapter_1 = require("../runtime/copilot-adapter");
+const copilot_token_1 = require("../runtime/copilot-token");
 const run_mutation_1 = require("./run-mutation");
 const providers_1 = require("../domain/providers");
 /**
@@ -33,16 +32,12 @@ async function switchProvider(args) {
         });
     }
     if ((0, providers_1.isCopilotBridgeProvider)(provider)) {
-        (0, copilot_installer_1.assertCopilotNodeRuntimeSupported)();
-        const installStatus = (0, copilot_installer_1.probeCopilotSdkInstall)(args.runtimesDir);
-        if (!installStatus.installed) {
-            throw (0, errors_1.cliError)("COPILOT_SDK_MISSING", "The optional Copilot SDK runtime is not installed.", {
-                installDir: installStatus.installDir,
-                packageName: installStatus.packageName,
-            });
+        const githubToken = (0, copilot_token_1.readGithubToken)(args.toolHomeDir);
+        if (!githubToken) {
+            throw (0, errors_1.cliError)("COPILOT_AUTH_REQUIRED", "GitHub Copilot authentication is required. Run `codexs login copilot` first.");
         }
-        await (0, copilot_adapter_1.readCopilotAuthState)(args.runtimesDir);
-        const bridge = await (0, copilot_bridge_1.ensureCopilotBridge)(args.providerName, provider, args.runtimeDir, args.runtimesDir);
+        await (0, copilot_token_1.exchangeForCopilotToken)(githubToken);
+        const bridge = await (0, copilot_bridge_1.ensureCopilotBridge)(args.providerName, provider, args.runtimeDir, args.runtimesDir, args.toolHomeDir);
         const nextProvider = bridge.portChanged
             ? (0, providers_1.cleanProviderRecord)({
                 ...provider,

package/dist/commands/handlers.js

@@ -60,9 +60,7 @@ const providers_1 = require("../domain/providers");
 const add_interactive_1 = require("../interaction/add-interactive");
 const interactive_1 = require("../interaction/interactive");
 const prompt_1 = require("../interaction/prompt");
-const copilot_adapter_1 = require("../runtime/copilot-adapter");
-const copilot_cli_1 = require("../runtime/copilot-cli");
-const copilot_installer_1 = require("../runtime/copilot-installer");
+const copilot_token_1 = require("../runtime/copilot-token");
 const config_repo_1 = require("../storage/config-repo");
 const codex_paths_1 = require("../storage/codex-paths");
 const providers_repo_1 = require("../storage/providers-repo");
@@ -100,6 +98,7 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
             return (0, get_status_1.getStatus)(paths.codexDir, paths.configPath, paths.providersPath, paths.authPath, {
                 runtimeDir: paths.runtimeDir,
                 runtimesDir: paths.runtimesDir,
+                toolHomeDir: paths.toolHomeDir,
             });
         case "bridge-start": {
             const providerName = parsed.positionals[0] ?? null;
@@ -108,6 +107,7 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
                 configPath: paths.configPath,
                 runtimeDir: paths.runtimeDir,
                 runtimesDir: paths.runtimesDir,
+                toolHomeDir: paths.toolHomeDir,
                 providerName,
                 runtime,
                 json: ctx.options.json,
@@ -156,80 +156,41 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
                     supportedUpstreams: ["copilot", "github-copilot"],
                 });
             }
-            (0, copilot_installer_1.assertCopilotNodeRuntimeSupported)();
-            const installed = (0, copilot_installer_1.probeCopilotSdkInstall)(paths.runtimesDir);
-            let installedNow = false;
-            if (!installed.installed) {
-                const confirmInstall = await runtime.confirmAction("The Copilot SDK runtime is not installed. Install it now?", {
-                    defaultValue: true,
-                });
-                if (!confirmInstall) {
-                    throw (0, errors_1.cliError)("COPILOT_SDK_MISSING", "The optional Copilot SDK runtime is not installed.", {
-                        installDir: installed.installDir,
-                        packageName: installed.packageName,
-                    });
-                }
-                runtime.writeLine("Installing Copilot SDK runtime...");
-                (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 {
-                    data: {
-                        upstream: "github-copilot",
-                        sdkInstalled: true,
-                        sdkInstalledNow: installedNow,
-                        authReady: true,
-                        loginLaunched: false,
-                        cliSource: availability.ok ? availability.source ?? null : null,
-                        cliCommand: availability.command ?? null,
-                    },
-                };
-            }
-            catch (error) {
-                const normalized = (0, errors_1.normalizeError)(error);
-                if (normalized.code !== "COPILOT_AUTH_REQUIRED") {
-                    throw error;
+            // Check if already authenticated
+            const existingToken = (0, copilot_token_1.readGithubToken)(paths.toolHomeDir);
+            if (existingToken) {
+                try {
+                    await (0, copilot_token_1.exchangeForCopilotToken)(existingToken);
+                    return {
+                        data: {
+                            upstream: "github-copilot",
+                            authReady: true,
+                            loginLaunched: false,
+                            authSource: "github-pat",
+                        },
+                    };
                 }
-            }
-            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,
-                    source: availability.source ?? null,
-                    command: availability.command ?? null,
-                });
-            }
-            try {
-                (0, copilot_cli_1.runCopilotLogin)({ runtimesDir: paths.runtimesDir });
-            }
-            catch (error) {
-                throw (0, errors_1.cliError)("COPILOT_LOGIN_LAUNCH_FAILED", "Failed to launch `copilot login`.", {
-                    cause: error instanceof Error ? error.message : String(error),
-                });
-            }
-            try {
-                await (0, copilot_adapter_1.readCopilotAuthState)(paths.runtimesDir);
-            }
-            catch (error) {
-                const normalized = (0, errors_1.normalizeError)(error);
-                if (normalized.code === "COPILOT_AUTH_REQUIRED") {
-                    throw (0, errors_1.cliError)("COPILOT_LOGIN_RECHECK_FAILED", "Copilot login completed but auth readiness recheck still failed.", {
-                        ...(normalized.details ?? {}),
-                    });
+                catch {
+                    // Token is invalid, proceed with new login
                 }
-                throw error;
             }
+            // Start GitHub OAuth Device Flow
+            runtime.writeLine("Starting GitHub authentication...");
+            const deviceFlow = await (0, copilot_token_1.startDeviceFlow)();
+            runtime.writeLine(`\nPlease visit: ${deviceFlow.verificationUri}`);
+            runtime.writeLine(`And enter code: ${deviceFlow.userCode}\n`);
+            runtime.writeLine("Waiting for authorization...");
+            const githubPat = await (0, copilot_token_1.pollDeviceFlowToken)(deviceFlow.deviceCode, deviceFlow.interval, deviceFlow.expiresIn);
+            // Validate the token by doing a test exchange
+            await (0, copilot_token_1.exchangeForCopilotToken)(githubPat);
+            (0, copilot_token_1.writeGithubToken)(githubPat, paths.toolHomeDir);
+            runtime.writeLine("GitHub Copilot authentication successful!");
             return {
                 data: {
                     upstream: "github-copilot",
-                    sdkInstalled: true,
-                    sdkInstalledNow: installedNow,
                     authReady: true,
                     loginLaunched: true,
-                    cliSource: availability.source ?? null,
-                    cliCommand: availability.command ?? null,
+                    authSource: "github-pat",
                 },
             };
         }
@@ -267,6 +228,7 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
                 authPath: paths.authPath,
                 runtimeDir: paths.runtimeDir,
                 runtimesDir: paths.runtimesDir,
+                toolHomeDir: paths.toolHomeDir,
                 providerName,
             });
         }
@@ -507,6 +469,7 @@ async function handleRegisteredCommand(ctx, parsed, runtime = (0, prompt_1.creat
                 authPath: paths.authPath,
                 runtimeDir: paths.runtimeDir,
                 runtimesDir: paths.runtimesDir,
+                toolHomeDir: paths.toolHomeDir,
             });
         case "migrate": {
             let codexDir = ctx.options.codexDir;

package/dist/domain/providers.js

@@ -88,7 +88,7 @@ function cleanProviderRecord(record) {
         next.tags = record.tags.map((tag) => tag.trim()).filter((tag) => tag.length > 0);
     }
     if (record.runtime) {
-        next.runtime = {
+        const cleanedRuntime = {
             kind: record.runtime.kind,
             upstream: record.runtime.upstream,
             bridgeHost: record.runtime.bridgeHost.trim(),
@@ -96,8 +96,11 @@ function cleanProviderRecord(record) {
             bridgePath: record.runtime.bridgePath,
             premiumRequests: record.runtime.premiumRequests,
             authSource: record.runtime.authSource,
-            sdkInstallMode: record.runtime.sdkInstallMode,
         };
+        if (record.runtime.sdkInstallMode) {
+            cleanedRuntime.sdkInstallMode = record.runtime.sdkInstallMode;
+        }
+        next.runtime = cleanedRuntime;
     }
     return next;
 }
@@ -148,10 +151,10 @@ function isRuntimeBackedProvider(provider) {
     return Boolean(provider.runtime);
 }
 /**
- * Returns whether one provider uses the GitHub Copilot SDK bridge runtime.
+ * Returns whether one provider uses the GitHub Copilot bridge runtime.
  */
 function isCopilotBridgeProvider(provider) {
-    return provider.runtime?.kind === "copilot-sdk-bridge";
+    return provider.runtime?.kind === "copilot-http-proxy" || provider.runtime?.kind === "copilot-sdk-bridge";
 }
 /**
  * Builds the canonical local bridge URL for one Copilot runtime provider.
@@ -194,7 +197,7 @@ function validateProviderRuntime(name, runtime) {
         throw new Error(`Provider "${name}" has an invalid runtime block.`);
     }
     const record = runtime;
-    if (record.kind !== "copilot-sdk-bridge") {
+    if (record.kind !== "copilot-http-proxy" && record.kind !== "copilot-sdk-bridge") {
         throw new Error(`Provider "${name}" has an unsupported runtime kind.`);
     }
     if (record.upstream !== "github-copilot") {
@@ -212,10 +215,7 @@ function validateProviderRuntime(name, runtime) {
     if (record.premiumRequests !== true) {
         throw new Error(`Provider "${name}" must enable runtime premiumRequests.`);
     }
-    if (record.authSource !== "official-sdk") {
+    if (record.authSource !== "github-pat" && record.authSource !== "official-sdk") {
         throw new Error(`Provider "${name}" has an invalid runtime authSource.`);
     }
-    if (record.sdkInstallMode !== "lazy") {
-        throw new Error(`Provider "${name}" has an invalid runtime sdkInstallMode.`);
-    }
 }

package/dist/runtime/copilot-adapter.js

@@ -340,7 +340,12 @@ async function stopCopilotClient(client) {
 async function abortCopilotSession(session) {
     const abort = resolveCallable(session, "abort");
     if (abort) {
-        await Promise.resolve(abort());
+        try {
+            await Promise.resolve(abort());
+        }
+        catch {
+            // Session may already be closed or unknown — safe to ignore
+        }
     }
 }
 async function disconnectCopilotSession(session) {