fix(knowledge-tools): scope kb_* tools to composer-selected bases too

src/main/ai/runtime/aiSdk/params/__tests__/buildAgentParams.test.ts

@@ -1,10 +1,15 @@
 import type { ProviderOptions } from '@ai-sdk/provider-utils'
+import type { Assistant } from '@shared/data/types/assistant'
 import type { StopCondition, ToolSet } from 'ai'
 import { describe, expect, it } from 'vitest'
 
 import { makeModel } from '../../../../__tests__/fixtures'
 import type { CallOverrides } from '../../../../types/requests'
-import { applyCallOverrides, composeStopWhen } from '../buildAgentParams'
+import { applyCallOverrides, composeStopWhen, resolveKnowledgeBaseIds } from '../buildAgentParams'
+
+function makeAssistant(overrides: Partial<Assistant> = {}): Assistant {
+  return { id: 'assistant-1', knowledgeBaseIds: [], ...overrides } as Assistant
+}
 
 /**
  * Covers the first-class per-request override merge that replaced the old
@@ -99,3 +104,26 @@ describe('composeStopWhen', () => {
     expect(await conditions[0]({ steps: new Array(19) } as never)).toBe(false)
   })
 })
+
+describe('resolveKnowledgeBaseIds', () => {
+  it('falls back to the assistant-bound bases when the request selects none', () => {
+    expect(resolveKnowledgeBaseIds(makeAssistant({ knowledgeBaseIds: ['kb-1'] }), undefined)).toEqual(['kb-1'])
+  })
+
+  it('trusts the request-selected bases when the assistant has no static binding', () => {
+    expect(resolveKnowledgeBaseIds(makeAssistant({ knowledgeBaseIds: [] }), ['kb-2'])).toEqual(['kb-2'])
+    expect(resolveKnowledgeBaseIds(undefined, ['kb-2'])).toEqual(['kb-2'])
+  })
+
+  it('unions assistant-bound and request-selected bases, deduping overlaps', () => {
+    expect(resolveKnowledgeBaseIds(makeAssistant({ knowledgeBaseIds: ['kb-1'] }), ['kb-1', 'kb-2'])).toEqual([
+      'kb-1',
+      'kb-2'
+    ])
+  })
+
+  it('returns an empty array when neither source selects a base', () => {
+    expect(resolveKnowledgeBaseIds(undefined, undefined)).toEqual([])
+    expect(resolveKnowledgeBaseIds(makeAssistant({ knowledgeBaseIds: [] }), undefined)).toEqual([])
+  })
+})

src/main/ai/runtime/aiSdk/params/buildAgentParams.ts

@@ -75,6 +75,7 @@ export async function buildAgentParams(input: BuildAgentParamsInput): Promise<Bu
   applyHttpTrace(sdkConfig, request.chatId, model)
   const fileAttachments = collectFileAttachments(request.messages)
   const hasFileAttachments = fileAttachments.length > 0
+  const knowledgeBaseIds = resolveKnowledgeBaseIds(assistant, request.knowledgeBaseIds)
   const { tools, deferredEntries, mcpToolIds } = canModelConsumeTools(model)
     ? await resolveTools(request, assistant, model, hasFileAttachments)
     : { tools: undefined, deferredEntries: [] as ToolEntry[], mcpToolIds: new Set<string>() }
@@ -89,7 +90,8 @@ export async function buildAgentParams(input: BuildAgentParamsInput): Promise<Bu
     topicId: request.chatId,
     assistant,
     abortSignal: signal,
-    fileAttachments
+    fileAttachments,
+    knowledgeBaseIds
   }
 
   const scope: RequestScope = {
@@ -105,7 +107,8 @@ export async function buildAgentParams(input: BuildAgentParamsInput): Promise<Bu
     aiSdkProviderId,
     requestContext,
     mcpToolIds,
-    hasFileAttachments
+    hasFileAttachments,
+    knowledgeBaseIds
   }
 
   const features = extraFeatures?.length ? [...INTERNAL_FEATURES, ...extraFeatures] : INTERNAL_FEATURES
@@ -218,6 +221,16 @@ function resolveHasAnyKnowledgeBase(): boolean {
   }
 }
 
+/**
+ * Effective knowledge base scope for this request: the assistant's own bound bases, unioned with
+ * whatever the composer's `/` picker selected for this turn. Union (not caller-wins, unlike
+ * `mcpToolIds`) because a per-turn selection is additive on top of the assistant's default scope,
+ * not a replacement for it.
+ */
+export function resolveKnowledgeBaseIds(assistant: Assistant | undefined, requestIds: string[] | undefined): string[] {
+  return Array.from(new Set([...(assistant?.knowledgeBaseIds ?? []), ...(requestIds ?? [])]))
+}
+
 /**
  * Assemble `AgentOptions`: capability-driven providerOptions overlaid with
  * the user's customParameters (split into AI-SDK standard params vs

src/main/ai/streamManager/context/PersistentChatContextProvider.ts

@@ -275,7 +275,14 @@ export class PersistentChatContextProvider implements ChatContextProvider {
       const history = this.buildHistory(userMessage.id)
       const models_ = assistantPlaceholders.map(({ model, placeholder, rootSpan }) => ({
         modelId: model.id,
-        request: this.buildStreamRequest(req.topicId, assistantId, model.id, history, placeholder.id),
+        request: this.buildStreamRequest(
+          req.topicId,
+          assistantId,
+          model.id,
+          history,
+          placeholder.id,
+          req.knowledgeBaseIds
+        ),
         rootSpan
       }))
       // Author the turn span's input attributes here, where the built request payload is available.
@@ -368,7 +375,7 @@ export class PersistentChatContextProvider implements ChatContextProvider {
         models: [
           {
             modelId: model.id,
-            request: this.buildStreamRequest(req.topicId, assistantId, model.id, history, anchor.id),
+            request: this.buildStreamRequest(req.topicId, assistantId, model.id, history, anchor.id, undefined),
             rootSpan
           }
         ],
@@ -438,7 +445,7 @@ export class PersistentChatContextProvider implements ChatContextProvider {
         models: [
           {
             modelId: model.id,
-            request: this.buildStreamRequest(req.topicId, assistantId, model.id, history, placeholder.id),
+            request: this.buildStreamRequest(req.topicId, assistantId, model.id, history, placeholder.id, undefined),
             rootSpan
           }
         ],
@@ -471,15 +478,17 @@ export class PersistentChatContextProvider implements ChatContextProvider {
     assistantId: string | undefined,
     uniqueModelId: UniqueModelId,
     history: CherryUIMessage[],
-    messageId: string
+    messageId: string,
+    knowledgeBaseIds: string[] | undefined
   ): AiStreamRequest {
     return {
       chatId: topicId,
       trigger: 'submit-message',
       assistantId,
       uniqueModelId,
       messages: history,
-      messageId
+      messageId,
+      knowledgeBaseIds
     }
   }
 }

src/main/ai/tools/adapters/aiSdk/builtin/KnowledgeListTool.ts

@@ -10,8 +10,8 @@
  * Both modes live in the shared `knowledgeLookup` core so the Claude Code MCP bridge runs identical
  * logic; this file is just the AI-SDK `tool()` wrapper.
  *
- * Scope: when `assistant.knowledgeBaseIds` is non-empty, only those bases are reachable; when empty,
- * all user bases are.
+ * Scope: when the effective scope (`assistant.knowledgeBaseIds` unioned with the composer's per-turn
+ * selection) is non-empty, only those bases are reachable; when empty, all user bases are.
  */
 
 import {
@@ -45,7 +45,7 @@ const kbListTool = tool({
   strict: true,
   execute: async (input, options) => {
     const { request } = getToolCallContext(options)
-    return listOrOutlineKnowledge(input, request.assistant?.knowledgeBaseIds ?? [])
+    return listOrOutlineKnowledge(input, request.knowledgeBaseIds ?? [])
   },
   toModelOutput: ({ input, output }) => knowledgeListModelOutput(output, input)
 })
@@ -58,9 +58,9 @@ export function createKbListToolEntry(): ToolEntry {
     defer: 'never',
     tool: kbListTool,
     // Discovery entry point, always inlined (defer: 'never') — but gated identically to kb_search /
-    // kb_read / kb_manage: a base must exist AND be bound to this assistant. Listing every base while
-    // none are bound (no kb_read / kb_search to act on them) is a discovery dead-end and widens the
-    // per-assistant scope, so kb_list shares the siblings' gate.
-    applies: (scope) => scope.hasAnyKnowledgeBase === true && (scope.assistant?.knowledgeBaseIds?.length ?? 0) > 0
+    // kb_read / kb_manage: a base must exist AND be in scope (bound to this assistant, or selected
+    // this turn). Listing every base while none are in scope (no kb_read / kb_search to act on them)
+    // is a discovery dead-end and widens the scope, so kb_list shares the siblings' gate.
+    applies: (scope) => scope.hasAnyKnowledgeBase === true && (scope.knowledgeBaseIds?.length ?? 0) > 0
   }
 }

