dsh-qqchat 0.2.0 → 0.2.2

package/lib/session/agent-bridge.d.ts

@@ -1,8 +1,10 @@
 import type { Context } from '@deepseek-ai/cordis';
+import type { Session, SessionEvent } from '@deepseek-ai/dsh-session';
 import '../shared/augmentations.js';
 import type { QQChatDatabase } from '../storage/db.js';
 import type { MemoryEngine } from '../storage/memory.js';
 import type { ChatType, GroupRow, LoggerLike, MemberRow, StoredAttachmentSummary, QQChatConfig, QQChatDisplayEvent, QQNormalizedMessage } from '../types.js';
+export declare function resolveQQSessionPreset(header: Session['header'], events: readonly SessionEvent[]): string | undefined;
 export declare class DshQQBridge {
     private readonly ctx;
     private readonly db;
@@ -21,7 +23,6 @@ export declare class DshQQBridge {
     private readonly memorySnapshots;
     private readonly disposeEvent;
     private readonly disposeToolGate;
-    private readonly disposeBootstrapGate;
     private readonly disposeCommands;
     private readonly disposeImageTool;
     private readonly disposeMediaTools;
@@ -36,7 +37,6 @@ export declare class DshQQBridge {
     private ensureAgent;
     private isArchived;
     private rememberRoute;
-    private ensureVisible;
     private appendDisplayIfMissing;
     private appendOwnerMessageIfMissing;
     private ensureTitle;
@@ -50,7 +50,9 @@ export declare class DshQQBridge {
     private commandHelp;
     private registerCommands;
     private modelCommand;
+    private presetCommand;
     private statusCommand;
     private composition;
+    private persistedPreset;
     private serial;
 }

package/lib/session/agent-bridge.js

@@ -1,15 +1,19 @@
 import { randomUUID } from 'node:crypto';
 import { createRequire } from 'node:module';
 import { installModelSelection } from '@deepseek-ai/dsh-agent';
+import { resolveSessionPreset } from '@deepseek-ai/dsh-agent-presets';
 import { createUserMessage } from '@deepseek-ai/dsh-llm';
 import { SessionId } from '@deepseek-ai/dsh-session';
 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 { MEMORY_SNAPSHOT_TTL_MS, memorySnapshotHash, restoreMemorySnapshotState, shouldRefreshMemorySnapshot } from './memory-snapshot.js';
 const DSH_RUNTIME_CONTEXT_SOURCE = '@deepseek-ai/dsh-system-prompt';
+export function resolveQQSessionPreset(header, events) {
+    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');
 const PLUGIN_VERSION = packageMetadata.version || 'unknown';
@@ -31,7 +35,6 @@ export class DshQQBridge {
     memorySnapshots = new Map();
     disposeEvent;
     disposeToolGate;
-    disposeBootstrapGate;
     disposeCommands;
     disposeImageTool;
     disposeMediaTools;
@@ -42,11 +45,6 @@ export class DshQQBridge {
         this.config = config;
         this.logger = logger;
         this.disposeEvent = ctx.on('session/event', (session, event) => this.onSessionEvent(session, event));
-        this.disposeBootstrapGate = ctx.on('agent/pre-step', async ({ messages }, next) => {
-            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) => {
             const agent = exec.agent;
             if (!agent)
@@ -75,7 +73,6 @@ export class DshQQBridge {
     }
     async dispose() {
         this.disposeEvent();
-        this.disposeBootstrapGate();
         this.disposeToolGate();
         this.disposeImageTool();
         this.disposeMediaTools();
@@ -131,6 +128,17 @@ export class DshQQBridge {
                 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)))
@@ -273,7 +281,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);
@@ -281,7 +288,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 };
             }
         }
@@ -300,7 +306,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 };
     }
     isArchived(sessionId) {
@@ -317,16 +322,10 @@ export class DshQQBridge {
         else
             this.memory.setMemberRoute(Number(row.id), provider, model, sessionId);
     }
-    async ensureVisible(agent) {
-        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();
-    }
     appendDisplayIfMissing(session, event) {
         if (session.events.some(item => item.type === 'qqchat/message' && item.data.messageId === event.messageId))
             return;
-        session.append('qqchat/message', displayEventPayload(event));
+        session.append('qqchat/message', displayEventPayload(event), { ignorable: true });
     }
     appendOwnerMessageIfMissing(session, event) {
         if (session.events.some(item => {
@@ -363,7 +362,7 @@ export class DshQQBridge {
     }
     async tryResume(sessionId) {
         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();
@@ -451,7 +450,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 工具',
@@ -468,6 +467,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, invocation.rawInput.trim()), 'preset'),
             register('qqstop', '中止当前生成', invocation => {
                 if (invocation.agent.status !== 'running')
                     return { kind: 'success', text: '当前没有进行中的生成。' };
@@ -512,6 +512,31 @@ export class DshQQBridge {
         this.routes.set(String(agent.id), { provider, model });
         return { kind: 'success', text: `模型已切换：${provider}/${model}\n对话上下文保留，下一轮生效。` };
     }
+    async presetCommand(agent, requested) {
+        const getService = this.ctx.get;
+        const presets = getService?.call(this.ctx, 'agentPresets');
+        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}` };
+        }
+    }
     statusCommand(agent) {
         const current = this.selection(agent)?.current;
         const messages = agent.session.events.filter(event => event.type === 'user/message' || event.type === 'assistant/message').length;
@@ -521,14 +546,41 @@ export class DshQQBridge {
             text: ['📊 Session 状态', `Session：${String(agent.id)}`, `状态：${agent.status === 'running' ? '生成中' : '空闲'}`, `模型：${current ? `${current.provider}/${current.model}` : '未知'}`, `消息数：${messages}`, `最后事件：${last?.type || '无'}`].join('\n'),
         };
     }
-    async composition() {
+    async composition(sessionId) {
         const getService = this.ctx.get;
         const presets = getService?.call(this.ctx, 'agentPresets');
         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;
+        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); } };
     }
+    async persistedPreset(sessionId) {
+        const getService = this.ctx.get;
+        const persistence = getService?.call(this.ctx, 'sessionPersistence');
+        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;
+        }
+    }
     serial(key, task) {
         const previous = this.locks.get(key) || Promise.resolve();
         const current = previous.catch(() => undefined).then(task);

package/lib/session/runtime.d.ts

@@ -32,6 +32,7 @@ export declare class QQChatRuntime {
     readAttachment(sessionId: string, attachmentId: string): Promise<Record<string, unknown>>;
     startGateway(account: AccountRow | undefined): void;
     restartGateway(accountId: number): Promise<void>;
+    connectManual(appId: string, appSecret: string, sandbox?: boolean): Promise<AccountRow>;
     private onIncoming;
     private chatRow;
     private flushOutbox;

package/lib/session/runtime.js

@@ -163,6 +163,9 @@ export class QQChatRuntime {
         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();
@@ -176,6 +179,29 @@ export class QQChatRuntime {
         if (account?.enabled)
             this.startGateway(account);
     }
+    async connectManual(appId, appSecret, sandbox = this.config.sandbox) {
+        const normalizedAppId = appId.trim();
+        const normalizedSecret = appSecret.trim();
+        if (!normalizedAppId || !normalizedSecret)
+            throw new Error('AppID 和 AppSecret 不能为空');
+        if (normalizedAppId.length > 256 || normalizedSecret.length > 512)
+            throw new Error('QQ Bot 凭据长度无效');
+        const existing = this.db.accountByAppId(normalizedAppId);
+        const candidate = {
+            ...(existing || { id: 0, bot_user_id: null, enabled: 1, gateway_status: 'offline', gateway_last_error: null, created_at: 0, updated_at: 0 }),
+            app_id: normalizedAppId, app_secret: normalizedSecret, sandbox: sandbox ? 1 : 0,
+        };
+        this.api.clearToken(Number(candidate.id));
+        try {
+            await this.api.gatewayUrl(candidate);
+        }
+        catch {
+            throw new Error('QQ Bot 凭据验证失败，请检查 AppID、AppSecret 和沙箱环境设置');
+        }
+        const account = this.db.upsertAccount(normalizedAppId, normalizedSecret, sandbox);
+        await this.restartGateway(Number(account.id));
+        return account;
+    }
     async onIncoming(message) {
         const account = this.db.accountById(message.accountId);
         if (!account || !account.enabled)

package/lib/shared/augmentations.d.ts

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

package/lib/transport/rpc.js

@@ -27,6 +27,11 @@ export function createQQChatRpc(runtime) {
                     }
                     return ok(result);
                 }
+                case 'account/manual-connect': {
+                    const record = asRecord(payload);
+                    const account = await runtime.connectManual(requireString(payload, 'appId'), requireString(payload, 'appSecret'), record?.sandbox === true);
+                    return ok({ account: publicAccount(account) });
+                }
                 case 'account/reconnect': {
                     const id = requireNumber(payload, 'accountId');
                     runtime.db.setAccountEnabled(id, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-qqchat",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "DeepSeek Harness 的 QQ 私聊/群聊插件，支持扫码授权、原生 Session、群记忆与工具权限。",
   "type": "module",
   "license": "MIT",
@@ -47,6 +47,7 @@
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-agent": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-agent-presets": "^0.1.0-rc.8",
     "@deepseek-ai/dsh-commands": "^0.1.0-rc.8",
     "@deepseek-ai/dsh-client-connection": "^0.1.0-rc.8",
     "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.8",
@@ -73,6 +74,7 @@
   },
   "devDependencies": {
     "@deepseek-ai/dsh-agent-default-model": "^0.1.0-rc.8",
+    "@deepseek-ai/dsh-agent-presets": "^0.1.0-rc.8",
     "@deepseek-ai/dsh-commands": "^0.1.0-rc.8",
     "@deepseek-ai/dsh-client-connection": "^0.1.0-rc.8",
     "@types/node": "^22.18.0",

package/src/gateway/api.ts

@@ -75,12 +75,16 @@ export class QQApiClient {
     return data.access_token
   }
 
-  async gatewayUrl(account: AccountRow): Promise<string> {
+  async gatewayUrl(account: AccountRow, retry = true): Promise<string> {
     const token = await this.token(account)
     const base = account.sandbox ? SANDBOX_API_BASE : API_BASE
     const response = await fetch(`${base}/gateway`, {
       headers: { Authorization: `QQBot ${token}` }, signal: AbortSignal.timeout(15_000),
     })
+    if (response.status === 401 && retry) {
+      this.clearToken(account.id)
+      return this.gatewayUrl(account, false)
+    }
     const data = await safeJson<QQGatewayPayload>(response)
     if (!response.ok || !data?.url) throw new Error(`QQ gateway 获取失败: HTTP ${response.status}`)
     return data.url

package/src/gateway/gateway.ts

@@ -71,7 +71,11 @@ export class QQGateway {
   }
 
   private async connectOnce(): Promise<void> {
-    const [url, token] = await Promise.all([this.api.gatewayUrl(this.account), this.api.token(this.account)])
+    // Resolve the URL first. gatewayUrl may invalidate and refresh a stale
+    // cached token after a 401; fetching the identify token in parallel could
+    // otherwise retain the pre-refresh token for the WebSocket handshake.
+    const url = await this.api.gatewayUrl(this.account)
+    const token = await this.api.token(this.account)
     await new Promise<void>((resolve, reject) => {
       const ws = new WebSocket(url)
       this.ws = ws

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()
@@ -149,6 +149,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)
@@ -286,7 +296,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 +303,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 +322,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,15 +338,9 @@ 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
-    session.append('qqchat/message', displayEventPayload(event))
+    session.append('qqchat/message', displayEventPayload(event), { ignorable: true })
   }
 
   private appendOwnerMessageIfMissing(session: Session, event: QQChatDisplayEvent): void {
@@ -375,7 +376,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()
@@ -458,7 +459,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 +478,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 +521,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 +555,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)

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()
@@ -160,6 +163,27 @@ export class QQChatRuntime {
     if (account?.enabled) this.startGateway(account)
   }
 
+  async connectManual(appId: string, appSecret: string, sandbox = this.config.sandbox): Promise<AccountRow> {
+    const normalizedAppId = appId.trim()
+    const normalizedSecret = appSecret.trim()
+    if (!normalizedAppId || !normalizedSecret) throw new Error('AppID 和 AppSecret 不能为空')
+    if (normalizedAppId.length > 256 || normalizedSecret.length > 512) throw new Error('QQ Bot 凭据长度无效')
+    const existing = this.db.accountByAppId(normalizedAppId)
+    const candidate = {
+      ...(existing || { id: 0, bot_user_id: null, enabled: 1 as const, gateway_status: 'offline' as const, gateway_last_error: null, created_at: 0, updated_at: 0 }),
+      app_id: normalizedAppId, app_secret: normalizedSecret, sandbox: sandbox ? 1 as const : 0 as const,
+    }
+    this.api.clearToken(Number(candidate.id))
+    try {
+      await this.api.gatewayUrl(candidate)
+    } catch {
+      throw new Error('QQ Bot 凭据验证失败，请检查 AppID、AppSecret 和沙箱环境设置')
+    }
+    const account = this.db.upsertAccount(normalizedAppId, normalizedSecret, sandbox)
+    await this.restartGateway(Number(account.id))
+    return account
+  }
+
   private async onIncoming(message: QQNormalizedMessage): Promise<void> {
     const account = this.db.accountById(message.accountId)
     if (!account || !account.enabled) return

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'
-    }
   }
 }