@foxden-app/foxclaw 0.5.12 → 0.5.14

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable FoxClaw changes are listed here. Each release note is bilingual so GitHub Releases and the npm package are useful to both Chinese and English readers.
 
+## 0.5.14 - 2026-06-08
+
+### 中文
+- Linux `foxclaw start` / `foxclaw restart` / `install-systemd` 现在如果检测到自己正运行在 `foxclaw.service` cgroup 内，会通过一次性的 `systemd-run --user` helper 在服务外执行重启，避免命令执行者被自己重启时杀掉导致半截输出或不确定状态。
+- 继续保留 systemd 作为稳定守护层：主 service 仍由 `Restart=always`、`KillMode=control-group` 和 user linger 保活；重启编排则交给短生命周期 helper，避免再引入一个更脆弱的常驻 Node 守护进程。
+
+### English
+- On Linux, `foxclaw start`, `foxclaw restart`, and `install-systemd` now detect when they are running inside the `foxclaw.service` cgroup and delegate the actual restart to a one-shot `systemd-run --user` helper outside that cgroup, avoiding half-written output or uncertain state when the caller would otherwise kill itself.
+- systemd remains the stable supervisor with `Restart=always`, `KillMode=control-group`, and user linger; restart orchestration moves to a short-lived helper instead of adding another long-running Node watchdog.
+
+## 0.5.13 - 2026-06-08
+
+### 中文
+- `auth.json_team_<localpart>` 候选现在会校验文件内 ChatGPT email localpart 是否匹配候选名；不匹配时 `/auth` 标为无效，避免继续显示另一位 seat 的额度。
+- 本机 auth mirror 不再传播 team 候选名与文件身份不一致的 auth，并会在启动 reconcile 时用仍然匹配候选名的 runtime 副本修复错误副本。
+- `/auth refresh all` 和当前候选额度刷新会跳过身份与 `team_` 候选名不匹配的文件，避免脏额度快照再次写入。
+
+### English
+- `auth.json_team_<localpart>` candidates now verify that the ChatGPT email local part inside the auth file matches the candidate name; mismatches are marked invalid in `/auth` instead of displaying another seat's quota.
+- The local auth mirror no longer propagates team candidates whose filename identity and auth payload disagree, and startup reconciliation can repair bad copies from a runtime copy that still matches the candidate name.
+- `/auth refresh all` and current-candidate quota refresh now skip files whose identity does not match the `team_` candidate name, preventing dirty quota snapshots from being recorded again.
+
 ## 0.5.12 - 2026-06-08
 
 ### 中文

package/dist/auth/mirror.d.ts

@@ -109,3 +109,4 @@ export declare function isAuthCandidateName(name: string): boolean;
 export declare function readChatGptAuthRecord(filePath: string): Promise<ChatGptAuthRecord | null>;
 export declare function readChatGptAuthMetadata(filePath: string): Promise<ChatGptAuthMetadata | null>;
 export declare function parseChatGptAuthMetadata(raw: string): ChatGptAuthMetadata | null;
+export declare function chatGptAuthMetadataMatchesCandidateName(candidateName: string, metadata: Pick<ChatGptAuthMetadata, 'email'>): boolean;

package/dist/auth/mirror.js

