diff options
Diffstat (limited to 'packages/api')
| -rw-r--r-- | packages/api/src/agent-manager.ts | 18 | ||||
| -rw-r--r-- | packages/api/tests/agent-manager.test.ts | 29 | ||||
| -rw-r--r-- | packages/api/tests/routes.test.ts | 8 |
3 files changed, 54 insertions, 1 deletions
diff --git a/packages/api/src/agent-manager.ts b/packages/api/src/agent-manager.ts index 85dd160..48b869e 100644 --- a/packages/api/src/agent-manager.ts +++ b/packages/api/src/agent-manager.ts @@ -19,6 +19,7 @@ import { createReadTabTool, createRetrieveTool, createRunShellTool, + createSearchCodeTool, createSendToTabTool, createSkillsWatcher, createSummonTool, @@ -75,6 +76,8 @@ const TOOL_DESCRIPTIONS: Record<string, string> = { write_file: "Write content to a file (creates parent directories if needed)", run_shell: "Execute shell commands in the working directory (bash). Returns stdout, stderr, and exit code. Set background=true to run in the background and get a job_id for later retrieval. Do NOT run destructive or irreversible commands unless the user explicitly requests them.", + search_code: + "Search the codebase by query using the 'cs' code search engine (relevance-ranked, structure-aware). Returns the most relevant files first with matching snippets and line numbers. Better than grep/find for exploratory 'where is X / how does Y work' searches; use run_shell with rg for exhaustive exact-match lists.", todo: "Create/maintain a todo list to plan and track work. Declarative whole-list write: send the entire list in `todos` each call (it replaces the previous list). Statuses: pending, in_progress, completed, cancelled.", summon: "Spawn a child agent to work on a task independently. By default blocks until the child finishes. Set background=true to return immediately with an agent_id for later retrieval.", @@ -403,9 +406,10 @@ export class AgentManager { const permSendToTab = getSetting("perm_send_to_tab") === "allow"; const permReadTab = getSetting("perm_read_tab") === "allow"; const permWebSearch = getSetting("perm_web_search") === "allow"; + const permSearchCode = getSetting("perm_search_code") === "allow"; const permYoutubeTranscribe = getSetting("perm_youtube_transcribe") === "allow"; const sysPrompt = getSetting("system_prompt") ?? ""; - const permKey = `${permRead}:${permEdit}:${permBash}:${permSummon}:${permUserAgent}:${permSendToTab}:${permReadTab}:${permWebSearch}:${permYoutubeTranscribe}:${sysPrompt}`; + const permKey = `${permRead}:${permEdit}:${permBash}:${permSummon}:${permUserAgent}:${permSendToTab}:${permReadTab}:${permWebSearch}:${permYoutubeTranscribe}:${permSearchCode}:${sysPrompt}`; // If the override differs or permissions changed, invalidate the cached agent if ( @@ -479,6 +483,12 @@ export class AgentManager { tool: createRunShellTool(workingDirectory, tabAgent.shellStore), }); } + if (allowed.has("search_code")) { + toolEntries.push({ + name: "search_code", + tool: createSearchCodeTool(workingDirectory), + }); + } if (allowed.has("web_search")) { toolEntries.push({ name: "web_search", tool: createWebSearchTool() }); } @@ -565,6 +575,12 @@ export class AgentManager { tool: createRunShellTool(workingDirectory, tabAgent.shellStore), }); } + if (permSearchCode) { + toolEntries.push({ + name: "search_code", + tool: createSearchCodeTool(workingDirectory), + }); + } if (permWebSearch) { toolEntries.push({ name: "web_search", tool: createWebSearchTool() }); } diff --git a/packages/api/tests/agent-manager.test.ts b/packages/api/tests/agent-manager.test.ts index 014022a..970ac1d 100644 --- a/packages/api/tests/agent-manager.test.ts +++ b/packages/api/tests/agent-manager.test.ts @@ -419,6 +419,14 @@ vi.mock("@dispatch/core", () => ({ execute: async () => "mock", }; }, + createSearchCodeTool(_wd: string) { + return { + name: "search_code", + description: "search code", + parameters: { _type: "z.ZodObject", shape: {} }, + execute: async () => "mock", + }; + }, createYoutubeTranscribeTool() { return { name: "youtube_transcribe", @@ -1441,6 +1449,27 @@ describe("AgentManager", () => { }); }); + describe("search_code permission gating", () => { + // Reuses the parent-path tool construction to confirm the perm flag wires + // the search_code tool on/off correctly. + async function toolsForPerms(tabId: string, perms: Record<string, string>): Promise<string[]> { + for (const [k, v] of Object.entries(perms)) setFakeSetting(k, v); + const manager = new AgentManager(); + await manager.processMessage(tabId, "go"); + return constructedAgents.at(-1)?.toolNames ?? []; + } + + it("grants search_code when perm_search_code is allowed", async () => { + const tools = await toolsForPerms("tab-cs-on", { perm_search_code: "allow" }); + expect(tools).toContain("search_code"); + }); + + it("omits search_code when perm_search_code is not allowed", async () => { + const tools = await toolsForPerms("tab-cs-off", {}); + expect(tools).not.toContain("search_code"); + }); + }); + // ─── Usage side-channel persistence ────────────────────────────── // // `usage` AgentEvents (one per LLM round-trip) are persisted as invisible diff --git a/packages/api/tests/routes.test.ts b/packages/api/tests/routes.test.ts index a8db5ce..c85d43d 100644 --- a/packages/api/tests/routes.test.ts +++ b/packages/api/tests/routes.test.ts @@ -283,6 +283,14 @@ vi.mock("@dispatch/core", () => ({ execute: async () => "mock", }; }, + createSearchCodeTool(_wd: string) { + return { + name: "search_code", + description: "search code", + parameters: { _type: "z.ZodObject", shape: {} }, + execute: async () => "mock", + }; + }, createYoutubeTranscribeTool() { return { name: "youtube_transcribe", |