@foxden-app/foxclaw 0.3.17 → 0.3.19

package/dist/main.js

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
+import os from 'node:os';
 import path from 'node:path';
 import process from 'node:process';
 import { createInterface } from 'node:readline/promises';
 import { spawnSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
-import { APP_HOME, DEFAULT_ENV_PATH, DEFAULT_LOG_PATH, DEFAULT_STATUS_PATH, getLoadedEnvPath, loadConfig, loadEnv, } from './config.js';
+import { APP_HOME, DEFAULT_CODEX_TELEGRAM_HOME, DEFAULT_ENV_PATH, DEFAULT_LOG_PATH, DEFAULT_STATUS_PATH, getLoadedEnvPath, loadConfig, loadEnv, } from './config.js';
 import { acquireProcessLock, LockHeldError } from './lock.js';
 import { readRuntimeStatus, writeRuntimeStatus } from './runtime.js';
 import { refreshFoxclawExecStartDropIns, removeFoxclawExecStartDropIns } from './systemd.js';
@@ -61,6 +62,9 @@ async function main() {
             entryPoint,
             nodePath: process.execPath,
             version: readPackageVersion(),
+            ...(process.env.CODEX_CLI_BIN || resolveCommand('codex')
+                ? { codexCliBin: process.env.CODEX_CLI_BIN || resolveCommand('codex') }
+                : {}),
             ...(notificationFile ? { notificationFile } : {}),
         };
         const outcome = performSelfUpdate(options);
@@ -137,7 +141,7 @@ Usage:
   foxclaw --help`);
 }
 async function runServeCli() {
-    const [{ BridgeMessagingRouter }, { TelegramMessagingPort }, { WeixinChannelAdapter }, { WeixinMessagingPort }, { attachIlinkRuntimeFromBridgeLogger }, { loadWeixinAccount }, { Logger }, { BridgeStore }, { TelegramGateway }, { CodexAppClient }, { BridgeSessionCore }, { TelegramChannelAdapter },] = await Promise.all([
+    const [{ BridgeMessagingRouter }, { TelegramMessagingPort }, { WeixinChannelAdapter }, { WeixinMessagingPort }, { attachIlinkRuntimeFromBridgeLogger }, { loadWeixinAccount }, { Logger }, { BridgeStore }, { TelegramGateway }, { CodexAppClient }, { BridgeSessionCore }, { TelegramChannelAdapter }, { AuthCandidateMirror },] = await Promise.all([
         import('./channels/bridge_messaging_router.js'),
         import('./channels/telegram/telegram_messaging_port.js'),
         import('./channels/weixin/weixin_channel_adapter.js'),
@@ -150,6 +154,7 @@ async function runServeCli() {
         import('./codex_app/client.js'),
         import('./controller/controller.js'),
         import('./channels/telegram/telegram_channel_adapter.js'),
+        import('./auth/mirror.js'),
     ]);
     const config = loadConfig();
     const logger = new Logger(config.logLevel, config.logPath);
@@ -157,8 +162,132 @@ async function runServeCli() {
     const processLock = acquireProcessLock(config.lockPath);
     let store = null;
     let weixinAdapter = null;
+    let activeTelegramAdapters = [];
+    let managedApps = [];
+    let activeAuthMirror = null;
     try {
         store = new BridgeStore(config.storePath);
+        if (config.tgMultiBotMode) {
+            const seeds = [];
+            for (const token of config.tgBotTokens) {
+                const bot = new TelegramGateway(token, config.tgAllowedUserId, config.tgAllowedChatId, config.telegramPollIntervalMs, store, logger, true);
+                const id = await bot.initializeIdentity();
+                if (seeds.some((runtime) => runtime.id === id)) {
+                    throw new Error(`TG_BOT_TOKENS contains duplicate Telegram bot identity: ${id}`);
+                }
+                const home = path.join(DEFAULT_CODEX_TELEGRAM_HOME, id, 'home');
+                fs.mkdirSync(home, { recursive: true, mode: 0o700 });
+                const runtimeConfig = {
+                    ...config,
+                    tgBotToken: token,
+                    tgBotTokens: [token],
+                    tgScopeBotId: id,
+                    codexAuthDir: home,
+                    codexHome: home,
+                    codexAppServerStatePath: path.join(APP_HOME, 'runtime', `codex-app-server-${id}.json`),
+                    codexAppServerLogPath: path.join(APP_HOME, 'logs', `codex-app-server-${id}.log`),
+                };
+                const app = new CodexAppClient(runtimeConfig.codexCliBin, runtimeConfig.codexAppLaunchCmd, runtimeConfig.codexAppAutolaunch, runtimeConfig.codexAppServerStatePath, runtimeConfig.codexAppServerLogPath, logger, { CODEX_HOME: home });
+                seeds.push({ id, home, config: runtimeConfig, bot, app });
+            }
+            const canonicalAuthDir = config.codexAuthDir ?? config.codexHome ?? path.join(os.homedir(), '.codex');
+            const mirror = new AuthCandidateMirror(canonicalAuthDir, seeds.map((runtime) => ({
+                id: runtime.id,
+                authDir: runtime.home,
+                notify: async (message) => {
+                    const chatId = store.getTelegramPrivateChatId(runtime.id);
+                    if (chatId) {
+                        await runtime.bot.sendMessage(chatId, message);
+                    }
+                },
+            })), logger);
+            await mirror.initialize();
+            mirror.start();
+            activeAuthMirror = mirror;
+            managedApps = seeds.map((runtime) => runtime.app);
+            const selfUpdater = createSelfUpdateRuntime({
+                entryPoint,
+                nodePath: process.execPath,
+                version: readPackageVersion(),
+                statusPath: config.statusPath,
+                logPath: path.join(APP_HOME, 'logs', 'update.log'),
+                codexCliBin: config.codexCliBin,
+            });
+            const runtimes = [];
+            const writeAggregateStatus = (running = true) => {
+                const statuses = runtimes.map((runtime) => runtime.core.getRuntimeStatus());
+                const first = statuses[0] ?? null;
+                writeRuntimeStatus(config.statusPath, {
+                    running,
+                    connected: running && statuses.every((status) => status.connected),
+                    userAgent: first?.userAgent ?? null,
+                    ...(first?.codexAppServer ? { codexAppServer: first.codexAppServer } : {}),
+                    botUsername: first?.botUsername ?? null,
+                    currentBindings: store.countBindings(),
+                    pendingApprovals: store.countPendingApprovals(),
+                    pendingUserInputs: store.countPendingUserInputs(),
+                    activeTurns: statuses.reduce((sum, status) => sum + status.activeTurns, 0),
+                    lastError: statuses.find((status) => status.lastError)?.lastError ?? null,
+                    updatedAt: new Date().toISOString(),
+                    channels: { telegram: running, weixin: running && config.wxEnabled },
+                    bots: runtimes.map((runtime, index) => ({
+                        id: runtime.id,
+                        username: statuses[index]?.botUsername ?? runtime.bot.username,
+                        connected: running && Boolean(statuses[index]?.connected),
+                        activeTurns: running ? (statuses[index]?.activeTurns ?? 0) : 0,
+                        ...(statuses[index]?.codexAppServer ? { codexAppServer: statuses[index].codexAppServer } : {}),
+                    })),
+                });
+            };
+            const coordinator = {
+                canSelfUpdate: () => runtimes.every((runtime) => runtime.core.isIdleForServiceUpdate()),
+                authCandidateUpdated: (runtimeId, candidateName) => mirror.syncRuntimeCandidate(runtimeId, candidateName).then(() => undefined),
+                statusUpdated: () => writeAggregateStatus(),
+            };
+            for (const [index, seed] of seeds.entries()) {
+                const telegramMessaging = new TelegramMessagingPort(seed.bot);
+                const weixinMessaging = index === 0 && config.wxEnabled
+                    ? new WeixinMessagingPort(store, (id) => loadWeixinAccount(config.weixinAccountsDir, id))
+                    : null;
+                const outbound = new BridgeMessagingRouter(telegramMessaging, weixinMessaging);
+                const core = new BridgeSessionCore(seed.config, store, logger, seed.bot, seed.app, outbound, selfUpdater, coordinator);
+                runtimes.push({ ...seed, core, telegram: new TelegramChannelAdapter(core) });
+            }
+            if (config.wxEnabled) {
+                weixinAdapter = new WeixinChannelAdapter(runtimes[0].core, store, runtimes[0].config, logger);
+            }
+            activeTelegramAdapters = runtimes.map((runtime) => runtime.telegram);
+            process.on('unhandledRejection', (error) => {
+                logger.error('process.unhandled_rejection', { error: serializeError(error) });
+            });
+            process.on('uncaughtException', (error) => {
+                logger.error('process.uncaught_exception', { error: serializeError(error) });
+            });
+            for (const runtime of runtimes) {
+                await runtime.telegram.start();
+            }
+            if (weixinAdapter) {
+                await weixinAdapter.start();
+            }
+            writeAggregateStatus();
+            logger.info('bridge.started', { bots: runtimes.map((runtime) => runtime.id) });
+            const shutdown = async (signal) => {
+                logger.info('bridge.shutting_down', { signal });
+                mirror.stop();
+                await weixinAdapter?.stop();
+                await Promise.all(runtimes.map((runtime) => runtime.telegram.stop()));
+                writeAggregateStatus(false);
+                await Promise.all(runtimes.map((runtime) => runtime.app.stop({ terminateServer: true }).catch((error) => {
+                    logger.warn('codex.app-server.stop_failed', { runtimeId: runtime.id, error: serializeError(error) });
+                })));
+                store?.close();
+                processLock.release();
+                process.exit(0);
+            };
+            process.on('SIGINT', () => void shutdown('SIGINT'));
+            process.on('SIGTERM', () => void shutdown('SIGTERM'));
+            return;
+        }
         const bot = new TelegramGateway(config.tgBotToken, config.tgAllowedUserId, config.tgAllowedChatId, config.telegramPollIntervalMs, store, logger);
         const app = new CodexAppClient(config.codexCliBin, config.codexAppLaunchCmd, config.codexAppAutolaunch, config.codexAppServerStatePath, config.codexAppServerLogPath, logger);
         const telegramMessaging = new TelegramMessagingPort(bot);
@@ -172,9 +301,12 @@ async function runServeCli() {
             version: readPackageVersion(),
             statusPath: config.statusPath,
             logPath: path.join(APP_HOME, 'logs', 'update.log'),
+            codexCliBin: config.codexCliBin,
         });
         const core = new BridgeSessionCore(config, store, logger, bot, app, outbound, selfUpdater);
         const telegram = new TelegramChannelAdapter(core);
+        managedApps = [app];
+        activeTelegramAdapters = [telegram];
         if (config.wxEnabled) {
             weixinAdapter = new WeixinChannelAdapter(core, store, config, logger);
         }
@@ -218,7 +350,10 @@ async function runServeCli() {
         process.on('SIGTERM', () => void shutdown('SIGTERM'));
     }
     catch (error) {
+        activeAuthMirror?.stop();
         await weixinAdapter?.stop().catch(() => { });
+        await Promise.allSettled(activeTelegramAdapters.map((adapter) => adapter.stop()));
+        await Promise.allSettled(managedApps.map((app) => app.stop({ terminateServer: true })));
         store?.close();
         processLock.release();
         throw error;
@@ -264,15 +399,15 @@ async function configureEnvInteractively(envPath, existed) {
         const skipped = [];
         const warnings = [];
         Object.assign(updates, await maybeSaveProxyEnvFromShell(rl, envPath));
-        const token = sanitizeEnvInput(await rl.question('Telegram bot token (TG_BOT_TOKEN): '));
-        if (token) {
-            updates.TG_BOT_TOKEN = token;
-            if (!/^\d+:[A-Za-z0-9_-]+$/.test(token)) {
-                warnings.push('TG_BOT_TOKEN does not look like a standard Telegram bot token.');
+        const tokens = sanitizeEnvInput(await rl.question('Telegram bot token(s), comma-separated (TG_BOT_TOKENS): '));
+        if (tokens) {
+            updates.TG_BOT_TOKENS = tokens;
+            if (tokens.split(',').map((token) => token.trim()).some((token) => !/^\d+:[A-Za-z0-9_-]+$/.test(token))) {
+                warnings.push('One or more TG_BOT_TOKENS values do not look like standard Telegram bot tokens.');
             }
         }
         else {
-            skipped.push('TG_BOT_TOKEN');
+            skipped.push('TG_BOT_TOKENS');
         }
         const userId = sanitizeEnvInput(await rl.question('Telegram numeric user ID (TG_ALLOWED_USER_ID): '));
         if (userId) {
@@ -486,7 +621,7 @@ function runDoctorChecks() {
     const checks = [
         ['node >= 24', Number(process.versions.node.split('.')[0]) >= 24],
         ['codex cli available', hasConfiguredCodexBin(configuredCodexBin) || hasCommand('codex')],
-        ['telegram bot token configured', Boolean(process.env.TG_BOT_TOKEN)],
+        ['telegram bot token(s) configured', Boolean(process.env.TG_BOT_TOKENS?.trim() || process.env.TG_BOT_TOKEN?.trim())],
         ['telegram allowed user configured', Boolean(process.env.TG_ALLOWED_USER_ID)],
     ];
     if (process.env.WX_ENABLED === 'true' || process.env.WX_ENABLED === '1') {

package/dist/store/database.d.ts

@@ -29,6 +29,8 @@ export declare class BridgeStore {
     constructor(dbPath: string);
     getTelegramOffset(botKey: string): number;
     setTelegramOffset(botKey: string, updateId: number): void;
+    rememberTelegramPrivateScope(botId: string, scopeId: string, chatId: string): void;
+    getTelegramPrivateChatId(botId: string): string | null;
     getBinding(chatId: string): ThreadBinding | null;
     setBinding(chatId: string, threadId: string, cwd: string | null): void;
     clearBinding(chatId: string): void;
@@ -73,7 +75,7 @@ export declare class BridgeStore {
     private writeChatSettings;
     getWeixinContextToken(scopeId: string): string | null;
     setWeixinContextToken(scopeId: string, contextToken: string): void;
-    listDisabledCodexAuthCandidateNames(): Set<string>;
-    setCodexAuthCandidateDisabled(name: string, disabled: boolean): void;
+    listDisabledCodexAuthCandidateNames(runtimeId?: string): Set<string>;
+    setCodexAuthCandidateDisabled(name: string, disabled: boolean, runtimeId?: string): void;
     private ensureColumn;
 }

package/dist/store/database.js

@@ -8,10 +8,16 @@ export class BridgeStore {
         fs.mkdirSync(path.dirname(dbPath), { recursive: true });
         this.db = new DatabaseSync(dbPath);
         this.db.exec(`
-      CREATE TABLE IF NOT EXISTS telegram_offsets (
-        bot_key TEXT PRIMARY KEY,
-        update_id INTEGER NOT NULL
-      );
+      CREATE TABLE IF NOT EXISTS telegram_offsets (
+        bot_key TEXT PRIMARY KEY,
+        update_id INTEGER NOT NULL
+      );
+      CREATE TABLE IF NOT EXISTS telegram_private_scopes (
+        bot_id TEXT PRIMARY KEY,
+        scope_id TEXT NOT NULL,
+        chat_id TEXT NOT NULL,
+        updated_at INTEGER NOT NULL
+      );
       CREATE TABLE IF NOT EXISTS chat_bindings (
         chat_id TEXT PRIMARY KEY,
         thread_id TEXT NOT NULL,
@@ -110,6 +116,13 @@ export class BridgeStore {
         disabled INTEGER NOT NULL DEFAULT 0,
         updated_at INTEGER NOT NULL
       );
+      CREATE TABLE IF NOT EXISTS codex_auth_candidate_runtime (
+        runtime_id TEXT NOT NULL,
+        name TEXT NOT NULL,
+        disabled INTEGER NOT NULL DEFAULT 0,
+        updated_at INTEGER NOT NULL,
+        PRIMARY KEY (runtime_id, name)
+      );
     `);
         this.ensureColumn('thread_cache', 'name', 'TEXT');
         this.ensureColumn('thread_cache', 'model_provider', 'TEXT');
@@ -136,6 +149,17 @@ export class BridgeStore {
       ON CONFLICT(bot_key) DO UPDATE SET update_id = excluded.update_id
     `).run(botKey, updateId);
     }
