funolio-agent 1.0.53 → 1.1.65

package/dist/mcp/sync-cli-config.d.ts

@@ -1,9 +1,22 @@
 /**
  * Sync MCP server configs to CLI provider native config files.
  *
- * For `claude-cli`: writes to ~/.claude.json so Claude Code can discover
- * both user-installed MCP servers and the funolio-tools bridge server.
+ * For `claude-cli`: writes to the selected Claude JSON config so Claude Code
+ * can discover both user-installed MCP servers and the funolio-tools bridge.
  */
+export type CliProviderId = 'claude-cli' | 'codex-cli';
+export declare function getCliProviderSessionHome(provider: CliProviderId): string;
+export declare function getCliBotSessionHome(provider: CliProviderId, botId: string): string;
+export declare function getCliSessionRuntimeHome(provider: CliProviderId, botId: string, conversationId: string): string;
+export declare function claudeUserCredentialsPath(): string;
+export declare function claudeCanonicalCredentialsPath(): string;
+export declare function syncClaudeCanonicalCredentials(): string | null;
+export declare function promoteClaudeBotHomeCredentialsToCanonical(botHomeDir: string): string | null;
+export declare function forceSyncClaudeCanonicalCredentialsFromUser(): string | null;
+export declare function resolveClaudeCredentialsSourcePath(): string | null;
+export declare function ensureCliBotSessionHome(provider: CliProviderId, botId: string): string;
+export declare function ensureCliSessionRuntimeHome(provider: CliProviderId, botId: string, conversationId: string): string;
+export declare function claudeJsonConfigPath(baseDir?: string): string;
 export declare function resolvePackagedAgentCommand(): string;
 /**
  * Sync installed MCP servers + funolio-tools bridge to the CLI provider's
@@ -11,9 +24,34 @@ export declare function resolvePackagedAgentCommand(): string;
  *
  * @returns Summary string for logging.
  */
-export declare function syncMcpToCliConfig(provider: string): Promise<string>;
-export declare function codexConfigPath(): string;
+export declare function syncMcpToCliConfig(provider: string, funolioToolEnv?: Record<string, string>, target?: {
+    claudeJsonPath?: string;
+    codexHomeDir?: string;
+}): Promise<string>;
+export declare function syncClaudeJsonConfig(funolioToolEnv?: Record<string, string>, claudeJsonPath?: string): string;
+export declare function codexConfigPath(baseDir?: string): string;
 export declare function stripCodexMcpSection(raw: string, name: string): string;
 export declare function appendCodexMcpStdio(raw: string, name: string, command: string, args: string[], envVars?: Record<string, string>): string;
 export declare const CODEX_FUNOLIO_SERVER_NAME = "funolio_tools";
+type ClaudeBotSettingsInput = {
+    model?: string | null;
+    effortLevel?: string | null;
+    outputStyle?: string | null;
+    fastMode?: boolean | null;
+    permissions?: Record<string, unknown> | null;
+};
+export declare function writeClaudeBotSettings(botId: string, settings: ClaudeBotSettingsInput): string;
+export declare function claudeBotSettingsPath(botId: string): string;
+export declare function readClaudeBotSettings(botId: string): ClaudeBotSettingsInput;
+type CodexBotConfigInput = {
+    model?: string | null;
+    modelReasoningEffort?: string | null;
+    personality?: string | null;
+    serviceTier?: string | null;
+    sandbox?: string | null;
+    approvalPolicy?: string | null;
+};
+export declare function writeCodexBotConfig(botId: string, config: CodexBotConfigInput): string;
+export declare function readCodexBotConfig(botId: string): CodexBotConfigInput;
+export {};
 //# sourceMappingURL=sync-cli-config.d.ts.map

package/dist/mcp/sync-cli-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-cli-config.d.ts","sourceRoot":"","sources":["../../src/mcp/sync-cli-config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA0BH,wBAAgB,2BAA2B,IAAI,MAAM,CAoBpD;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAU1E;AAkED,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAuBtE;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,MAAM,CAiBR;AAmDD,eAAO,MAAM,yBAAyB,kBAAkB,CAAC"}
+{"version":3,"file":"sync-cli-config.d.ts","sourceRoot":"","sources":["../../src/mcp/sync-cli-config.ts"],"names":[],"mappings":"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"}

