chore: 2.6.11

prompt() 在调用 submitMessage 前没有 switchSession，recordTranscript
依赖全局 getSessionId() 确定写入路径，多会话场景下新会话内容会覆盖旧会话。

package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-best",
-  "version": "2.6.9",
+  "version": "2.6.11",
   "description": "Reverse-engineered Anthropic Claude Code CLI — interactive AI coding assistant in the terminal",
   "type": "module",
   "author": "claude-code-best <claude-code-best@proton.me>",

src/services/acp/__tests__/agent.test.ts

@@ -1226,19 +1226,20 @@ describe('AcpAgent', () => {
       )
     })
 
-    test('prompt does not trigger additional switchSession for multi-session', async () => {
+    test('prompt switches global sessionId to the correct session', async () => {
       const agent = new AcpAgent(makeConn())
       await agent.newSession({ cwd: '/tmp' } as any)
       await agent.newSession({ cwd: '/tmp' } as any)
       mockSwitchSession.mockClear()
 
-      // Prompts should not call switchSession — alignment happens at session creation
+      // Prompts must switch global state so recordTranscript writes to
+      // the correct session file in multi-session scenarios.
       const s1 = agent.sessions.keys().next().value
       await agent.prompt({
         sessionId: s1,
         prompt: [{ type: 'text', text: 'hello' }],
       } as any)
-      expect(mockSwitchSession).not.toHaveBeenCalled()
+      expect(mockSwitchSession).toHaveBeenCalledWith(s1, null)
     })
   })
 })

src/services/acp/agent.ts

@@ -54,6 +54,7 @@ import { getEmptyToolPermissionContext } from '../../Tool.js'
 import type { PermissionMode } from '../../types/permissions.js'
 import type { Command } from '../../types/command.js'
 import { getCommands } from '../../commands.js'
+import { getAgentDefinitionsWithOverrides } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import {
   setOriginalCwd,
   switchSession,
@@ -299,6 +300,10 @@ export class AcpAgent implements Agent {
       // After a previous interrupt(), the internal controller is stuck in
       // aborted state — without this, submitMessage() fails immediately.
       session.queryEngine.resetAbortController()
+      // Switch global session state so recordTranscript writes to the correct
+      // session file. Without this, multi-session scenarios (or creating a new
+      // session after another) write transcript data to the wrong file.
+      switchSession(params.sessionId as SessionId, getSessionProjectDir())
 
       const sdkMessages = session.queryEngine.submitMessage(promptInput)
 
@@ -549,8 +554,14 @@ export class AcpAgent implements Agent {
         },
       }
 
-      // Load commands for slash command and skill support
-      const commands = await getCommands(cwd)
+      // Load commands and agent definitions for subagent support
+      const [commands, agentDefinitionsResult] = await Promise.all([
+        getCommands(cwd),
+        getAgentDefinitionsWithOverrides(cwd),
+      ])
+
+      // Inject agent definitions into appState
+      appState.agentDefinitions = agentDefinitionsResult
 
       // Build QueryEngine config
       const engineConfig: QueryEngineConfig = {
@@ -558,7 +569,7 @@ export class AcpAgent implements Agent {
         tools,
         commands,
         mcpClients: [],
-        agents: [],
+        agents: agentDefinitionsResult.activeAgents,
         canUseTool,
         getAppState: () => appState,
         setAppState: (updater: (prev: AppState) => AppState) => {

src/services/acp/bridge.ts

@@ -633,6 +633,7 @@ export async function forwardSessionUpdates(
   let lastAssistantTotalUsage: number | null = null
   let lastAssistantModel: string | null = null
   let lastContextWindowSize = 200000
+  let streamingActive = false
 
   try {
     while (!abortSignal.aborted) {
@@ -788,6 +789,7 @@ export async function forwardSessionUpdates(
           for (const notification of notifications) {
             await conn.sessionUpdate(notification)
           }
+          streamingActive = true
           break
         }
 
@@ -827,6 +829,8 @@ export async function forwardSessionUpdates(
             {
               clientCapabilities,
               cwd,
+              parentToolUseId,
+              streamingActive,
             },
           )
           for (const notification of notifications) {
@@ -942,6 +946,7 @@ function assistantMessageToAcpNotifications(
     clientCapabilities?: ClientCapabilities
     parentToolUseId?: string | null
     cwd?: string
+    streamingActive?: boolean
   },
 ): SessionNotification[] {
   const message = msg.message as Record<string, unknown> | undefined
@@ -966,8 +971,20 @@ function assistantMessageToAcpNotifications(
     ]
   }
 
+  // When streaming is active, text/thinking were already sent via stream_event
+  // messages. Filter them out to avoid duplicate agent_message_chunk /
+  // agent_thought_chunk notifications. String content (synthetic messages)
+  // is unaffected — those have no corresponding stream_events.
+  const contentToProcess = options?.streamingActive
+    ? content.filter(
+        block => block.type !== 'text' && block.type !== 'thinking',
+      )
+    : content
+
+  if (contentToProcess.length === 0) return []
+
   return toAcpNotifications(
-    content,
+    contentToProcess,
     'assistant',
     sessionId,
     toolUseCache,
@@ -987,6 +1004,7 @@ function streamEventToAcpNotifications(
   options?: {
     clientCapabilities?: ClientCapabilities
     cwd?: string
+    streamingActive?: boolean
   },
 ): SessionNotification[] {
   const event = (msg as unknown as { event: Record<string, unknown> }).event
@@ -1055,6 +1073,7 @@ function toAcpNotifications(
     clientCapabilities?: ClientCapabilities
     parentToolUseId?: string | null
     cwd?: string
+    streamingActive?: boolean
   },
 ): SessionNotification[] {
   const output: SessionNotification[] = []