@foxden-app/foxclaw 0.3.7 → 0.3.8

package/dist/controller/controller.d.ts

@@ -249,6 +249,8 @@ export declare class BridgeSessionCore {
     private retryTurnAfterAuthRotation;
     private selectNextCodexAuthCandidate;
     private listCodexAuthState;
+    private readCodexAuthSwitchLabels;
+    private codexAuthSwitchParams;
     private switchCodexAuthAndRestart;
     private buildNativeCollaborationMode;
     private buildCodexUsageStatusLines;

package/dist/controller/controller.js

@@ -3693,7 +3693,8 @@ export class BridgeSessionCore {
             await this.sendMessage(scopeId, renderAuthListMessage(locale, state, parseWeixinBridgeScope(scopeId) !== null));
             return;
         }
-        await this.sendMessage(scopeId, t(locale, 'auth_switching', { value: candidate.name }));
+        const switchLabels = await this.readCodexAuthSwitchLabels(candidate);
+        await this.sendMessage(scopeId, t(locale, 'auth_switching', this.codexAuthSwitchParams(locale, switchLabels.fromLabel, switchLabels.toLabel)));
         await this.switchCodexAuthAndRestart(scopeId, locale, candidate, false);
     }
     async handleAuthToggleCommand(scopeId, locale, args, disabled) {
@@ -4190,8 +4191,10 @@ export class BridgeSessionCore {
         }
         await this.messaging.answerCallback(event.callbackQueryId, t(locale, 'auth_choice_recorded'));
         this.pendingAuthChoiceLists.delete(localId);
+        const switchLabels = await this.readCodexAuthSwitchLabels(candidate);
+        const switchingMessage = t(locale, 'auth_switching', this.codexAuthSwitchParams(locale, switchLabels.fromLabel, switchLabels.toLabel));
         if (record.messageId !== null) {
-            await this.editMessage(event.scopeId, record.messageId, t(locale, 'auth_switching', { value: candidate.name }), []);
+            await this.editMessage(event.scopeId, record.messageId, switchingMessage, []);
         }
         await this.switchCodexAuthAndRestart(event.scopeId, locale, candidate, false);
     }