package/dist/mcp/sync-cli-config.js

@@ -2,8 +2,8 @@
 /**
  * Sync MCP server configs to CLI provider native config files.
  *
- * For `claude-cli`: writes to ~/.claude.json so Claude Code can discover
- * both user-installed MCP servers and the funolio-tools bridge server.
+ * For `claude-cli`: writes to the selected Claude JSON config so Claude Code
+ * can discover both user-installed MCP servers and the funolio-tools bridge.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -40,20 +40,316 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CODEX_FUNOLIO_SERVER_NAME = void 0;
+exports.getCliProviderSessionHome = getCliProviderSessionHome;
+exports.getCliBotSessionHome = getCliBotSessionHome;
+exports.getCliSessionRuntimeHome = getCliSessionRuntimeHome;
+exports.claudeUserCredentialsPath = claudeUserCredentialsPath;
+exports.claudeCanonicalCredentialsPath = claudeCanonicalCredentialsPath;
+exports.syncClaudeCanonicalCredentials = syncClaudeCanonicalCredentials;
+exports.promoteClaudeBotHomeCredentialsToCanonical = promoteClaudeBotHomeCredentialsToCanonical;
+exports.forceSyncClaudeCanonicalCredentialsFromUser = forceSyncClaudeCanonicalCredentialsFromUser;
+exports.resolveClaudeCredentialsSourcePath = resolveClaudeCredentialsSourcePath;
+exports.ensureCliBotSessionHome = ensureCliBotSessionHome;
+exports.ensureCliSessionRuntimeHome = ensureCliSessionRuntimeHome;
+exports.claudeJsonConfigPath = claudeJsonConfigPath;
 exports.resolvePackagedAgentCommand = resolvePackagedAgentCommand;
 exports.syncMcpToCliConfig = syncMcpToCliConfig;
+exports.syncClaudeJsonConfig = syncClaudeJsonConfig;
 exports.codexConfigPath = codexConfigPath;
 exports.stripCodexMcpSection = stripCodexMcpSection;
 exports.appendCodexMcpStdio = appendCodexMcpStdio;
+exports.writeClaudeBotSettings = writeClaudeBotSettings;
+exports.claudeBotSettingsPath = claudeBotSettingsPath;
+exports.readClaudeBotSettings = readClaudeBotSettings;
+exports.writeCodexBotConfig = writeCodexBotConfig;
+exports.readCodexBotConfig = readCodexBotConfig;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const config_1 = require("../config");
+function resolveHomeDir() {
+    const override = process.env.FUNOLIO_CLI_HOME_OVERRIDE?.trim();
+    return override || os.homedir();
+}
+function funolioCliSessionsRoot() {
+    return path.join(resolveHomeDir(), '.funolio', 'cli-sessions');
+}
+function providerDirName(provider) {
+    return provider === 'claude-cli' ? 'claude' : 'codex';
+}
+function getCliProviderSessionHome(provider) {
+    return path.join(funolioCliSessionsRoot(), providerDirName(provider));
+}
+function getCliBotSessionHome(provider, botId) {
+    return path.join(getCliProviderSessionHome(provider), botId);
+}
+function safeSessionDirName(value) {
+    const normalized = String(value || '').trim();
+    if (!normalized)
+        return 'session';
+    return normalized.replace(/[^a-zA-Z0-9._-]/g, '_');
+}
+function getCliSessionRuntimeHome(provider, botId, conversationId) {
+    return path.join(getCliBotSessionHome(provider, botId), 'runtime', safeSessionDirName(conversationId));
+}
+function userCliHome(provider) {
+    return path.join(resolveHomeDir(), provider === 'claude-cli' ? '.claude' : '.codex');
+}
+function copyDirectoryRecursive(sourceDir, targetDir) {
+    if (!fs.existsSync(sourceDir))
+        return;
+    if (!fs.existsSync(targetDir))
+        fs.mkdirSync(targetDir, { recursive: true });
+    for (const entry of fs.readdirSync(sourceDir, { withFileTypes: true })) {
+        const sourcePath = path.join(sourceDir, entry.name);
+        const targetPath = path.join(targetDir, entry.name);
+        if (entry.isDirectory()) {
+            copyDirectoryRecursive(sourcePath, targetPath);
+            continue;
+        }
+        if (!entry.isFile())
+            continue;
+        if (!fs.existsSync(targetPath)) {
+            fs.copyFileSync(sourcePath, targetPath);
+        }
+    }
+}
+function copyFileIfPresent(sourcePath, targetPath, overwrite = false) {
+    if (!fs.existsSync(sourcePath))
+        return;
+    if (!overwrite && fs.existsSync(targetPath))
+        return;
+    fs.mkdirSync(path.dirname(targetPath), { recursive: true });
+    fs.copyFileSync(sourcePath, targetPath);
+}
+function fileMtimeMs(filePath) {
+    try {
+        return fs.statSync(filePath).mtimeMs;
+    }
+    catch {
+        return null;
+    }
+}
+function readClaudeOauthJson(filePath) {
+    try {
+        const parsed = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+        const oauth = parsed.claudeAiOauth;
+        return oauth && typeof oauth === 'object' ? oauth : null;
+    }
+    catch {
+        return null;
+    }
+}
+function toNonEmptyString(value) {
+    return typeof value === 'string' && value.trim() ? value : null;
+}
+function toEpochMs(value) {
+    if (typeof value === 'number' && Number.isFinite(value))
+        return value;
+    if (typeof value === 'string' && value.trim()) {
+        const asNumber = Number(value);
+        if (Number.isFinite(asNumber))
+            return asNumber;
+        const asDate = Date.parse(value);
+        return Number.isFinite(asDate) ? asDate : null;
+    }
+    return null;
+}
+function mergeClaudeOauth(baseOauth, incomingOauth) {
+    if (!baseOauth && !incomingOauth)
+        return null;
+    if (!baseOauth)
+        return incomingOauth ? { ...incomingOauth } : null;
+    if (!incomingOauth)
+        return { ...baseOauth };
+    const baseAccess = toNonEmptyString(baseOauth.accessToken);
+    const incomingAccess = toNonEmptyString(incomingOauth.accessToken);
+    const baseRefresh = toNonEmptyString(baseOauth.refreshToken);
+    const incomingRefresh = toNonEmptyString(incomingOauth.refreshToken);
+    const baseExpiry = toEpochMs(baseOauth.expiresAt);
+    const incomingExpiry = toEpochMs(incomingOauth.expiresAt);
+    let accessToken = baseAccess;
+    if (!accessToken && incomingAccess) {
+        accessToken = incomingAccess;
+    }
+    else if (incomingAccess
+        && incomingAccess !== baseAccess
+        && (!!incomingRefresh
+            || !baseAccess
+            || ((incomingExpiry ?? -1) > (baseExpiry ?? -1)))) {
+        accessToken = incomingAccess;
+    }
+    const refreshToken = incomingRefresh || baseRefresh || '';
+    const expiresAt = Math.max(baseExpiry ?? 0, incomingExpiry ?? 0) || incomingOauth.expiresAt || baseOauth.expiresAt;
+    return {
+        ...baseOauth,
+        ...incomingOauth,
+        ...(accessToken ? { accessToken } : {}),
+        refreshToken,
+        expiresAt,
+    };
+}
+function writeClaudeOauthJson(targetPath, oauth) {
+    const existing = readJsonFile(targetPath);
+    const payload = existing && typeof existing === 'object' ? existing : {};
+    payload.claudeAiOauth = oauth;
+    fs.mkdirSync(path.dirname(targetPath), { recursive: true });
+    fs.writeFileSync(targetPath, JSON.stringify(payload, null, 2), 'utf-8');
+}
+function removeFileIfPresent(filePath) {
+    try {
+        if (fs.existsSync(filePath))
+            fs.unlinkSync(filePath);
+    }
+    catch {
+        // best effort
+    }
+}
+function claudeUserCredentialsPath() {
+    return path.join(userCliHome('claude-cli'), '.credentials.json');
+}
+function claudeCanonicalCredentialsPath() {
+    return path.join(getCliProviderSessionHome('claude-cli'), '.credentials.json');
+}
+function overwriteFileFromSource(sourcePath, targetPath) {
+    if (!fs.existsSync(sourcePath))
+        return false;
+    fs.mkdirSync(path.dirname(targetPath), { recursive: true });
+    fs.copyFileSync(sourcePath, targetPath);
+    return true;
+}
+function syncClaudeCanonicalCredentials() {
+    const canonicalPath = claudeCanonicalCredentialsPath();
+    return fs.existsSync(canonicalPath) ? canonicalPath : null;
+}
+function promoteClaudeBotHomeCredentialsToCanonical(botHomeDir) {
+    const botPath = path.join(botHomeDir, '.credentials.json');
+    if (!fs.existsSync(botPath)) {
+        return syncClaudeCanonicalCredentials();
+    }
+    const canonicalPath = claudeCanonicalCredentialsPath();
+    if (!fs.existsSync(canonicalPath)) {
+        try {
+            overwriteFileFromSource(botPath, canonicalPath);
+            return canonicalPath;
+        }
+        catch {
+            return syncClaudeCanonicalCredentials();
+        }
+    }
+    try {
+        const merged = mergeClaudeOauth(readClaudeOauthJson(canonicalPath), readClaudeOauthJson(botPath));
+        if (merged) {
+            writeClaudeOauthJson(canonicalPath, merged);
+            return canonicalPath;
+        }
+    }
+    catch {
+        // fall through
+    }
+    return syncClaudeCanonicalCredentials();
+}
+function forceSyncClaudeCanonicalCredentialsFromUser() {
+    const userPath = claudeUserCredentialsPath();
+    const canonicalPath = claudeCanonicalCredentialsPath();
+    if (!fs.existsSync(userPath))
+        return fs.existsSync(canonicalPath) ? canonicalPath : null;
+    try {
+        overwriteFileFromSource(userPath, canonicalPath);
+        return canonicalPath;
+    }
+    catch {
+        return null;
+    }
+}
+function resolveClaudeCredentialsSourcePath() {
+    return syncClaudeCanonicalCredentials();
+}
+function syncClaudeCredentialsIntoBotHome(targetDir) {
+    const sourcePath = syncClaudeCanonicalCredentials();
+    const targetPath = path.join(targetDir, '.credentials.json');
+    if (!sourcePath) {
+        removeFileIfPresent(targetPath);
+        return;
+    }
+    overwriteFileFromSource(sourcePath, targetPath);
+}
+function seedCliBotSessionHome(provider, targetDir) {
+    const sources = [getCliProviderSessionHome(provider), userCliHome(provider)];
+    for (const sourceDir of sources) {
+        if (!fs.existsSync(sourceDir))
+            continue;
+        if (provider === 'claude-cli') {
+            copyFileIfPresent(path.join(sourceDir, 'settings.json'), path.join(targetDir, 'settings.json'));
+            const pluginsDir = path.join(sourceDir, 'plugins');
+            if (fs.existsSync(pluginsDir)) {
+                copyDirectoryRecursive(pluginsDir, path.join(targetDir, 'plugins'));
+            }
+            return;
+        }
+        for (const fileName of ['auth.json', 'config.toml', 'version.json', 'installation_id', 'cap_sid', '.env', '.personality_migration']) {
+            copyFileIfPresent(path.join(sourceDir, fileName), path.join(targetDir, fileName));
+        }
+        for (const dirName of ['rules', 'skills', 'memories']) {
+            const sourcePath = path.join(sourceDir, dirName);
+            if (fs.existsSync(sourcePath)) {
+                copyDirectoryRecursive(sourcePath, path.join(targetDir, dirName));
+            }
+        }
+        return;
+    }
+}
+function refreshCliBotSessionRuntimeFiles(provider, targetDir) {
+    if (provider === 'claude-cli') {
+        syncClaudeCredentialsIntoBotHome(targetDir);
+        copyFileIfPresent(claudeJsonConfigPath(), path.join(targetDir, '.claude.json'), true);
+        copyFileIfPresent(path.join(userCliHome(provider), 'settings.json'), path.join(targetDir, 'settings.json'), true);
+        ensureClaudeBotSettingsDefaults(path.join(targetDir, 'settings.json'));
+        const sourceDir = userCliHome(provider);
+        const pluginsDir = path.join(sourceDir, 'plugins');
+        if (fs.existsSync(pluginsDir)) {
+            copyDirectoryRecursive(pluginsDir, path.join(targetDir, 'plugins'));
+        }
+        return;
+    }
+    const sourceDir = userCliHome(provider);
+    if (!fs.existsSync(sourceDir))
+        return;
+    for (const fileName of ['auth.json', 'version.json', 'installation_id', 'cap_sid', '.env', '.personality_migration']) {
+        copyFileIfPresent(path.join(sourceDir, fileName), path.join(targetDir, fileName), true);
+    }
+}
+function ensureCliSessionHome(provider, targetDir) {
+    if (!fs.existsSync(targetDir)) {
+        fs.mkdirSync(targetDir, { recursive: true });
+    }
+    seedCliBotSessionHome(provider, targetDir);
+    refreshCliBotSessionRuntimeFiles(provider, targetDir);
+    return targetDir;
+}
+function ensureCliBotSessionHome(provider, botId) {
+    return ensureCliSessionHome(provider, getCliBotSessionHome(provider, botId));
+}
+function ensureCliSessionRuntimeHome(provider, botId, conversationId) {
+    return ensureCliSessionHome(provider, getCliSessionRuntimeHome(provider, botId, conversationId));
+}
+function claudeJsonConfigPath(baseDir) {
+    return baseDir
+        ? path.join(baseDir, '.claude.json')
+        : path.join(resolveHomeDir(), '.claude.json');
+}
 function resolvePackagedAgentCommand() {
     const execBase = path.basename(process.execPath).toLowerCase();
     if (execBase === 'funolio-agent' || execBase === 'funolio-agent.exe') {
         return process.execPath;
     }
+    const argvCliCandidate = process.argv[1];
+    if (argvCliCandidate
+        && path.basename(argvCliCandidate).toLowerCase() === 'cli.js'
+        && argvCliCandidate.toLowerCase().includes(`${path.sep}funolio-agent${path.sep}`)
+        && fs.existsSync(argvCliCandidate)) {
+        return argvCliCandidate;
+    }
     const exeName = process.platform === 'win32' ? 'funolio-agent.exe' : 'funolio-agent';
     const installedCandidate = process.platform === 'win32'
         ? path.join(os.homedir(), 'AppData', 'Local', 'Funolio', exeName)
@@ -61,7 +357,17 @@ function resolvePackagedAgentCommand() {
     if (fs.existsSync(installedCandidate)) {
         return installedCandidate;
     }
-    const distCandidate = path.resolve(__dirname, '..', '..', 'dist', exeName);
+    if (process.platform !== 'win32') {
+        const localBinCandidate = '/usr/local/bin/funolio-agent';
+        if (fs.existsSync(localBinCandidate)) {
+            return localBinCandidate;
+        }
+    }
+    const distCliCandidate = path.resolve(__dirname, '..', 'cli.js');
+    if (fs.existsSync(distCliCandidate)) {
+        return distCliCandidate;
+    }
+    const distCandidate = path.resolve(__dirname, '..', '..', 'dist', 'cli.js');
     if (fs.existsSync(distCandidate)) {
         return distCandidate;
     }
@@ -73,19 +379,18 @@ function resolvePackagedAgentCommand() {
  *
  * @returns Summary string for logging.
  */
