@xmanrui/dsh-im 4.19.1 → 4.20.0

package/src/channels/qq/qq-menu.mjs

@@ -55,7 +55,8 @@ export class QqMenuStore {
     const entry = this.#entries.get(this.#key(route, actor));
     if (!entry || entry.used || !entry.view || entry.expiresAt <= this.#now()
       || (token && token !== entry.token)) return { error: t('这个菜单已过期，请回复 /m 重新打开。') };
-    if (entry.workspace !== context.workspace || entry.sessionId !== context.sessionId) {
+    if (entry.workspace !== context.workspace || entry.sessionWorkspace !== context.sessionWorkspace
+      || entry.sessionId !== context.sessionId) {
       entry.used = true;
       return { error: t('会话或工作区已变化，请重新发送 /m。') };
     }
@@ -80,13 +81,15 @@ export function qqMenuPage(list, requestedPage = 0) {
     list.choices.length ? '' : t('暂无可用选项。')].filter(Boolean).join('\n'), entries, columns: 2 };
 }
 
-async function catalogFor(harness, sessionId, options) {
-  const session = sessionId ? harness.workspaceSession?.(sessionId) : null;
+async function catalogFor(harness, sessionId, key, options) {
+  const session = sessionId ? harness.workspaceSession?.(sessionId, key) : null;
   return typeof session?.models === 'function' ? session.models(options) : harness.listModels(options);
 }
 
 export async function qqMenuView(name, harness, state, key, { signal, busy = false } = {}) {
   const workspace = harness.currentWorkspace?.();
+  const sessionWorkspace = typeof harness.currentConversationWorkspace === 'function'
+    ? harness.currentConversationWorkspace(key) : workspace;
   const sessionId = state.sessionFor(key);
   const options = { signal };
   const archived = state.includesArchivedSessions?.() === true;
@@ -94,8 +97,8 @@ export async function qqMenuView(name, harness, state, key, { signal, busy = fal
   if (name === 'main' || name === 'status') {
     if (name === 'status') await harness.ensureRunning(options);
     const results = await Promise.allSettled([
-      harness.listWorkspaceSessions?.(workspace, options),
-      catalogFor(harness, sessionId, options),
+      harness.listWorkspaceSessions?.(name === 'main' ? sessionWorkspace : workspace, options),
+      catalogFor(harness, sessionId, key, options),
       harness.agentPresetSettings?.(options),
     ]);
     signal?.throwIfAborted();
@@ -125,8 +128,8 @@ export async function qqMenuView(name, harness, state, key, { signal, busy = fal
       ] };
   }
   if (name === 'sessions') {
-    const listed = await harness.listWorkspaceSessions(workspace, options);
-    return qqMenuPage({ title: t('📋 会话列表'), detail: clean(workspace), choices: visibleSessions(listed).map((item) =>
+    const listed = await harness.listWorkspaceSessions(sessionWorkspace, options);
+    return qqMenuPage({ title: t('📋 会话列表'), detail: clean(sessionWorkspace), choices: visibleSessions(listed).map((item) =>
       command(`${item.sessionId === sessionId ? '✓ ' : ''}${clean(item.title || item.sessionId, 70)}${item.archived ? t('（已归档）') : ''}`, `/session ${item.sessionId}`)) });
   }
   if (name === 'workspaces') {
@@ -135,7 +138,7 @@ export async function qqMenuView(name, harness, state, key, { signal, busy = fal
       command(`${path === workspace ? '✓ ' : ''}${clean(path)}`, `/workspace ${path}`)) });
   }
   if (name === 'models') {
-    const catalog = await catalogFor(harness, sessionId, options);
+    const catalog = await catalogFor(harness, sessionId, key, options);
     return qqMenuPage({ title: t('🧠 模型'), detail: catalog.failures?.length ? t('部分模型暂不可用，可稍后重试。') : '',
       choices: catalog.groups.flatMap((group) => group.models.map((model) => command(
         `${catalog.current?.provider === group.id && catalog.current?.model === model.id ? '✓ ' : ''}${clean(group.name, 30)} · ${clean(model.name, 60)}`,