src/main/ai/tools/adapters/aiSdk/builtin/KnowledgeManageTool.ts

@@ -2,8 +2,9 @@
  * Knowledge base write tool — the destructive companion to the read tools.
  *
  * One tool with an `action`: add a new source (file / url / note), or delete /
- * re-index existing documents addressed by their Concept ID. Per-request
- * `assistant.knowledgeBaseIds` flows in via RequestContext and scopes which bases
+ * re-index existing documents addressed by their Concept ID. The effective knowledge
+ * base scope (`assistant.knowledgeBaseIds` unioned with the composer's per-turn
+ * selection) flows in via `RequestContext.knowledgeBaseIds` and scopes which bases
  * are reachable. Every action mutates the base, so the tool is approval-gated
  * (`needsApproval: true`) — Cherry surfaces the approval card before it runs. The
  * mutation itself lives in the shared `knowledgeLookup` core so the Claude Code
@@ -43,7 +44,7 @@ const kbManageTool = tool({
   needsApproval: true,
   execute: async (input, options) => {
     const { request } = getToolCallContext(options)
-    return manageKnowledge(input, request.assistant?.knowledgeBaseIds ?? [])
+    return manageKnowledge(input, request.knowledgeBaseIds ?? [])
   },
   toModelOutput: ({ output }) => knowledgeManageModelOutput(output)
 })
