theclawbay 0.3.32 → 0.3.33

package/README.md

@@ -18,6 +18,7 @@ theclawbay setup --api-key <apiKey>
 
 In an interactive terminal, setup shows one picker for Codex, Continue, Cline, OpenClaw, OpenCode, Kilo, Roo Code, Aider, and Windows Trae.
 Each row includes a terminal-friendly icon plus the tool's official site, and you can toggle items with arrow keys plus `Enter` or by pressing their number.
+Re-running setup also migrates legacy OpenCode and Kilo patches to the current reasoning-capable provider path and refreshes OpenClaw model metadata.
 
 ## Optional
 

package/dist/commands/logout.js

@@ -13,6 +13,7 @@ const codex_auth_seeding_1 = require("../lib/codex-auth-seeding");
 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");
+const supported_models_1 = require("../lib/supported-models");
 const OPENAI_PROVIDER_ID = "openai";
 const DEFAULT_PROVIDER_ID = "theclawbay";
 const WAN_PROVIDER_ID = "theclawbay-wan";
@@ -29,6 +30,8 @@ const CLINE_GLOBAL_STATE_PATH = node_path_1.default.join(node_os_1.default.homed
 const CLINE_SECRETS_PATH = node_path_1.default.join(node_os_1.default.homedir(), ".cline", "data", "secrets.json");
 const AIDER_CONFIG_PATH = node_path_1.default.join(node_os_1.default.homedir(), ".aider.conf.yml");
 const CLINE_RESTORE_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "cline.restore.json");
+const OPENCODE_RESTORE_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "opencode.restore.json");
+const KILO_RESTORE_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "kilo.restore.json");
 const ROO_SETTINGS_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "roo-settings.restore.json");
 const ROO_IMPORT_FILE = node_path_1.default.join(paths_1.theclawbayConfigDir, "roo-code-settings.json");
 const MIGRATION_STATE_FILE = node_path_1.default.join(paths_1.codexDir, "theclawbay.migration.json");
@@ -39,6 +42,7 @@ const HISTORY_PROVIDER_NEUTRALIZE_SOURCES = new Set([
 ]);
 const HISTORY_PROVIDER_DB_MIGRATE_SOURCES = [DEFAULT_PROVIDER_ID, WAN_PROVIDER_ID];
 const THECLAWBAY_OPENAI_PROXY_SUFFIX = "/api/codex-auth/v1/proxy/v1";
+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";
@@ -179,6 +183,18 @@ async function writeJsonFile(filePath, value, mode) {
     if (mode !== undefined)
         await promises_1.default.chmod(filePath, mode);
 }
