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(agent-island): 远程伙伴卡片点击后标记已读,main 侧去掉新增的动态 import

Dash67981b2e70be
diff --git a/apps/desktop/src/main/agent-island/companionIdentity.ts b/apps/desktop/src/main/agent-island/companionIdentity.ts
index 4775c685ee..dd140e26b2 100644
--- a/apps/desktop/src/main/agent-island/companionIdentity.ts
+++ b/apps/desktop/src/main/agent-island/companionIdentity.ts
@@ -28,6 +28,18 @@ const PRESET_AVATAR_FILES: Readonly<Record<string, string>> = {
'cindy://avatar/preset/lizi': 'legacy-teammate-avatars/lizi.png',
};
+/**
+ * Local copy of an avatar held by another computer or the cloud. Registered at startup
+ * (bootstrap) rather than imported: the avatar cache pulls in the media store and device-link,
+ * which this module must not load (and main forbids runtime dynamic imports).
+ */
+type CompanionAvatarResolver = (request: { avatar: string; deviceId: string | null; fetch: boolean }) => Promise<string | null>;
+let resolveCompanionAvatarCopy: CompanionAvatarResolver | null = null;
+
+export function setCompanionAvatarResolver(resolver: CompanionAvatarResolver | null): void {
+ resolveCompanionAvatarCopy = resolver;
+}
+
const THUMBNAIL_CACHE_LIMIT = 32;
// Content-addressed avatar values: a changed avatar is a new key, never a stale hit.
const thumbnails = new Map<string, Promise<string | undefined>>();
@@ -116,8 +128,7 @@ async function readAvatarBytes(avatar: string, deviceId: string | null): Promise
}
let local: string | null = isManagedBotAvatarUrl(avatar) && !deviceId ? avatar : null;
if (!local && (deviceId || avatar.startsWith('https://'))) {
- const { companionAvatarCache } = await import('../companion-cloud/avatarCacheHost.js');
- local = await companionAvatarCache.resolve({ avatar, deviceId, fetch: true });
+ local = (await resolveCompanionAvatarCopy?.({ avatar, deviceId, fetch: true })) ?? null;
}
if (!local || !isManagedBotAvatarUrl(local)) return undefined;
const bytes = await readFile(resolveSafe(local).absPath);
diff --git a/apps/desktop/src/main/agent-island/service.ts b/apps/desktop/src/main/agent-island/service.ts
index 643d3f0dc5..75aeed344a 100644
--- a/apps/desktop/src/main/agent-island/service.ts
+++ b/apps/desktop/src/main/agent-island/service.ts
@@ -76,6 +76,7 @@ import {
type AgentIslandScreenLayoutMetrics,
} from '../../shared/agentIsland.js';
import { getSessionRowSnapshot } from '../localDb/ipc/sessions.js';
+import { setAgentIslandCompanionChangeSink } from '../localDb/agentIslandSessionPatch.js';
import {
companionAvatarHasArtwork,
companionAvatarThumbnail,
@@ -252,6 +253,10 @@ export function initAgentIslandService(deps: AgentIslandServiceDeps): AgentIslan
...deps,
nativeHost: deps.nativeHost ?? (supportsNativeIsland ? undefined : HEADLESS_AGENT_ISLAND_NATIVE_HOST),
});
+ setAgentIslandCompanionChangeSink({
+ companionChanged: (botId) => serviceSingleton?.handleCompanionProfileChanged(botId),
+ groupChanged: (groupId) => serviceSingleton?.handleBotGroupChanged(groupId),
+ });
// 远程任务同步与原生岛面无关:无原生岛的平台也要靠它发桌面通知。
serviceSingleton.registerDeviceSessionIpc();
if (supportsNativeIsland) {
diff --git a/apps/desktop/src/main/bootstrap-electron.ts b/apps/desktop/src/main/bootstrap-electron.ts
index 4896499fba..8eb2f8e574 100644
--- a/apps/desktop/src/main/bootstrap-electron.ts
+++ b/apps/desktop/src/main/bootstrap-electron.ts
@@ -557,6 +557,8 @@ import {
import { initNotificationService, showDeviceSessionDesktopEvent } from './notificationService';
import { initWecomGroupNotificationIpc } from './wecomGroupNotification';
import { getAgentIslandService, initAgentIslandService } from './agent-island/service.js';
+import { setCompanionAvatarResolver } from './agent-island/companionIdentity.js';
+import { companionAvatarCache } from './companion-cloud/avatarCacheHost.js';
import { attachWorkLouderCodexWindowReveal } from './worklouder-codex/index.js';
import {
disposeInputDevices,
@@ -4450,6 +4452,7 @@ const registerIpcHandlers = () => {
feishuIm,
});
initWecomGroupNotificationIpc();
+ setCompanionAvatarResolver((request) => companionAvatarCache.resolve(request));
initAgentIslandService({
// The relay waits for native done before checking the durable result handoff.
isCompletionHandledByTeammate,
diff --git a/apps/desktop/src/main/localDb/agentIslandSessionPatch.ts b/apps/desktop/src/main/localDb/agentIslandSessionPatch.ts
index 1f9cffb0e9..5e0d045d6e 100644
--- a/apps/desktop/src/main/localDb/agentIslandSessionPatch.ts
+++ b/apps/desktop/src/main/localDb/agentIslandSessionPatch.ts
@@ -44,16 +44,27 @@ function toNullableString(value: unknown): string | null | undefined {
return undefined;
}
+/**
+ * 伙伴身份变化的接收方由灵动岛服务在初始化时登记:localDb 与灵动岛服务互相依赖,
+ * 这里用登记回调解开循环,而不是运行时动态 import(见 architecture-invariants.md §2)。
+ */
+export interface AgentIslandCompanionChangeSink {
+ companionChanged: (botId: string) => void;
+ groupChanged: (groupId: string) => void;
+}
+
+let companionChangeSink: AgentIslandCompanionChangeSink | null = null;
+
+export function setAgentIslandCompanionChangeSink(sink: AgentIslandCompanionChangeSink | null): void {
+ companionChangeSink = sink;
+}
+
/** 伙伴群改名或解散后,让灵动岛重读以该群群专线说话的任务。 */
export function notifyAgentIslandBotGroupChanged(groupId: string): void {
- void import('../agent-island/service.js')
- .then(({ getAgentIslandService }) => getAgentIslandService()?.handleBotGroupChanged(groupId))
- .catch(() => undefined);
+ companionChangeSink?.groupChanged(groupId);
}
/** 伙伴改名或换头像后,让灵动岛重画以它身份说话的任务。 */
export function notifyAgentIslandCompanionChanged(botId: string): void {
- void import('../agent-island/service.js')
- .then(({ getAgentIslandService }) => getAgentIslandService()?.handleCompanionProfileChanged(botId))
- .catch(() => undefined);
+ companionChangeSink?.companionChanged(botId);
}
diff --git a/apps/desktop/src/renderer/features/bots/RemoteBotSessionView.tsx b/apps/desktop/src/renderer/features/bots/RemoteBotSessionView.tsx
index e84be92a12..7f221bd240 100644
--- a/apps/desktop/src/renderer/features/bots/RemoteBotSessionView.tsx
+++ b/apps/desktop/src/renderer/features/bots/RemoteBotSessionView.tsx
@@ -11,6 +11,7 @@ import { Spinner } from '@/components/ui/spinner';
import { BotAvatar } from './BotAvatar';
import { parseRemoteBots, type RemoteBot } from './remoteBotRoster';
import { markRemoteBotRead, useRemoteBots } from './useRemoteBots';
+import { useBotIslandVisibleSession } from './useBotIslandVisibleSession';
import { useCompanionCloud } from './companionCloudStore';
import { cloudCompanionAt } from './companionCloudPresentation';
import { useDelayedFlag } from '@/features/cc-agent/workdir-browse/hooks/useDelayedFlag';
@@ -99,6 +100,8 @@ export function RemoteBotSessionView() {
}, [bot, failed, ready, validatedSessionId]);
const liveChat = !!bot && !failed && !!ready?.sessionId && ready.id === botId && ready.deviceId === deviceId;
+ // Like a local companion chat: once the chat is shown, the island card for this Session is read.
+ useBotIslandVisibleSession(liveChat ? ready!.sessionId : null);
const homeAway = !!cloudActor && !!deviceId && !!botId && cloudActor.homeDeviceId !== cloud.selfDeviceId
&& (!bot || (!bot.online && bot.connectionKnown !== false));
// Like IM, a brief drop keeps the open chat in place (cloud-companions.md §3.1).