@jingyi0605/codingns4dsh 0.2.1-beta.6 → 0.2.1-beta.8

package/data/build/dist/host/features/global-voice-rpc.js

@@ -40,11 +40,19 @@ import { AssistantVoiceInitialization } from './assistant-voice-initialization.j
 import { installVoiceDiagnostics } from '../voice-diagnostics.js';
 import { measureVoice, traceVoice, sanitizeVoiceDiagnosticFields } from '../../shared/voice-diagnostics.js';
 import { assistantSourceCache } from './assistant-source-cache.js';
+import { AssistantNotificationEvents } from './assistant-notification-events.js';
+import { CodingNsRpcError } from '../rpc-table.js';
+import { AssistantNotificationSource } from './assistant-notification-source.js';
+import { readAssistantNotificationFeedRequest } from '../../shared/assistant-notification-feed.js';
+import { bindDesktopAssistantNotifications } from '../desktop-assistant/notifications.js';
+import { AssistantNotificationController } from './assistant-notification-stream.js';
+import { appendAssistantSessionStream, readAssistantSessionMessages } from '../../shared/assistant-session-messages.js';
+import { resolveDshNativeDispatch } from '../modules/peer-host/peer-host-native-dispatch.js';
 /**
  * 全局智能助理 Host 边界。
  *
- * 这里故意不接收 sessionId：会话索引、意图和派发各自通过快照协作，语音租约
- * 只属于 Host。这样刷新页面或切换当前对话不会改变助理的目标范围。
+ * 会话索引、意图和派发各自通过快照协作；会话级通知已读只消费已认证客户端
+ * 的当前选择三元组，不改变助理的目标范围。语音租约仍只属于 Host。
  */
 export function createGlobalVoiceRpcFeature(options = {}) {
     return {
@@ -124,8 +132,49 @@ export function createGlobalVoiceRpcFeature(options = {}) {
                         throw new Error('助理管理范围已变化，请重新查询');
                     return summary;
                 },
+                readMessages: async (entry, signal, toolCallId) => {
+                    const revision = lifecycleRevision;
+                    const managed = assistantSettings().managedWorkspaceIds;
+                    const source = await readAssistantSource(context.services, managed, waitingState, signal);
+                    signal.throwIfAborted();
+                    if (resetting || revision !== lifecycleRevision)
+                        throw new Error('助理管理范围已变化，请重新查询');
+                    const current = source.sessions.find((item) => item.hostId === entry.hostId && item.sessionId === entry.sessionId && item.workspaceId === entry.workspaceId);
+                    if (current === undefined || source.archivedSessionIds.includes(entry.sessionId))
+                        throw new Error('目标会话已退出助理管理范围');
+                    const messages = await source.readMessages?.(current, signal, toolCallId) ?? [];
+                    signal.throwIfAborted();
+                    if (resetting || revision !== lifecycleRevision)
+                        throw new Error('助理管理范围已变化，请重新查询');
+                    return messages;
+                },
             });
             const managementAgent = createAssistantAgentAdapter(context.services.dshContext, context.services.dshVersion ?? minimumSupportedDshVersion(), llm, managementTools);
+            const notificationSource = new AssistantNotificationSource({ recover: (workspaceIds) => notifications.recoverSource(workspaceIds).map(toSourceNotificationFact), capabilities: () => ({ completed: true, error: true, requests: true, resolve: true, recovery: notifications.recoverySupported }) });
+            context.resources.add(() => notificationSource.dispose());
+            const notifications = new AssistantNotificationEvents(context.services, { enabled: () => !resetting && !disposed, excludedSessionIds: () => managementAgent.sessionIds, onFact: (fact) => notificationSource.append(toSourceNotificationFact(fact)) });
+            context.resources.add(() => notifications.dispose());
+            // 通知页面只在首次连接和连接代次变化时读取快照，正常变化走 Typert Remote WebSocket。
+            // TypertRemoteService 只能在真正的 Cordis Host Context 上注册；没有 typert
+            // 注册表的测试夹具和纯 RPC 宿主跳过 Remote，读取继续由 rpc-table 承担。
+            const notificationContext = context.services.dshContext;
+            if (notificationContext !== undefined && readOptionalService(notificationContext, 'typert') !== undefined) {
+                new AssistantNotificationController(notificationContext, notifications.center, {
+                    source: notificationSource,
+                    authorizeSource: (workspaceIds) => {
+                        const allowed = new Set(readWorkspaceRecords(context.services.dshContext).map(workspace => workspace.id));
+                        if (workspaceIds.some(id => !allowed.has(id)))
+                            throw new CodingNsRpcError('ASSISTANT_NOTIFICATION_FORBIDDEN', '通知来源工作区不可访问');
+                    },
+                    sourceScope: (workspaceIds) => notifications.sourceScope(workspaceIds),
+                    renewSourceScope: (workspaceIds) => notifications.renewSourceScope(workspaceIds),
+                });
+            }
+            // 同一 Host 中心供原生时钟和独立列表读取，主页面隐藏时仍准确同步。
+            context.resources.add(bindDesktopAssistantNotifications(context.services, {
+                read: (input) => { notifications.readCurrent(); return notifications.center.read(input); },
+                presented: (input) => { notifications.center.ack(input); },
+            }));
             // 正式文字和语音共用连续对话；租约只约束收音和当前语音轮次。
             const voiceTextChat = new AssistantTextChat(options.conversationAdapter ?? managementAgent, '助理 Agent 对话');
             const conversation = new AssistantConversation(voiceTextChat, llm, options.conversationStorage ?? createAssistantConversationStorage(), readAssistantAttachmentStore(context.services.dshContext));