+function isManagedOpenCodeModel(value) {
+    if (typeof value !== "string")
+        return false;
+    if (!value.startsWith(`${OPENAI_PROVIDER_ID}/`))
+        return false;
+    return SUPPORTED_MODEL_IDS.has(value.slice(`${OPENAI_PROVIDER_ID}/`.length));
+}
+function isManagedOpenCodeProvider(value) {
+    const provider = objectRecordOr(value, {});
+    const options = objectRecordOr(provider.options, {});
+    return isTheClawBayOpenAiCompatibleBaseUrl(options.baseURL);
+}
 function roamingAppDataDir() {
     if (process.env.APPDATA?.trim())
         return process.env.APPDATA;
@@ -433,11 +449,11 @@ async function cleanupOpenClawConfig() {
     await promises_1.default.writeFile(configPath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
     return true;
 }
-async function cleanupOpenCodeConfig() {
-    const configPath = node_path_1.default.join(node_os_1.default.homedir(), ".config", "opencode", "opencode.json");
-    const existingRaw = await readFileIfExists(configPath);
-    if (existingRaw === null || !existingRaw.trim())
-        return false;
+async function cleanupOpenCodeFamilyConfig(params) {
+    const existingRaw = await readFileIfExists(params.configPath);
+    if (existingRaw === null || !existingRaw.trim()) {
+        return removeFileIfExists(params.restoreStatePath);
+    }
     let doc;
     try {
         doc = objectRecordOr(JSON.parse(existingRaw), {});
@@ -445,56 +461,76 @@ async function cleanupOpenCodeConfig() {
     catch {
         return false;
     }
+    const snapshotRaw = await readFileIfExists(params.restoreStatePath);
     let changed = false;
     const providerRoot = objectRecordOr(doc.provider, {});
-    for (const id of [DEFAULT_PROVIDER_ID]) {
-        if (id in providerRoot) {
-            delete providerRoot[id];
-            changed = true;
-        }
-    }
-    doc.provider = providerRoot;
-    const model = doc.model;
-    if (typeof model === "string" && model.startsWith(`${DEFAULT_PROVIDER_ID}/`)) {
-        delete doc.model;
+    if (DEFAULT_PROVIDER_ID in providerRoot) {
+        delete providerRoot[DEFAULT_PROVIDER_ID];
         changed = true;
     }
-    if (!changed)
-        return false;
-    await promises_1.default.writeFile(configPath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
-    return true;
-}
-async function cleanupKiloConfig() {
-    const configPath = node_path_1.default.join(node_os_1.default.homedir(), ".config", "kilo", "opencode.json");
-    const existingRaw = await readFileIfExists(configPath);
-    if (existingRaw === null || !existingRaw.trim())
-        return false;
-    let doc;
-    try {
-        doc = objectRecordOr(JSON.parse(existingRaw), {});
-    }
-    catch {
-        return false;
-    }
-    let changed = false;
-    const providerRoot = objectRecordOr(doc.provider, {});
-    for (const id of [DEFAULT_PROVIDER_ID]) {
-        if (id in providerRoot) {
-            delete providerRoot[id];
+    if (snapshotRaw?.trim()) {
+        try {
+            const snapshot = JSON.parse(snapshotRaw);
+            if (snapshot.openAiProvider) {
+                providerRoot[OPENAI_PROVIDER_ID] = snapshot.openAiProvider;
+            }
+            else if (OPENAI_PROVIDER_ID in providerRoot) {
+                delete providerRoot[OPENAI_PROVIDER_ID];
+            }
+            doc.provider = providerRoot;
+            if (snapshot.model === null) {
+                if (isManagedOpenCodeModel(doc.model) || typeof doc.model === "string" && doc.model.startsWith(`${DEFAULT_PROVIDER_ID}/`)) {
+                    delete doc.model;
+                }
+            }
+            else {
+                doc.model = snapshot.model;
+            }
+            if (snapshot.schema === null) {
+                if (typeof doc.$schema === "string")
+                    delete doc.$schema;
+            }
+            else {
+                doc.$schema = snapshot.schema;
+            }
             changed = true;
+            await promises_1.default.writeFile(params.configPath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
+            await removeFileIfExists(params.restoreStatePath);
+            return changed;
+        }
+        catch {
+            // Fall through to best-effort cleanup below.
         }
     }
     doc.provider = providerRoot;
     const model = doc.model;
-    if (typeof model === "string" && model.startsWith(`${DEFAULT_PROVIDER_ID}/`)) {
+    if (typeof model === "string" && (model.startsWith(`${DEFAULT_PROVIDER_ID}/`) || isManagedOpenCodeModel(model))) {
         delete doc.model;
         changed = true;
     }
+    if (isManagedOpenCodeProvider(providerRoot[OPENAI_PROVIDER_ID])) {
+        delete providerRoot[OPENAI_PROVIDER_ID];
+        doc.provider = providerRoot;
+        changed = true;
+    }
     if (!changed)
         return false;
-    await promises_1.default.writeFile(configPath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
+    await promises_1.default.writeFile(params.configPath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
+    await removeFileIfExists(params.restoreStatePath);
     return true;
 }
+async function cleanupOpenCodeConfig() {
+    return cleanupOpenCodeFamilyConfig({
+        configPath: node_path_1.default.join(node_os_1.default.homedir(), ".config", "opencode", "opencode.json"),
+        restoreStatePath: OPENCODE_RESTORE_STATE_PATH,
+    });
+}
+async function cleanupKiloConfig() {
+    return cleanupOpenCodeFamilyConfig({
+        configPath: node_path_1.default.join(node_os_1.default.homedir(), ".config", "kilo", "opencode.json"),
+        restoreStatePath: KILO_RESTORE_STATE_PATH,
+    });
+}
 async function cleanupTraeBundle() {
     const bundlePath = traeBundlePath();
     if (!bundlePath)

package/dist/commands/setup.js

@@ -42,6 +42,8 @@ const CLINE_GLOBAL_STATE_PATH = node_path_1.default.join(node_os_1.default.homed
 const CLINE_SECRETS_PATH = node_path_1.default.join(node_os_1.default.homedir(), ".cline", "data", "secrets.json");
 const AIDER_CONFIG_PATH = node_path_1.default.join(node_os_1.default.homedir(), ".aider.conf.yml");
 const CLINE_RESTORE_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "cline.restore.json");
+const OPENCODE_RESTORE_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "opencode.restore.json");
+const KILO_RESTORE_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "kilo.restore.json");
 const ROO_SETTINGS_STATE_PATH = node_path_1.default.join(paths_1.theclawbayStateDir, "roo-settings.restore.json");
 const ROO_IMPORT_FILE = node_path_1.default.join(paths_1.theclawbayConfigDir, "roo-code-settings.json");
 const MIGRATION_STATE_FILE = node_path_1.default.join(paths_1.codexDir, "theclawbay.migration.json");
@@ -56,6 +58,9 @@ const HISTORY_PROVIDER_NEUTRALIZE_SOURCES = new Set(["openai", "theclawbay-wan",
 const HISTORY_PROVIDER_DB_MIGRATE_SOURCES = ["openai", "theclawbay-wan"];
 const SETUP_CLIENT_IDS = ["codex", "continue", "cline", "openclaw", "opencode", "kilo", "roo", "trae", "aider"];
 const THECLAWBAY_OPENAI_PROXY_SUFFIX = "/api/codex-auth/v1/proxy/v1";
+const OPENAI_PROVIDER_ID = "openai";
+const OPENCODE_CONFIG_SCHEMA_URL = "https://opencode.ai/config.json";
+const KILO_CONFIG_SCHEMA_URL = "https://kilo.ai/config.json";
 const CONTINUE_MODEL_NAME = "The Claw Bay";
 const ROO_PROFILE_NAME = "The Claw Bay";
 const ROO_PROFILE_ID = "theclawbay-openai-compatible";
@@ -1018,7 +1023,7 @@ async function patchOpenClawConfigFile(params) {
         baseUrl: `${trimTrailingSlash(params.backendUrl)}/api/codex-auth/v1/proxy/v1`,
         apiKey: params.apiKey,
         api: "openai-responses",
-        models: params.models,
+        models: buildOpenClawModels(params.models),
     };
     const configPath = node_path_1.default.join(node_os_1.default.homedir(), ".openclaw", "openclaw.json");
     await promises_1.default.mkdir(node_path_1.default.dirname(configPath), { recursive: true });
@@ -1050,6 +1055,9 @@ async function patchOpenClawConfigFile(params) {
     const defaultsRoot = objectRecordOr(agentsRoot.defaults, {});
     const modelRoot = objectRecordOr(defaultsRoot.model, {});
     modelRoot.primary = resolveOpenClawPrimaryModel(params);
+    if (typeof defaultsRoot.thinkingDefault !== "string") {
+        defaultsRoot.thinkingDefault = "medium";
+    }
     defaultsRoot.model = modelRoot;
     agentsRoot.defaults = defaultsRoot;
     doc.agents = agentsRoot;
@@ -1066,21 +1074,57 @@ function objectRecordOr(value, fallback) {
     }
     return fallback;
 }
-function openCodeModelsObject(models) {
+function modelContextLimit(modelId) {
+    if (modelId === "gpt-5.4")
+        return 1050000;
+    return 272000;
+}
+function modelOutputLimit(modelId) {
+    if (modelId === "gpt-5.4")
+        return 128000;
+    return 65536;
+}
+function buildOpenCodeModelConfig(model) {
+    return {
+        name: model.name || model.id,
+        reasoning: true,
+        tool_call: true,
+        attachment: true,
+        modalities: {
+            input: ["text", "image"],
+            output: ["text"],
+        },
+        limit: {
+            context: modelContextLimit(model.id),
+            output: modelOutputLimit(model.id),
+        },
+    };
+}
+function buildOpenCodeModelsObject(models) {
     const result = {};
     for (const model of models) {
         if (!model.id)
             continue;
-        result[model.id] = { name: model.name || model.id };
+        result[model.id] = buildOpenCodeModelConfig(model);
     }
     return result;
 }
-async function writeOpenCodeConfig(params) {
-    const configPath = node_path_1.default.join(node_os_1.default.homedir(), ".config", "opencode", "opencode.json");
-    await promises_1.default.mkdir(node_path_1.default.dirname(configPath), { recursive: true });
+function isManagedOpenCodeProvider(provider) {
+    const options = objectRecordOr(provider.options, {});
+    return isTheClawBayOpenAiCompatibleBaseUrl(options.baseURL);
+}
+function isManagedOpenCodeModel(value, supportedModelIds) {
+    if (typeof value !== "string")
+        return false;
+    if (!value.startsWith(`${OPENAI_PROVIDER_ID}/`))
+        return false;
+    return supportedModelIds.has(value.slice(`${OPENAI_PROVIDER_ID}/`.length));
+}
+async function writeOpenCodeFamilyConfig(params) {
+    await promises_1.default.mkdir(node_path_1.default.dirname(params.configPath), { recursive: true });
     let existingRaw = "";
     try {
-        existingRaw = await promises_1.default.readFile(configPath, "utf8");
+        existingRaw = await promises_1.default.readFile(params.configPath, "utf8");
     }
     catch (error) {
         const err = error;
@@ -1093,60 +1137,81 @@ async function writeOpenCodeConfig(params) {
             doc = objectRecordOr(JSON.parse(existingRaw), {});
         }
         catch {
-            throw new Error(`invalid JSON in OpenCode config: ${configPath}`);
+            throw new Error(`invalid JSON in config: ${params.configPath}`);
         }
     }
     const providerRoot = objectRecordOr(doc.provider, {});
-    providerRoot[DEFAULT_PROVIDER_ID] = {
-        npm: "@ai-sdk/openai-compatible",
-        name: DEFAULT_PROVIDER_ID,
-        options: {
-            baseURL: `${trimTrailingSlash(params.backendUrl)}/api/codex-auth/v1/proxy/v1`,
-            apiKey: params.apiKey,
-        },
-        models: openCodeModelsObject(params.models),
-    };
+    const openAiProvider = objectRecordOr(providerRoot[OPENAI_PROVIDER_ID], {});
+    const supportedModelIds = new Set(params.models.map((entry) => entry.id).filter(Boolean));
+    const alreadyManaged = isManagedOpenCodeProvider(openAiProvider) && isManagedOpenCodeModel(doc.model, supportedModelIds);
+    if (!alreadyManaged) {
+        const snapshot = {
+            openAiProvider: Object.keys(openAiProvider).length > 0 ? openAiProvider : null,
+            model: typeof doc.model === "string" && !doc.model.startsWith(`${DEFAULT_PROVIDER_ID}/`)
+                ? doc.model
+                : null,
+            schema: typeof doc.$schema === "string" ? doc.$schema : null,
+        };
+        await writeJsonObjectFile(params.restoreStatePath, snapshot, 0o600);
+    }
+    const managedOpenAiProvider = objectRecordOr(providerRoot[OPENAI_PROVIDER_ID], {});
+    const optionsRoot = objectRecordOr(managedOpenAiProvider.options, {});
+    optionsRoot.baseURL = `${trimTrailingSlash(params.backendUrl)}/api/codex-auth/v1/proxy/v1`;
+    optionsRoot.apiKey = params.apiKey;
+    managedOpenAiProvider.options = optionsRoot;
+    managedOpenAiProvider.models = buildOpenCodeModelsObject(params.models);
+    managedOpenAiProvider.whitelist = params.models.map((entry) => entry.id).filter(Boolean);
+    if ("blacklist" in managedOpenAiProvider) {
+        delete managedOpenAiProvider.blacklist;
+    }
+    providerRoot[OPENAI_PROVIDER_ID] = managedOpenAiProvider;
+    if (DEFAULT_PROVIDER_ID in providerRoot) {
+        delete providerRoot[DEFAULT_PROVIDER_ID];
+    }
+    doc.$schema = params.schemaUrl;
     doc.provider = providerRoot;
-    doc.model = `${DEFAULT_PROVIDER_ID}/${params.model}`;
-    await promises_1.default.writeFile(configPath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
-    return configPath;
+    doc.model = `${OPENAI_PROVIDER_ID}/${params.model}`;
+    await promises_1.default.writeFile(params.configPath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
+    return params.configPath;
+}
+function buildOpenClawModels(models) {
+    const supportedModelMap = new Map((0, supported_models_1.getSupportedModels)().map((model) => [model.id, model]));
+    return models
+        .filter((model) => Boolean(model.id))
+        .map((model) => {
+        const pricing = supportedModelMap.get(model.id);
+        return {
+            id: model.id,
+            name: model.name || model.id,
+            api: "openai-responses",
+            reasoning: true,
+            input: ["text", "image"],
+            cost: {
+                input: pricing?.inputPer1M ?? 0,
+                output: pricing?.outputPer1M ?? 0,
+                cacheRead: pricing?.cachedInputPer1M ?? 0,
+                cacheWrite: pricing?.inputPer1M ?? 0,
+            },
+            contextWindow: modelContextLimit(model.id),
+            maxTokens: modelOutputLimit(model.id),
+        };
+    });
+}
+async function writeOpenCodeConfig(params) {
+    return writeOpenCodeFamilyConfig({
+        configPath: node_path_1.default.join(node_os_1.default.homedir(), ".config", "opencode", "opencode.json"),
+        restoreStatePath: OPENCODE_RESTORE_STATE_PATH,
+        schemaUrl: OPENCODE_CONFIG_SCHEMA_URL,
+        ...params,
+    });
 }
 async function writeKiloConfig(params) {
-    const configPath = node_path_1.default.join(node_os_1.default.homedir(), ".config", "kilo", "opencode.json");
-    await promises_1.default.mkdir(node_path_1.default.dirname(configPath), { recursive: true });
-    let existingRaw = "";
-    try {
-        existingRaw = await promises_1.default.readFile(configPath, "utf8");
-    }
-    catch (error) {
-        const err = error;
-        if (err.code !== "ENOENT")
-            throw error;
-    }
-    let doc = {};
-    if (existingRaw.trim()) {
-        try {
-            doc = objectRecordOr(JSON.parse(existingRaw), {});
-        }
-        catch {
-            throw new Error(`invalid JSON in Kilo config: ${configPath}`);
-        }
-    }
-    const providerRoot = objectRecordOr(doc.provider, {});
-    providerRoot[DEFAULT_PROVIDER_ID] = {
-        npm: "@ai-sdk/openai-compatible",
-        name: DEFAULT_PROVIDER_ID,
-        options: {
-            baseURL: `${trimTrailingSlash(params.backendUrl)}/api/codex-auth/v1/proxy/v1`,
-            apiKey: params.apiKey,
-        },
-        models: openCodeModelsObject(params.models),
-    };
-    doc.$schema = "https://kilo.ai/config.json";
-    doc.provider = providerRoot;
-    doc.model = `${DEFAULT_PROVIDER_ID}/${params.model || DEFAULT_KILO_MODEL}`;
-    await promises_1.default.writeFile(configPath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
-    return configPath;
+    return writeOpenCodeFamilyConfig({
+        configPath: node_path_1.default.join(node_os_1.default.homedir(), ".config", "kilo", "opencode.json"),
+        restoreStatePath: KILO_RESTORE_STATE_PATH,
+        schemaUrl: KILO_CONFIG_SCHEMA_URL,
+        ...params,
+    });
 }
 function traePatchSnippet(params) {
     const patchedModels = params.models.length

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "theclawbay",
-  "version": "0.3.32",
+  "version": "0.3.33",
   "description": "CLI for connecting Codex, Continue, Cline, OpenClaw, OpenCode, Kilo, Roo Code, Aider, and experimental Trae to The Claw Bay.",
   "license": "MIT",
   "bin": {