clementine-agent 1.18.197 → 1.18.199

package/dist/agent/agent-definitions.js

@@ -42,11 +42,26 @@ const PLANNER_PROMPT = [
     '- End each step prompt with "Deliver: <one-line return shape>".',
 ].join('\n');
 const RESEARCHER_PROMPT = [
-    'You are a per-item research specialist. You receive ONE specific item to investigate (one lead, one account, one file, one topic).',
+    'You are a per-item research specialist. You receive ONE specific item to investigate (one lead, one account, one domain, one file, one topic).',
     '',
-    'Use your bounded tools to gather the requested information. Return a ONE-PARAGRAPH summary in the format the parent specified.',
+    '## Tool access (1.18.198)',
     '',
-    'NEVER return raw tool output, full lists, or unbounded data. If a tool returns 50KB of JSON, extract only the fields you need and discard the rest.',
+    'You INHERIT every tool the parent agent has access to: Bash, Read, Grep, Glob, WebSearch, WebFetch, AND every MCP tool the parent has wired (dataforseo, brightdata, Salesforce, Gmail, Composio integrations, etc.). If the parent has it, you have it.',
+    '',
+    'The parent\'s dispatch prompt names the SPECIFIC tool you should use. Use exactly that tool. If the prompt is vague ("enrich this domain"), pick the most appropriate read-only tool from your inherited surface and proceed.',
+    '',
+    '## Safety bounds (behavior, not allowlist)',
+    '',
+    'You are READ-ONLY. Never call:',
+    '- `Edit`, `Write`, `NotebookEdit` (mutate files)',
+    '- Any MCP tool whose name contains `send_`, `create_`, `update_`, `delete_`, `post_`, `apply_`, `move_`, `rename_`, `archive_`, `set_`, `add_`, `remove_`, `enable_`, `disable_`, `subscribe_`, `unsubscribe_`, `assign_`, `cancel_`, `approve_`',
+    '- Bash commands containing `rm `, `mv `, `>>`, `>` (except for piping to `head`/`awk`), `git commit`, `git push`, `sf data ... update`, `sf data ... delete`, or any shell side-effect',
+    '',
+    'If you cannot complete the request read-only, say so in one line — do not improvise a mutation.',
+    '',
+    '## Output discipline',
+    '',
+    'Return a ONE-PARAGRAPH summary in the format the parent specified. Never raw tool output, never full lists, never unbounded data dumps. If a tool returns 50KB of JSON, extract only the requested fields and discard the rest — your job is to compress.',
     '',
     'If you cannot find the requested data, say so in one line. Do not speculate.',
 ].join('\n');
@@ -177,18 +192,36 @@ export function buildAgentMap(opts = {}) {
         maxTurns: 1,
     };
     // Researcher: haiku, per-item investigation. Cheap fan-out target.
-    // No Bash — researcher is read-only fanout, must not mutate state.
+    //
+    // 1.18.198 — NO `tools` allowlist. Researcher inherits every tool the
+    // parent has access to (Bash, Read, MCP wildcards, etc.). The earlier
+    // hardcoded ['Read', 'Grep', 'Glob', 'WebSearch', 'WebFetch'] blocked
+    // researcher from using the parent's MCP servers — when Ross dispatched
+    // "Parallel SEO enrichment for 13 domains" the subagent couldn't call
+    // `mcp__dataforseo__*` because it wasn't in the allowlist. Result: the
+    // subagent said "I can't do that" and Ross fell back to running 25
+    // sequential MCP calls in his own turn, defeating the fan-out.
+    //
+    // Read-only behavior is enforced in RESEARCHER_PROMPT (behavior class:
+    // no `Edit`/`Write`, no MCP tools containing send_/create_/update_/
+    // delete_/etc.). The prompt is the contract; the SDK lets the subagent
+    // inherit everything from the parent.
     map['researcher'] = {
         description: [
             'Use this subagent to investigate ONE specific item — a single',
-            'lead, account, file, web page, or topic — and return a',
+            'lead, account, domain, file, web page, or topic — and return a',
             'one-paragraph summary. Spawn it in PARALLEL via the Agent tool',
-            'with one subagent per item when the planner returns multiple',
-            'research steps. Read-only: never mutates state. Cheap (Haiku).',
+            'with one subagent per item for batch fan-out. Read-only: never',
+            'mutates state (Haiku, inherits parent tool surface).',
+            '',
+            'When dispatching, NAME THE SPECIFIC TOOL in the prompt (e.g.',
+            '"call mcp__dataforseo__google_domain_rank_overview for domain X")',
+            'rather than describing the goal abstractly ("enrich this domain").',
         ].join(' '),
         prompt: RESEARCHER_PROMPT,
         model: 'haiku',
-        tools: ['Read', 'Grep', 'Glob', 'WebSearch', 'WebFetch'],
+        // NO `tools` field — inherit from parent. See RESEARCHER_PROMPT for
+        // read-only safety enforcement.
         effort: 'low',
         maxTurns: 15,
     };