@@ -428,8 +477,18 @@ export function createGlobalVoiceRpcFeature(options = {}) {
             background.setEnabled(backgroundEnabled);
             context.resources.add(() => { disposed = true; cancelIndexWork(); background.dispose(); updates.dispose(); });
             const eventDisposers = [];
+            // 当前 Workspace Registry 发布真实 domain/changed；旧版本别名继续兼容。
+            const disposeNotificationMembership = context.services.events?.on('domain/changed', (change) => {
+                if (asRecord(change)?.domain === 'workspace')
+                    notifications.refreshMembership();
+            });
+            if (typeof disposeNotificationMembership === 'function')
+                eventDisposers.push(disposeNotificationMembership);
+            const disposeNotificationSession = context.services.events?.on('session/disposed', (session) => notifications.sessionDisposed(session));
+            if (typeof disposeNotificationSession === 'function')
+                eventDisposers.push(disposeNotificationSession);
             for (const eventName of ['workspace/archive', 'workspace/unarchive', 'workspace/changed']) {
-                const disposer = context.services.events?.on(eventName, () => { markMetadataChanged(true); updates.schedule(); });
+                const disposer = context.services.events?.on(eventName, () => { notifications.refreshMembership(); markMetadataChanged(true); updates.schedule(); });
                 if (typeof disposer === 'function')
                     eventDisposers.push(disposer);
             }
@@ -496,6 +555,7 @@ export function createGlobalVoiceRpcFeature(options = {}) {
                         waitingOverrides.set(sessionId, kind);
                     }
                     changedSession(args);
+                    return notifications.observeRequest(eventName, args);
                 });
                 if (typeof disposer === 'function')
                     eventDisposers.push(disposer);
@@ -508,11 +568,13 @@ export function createGlobalVoiceRpcFeature(options = {}) {
                         waitingOverrides.set(sessionId, null);
                     }
                     changedSession(args);
