theclawbay 0.3.70 → 0.3.72

package/dist/commands/logout.js

@@ -65,7 +65,7 @@ const LEGACY_THECLAWBAY_OPENAI_PROXY_SUFFIX = "/api/codex-auth/v1/proxy/v1";
 const CANONICAL_THECLAWBAY_OPENAI_PROXY_SUFFIX = "/v1";
 const THECLAWBAY_CANONICAL_API_HOST = "api.theclawbay.com";
 const THECLAWBAY_WEBSITE_HOSTS = new Set(["theclawbay.com", "www.theclawbay.com"]);
-const SUPPORTED_MODEL_IDS = new Set((0, supported_models_1.getKnownTheClawBayModelIds)());
+const SUPPORTED_MODEL_IDS = new Set((0, supported_models_1.getSupportedModelIds)());
 const CONTINUE_MODEL_NAME = "The Claw Bay";
 const TRAE_PATCH_MARKER = "theclawbay-trae-patch";
 const TRAE_BUNDLE_BACKUP_SUFFIX = ".theclawbay-managed-backup";
@@ -1548,10 +1548,10 @@ class LogoutCommand extends base_command_1.BaseCommand {
                 this.log("- Codex login state: no cleanup needed.");
             }
             if (modelCacheCleanup.action === "removed") {
-                this.log("- Codex model cache: removed the Claw Bay managed model catalog.");
+                this.log("- Codex model cache: removed the Claw Bay GPT-5.5 / GPT-5.4 / GPT-5.4 Mini seed.");
             }
             else if (modelCacheCleanup.action === "preserved") {
-                this.log("- Codex model cache: preserved an existing model catalog entry.");
+                this.log("- Codex model cache: preserved an existing GPT-5.5 / GPT-5.4 / GPT-5.4 Mini entry.");
             }
             else if (modelCacheCleanup.warning) {
                 this.log(`- Codex model cache: ${modelCacheCleanup.warning}`);

package/dist/commands/setup.js

@@ -14,7 +14,6 @@ const core_1 = require("@oclif/core");
 const yaml_1 = require("yaml");
 const base_command_1 = require("../lib/base-command");
 const codex_auth_seeding_1 = require("../lib/codex-auth-seeding");
-const codex_desktop_model_picker_1 = require("../lib/codex-desktop-model-picker");
 const codex_history_migration_1 = require("../lib/codex-history-migration");
 const codex_model_cache_migration_1 = require("../lib/codex-model-cache-migration");
 const paths_1 = require("../lib/config/paths");
@@ -28,9 +27,7 @@ const DEFAULT_PROVIDER_ID = "theclawbay";
 const CLI_HTTP_USER_AGENT = "theclawbay-cli";
 const SUPPORTED_MODEL_IDS = (0, supported_models_1.getSupportedModelIds)();
 const MODEL_DISPLAY_NAMES = (0, supported_models_1.getSupportedModelDisplayNames)();
-const DEFAULT_CODEX_MODEL = (["gpt-5.5", "gpt-5.4"].find((modelId) => SUPPORTED_MODEL_IDS.includes(modelId)) ??
-    SUPPORTED_MODEL_IDS[0] ??
-    "gpt-5.4");
+const DEFAULT_CODEX_MODEL = SUPPORTED_MODEL_IDS[0] ?? "gpt-5.5";
 const DEFAULT_CONTINUE_MODEL = DEFAULT_CODEX_MODEL;
 const DEFAULT_CLINE_MODEL = DEFAULT_CODEX_MODEL;
 const DEFAULT_OPENCLAW_MODEL = DEFAULT_CODEX_MODEL;
@@ -40,7 +37,7 @@ const DEFAULT_TRAE_MODEL = DEFAULT_CODEX_MODEL;
 const DEFAULT_AIDER_MODEL = DEFAULT_CODEX_MODEL;
 const DEFAULT_ZO_MODEL = DEFAULT_CODEX_MODEL;
 const DEFAULT_MODELS = [...SUPPORTED_MODEL_IDS];
-const PREFERRED_MODELS = Array.from(new Set(["gpt-5.5", ...SUPPORTED_MODEL_IDS]));
+const PREFERRED_MODELS = [...SUPPORTED_MODEL_IDS];
 const ENV_KEY_NAME = "THECLAWBAY_API_KEY";
 const CLAUDE_ENV_API_KEY_NAME = "ANTHROPIC_API_KEY";
 const CLAUDE_ENV_BASE_URL_NAME = "ANTHROPIC_BASE_URL";
@@ -516,7 +513,10 @@ function upsertTopLevelTableKey(source, tableName, key, tomlValue) {
     lines.splice(tableEnd, 0, `${key} = ${tomlValue}`);
     return `${lines.join("\n").trimEnd()}\n`;
 }
-function readTopLevelTableKeyValue(source, tableName, key) {
+function setTopLevelTableKey(source, tableName, key, tomlValue) {
+    return upsertTopLevelTableKey(source, tableName, key, tomlValue);
+}
+function removeTopLevelTableKey(source, tableName, key) {
     const header = `[${tableName}]`;
     const lines = source.split(/\r?\n/);
     let tableStart = -1;
@@ -526,20 +526,55 @@ function readTopLevelTableKeyValue(source, tableName, key) {
             break;
         }
     }
-    if (tableStart < 0) {
-        return { hadTable: false, hadKey: false, value: null };
-    }
+    if (tableStart < 0)
+        return source;
+    let tableEnd = lines.length;
     for (let i = tableStart + 1; i < lines.length; i++) {
-        const line = lines[i] ?? "";
-        if (/^\s*\[[^\]]+\]\s*$/.test(line))
+        if (/^\s*\[[^\]]+\]\s*$/.test(lines[i] ?? "")) {
+            tableEnd = i;
             break;
-        if (/^\s*#/.test(line) || !line.trim())
+        }
+    }
+    const nextLines = [...lines];
+    for (let i = tableStart + 1; i < tableEnd; i++) {
+        const line = nextLines[i] ?? "";
+        if (/^\s*#/.test(line))
             continue;
         if (new RegExp(`^\\s*${key}\\s*=`).test(line)) {
-            return { hadTable: true, hadKey: true, value: parseTomlScalarValue(line) };
+            nextLines.splice(i, 1);
+            return `${nextLines.join("\n").trimEnd()}\n`;
         }
     }
-    return { hadTable: true, hadKey: false, value: null };
+    return source;
+}
+async function restoreManagedCodexFeatureFlags(source) {
+    const snapshotRaw = await readFileIfExists(CODEX_FEATURE_FLAGS_STATE_PATH);
+    if (snapshotRaw === null || !snapshotRaw.trim())
+        return source;
+    let snapshot = null;
+    try {
+        snapshot = JSON.parse(snapshotRaw);
+    }
+    catch {
+        snapshot = null;
+    }
+    await removeFileIfExists(CODEX_FEATURE_FLAGS_STATE_PATH);
+    if (!snapshot)
+        return source;
+    let next = source;
+    if (snapshot.appsHadKey && snapshot.appsPreviousValue !== null) {
+        next = setTopLevelTableKey(next, "features", "apps", snapshot.appsPreviousValue);
+    }
+    else {
+        next = removeTopLevelTableKey(next, "features", "apps");
+    }
+    if (snapshot.appsMcpGatewayHadKey && snapshot.appsMcpGatewayPreviousValue !== null) {
+        next = setTopLevelTableKey(next, "features", "apps_mcp_gateway", snapshot.appsMcpGatewayPreviousValue);
+    }
+    else {
+        next = removeTopLevelTableKey(next, "features", "apps_mcp_gateway");
+    }
+    return next;
 }
 function removeTopLevelKeyLineIf(source, key, shouldRemove) {
     const lines = source.split(/\r?\n/);
@@ -1088,38 +1123,18 @@ function resolveSetupClientSelection(params) {
 async function promptForCodexConversationMigration() {
     if (!process.stdin.isTTY || !process.stdout.isTTY)
         return false;
-    const stdin = process.stdin;
-    const stdout = process.stdout;
-    const wasRaw = stdin.isRaw;
-    stdin.resume();
-    return new Promise((resolve) => {
-        const finish = (enabled) => {
-            stdin.off("data", onData);
-            if (stdin.isTTY)
-                stdin.setRawMode(Boolean(wasRaw));
-            stdout.write("\n");
-            resolve(enabled);
-        };
-        const onData = (chunk) => {
-            const key = chunk.toString("utf8");
-            if (key === "\u0003") {
-                stdout.write("\x1b[?25h");
-                process.exit(130);
-            }
-            const normalized = key.trim().toLowerCase();
-            if (normalized === "y" || normalized === "yes") {
-                finish(true);
-                return;
-            }
-            if (!normalized || normalized === "n" || normalized === "no") {
-                finish(false);
-            }
-        };
-        process.stdout.write("\nConvert old Codex conversations so they stay visible under The Claw Bay? [y/N] ");
-        if (stdin.isTTY)
-            stdin.setRawMode(true);
-        stdin.on("data", onData);
+    const rl = (0, promises_2.createInterface)({
+        input: process.stdin,
+        output: process.stdout,
     });
+    try {
+        const answer = await rl.question("\nConvert old Codex conversations so they stay visible under The Claw Bay? [y/N] ");
+        const normalized = answer.trim().toLowerCase();
+        return normalized === "y" || normalized === "yes";
+    }
+    finally {
+        rl.close();
+    }
 }
 async function resolveCodexConversationMigrationSelection(params) {
     if (!params.codexSelected)
@@ -1509,36 +1524,15 @@ async function writeCodexConfig(params) {
     }
     const proxyRoot = publicApiOriginForBackendUrl(params.backendUrl);
     const nativeCodexBaseUrl = `${proxyRoot}${CANONICAL_CODEX_NATIVE_PROXY_SUFFIX}`;
-    let next = existing;
+    let next = await restoreManagedCodexFeatureFlags(existing);
     next = removeManagedBlock(next, MANAGED_START, MANAGED_END);
     next = removeProviderTable(next, DEFAULT_PROVIDER_ID);
-    next = upsertFirstKeyLine(next, "model_provider", `"${DEFAULT_PROVIDER_ID}"`);
+    next = upsertFirstKeyLine(next, "model_provider", `"${OPENAI_PROVIDER_ID}"`);
     next = upsertFirstKeyLine(next, "model", `"${params.model}"`);
+    next = upsertFirstKeyLine(next, "openai_base_url", `"${nativeCodexBaseUrl}"`);
     next = removeTopLevelKeyLineIf(next, "chatgpt_base_url", isTheClawBayChatgptBaseUrl);
-    const existingFeatureSnapshot = await readFileIfExists(CODEX_FEATURE_FLAGS_STATE_PATH);
-    if (!existingFeatureSnapshot?.trim()) {
-        const appsState = readTopLevelTableKeyValue(next, "features", "apps");
-        const appsMcpGatewayState = readTopLevelTableKeyValue(next, "features", "apps_mcp_gateway");
-        const snapshot = {
-            hadFeaturesTable: appsState.hadTable || appsMcpGatewayState.hadTable,
-            appsHadKey: appsState.hadKey,
-            appsPreviousValue: appsState.value,
-            appsMcpGatewayHadKey: appsMcpGatewayState.hadKey,
-            appsMcpGatewayPreviousValue: appsMcpGatewayState.value,
-        };
-        await writeJsonObjectFile(CODEX_FEATURE_FLAGS_STATE_PATH, snapshot, 0o600);
-    }
-    next = upsertTopLevelTableKey(next, "features", "apps", "false");
-    next = upsertTopLevelTableKey(next, "features", "apps_mcp_gateway", "false");
     const managedBlock = appendManagedBlock("", [
         MANAGED_START,
-        `[model_providers.${DEFAULT_PROVIDER_ID}]`,
-        'name = "OpenAI"',
-        `base_url = "${nativeCodexBaseUrl}"`,
-        'wire_api = "responses"',
-        "requires_openai_auth = true",
-        "supports_websockets = true",
-        `experimental_bearer_token = "${params.apiKey}"`,
         MANAGED_END,
     ]);
     next = appendManagedBlock(next, managedBlock.trimEnd().split("\n"));
@@ -2417,12 +2411,10 @@ function objectRecordOr(value, fallback) {
 function modelContextLimit(modelId) {
     if (modelId === "gpt-5.4")
         return 1050000;
-    if (modelId === "gpt-5.5")
-        return 1000000;
     return 272000;
 }
 function modelOutputLimit(modelId) {
-    if (modelId === "gpt-5.4" || modelId === "gpt-5.5")
+    if (modelId === "gpt-5.4")
         return 128000;
     return 65536;
 }
@@ -2989,10 +2981,9 @@ class SetupCommand extends base_command_1.BaseCommand {
             let restoredClaudeDesktop3pConfig = false;
             let claudeDesktop3pConfigPathManaged = null;
             let sessionMigration = null;
-            let authSeedResult = null;
+            let authSeedCleanup = null;
             let stateDbMigration = null;
             let modelCacheMigration = null;
-            let desktopModelPickerMigration = null;
             let continueConfigPath = null;
             let clineConfigPaths = [];
             let gsdConfigPaths = [];
@@ -3092,22 +3083,19 @@ class SetupCommand extends base_command_1.BaseCommand {
                             neutralizeSources: HISTORY_PROVIDER_NEUTRALIZE_SOURCES,
                         });
                     }
-                    authSeedResult = await (0, codex_auth_seeding_1.ensureCodexUsageLimitAuth)({
+                    authSeedCleanup = await (0, codex_auth_seeding_1.cleanupSeededCodexAuth)({
                         codexHome: paths_1.codexDir,
-                        apiKey: authCredential,
-                        replaceExistingAuth: true,
                     });
                     if (migrateCodexConversations) {
                         stateDbMigration = await (0, codex_history_migration_1.migrateStateDbProviders)({
                             codexHome: paths_1.codexDir,
-                            targetProvider: DEFAULT_PROVIDER_ID,
+                            targetProvider: OPENAI_PROVIDER_ID,
                             sourceProviders: HISTORY_PROVIDER_DB_MIGRATE_SOURCES,
                         });
                     }
                     modelCacheMigration = await (0, codex_model_cache_migration_1.ensureCodexModelCacheHasGpt54)({
                         codexHome: paths_1.codexDir,
                     });
-                    desktopModelPickerMigration = await (0, codex_desktop_model_picker_1.ensureCodexDesktopModelPickerSupport)();
                 }
                 if (selectedSetupClients.has("continue")) {
                     progress.update("Configuring Continue");
@@ -3236,19 +3224,13 @@ class SetupCommand extends base_command_1.BaseCommand {
             }
             if (modelCacheMigration?.warning)
                 summaryNotes.add(modelCacheMigration.warning);
-            if (desktopModelPickerMigration?.warning)
-                summaryNotes.add(desktopModelPickerMigration.warning);
-            if (authSeedResult?.warning)
-                summaryNotes.add(authSeedResult.warning);
-            if (authSeedResult &&
-                ["seeded", "updated", "already_seeded"].includes(authSeedResult.action)) {
-                summaryNotes.add("Codex desktop clients were pinned to the local The Claw Bay API-key auth path while the desktop picker compatibility patches keep current VS Code and Codex app builds on the The Claw Bay model catalog.");
-            }
-            if (desktopModelPickerMigration?.action === "patched") {
-                summaryNotes.add("Desktop model pickers were refreshed so current VS Code and Codex app builds stop labeling supported The Claw Bay models like GPT-5.5 as Custom.");
+            if (authSeedCleanup?.warning)
+                summaryNotes.add(authSeedCleanup.warning);
+            if (authSeedCleanup?.action === "removed") {
+                summaryNotes.add("Removed an older The Claw Bay Codex auth override that newer Codex releases now treat as invalid ChatGPT OAuth.");
             }
-            if (selectedSetupClients.has("codex")) {
-                summaryNotes.add("If Codex updates later, rerun `theclawbay setup` once to refresh its local model catalog.");
+            else if (authSeedCleanup?.action === "restored_backup") {
+                summaryNotes.add("Restored the Codex auth that existed before an older The Claw Bay auth override.");
             }
             if (selectedSetupClients.has("codex") && !migrateCodexConversations) {
                 summaryNotes.add("Left existing Codex conversations untouched.");
@@ -3351,31 +3333,17 @@ class SetupCommand extends base_command_1.BaseCommand {
                 else if (modelCacheMigration) {
                     this.log("- Codex model cache: no change.");
                 }
-                if (desktopModelPickerMigration?.action === "patched") {
-                    this.log("- Codex desktop picker: refreshed VS Code / Codex app picker compatibility so supported The Claw Bay models keep their real labels.");
-                }
-                else if (desktopModelPickerMigration?.warning) {
-                    this.log(`- Codex desktop picker: ${desktopModelPickerMigration.warning}`);
-                }
-                else if (desktopModelPickerMigration) {
-                    this.log("- Codex desktop picker: no change.");
-                }
-                if (authSeedResult?.action === "seeded") {
-                    this.log(authSeedResult.replacedExistingAuth
-                        ? "- Codex login state: backed up the existing Codex auth and switched local desktop auth back to the Claw Bay API-key mode."
-                        : "- Codex login state: seeded local desktop auth in the Claw Bay API-key mode.");
-                }
-                else if (authSeedResult?.action === "updated") {
-                    this.log("- Codex login state: refreshed the local The Claw Bay API-key auth seed.");
+                if (authSeedCleanup?.action === "restored_backup") {
+                    this.log("- Codex login state: restored the auth that existed before an older The Claw Bay override.");
                 }
-                else if (authSeedResult?.action === "already_seeded") {
-                    this.log("- Codex login state: local desktop auth was already pinned to the Claw Bay API-key mode.");
+                else if (authSeedCleanup?.action === "removed") {
+                    this.log("- Codex login state: removed the older The Claw Bay ChatGPT-token override for compatibility with current Codex releases.");
                 }
-                else if (authSeedResult?.warning) {
-                    this.log(`- Codex login state: ${authSeedResult.warning}`);
+                else if (authSeedCleanup?.warning) {
+                    this.log(`- Codex login state: ${authSeedCleanup.warning}`);
                 }
                 else {
-                    this.log("- Codex login state: no change.");
+                    this.log("- Codex login state: using provider-scoped bearer auth only; no fake ChatGPT auth tokens were seeded.");
                 }
             }
             else if (codexDetected) {

package/dist/lib/codex-auth-seeding.d.ts

@@ -12,12 +12,10 @@ export type CleanupCodexAuthResult = {
 export declare function ensureCodexApiKeyAuth(params: {
     codexHome: string;
     apiKey: string;
-    replaceExistingAuth?: boolean;
 }): Promise<EnsureCodexAuthResult>;
 export declare function ensureCodexUsageLimitAuth(params: {
     codexHome: string;
     apiKey: string;
-    replaceExistingAuth?: boolean;
 }): Promise<EnsureCodexAuthResult>;
 export declare function cleanupSeededCodexAuth(params: {
     codexHome: string;

package/dist/lib/codex-auth-seeding.js

@@ -74,19 +74,15 @@ function buildFakeJwt(params) {
 }
 function buildSeededAuthDocument(params) {
     if (params.mode === "chatgpt-auth-tokens") {
-        const fakeJwt = buildFakeJwt({
-            email: THECLAWBAY_CHATGPT_EMAIL,
-            accountId: THECLAWBAY_CHATGPT_ACCOUNT_ID,
-            planType: THECLAWBAY_CHATGPT_PLAN_TYPE,
-        });
         return {
             auth_mode: "chatgptAuthTokens",
             tokens: {
-                // Current desktop Codex builds derive the local ChatGPT-style account
-                // identity from these token fields. Keep them obviously fake so the real
-                // The Claw Bay bearer stays scoped to experimental_bearer_token only.
-                id_token: fakeJwt,
-                access_token: fakeJwt,
+                id_token: buildFakeJwt({
+                    email: THECLAWBAY_CHATGPT_EMAIL,
+                    accountId: THECLAWBAY_CHATGPT_ACCOUNT_ID,
+                    planType: THECLAWBAY_CHATGPT_PLAN_TYPE,
+                }),
+                access_token: params.apiKey,
                 refresh_token: "",
                 account_id: THECLAWBAY_CHATGPT_ACCOUNT_ID,
             },
@@ -240,16 +236,14 @@ async function ensureCodexApiKeyAuth(params) {
         codexHome: params.codexHome,
         apiKey: params.apiKey,
         mode: "api-key",
-        replaceExistingAuth: params.replaceExistingAuth ?? false,
+        replaceExistingAuth: false,
     });
 }
 async function ensureCodexUsageLimitAuth(params) {
-    // Current desktop Codex builds treat chatgptAuthTokens as real ChatGPT web
-    // auth and can trigger upstream plugin sync calls against chatgpt.com. With
-    // The Claw Bay, that can wedge the desktop startup path behind Cloudflare
-    // challenges and leave Codex / VS Code stuck on splash. Keep desktop auth on
-    // the local API-key path and rely on the managed config + picker patches for
-    // model catalog compatibility instead.
+    // Current Codex releases treat chatgptAuthTokens.access_token as a real
+    // ChatGPT JWT and use it against chatgpt.com. The Claw Bay credentials are
+    // provider-scoped bearer tokens, so the legacy fake-ChatGPT seed path is no
+    // longer safe to apply here.
     return ensureCodexApiKeyAuth(params);
 }
 async function cleanupSeededCodexAuth(params) {