dsh-qqchat 0.2.1 → 0.2.3

package/src/session/agent-bridge.ts

@@ -2,7 +2,8 @@ import { randomUUID } from 'node:crypto'
 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, PreStepDecision as AgentPreStepDecision } 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 { createUserMessage } from '@deepseek-ai/dsh-llm'
 import type { ContentBlock } from '@deepseek-ai/dsh-llm'
 import type { CommandInvocation, CommandRuntime, CommandResult } from '@deepseek-ai/dsh-commands'
@@ -15,7 +16,7 @@ import '../shared/augmentations.js'
 import { defaultRuntimeSettings } from '../config.js'
 import { registerQQImageTool } from '../media/image-tool.js'
 import { registerQQMediaTools } from '../media/media-tools.js'
-import { dispatchQQCommand, qqCommandText } from '../commands/dispatch.js'
+import { dispatchQQCommand, qqCommandText, slashCommandName } from '../commands/dispatch.js'
 import type { QQChatDatabase } from '../storage/db.js'
 import type { MemoryEngine } from '../storage/memory.js'
 import type {
@@ -35,12 +36,17 @@ import type { MemorySnapshotState } from './memory-snapshot.js'
 const DSH_RUNTIME_CONTEXT_SOURCE = '@deepseek-ai/dsh-system-prompt'
 
 interface AgentPreset { id: string }
-interface AgentPresetService { resolve(id?: string): Promise<AgentPreset>; mount(ctx: Context, id: string): Promise<unknown> }
+interface AgentPresetService { resolve(id?: string): Promise<AgentPreset>; list(): Promise<AgentPreset[]>; mount(ctx: Context, id: string): Promise<unknown>; recompose(ctx: Context, id: string): Promise<AgentPreset> }
+interface SessionPersistenceService { inspect(id: SessionId): Promise<{ meta: Session['header']; events: readonly SessionEvent[] }> }
 interface SessionTitleService { get(session: Session): unknown; rename(session: Session, title: string): unknown }
 interface WorkspaceRegistryService { archivedSessionIds: readonly string[] }
 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 })
+}
+
 const MEDIA_TOOL_NAMES = new Set(['qqchat_describe_image', 'qqchat_read_file', 'qqchat_media_info'])
 const packageMetadata = createRequire(import.meta.url)('../../package.json') as { version?: string }
 const PLUGIN_VERSION = packageMetadata.version || 'unknown'