-async function syncMcpToCliConfig(provider) {
+async function syncMcpToCliConfig(provider, funolioToolEnv, target) {
     if (provider === 'claude-cli') {
-        return syncToClaudeJson();
+        return syncToClaudeJson(target?.claudeJsonPath);
     }
     if (provider === 'codex-cli') {
-        return syncToCodexCli();
+        return syncToCodexCli(funolioToolEnv, target?.codexHomeDir);
     }
     return `[MCP sync] Provider "${provider}" is not a CLI provider — skipping`;
 }
-function syncToClaudeJson() {
-    const claudeJsonPath = path.join(os.homedir(), '.claude.json');
+function syncClaudeJsonConfig(funolioToolEnv = {}, claudeJsonPath = claudeJsonConfigPath()) {
     let config = {};
-    // Read existing ~/.claude.json
+    // Read existing Claude JSON config.
     try {
         if (fs.existsSync(claudeJsonPath)) {
             config = JSON.parse(fs.readFileSync(claudeJsonPath, 'utf-8'));
@@ -132,18 +437,30 @@ function syncToClaudeJson() {
     }
     // 2. Add the funolio-tools bridge server through the packaged binary.
     const agentCommand = resolvePackagedAgentCommand();
+    const funolioEnv = {};
+    if (process.env.BRAVE_API_KEY)
+        funolioEnv.BRAVE_API_KEY = process.env.BRAVE_API_KEY;
+    for (const [key, value] of Object.entries(funolioToolEnv || {})) {
+        if (!value || !String(value).trim())
+            continue;
+        funolioEnv[key] = String(value);
+    }
     config.mcpServers['funolio-tools'] = {
         command: agentCommand,
         args: ['mcp-serve'],
-        env: process.env.BRAVE_API_KEY ? { BRAVE_API_KEY: process.env.BRAVE_API_KEY } : undefined,
+        env: Object.keys(funolioEnv).length > 0 ? funolioEnv : undefined,
     };
     serverCount++;
-    // Write back ~/.claude.json
+    ensureClaudeJsonOnboardingDefaults(config);
+    // Write back the selected Claude JSON config.
     fs.writeFileSync(claudeJsonPath, JSON.stringify(config, null, 2), 'utf-8');
-    return `[MCP sync] Wrote ${serverCount} MCP server(s) to ~/.claude.json (including funolio-tools bridge)`;
+    return `[MCP sync] Wrote ${serverCount} MCP server(s) to ${claudeJsonPath} (including funolio-tools bridge)`;
+}
+function syncToClaudeJson(claudeJsonPath) {
+    return syncClaudeJsonConfig({}, claudeJsonPath || claudeJsonConfigPath());
 }
-function codexConfigPath() {
-    return path.join(os.homedir(), '.codex', 'config.toml');
+function codexConfigPath(baseDir) {
+    return path.join(baseDir || path.join(resolveHomeDir(), '.codex'), 'config.toml');
 }
 function stripCodexMcpSection(raw, name) {
     const lines = raw.split(/\r?\n/);
@@ -183,11 +500,11 @@ function appendCodexMcpStdio(raw, name, command, args, envVars) {
     }
     return `${raw.trimEnd()}\n${lines.join('\n')}\n`;
 }
-function syncToCodexCli() {
+function syncToCodexCli(funolioToolEnv, codexHomeDir) {
     const codexFunolioServerName = exports.CODEX_FUNOLIO_SERVER_NAME;
     let serverCount = 0;
     const configuredNames = [];
-    const configPath = codexConfigPath();
+    const configPath = codexConfigPath(codexHomeDir);
     if (!fs.existsSync(path.dirname(configPath))) {
         fs.mkdirSync(path.dirname(configPath), { recursive: true });
     }
@@ -219,11 +536,174 @@ function syncToCodexCli() {
     catch {
         // non-fatal
     }
-    raw = appendCodexMcpStdio(raw, codexFunolioServerName, resolvePackagedAgentCommand(), ['mcp-serve'], process.env.BRAVE_API_KEY ? { BRAVE_API_KEY: process.env.BRAVE_API_KEY } : undefined);
+    const mcpEnv = {};
+    if (process.env.BRAVE_API_KEY)
+        mcpEnv.BRAVE_API_KEY = process.env.BRAVE_API_KEY;
+    for (const [key, value] of Object.entries(funolioToolEnv || {})) {
+        if (value && String(value).trim())
+            mcpEnv[key] = String(value);
+    }
+    raw = appendCodexMcpStdio(raw, codexFunolioServerName, resolvePackagedAgentCommand(), ['mcp-serve'], Object.keys(mcpEnv).length > 0 ? mcpEnv : undefined);
     serverCount++;
     configuredNames.push(codexFunolioServerName);
     fs.writeFileSync(configPath, raw, 'utf-8');
     return `[MCP sync] Wrote ${serverCount} MCP server(s) to Codex CLI (${configuredNames.join(', ')})`;
 }
 exports.CODEX_FUNOLIO_SERVER_NAME = 'funolio_tools';
+function readJsonFile(filePath) {
+    try {
+        if (fs.existsSync(filePath)) {
+            const parsed = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+            if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+                return parsed;
+            }
+        }
+    }
+    catch {
+        // fall through
+    }
+    return {};
+}
+function ensureClaudeBotSettingsDefaults(settingsPath) {
+    const next = readJsonFile(settingsPath);
+    let dirty = false;
+    if (next.skipDangerousModePermissionPrompt !== true) {
+        next.skipDangerousModePermissionPrompt = true;
+        dirty = true;
+    }
+    if (typeof next.theme !== 'string' || !next.theme.trim()) {
+        next.theme = 'dark';
+        dirty = true;
+    }
+    if (dirty) {
+        fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
+        fs.writeFileSync(settingsPath, `${JSON.stringify(next, null, 2)}\n`, 'utf-8');
+    }
+}
+function ensureClaudeJsonOnboardingDefaults(config) {
+    if (config.hasCompletedOnboarding !== true) {
+        config.hasCompletedOnboarding = true;
+    }
+    if (typeof config.lastOnboardingVersion !== 'string' || !config.lastOnboardingVersion.trim()) {
+        config.lastOnboardingVersion = '2.1.0';
+    }
+    if (config.hasSeenTasksHint !== true) {
+        config.hasSeenTasksHint = true;
+    }
+    if (config.hasSeenStashHint !== true) {
+        config.hasSeenStashHint = true;
+    }
+}
+function writeClaudeBotSettings(botId, settings) {
+    const homeDir = ensureCliBotSessionHome('claude-cli', botId);
+    const settingsPath = path.join(homeDir, 'settings.json');
+    const next = readJsonFile(settingsPath);
+    const apply = (key, value) => {
+        if (value === undefined)
+            return;
+        if (value === null || value === '') {
+            delete next[key];
+            return;
+        }
+        next[key] = value;
+    };
+    apply('model', settings.model ?? undefined);
+    apply('effortLevel', settings.effortLevel ?? undefined);
+    apply('outputStyle', settings.outputStyle ?? undefined);
+    apply('fastMode', settings.fastMode ?? undefined);
+    apply('permissions', settings.permissions ?? undefined);
+    fs.writeFileSync(settingsPath, `${JSON.stringify(next, null, 2)}\n`, 'utf-8');
+    ensureClaudeBotSettingsDefaults(settingsPath);
+    return settingsPath;
+}
+function claudeBotSettingsPath(botId) {
+    return path.join(ensureCliBotSessionHome('claude-cli', botId), 'settings.json');
+}
+function readClaudeBotSettings(botId) {
+    const settingsPath = claudeBotSettingsPath(botId);
+    const parsed = readJsonFile(settingsPath);
+    const permissions = parsed.permissions && typeof parsed.permissions === 'object' && !Array.isArray(parsed.permissions)
+        ? parsed.permissions
+        : null;
+    return {
+        model: typeof parsed.model === 'string' ? parsed.model : null,
+        effortLevel: typeof parsed.effortLevel === 'string' ? parsed.effortLevel : null,
+        outputStyle: typeof parsed.outputStyle === 'string' ? parsed.outputStyle : null,
+        fastMode: typeof parsed.fastMode === 'boolean' ? parsed.fastMode : null,
+        permissions,
+    };
+}
+function setTomlScalarValue(raw, key, value) {
+    const linePattern = new RegExp(`^${key.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\$&')}\\s*=.*$`, 'm');
+    if (value === undefined)
+        return raw;
+    if (value === null || value === '') {
+        return raw.replace(linePattern, '').replace(/\n{3,}/g, '\n\n').trimEnd();
+    }
+    const serialized = typeof value === 'string'
+        ? JSON.stringify(value)
+        : typeof value === 'boolean'
+            ? (value ? 'true' : 'false')
+            : String(value);
+    if (linePattern.test(raw)) {
+        return raw.replace(linePattern, `${key} = ${serialized}`);
+    }
+    const suffix = raw.trimEnd().length > 0 ? '\n' : '';
+    return `${raw.trimEnd()}${suffix}${key} = ${serialized}\n`;
+}
+function writeCodexBotConfig(botId, config) {
+    const homeDir = ensureCliBotSessionHome('codex-cli', botId);
+    const configPath = codexConfigPath(homeDir);
+    let raw = fs.existsSync(configPath) ? fs.readFileSync(configPath, 'utf-8') : '';
+    raw = setTomlScalarValue(raw, 'model', config.model ?? undefined);
+    raw = setTomlScalarValue(raw, 'model_reasoning_effort', config.modelReasoningEffort ?? undefined);
+    raw = setTomlScalarValue(raw, 'personality', config.personality ?? undefined);
+    raw = setTomlScalarValue(raw, 'service_tier', config.serviceTier ?? undefined);
+    raw = setTomlScalarValue(raw, 'sandbox', config.sandbox ?? undefined);
+    raw = setTomlScalarValue(raw, 'approval_policy', config.approvalPolicy ?? undefined);
+    raw = setTomlScalarValue(raw, 'funolio_statusline_json', null);
+    raw = setTomlScalarValue(raw, 'funolio_terminal_title_json', null);
+    raw = setTomlScalarValue(raw, 'funolio_experimental_flags_json', null);
+    fs.mkdirSync(path.dirname(configPath), { recursive: true });
+    fs.writeFileSync(configPath, raw.trimEnd() ? `${raw.trimEnd()}\n` : '', 'utf-8');
+    return configPath;
+}
+function readTomlScalarValue(raw, key) {
+    const linePattern = new RegExp(`^${key.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\$&')}\\s*=\\s*(.+)$`, 'm');
+    const match = linePattern.exec(raw);
+    if (!match)
+        return null;
+    const value = match[1].trim();
+    if (!value)
+        return null;
+    if (value.startsWith('"') && value.endsWith('"')) {
+        try {
+            return JSON.parse(value);
+        }
+        catch {
+            return value.slice(1, -1);
+        }
+    }
+    return value;
+}
+function readCodexBotConfig(botId) {
+    const configPath = codexConfigPath(ensureCliBotSessionHome('codex-cli', botId));
+    if (!fs.existsSync(configPath))
+        return {};
+    let raw = '';
+    try {
+        raw = fs.readFileSync(configPath, 'utf-8');
+    }
+    catch {
+        return {};
+    }
+    return {
+        model: readTomlScalarValue(raw, 'model'),
+        modelReasoningEffort: readTomlScalarValue(raw, 'model_reasoning_effort'),
+        personality: readTomlScalarValue(raw, 'personality'),
+        serviceTier: readTomlScalarValue(raw, 'service_tier'),
+        sandbox: readTomlScalarValue(raw, 'sandbox'),
+        approvalPolicy: readTomlScalarValue(raw, 'approval_policy'),
+    };
+}
 //# sourceMappingURL=sync-cli-config.js.map