Spread skill tools across build, docs, review, and orchestrator surfaces

Author: TheGreatAxios

src/agent/directors/tool-sets.test.ts

@@ -7,6 +7,7 @@ import {
   READ_TOOLS,
   REVIEW_TOOLS,
   INTERN_TOOLS,
+  SKILL_TOOLS,
   SKYWALKER_TOOLS,
 } from "./tool-sets.js";
 
@@ -92,7 +93,8 @@ describe("SKYWALKER_TOOLS / ORCHESTRATOR_TOOLS", () => {
     );
   });
 
-  test("skill_search + use_skill mount on every worker surface", () => {
+  test("skill_search + use_skill mount on every worker surface, never ask_operator", () => {
+    expect([...SKILL_TOOLS]).toEqual(["skill_search", "use_skill"]);
     for (const surface of [
       READ_TOOLS,
       BUILD_TOOLS,
@@ -104,6 +106,7 @@ describe("SKYWALKER_TOOLS / ORCHESTRATOR_TOOLS", () => {
     ] as const) {
       expect(surface as readonly string[]).toContain("skill_search");
       expect(surface as readonly string[]).toContain("use_skill");
+      expect(surface as readonly string[]).not.toContain("ask_operator");
     }
   });
 });

src/agent/directors/tool-sets.ts

@@ -1,18 +1,14 @@
 // Small, explicit tool allowlists for director packages.
 // Prefer tools.allow at mount (CapabilityFilter include) over huge deny lists.
 // manage_tasks is always mounted by runSubAgent after the filter — omit it here.
-// skill_search + use_skill mount on every worker through runSubAgent (scoped to
-// the dispatch's optionalSkills); they ride the allowlists below so the
-// capability filter keeps them. ask_operator stays primary-only.
+// skill_search + use_skill mount on every worker, scoped at mount to the
+// dispatch's optionalSkills. ask_operator stays primary-session-only: workers
+// never mount it (Do not #1).
 
-/**
- * Skill discovery/loading, mounted on every worker surface (read/build/docs/
- * review/intern/orchestrator). runSubAgent scopes both tools to the
- * dispatch's optionalSkills before the capability filter.
- */
+/** Skill discovery + loading — mounted on every worker surface below. */
 export const SKILL_TOOLS = ["skill_search", "use_skill"] as const;
 
-/** Read/search/shell — no product mutation. */
+/** Read/search/shell + skill tools — no product mutation. */
 export const READ_TOOLS = [
   "read_file",
   "grep",
@@ -46,6 +42,7 @@ export const PRODUCT_WRITE_TOOLS = [
 export const BUILD_TOOLS = [
   ...READ_TOOLS,
   ...PRODUCT_WRITE_TOOLS,
+  ...SKILL_TOOLS,
   "apply_patch",
   "shell",
   "update_plan",
@@ -65,12 +62,17 @@ export const BUILD_TOOLS = [
 export const DOCS_TOOLS = [
   ...READ_TOOLS.filter((t) => t !== "run_shell" && t !== "shell_collect"),
   ...PRODUCT_WRITE_TOOLS,
+  ...SKILL_TOOLS,
   "apply_patch",
   "update_plan",
 ] as const;
 
-/** Review / counsel: read surface + path writes (lane discipline in prompts). */
-export const REVIEW_TOOLS = [...READ_TOOLS, ...PRODUCT_WRITE_TOOLS] as const;
+/** Review / counsel: read surface + path writes + skill tools (lane discipline in prompts). */
+export const REVIEW_TOOLS = [
+  ...READ_TOOLS,
+  ...PRODUCT_WRITE_TOOLS,
+  ...SKILL_TOOLS,
+] as const;
 
 /** Mechanical intern: shell-first + path writes when the brief requires them. */
 export const INTERN_TOOLS = [
@@ -90,6 +92,7 @@ export const INTERN_TOOLS = [
 export const ORCHESTRATOR_TOOLS = [
   ...READ_TOOLS,
   ...PRODUCT_WRITE_TOOLS,
+  ...SKILL_TOOLS,
   "spawn_agent",
   "list_agents",
   "close_agent",

src/agent/tool-classification.test.ts

@@ -18,6 +18,9 @@ describe("AUTO_ALLOW_READ_TOOLS", () => {
         "manage_tasks",
         "read_file",
         "search_files",
+        // CL-7668: read-only skill discovery/loading needs no approval prompt.
+        "skill_search",
+        "use_skill",
       ].sort(),
     );
   });