@@ -58,7 +64,6 @@ export class DshQQBridge {
   private readonly memorySnapshots = new Map<string, MemorySnapshotState>()
   private readonly disposeEvent: () => void
   private readonly disposeToolGate: () => void
-  private readonly disposeBootstrapGate: () => void
   private readonly disposeCommands: () => void
   private readonly disposeImageTool: () => void
   private readonly disposeMediaTools: () => void
@@ -71,10 +76,6 @@ export class DshQQBridge {
     private readonly logger: LoggerLike = console,
   ) {
     this.disposeEvent = ctx.on('session/event', (session, event) => this.onSessionEvent(session, event))
-    this.disposeBootstrapGate = ctx.on('agent/pre-step', async ({ messages }, next): Promise<AgentPreStepDecision> => {
-      if (messages.some(message => message.source.kind === 'qq-chat-bootstrap')) return { kind: 'reject' }
-      return next()
-    })
     this.disposeToolGate = ctx.on('tools/pre-execute', async (exec, next): Promise<PreToolDecision> => {
       const agent = exec.agent
       if (!agent) return next()
@@ -99,7 +100,6 @@ export class DshQQBridge {
 
   async dispose(): Promise<void> {
     this.disposeEvent()
-    this.disposeBootstrapGate()
     this.disposeToolGate()
     this.disposeImageTool()
     this.disposeMediaTools()
@@ -128,9 +128,12 @@ export class DshQQBridge {
     const { agent, sessionId } = await this.ensureAgent(event.chatType, row)
     event.sessionId = sessionId
     if (event.isOwner) {
-      const hasImages = event.attachments?.some(attachment => attachment.kind === 'image' && this.db.attachmentById(attachment.id)?.imageRef) === true
-      if (!hasImages || await this.imageRouteAvailable(agent)) this.appendOwnerMessageIfMissing(agent.session, event)
-      else this.appendDisplayIfMissing(agent.session, event)
+      // 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)
@@ -149,6 +152,16 @@ export class DshQQBridge {
         const commandText = qqCommandText(message.text, message.mentioned)
         if (commandText !== undefined) {
           if (!commands) return '当前 DSH profile 未加载命令系统，请重启并确认使用了最新插件。'
+          // Preset discovery/selection is a pre-session operation. Running it
+          // through DSH's native command executor would append command/run and
+          // make the blank Session ineligible for the very preset it lists.
+          // Keep the native registration for Web, but handle QQ directly.
+          if (slashCommandName(commandText) === 'qqpreset' && (message.chatType !== 'group' || isOwner)) {
+            const prefix = '/qqpreset'
+            const result = await this.presetCommand(agent, commandText.slice(prefix.length).trim())
+            if (this.pendingResets.delete(String(sessionId))) await this.resetSession(message.chatType, row)
+            return result.text || ''
+          }
           const command = await dispatchQQCommand(commands, agent, commandText, { chatType: message.chatType, isOwner })
           if (command.handled) {
             if (this.pendingResets.delete(String(sessionId))) await this.resetSession(message.chatType, row)
@@ -168,15 +181,7 @@ export class DshQQBridge {
         this.injectMemorySnapshot(agent, sessionId, contextText)
       }
 
-      const currentText = this.memory.currentMessageText(message) + mediaPrompt(attachments)
-      const currentContent: ContentBlock[] = [{ type: 'text', text: currentText }]
-      if (attachments.length && await this.imageRouteAvailable(agent)) {
-        for (const attachment of attachments) {
-          if (attachment.kind === 'image' && attachment.imageRef) {
-            currentContent.push({ type: 'image', attachment: attachment.imageRef })
-          }
-        }
-      }
+      const currentContent = qqMessageContent(this.memory.currentMessageText(message), attachments)
       const current = createUserMessage({
         source: {
           kind: 'qq-chat', botId: String(message.accountId), chatType: message.chatType,
@@ -286,7 +291,6 @@ export class DshQQBridge {
         this.ensureSelection(live)
         this.ensureTitle(live.session, chatType, row)
         this.rememberRoute(chatType, row, live, sessionId)
-        await this.ensureVisible(live)
         return { agent: live, sessionId }
       }
       const resumed = await this.tryResume(sessionId)
@@ -294,7 +298,6 @@ export class DshQQBridge {
         this.ensureSelection(resumed.agent)
         this.ensureTitle(resumed.agent.session, chatType, row)
         this.rememberRoute(chatType, row, resumed.agent, sessionId)
-        await this.ensureVisible(resumed.agent)
         return { agent: resumed.agent, sessionId }
       }
     }
@@ -314,7 +317,6 @@ export class DshQQBridge {
     this.db.setChatSession(chatType, Number(row.id), sessionId)
     this.ensureTitle(handle.agent.session, chatType, row)
     this.rememberRoute(chatType, row, handle.agent, sessionId)
-    await this.ensureVisible(handle.agent)
     return { agent: handle.agent, sessionId }
   }
 
@@ -331,14 +333,12 @@ export class DshQQBridge {
     else this.memory.setMemberRoute(Number((row as MemberRow).id), provider, model, sessionId)
   }
 
-  private async ensureVisible(agent: AgentHandle['agent']): Promise<void> {
-    if (agent.session.events.some(event => event.type === 'turn/start')) return
-    agent.followup(createUserMessage({ source: { kind: 'qq-chat-bootstrap', plugin: 'dsh-qqchat' }, content: [{ type: 'text', text: 'Activate QQ Chat workspace session.' }] }))
-    await agent.whenIdle()
-  }
-
   private appendDisplayIfMissing(session: Session, event: QQChatDisplayEvent): void {
     if (session.events.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
+    // fresh Session while SQLite remains the QQ history source of truth.
     session.append('qqchat/message', displayEventPayload(event))
   }
 
@@ -375,7 +375,7 @@ export class DshQQBridge {
 
   private async tryResume(sessionId: string): Promise<AgentHandle | undefined> {
     try {
-      const composition = await this.composition()
+      const composition = await this.composition(sessionId)
       const handle = await this.ctx.agents.resume({ resumeSessionId: SessionId(sessionId), agentOptions: this.agentOptions(), setup: composition.setup })
       if (!handle.agent.session.header.cwd) {
         await handle.dispose()
@@ -400,15 +400,6 @@ export class DshQQBridge {
     return options
   }
 
-  private async imageRouteAvailable(agent: AgentHandle['agent']): Promise<boolean> {
-    const route = this.selection(agent)?.current || { provider: agent.options.provider, model: agent.options.model }
-    if (!route.provider || !route.model) return false
-    try {
-      const info = await this.ctx.llm.resolveModelInfo(route.provider, route.model)
-      return info.inputModalities?.includes('image') === true
-    } catch { return false }
-  }
-
   private ensureSelection(agent: AgentHandle['agent']): ModelSelectionRef | undefined {
     const id = String(agent.id)
     const existing = this.selections.get(id)
@@ -458,7 +449,7 @@ export class DshQQBridge {
         .map(command => `/${command.name}${command.input?.hint ? ` ${command.input.hint}` : ''} — ${command.description}`),
       '',
       'QQChat 会话',
-      ...commands.filter(command => ['qqnew', 'qqreset', 'qqclear', 'qqmodel', 'qqstop', 'qqstatus'].includes(command.name))
+      ...commands.filter(command => ['qqnew', 'qqreset', 'qqclear', 'qqmodel', 'qqpreset', 'qqstop', 'qqstatus'].includes(command.name))
         .map(command => `/${command.name}${command.input?.hint ? ` ${command.input.hint}` : ''} — ${command.description}`),
       '',
       'QQChat 工具',
@@ -477,6 +468,7 @@ export class DshQQBridge {
       register('qqreset', '开始新会话（/qqnew 别名）', invocation => { this.requestReset(String(invocation.agent.id)); return { kind: 'success', text: '已开启新会话，下一条消息将进入新的 Session。' } }),
       register('qqclear', '开始新会话（/qqnew 别名）', invocation => { this.requestReset(String(invocation.agent.id)); return { kind: 'success', text: '已开启新会话，下一条消息将进入新的 Session。' } }),
       register('qqmodel', '查看或切换当前会话模型', invocation => this.modelCommand(invocation), '[provider/]model'),
+      register('qqpreset', '查看或切换当前 Session 的 Agent Preset', invocation => this.presetCommand(invocation.agent as AgentHandle['agent'], invocation.rawInput.trim()), 'preset'),
       register('qqstop', '中止当前生成', invocation => {
         if (invocation.agent.status !== 'running') return { kind: 'success', text: '当前没有进行中的生成。' }
         invocation.agent.cancel({ kind: 'user' })
@@ -519,6 +511,30 @@ export class DshQQBridge {
     return { kind: 'success', text: `模型已切换：${provider}/${model}\n对话上下文保留，下一轮生效。` }
   }
 
+  private async presetCommand(agent: AgentHandle['agent'], requested: string): Promise<CommandResult> {
+    const getService = (this.ctx as unknown as { get?: (name: string) => unknown }).get
+    const presets = getService?.call(this.ctx, 'agentPresets') as AgentPresetService | undefined
+    if (!presets) return { kind: 'error', text: '当前 DSH profile 未加载 Agent Preset 系统。' }
+    if (!requested) {
+      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')) {
+      return { kind: 'error', text: '当前 Session 已经开始对话，DSH 不允许更换 Agent Preset。请先使用 /qqnew 开启新 Session。' }
+    }
+    try {
+      const preset = await presets.recompose(agent.ctx, requested)
+      agent.session.append('agent-preset/selected', { agentPreset: preset.id })
+      return { kind: 'success', text: `当前 Session 已切换到 Agent Preset：${preset.id}` }
+    } catch {
+      const available = await presets.list().catch(() => [])
+      const availableText = available.length
+        ? `当前可用：${available.map(preset => preset.id).join('、')}`
+        : '当前没有可用 Agent Preset。'
+      return { kind: 'error', text: `无法切换 Agent Preset「${requested}」：该 preset 不存在、已删除或格式无效。\n${availableText}` }
+    }
+  }
+
   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
@@ -529,14 +545,38 @@ export class DshQQBridge {
     }
   }
 
-  private async composition(): Promise<Composition> {
+  private async composition(sessionId?: string): Promise<Composition> {
     const getService = (this.ctx as unknown as { get?: (name: string) => unknown }).get
     const presets = getService?.call(this.ctx, 'agentPresets') as AgentPresetService | undefined
     if (!presets) return {}
-    const preset = await presets.resolve(this.config.agentPreset)
+    const persisted = sessionId ? await this.persistedPreset(sessionId) : undefined
+    const requested = persisted || this.config.agentPreset
+    let preset: AgentPreset
+    try {
+      preset = await presets.resolve(requested)
+    } catch (error) {
+      const available = await presets.list()
+      const fallback = available[0]
+      if (!fallback) throw error
+      this.logger.warn?.(`[dsh-qqchat] Agent Preset「${requested || '默认'}」不可用，已降级到「${fallback.id}」`)
+      preset = await presets.resolve(fallback.id)
+    }
     return { presetId: preset.id, setup: async agentCtx => { await presets.mount(agentCtx, preset.id) } }
   }
 
+  private async persistedPreset(sessionId: string): Promise<string | undefined> {
+    const getService = (this.ctx as unknown as { get?: (name: string) => unknown }).get
+    const persistence = getService?.call(this.ctx, 'sessionPersistence') as SessionPersistenceService | undefined
+    if (!persistence) return undefined
+    try {
+      const inspection = await persistence.inspect(SessionId(sessionId))
+      return resolveQQSessionPreset(inspection.meta, inspection.events)
+    } catch (error) {
+      this.logger.debug?.(`[dsh-qqchat] persisted preset lookup skipped: ${error instanceof Error ? error.message : String(error)}`)
+      return undefined
+    }
+  }
+
   private serial<T>(key: string, task: () => Promise<T>): Promise<T> {
     const previous = this.locks.get(key) || Promise.resolve()
     const current = previous.catch(() => undefined).then(task)
@@ -548,7 +588,18 @@ export class DshQQBridge {
 function mediaPrompt(attachments: StoredAttachmentSummary[]): string {
   if (!attachments.length) return ''
   const lines = attachments.map(item => `- ${item.kind}: ${item.filename} (attachment_id=${item.id}${item.quoted ? ', 引用消息附件' : ''})`)
-  return `\n\n[QQ 媒体附件]\n${lines.join('\n')}\n图片可使用 qqchat_describe_image 查看。`
+  return `\n\n[QQ 媒体附件]\n${lines.join('\n')}\n图片由 DSH 根据当前模型能力处理；视觉模型可直接理解图片。`
+}
+
+/** Build the durable DSH content for one QQ turn without pre-flighting the model. */
+export function qqMessageContent(text: string, attachments: readonly StoredAttachmentSummary[]): ContentBlock[] {
+  const content: ContentBlock[] = [{ type: 'text', text: text + mediaPrompt([...attachments]) }]
+  for (const attachment of attachments) {
+    if (attachment.kind === 'image' && attachment.imageRef) {
+      content.push({ type: 'image', attachment: attachment.imageRef })
+    }
+  }
+  return content
 }
 
 function transcriptContent(event: QQChatDisplayEvent, db: QQChatDatabase): ContentBlock[] {

package/src/session/registration.ts

@@ -0,0 +1,102 @@
+import { createRequire } from 'node:module'
+import { realpathSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { dirname, join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+
+const QQCHAT_SESSION_EVENT_TYPE = 'qqchat/message'
+
+interface KnownEventTypesModule {
+  KNOWN_SESSION_EVENT_TYPES?: { add(type: string): unknown }
+}
+
+export interface SessionEventRegistrationOptions {
+  readonly argv?: readonly string[]
+  readonly dshHome?: string
+  readonly anchors?: readonly string[]
+}
+
+export function profileNameFromArgv(argv: readonly string[]): string | undefined {
+  const profileIndex = argv.indexOf('--profile')
+  if (profileIndex >= 0) {
+    const value = argv[profileIndex + 1]
+    if (value && !value.startsWith('-')) return value
+  }
+  const inline = argv.find(value => value.startsWith('--profile='))
+  const value = inline?.slice('--profile='.length)
+  return value && !value.startsWith('-') ? value : undefined
+}
+
+/**
+ * Register the plugin's log-only event in every reachable dsh-session copy.
+ *
+ * DSH does not expose a public downstream event registration API yet. This
+ * small compatibility shim follows the ecosystem convention used by other
+ * DSH plugins and is intentionally idempotent and best-effort.
+ */
+export async function registerQQChatSessionEventType(options: SessionEventRegistrationOptions = {}): Promise<number> {
+  const argv = options.argv || process.argv
+  const profileName = profileNameFromArgv(argv)
+  const dshHome = options.dshHome || process.env.DSH_HOME || join(homedir(), '.dsh')
+  const profileAnchors = profileName
+    ? [
+        join(dshHome, 'profiles', profileName, 'package.json'),
+        join(dshHome, 'profiles', 'package.json'),
+      ]
+    : []
+  const anchors = [...(options.anchors || [import.meta.url, argv[1]]), ...profileAnchors].filter(
+    (anchor): anchor is string => typeof anchor === 'string' && anchor.length > 0,
+  )
+  const registeredPaths = new Set<string>()
+  let registered = 0
+
+  for (const anchor of anchors) {
+    try {
+      const require = createRequire(anchor)
+      registered += await registerSessionCopy(require, registeredPaths)
+      // Persistence may resolve its own peer dependency from a different
+      // package tree. Register the copy selected by that validator too.
+      try {
+        const persistence = require.resolve('@deepseek-ai/dsh-session-persistence')
+        registered += await registerSessionCopy(createRequire(persistence), registeredPaths)
+      } catch {
+        // Some minimal profiles do not ship the persistence package.
+      }
+    } catch {
+      // A profile may not expose this package from one of the anchors. The
+      // other anchor can still reach the validator used by the running host.
+    }
+  }
+
+  return registered
+}
+
+async function registerSessionCopy(require: NodeRequire, registeredPaths: Set<string>): Promise<number> {
+  const resolved = require.resolve('@deepseek-ai/dsh-session')
+  const candidates = [resolved]
+  // The DSH development CLI can resolve workspace source through tsx while
+  // the published package resolves lib/. Register both when source exists.
+  const packageRoot = dirname(dirname(resolved))
+  candidates.push(join(packageRoot, 'src', 'index.ts'))
+  candidates.push(join(packageRoot, 'src', 'index.js'))
+  let registered = 0
+  for (const candidate of candidates) {
+    let physical: string
+    try { physical = realpathSync(candidate) } catch { continue }
+    if (registeredPaths.has(physical)) continue
+    registeredPaths.add(physical)
+    try {
+      // DSH publishes ESM builds. Dynamic import also handles a CJS build and
+      // preserves the actual module instance selected by the host anchor.
+      const module = await import(pathToFileURL(physical).href) as KnownEventTypesModule
+      if (module.KNOWN_SESSION_EVENT_TYPES?.add) {
+        module.KNOWN_SESSION_EVENT_TYPES.add(QQCHAT_SESSION_EVENT_TYPE)
+        registered += 1
+      }
+    } catch {
+      // A published package may not ship its source entry; the lib entry above
+      // remains the normal registration target.
+    }
+  }
+  return registered
+}

package/src/session/runtime.ts

@@ -147,6 +147,9 @@ export class QQChatRuntime {
     if (!account) return
     const id = Number(account.id)
     if (this.gateways.has(id)) return
+    // QR binding can replace the secret for an existing account id. Never
+    // carry a token obtained with the previous secret into the new Gateway.
+    this.api.clearToken(id)
     const gateway = new QQGateway(account, this.db, this.api, message => this.onIncoming(message), this.logger)
     this.gateways.set(id, gateway)
     gateway.start()

package/src/shared/augmentations.ts

@@ -28,10 +28,6 @@ declare module '@deepseek-ai/dsh-llm' {
       form: 'notice'
       summary: string
     }
-    'qq-chat-bootstrap': {
-      kind: 'qq-chat-bootstrap'
-      plugin: 'dsh-qqchat'
-    }
   }
 }