Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(teammates): recover shared tools and library grants without global restart

zqchris79963a82766e
diff --git a/apps/desktop/src/main/hook-control/ipc.ts b/apps/desktop/src/main/hook-control/ipc.ts
index 625c5be05c..0de77df6bd 100644
--- a/apps/desktop/src/main/hook-control/ipc.ts
+++ b/apps/desktop/src/main/hook-control/ipc.ts
@@ -28,8 +28,7 @@ import { t } from '../i18n.js';
import { buildOfficialBotCommandMenus } from '../im/shared/botCommands.js';
import { stopSessionTurnExplicitly } from '../maker-ipc/register.js';
import { onChannelTurn } from '../maker-ipc/channelTurnSignal.js';
-import { getMaker, restartCodexAfterAuthModeChange } from '../maker-host/index.js';
-import { shutdownCodexEnvironment } from '../mcp-integrations/codexEnvironment.js';
+import { getMaker } from '../maker-host/index.js';
import { getDesktopProviderService } from '../maker-host/createDesktopProviderService.js';
import { getModelVisibilityOverride, waitForModelVisibilityMirror } from '../maker-host/model-visibility-mirror.js';
import { resolveFreshSourceBranch, WorktreeManager } from '../worktree/index.js';
@@ -125,17 +124,6 @@ let store: SlackHookStore | null = null;
let manager: HookControlManager | null = null;
let disposeAuthListener: (() => void) | null = null;
let observedAuthRealm: ReturnType<typeof authManager.getActiveAuthRealm> | null = null;
-let codexMcpRefreshPending = false;
-let codexMcpRefreshRunning = false;
-let codexMcpRefreshRetryTimer: NodeJS.Timeout | null = null;
-let latestSlackToolProviderEnabled = false;
-let codexMcpRefreshRetryDelayMs = 0;
-
-// busy 重试按指数退避:伙伴等本地 Codex 会话可能连续忙几十分钟,固定 2 秒重试会把日志刷满
-// (2026-10-19 实排:一次启动 987 条 deferred)。新的可用性变化会把退避归零。
-const CODEX_MCP_REFRESH_RETRY_MIN_MS = 2_000;
-const CODEX_MCP_REFRESH_RETRY_MAX_MS = 60_000;
-
function hookControlAvailable(): boolean {
return getAppCapabilities().canUseCindyAccountServices;
}
@@ -182,64 +170,6 @@ function disabledHookView(): SlackHookView {
};
}
-/**
- * Slack 绑定态会改变 lizi_slack 是否出现在 Codex 的冻结 MCP 清单里。
- *
- * 先软关 Codex app-server(含 busy turn 的 fail-closed 检查),成功后再关 HTTP
- * bridge / 清 spawn cache;反过来会让仍在运行的 session 指向已停 bridge。
- * busy 时保留 pending 并低频重试,避免「绑定发生在 Codex turn 中」后必须重启
- * 整个 App 才能看到工具。多次快速翻转合并到同一条串行 drain,不并发 dispose。
- */
-function requestCodexMcpRefreshForSlackAvailability(enabled: boolean): void {
- latestSlackToolProviderEnabled = enabled;
- codexMcpRefreshPending = true;
- codexMcpRefreshRetryDelayMs = 0;
- if (codexMcpRefreshRetryTimer !== null) {
- clearTimeout(codexMcpRefreshRetryTimer);
- codexMcpRefreshRetryTimer = null;
- }
- void drainCodexMcpRefreshForSlackAvailability();
-}
-
-async function drainCodexMcpRefreshForSlackAvailability(): Promise<void> {
- if (codexMcpRefreshRunning) return;
- codexMcpRefreshRunning = true;
- try {
- while (codexMcpRefreshPending) {
- codexMcpRefreshPending = false;
- try {
- await restartCodexAfterAuthModeChange(shutdownCodexEnvironment);
- codexMcpRefreshRetryDelayMs = 0;
- log.info('Codex MCP environment refreshed after Slack provider availability changed', {
- enabled: latestSlackToolProviderEnabled,
- });
- } catch (err) {
- codexMcpRefreshPending = true;
- codexMcpRefreshRetryDelayMs = codexMcpRefreshRetryDelayMs === 0
- ? CODEX_MCP_REFRESH_RETRY_MIN_MS
- : Math.min(codexMcpRefreshRetryDelayMs * 2, CODEX_MCP_REFRESH_RETRY_MAX_MS);
- // 首次推迟 warn 一次;之后的退避重试只记 debug,避免同一原因刷屏。
- const logDeferred = codexMcpRefreshRetryDelayMs === CODEX_MCP_REFRESH_RETRY_MIN_MS ? log.warn : log.debug;
- logDeferred('Codex MCP refresh deferred after Slack provider availability changed', {
- enabled: latestSlackToolProviderEnabled,
- retryInMs: codexMcpRefreshRetryDelayMs,
- error: err instanceof Error ? err.message : String(err),
- });
- break;
- }
- }
- } finally {
- codexMcpRefreshRunning = false;
- }
- if (codexMcpRefreshPending && codexMcpRefreshRetryTimer === null) {
- codexMcpRefreshRetryTimer = setTimeout(() => {
- codexMcpRefreshRetryTimer = null;
- void drainCodexMcpRefreshForSlackAvailability();
- }, codexMcpRefreshRetryDelayMs || CODEX_MCP_REFRESH_RETRY_MIN_MS);
- codexMcpRefreshRetryTimer.unref?.();
- }
-}
-
function broadcastStatus(view: SlackHookView): void {
for (const w of BrowserWindow.getAllWindows()) {
if (!w.isDestroyed() && isAppContentWindow(w)) {
@@ -648,7 +578,6 @@ function ensureInstances(): { store: SlackHookStore; manager: HookControlManager
// Pi is optional on unsupported/unprepared platforms.
agents: getMaker().listAvailableAgents(),
notifyStatus: broadcastStatus,
- onSlackToolProviderEnabledChanged: requestCodexMcpRefreshForSlackAvailability,
notifyPrefs: (view) => {
persistUnsolicitedServerPrefs('slack', view.prefs);
broadcastPrefs(slackLocalPrefsView());
@@ -1325,11 +1254,6 @@ export function resetHookControlOwnerBoundary(options?: { clearPersisted?: boole
store = null;
}
export function disposeHookControl(): void {
- codexMcpRefreshPending = false;
- if (codexMcpRefreshRetryTimer !== null) {
- clearTimeout(codexMcpRefreshRetryTimer);
- codexMcpRefreshRetryTimer = null;
- }
disposeAuthListener?.();
disposeAuthListener = null;
observedAuthRealm = null;
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index 75d4a1112b..08b8bfeceb 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -9301,7 +9301,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
});
return [];
});
- if (extraDirs.length > 0) createOpts.extraDirs = extraDirs;
+ Object.assign(createOpts, directoryGrantsForRuntime(extraDirs));
const workDirReady = await checkWorkDirExists(
expectedSession.id,
@@ -9424,7 +9424,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
});
await synthesizeOrcaVendorOptionsFromDb(live.id, createOpts);
const extraDirs = await readSessionExtraDirsFromDb(live.id).catch(() => []);
- if (extraDirs.length > 0) createOpts.extraDirs = extraDirs;
+ Object.assign(createOpts, directoryGrantsForRuntime(extraDirs));
const snapshot = await preflightBotRuntimeResources(
createOpts as MakerSessionCreateOpts,
);
@@ -11010,7 +11010,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
prepareCreateOpts: async (sessionId, createOpts) => {
await synthesizeOrcaVendorOptionsFromDb(sessionId, createOpts);
const extraDirs = await readSessionExtraDirsFromDb(sessionId);
- if (extraDirs.length > 0) createOpts.extraDirs = extraDirs;
+ Object.assign(createOpts, directoryGrantsForRuntime(extraDirs));
},
bootstrapSession: (createOpts) => bootstrapSession(createOpts),
});
diff --git a/apps/desktop/src/main/mcp-integrations/__tests__/codexEnvironment.test.ts b/apps/desktop/src/main/mcp-integrations/__tests__/codexEnvironment.test.ts
index 975e045290..7a9d333813 100644
--- a/apps/desktop/src/main/mcp-integrations/__tests__/codexEnvironment.test.ts
+++ b/apps/desktop/src/main/mcp-integrations/__tests__/codexEnvironment.test.ts
@@ -1,3 +1,6 @@
+import { createLiziMcpProviders } from '@cindy/mcps';
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
import { afterEach, describe, expect, it, vi } from 'vitest';
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
@@ -43,18 +46,6 @@ function testProvider(): McpProvider {
};
}
-function slackProvider(isBound: () => boolean): McpProvider {
- return {
- name: 'cindy_slack',
- isEnabled: isBound,
- toClaudeSdkConfig: () => ({
- type: 'sdk',
- name: 'cindy_slack',
- instance: new McpServer({ name: 'cindy_slack', version: '1.0.0' }),
- }),
- };
-}
-
/** server 名是不安全对象 key 的远程 provider(自定义 MCP id 正则允许 `__proto__`)。 */
function unsafeKeyRemoteProvider(): McpProvider {
return {
@@ -435,24 +426,32 @@ describe('codexEnvironment', () => {
);
});
- it('Slack 在 bridge 启动后完成绑定时,清缓存会按最新 provider gate 重建', async () => {
+ it('keeps the existing Slack gateway callable across binding changes without restarting the shared host', async () => {
let bound = false;
- const providers = [testProvider(), slackProvider(() => bound)];
- const logger = noopLogger();
-
- const beforeBind = await getCodexExtraSpawnConfig({ mcpProviders: providers, logger });
- expect(beforeBind.extraArgs.some((arg) => arg.startsWith('mcp_servers.cindy_slack.'))).toBe(false);
-
- // Codex 的 provider 集合冻结在首个 cached spawn config;仅改变绑定态还不会出现。
- bound = true;
- const stillFrozen = await getCodexExtraSpawnConfig({ mcpProviders: providers, logger });
- expect(stillFrozen).toBe(beforeBind);
- expect(stillFrozen.extraArgs.some((arg) => arg.startsWith('mcp_servers.cindy_slack.'))).toBe(false);
-
- // hook-control 收到 bound gate 翻转后会走同一失效出口,再次构建即可看到工具。
- await shutdownCodexEnvironment();
- const afterBind = await getCodexExtraSpawnConfig({ mcpProviders: providers, logger });
- expect(afterBind.extraArgs.some((arg) => arg.startsWith('mcp_servers.cindy_slack.'))).toBe(true);
+ const providers = createLiziMcpProviders({ slackHook: { getBridge: () => ({
+ availability: () => ({ connected: true, bound, serverSupportsTools: true }),
+ callTool: async () => ({ ok: true as const, result: { bound } }),
+ }) } });
+ const config = await getCodexExtraSpawnConfig({ mcpProviders: providers, logger: noopLogger() });
+ registerCodexMcpThreadContext('slack-thread', {
+ agentKind: 'codex', workingDir: '/workspace', sessionId: 'slack-session', sessionInstanceId: 'slack-instance',
+ });
+ const url = new URL(config.buildSessionMcpConfig!('slack-instance')['mcp_servers.cindy_slack.url'] as string);
+ const client = new Client({ name: 'slack-recovery', version: '1' });
+ await client.connect(new StreamableHTTPClientTransport(url, {
+ requestInit: { headers: { Authorization: `Bearer ${config.bridge!.token}` } },
+ }));
+ try {
+ for (const next of [false, true, false]) {
+ bound = next;
+ const result = await client.callTool({ name: 'slack_status', arguments: {}, _meta: { threadId: 'slack-thread' } });
+ expect(JSON.parse((result.content as Array<{ text: string }>)[0]!.text)).toMatchObject({ bound });
+ expect(await getCodexExtraSpawnConfig({ mcpProviders: providers, logger: noopLogger() })).toBe(config);
+ }
+ } finally {
+ await client.close();
+ unregisterCodexMcpThreadContext('slack-thread');
+ }
});
it('serializes remote HTTP custom headers as env_http_headers -c overrides (no bridge)', async () => {
diff --git a/apps/desktop/src/main/mcp-integrations/__tests__/piEnvironment.test.ts b/apps/desktop/src/main/mcp-integrations/__tests__/piEnvironment.test.ts
index 88326c93a5..21f3a77716 100644
--- a/apps/desktop/src/main/mcp-integrations/__tests__/piEnvironment.test.ts
+++ b/apps/desktop/src/main/mcp-integrations/__tests__/piEnvironment.test.ts
@@ -1,3 +1,5 @@
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
/**
* piEnvironment —— pi MCP 桥 per-session 身份接线测试。
*
@@ -15,7 +17,7 @@
import { afterEach, describe, expect, it, vi } from 'vitest';
import { PluginRegistry } from '../../maker-host/plugins/plugin-registry';
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { getLiziMcpSessionContext } from '@cindy/mcps';
+import { createLiziMcpProviders, getLiziMcpSessionContext } from '@cindy/mcps';
import { createOrcaWorkerBridgeMcpProvider } from '@cindy/orca-workflow';
vi.mock('electron', () => ({
@@ -163,6 +165,32 @@ describe('piEnvironment per-session identity', () => {
await shutdownPiEnvironment();
});
+ it('recovers Slack binding in the existing Pi bridge while another session holds its lease', async () => {
+ let bound = false;
+ const providers = createLiziMcpProviders({ slackHook: { getBridge: () => ({
+ availability: () => ({ connected: true, bound, serverSupportsTools: true }),
+ callTool: async () => ({ ok: true as const, result: { bound } }),
+ }) } });
+ const peer = await getPiExtraSpawnConfig(providers, noopLogger(), { sessionId: 'busy-peer', workingDir: '/workspace' });
+ const config = await getPiExtraSpawnConfig(providers, noopLogger(), { sessionId: 'slack-session', workingDir: '/workspace' });
+ const server = config!.mcpBridge!.servers.find((entry) => entry.name === 'cindy_slack')!;
+ const client = new Client({ name: 'slack-recovery', version: '1' });
+ await client.connect(new StreamableHTTPClientTransport(new URL(server.url), {
+ requestInit: { headers: { Authorization: `Bearer ${config!.mcpBridge!.token}` } },
+ }));
+ try {
+ for (const next of [false, true, false]) {
+ bound = next;
+ const result = await client.callTool({ name: 'slack_status', arguments: {} });
+ expect(JSON.parse((result.content as Array<{ text: string }>)[0]!.text)).toMatchObject({ bound });
+ }
+ } finally {
+ await client.close();
+ config!.disposeSessionCtx?.();
+ peer!.disposeSessionCtx?.();
+ }
+ });
+
it('registers a pi session ctx and routes it through session + instance identity', async () => {
const config = await getPiExtraSpawnConfig([makeProvider()], noopLogger(), {
sessionId: 'pi-lead-1',
diff --git a/packages/lizi-mcps/src/__tests__/providersSlackGate.test.ts b/packages/lizi-mcps/src/__tests__/providersSlackGate.test.ts
index 87199ad7a2..5d65ff56d3 100644
--- a/packages/lizi-mcps/src/__tests__/providersSlackGate.test.ts
+++ b/packages/lizi-mcps/src/__tests__/providersSlackGate.test.ts
@@ -4,7 +4,7 @@ import { createLiziMcpProviders } from '../providers.js';
import type { SlackToolBridgeLike } from '../types.js';
describe('cindy_slack provider gate', () => {
- const context = { agentKind: 'codex', workingDir: '' };
+ const context = { agentKind: 'claude-code', workingDir: '/workspace' };
it.each([
{ bound: false, serverSupportsTools: false, enabled: false },
@@ -27,6 +27,13 @@ describe('cindy_slack provider gate', () => {
},
);
+ it.each(['codex', 'pi'])('keeps the %s shared gateway registered before binding', (agentKind) => {
+ const provider = createLiziMcpProviders({ slackHook: { getBridge: () => null } })
+ .find((item) => item.name === 'cindy_slack')!;
+ expect(provider.isEnabled?.({ agentKind, workingDir: '' })).toBe(true);
+ expect(provider.isEnabled?.({ agentKind, workingDir: '/workspace' })).toBe(false);
+ });
+
it('bridge 尚未注册时 fail-closed', () => {
const provider = createLiziMcpProviders({
slackHook: { getBridge: () => null },
diff --git a/packages/lizi-mcps/src/providers.ts b/packages/lizi-mcps/src/providers.ts
index cd7cc42a0b..87d2a1ad70 100644
--- a/packages/lizi-mcps/src/providers.ts
+++ b/packages/lizi-mcps/src/providers.ts
@@ -46,8 +46,8 @@ export interface CreateLiziMcpProvidersOptions {
/**
* cindy_slack: Slack 网关工具(经 hook 通道由 slack-hook-server 以托管
* user token 调 Slack 官方 MCP, 接替退役的 cindy-slack 意识)。
- * workingDir 由 provider 从 ctx 绑定; isEnabled = 桥可用、绑定 confirmed 且
- * 最近一次 welcome 宣告 slack-tools 能力(所有会话可见, 不按 source 门控)。
+ * workingDir 由 provider 从 ctx 绑定; 共享 bridge 预先注册稳定网关,
+ * 普通会话构建仍按绑定及服务端能力门控,实际调用始终复核实时连接与权限。
* 对应可关插件 id 'slack'。
*/
slackHook?: Omit<SlackHookMcpDeps, 'workingDir'>;
@@ -308,11 +308,12 @@ export function createLiziMcpProviders(
if (opts.slackHook && selected(enabled, 'cindy_slack')) {
providers.push({
name: 'cindy_slack',
- // 会话构建期门控: 桥已注册、绑定 confirmed、最近一次成功 welcome 宣告
- // slack-tools 才挂工具面。瞬时断线不撤 provider(避免重建 Codex),调用期由
- // connected fail-closed 复查兜底;重连到不同 server 后 manager 会按新 welcome
- // 刷新此 gate。server 侧还有 NOT_BOUND 的最终防线。
- isEnabled: () => {
+ // Shared Codex/Pi bridges outlive Slack binding changes. Register the stable
+ // gateway before binding so an existing runtime can recover without closing
+ // unrelated sessions. Every call still reads the live bridge and its binding,
+ // connection, server capabilities and account authorization.
+ isEnabled: (ctx) => {
+ if ((ctx.agentKind === 'codex' || ctx.agentKind === 'pi') && !ctx.workingDir) return true;
const bridge = opts.slackHook!.getBridge();
if (bridge === null) return false;
const a = bridge.availability();