+    rememberTelegramPrivateScope(botId, scopeId, chatId) {
+        this.db.prepare(`
+      INSERT INTO telegram_private_scopes (bot_id, scope_id, chat_id, updated_at)
+      VALUES (?, ?, ?, ?)
+      ON CONFLICT(bot_id) DO UPDATE SET scope_id = excluded.scope_id, chat_id = excluded.chat_id, updated_at = excluded.updated_at
+    `).run(botId, scopeId, chatId, Date.now());
+    }
+    getTelegramPrivateChatId(botId) {
+        const row = this.db.prepare('SELECT chat_id FROM telegram_private_scopes WHERE bot_id = ?').get(botId);
+        return row ? String(row.chat_id) : null;
+    }
     getBinding(chatId) {
         const row = this.db.prepare('SELECT chat_id, thread_id, cwd, updated_at FROM chat_bindings WHERE chat_id = ?').get(chatId);
         if (!row)
@@ -462,11 +486,23 @@ export class BridgeStore {
       ON CONFLICT(scope_id) DO UPDATE SET context_token = excluded.context_token, updated_at = excluded.updated_at
     `).run(scopeId, contextToken, Date.now());
     }
-    listDisabledCodexAuthCandidateNames() {
+    listDisabledCodexAuthCandidateNames(runtimeId = 'default') {
+        if (runtimeId !== 'default') {
+            const runtimeRows = this.db.prepare('SELECT name FROM codex_auth_candidate_runtime WHERE runtime_id = ? AND disabled = 1').all(runtimeId);
+            return new Set(runtimeRows.map(row => String(row.name)));
+        }
         const rows = this.db.prepare('SELECT name FROM codex_auth_candidates WHERE disabled = 1').all();
         return new Set(rows.map(row => String(row.name)));
     }
-    setCodexAuthCandidateDisabled(name, disabled) {
+    setCodexAuthCandidateDisabled(name, disabled, runtimeId = 'default') {
+        if (runtimeId !== 'default') {
+            this.db.prepare(`
+        INSERT INTO codex_auth_candidate_runtime (runtime_id, name, disabled, updated_at)
+        VALUES (?, ?, ?, ?)
+        ON CONFLICT(runtime_id, name) DO UPDATE SET disabled = excluded.disabled, updated_at = excluded.updated_at
+      `).run(runtimeId, name, disabled ? 1 : 0, Date.now());
+            return;
+        }
         this.db.prepare(`
       INSERT INTO codex_auth_candidates (name, disabled, updated_at)
       VALUES (?, ?, ?)

package/dist/telegram/addressing.d.ts

@@ -27,6 +27,7 @@ interface DefaultScopeParams {
     allowedChatId: string | null;
     allowedTopicId: number | null;
     topicId: number | null;
+    requireExplicitGroupAddressing?: boolean;
 }
 export declare function resolveTelegramAddressing(params: ResolveTelegramAddressingParams): TelegramAddressingDecision;
 export declare function isDefaultTelegramScope(params: DefaultScopeParams): boolean;

package/dist/telegram/addressing.js

@@ -21,6 +21,9 @@ export function isDefaultTelegramScope(params) {
     if (params.chatType === 'private') {
         return true;
     }
+    if (params.requireExplicitGroupAddressing) {
+        return false;
+    }
     if (params.allowedChatId === null) {
         return false;
     }

package/dist/telegram/gateway.d.ts

@@ -34,12 +34,15 @@ export declare class TelegramGateway extends EventEmitter {
     private readonly pollIntervalMs;
     private readonly store;
     private readonly logger;
+    private readonly namespacedScopes;
     private running;
     private botKey;
     private botUsername;
     private botUserId;
-    constructor(botToken: string, allowedUserId: string, allowedChatId: string | null, pollIntervalMs: number, store: BridgeStore, logger: Logger);
+    constructor(botToken: string, allowedUserId: string, allowedChatId: string | null, pollIntervalMs: number, store: BridgeStore, logger: Logger, namespacedScopes?: boolean);
     get username(): string | null;
+    get identity(): string | null;
+    initializeIdentity(): Promise<string>;
     start(): Promise<void>;
     stop(): void;
     sendMessage(chatId: string, text: string, inlineKeyboard?: Array<Array<{

package/dist/telegram/gateway.js

@@ -11,11 +11,12 @@ export class TelegramGateway extends EventEmitter {
     pollIntervalMs;
     store;
     logger;
+    namespacedScopes;
     running = false;
     botKey;
     botUsername = null;
     botUserId = null;
-    constructor(botToken, allowedUserId, allowedChatId, pollIntervalMs, store, logger) {
+    constructor(botToken, allowedUserId, allowedChatId, pollIntervalMs, store, logger, namespacedScopes = false) {
         super();
         this.botToken = botToken;
         this.allowedUserId = allowedUserId;
@@ -23,16 +24,26 @@ export class TelegramGateway extends EventEmitter {
         this.pollIntervalMs = pollIntervalMs;
         this.store = store;
         this.logger = logger;
+        this.namespacedScopes = namespacedScopes;
         this.botKey = `telegram:${crypto.createHash('sha256').update(this.botToken).digest('hex').slice(0, 8)}`;
     }
     get username() {
         return this.botUsername;
     }
+    get identity() {
+        return this.botUserId === null ? null : `bot${this.botUserId}`;
+    }
+    async initializeIdentity() {
+        await this.resolveBotIdentity(true);
+        return this.identity;
+    }
     async start() {
         if (this.running)
             return;
         this.running = true;
-        await this.resolveBotIdentity();
+        if (this.botUserId === null) {
+            await this.resolveBotIdentity(this.namespacedScopes);
+        }
         await this.registerCommands();
         void this.pollLoop();
     }
@@ -134,12 +145,16 @@ export class TelegramGateway extends EventEmitter {
     async downloadResolvedFile(remoteFilePath, destinationPath) {
         return downloadTelegramFile(this.botToken, remoteFilePath, destinationPath);
     }
-    async resolveBotIdentity() {
+    async resolveBotIdentity(required = false) {
         const result = await callTelegramApi(this.botToken, 'getMe', {});
         if (result.ok && result.result) {
             this.botKey = `telegram:bot${result.result.id}`;
             this.botUserId = result.result.id;
             this.botUsername = result.result.username ?? null;
+            return;
+        }
+        if (required) {
+            throw new Error(result.description || 'Failed to resolve Telegram bot identity');
         }
     }
     async registerCommands() {
@@ -187,7 +202,7 @@ export class TelegramGateway extends EventEmitter {
             const attachments = extractAttachments(update.message);
             const text = update.message.text ?? update.message.caption ?? '';
             const topicId = update.message.message_thread_id ?? null;
-            const scopeId = toTelegramBridgeScopeId(createTelegramScopeId(String(update.message.chat.id), topicId));
+            const scopeId = toTelegramBridgeScopeId(createTelegramScopeId(String(update.message.chat.id), topicId), this.namespacedScopes ? this.identity : null);
             const entities = update.message.text ? (update.message.entities ?? []) : (update.message.caption_entities ?? []);
             const replyToBot = this.botUserId !== null && update.message.reply_to_message?.from?.id === this.botUserId;
             if (text || attachments.length > 0) {
@@ -204,6 +219,9 @@ export class TelegramGateway extends EventEmitter {
                     replyToBot,
                     ...(update.message.from.language_code ? { languageCode: update.message.from.language_code } : {}),
                 });
+                if (update.message.chat.type === 'private' && this.identity) {
+                    this.store.rememberTelegramPrivateScope(this.identity, scopeId, String(update.message.chat.id));
+                }
                 return;
             }
         }
@@ -216,7 +234,7 @@ export class TelegramGateway extends EventEmitter {
             this.emit('callback', {
                 chatId: String(update.callback_query.message.chat.id),
                 topicId,
-                scopeId: toTelegramBridgeScopeId(createTelegramScopeId(String(update.callback_query.message.chat.id), topicId)),
+                scopeId: toTelegramBridgeScopeId(createTelegramScopeId(String(update.callback_query.message.chat.id), topicId), this.namespacedScopes ? this.identity : null),
                 userId: String(update.callback_query.from.id),
                 data: update.callback_query.data,
                 callbackQueryId: update.callback_query.id,

package/dist/types.d.ts

@@ -340,4 +340,11 @@ export interface RuntimeStatus {
         telegram: boolean;
         weixin: boolean;
     };
+    bots?: Array<{
+        id: string;
+        username: string | null;
+        connected: boolean;
+        activeTurns: number;
+        codexAppServer?: RuntimeStatus['codexAppServer'];
+    }>;
 }

package/dist/update.d.ts

@@ -6,6 +6,7 @@ export interface SelfUpdateStatus {
     locale: AppLocale;
     fromVersion: string;
     toVersion: string | null;
+    codexUpdate?: string | null;
     error: string | null;
     updatedAt: string;
 }
@@ -19,6 +20,7 @@ export interface SelfUpdateInstaller {
     command: string;
     installArgs: string[];
     rootArgs: string[];
+    pnpmHome?: string;
 }
 interface CreateSelfUpdateRuntimeOptions {
     entryPoint: string;
@@ -26,12 +28,14 @@ interface CreateSelfUpdateRuntimeOptions {
     version: string;
     statusPath: string;
     logPath: string;
+    codexCliBin?: string;
 }
 interface PerformSelfUpdateOptions {
     entryPoint: string;
     nodePath: string;
     version: string;
     notificationFile?: string;
+    codexCliBin?: string;
     env?: NodeJS.ProcessEnv;
 }
 export interface SelfUpdateOutcome {
@@ -43,6 +47,7 @@ export interface SelfUpdateOutcome {
 export declare function selfUpdateStatusPath(statusPath: string): string;
 export declare function inferPnpmHomeFromEntryPoint(entryPoint: string): string | null;
 export declare function resolveSelfUpdateInstaller(entryPoint: string, nodePath?: string, exists?: (target: string) => boolean, env?: NodeJS.ProcessEnv): SelfUpdateInstaller;
+export declare function resolveCodexUpdateInstaller(codexCliBin: string, nodePath?: string, exists?: (target: string) => boolean, env?: NodeJS.ProcessEnv, realpath?: (target: string) => string, readText?: (target: string) => string): SelfUpdateInstaller | null;
 export declare function readSelfUpdateStatus(statusFile: string): SelfUpdateStatus | null;
 export declare function writeSelfUpdateStatus(statusFile: string, status: SelfUpdateStatus): void;
 export declare function createSelfUpdateRuntime(options: CreateSelfUpdateRuntimeOptions): SelfUpdateRuntime;