+                    notifications.resolveRequest(eventName, args);
                 });
                 if (typeof disposer === 'function')
                     eventDisposers.push(disposer);
             }
             const onSessionEvent = (session, event) => {
+                notifications.sessionEvent(session, event);
                 if (!isAssistantIndexEvent(event))
                     return;
                 const record = asRecord(session);
@@ -545,6 +607,7 @@ export function createGlobalVoiceRpcFeature(options = {}) {
             let currentPrompts = readAssistantPrompts(context.services.settings?.get().assistant.prompts);
             let configuredModelKey = JSON.stringify(context.services.settings?.get().assistant.model ?? {});
             const disposeSettingsWatch = context.services.settings?.watch?.(() => {
+                notifications.sync();
                 const nextKey = JSON.stringify([...(context.services.settings?.get().assistant.managedWorkspaceIds ?? [])].sort());
                 const nextPrompts = readAssistantPrompts(context.services.settings?.get().assistant.prompts);
                 const model = context.services.settings?.get().assistant.model;
@@ -865,6 +928,7 @@ export function createGlobalVoiceRpcFeature(options = {}) {
                     const scopeChanged = JSON.stringify([...settings.get().assistant.managedWorkspaceIds].sort()) !== JSON.stringify([...next.managedWorkspaceIds].sort());
                     lifecycleRevision++;
                     await settings.update({ assistant: next });
+                    notifications.sync();
                     if (isRecord(payload) && payload.configurationPatch !== undefined) {
                         runtime.configureEnvironment(buildSherpaRuntimeEnvironment(next.voice));
                         updateVoiceAgentCapabilities();
@@ -894,6 +958,7 @@ export function createGlobalVoiceRpcFeature(options = {}) {
                 resetting = true;
                 lifecycleRevision++;
                 indexRevision++;
+                notifications.sync();
                 syncBackground();
                 background.invalidate();
                 cancelIndexWork();
@@ -918,6 +983,7 @@ export function createGlobalVoiceRpcFeature(options = {}) {
                 finally {
                     modelAbort = new AbortController();
                     resetting = false;
+                    notifications.sync();
                     syncBackground();
                 }
             };
@@ -943,7 +1009,41 @@ export function createGlobalVoiceRpcFeature(options = {}) {
                     indexedAt: view.indexedAt, workspaces: view.cached?.value.source.workspaces ?? [] };
                 return cachedStatus;
             };
-            context.resources.add(context.services.rpc.register('assistant', async (action, payload) => {
+            context.resources.add(context.services.rpc.register('assistant', async (action, payload, rpcContext) => {
+                if (action.startsWith('notifications/')) {
+                    // 外层连接已完成认证；仍拒绝明确的访客/受限会话，伴随页没有这条 RPC 通道。
+                    const peer = asRecord(asRecord(rpcContext)?.peer);
+                    const operator = readOptionalService(context.services.dshContext, 'connection')?.operator;
+                    if (operator !== undefined && asRecord(rpcContext)?.peer !== operator || peer?.authenticated === false || peer?.authorized === false || peer?.scope?.kind === 'session' || peer?.kind === 'session')
+                        throw new CodingNsRpcError('CODINGNS_RPC_UNAUTHENTICATED', '当前调用者无权读取全局助理通知');
+                    if (!isRecord(payload) || Array.isArray(payload))
+                        throw new TypeError('通知 RPC 参数无效');
+                    if (action === 'notifications/source') {
+                        const request = readAssistantNotificationFeedRequest(payload);
+                        const allowed = new Set(readWorkspaceRecords(context.services.dshContext).map(workspace => workspace.id));
+                        if (request.workspaceIds.some(id => !allowed.has(id)))
+                            throw new CodingNsRpcError('ASSISTANT_NOTIFICATION_FORBIDDEN', '通知来源工作区不可访问');
+                        notifications.sourceScope(request.workspaceIds);
+                        return notificationSource.read(request);
+                    }
+                    if (action === 'notifications/read') {
+                        notifications.readCurrent();
+                        return notifications.center.read(payload);
+                    }
+                    if (action === 'notifications/read-session') {
+                        notifications.readCurrent();
+                        const request = payload;
+                        // Client 的本地选择使用稳定的 `local` 别名；真实 Host ID 只由 Host 自己决定。
+                        return notifications.center.readSession({ ...request, hostId: request.hostId === 'local' ? localHostId : request.hostId });
+                    }
+                    if (action === 'notifications/ack')
+                        return notifications.center.ack(payload);
+                    if (action === 'notifications/clear-all')
+                        return notifications.center.clearAll(payload);
+                    if (action === 'notifications/target')
+                        return { ...await notifications.center.target(payload), localHostId };
+                    throw new TypeError('通知 RPC 方法无效');
+                }
                 if (resetting && action !== 'lifecycle/read' && action !== 'voice/capabilities' && action !== 'tts/catalog')
                     throw new Error('助理正在重置，请稍后操作');
                 if (action.startsWith('tts/')) {
@@ -1323,6 +1423,20 @@ function createDispatchContext(snapshot, archivedSessionIds) {
         entries: snapshot.entries,
     };
 }
+/** 来源日志只传固定通知文字和稳定身份，不带导航权限、原始请求参数或堆栈。 */
+function toSourceNotificationFact(fact) {
+    const request = 'requestId' in fact;
+    return {
+        kind: request ? fact.type === 'request-resolved' ? 'resolved' : fact.requestKind : fact.type === 'turn-failed' ? 'error' : 'completed',
+        workspaceId: fact.target.workspaceId, sessionId: fact.target.sessionId,
+        logicalId: request ? JSON.stringify([fact.requestKind, fact.requestId]) : fact.turnId,
+        ...(request ? { requestId: fact.requestId, requestKind: fact.requestKind } : {}),
+        ...(request && fact.target.actualRequestTarget !== undefined ? { actualRequestSessionId: fact.target.actualRequestTarget.sessionId } : {}),
+        hostLabel: fact.hostLabel ?? '本机', workspaceLabel: fact.workspaceLabel ?? '工作区', sessionTitle: fact.sessionTitle ?? '未命名会话',
+        ...(fact.seq === undefined ? {} : { seq: fact.seq }),
+        ...(!request && fact.errorExcerpt !== undefined ? { errorExcerpt: fact.errorExcerpt } : {}),
+    };
+}
 function readOwner(payload) {
     if (!isRecord(payload) || typeof payload.ownerId !== 'string' || payload.ownerId.trim() === '') {
         throw new TypeError('全局语音 RPC 缺少 ownerId');
@@ -1506,6 +1620,18 @@ async function readAssistantSource(services, managedWorkspaceIds = [], waitingSt
                 return session.summary ?? null;
             },
         }),
+        readMessages: async (session, readSignal, toolCallId) => {
+            readSignal?.throwIfAborted();
+            if (session.hostId === hostId) {
+                const surfaceMessages = readSurface === undefined ? [] : await readSurfaceMessages(readSurface, session.sessionId, readSignal, toolCallId);
+                if (surfaceMessages.length > 0)
+                    return surfaceMessages;
+                return await readNativeSessionMessages(services, session.sessionId, readSignal, toolCallId);
+            }
+            if (gatewayResult?.readMessages !== undefined)
+                return gatewayResult.readMessages(session, readSignal, toolCallId);
+            return [];
+        },
         ...((gatewayResult?.readWaiting === undefined) ? {} : {
             readWaiting: async (session, readSignal) => {
                 readSignal?.throwIfAborted();
@@ -1579,6 +1705,55 @@ async function readSurfaceSummary(readSurface, sessionId, signal) {
         return summarizeSurfaceEvents(value.events);
     return null;
 }
+async function readSurfaceMessages(readSurface, sessionId, signal, toolCallId) {
+    signal?.throwIfAborted();
+    const value = await readSurface(sessionId, signal);
+    signal?.throwIfAborted();
+    if (!isRecord(value))
+        return [];
+    const records = Array.isArray(value.events) ? value.events : Array.isArray(value.records) ? value.records : [];
+    return appendAssistantSessionStream(readAssistantSessionMessages(records, { ...(toolCallId === undefined ? {} : { toolCallId }) }), value.assistantStream);
+}
+/** DSH 原生会话快照是本地运行中会话的实时回退；提取器只输出白名单语义消息。 */
+async function readNativeSessionMessages(services, sessionId, signal, toolCallId) {
+    signal?.throwIfAborted();
+    const dispatch = resolveDshNativeDispatch(services.dshContext);
+    if (dispatch !== undefined) {
+        try {
+            const stream = await dispatch.stream('session/follow', {
+                args: { request: { address: { kind: 'session', sessionId }, assistantStream: true, maxMessages: 32 } },
+            }, signal);
+            for await (const frame of stream) {
+                signal?.throwIfAborted();
+                if (!isRecord(frame) || frame.type !== 'snapshot')
+                    continue;
+                const records = Array.isArray(frame.records) ? frame.records : [];
+                return appendAssistantSessionStream(readAssistantSessionMessages(records, { ...(toolCallId === undefined ? {} : { toolCallId }) }), frame.assistantStream);
+            }
+        }
+        catch {
+            signal?.throwIfAborted();
+            // 较旧 DSH Host 没有 session/follow 时回退到当前内存 Session 快照。
+        }
+    }
+    const ctx = services.dshContext;
+    let session;
+    try {
+        session = services.nativeSessions?.get(sessionId) ?? readOptionalService(ctx, 'sessions')?.get?.(sessionId);
+    }
+    catch {
+        return [];
+    }
+    if (!isRecord(session) || typeof session.snapshotEvents !== 'function')
+        return [];
+    try {
+        const events = session.snapshotEvents();
+        return Array.isArray(events) ? readAssistantSessionMessages(events, { ...(toolCallId === undefined ? {} : { toolCallId }) }) : [];
+    }
+    catch {
+        return [];
+    }
+}
 /**
  * readSurface 返回的是已经过滤过的模型表层事件。这里只读取最后几条语义事件，
  * 不遍历原始日志，也不把工具流式 chunk 当成用户或助理正文。