dsh-qqchat 0.2.5 → 0.2.7

package/src/session/agent-bridge.ts

@@ -3,7 +3,7 @@ import { createRequire } from 'node:module'
 import type { Context } from '@deepseek-ai/cordis'
 import { installModelSelection } from '@deepseek-ai/dsh-agent'
 import type { AgentHandle, AgentOptions, AgentSetup, ModelSelectionRef } from '@deepseek-ai/dsh-agent'
-import { resolveSessionPreset } from '@deepseek-ai/dsh-agent-presets'
+import { agentPresetProjectionDefinition } from '@deepseek-ai/dsh-agent-presets'
 import { createUserMessage } from '@deepseek-ai/dsh-llm'
 import type { ContentBlock } from '@deepseek-ai/dsh-llm'
 import type { CommandInvocation, CommandRuntime, CommandResult } from '@deepseek-ai/dsh-commands'
@@ -41,12 +41,15 @@ interface SessionPersistenceService { inspect(id: SessionId): Promise<{ meta: Se
 interface SessionTitleService { get(session: Session): unknown; rename(session: Session, title: string): unknown }
 interface WorkspaceRegistryService {
   archivedSessionIds: readonly string[]
+  resolveByPath(path: string): Promise<{ attachSession(sessionId: import('@deepseek-ai/dsh-session').SessionId): Promise<void> } | undefined>
 }
 interface Composition { presetId?: string; setup?: AgentSetup }
 interface ActiveActor { chatType: ChatType; senderId: string }
 
 export function resolveQQSessionPreset(header: Session['header'], events: readonly SessionEvent[]): string | undefined {
-  return resolveSessionPreset({ header, events })
+  let current = agentPresetProjectionDefinition.init(header)
+  for (const event of events) current = agentPresetProjectionDefinition.apply(current, event)
+  return current || undefined
 }
 
 const MEDIA_TOOL_NAMES = new Set(['qqchat_describe_image', 'qqchat_read_file', 'qqchat_media_info'])
@@ -65,6 +68,7 @@ export class DshQQBridge {
   private readonly activeMediaReadable = new Map<string, boolean>()
   private readonly memorySnapshots = new Map<string, MemorySnapshotState>()
   private readonly disposeEvent: () => void
+  private readonly disposeAssistantStream: () => void
   private readonly disposeToolGate: () => void
   private readonly disposeCommands: () => void
   private readonly disposeImageTool: () => void
@@ -78,6 +82,10 @@ export class DshQQBridge {
     private readonly logger: LoggerLike = console,
   ) {
     this.disposeEvent = ctx.on('session/event', (session, event) => this.onSessionEvent(session, event))
+    this.disposeAssistantStream = ctx.on('agent/assistant-stream', ({ agent, frame }) => {
+      if (frame.type !== 'chunk' || frame.chunk.type !== 'text-delta' || !frame.chunk.text) return
+      this.pending.get(String(agent.id))?.onTextDelta?.(frame.chunk.text)
+    })
     this.disposeToolGate = ctx.on('tools/pre-execute', async (exec, next): Promise<PreToolDecision> => {
       const agent = exec.agent
       if (!agent) return next()
@@ -100,8 +108,19 @@ export class DshQQBridge {
     this.disposeCommands = this.registerCommands()
   }
 
+  async attachMappedSessionsToWorkspace(): Promise<void> {
+    const sessionIds = [
+      ...this.db.listGroups().map(row => row.dsh_session_id),
+      ...this.db.listDirectChats().map(row => row.dsh_session_id),
+    ]
+    for (const sessionId of sessionIds) {
+      if (sessionId) await this.attachToWorkspace(sessionId)
+    }
+  }
+
   async dispose(): Promise<void> {
     this.disposeEvent()
+    this.disposeAssistantStream()
     this.disposeToolGate()
     this.disposeImageTool()
     this.disposeMediaTools()
@@ -129,15 +148,6 @@ export class DshQQBridge {
     if (!existing && !createSession) return undefined
     const { agent, sessionId } = await this.ensureAgent(event.chatType, row)
     event.sessionId = sessionId
-    if (event.isOwner) {
-      // Keep owner messages as native user/message events even when they carry
-      // images. DSH now owns the image projection: visual routes receive the
-      // durable image block, while text-only routes receive its stable text
-      // placeholder. Falling back to a display-only event here would discard
-      // the owner's message semantics before DSH can apply that policy.
-      this.appendOwnerMessageIfMissing(agent.session, event)
-      return sessionId
-    }
     this.appendDisplayIfMissing(agent.session, event)
     return sessionId
   }
@@ -235,12 +245,6 @@ export class DshQQBridge {
       if (text.trim()) pending.text = text
       return
     }
-    if (event.type === 'assistant/chunk') {
-      const pending = this.pending.get(id)
-      const chunk = event.data.chunk
-      if (pending?.onTextDelta && chunk.type === 'text-delta' && chunk.text) pending.onTextDelta(chunk.text)
-      return
-    }
     if (event.type === 'request/header') {
       const { config } = event.data.header
       if (config.provider && config.model) this.routes.set(id, { provider: config.provider, model: config.model })
@@ -271,7 +275,7 @@ export class DshQQBridge {
   }
 
   private restoreMemorySnapshot(session: Session): MemorySnapshotState | undefined {
-    return restoreMemorySnapshotState(session.events as unknown as Parameters<typeof restoreMemorySnapshotState>[0], DSH_RUNTIME_CONTEXT_SOURCE)
+    return restoreMemorySnapshotState(session.snapshotEvents() as unknown as Parameters<typeof restoreMemorySnapshotState>[0], DSH_RUNTIME_CONTEXT_SOURCE)
   }
 
   private async ensureAgent(chatType: ChatType, row: GroupRow | MemberRow): Promise<{ agent: AgentHandle['agent']; sessionId: string }> {
@@ -292,6 +296,7 @@ export class DshQQBridge {
       if (live) {
         this.ensureSelection(live)
         this.ensureTitle(live.session, chatType, row)
+        await this.attachToWorkspace(sessionId)
         this.rememberRoute(chatType, row, live, sessionId)
         return { agent: live, sessionId }
       }
@@ -299,6 +304,7 @@ export class DshQQBridge {
       if (resumed) {
         this.ensureSelection(resumed.agent)
         this.ensureTitle(resumed.agent.session, chatType, row)
+        await this.attachToWorkspace(sessionId)
         this.rememberRoute(chatType, row, resumed.agent, sessionId)
         return { agent: resumed.agent, sessionId }
       }
@@ -317,6 +323,7 @@ export class DshQQBridge {
     this.handles.set(sessionId, handle)
     this.ensureSelection(handle.agent)
     this.db.setChatSession(chatType, Number(row.id), sessionId)
+    await this.attachToWorkspace(sessionId)
     this.ensureTitle(handle.agent.session, chatType, row)
     this.rememberRoute(chatType, row, handle.agent, sessionId)
     return { agent: handle.agent, sessionId }
@@ -327,6 +334,17 @@ export class DshQQBridge {
     return registry?.archivedSessionIds.includes(sessionId) ?? false
   }
 
+  private async attachToWorkspace(sessionId: string): Promise<void> {
+    const registry = (this.ctx as unknown as { workspaceRegistry?: WorkspaceRegistryService }).workspaceRegistry
+    if (!registry) return
+    try {
+      const workspace = await registry.resolveByPath(process.cwd())
+      await workspace?.attachSession(SessionId(sessionId))
+    } catch (error) {
+      this.logger.warn?.(`[dsh-qqchat] QQ session ${sessionId} 未能挂载到当前工作区: ${error instanceof Error ? error.message : String(error)}`)
+    }
+  }
+
   private rememberRoute(chatType: ChatType, row: GroupRow | MemberRow, agent: AgentHandle['agent'], sessionId: string): void {
     const provider = agent.options.provider || this.config.provider
     const model = agent.options.model || this.config.model
@@ -336,7 +354,7 @@ export class DshQQBridge {
   }
 
   private appendDisplayIfMissing(session: Session, event: QQChatDisplayEvent): void {
-    if (session.events.some(item => item.type === 'qqchat/message' && item.data.messageId === event.messageId)) return
+    if (session.snapshotEvents().some(item => item.type === 'qqchat/message' && item.data.messageId === event.messageId)) return
     // Keep this on the public Session.append signature. Official DSH releases
     // do not yet expose the optional ignorable envelope marker; if an older
     // DSH cannot restore this plugin-only event, ensureAgent falls back to a
@@ -344,23 +362,6 @@ export class DshQQBridge {
     session.append('qqchat/message', displayEventPayload(event))
   }
 
-  private appendOwnerMessageIfMissing(session: Session, event: QQChatDisplayEvent): void {
-    if (session.events.some(item => {
-      if (item.type !== 'user/message') return false
-      const source = item.data.source as unknown as { messageId?: string }
-      return source.messageId === event.messageId
-    })) return
-    session.append('user/message', createUserMessage({
-      source: {
-        kind: 'user', channel: 'qq', botId: 'qqchat', chatType: event.chatType,
-        chatId: event.chatId, senderId: event.senderId,
-        ...(event.senderName ? { senderName: event.senderName } : {}),
-        messageId: event.messageId, mentioned: event.mentioned,
-      },
-      content: transcriptContent(event, this.db),
-    }), { surfaceOp: 'append' })
-  }
-
   private ensureTitle(session: Session, chatType: ChatType, row: GroupRow | MemberRow): void {
     try {
       const getService = (this.ctx as unknown as { get?: (name: string) => unknown }).get
@@ -521,7 +522,7 @@ export class DshQQBridge {
       const available = await presets.list()
       return { kind: 'success', text: available.length ? `可用 Agent Preset：\n${available.map(preset => `/qqpreset ${preset.id}`).join('\n')}` : '当前没有可用 Agent Preset。' }
     }
-    if (agent.session.events.some(event => event.type === 'turn/start')) {
+    if (agent.session.snapshotEvents().some(event => event.type === 'turn/start')) {
       return { kind: 'error', text: '当前 Session 已经开始对话，DSH 不允许更换 Agent Preset。请先使用 /qqnew 开启新 Session。' }
     }
     try {
@@ -539,8 +540,9 @@ export class DshQQBridge {
 
   private statusCommand(agent: AgentHandle['agent']): CommandResult {
     const current = this.selection(agent)?.current
-    const messages = agent.session.events.filter(event => event.type === 'user/message' || event.type === 'assistant/message').length
-    const last = agent.session.events.at(-1)
+    const events = agent.session.snapshotEvents()
+    const messages = events.filter(event => event.type === 'user/message' || event.type === 'assistant/message').length
+    const last = events.at(-1)
     return {
       kind: 'success',
       text: ['📊 Session 状态', `Session：${String(agent.id)}`, `状态：${agent.status === 'running' ? '生成中' : '空闲'}`, `模型：${current ? `${current.provider}/${current.model}` : '未知'}`, `消息数：${messages}`, `最后事件：${last?.type || '无'}`].join('\n'),
@@ -604,36 +606,6 @@ export function qqMessageContent(text: string, attachments: readonly StoredAttac
   return content
 }
 
-function transcriptContent(event: QQChatDisplayEvent, db: QQChatDatabase): ContentBlock[] {
-  const attachments = event.attachments || []
-  const renderableImages = attachments.filter(attachment => attachment.kind === 'image' && db.attachmentById(attachment.id)?.imageRef)
-  const imagePlaceholderLines = new Set(renderableImages.map(attachment => `[图片] ${attachment.filename}`))
-  const quote = event.quote ? formatDisplayQuote(event) : ''
-  const body = event.content.split('\n').filter(line => !imagePlaceholderLines.has(line)).join('\n').trim()
-  const text = [quote, body].filter(Boolean).join('\n\n')
-  const content: ContentBlock[] = [{ type: 'text', text }]
-  for (const attachment of attachments) {
-    const imageRef = attachment.kind === 'image' ? db.attachmentById(attachment.id)?.imageRef : undefined
-    if (imageRef) {
-      content.push({ type: 'image', attachment: imageRef })
-    }
-  }
-  return content
-}
-
-function formatDisplayQuote(event: QQChatDisplayEvent): string {
-  const quote = event.quote
-  if (!quote) return ''
-  return [
-    '[引用消息]',
-    quote.senderId ? `发送人ID=${quote.senderId}` : '',
-    quote.senderName ? `显示名=${quote.senderName}` : '',
-    quote.messageId ? `消息ID=${quote.messageId}` : '',
-    `正文=${quote.text || '(空消息)'}`,
-    quote.attachments.length ? `附件=${quote.attachments.map(attachment => `${attachment.kind || 'file'}:${attachment.filename}${attachment.attachmentId ? ` (attachment_id=${attachment.attachmentId})` : ''}`).join('、')}` : '',
-  ].filter(Boolean).join('\n')
-}
-
 function displayEventPayload(event: QQChatDisplayEvent): QQChatDisplayEvent {
   const attachments = (event.attachments || []).map(attachment => ({
     id: String(attachment.id), kind: attachment.kind, filename: String(attachment.filename),

package/src/session/runtime.ts

@@ -9,6 +9,7 @@ import type { QQApiClient } from '../gateway/api.js'
 import type { QQBindService } from '../gateway/auth.js'
 import { QQGateway } from '../gateway/gateway.js'
 import { renderQQMentionNames } from '../gateway/normalize.js'
+import { qqCommandText } from '../commands/dispatch.js'
 import { QQMediaStore } from '../media/store.js'
 import type {
   AccountRow, ChatTargetRow, ChatType, GroupReceiveMode, GroupRow, MemberRow, QQAttachmentInput, QQChatConfig,
@@ -29,6 +30,7 @@ export class QQChatRuntime {
   ) {}
 
   async start(): Promise<void> {
+    await this.bridge.attachMappedSessionsToWorkspace()
     for (const account of this.db.enabledAccounts()) this.startGateway(account)
     this.outboxTimer = setInterval(() => void this.flushOutbox(), 3000)
     this.outboxTimer.unref?.()
@@ -51,9 +53,7 @@ export class QQChatRuntime {
   }
 
   settings(): QQChatRuntimeSettings {
-    const settings = this.db.runtimeSettings(defaultRuntimeSettings(this.config))
-    if (settings.directReplyFormat === 'compat') settings.directStreamingEnabled = false
-    return settings
+    return this.db.runtimeSettings(defaultRuntimeSettings(this.config))
   }
 
   updateSettings(patch: QQChatRuntimeSettingsPatch): QQChatRuntimeSettings {
@@ -70,9 +70,7 @@ export class QQChatRuntime {
     if (patch.directReplyFormat !== undefined) {
       if (!isReplyFormat(patch.directReplyFormat)) throw new Error('无效的私聊消息兼容格式')
       this.db.setSetting('directReplyFormat', patch.directReplyFormat)
-      if (patch.directReplyFormat === 'compat') this.db.setSetting('directStreamingEnabled', false)
     }
-    if (patch.directStreamingEnabled !== undefined) this.db.setSetting('directStreamingEnabled', Boolean(patch.directStreamingEnabled))
     if (patch.groupMembersCanUseTools !== undefined) this.db.setSetting('groupMembersCanUseTools', Boolean(patch.groupMembersCanUseTools))
     if (patch.groupMembersCanReceiveMedia !== undefined) this.db.setSetting('groupMembersCanReceiveMedia', Boolean(patch.groupMembersCanReceiveMedia))
     if (patch.groupMembersCanReadMedia !== undefined) this.db.setSetting('groupMembersCanReadMedia', Boolean(patch.groupMembersCanReadMedia))
@@ -251,22 +249,21 @@ export class QQChatRuntime {
         }
       }
 
-    if (!shouldReply) {
+    if (shouldRecordQQTranscript(shouldReply, message.text, message.mentioned)) {
       await this.bridge.recordTranscript(displayEvent, row, true)
+    }
+    if (!shouldReply) {
       return
     }
 
     try {
-      // Keep the incoming QQ message visible in Web independently from the
-      // notice-shaped message used to drive the Agent turn.
-      await this.bridge.recordTranscript(displayEvent, row, true)
       const targetId = message.chatType === 'group' ? message.groupOpenid! : message.senderId
       const sendOptions = {
         group: message.chatType === 'group', messageId: message.messageId || null,
         format: message.chatType === 'group' ? settings.groupReplyFormat : settings.directReplyFormat,
       } as const
-      const stream = message.chatType === 'c2c' && settings.directReplyFormat !== 'compat' && settings.directStreamingEnabled
-        ? this.api.createPrivateTextStream(account, targetId, sendOptions)
+      const stream = message.chatType === 'c2c' && settings.directReplyFormat === 'markdown'
+        ? this.api.createPrivateTextStream(account, targetId, { messageId: sendOptions.messageId })
         : undefined
       const reply = await this.bridge.reply(message, group, member, storedAttachments, stream ? delta => stream.push(delta) : undefined, isOwner)
       if (stream) {
@@ -319,11 +316,15 @@ export class QQChatRuntime {
 }
 
 function isGroupReceiveMode(value: unknown): value is GroupReceiveMode { return value === 'auto' || value === 'mention' || value === 'silent' }
-function isReplyFormat(value: unknown): value is ReplyFormat { return value === 'smart' || value === 'markdown' || value === 'compat' }
+function isReplyFormat(value: unknown): value is ReplyFormat { return value === 'markdown' || value === 'compat' }
 export function shouldReplyToGroup(mode: GroupReceiveMode, group: Pick<GroupRow, 'enabled' | 'read_enabled'>, mentioned: boolean): boolean {
   if (group.enabled !== 1 || group.read_enabled !== 1) return false
   return mode === 'auto' || (mode === 'mention' && mentioned)
 }
+/** Record messages that do not enter the Agent turn, plus QQ commands handled outside Agent.followup. */
+export function shouldRecordQQTranscript(shouldReply: boolean, text: string, mentioned: boolean): boolean {
+  return !shouldReply || qqCommandText(text, mentioned) !== undefined
+}
 function shortId(value: string): string { return value.length > 10 ? `…${value.slice(-10)}` : value }
 function publicAttachments(attachments: StoredAttachmentSummary[]): StoredAttachmentSummary[] {
   return attachments.map(attachment => ({

package/src/storage/db.ts

@@ -264,6 +264,9 @@ export class QQChatDatabase {
         error TEXT
       );
     `)
+    this.db.prepare("UPDATE plugin_settings SET value='\"markdown\"',updated_at=? WHERE key IN ('replyFormat','groupReplyFormat','directReplyFormat') AND value='\"smart\"'")
+      .run(now())
+    this.db.prepare("DELETE FROM plugin_settings WHERE key='directStreamingEnabled'").run()
     this.db.prepare("UPDATE reflection_tasks SET status='failed',updated_at=? WHERE status='running' AND updated_at<?")
       .run(now(), now() - REFLECTION_TASK_STALE_MS)
     const columns = new Set(many<{ name: string }>(this.db.prepare('PRAGMA table_info(group_members)').all()).map(column => column.name))
@@ -396,13 +399,16 @@ export class QQChatDatabase {
   }
 
   runtimeSettings(defaults: QQChatRuntimeSettings): QQChatRuntimeSettings {
+    const legacyReplyFormat = normalizeReplyFormat(
+      this.getSetting<unknown>('replyFormat', defaults.directReplyFormat),
+      defaults.directReplyFormat,
+    )
     return {
       memoryEnabled: this.getSetting('memoryEnabled', defaults.memoryEnabled),
       memoryMemberBatchEnabled: this.getSetting('memoryMemberBatchEnabled', defaults.memoryMemberBatchEnabled),
       groupReceiveMode: this.getSetting('groupReceiveMode', defaults.groupReceiveMode),
-      groupReplyFormat: this.getSetting('groupReplyFormat', defaults.groupReplyFormat),
-      directReplyFormat: this.getSetting('directReplyFormat', this.getSetting('replyFormat', defaults.directReplyFormat)),
-      directStreamingEnabled: this.getSetting('directStreamingEnabled', defaults.directStreamingEnabled),
+      groupReplyFormat: normalizeReplyFormat(this.getSetting<unknown>('groupReplyFormat', defaults.groupReplyFormat), defaults.groupReplyFormat),
+      directReplyFormat: normalizeReplyFormat(this.getSetting<unknown>('directReplyFormat', legacyReplyFormat), legacyReplyFormat),
       groupMembersCanUseTools: this.getSetting('groupMembersCanUseTools', defaults.groupMembersCanUseTools),
       groupMembersCanReceiveMedia: this.getSetting('groupMembersCanReceiveMedia', defaults.groupMembersCanReceiveMedia),
       groupMembersCanReadMedia: this.getSetting('groupMembersCanReadMedia', defaults.groupMembersCanReadMedia),
@@ -828,3 +834,9 @@ export class QQChatDatabase {
     this.db.prepare('UPDATE outbox SET status=?,sent_at=?,error=? WHERE id=?').run(error ? 'failed' : 'sent', now(), error, id)
   }
 }
+
+function normalizeReplyFormat(value: unknown, fallback: QQChatRuntimeSettings['directReplyFormat']): QQChatRuntimeSettings['directReplyFormat'] {
+  if (value === 'markdown' || value === 'compat') return value
+  // Older releases persisted the automatic “smart” mode. Its explicit replacement is Markdown.
+  return value === 'smart' ? 'markdown' : fallback
+}

package/src/transport/rpc.ts

@@ -311,9 +311,8 @@ function asSettingsPatch(value: unknown): QQChatRuntimeSettingsPatch {
   if (record.groupReceiveMode === 'auto' || record.groupReceiveMode === 'mention' || record.groupReceiveMode === 'silent') {
     patch.groupReceiveMode = record.groupReceiveMode
   }
-  if (record.groupReplyFormat === 'smart' || record.groupReplyFormat === 'markdown' || record.groupReplyFormat === 'compat') patch.groupReplyFormat = record.groupReplyFormat
-  if (record.directReplyFormat === 'smart' || record.directReplyFormat === 'markdown' || record.directReplyFormat === 'compat') patch.directReplyFormat = record.directReplyFormat
-  if (typeof record.directStreamingEnabled === 'boolean') patch.directStreamingEnabled = record.directStreamingEnabled
+  if (record.groupReplyFormat === 'markdown' || record.groupReplyFormat === 'compat') patch.groupReplyFormat = record.groupReplyFormat
+  if (record.directReplyFormat === 'markdown' || record.directReplyFormat === 'compat') patch.directReplyFormat = record.directReplyFormat
   if (typeof record.groupMembersCanUseTools === 'boolean') patch.groupMembersCanUseTools = record.groupMembersCanUseTools
   if (typeof record.groupMembersCanReceiveMedia === 'boolean') patch.groupMembersCanReceiveMedia = record.groupMembersCanReceiveMedia
   if (typeof record.groupMembersCanReadMedia === 'boolean') patch.groupMembersCanReadMedia = record.groupMembersCanReadMedia

package/src/types.ts

@@ -16,7 +16,7 @@ export interface DailyEntry {
   date: string
   note: string
 }
-export type ReplyFormat = 'smart' | 'markdown' | 'compat'
+export type ReplyFormat = 'markdown' | 'compat'
 export type GroupReceiveMode = 'auto' | 'mention' | 'silent'
 export type GatewayStatus = 'offline' | 'connecting' | 'online' | 'error'
 export type LogLevel = 'debug' | 'info' | 'warn' | 'error'
@@ -65,7 +65,6 @@ export interface QQChatRuntimeSettings {
   groupReceiveMode: GroupReceiveMode
   groupReplyFormat: ReplyFormat
   directReplyFormat: ReplyFormat
-  directStreamingEnabled: boolean
   groupMembersCanUseTools: boolean
   groupMembersCanReceiveMedia: boolean
   groupMembersCanReadMedia: boolean
@@ -78,7 +77,6 @@ export interface QQChatRuntimeSettingsPatch {
   groupReceiveMode?: GroupReceiveMode
   groupReplyFormat?: ReplyFormat
   directReplyFormat?: ReplyFormat
-  directStreamingEnabled?: boolean
   groupMembersCanUseTools?: boolean
   groupMembersCanReceiveMedia?: boolean
   groupMembersCanReadMedia?: boolean