Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(remote): repair Codex daemon restart and workspace config reload
DavidShen26164b72f253
diff --git a/apps/desktop/src/main/maker-host/index.ts b/apps/desktop/src/main/maker-host/index.tsindex 9d0c5eb151..1a7f0db7f2 100644--- a/apps/desktop/src/main/maker-host/index.ts+++ b/apps/desktop/src/main/maker-host/index.ts@@ -2873,6 +2873,11 @@ export async function listSshCodexProviders(hostId: string) {}}+export async function disposeRemoteCodexHostAfterRestart(hostId: string, ownerGeneration: number): Promise<void> {+ if (getActiveAppSession().generation !== ownerGeneration) return;+ await _codexAgent?.disposeRemoteHostAfterRestart(hostId);+}+/** Register Pi after a managed runtime retry and notify local renderers. */export function registerPiAgentIfAvailable(): boolean {const register = _registerPiAgent;diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 011cdf245e..512236a873 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -462,6 +462,7 @@ import {finalizeCodexAfterAuthModeChange,getMaker,listSshCodexProviders,+ disposeRemoteCodexHostAfterRestart,getMakerIfReady,getPluginRegistry,isBotToolsetAvailable,@@ -7280,6 +7281,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)session?: { agentKind: AgentKind; remoteHostId: string | null } | null;createOpts?: unknown;}): Promise<{ remoteCodexDaemonRebootstrapped: true } | void> {+ const ownerGeneration = getActiveAppSession().generation;const { session, createOpts } = params;// Remote SSH auto-reconnect 前置: 拿 host 是否要联网在 maker-core 之前确定,// 避免 remote transport hook 同步抛 "not found in pool"。ensureRemoteHostReady@@ -7431,6 +7433,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)await detachIdleRemoteCodexSessionsOnHost(remoteHostIdToEnsure,'codex-mcp-daemon-rebootstrap',+ ownerGeneration,);return { remoteCodexDaemonRebootstrapped: true };}@@ -7486,7 +7489,9 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)async function detachIdleRemoteCodexSessionsOnHost(hostId: string,reason: string,+ ownerGeneration: number,): Promise<void> {+ if (isAppSessionBoundaryPending() || getActiveAppSession().generation !== ownerGeneration) return;const detachTasks: Array<Promise<void>> = [];for (const s of maker.listActiveSessions()) {if (s.remoteHostId !== hostId || s.agentKind !== 'codex') continue;@@ -7503,6 +7508,10 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions));}await Promise.all(detachTasks);+ // Model discovery can own a connection before any Session exists. Daemon+ // bootstrap invalidates that connection too; wait for its retirement before+ // lazy creation reads the catalog, rather than racing the SSH close event.+ await disposeRemoteCodexHostAfterRestart(hostId, ownerGeneration);}// turn 结束后补一次远端 MCP ensure (best-effort):live turn 期间被推迟的@@ -7512,6 +7521,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)// holder 供各 turn 收口路径调用。远端 CC 走 holder 的 detach 补偿// (bridge 重建 / 端口重绑已让 fresh 失效时重建 query)。refreshRemoteCodexMcpOnTurnSettledHolder = (sessionId: string): void => {+ const ownerGeneration = getActiveAppSession().generation;// Shutdown closes sessions while the dynamic Maker facade rejects access.// No remote reconfiguration belongs to the departing owner's boundary.if (isAppSessionBoundaryPending()) return;@@ -7551,8 +7561,14 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)await detachIdleRemoteCodexSessionsOnHost(remoteHostId,'codex-mcp-turn-settled-rebootstrap',+ ownerGeneration,);}+ }).catch((err) => {+ log.warn('remote Codex refresh on turn settled failed', {+ hostId: remoteHostId,+ errorName: err instanceof Error ? err.name : 'UnknownError',+ });});return;}diff --git a/packages/maker-core/src/agents/codex/index.test.ts b/packages/maker-core/src/agents/codex/index.test.tsindex be5966fb28..8acf1524bf 100644--- a/packages/maker-core/src/agents/codex/index.test.ts+++ b/packages/maker-core/src/agents/codex/index.test.ts@@ -3013,6 +3013,27 @@ describe('CodexAgent capability routing', () => {describe('CodexAgent reference directories', () => {const profileName = 'cindy-readonly-references';+ it.each([+ { permissionMode: 'auto' as const, extraDirs: [], selector: { sandbox_mode: 'workspace-write' } },+ { permissionMode: 'ask' as const, extraDirs: ['/reference'], selector: { default_permissions: profileName } },+ { permissionMode: 'bypassPermissions' as const, extraDirs: ['/reference'], selector: { sandbox_mode: 'danger-full-access' } },+ ])('retains the $permissionMode selection when native workspace routing reloads config (extraDirs=$extraDirs)', async ({ permissionMode, extraDirs, selector }) => {+ const agent = new CodexAgent(createDeps());+ const host = installFakeHost(agent, undefined, { userAgent: 'codex/0.156.0' });+ const handle = await agent.startSession({+ sessionId: 'workspace-config-reload', model: 'gpt-6-luna',+ workingDir: '/repo', remoteHostId: 'builder', permissionMode, extraDirs,+ });+ const [, params] = host.request.mock.calls.find(([method]) => method === Method.ThreadStart)!;+ const config = (params as { config: Record<string, unknown> }).config;+ // 0.156 reloads the config layer without the RPC sandbox/permissions fields.+ // A profile declaration alone then fails before any model request is sent.+ expect(config).toMatchObject(selector);+ expect(Object.hasOwn(config, 'default_permissions')).toBe('default_permissions' in selector);+ expect(Object.hasOwn(config, 'sandbox_mode')).toBe('sandbox_mode' in selector);+ await handle.close();+ });+it('marks only explicitly writable additional roots as write in the thread profile', async () => {const agent = new CodexAgent(createDeps());const host = installFakeHost(agent, undefined, { codexHome: '/tmp/mock-codex-home' });@@ -3082,6 +3103,8 @@ describe('CodexAgent reference directories', () => {)[1] as [string, Record<string, unknown>];expect('permissions' in revokedResume).toBe(false);expect(revokedResume.sandbox).toBe('workspace-write');+ expect(revokedResume.config).toMatchObject({ sandbox_mode: 'workspace-write' });+ expect(revokedResume.config).not.toHaveProperty('default_permissions');const turnCalls = host.request.mock.calls.filter(([method]) => method === Method.TurnStart,);@@ -4254,6 +4277,45 @@ describe('CodexAgent.listCustomizations', () => {});describe('CodexAgent.refreshLocalModels', () => {+ it('retires a model-only SSH connection after daemon restart before admitting new catalog reads', async () => {+ const transports: InstanceType<typeof MockCodexTransport>[] = [];+ const agent = new CodexAgent(createDeps({}, { getRemoteCodexTransport: () => {+ const transport = new MockCodexTransport();+ transports.push(transport);+ return transport;+ } }));+ await agent.listRemoteModels('builder');+ await agent.listRemoteModels('other-builder');+ const oldClose = deferred<void>();+ const originalClose = transports[0]!.close.bind(transports[0]);+ vi.spyOn(transports[0]!, 'close').mockImplementation(async () => {+ await oldClose.promise;+ await originalClose();+ });+ const retirement = agent.disposeRemoteHostAfterRestart('builder');+ const catalog = agent.listRemoteModels('builder');+ await Promise.resolve();+ expect(transports).toHaveLength(2);+ oldClose.resolve();+ await retirement;+ await catalog;+ expect(transports).toHaveLength(3);+ expect(transports[0]!.closed).toBe(true);+ expect(transports[1]!.closed).toBe(false);+ expect(transports[2]!.closed).toBe(false);+ await agent.dispose();+ });++ it('does not retire a remote host that still has an attached session', async () => {+ const agent = new CodexAgent(createDeps());+ const host = installFakeHost(agent, (method) =>+ method === Method.ModelList ? { data: [], nextCursor: null } : undefined);+ await agent.listRemoteModels('builder');+ host.activeSubscriptions = 1;+ await expect(agent.disposeRemoteHostAfterRestart('builder')).rejects.toThrow('active Codex session');+ expect(host.retire).not.toHaveBeenCalled();+ });+it('reads SSH models on the named remote host without publishing them to local discovery', async () => {const publish = vi.fn();const agent = new CodexAgent(createDeps({}, { onCodexLocalModelsListed: publish }));diff --git a/packages/maker-core/src/agents/codex/index.ts b/packages/maker-core/src/agents/codex/index.tsindex 8f58488b60..9ed45459e0 100644--- a/packages/maker-core/src/agents/codex/index.ts+++ b/packages/maker-core/src/agents/codex/index.ts@@ -6021,6 +6021,7 @@ export class CodexAgent extends BaseAgent {| 'config'> {const { approvalPolicy, approvalsReviewer, sandbox } = currentApprovalConfig();+ const permissionProfile = currentWorkspacePermissionProfile();const threadContextWindow = effectiveThreadContextWindow(contextLimit);const config = {// Apply transport defaults before the per-session Bot capability policy.@@ -6041,6 +6042,15 @@ export class CodexAgent extends BaseAgent {} : {}),...(readonlyReferenceDirsSupported ? readonlyReferencesConfig() : {}),...(reviewMode ? reviewPermissionsConfig : {}),+ // Workspace routing reloads retained config without thread/start's RPC+ // overrides (Codex 0.156+). Keep the selected permission syntax in that+ // config too, otherwise our profile definitions have no default and+ // native account routing fails before the first model request.+ ...(readonlyReferenceDirsSupported+ ? permissionProfile+ ? { default_permissions: permissionProfile }+ : { sandbox_mode: sandbox }+ : {}),...(reviewMode? {web_search: 'disabled',@@ -6076,7 +6086,6 @@ export class CodexAgent extends BaseAgent {: {}),...(Object.keys(config).length > 0 ? { config } : {}),};- const permissionProfile = currentWorkspacePermissionProfile();if (permissionProfile) {return {...shared,@@ -14660,6 +14669,15 @@ export class CodexAgent extends BaseAgent {this.retireHostKey(key, 'Codex account credentials changed', { failIfActive: false, logPrefix: 'codex account', throwOnShutdownFailure: true })));}+ /** Release a stale SSH connection after its daemon was explicitly restarted. */+ async disposeRemoteHostAfterRestart(remoteHostId: string): Promise<void> {+ await this.retireHostKey(hostKey(remoteHostId), 'SSH Codex daemon restarted', {+ failIfActive: true,+ logPrefix: 'codex remote restart',+ throwOnShutdownFailure: true,+ });+ }+private async disposeLocalHostForCredentialChangeUnlocked(key: string, reason: string): Promise<void> {await this.retireHostKey(key, reason, {failIfActive: true,