package/dist/agent/run-agent-context.js

@@ -141,7 +141,16 @@ const BEHAVIORAL_POSTURE = `## How you operate
 
 6. **Single, targeted action** (read this specific file, write this output, call this one MCP tool, send this one message) → do it yourself in your own turn. Direct tool use is correct when the scope is small and known.
 
-**The northstar.** A request like "find that coach project locally and build a report" should look like: you dispatch \`discovery\` to find the project (returns paths), then you Read the specific README it returned (one targeted Read), then you dispatch a worker subagent or do the report-write yourself depending on scope. NOT: you run a recursive \`Glob\` then 20 Reads in your own turn.`;
+**The northstar.** A request like "find that coach project locally and build a report" should look like: you dispatch \`discovery\` to find the project (returns paths), then you Read the specific README it returned (one targeted Read), then you dispatch a worker subagent or do the report-write yourself depending on scope. NOT: you run a recursive \`Glob\` then 20 Reads in your own turn.
+
+**Dispatch-prompt rule (1.18.198).** When you dispatch to a subagent, NAME THE SPECIFIC TOOL the subagent should use in your prompt. Subagents inherit your full tool surface (every MCP your parent has access to is also visible to them), but they often can't tell from a goal-only prompt which tool to pick. Be explicit:
+
+- ❌ Vague: "Enrich these 13 law firm domains."
+- ✅ Specific: "For each domain in the list, call \`mcp__dataforseo__dataforseo_labs_google_domain_rank_overview\` and return: organic_keywords, etv, top-3 ranked keywords. Read-only — never call any MCP tool whose name contains send_/create_/update_/delete_."
+
+The subagent's job is execution, not tool selection. You did the orchestration thinking; pass the answer through to them. A subagent that doesn't know which tool to use will either guess wrong or refuse — both waste a dispatch.
+
+For parallel fan-out (25 contacts to enrich, 30 records to look up), dispatch 25 subagents in ONE message, each with the same tool name but a different per-item input. The SDK runs them concurrently.`;
 /**
  * Read the long-term memory block for an autonomous run (cron, team-task).
  * Returns the agent-specific MEMORY.md when a hired agent is active, the

package/dist/gateway/router.js

@@ -2431,14 +2431,38 @@ export class Gateway {
                         });
                     // Wire Composio + external MCP only for real chat. Builder
                     // skips entirely — builder turns never call tools.
+                    //
+                    // 1.18.199 — `fullSurface: true` (NOT per-turn scopeText routing).
+                    //
+                    // The previous per-message routing was a regression: each chat
+                    // turn called `routeToolSurface(originalText)` and only loaded
+                    // MCP servers that matched THAT message's text. When the owner
+                    // sent a one-word reply like "sure" mid-conversation, zero MCPs
+                    // matched → zero servers registered → Ross said "DataForSEO
+                    // isn't in scope for this session context" mid-task. Verified
+                    // live on 2026-05-12 at 13:35:33.
+                    //
+                    // The right structural fix: chat always loads the agent's
+                    // full profile-allowed MCP surface. The profile's
+                    // `allowedComposioToolkits` / `allowedMcpServers` still bound
+                    // what each agent can see (Ross gets his scope, Sasha gets
+                    // hers). Within those bounds, every server registers every
+                    // turn — tools don't vanish mid-conversation. The SDK's
+                    // `ENABLE_TOOL_SEARCH=auto:5` (execution-policy.ts) still
+                    // defers individual tool-schema loading until needed, so the
+                    // per-turn token cost stays bounded even with many servers
+                    // registered.
+                    //
+                    // The skill-resolver still runs above this point — it
+                    // contributes the SKILL PROMPT BLOCK to system context. It
+                    // simply no longer affects MCP server registration. That
+                    // experiment (1.18.170 `skillHintedMcpServers`) caused more
+                    // problems than it solved.
                     const chatMcp = isBuilderSession
                         ? null
                         : await buildExtraMcpForRunAgent({
-                            scopeText: originalText,
+                            fullSurface: true,
                             profile: resolvedProfile,
-                            ...(resolvedSkills && resolvedSkills.hintedMcpServers.length > 0
-                                ? { skillHintedMcpServers: resolvedSkills.hintedMcpServers }
-                                : {}),
                         });
                     // Vault context (SOUL.md / MEMORY.md / AGENTS.md + optional
                     // profile body) — real chat only. Builder gets just its own

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clementine-agent",
-  "version": "1.18.197",
+  "version": "1.18.199",
   "description": "Clementine — Personal AI Assistant (TypeScript)",
   "type": "module",
   "main": "dist/index.js",