@@ -4207,16 +4210,17 @@ export class BridgeSessionCore {
         this.authRotationInProgress = true;
         try {
             const failedTargets = rotation.retry?.failedAuthTargets ?? this.authRotationFailedTargets;
-            const candidate = await this.selectNextCodexAuthCandidate(failedTargets);
+            const selection = await this.selectNextCodexAuthCandidate(failedTargets);
             const locale = this.localeForChat(rotation.scopeId);
-            if (!candidate) {
+            if (!selection) {
                 await this.sendMessage(rotation.scopeId, t(locale, 'auth_auto_no_candidate', {
                     error: formatShortStatusError(rotation.reason),
                 }));
                 return false;
             }
+            const { candidate, fromLabel, toLabel } = selection;
             await this.sendMessage(rotation.scopeId, t(locale, 'auth_auto_switching', {
-                value: candidate.name,
+                ...this.codexAuthSwitchParams(locale, fromLabel, toLabel),
                 error: formatShortStatusError(rotation.reason),
             }));
             await this.switchCodexAuthAndRestart(rotation.scopeId, locale, candidate, true);
@@ -4290,21 +4294,35 @@ export class BridgeSessionCore {
         for (let offset = 1; offset <= state.candidates.length; offset += 1) {
             const candidate = state.candidates[(currentIndex + offset + state.candidates.length) % state.candidates.length];
             if (candidate && !candidate.disabled && !failedTargets.has(candidate.path)) {
-                return candidate;
+                return { candidate, fromLabel: state.currentLabel, toLabel: await authPathDisplayLabel(candidate.path) };
             }
         }
-        return candidates[0] ?? null;
+        const candidate = candidates[0] ?? null;
+        return candidate ? { candidate, fromLabel: state.currentLabel, toLabel: await authPathDisplayLabel(candidate.path) } : null;
     }
     async listCodexAuthState() {
         return listCodexAuthState(this.store.listDisabledCodexAuthCandidateNames());
     }
+    async readCodexAuthSwitchLabels(candidate) {
+        const state = await this.listCodexAuthState();
+        return {
+            fromLabel: state.currentLabel,
+            toLabel: await authPathDisplayLabel(candidate.path),
+        };
+    }
+    codexAuthSwitchParams(locale, fromLabel, toLabel) {
+        return {
+            from: fromLabel ?? t(locale, 'none'),
+            to: toLabel,
+        };
+    }
     async switchCodexAuthAndRestart(scopeId, locale, candidate, automatic) {
-        await switchCodexAuth(candidate.path);
+        const result = await switchCodexAuth(candidate.path);
         this.authRotationFailedTargets.delete(candidate.path);
         this.pendingTurnErrors.clear();
         this.attachedThreads.clear();
         await this.app.restart();
-        const lines = [t(locale, automatic ? 'auth_auto_done' : 'auth_switch_done', { value: candidate.name })];
+        const lines = [t(locale, automatic ? 'auth_auto_done' : 'auth_switch_done', this.codexAuthSwitchParams(locale, result.fromLabel, result.toLabel))];
         lines.push(...await this.buildCodexUsageStatusLines(locale));
         await this.sendMessage(scopeId, lines.join('\n'));
     }
@@ -6913,7 +6931,7 @@ async function listCodexAuthState(disabledNames = new Set()) {
         authDir,
         authPath,
         currentTargetPath,
-        currentLabel: currentTargetPath ? path.basename(currentTargetPath) : null,
+        currentLabel: currentTargetPath ? await authPathDisplayLabel(currentTargetPath) : null,
         candidates,
     };
 }
@@ -6946,6 +6964,27 @@ async function resolveCurrentAuthTarget(authDir, authPath) {
     }
     return authPath;
 }
+async function resolveAuthFinalTargetPath(startPath) {
+    let currentPath = startPath;
+    const seen = new Set();
+    for (let depth = 0; depth < 20; depth += 1) {
+        const absolutePath = path.resolve(currentPath);
+        if (seen.has(absolutePath)) {
+            return currentPath;
+        }
+        seen.add(absolutePath);
+        const stat = await fs.lstat(currentPath).catch(() => null);
+        if (!stat?.isSymbolicLink()) {
+            return currentPath;
+        }
+        const target = await fs.readlink(currentPath);
+        currentPath = path.resolve(path.dirname(currentPath), target);
+    }
+    return currentPath;
+}
+async function authPathDisplayLabel(authPath) {
+    return path.basename(await resolveAuthFinalTargetPath(authPath));
+}
 async function pointCodexAuthAtTarget(authDir, authPath, targetPath) {
     await fs.mkdir(authDir, { recursive: true });
     const tempLink = path.join(authDir, `.auth.json.${process.pid}.${Date.now()}.tmp`);
@@ -6965,6 +7004,10 @@ async function switchCodexAuth(targetPath) {
         throw new Error(`Auth candidate is no longer available: ${path.basename(targetPath)}`);
     }
     await pointCodexAuthAtTarget(state.authDir, state.authPath, candidate.path);
+    return {
+        fromLabel: state.currentLabel,
+        toLabel: await authPathDisplayLabel(candidate.path),
+    };
 }
 function renderAuthListMessage(locale, state, includeWeixinCopyPaste = false) {
     const lines = [

package/dist/i18n.d.ts

@@ -133,10 +133,10 @@ declare const MESSAGES: {
         readonly auth_choice_expired: "This auth list is no longer active";
         readonly auth_choice_mismatch: "Auth choice does not match this message";
         readonly auth_choice_recorded: "Auth selected";
-        readonly auth_switching: "Switching Codex auth to {value}...";
-        readonly auth_switch_done: "Codex auth switched to {value}.";
-        readonly auth_auto_switching: "Codex auth problem detected ({error}). Switching to {value}...";
-        readonly auth_auto_done: "Auto-switched Codex auth to {value}.";
+        readonly auth_switching: "Switching Codex auth: {from} -> {to}...";
+        readonly auth_switch_done: "Codex auth switched: {from} -> {to}.";
+        readonly auth_auto_switching: "Codex auth problem detected ({error}). Switching: {from} -> {to}...";
+        readonly auth_auto_done: "Auto-switched Codex auth: {from} -> {to}.";
         readonly auth_auto_retrying: "Retrying the same request with the new auth...";
         readonly auth_auto_retry_thread_missing: "Auth was switched, but the original thread is no longer available ({threadId}). Retry was stopped to avoid creating duplicate sessions.";
         readonly auth_auto_no_candidate: "Codex auth problem detected ({error}), but no unused auth candidate is available.";
@@ -683,10 +683,10 @@ declare const MESSAGES: {
         readonly auth_choice_expired: "这个 auth 列表已经不再有效";
         readonly auth_choice_mismatch: "这个 auth 选择按钮不属于当前消息";
         readonly auth_choice_recorded: "已选择 auth";
-        readonly auth_switching: "正在切换 Codex auth 到 {value}...";
-        readonly auth_switch_done: "Codex auth 已切换到 {value}。";
-        readonly auth_auto_switching: "检测到 Codex auth 问题（{error}），正在切换到 {value}...";
-        readonly auth_auto_done: "已自动切换 Codex auth 到 {value}。";
+        readonly auth_switching: "正在切换 Codex auth：{from} -> {to}...";
+        readonly auth_switch_done: "Codex auth 已切换：{from} -> {to}。";
+        readonly auth_auto_switching: "检测到 Codex auth 问题（{error}），正在切换：{from} -> {to}...";
+        readonly auth_auto_done: "已自动切换 Codex auth：{from} -> {to}。";
         readonly auth_auto_retrying: "正在用新的 auth 重试同一条请求...";
         readonly auth_auto_retry_thread_missing: "Auth 已切换，但原线程已经不可用（{threadId}）。已停止重试，避免创建重复 session。";
         readonly auth_auto_no_candidate: "检测到 Codex auth 问题（{error}），但没有可用的未失败候选 auth。";

package/dist/i18n.js

@@ -131,10 +131,10 @@ const MESSAGES = {
         auth_choice_expired: 'This auth list is no longer active',
         auth_choice_mismatch: 'Auth choice does not match this message',
         auth_choice_recorded: 'Auth selected',
-        auth_switching: 'Switching Codex auth to {value}...',
-        auth_switch_done: 'Codex auth switched to {value}.',
-        auth_auto_switching: 'Codex auth problem detected ({error}). Switching to {value}...',
-        auth_auto_done: 'Auto-switched Codex auth to {value}.',
+        auth_switching: 'Switching Codex auth: {from} -> {to}...',
+        auth_switch_done: 'Codex auth switched: {from} -> {to}.',
+        auth_auto_switching: 'Codex auth problem detected ({error}). Switching: {from} -> {to}...',
+        auth_auto_done: 'Auto-switched Codex auth: {from} -> {to}.',
         auth_auto_retrying: 'Retrying the same request with the new auth...',
         auth_auto_retry_thread_missing: 'Auth was switched, but the original thread is no longer available ({threadId}). Retry was stopped to avoid creating duplicate sessions.',
         auth_auto_no_candidate: 'Codex auth problem detected ({error}), but no unused auth candidate is available.',
@@ -681,10 +681,10 @@ const MESSAGES = {
         auth_choice_expired: '这个 auth 列表已经不再有效',
         auth_choice_mismatch: '这个 auth 选择按钮不属于当前消息',
         auth_choice_recorded: '已选择 auth',
-        auth_switching: '正在切换 Codex auth 到 {value}...',
-        auth_switch_done: 'Codex auth 已切换到 {value}。',
-        auth_auto_switching: '检测到 Codex auth 问题（{error}），正在切换到 {value}...',
-        auth_auto_done: '已自动切换 Codex auth 到 {value}。',
+        auth_switching: '正在切换 Codex auth：{from} -> {to}...',
+        auth_switch_done: 'Codex auth 已切换：{from} -> {to}。',
+        auth_auto_switching: '检测到 Codex auth 问题（{error}），正在切换：{from} -> {to}...',
+        auth_auto_done: '已自动切换 Codex auth：{from} -> {to}。',
         auth_auto_retrying: '正在用新的 auth 重试同一条请求...',
         auth_auto_retry_thread_missing: 'Auth 已切换，但原线程已经不可用（{threadId}）。已停止重试，避免创建重复 session。',
         auth_auto_no_candidate: '检测到 Codex auth 问题（{error}），但没有可用的未失败候选 auth。',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foxden-app/foxclaw",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "Foxden local execution claw for controlling Codex from trusted chat interfaces.",
   "type": "module",
   "main": "dist/main.js",