theclawbay 0.3.33 → 0.3.34

package/dist/commands/logout.js

@@ -166,6 +166,57 @@ function objectRecordOr(value, fallback) {
 function isTheClawBayOpenAiCompatibleBaseUrl(value) {
     return typeof value === "string" && value.trim().endsWith(THECLAWBAY_OPENAI_PROXY_SUFFIX);
 }
+function uniqueStrings(values) {
+    const output = [];
+    const seen = new Set();
+    for (const value of values) {
+        const normalized = value.trim();
+        if (!normalized || seen.has(normalized))
+            continue;
+        seen.add(normalized);
+        output.push(normalized);
+    }
+    return output;
+}
+function xdgConfigHomeDir() {
+    const raw = process.env.XDG_CONFIG_HOME?.trim();
+    if (raw)
+        return raw;
+    return node_path_1.default.join(node_os_1.default.homedir(), ".config");
+}
+function configDirCandidates(appName) {
+    const home = node_os_1.default.homedir();
+    const dirs = [node_path_1.default.join(xdgConfigHomeDir(), appName)];
+    if (node_os_1.default.platform() === "darwin") {
+        dirs.push(node_path_1.default.join(home, "Library", "Application Support", appName));
+    }
+    else if (node_os_1.default.platform() === "win32") {
+        dirs.push(node_path_1.default.join(roamingAppDataDir(), appName));
+    }
+    return uniqueStrings(dirs);
+}
+function openCodeConfigCleanupTargets() {
+    const home = node_os_1.default.homedir();
+    const dirs = configDirCandidates("opencode");
+    const candidates = [];
+    for (const dir of dirs) {
+        candidates.push(node_path_1.default.join(dir, "opencode.json"));
+        candidates.push(node_path_1.default.join(dir, ".opencode.json"));
+        candidates.push(node_path_1.default.join(dir, "config.json"));
+    }
+    candidates.push(node_path_1.default.join(home, ".opencode.json"));
+    return uniqueStrings(candidates);
+}
+function kiloConfigCleanupTargets() {
+    const home = node_os_1.default.homedir();
+    const dirs = uniqueStrings([...configDirCandidates("kilo"), node_path_1.default.join(home, ".kilo")]);
+    const candidates = [];
+    for (const dir of dirs) {
+        candidates.push(node_path_1.default.join(dir, "opencode.json"));
+        candidates.push(node_path_1.default.join(dir, "config.json"));
+    }
+    return uniqueStrings(candidates);
+}
 async function readJsonObjectFile(filePath) {
     const existingRaw = await readFileIfExists(filePath);
     if (existingRaw === null || !existingRaw.trim())
@@ -449,85 +500,169 @@ async function cleanupOpenClawConfig() {
     await promises_1.default.writeFile(configPath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
     return true;
 }
-async function cleanupOpenCodeFamilyConfig(params) {
-    const existingRaw = await readFileIfExists(params.configPath);
-    if (existingRaw === null || !existingRaw.trim()) {
-        return removeFileIfExists(params.restoreStatePath);
+function normalizeOpenCodeRestoreSnapshot(snapshot, fallbackConfigPath) {
+    if (typeof snapshot !== "object" || snapshot === null || Array.isArray(snapshot))
+        return null;
+    const obj = snapshot;
+    if (obj.version === 2 && Array.isArray(obj.targets)) {
+        const targets = [];
+        for (const entry of obj.targets) {
+            if (typeof entry !== "object" || entry === null || Array.isArray(entry))
+                continue;
+            const candidate = entry;
+            const configPath = typeof candidate.configPath === "string" ? candidate.configPath.trim() : "";
+            if (!configPath)
+                continue;
+            targets.push({
+                configPath,
+                existed: candidate.existed === true,
+                openAiProvider: typeof candidate.openAiProvider === "object" && candidate.openAiProvider !== null && !Array.isArray(candidate.openAiProvider)
+                    ? candidate.openAiProvider
+                    : null,
+                model: typeof candidate.model === "string" ? candidate.model : null,
+                schema: typeof candidate.schema === "string" ? candidate.schema : null,
+            });
+        }
+        return { version: 2, targets };
     }
-    let doc;
+    const looksLikeV1 = "openAiProvider" in obj || "model" in obj || "schema" in obj;
+    if (!looksLikeV1)
+        return null;
+    return {
+        version: 2,
+        targets: [
+            {
+                configPath: fallbackConfigPath,
+                existed: true,
+                openAiProvider: typeof obj.openAiProvider === "object" && obj.openAiProvider !== null && !Array.isArray(obj.openAiProvider)
+                    ? obj.openAiProvider
+                    : null,
+                model: typeof obj.model === "string" ? obj.model : null,
+                schema: typeof obj.schema === "string" ? obj.schema : null,
+            },
+        ],
+    };
+}
+async function readOpenCodeRestoreSnapshot(restoreStatePath, fallbackConfigPath) {
+    const existingRaw = await readFileIfExists(restoreStatePath);
+    if (existingRaw === null || !existingRaw.trim())
+        return null;
     try {
-        doc = objectRecordOr(JSON.parse(existingRaw), {});
+        return normalizeOpenCodeRestoreSnapshot(JSON.parse(existingRaw), fallbackConfigPath);
     }
     catch {
-        return false;
+        return null;
     }
-    const snapshotRaw = await readFileIfExists(params.restoreStatePath);
+}
+async function cleanupOpenCodeFamilyConfigs(params) {
+    const configPaths = uniqueStrings(params.configPaths);
+    const fallbackConfigPath = configPaths[0] ?? node_path_1.default.join(xdgConfigHomeDir(), "opencode", "opencode.json");
+    const snapshot = await readOpenCodeRestoreSnapshot(params.restoreStatePath, fallbackConfigPath);
+    const snapshotTargets = snapshot?.targets ?? [];
     let changed = false;
-    const providerRoot = objectRecordOr(doc.provider, {});
-    if (DEFAULT_PROVIDER_ID in providerRoot) {
-        delete providerRoot[DEFAULT_PROVIDER_ID];
-        changed = true;
-    }
-    if (snapshotRaw?.trim()) {
+    const restoreConfig = async (target) => {
+        if (!target.existed) {
+            changed = (await removeFileIfExists(target.configPath)) || changed;
+            return;
+        }
+        const existingRaw = await readFileIfExists(target.configPath);
+        if (existingRaw === null || !existingRaw.trim()) {
+            return;
+        }
+        let doc;
         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;
+            doc = objectRecordOr(JSON.parse(existingRaw), {});
+        }
+        catch {
+            return;
+        }
+        const providerRoot = objectRecordOr(doc.provider, {});
+        if (DEFAULT_PROVIDER_ID in providerRoot) {
+            delete providerRoot[DEFAULT_PROVIDER_ID];
+            changed = true;
+        }
+        if (target.openAiProvider) {
+            providerRoot[OPENAI_PROVIDER_ID] = target.openAiProvider;
+        }
+        else if (OPENAI_PROVIDER_ID in providerRoot) {
+            delete providerRoot[OPENAI_PROVIDER_ID];
+        }
+        doc.provider = providerRoot;
+        if (target.model === null) {
+            if (isManagedOpenCodeModel(doc.model) ||
+                (typeof doc.model === "string" && doc.model.startsWith(`${DEFAULT_PROVIDER_ID}/`))) {
+                delete doc.model;
+                changed = true;
             }
-            else {
-                doc.$schema = snapshot.schema;
+        }
+        else {
+            doc.model = target.model;
+            changed = true;
+        }
+        if (target.schema === null) {
+            if (typeof doc.$schema === "string") {
+                delete doc.$schema;
+                changed = true;
             }
+        }
+        else {
+            doc.$schema = target.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.
+        await promises_1.default.writeFile(target.configPath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
+    };
+    if (snapshotTargets.length > 0) {
+        for (const target of snapshotTargets) {
+            await restoreConfig(target);
         }
+        await removeFileIfExists(params.restoreStatePath);
+        return changed;
     }
-    doc.provider = providerRoot;
-    const model = doc.model;
-    if (typeof model === "string" && (model.startsWith(`${DEFAULT_PROVIDER_ID}/`) || isManagedOpenCodeModel(model))) {
-        delete doc.model;
+    for (const configPath of configPaths) {
+        const existingRaw = await readFileIfExists(configPath);
+        if (existingRaw === null || !existingRaw.trim())
+            continue;
+        let doc;
+        try {
+            doc = objectRecordOr(JSON.parse(existingRaw), {});
+        }
+        catch {
+            continue;
+        }
+        let fileChanged = false;
+        const providerRoot = objectRecordOr(doc.provider, {});
+        if (DEFAULT_PROVIDER_ID in providerRoot) {
+            delete providerRoot[DEFAULT_PROVIDER_ID];
+            fileChanged = true;
+        }
+        const model = doc.model;
+        if (typeof model === "string" &&
+            (model.startsWith(`${DEFAULT_PROVIDER_ID}/`) || isManagedOpenCodeModel(model))) {
+            delete doc.model;
+            fileChanged = true;
+        }
+        if (isManagedOpenCodeProvider(providerRoot[OPENAI_PROVIDER_ID])) {
+            delete providerRoot[OPENAI_PROVIDER_ID];
+            fileChanged = true;
+        }
+        if (!fileChanged)
+            continue;
         changed = true;
-    }
-    if (isManagedOpenCodeProvider(providerRoot[OPENAI_PROVIDER_ID])) {
-        delete providerRoot[OPENAI_PROVIDER_ID];
         doc.provider = providerRoot;
-        changed = true;
+        await promises_1.default.writeFile(configPath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
     }
-    if (!changed)
-        return false;
-    await promises_1.default.writeFile(params.configPath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
     await removeFileIfExists(params.restoreStatePath);
-    return true;
+    return changed;
 }
 async function cleanupOpenCodeConfig() {
-    return cleanupOpenCodeFamilyConfig({
-        configPath: node_path_1.default.join(node_os_1.default.homedir(), ".config", "opencode", "opencode.json"),
+    return cleanupOpenCodeFamilyConfigs({
+        configPaths: openCodeConfigCleanupTargets(),
         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"),
+    return cleanupOpenCodeFamilyConfigs({
+        configPaths: kiloConfigCleanupTargets(),
         restoreStatePath: KILO_RESTORE_STATE_PATH,
     });
 }

package/dist/commands/setup.js

@@ -272,6 +272,35 @@ function openAiCompatibleProxyUrl(backendUrl) {
 function isTheClawBayOpenAiCompatibleBaseUrl(value) {
     return typeof value === "string" && value.trim().endsWith(THECLAWBAY_OPENAI_PROXY_SUFFIX);
 }
+function uniqueStrings(values) {
+    const output = [];
+    const seen = new Set();
+    for (const value of values) {
+        const normalized = value.trim();
+        if (!normalized || seen.has(normalized))
+            continue;
+        seen.add(normalized);
+        output.push(normalized);
+    }
+    return output;
+}
+function xdgConfigHomeDir() {
+    const raw = process.env.XDG_CONFIG_HOME?.trim();
+    if (raw)
+        return raw;
+    return node_path_1.default.join(node_os_1.default.homedir(), ".config");
+}
+function configDirCandidates(appName) {
+    const home = node_os_1.default.homedir();
+    const dirs = [node_path_1.default.join(xdgConfigHomeDir(), appName)];
+    if (node_os_1.default.platform() === "darwin") {
+        dirs.push(node_path_1.default.join(home, "Library", "Application Support", appName));
+    }
+    else if (node_os_1.default.platform() === "win32") {
+        dirs.push(node_path_1.default.join(roamingAppDataDir(), appName));
+    }
+    return uniqueStrings(dirs);
+}
 function roamingAppDataDir() {
     if (process.env.APPDATA?.trim())
         return process.env.APPDATA;
@@ -1109,6 +1138,99 @@ function buildOpenCodeModelsObject(models) {
     }
     return result;
 }
+function normalizeOpenCodeRestoreSnapshot(snapshot, fallbackConfigPath) {
+    if (typeof snapshot !== "object" || snapshot === null || Array.isArray(snapshot))
+        return null;
+    const obj = snapshot;
+    if (obj.version === 2 && Array.isArray(obj.targets)) {
+        const targets = [];
+        for (const entry of obj.targets) {
+            if (typeof entry !== "object" || entry === null || Array.isArray(entry))
+                continue;
+            const candidate = entry;
+            const configPath = typeof candidate.configPath === "string" ? candidate.configPath.trim() : "";
+            if (!configPath)
+                continue;
+            targets.push({
+                configPath,
+                existed: candidate.existed === true,
+                openAiProvider: typeof candidate.openAiProvider === "object" && candidate.openAiProvider !== null && !Array.isArray(candidate.openAiProvider)
+                    ? candidate.openAiProvider
+                    : null,
+                model: typeof candidate.model === "string" ? candidate.model : null,
+                schema: typeof candidate.schema === "string" ? candidate.schema : null,
+            });
+        }
+        return { version: 2, targets };
+    }
+    const looksLikeV1 = "openAiProvider" in obj || "model" in obj || "schema" in obj;
+    if (!looksLikeV1)
+        return null;
+    return {
+        version: 2,
+        targets: [
+            {
+                configPath: fallbackConfigPath,
+                existed: true,
+                openAiProvider: typeof obj.openAiProvider === "object" && obj.openAiProvider !== null && !Array.isArray(obj.openAiProvider)
+                    ? obj.openAiProvider
+                    : null,
+                model: typeof obj.model === "string" ? obj.model : null,
+                schema: typeof obj.schema === "string" ? obj.schema : null,
+            },
+        ],
+    };
+}
+async function readOpenCodeRestoreSnapshot(restoreStatePath, fallbackConfigPath) {
+    const existingRaw = await readFileIfExists(restoreStatePath);
+    if (existingRaw === null || !existingRaw.trim())
+        return null;
+    try {
+        return normalizeOpenCodeRestoreSnapshot(JSON.parse(existingRaw), fallbackConfigPath);
+    }
+    catch {
+        return null;
+    }
+}
+function openCodeConfigFileCandidates() {
+    const home = node_os_1.default.homedir();
+    const dirs = configDirCandidates("opencode");
+    const candidates = [];
+    for (const dir of dirs) {
+        candidates.push(node_path_1.default.join(dir, "opencode.json"));
+        candidates.push(node_path_1.default.join(dir, ".opencode.json"));
+        candidates.push(node_path_1.default.join(dir, "config.json"));
+    }
+    candidates.push(node_path_1.default.join(home, ".opencode.json"));
+    return uniqueStrings(candidates);
+}
+function kiloConfigFileCandidates() {
+    const home = node_os_1.default.homedir();
+    const dirs = uniqueStrings([...configDirCandidates("kilo"), node_path_1.default.join(home, ".kilo")]);
+    const candidates = [];
+    for (const dir of dirs) {
+        candidates.push(node_path_1.default.join(dir, "opencode.json"));
+        candidates.push(node_path_1.default.join(dir, "config.json"));
+    }
+    return uniqueStrings(candidates);
+}
+function resolveOpenCodeConfigTargets() {
+    const candidates = openCodeConfigFileCandidates();
+    const existing = candidates.filter((candidate) => (0, node_fs_1.existsSync)(candidate));
+    if (existing.length)
+        return existing;
+    const primaryDir = configDirCandidates("opencode")[0] ?? node_path_1.default.join(xdgConfigHomeDir(), "opencode");
+    return uniqueStrings([node_path_1.default.join(primaryDir, "opencode.json"), node_path_1.default.join(primaryDir, ".opencode.json")]);
+}
+function resolveKiloConfigTargets() {
+    const candidates = kiloConfigFileCandidates();
+    const existing = candidates.filter((candidate) => (0, node_fs_1.existsSync)(candidate));
+    if (existing.length)
+        return existing;
+    const home = node_os_1.default.homedir();
+    const primaryDir = uniqueStrings([...configDirCandidates("kilo"), node_path_1.default.join(home, ".kilo")])[0] ?? node_path_1.default.join(xdgConfigHomeDir(), "kilo");
+    return uniqueStrings([node_path_1.default.join(primaryDir, "opencode.json")]);
+}
 function isManagedOpenCodeProvider(provider) {
     const options = objectRecordOr(provider.options, {});
     return isTheClawBayOpenAiCompatibleBaseUrl(options.baseURL);
@@ -1121,58 +1243,74 @@ function isManagedOpenCodeModel(value, supportedModelIds) {
     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(params.configPath, "utf8");
-    }
-    catch (error) {
-        const err = error;
-        if (err.code !== "ENOENT")
-            throw error;
-    }
-    let doc = {};
-    if (existingRaw.trim()) {
+    const normalizedConfigPaths = uniqueStrings(params.configPaths);
+    const fallbackConfigPath = normalizedConfigPaths[0] ?? node_path_1.default.join(xdgConfigHomeDir(), "opencode", "opencode.json");
+    const restoreState = (await readOpenCodeRestoreSnapshot(params.restoreStatePath, fallbackConfigPath)) ??
+        {
+            version: 2,
+            targets: [],
+        };
+    const supportedModelIds = new Set(params.models.map((entry) => entry.id).filter(Boolean));
+    const restoreHasTarget = (configPath) => restoreState.targets.some((entry) => entry.configPath === configPath);
+    for (const configPath of normalizedConfigPaths) {
+        await promises_1.default.mkdir(node_path_1.default.dirname(configPath), { recursive: true });
+        let existed = true;
+        let existingRaw = "";
         try {
-            doc = objectRecordOr(JSON.parse(existingRaw), {});
+            existingRaw = await promises_1.default.readFile(configPath, "utf8");
         }
-        catch {
-            throw new Error(`invalid JSON in config: ${params.configPath}`);
+        catch (error) {
+            const err = error;
+            if (err.code !== "ENOENT")
+                throw error;
+            existed = false;
         }
+        let doc = {};
+        if (existingRaw.trim()) {
+            try {
+                doc = objectRecordOr(JSON.parse(existingRaw), {});
+            }
+            catch {
+                throw new Error(`invalid JSON in config: ${configPath}`);
+            }
+        }
+        const providerRoot = objectRecordOr(doc.provider, {});
+        const openAiProvider = objectRecordOr(providerRoot[OPENAI_PROVIDER_ID], {});
+        const alreadyManaged = isManagedOpenCodeProvider(openAiProvider) && isManagedOpenCodeModel(doc.model, supportedModelIds);
+        if (!alreadyManaged && !restoreHasTarget(configPath)) {
+            restoreState.targets.push({
+                configPath,
+                existed,
+                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,
+            });
+        }
+        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 = `${OPENAI_PROVIDER_ID}/${params.model}`;
+        await promises_1.default.writeFile(configPath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
     }
-    const providerRoot = objectRecordOr(doc.provider, {});
-    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 = `${OPENAI_PROVIDER_ID}/${params.model}`;
-    await promises_1.default.writeFile(params.configPath, `${JSON.stringify(doc, null, 2)}\n`, "utf8");
-    return params.configPath;
+    if (restoreState.targets.length > 0) {
+        await writeJsonObjectFile(params.restoreStatePath, restoreState, 0o600);
+    }
+    return normalizedConfigPaths;
 }
 function buildOpenClawModels(models) {
     const supportedModelMap = new Map((0, supported_models_1.getSupportedModels)().map((model) => [model.id, model]));
@@ -1199,7 +1337,7 @@ function buildOpenClawModels(models) {
 }
 async function writeOpenCodeConfig(params) {
     return writeOpenCodeFamilyConfig({
-        configPath: node_path_1.default.join(node_os_1.default.homedir(), ".config", "opencode", "opencode.json"),
+        configPaths: resolveOpenCodeConfigTargets(),
         restoreStatePath: OPENCODE_RESTORE_STATE_PATH,
         schemaUrl: OPENCODE_CONFIG_SCHEMA_URL,
         ...params,
@@ -1207,7 +1345,7 @@ async function writeOpenCodeConfig(params) {
 }
 async function writeKiloConfig(params) {
     return writeOpenCodeFamilyConfig({
-        configPath: node_path_1.default.join(node_os_1.default.homedir(), ".config", "kilo", "opencode.json"),
+        configPaths: resolveKiloConfigTargets(),
         restoreStatePath: KILO_RESTORE_STATE_PATH,
         schemaUrl: KILO_CONFIG_SCHEMA_URL,
         ...params,
@@ -1382,8 +1520,8 @@ class SetupCommand extends base_command_1.BaseCommand {
             let clineConfigPaths = [];
             let openClawConfigPath = null;
             let openClawCliWarning = null;
-            let openCodePath = null;
-            let kiloConfigPath = null;
+            let openCodeConfigPaths = [];
+            let kiloConfigPaths = [];
             let rooConfigPaths = [];
             let traeBundlePathPatched = null;
             let aiderConfigPath = null;
@@ -1446,7 +1584,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                 }
                 if (selectedSetupClients.has("opencode")) {
                     progress.update("Configuring OpenCode");
-                    openCodePath = await writeOpenCodeConfig({
+                    openCodeConfigPaths = await writeOpenCodeConfig({
                         backendUrl,
                         model: resolved?.model ?? DEFAULT_CODEX_MODEL,
                         models: resolved?.models ?? [{ id: DEFAULT_CODEX_MODEL, name: modelDisplayName(DEFAULT_CODEX_MODEL) }],
@@ -1455,7 +1593,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                 }
                 if (selectedSetupClients.has("kilo")) {
                     progress.update("Configuring Kilo Code");
-                    kiloConfigPath = await writeKiloConfig({
+                    kiloConfigPaths = await writeKiloConfig({
                         backendUrl,
                         model: resolved?.model ?? DEFAULT_CODEX_MODEL,
                         models: resolved?.models ?? [{ id: DEFAULT_CODEX_MODEL, name: modelDisplayName(DEFAULT_CODEX_MODEL) }],
@@ -1619,7 +1757,7 @@ class SetupCommand extends base_command_1.BaseCommand {
             }
             const openCodeDetected = setupClients.find((client) => client.id === "opencode")?.detected ?? false;
             if (selectedSetupClients.has("opencode")) {
-                this.log(`- OpenCode: configured (${openCodePath})`);
+                this.log(`- OpenCode: configured (${openCodeConfigPaths.join(", ")})`);
             }
             else if (openCodeDetected) {
                 this.log("- OpenCode: detected but skipped");
@@ -1628,7 +1766,7 @@ class SetupCommand extends base_command_1.BaseCommand {
                 this.log("- OpenCode: not detected (skipped)");
             }
             if (selectedSetupClients.has("kilo")) {
-                this.log(`- Kilo Code: configured (${kiloConfigPath})`);
+                this.log(`- Kilo Code: configured (${kiloConfigPaths.join(", ")})`);
             }
             else if (kiloDetected) {
                 this.log("- Kilo Code: detected but skipped");

package/package.json

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