@@ -55,7 +56,7 @@ export function createKbManageToolEntry(): ToolEntry {
     description: 'Add, delete, or re-index documents in a knowledge base (requires approval)',
     defer: 'never',
     tool: kbManageTool,
-    applies: (scope) => scope.hasAnyKnowledgeBase === true && (scope.assistant?.knowledgeBaseIds?.length ?? 0) > 0
+    applies: (scope) => scope.hasAnyKnowledgeBase === true && (scope.knowledgeBaseIds?.length ?? 0) > 0
   }
 }
 

src/main/ai/tools/adapters/aiSdk/builtin/KnowledgeReadTool.ts

@@ -8,7 +8,8 @@
  *     match's line, offsets, and snippet — for a precise lookup when semantic search is too fuzzy.
  *
  * The model passes a `conceptId` + `baseId` from a `kb_search` hit (or a `kb_list` outline).
- * Per-request `assistant.knowledgeBaseIds` flows in via RequestContext and scopes which bases are
+ * The effective knowledge base scope (`assistant.knowledgeBaseIds` unioned with the composer's
+ * per-turn selection) flows in via `RequestContext.knowledgeBaseIds` and scopes which bases are
  * reachable. Both modes live in the shared `knowledgeLookup` core so the Claude Code MCP bridge runs
  * identical logic; this file is just the AI-SDK `tool()` wrapper.
  */
@@ -39,7 +40,7 @@ const kbReadTool = tool({
   strict: true,
   execute: async (input, options) => {
     const { request } = getToolCallContext(options)
-    return readOrGrepConcept(input, request.assistant?.knowledgeBaseIds ?? [])
+    return readOrGrepConcept(input, request.knowledgeBaseIds ?? [])
   },
   toModelOutput: ({ output }) => knowledgeReadModelOutput(output)
 })
@@ -51,7 +52,7 @@ export function createKbReadToolEntry(): ToolEntry {
     description: 'Read a knowledge base document by its Concept ID, or grep within it',
     defer: 'always',
     tool: kbReadTool,
-    applies: (scope) => scope.hasAnyKnowledgeBase === true && (scope.assistant?.knowledgeBaseIds?.length ?? 0) > 0
+    applies: (scope) => scope.hasAnyKnowledgeBase === true && (scope.knowledgeBaseIds?.length ?? 0) > 0
   }
 }
 

src/main/ai/tools/adapters/aiSdk/builtin/KnowledgeSearchTool.ts

@@ -2,10 +2,10 @@
  * Knowledge base search tool — agentic.
  *
  * The model picks the query and target `baseIds` (typically after `kb_list`).
- * Per-request `assistant.knowledgeBaseIds` flows in via RequestContext and
- * scopes which base IDs are accepted. The search itself lives in the shared
- * `knowledgeLookup` core so the Claude Code MCP bridge runs identical logic;
- * this file is just the AI-SDK `tool()` wrapper.
+ * The effective knowledge base scope (`assistant.knowledgeBaseIds` unioned with the composer's
+ * per-turn selection) flows in via `RequestContext.knowledgeBaseIds` and scopes which base IDs are
+ * accepted. The search itself lives in the shared `knowledgeLookup` core so the Claude Code MCP
+ * bridge runs identical logic; this file is just the AI-SDK `tool()` wrapper.
  */
 
 import { KB_SEARCH_TOOL_NAME, kbSearchInputSchema, kbSearchOutputSchema } from '@shared/ai/builtinTools'
@@ -33,7 +33,7 @@ const kbSearchTool = tool({
   strict: true,
   execute: async ({ query, baseIds }, options) => {
     const { request } = getToolCallContext(options)
-    return searchKnowledge(query, baseIds, request.assistant?.knowledgeBaseIds ?? [])
+    return searchKnowledge(query, baseIds, request.knowledgeBaseIds ?? [])
   },
   toModelOutput: ({ output }) => knowledgeSearchModelOutput(output)
 })
@@ -45,7 +45,7 @@ export function createKbSearchToolEntry(): ToolEntry {
     description: "Search the user's private knowledge base",
     defer: 'always',
     tool: kbSearchTool,
-    applies: (scope) => scope.hasAnyKnowledgeBase === true && (scope.assistant?.knowledgeBaseIds?.length ?? 0) > 0
+    applies: (scope) => scope.hasAnyKnowledgeBase === true && (scope.knowledgeBaseIds?.length ?? 0) > 0
   }
 }