@@ -159,9 +159,18 @@ export class AuthCandidateMirror {
             const destination = await readChatGptAuthRecord(destinationPath);
             if (!destination)
                 return null;
+            const destinationMatchesName = chatGptAuthMetadataMatchesCandidateName(candidateName, destination);
             const sources = await this.collectAuthRecords();
             const newest = sources
-                .filter(entry => authRecordsCompatible(entry.record, destination))
+                .filter((entry) => {
+                if (!chatGptAuthMetadataMatchesCandidateName(candidateName, entry.record)) {
+                    return false;
+                }
+                if (!destinationMatchesName) {
+                    return entry.candidateName === candidateName;
+                }
+                return authRecordsCompatible(entry.record, destination);
+            })
                 .reduce((current, entry) => (!current || entry.record.lastRefreshMs > current.record.lastRefreshMs ? entry : current), null);
             if (!newest || newest.record.lastRefreshMs <= destination.lastRefreshMs) {
                 return null;
@@ -200,10 +209,17 @@ export class AuthCandidateMirror {
                 skipped += this.runtimes.length;
                 continue;
             }
+            if (!chatGptAuthMetadataMatchesCandidateName(name, canonical)) {
+                skipped += this.runtimes.length;
+                this.logger.warn('auth.mirror.distribution_identity_mismatch', { name });
+                continue;
+            }
             for (const runtime of this.runtimes) {
                 const destinationPath = path.join(runtime.authDir, name);
                 const destination = await readChatGptAuthRecord(destinationPath);
-                if (destination && !authRecordsCompatible(destination, canonical)) {
+                if (destination
+                    && chatGptAuthMetadataMatchesCandidateName(name, destination)
+                    && !authRecordsCompatible(destination, canonical)) {
                     skipped += 1;
                     this.logger.warn('auth.mirror.distribution_conflict', { runtimeId: runtime.id, name });
                     continue;
@@ -232,8 +248,11 @@ export class AuthCandidateMirror {
                 if (!metadata) {
                     return { ok: false, imported: false, reason: 'invalid ChatGPT auth payload' };
                 }
+                if (!chatGptAuthMetadataMatchesCandidateName(candidateName, metadata)) {
+                    return { ok: false, imported: false, reason: 'candidate auth identity does not match candidate name' };
+                }
                 const existing = (await this.collectAuthRecords())
-                    .filter(entry => entry.candidateName === candidateName);
+                    .filter(entry => entry.candidateName === candidateName && chatGptAuthMetadataMatchesCandidateName(candidateName, entry.record));
                 const conflicting = existing.find(entry => !authRecordsCompatible(entry.record, metadata));
                 if (conflicting) {
                     return { ok: false, imported: false, reason: 'same candidate belongs to a different account or ChatGPT user' };
@@ -286,9 +305,15 @@ export class AuthCandidateMirror {
             const record = await readChatGptAuthRecord(sourcePath);
             if (!record)
                 return false;
+            if (!chatGptAuthMetadataMatchesCandidateName(name, record)) {
+                this.logger.warn('auth.mirror.identity_mismatch', { runtimeId: runtime.id, name });
+                return false;
+            }
             const canonicalPath = path.join(this.canonicalDir, name);
             const canonical = await readChatGptAuthRecord(canonicalPath);
-            if (canonical && !authRecordsCompatible(canonical, record)) {
+            if (canonical
+                && chatGptAuthMetadataMatchesCandidateName(name, canonical)
+                && !authRecordsCompatible(canonical, record)) {
                 this.logger.warn('auth.mirror.account_conflict', { runtimeId: runtime.id, name });
                 return false;
             }
@@ -315,7 +340,15 @@ export class AuthCandidateMirror {
             await atomicWrite(canonicalPath, record.raw);
             for (const target of this.runtimes) {
                 if (target.id !== runtime.id) {
-                    await atomicWrite(path.join(target.authDir, name), record.raw);
+                    const targetPath = path.join(target.authDir, name);
+                    const targetRecord = await readChatGptAuthRecord(targetPath);
+                    if (targetRecord
+                        && chatGptAuthMetadataMatchesCandidateName(name, targetRecord)
+                        && !authRecordsCompatible(targetRecord, record)) {
+                        this.logger.warn('auth.mirror.target_conflict', { sourceRuntimeId: runtime.id, targetRuntimeId: target.id, name });
+                        continue;
+                    }
+                    await atomicWrite(targetPath, record.raw);
                 }
             }
             this.lastSyncedRefresh.set(name, record.lastRefreshMs);
@@ -422,12 +455,17 @@ export class AuthCandidateMirror {
         })))).filter((entry) => entry.record !== null);
         if (records.length === 0)
             return;
-        const reference = records[0].record;
-        if (records.some(entry => !authRecordsCompatible(reference, entry.record))) {
+        const trustedRecords = records.filter(entry => chatGptAuthMetadataMatchesCandidateName(name, entry.record));
+        if (trustedRecords.length === 0) {
+            this.logger.warn('auth.mirror.startup_identity_mismatch', { name });
+            return;
+        }
+        const reference = trustedRecords[0].record;
+        if (trustedRecords.some(entry => !authRecordsCompatible(reference, entry.record))) {
             this.logger.warn('auth.mirror.startup_conflict', { name });
             return;
         }
-        const newest = records.reduce((current, entry) => (entry.record.lastRefreshMs > current.record.lastRefreshMs ? entry : current));
+        const newest = trustedRecords.reduce((current, entry) => (entry.record.lastRefreshMs > current.record.lastRefreshMs ? entry : current));
         this.lastSyncedRefresh.set(name, newest.record.lastRefreshMs);
         for (const destination of paths) {
             await atomicWrite(destination, newest.record.raw);
@@ -560,6 +598,26 @@ export function parseChatGptAuthMetadata(raw) {
         return null;
     }
 }
+export function chatGptAuthMetadataMatchesCandidateName(candidateName, metadata) {
+    const expectedLocalPart = expectedTeamCandidateEmailLocalPart(candidateName);
+    if (!expectedLocalPart || !metadata.email) {
+        return true;
+    }
+    const actualLocalPart = metadata.email.split('@', 1)[0]?.trim().toLowerCase() ?? '';
+    return actualLocalPart === expectedLocalPart;
+}
+function expectedTeamCandidateEmailLocalPart(candidateName) {
+    const prefix = 'auth.json_team_';
+    if (!candidateName.startsWith(prefix)) {
+        return null;
+    }
+    const raw = candidateName.slice(prefix.length).trim().toLowerCase();
+    if (!raw || raw.includes('/') || raw.includes('\\')) {
+        return null;
+    }
+    const localPart = raw.includes('@') ? raw.split('@', 1)[0] : raw;
+    return /^[a-z0-9][a-z0-9._+-]*$/.test(localPart) ? localPart : null;
+}
 function chatGptQuotaIdentityId(accountId, userId, email) {
     if (userId) {
         return `${accountId}:user:${userId}`;

package/dist/controller/controller.js

@@ -3,7 +3,7 @@ import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { normalizeLocale, t } from '../i18n.js';
-import { parseChatGptAuthMetadata, readChatGptAuthMetadata } from '../auth/mirror.js';
+import { chatGptAuthMetadataMatchesCandidateName, parseChatGptAuthMetadata, readChatGptAuthMetadata, } from '../auth/mirror.js';
 import { parseCommand } from './commands.js';
 import { buildAccessSettingsKeyboard, buildModelSettingsKeyboard, buildSetupPanelKeyboard, buildThreadListKeyboard, buildThreadsKeyboard, clampEffortToModel, formatAccessPresetLabel, formatActiveTurnMessageModeLabel, formatAccessSettingsMessage, formatApprovalPolicyLabel, formatCollaborationModeLabel, formatModelSettingsMessage, formatSandboxModeLabel, formatServiceTierStatusLabel, formatSetupPanelMessage, formatThreadContextSummary, formatThreadsMessage, formatWeixinAccessCopyPaste, formatWeixinModelCopyPaste, formatWeixinThreadsCopyPaste, formatWeixinWhereNavCopyPaste, formatWhereMessage, normalizeRequestedEffort, resolveCurrentModel, resolveActiveTurnMessageMode, resolveRequestedModel, } from './presentation.js';
 import { clampServiceTierToModel, resolveFastTierForModel } from './service_tier.js';
@@ -5410,7 +5410,7 @@ export class BridgeSessionCore {
         try {
             for (const candidate of candidates) {
                 const before = await readChatGptAuthMetadata(candidate.path);
-                if (!before) {
+                if (!before || !chatGptAuthMetadataMatchesCandidateName(candidate.name, before)) {
                     result.skipped.push(candidate.name);
                     continue;
                 }
@@ -5427,7 +5427,9 @@ export class BridgeSessionCore {
                         throw new Error('Codex did not return ChatGPT rate limits after refresh');
                     }
                     const after = await readChatGptAuthMetadata(candidate.path);
-                    if (!after || !chatGptAuthMetadataCompatible(before, after)) {
+                    if (!after
+                        || !chatGptAuthMetadataMatchesCandidateName(candidate.name, after)
+                        || !chatGptAuthMetadataCompatible(before, after)) {
                         throw new Error('refreshed auth identity did not match the original candidate');
                     }
                     if (after.lastRefreshMs <= before.lastRefreshMs) {
@@ -5655,6 +5657,9 @@ export class BridgeSessionCore {
         }
         try {
             const metadata = await readChatGptAuthMetadata(candidate.path);
+            if (!metadata || !chatGptAuthMetadataMatchesCandidateName(candidate.name, metadata)) {
+                return;
+            }
             const snapshot = selectCodexRateLimitSnapshot(await this.app.readAccountRateLimits());
             if (!snapshot) {
                 return;
@@ -5701,13 +5706,16 @@ export class BridgeSessionCore {
     async readCodexAuthCandidateQuotaIdentities(candidates) {
         const entries = await Promise.all(candidates.map(async (candidate) => {
             const metadata = await readChatGptAuthMetadata(candidate.path);
-            candidate.credentialKind = metadata
+            const metadataMatchesName = metadata
+                ? chatGptAuthMetadataMatchesCandidateName(candidate.name, metadata)
+                : false;
+            candidate.credentialKind = metadata && metadataMatchesName
                 ? 'chatgpt'
                 : await isCodexApiKeyAuthCandidate(candidate.path)
                     ? 'api-key'
                     : 'invalid';
-            candidate.credentialLastRefreshMs = metadata?.lastRefreshMs ?? null;
-            return [candidate.name, metadata ? {
+            candidate.credentialLastRefreshMs = metadata && metadataMatchesName ? metadata.lastRefreshMs : null;
+            return [candidate.name, metadata && metadataMatchesName ? {
                     accountId: metadata.accountId,
                     quotaIdentityId: metadata.quotaIdentityId,
                 } : null];

package/dist/main.js

@@ -10,7 +10,7 @@ import { fileURLToPath } from 'node:url';
 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 { buildFoxclawSystemdUnitText, refreshFoxclawExecStartDropIns, removeFoxclawExecStartDropIns } from './systemd.js';
+import { buildFoxclawSystemdUnitText, buildSystemdRestartHelperArgs, cgroupContainsSystemdUnit, refreshFoxclawExecStartDropIns, removeFoxclawExecStartDropIns, } from './systemd.js';
 import { createSelfUpdateRuntime, inferPnpmHomeFromEntryPoint, performSelfUpdate, readSelfUpdateStatus, writeSelfUpdateStatus, } from './update.js';
 const rawCommand = process.argv[2];
 const command = rawCommand || 'serve';
@@ -1305,13 +1305,46 @@ function installSystemd() {
     ensureSystemdUserLingerEnabled();
     spawnChecked('systemctl', ['--user', 'daemon-reload']);
     spawnChecked('systemctl', ['--user', 'enable', unitName]);
+    restartSystemdUnit(unitName);
+    console.log(`Installed ${unitPath}`);
+    console.log(`Status: systemctl --user status ${unitName}`);
+    console.log(`Logs:   journalctl --user -u ${unitName} -f`);
+}
+function restartSystemdUnit(unitName) {
+    if (isCurrentProcessInSystemdUnit(unitName)) {
+        const systemdRun = resolveCommand('systemd-run');
+        if (systemdRun) {
+            const helperUnitName = `foxclaw-restart-${process.pid}-${Date.now()}`;
+            const result = spawnSync(systemdRun, buildSystemdRestartHelperArgs({
+                unitName,
+                helperUnitName,
+                delaySeconds: 1,
+            }), { stdio: 'inherit' });
+            if (result.status === 0) {
+                console.log(`[OK] scheduled ${unitName} restart via transient systemd helper: ${helperUnitName}`);
+                return;
+            }
+            console.log('[WARN] transient systemd restart helper failed; falling back to direct restart.');
+        }
+        else {
+            console.log('[WARN] systemd-run not found; falling back to direct restart.');
+        }
+    }
     const restarted = spawnSync('systemctl', ['--user', 'restart', unitName], { stdio: 'inherit' });
     if (restarted.status !== 0) {
         spawnChecked('systemctl', ['--user', 'start', unitName]);
     }
-    console.log(`Installed ${unitPath}`);
-    console.log(`Status: systemctl --user status ${unitName}`);
-    console.log(`Logs:   journalctl --user -u ${unitName} -f`);
+}
+function isCurrentProcessInSystemdUnit(unitName) {
+    if (process.platform !== 'linux') {
+        return false;
+    }
+    try {
+        return cgroupContainsSystemdUnit(fs.readFileSync('/proc/self/cgroup', 'utf8'), unitName);
+    }
+    catch {
+        return false;
+    }
 }
 function ensureSystemdUserLingerEnabled() {
     if (process.platform !== 'linux') {

package/dist/systemd.d.ts

@@ -11,7 +11,14 @@ export interface FoxclawSystemdUnitTextOptions {
     pathValue: string;
     execStart: string;
 }
+export interface SystemdRestartHelperOptions {
+    unitName: string;
+    helperUnitName: string;
+    delaySeconds: number;
+}
 export declare function buildFoxclawSystemdUnitText(options: FoxclawSystemdUnitTextOptions): string;
+export declare function cgroupContainsSystemdUnit(cgroupText: string, unitName: string): boolean;
+export declare function buildSystemdRestartHelperArgs(options: SystemdRestartHelperOptions): string[];
 export declare function refreshFoxclawExecStartDropIns(userSystemdDir: string, unitName: string, escapedEntryPoint: string): SystemdDropInUpdate[];
 export declare function removeFoxclawExecStartDropIns(userSystemdDir: string, unitName: string): SystemdDropInUpdate[];
 export declare function refreshFoxclawExecStartText(text: string, escapedEntryPoint: string): {

package/dist/systemd.js

@@ -29,6 +29,23 @@ KillMode=control-group
 WantedBy=default.target
 `;
 }
+export function cgroupContainsSystemdUnit(cgroupText, unitName) {
+    const escapedUnitName = unitName.replace(/-/g, '\\x2d');
+    return cgroupText
+        .split(/\r?\n/)
+        .some((line) => line.includes(`/${unitName}`) || line.includes(`/${escapedUnitName}`));
+}
+export function buildSystemdRestartHelperArgs(options) {
+    return [
+        '--user',
+        '--collect',
+        `--unit=${options.helperUnitName}`,
+        '--description=Restart FoxClaw service outside foxclaw.service cgroup',
+        '/bin/sh',
+        '-lc',
+        `sleep ${Math.max(0, options.delaySeconds)}; exec systemctl --user restart ${options.unitName}`,
+    ];
+}
 export function refreshFoxclawExecStartDropIns(userSystemdDir, unitName, escapedEntryPoint) {
     const dropInDir = path.join(userSystemdDir, `${unitName}.d`);
     let names;

package/package.json

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