theclawbay 0.3.21 → 0.3.23

package/dist/commands/logout.js

@@ -13,22 +13,20 @@ const codex_model_cache_migration_1 = require("../lib/codex-model-cache-migratio
 const paths_1 = require("../lib/config/paths");
 const OPENAI_PROVIDER_ID = "openai";
 const DEFAULT_PROVIDER_ID = "theclawbay";
-const LEGACY_PROVIDER_ID = "codex-lb";
 const WAN_PROVIDER_ID = "theclawbay-wan";
 const MANAGED_START = "# theclawbay-managed:start";
 const MANAGED_END = "# theclawbay-managed:end";
 const SHELL_START = "# theclawbay-shell-managed:start";
 const SHELL_END = "# theclawbay-shell-managed:end";
 const ENV_FILE = node_path_1.default.join(node_os_1.default.homedir(), ".config", "theclawbay", "env");
-const ENV_KEY_NAME = "CODEX_LB_API_KEY";
+const ENV_KEY_NAME = "THECLAWBAY_API_KEY";
 const MIGRATION_STATE_FILE = node_path_1.default.join(paths_1.codexDir, "theclawbay.migration.json");
 const HISTORY_PROVIDER_NEUTRALIZE_SOURCES = new Set([
     OPENAI_PROVIDER_ID,
     WAN_PROVIDER_ID,
     DEFAULT_PROVIDER_ID,
-    LEGACY_PROVIDER_ID,
 ]);
-const HISTORY_PROVIDER_DB_MIGRATE_SOURCES = [DEFAULT_PROVIDER_ID, WAN_PROVIDER_ID, LEGACY_PROVIDER_ID];
+const HISTORY_PROVIDER_DB_MIGRATE_SOURCES = [DEFAULT_PROVIDER_ID, WAN_PROVIDER_ID];
 const TRAE_PATCH_MARKER = "theclawbay-trae-patch";
 const TRAE_BUNDLE_BACKUP_SUFFIX = ".theclawbay-managed-backup";
 function removeManagedBlock(source, start, end) {
@@ -74,7 +72,7 @@ function removeTopLevelProviderSelection(source) {
             filtered.push(line);
             continue;
         }
-        if (match[1] === DEFAULT_PROVIDER_ID || match[1] === LEGACY_PROVIDER_ID)
+        if (match[1] === DEFAULT_PROVIDER_ID)
             continue;
         filtered.push(line);
     }
@@ -135,7 +133,6 @@ async function cleanupCodexConfig() {
     let next = existing;
     next = removeManagedBlock(next, MANAGED_START, MANAGED_END);
     next = removeProviderTable(next, DEFAULT_PROVIDER_ID);
-    next = removeProviderTable(next, LEGACY_PROVIDER_ID);
     next = removeTopLevelProviderSelection(next);
     return writeIfChanged(configPath, next, existing);
 }
@@ -181,7 +178,7 @@ async function cleanupOpenClawConfig() {
     let changed = false;
     const modelsRoot = objectRecordOr(doc.models, {});
     const providersRoot = objectRecordOr(modelsRoot.providers, {});
-    for (const id of [DEFAULT_PROVIDER_ID, LEGACY_PROVIDER_ID]) {
+    for (const id of [DEFAULT_PROVIDER_ID]) {
         if (id in providersRoot) {
             delete providersRoot[id];
             changed = true;
@@ -193,8 +190,7 @@ async function cleanupOpenClawConfig() {
     const defaultsRoot = objectRecordOr(agentsRoot.defaults, {});
     const modelRoot = objectRecordOr(defaultsRoot.model, {});
     const primary = modelRoot.primary;
-    if (typeof primary === "string" &&
-        (primary.startsWith(`${DEFAULT_PROVIDER_ID}/`) || primary.startsWith(`${LEGACY_PROVIDER_ID}/`))) {
+    if (typeof primary === "string" && primary.startsWith(`${DEFAULT_PROVIDER_ID}/`)) {
         delete modelRoot.primary;
         changed = true;
     }
@@ -220,7 +216,7 @@ async function cleanupOpenCodeConfig() {
     }
     let changed = false;
     const providerRoot = objectRecordOr(doc.provider, {});
-    for (const id of [DEFAULT_PROVIDER_ID, LEGACY_PROVIDER_ID]) {
+    for (const id of [DEFAULT_PROVIDER_ID]) {
         if (id in providerRoot) {
             delete providerRoot[id];
             changed = true;
@@ -228,8 +224,7 @@ async function cleanupOpenCodeConfig() {
     }
     doc.provider = providerRoot;
     const model = doc.model;
-    if (typeof model === "string" &&
-        (model.startsWith(`${DEFAULT_PROVIDER_ID}/`) || model.startsWith(`${LEGACY_PROVIDER_ID}/`))) {
+    if (typeof model === "string" && model.startsWith(`${DEFAULT_PROVIDER_ID}/`)) {
         delete doc.model;
         changed = true;
     }
@@ -252,7 +247,7 @@ async function cleanupKiloConfig() {
     }
     let changed = false;
     const providerRoot = objectRecordOr(doc.provider, {});
-    for (const id of [DEFAULT_PROVIDER_ID, LEGACY_PROVIDER_ID]) {
+    for (const id of [DEFAULT_PROVIDER_ID]) {
         if (id in providerRoot) {
             delete providerRoot[id];
             changed = true;
@@ -260,8 +255,7 @@ async function cleanupKiloConfig() {
     }
     doc.provider = providerRoot;
     const model = doc.model;
-    if (typeof model === "string" &&
-        (model.startsWith(`${DEFAULT_PROVIDER_ID}/`) || model.startsWith(`${LEGACY_PROVIDER_ID}/`))) {
+    if (typeof model === "string" && model.startsWith(`${DEFAULT_PROVIDER_ID}/`)) {
         delete doc.model;
         changed = true;
     }

package/dist/commands/setup.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const node_fs_1 = require("node:fs");
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -19,7 +20,6 @@ const config_1 = require("../lib/managed/config");
 const errors_1 = require("../lib/managed/errors");
 const DEFAULT_BACKEND_URL = "https://theclawbay.com";
 const DEFAULT_PROVIDER_ID = "theclawbay";
-const LEGACY_PROVIDER_ID = "codex-lb";
 const CLI_HTTP_USER_AGENT = "theclawbay-cli";
 const DEFAULT_CODEX_MODEL = "gpt-5.4";
 const DEFAULT_OPENCLAW_MODEL = "gpt-5.4";
@@ -58,7 +58,7 @@ const MODEL_DISPLAY_NAMES = {
     "gpt-5.1-codex": "GPT-5.1 Codex",
     "gpt-5.1": "GPT-5.1",
 };
-const ENV_KEY_NAME = "CODEX_LB_API_KEY";
+const ENV_KEY_NAME = "THECLAWBAY_API_KEY";
 const ENV_FILE = node_path_1.default.join(node_os_1.default.homedir(), ".config", "theclawbay", "env");
 const MIGRATION_STATE_FILE = node_path_1.default.join(paths_1.codexDir, "theclawbay.migration.json");
 const MANAGED_START = "# theclawbay-managed:start";
@@ -66,8 +66,8 @@ const MANAGED_END = "# theclawbay-managed:end";
 const SHELL_START = "# theclawbay-shell-managed:start";
 const SHELL_END = "# theclawbay-shell-managed:end";
 const OPENCLAW_PROVIDER_ID = DEFAULT_PROVIDER_ID;
-const HISTORY_PROVIDER_NEUTRALIZE_SOURCES = new Set(["openai", "theclawbay-wan", DEFAULT_PROVIDER_ID, LEGACY_PROVIDER_ID]);
-const HISTORY_PROVIDER_DB_MIGRATE_SOURCES = ["openai", "theclawbay-wan", LEGACY_PROVIDER_ID];
+const HISTORY_PROVIDER_NEUTRALIZE_SOURCES = new Set(["openai", "theclawbay-wan", DEFAULT_PROVIDER_ID]);
+const HISTORY_PROVIDER_DB_MIGRATE_SOURCES = ["openai", "theclawbay-wan"];
 const OPTIONAL_SETUP_CLIENT_IDS = ["openclaw", "opencode", "kilo", "trae"];
 const TRAE_PATCH_MARKER = "theclawbay-trae-patch";
 const TRAE_BUNDLE_BACKUP_SUFFIX = ".theclawbay-managed-backup";
@@ -95,10 +95,45 @@ function localAppDataDir() {
         return process.env.LOCALAPPDATA;
     return node_path_1.default.join(node_os_1.default.homedir(), "AppData", "Local");
 }
+const TRAE_BUNDLE_RELATIVE_PATH = node_path_1.default.join("resources", "app", "node_modules", "@byted-icube", "ai-modules-chat", "dist", "index.js");
+function appendTraeBundlePath(basePath) {
+    if (basePath.toLowerCase().endsWith(node_path_1.default.normalize(TRAE_BUNDLE_RELATIVE_PATH).toLowerCase())) {
+        return basePath;
+    }
+    return node_path_1.default.join(basePath, TRAE_BUNDLE_RELATIVE_PATH);
+}
+function traeBundleCandidateRoots() {
+    const candidates = new Set();
+    if (process.env.THECLAWBAY_TRAE_PATH?.trim()) {
+        candidates.add(process.env.THECLAWBAY_TRAE_PATH.trim());
+    }
+    const localPrograms = node_path_1.default.join(localAppDataDir(), "Programs");
+    candidates.add(node_path_1.default.join(localPrograms, "Trae"));
+    for (const envKey of ["ProgramFiles", "ProgramFiles(x86)"]) {
+        const root = process.env[envKey]?.trim();
+        if (root)
+            candidates.add(node_path_1.default.join(root, "Trae"));
+    }
+    if ((0, node_fs_1.existsSync)(localPrograms)) {
+        for (const entry of (0, node_fs_1.readdirSync)(localPrograms, { withFileTypes: true })) {
+            if (!entry.isDirectory())
+                continue;
+            if (!entry.name.toLowerCase().includes("trae"))
+                continue;
+            candidates.add(node_path_1.default.join(localPrograms, entry.name));
+        }
+    }
+    return Array.from(candidates);
+}
 function traeBundlePath() {
     if (node_os_1.default.platform() !== "win32")
         return null;
-    return node_path_1.default.join(localAppDataDir(), "Programs", "Trae", "resources", "app", "node_modules", "@byted-icube", "ai-modules-chat", "dist", "index.js");
+    for (const candidateRoot of traeBundleCandidateRoots()) {
+        const bundlePath = appendTraeBundlePath(candidateRoot);
+        if ((0, node_fs_1.existsSync)(bundlePath))
+            return bundlePath;
+    }
+    return appendTraeBundlePath(node_path_1.default.join(localAppDataDir(), "Programs", "Trae"));
 }
 function traeBundleBackupPath(bundlePath) {
     return `${bundlePath}${TRAE_BUNDLE_BACKUP_SUFFIX}`;
@@ -392,7 +427,6 @@ async function writeCodexConfig(params) {
     const proxyRoot = `${trimTrailingSlash(params.backendUrl)}/api/codex-auth/v1/proxy`;
     let next = existing;
     next = removeManagedBlock(next, MANAGED_START, MANAGED_END);
-    next = removeProviderTable(next, LEGACY_PROVIDER_ID);
     next = removeProviderTable(next, DEFAULT_PROVIDER_ID);
     next = upsertFirstKeyLine(next, "model_provider", `"${DEFAULT_PROVIDER_ID}"`);
     next = upsertFirstKeyLine(next, "model", `"${params.model}"`);
@@ -484,9 +518,8 @@ function runOpenClawConfigCommand(args) {
 function isOpenClawMissingApiKeyEnvError(error) {
     if (!(error instanceof Error))
         return false;
-    return (error.message.includes('Missing env var "CODEX_LB_API_KEY"') &&
-        (error.message.includes(`models.providers.${LEGACY_PROVIDER_ID}.apiKey`) ||
-            error.message.includes(`models.providers.${OPENCLAW_PROVIDER_ID}.apiKey`)));
+    return (error.message.includes(`Missing env var "${ENV_KEY_NAME}"`) &&
+        error.message.includes(`models.providers.${OPENCLAW_PROVIDER_ID}.apiKey`));
 }
 function resolveOpenClawPrimaryModel(params) {
     const hasStableDefault = params.models.some((entry) => entry.id === DEFAULT_OPENCLAW_MODEL);
@@ -523,9 +556,6 @@ async function patchOpenClawConfigFile(params) {
     const modelsRoot = objectRecordOr(doc.models, {});
     modelsRoot.mode = "merge";
     const providersRoot = objectRecordOr(modelsRoot.providers, {});
-    if (LEGACY_PROVIDER_ID !== OPENCLAW_PROVIDER_ID && LEGACY_PROVIDER_ID in providersRoot) {
-        delete providersRoot[LEGACY_PROVIDER_ID];
-    }
     providersRoot[OPENCLAW_PROVIDER_ID] = provider;
     modelsRoot.providers = providersRoot;
     doc.models = modelsRoot;
@@ -580,9 +610,6 @@ async function writeOpenCodeConfig(params) {
         }
     }
     const providerRoot = objectRecordOr(doc.provider, {});
-    if (LEGACY_PROVIDER_ID !== DEFAULT_PROVIDER_ID && LEGACY_PROVIDER_ID in providerRoot) {
-        delete providerRoot[LEGACY_PROVIDER_ID];
-    }
     providerRoot[DEFAULT_PROVIDER_ID] = {
         npm: "@ai-sdk/openai-compatible",
         name: DEFAULT_PROVIDER_ID,
@@ -619,9 +646,6 @@ async function writeKiloConfig(params) {
         }
     }
     const providerRoot = objectRecordOr(doc.provider, {});
-    if (LEGACY_PROVIDER_ID !== DEFAULT_PROVIDER_ID && LEGACY_PROVIDER_ID in providerRoot) {
-        delete providerRoot[LEGACY_PROVIDER_ID];
-    }
     providerRoot[DEFAULT_PROVIDER_ID] = {
         npm: "@ai-sdk/openai-compatible",
         name: DEFAULT_PROVIDER_ID,
@@ -904,7 +928,7 @@ class SetupCommand extends base_command_1.BaseCommand {
             else {
                 this.log("- Codex login state: no change.");
             }
-            this.log("Next: restart terminal/VS Code window only if you rely on CODEX_LB_API_KEY in your own scripts.");
+            this.log("Next: restart terminal/VS Code window only if you rely on the The Claw Bay API key in your own scripts.");
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "theclawbay",
-  "version": "0.3.21",
+  "version": "0.3.23",
   "description": "CLI for connecting Codex, OpenClaw, OpenCode, Kilo, and experimental Trae to The Claw Bay.",
   "license": "MIT",
   "bin": {