mixdog 0.8.0 → 0.9.0

package/scripts/tool-smoke.mjs

@@ -1,23 +1,57 @@
 #!/usr/bin/env node
-import { dirname, resolve } from 'node:path';
+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { compactToolSearchDescription, defaultDeferredToolNames, TOOL_SEARCH_TOOL } from '../src/mixdog-session-runtime.mjs';
+import { __renderToolSearchForTest, compactToolSearchDescription, defaultDeferredToolNames, SKILL_TOOL, TOOL_SEARCH_TOOL } from '../src/mixdog-session-runtime.mjs';
 import { buildExplorerPrompt, EXPLORE_TOOL, MAX_FANOUT_QUERIES, normalizeExploreQueries } from '../src/standalone/explore-tool.mjs';
-import { BRIDGE_TOOL, createStandaloneBridge, resolveBridgeExecutionMode } from '../src/standalone/bridge-tool.mjs';
+import { AGENT_TOOL, createStandaloneAgent } from '../src/standalone/agent-tool.mjs';
+import { parseHeadlessRoleCommand } from '../src/app.mjs';
+import { buildHeadlessSpawnArgs } from '../src/headless-role.mjs';
+import { createStandaloneChannelWorker } from '../src/standalone/channel-worker.mjs';
+import { OpenAIOAuthProvider, buildRequestBody, sendViaHttpSse } from '../src/runtime/agent/orchestrator/providers/openai-oauth.mjs';
+import { _logicalResponseItemMatch, _resolveOpenAiPromptCacheRatePolicy } from '../src/runtime/agent/orchestrator/providers/openai-oauth-ws.mjs';
+import { _mergePendingMessageEntries, closeSession, createSession, drainPendingMessages, enqueuePendingMessage, resumeSession } from '../src/runtime/agent/orchestrator/session/manager.mjs';
+import {
+  contentHasImage,
+  normalizeContentForAnthropic,
+  normalizeContentForGeminiParts,
+  normalizeContentForOpenAIChat,
+  normalizeContentForOpenAIResponses,
+  sanitizeContentForStoredHistory,
+} from '../src/runtime/agent/orchestrator/providers/media-normalization.mjs';
+import { initProviders } from '../src/runtime/agent/orchestrator/providers/registry.mjs';
+import {
+  cacheCapabilityForProvider,
+  resolveCacheStrategy,
+  shouldMarkWarmForProvider,
+  shouldRecordObservedForProvider,
+} from '../src/runtime/agent/orchestrator/agent-runtime/cache-strategy.mjs';
 import { executeBuiltinTool } from '../src/runtime/agent/orchestrator/tools/builtin.mjs';
 import { validateBuiltinArgs } from '../src/runtime/agent/orchestrator/tools/builtin/arg-guard.mjs';
 import { BUILTIN_TOOLS } from '../src/runtime/agent/orchestrator/tools/builtin/builtin-tools.mjs';
+import { runResultCacheInFlight } from '../src/runtime/agent/orchestrator/tools/builtin/cache-layers.mjs';
 import { executeCodeGraphTool } from '../src/runtime/agent/orchestrator/tools/code-graph.mjs';
 import { CODE_GRAPH_TOOL_DEFS } from '../src/runtime/agent/orchestrator/tools/code-graph-tool-defs.mjs';
 import { executePatchTool } from '../src/runtime/agent/orchestrator/tools/patch.mjs';
 import { PATCH_TOOL_DEFS } from '../src/runtime/agent/orchestrator/tools/patch-tool-defs.mjs';
 import { TOOL_DEFS as MEMORY_TOOL_DEFS } from '../src/runtime/memory/tool-defs.mjs';
+import { mergeSessionRowsIntoGlobal } from '../src/runtime/memory/lib/memory-session-merge.mjs';
 import { TOOL_DEFS as SEARCH_TOOL_DEFS } from '../src/runtime/search/tool-defs.mjs';
 import { TOOL_DEFS as CHANNEL_TOOL_DEFS } from '../src/runtime/channels/tool-defs.mjs';
-import { classifyBridgeWorkerGitMutationCommand } from '../src/runtime/agent/orchestrator/tool-loop-guard.mjs';
+import { AGENT_OWNER } from '../src/runtime/agent/orchestrator/agent-owner.mjs';
+import { composeSystemPrompt } from '../src/runtime/agent/orchestrator/context/collect.mjs';
+import { setInternalToolsProvider } from '../src/runtime/agent/orchestrator/internal-tools.mjs';
+import { prepareAgentSession } from '../src/runtime/agent/orchestrator/agent-runtime/session-builder.mjs';
+import { resolveHiddenRoleSchemaAllowedTools } from '../src/runtime/agent/orchestrator/agent-runtime/agent-dispatch.mjs';
+import { getHiddenRole, resolveAgentSessionPermission } from '../src/runtime/agent/orchestrator/internal-roles.mjs';
 
 const root = resolve(dirname(fileURLToPath(import.meta.url)), '..');
 
+function assert(condition, message) {
+  if (!condition) throw new Error(message);
+}
+
 function assertOk(name, result, pattern = null) {
   const text = String(result || '');
   if (!text || /^Error[\s:[]/.test(text)) {
@@ -29,6 +63,291 @@ function assertOk(name, result, pattern = null) {
   return text;
 }
 
+{
+  const sid = `tool-smoke-rich-pending-${process.pid}-${Date.now()}`.replace(/[^A-Za-z0-9_-]/g, '_');
+  const richContent = [
+    { type: 'text', text: 'look at this' },
+    { type: 'image', data: 'abc', mimeType: 'image/png' },
+  ];
+  const depth = enqueuePendingMessage(sid, { text: 'look at this\n[Image]', content: richContent });
+  assert(depth >= 1, `rich pending enqueue should return queue depth, got ${depth}`);
+  const drained = drainPendingMessages(sid);
+  assert(drained.length === 1, `rich pending drain should dedupe memory+persisted entries, got ${drained.length}`);
+  assert(Array.isArray(drained[0]?.content), `rich pending drain should preserve content array: ${JSON.stringify(drained)}`);
+  assert(drained[0].content.some((part) => part?.type === 'image' && part?.data === 'abc'), `rich pending drain lost image part: ${JSON.stringify(drained)}`);
+  const merged = _mergePendingMessageEntries([...drained, 'plain follow-up']);
+  assert(Array.isArray(merged?.content), `rich pending merge should preserve structured content: ${JSON.stringify(merged)}`);
+  assert(merged.content.some((part) => part?.type === 'image' && part?.data === 'abc'), `rich pending merge lost image part: ${JSON.stringify(merged)}`);
+  assert(
+    merged.content.some((part) => part?.type === 'text' && /plain follow-up/.test(part.text || '')),
+    `rich pending merge should keep later text follow-up: ${JSON.stringify(merged)}`,
+  );
+  assert(drainPendingMessages(sid).length === 0, 'rich pending drain should remove persisted fallback after first drain');
+  await new Promise((resolve) => setImmediate(resolve));
+  assert(drainPendingMessages(sid).length === 0, 'rich pending async mirror must not resurrect an already-drained message');
+}
+
+{
+  const sid = `tool-smoke-async-pending-${process.pid}-${Date.now()}`.replace(/[^A-Za-z0-9_-]/g, '_');
+  enqueuePendingMessage(sid, 'persisted pending text');
+  await new Promise((resolve) => setImmediate(resolve));
+  const drained = drainPendingMessages(sid);
+  assert(drained.length === 1 && drained[0] === 'persisted pending text', `async pending mirror should persist fallback text: ${JSON.stringify(drained)}`);
+}
+
+{
+  let computes = 0;
+  const key = `tool-smoke-inflight-${Date.now()}-${Math.random()}`;
+  const [a, b] = await Promise.all([
+    runResultCacheInFlight(key, async () => {
+      computes += 1;
+      await new Promise((resolve) => setTimeout(resolve, 15));
+      return 'shared-result';
+    }),
+    runResultCacheInFlight(key, async () => {
+      computes += 1;
+      return 'duplicate-result';
+    }),
+  ]);
+  assert(computes === 1, `in-flight result cache should compute once, computed ${computes}`);
+  assert(a === 'shared-result' && b === 'shared-result', 'in-flight result cache should share the first result');
+}
+
+{
+  const fullPolicy = _resolveOpenAiPromptCacheRatePolicy({}, {
+    mode: 'full',
+    frameInputItems: 40,
+    deltaTokens: 9000,
+    hasPreviousResponseId: false,
+  });
+  assert(fullPolicy.policy === 'full_guard' && fullPolicy.limitPerMin === 12, `full cache lane should keep 12rpm guard: ${JSON.stringify(fullPolicy)}`);
+
+  const deltaPolicy = _resolveOpenAiPromptCacheRatePolicy({}, {
+    mode: 'delta',
+    frameInputItems: 1,
+    deltaTokens: 9000,
+    hasPreviousResponseId: true,
+  });
+  assert(deltaPolicy.policy === 'delta_relaxed' && deltaPolicy.limitPerMin === 60, `small delta should use relaxed cache lane rpm: ${JSON.stringify(deltaPolicy)}`);
+
+  const largeDeltaPolicy = _resolveOpenAiPromptCacheRatePolicy({}, {
+    mode: 'delta',
+    frameInputItems: 20,
+    deltaTokens: 9000,
+    hasPreviousResponseId: true,
+  });
+  assert(largeDeltaPolicy.policy === 'delta_guarded' && largeDeltaPolicy.limitPerMin === 12, `large delta should fall back to full guard: ${JSON.stringify(largeDeltaPolicy)}`);
+
+  const customDeltaPolicy = _resolveOpenAiPromptCacheRatePolicy({ openaiCacheLaneDeltaRateLimitPerMin: 90 }, {
+    mode: 'delta',
+    frameInputItems: 1,
+    deltaTokens: 9000,
+    hasPreviousResponseId: true,
+  });
+  assert(customDeltaPolicy.limitPerMin === 90, `custom delta rpm should be honored: ${JSON.stringify(customDeltaPolicy)}`);
+
+  const unlimitedDeltaPolicy = _resolveOpenAiPromptCacheRatePolicy({ openaiCacheLaneDeltaRateLimitPerMin: 0 }, {
+    mode: 'delta',
+    frameInputItems: 1,
+    deltaTokens: 9000,
+    hasPreviousResponseId: true,
+  });
+  assert(unlimitedDeltaPolicy.policy === 'delta_unlimited' && unlimitedDeltaPolicy.limitPerMin === 0, `delta rpm=0 should disable delta rate wait: ${JSON.stringify(unlimitedDeltaPolicy)}`);
+
+  const originalFunctionCall = {
+    type: 'function_call',
+    call_id: 'call_tool_1',
+    name: 'shell',
+    arguments: JSON.stringify({ command: 'Get-Content -Path src/runtime/agent/orchestrator/session/loop.mjs' }),
+  };
+  const compactedReplayFunctionCall = {
+    type: 'function_call',
+    call_id: 'call_tool_1',
+    name: 'shell',
+    arguments: JSON.stringify({ command: '[mixdog compacted 74 bytes]' }),
+  };
+  assert(
+    _logicalResponseItemMatch(compactedReplayFunctionCall, originalFunctionCall),
+    'function_call replay should match by call_id/name even when history compacts arguments',
+  );
+  assert(
+    !_logicalResponseItemMatch({ ...compactedReplayFunctionCall, call_id: 'call_tool_2' }, originalFunctionCall),
+    'function_call replay must not match a different call_id',
+  );
+  const originalCustomCall = {
+    type: 'custom_tool_call',
+    call_id: 'call_patch_1',
+    name: 'apply_patch',
+    input: '*** Begin Patch\n*** Add File: a.txt\n+ok\n*** End Patch\n',
+  };
+  assert(
+    _logicalResponseItemMatch({ ...originalCustomCall, input: '[mixdog compacted patch]' }, originalCustomCall),
+    'custom_tool_call replay should match by call_id/name even when history compacts patch input',
+  );
+  assert(
+    !_logicalResponseItemMatch({ ...originalCustomCall, call_id: 'call_patch_2' }, originalCustomCall),
+    'custom_tool_call replay must not match a different call_id',
+  );
+}
+
+{
+  const publicStrategy = resolveCacheStrategy('worker');
+  assert(publicStrategy.tools === 'none', `Anthropic tools must not spend a cache_control BP: ${JSON.stringify(publicStrategy)}`);
+  assert(publicStrategy.system === '1h' && publicStrategy.tier3 === '1h' && publicStrategy.messages === '1h', `public cache tiers changed unexpectedly: ${JSON.stringify(publicStrategy)}`);
+  assert(cacheCapabilityForProvider('anthropic-oauth') === 'explicit-breakpoint', 'Anthropic OAuth should remain explicit-breakpoint');
+  assert(cacheCapabilityForProvider('openai-oauth') === 'key-prefix', 'OpenAI OAuth should remain key-prefix');
+  assert(cacheCapabilityForProvider('xai') === 'key-prefix', 'xAI should remain key-prefix');
+  assert(cacheCapabilityForProvider('grok-oauth') === 'key-prefix', 'Grok OAuth should remain key-prefix');
+  assert(cacheCapabilityForProvider('gemini') === 'managed-explicit', 'Gemini should be provider-managed explicit cachedContents');
+  assert(shouldMarkWarmForProvider('gemini') === true, 'Gemini provider-managed cache should count as warmable');
+  assert(shouldRecordObservedForProvider('gemini') === false, 'Gemini is no longer implicit-observed only');
+  assert(shouldRecordObservedForProvider('deepseek') === true, 'DeepSeek should remain observed-only');
+}
+
+{
+  const prevTraceDisable = process.env.MIXDOG_AGENT_TRACE_DISABLE;
+  process.env.MIXDOG_AGENT_TRACE_DISABLE = '1';
+  try {
+    const provider = new OpenAIOAuthProvider({});
+    provider.ensureAuth = async () => ({ access_token: 'fake-token' });
+    const calls = [];
+    const fakeWs = async () => {
+      calls.push('ws');
+      return { content: 'ws-ok' };
+    };
+    const fakeHttp = async () => {
+      calls.push('http');
+      return { content: 'http-ok' };
+    };
+    const imageTurnContent = [
+      { type: 'text', text: 'look' },
+      { type: 'image', data: 'abc', mimeType: 'image/png' },
+    ];
+    await provider.send(
+      [
+        { role: 'system', content: 'sys' },
+        { role: 'user', content: imageTurnContent },
+      ],
+      'gpt-5.5',
+      [],
+      { _sendViaWebSocketFn: fakeWs, _sendViaHttpSseFn: fakeHttp, sessionId: 'tool-smoke-image-ws' },
+    );
+    if (provider._forceHttpFallback) {
+      throw new Error('image WS send must not poison future OpenAI OAuth sends');
+    }
+    const storedImageTurnContent = sanitizeContentForStoredHistory(imageTurnContent);
+    if (contentHasImage(storedImageTurnContent)) {
+      throw new Error(`stored image history must not retain provider-visible image parts: ${JSON.stringify(storedImageTurnContent)}`);
+    }
+    await provider.send(
+      [
+        { role: 'system', content: 'sys' },
+        { role: 'user', content: storedImageTurnContent },
+        { role: 'assistant', content: 'image received' },
+        { role: 'user', content: 'plain ping text, no image' },
+      ],
+      'gpt-5.5',
+      [],
+      { _sendViaWebSocketFn: fakeWs, _sendViaHttpSseFn: fakeHttp, sessionId: 'tool-smoke-plain-after-image' },
+    );
+    await provider.send(
+      [
+        { role: 'system', content: 'sys' },
+        { role: 'user', content: 'forced HTTP fallback probe' },
+      ],
+      'gpt-5.5',
+      [],
+      { _sendViaWebSocketFn: fakeWs, _sendViaHttpSseFn: fakeHttp, forceHttpFallback: true, sessionId: 'tool-smoke-forced-http-fallback' },
+    );
+    if (calls.join(',') !== 'ws,ws,http') {
+      throw new Error(`image should use WS first while forced fallback still uses HTTP: ${calls.join(',')}`);
+    }
+  } finally {
+    if (prevTraceDisable == null) delete process.env.MIXDOG_AGENT_TRACE_DISABLE;
+    else process.env.MIXDOG_AGENT_TRACE_DISABLE = prevTraceDisable;
+  }
+}
+
+{
+  const anthropicImages = normalizeContentForAnthropic([
+    { type: 'input_image', image_url: 'data:image/png;base64,abc' },
+    { type: 'image_url', image_url: { url: 'https://example.com/a.png' } },
+    { type: 'input_image', file_id: 'file_123' },
+    { type: 'input_text', text: 'look' },
+  ]);
+  assert(
+    anthropicImages[0]?.type === 'image'
+      && anthropicImages[0]?.source?.type === 'base64'
+      && anthropicImages[0]?.source?.media_type === 'image/png'
+      && anthropicImages[0]?.source?.data === 'abc',
+    `Anthropic data-url image normalization failed: ${JSON.stringify(anthropicImages[0])}`,
+  );
+  assert(
+    anthropicImages[1]?.type === 'image'
+      && anthropicImages[1]?.source?.type === 'url'
+      && anthropicImages[1]?.source?.url === 'https://example.com/a.png',
+    `Anthropic URL image normalization failed: ${JSON.stringify(anthropicImages[1])}`,
+  );
+  assert(
+    anthropicImages[2]?.type === 'image'
+      && anthropicImages[2]?.source?.type === 'file'
+      && anthropicImages[2]?.source?.file_id === 'file_123',
+    `Anthropic file image normalization failed: ${JSON.stringify(anthropicImages[2])}`,
+  );
+  const storedFileImage = sanitizeContentForStoredHistory([{ type: 'input_image', file_id: 'file_123' }]);
+  assert(!contentHasImage(storedFileImage), `stored file image history must be sanitized: ${JSON.stringify(storedFileImage)}`);
+}
+
+{
+  const geminiImages = normalizeContentForGeminiParts([
+    { type: 'input_image', image_url: 'data:image/png;base64,abc' },
+    { type: 'image_url', image_url: { url: 'https://example.com/a.png' } },
+    { fileData: { mimeType: 'image/jpeg', fileUri: 'https://generativelanguage.googleapis.com/v1beta/files/abc' } },
+    { type: 'input_image', file_id: 'file_123' },
+  ]);
+  assert(
+    geminiImages[0]?.inlineData?.mimeType === 'image/png'
+      && geminiImages[0]?.inlineData?.data === 'abc',
+    `Gemini data-url image normalization failed: ${JSON.stringify(geminiImages[0])}`,
+  );
+  assert(
+    geminiImages[1]?.fileData?.fileUri === 'https://example.com/a.png',
+    `Gemini URL image normalization failed: ${JSON.stringify(geminiImages[1])}`,
+  );
+  assert(
+    geminiImages[2]?.fileData?.mimeType === 'image/jpeg'
+      && geminiImages[2]?.fileData?.fileUri === 'https://generativelanguage.googleapis.com/v1beta/files/abc',
+    `Gemini fileData image normalization failed: ${JSON.stringify(geminiImages[2])}`,
+  );
+  assert(
+    /unsupported image file_id for Gemini/.test(geminiImages[3]?.text || ''),
+    `Gemini incompatible file_id must be explicit text, got: ${JSON.stringify(geminiImages[3])}`,
+  );
+}
+
+{
+  const grokChatImages = normalizeContentForOpenAIChat([
+    { type: 'image_url', image_url: { url: 'https://example.com/a.png' } },
+    { type: 'input_image', file_id: 'file_123' },
+  ]);
+  assert(
+    grokChatImages[0]?.type === 'image_url'
+      && grokChatImages[0]?.image_url?.url === 'https://example.com/a.png',
+    `OpenAI-compatible URL image normalization failed: ${JSON.stringify(grokChatImages[0])}`,
+  );
+  assert(
+    /unsupported image file_id for OpenAI Chat-compatible/.test(grokChatImages[1]?.text || ''),
+    `OpenAI-compatible chat file_id must be explicit text, got: ${JSON.stringify(grokChatImages[1])}`,
+  );
+  const grokResponsesImages = normalizeContentForOpenAIResponses([
+    { type: 'input_image', file_id: 'file_123' },
+  ]);
+  assert(
+    grokResponsesImages[0]?.type === 'input_image' && grokResponsesImages[0]?.file_id === 'file_123',
+    `OpenAI-compatible Responses file_id normalization failed: ${JSON.stringify(grokResponsesImages[0])}`,
+  );
+}
+
 const listOut = await executeBuiltinTool('list', { path: 'scripts', head_limit: 20 }, root);
 assertOk('list', listOut, /smoke\.mjs/);
 
@@ -40,6 +359,13 @@ const grepOut = await executeBuiltinTool('grep', {
 }, root);
 assertOk('grep', grepOut, /smoke\.mjs/);
 
+const redundantAllFilesGlobGrepOut = await executeBuiltinTool('grep', {
+  pattern: 'standalone mixdog CLI/TUI coding agent',
+  glob: '**/*',
+  head_limit: 10,
+}, root);
+assertOk('grep redundant all-files glob', redundantAllFilesGlobGrepOut, /scripts[\\/](?:boot-smoke|tool-smoke|smoke)\.mjs|src[\\/]help\.mjs/);
+
 const implicitRefsGlobOut = await executeBuiltinTool('glob', {
   pattern: '**/agent-session.ts',
   head_limit: 20,
@@ -55,6 +381,13 @@ const explicitSrcGlobOut = await executeBuiltinTool('glob', {
 }, root);
 assertOk('glob explicit src', explicitSrcGlobOut, /src[\\/].*engine\.mjs/i);
 
+const findOut = await executeBuiltinTool('find', {
+  query: 'tool smoke',
+  path: '.',
+  head_limit: 10,
+}, root);
+assertOk('find', findOut, /scripts[\\/]tool-smoke\.mjs/i);
+
 const readOut = await executeBuiltinTool('read', {
   path: 'scripts/smoke.mjs',
   line: 1,
@@ -213,47 +546,6 @@ if (!/exactly one window family/i.test(readWindowErr || '')) {
   throw new Error(`read mixed-window guard failed: err=${readWindowErr} args=${JSON.stringify(mixedReadWindow)}`);
 }
 
-const modelDefaultAsync = resolveBridgeExecutionMode(
-  {},
-  { invocationSource: 'model-tool' },
-  'sync',
-);
-if (modelDefaultAsync !== 'async') throw new Error(`bridge model-tool default mode should be async, got ${modelDefaultAsync}`);
-
-const explicitSync = resolveBridgeExecutionMode(
-  { wait: true, mode: 'sync', async: false },
-  { invocationSource: 'model-tool' },
-  'sync',
-);
-if (explicitSync !== 'sync') throw new Error(`bridge explicit sync mode should be honored, got ${explicitSync}`);
-
-const userSync = resolveBridgeExecutionMode(
-  { wait: true },
-  { invocationSource: 'user-command' },
-  'async',
-);
-if (userSync !== 'sync') throw new Error(`bridge user-command wait mode should be sync, got ${userSync}`);
-
-for (const command of [
-  'git status --short',
-  'git diff -- src/mixdog-session-runtime.mjs',
-  'Write-Output "git push"',
-]) {
-  const blocked = classifyBridgeWorkerGitMutationCommand(command);
-  if (blocked) throw new Error(`bridge git guard should allow readonly/non-command form ${JSON.stringify(command)}; got ${blocked}`);
-}
-for (const [command, expected] of [
-  ['git push', 'git push'],
-  ['git -C . commit -m smoke', 'git commit'],
-  ['npm test && git add -A', 'git add'],
-  ['bash -lc "git push"', 'git push'],
-  ['cmd /c git commit -m smoke', 'git commit'],
-  ['powershell -Command "git stash"', 'git stash'],
-]) {
-  const blocked = classifyBridgeWorkerGitMutationCommand(command);
-  if (blocked !== expected) throw new Error(`bridge git guard mismatch for ${JSON.stringify(command)}: got ${blocked}, expected ${expected}`);
-}
-
 function assertHas(set, name) {
   if (!set.has(name)) throw new Error(`default tool surface missing ${name}: ${[...set].join(', ')}`);
 }
@@ -270,32 +562,32 @@ const smokeCatalog = [
   ...SEARCH_TOOL_DEFS,
   ...CHANNEL_TOOL_DEFS,
   EXPLORE_TOOL,
-  BRIDGE_TOOL,
+  AGENT_TOOL,
+  SKILL_TOOL,
   TOOL_SEARCH_TOOL,
 ].filter(Boolean);
 
 const fullDefaults = defaultDeferredToolNames(smokeCatalog, 'full');
-if (fullDefaults.size !== 12) {
-  throw new Error(`full default surface should stay 12 tools, got ${fullDefaults.size}: ${[...fullDefaults].join(', ')}`);
+if (fullDefaults.size !== 10) {
+  throw new Error(`full default surface should stay 10 tools, got ${fullDefaults.size}: ${[...fullDefaults].join(', ')}`);
 }
-for (const name of ['read', 'code_graph', 'grep', 'glob', 'list', 'apply_patch', 'explore', 'bridge', 'recall', 'search', 'web_fetch', 'tool_search']) {
+for (const name of ['read', 'code_graph', 'grep', 'find', 'glob', 'list', 'apply_patch', 'explore', 'Skill', 'tool_search']) {
   assertHas(fullDefaults, name);
 }
-for (const name of ['shell', 'edit', 'write']) {
+for (const name of ['shell', 'task', 'agent', 'recall', 'search', 'web_fetch', 'cwd']) {
   assertLacks(fullDefaults, name);
 }
 
 const leadDefaults = defaultDeferredToolNames(smokeCatalog, 'lead');
-if (leadDefaults.size !== 14) {
-  throw new Error(`lead default surface should stay 14 tools, got ${leadDefaults.size}: ${[...leadDefaults].join(', ')}`);
+if (leadDefaults.size !== 16) {
+  throw new Error(`lead default surface should stay 16 tools for this static catalog, got ${leadDefaults.size}: ${[...leadDefaults].join(', ')}`);
 }
-for (const name of ['read', 'code_graph', 'grep', 'glob', 'list', 'shell', 'task', 'apply_patch', 'explore', 'bridge', 'recall', 'search', 'web_fetch', 'tool_search']) {
+for (const name of ['read', 'code_graph', 'grep', 'find', 'glob', 'list', 'shell', 'task', 'apply_patch', 'explore', 'agent', 'recall', 'search', 'web_fetch', 'Skill', 'tool_search']) {
   assertHas(leadDefaults, name);
 }
-for (const name of ['edit', 'write']) {
-  assertLacks(leadDefaults, name);
+if (TOOL_SEARCH_TOOL.annotations?.agentHidden !== true) {
+  throw new Error('tool_search must stay Lead-only / standalone-only; agent sessions keep fixed schemas without deferred loading');
 }
-
 function toolSchemaSize(tool) {
   const desc = String(tool?.description || '');
   const schema = JSON.stringify(tool?.input_schema || tool?.inputSchema || {});
@@ -306,13 +598,13 @@ const surfaceSize = [...fullDefaults].reduce((sum, name) => {
   const tool = smokeCatalog.find((item) => item?.name === name);
   return sum + toolSchemaSize(tool);
 }, 0);
-if (surfaceSize > 14000) {
-  throw new Error(`full default tool surface too large: ${surfaceSize} chars (cap 14000)`);
+if (surfaceSize > 17000) {
+  throw new Error(`full default tool surface too large: ${surfaceSize} chars (cap 17000)`);
 }
 for (const [name, cap] of [
   ['apply_patch', 1300],
   ['code_graph', 1550],
-  ['bridge', 2500],
+  ['agent', 2500],
   ['recall', 2400],
   ['search', 3200],
   ['web_fetch', 900],
@@ -324,25 +616,69 @@ for (const [name, cap] of [
 }
 
 const readonlyDefaults = defaultDeferredToolNames(smokeCatalog, 'readonly');
-if (readonlyDefaults.size !== 7) {
-  throw new Error(`readonly default surface should stay 7 tools, got ${readonlyDefaults.size}: ${[...readonlyDefaults].join(', ')}`);
+if (readonlyDefaults.size !== 9) {
+  throw new Error(`readonly default surface should stay 9 tools, got ${readonlyDefaults.size}: ${[...readonlyDefaults].join(', ')}`);
 }
-for (const name of ['read', 'code_graph', 'grep', 'glob', 'list', 'explore', 'tool_search']) {
+for (const name of ['read', 'code_graph', 'grep', 'find', 'glob', 'list', 'explore', 'Skill', 'tool_search']) {
   assertHas(readonlyDefaults, name);
 }
-for (const name of ['apply_patch', 'bridge', 'shell', 'edit', 'write']) {
+for (const name of ['apply_patch', 'agent', 'shell']) {
   assertLacks(readonlyDefaults, name);
 }
 
-const bridgeProps = BRIDGE_TOOL.inputSchema?.properties || {};
-if (!bridgeProps.mode || bridgeProps.wait) throw new Error('bridge schema should expose mode but not legacy wait');
-if (!/Prefer async by default/i.test(BRIDGE_TOOL.description || '') || !/distinct tags/i.test(BRIDGE_TOOL.description || '') || !/completion notification/i.test(BRIDGE_TOOL.description || '') || !/do not call status\/read/i.test(BRIDGE_TOOL.description || '')) {
-  throw new Error('bridge description must preserve async tagged delegation contract');
+const agentProps = AGENT_TOOL.inputSchema?.properties || {};
+if (agentProps.mode || agentProps.wait) throw new Error('agent schema should not expose execution mode controls');
+{
+  const heavyPrompt = composeSystemPrompt({
+    role: 'heavy-worker',
+    provider: 'anthropic-oauth',
+    agentRules: '# Tool Use',
+    skillManifest: '',
+  });
+  if (!heavyPrompt.stableSystemContext.includes('## heavy-worker') || !heavyPrompt.stableSystemContext.includes('Complex implementation agent')) {
+    throw new Error(`heavy-worker AGENT.md must be included in scoped role instructions: ${heavyPrompt.stableSystemContext}`);
+  }
+  const workerPrompt = composeSystemPrompt({
+    role: 'worker',
+    provider: 'anthropic-oauth',
+    agentRules: '# Tool Use',
+    skillManifest: '',
+  });
+  if (!workerPrompt.stableSystemContext.includes('## worker') || !workerPrompt.stableSystemContext.includes('Basic implementation agent')) {
+    throw new Error(`worker AGENT.md must be included in scoped role instructions: ${workerPrompt.stableSystemContext}`);
+  }
 }
-const bridgeSmoke = createStandaloneBridge({
+{
+  const shorthand = parseHeadlessRoleCommand(['reviewer', 'check', 'this']);
+  if (shorthand?.role !== 'reviewer' || shorthand?.message !== 'check this') {
+    throw new Error(`headless shorthand command parse failed: ${JSON.stringify(shorthand)}`);
+  }
+  const explicit = parseHeadlessRoleCommand(['role', 'debug', 'trace', 'failure']);
+  if (!explicit?.error || !/mixdog <role> <message/.test(explicit.error)) {
+    throw new Error(`headless role subcommand must be rejected: ${JSON.stringify(explicit)}`);
+  }
+  const tuiDefault = parseHeadlessRoleCommand([]);
+  if (tuiDefault !== null) {
+    throw new Error(`empty argv must keep TUI default: ${JSON.stringify(tuiDefault)}`);
+  }
+  const modelOnlySpawn = buildHeadlessSpawnArgs({
+    role: 'reviewer',
+    tag: 'headless-smoke',
+    cwd: root,
+    message: 'check this',
+    model: 'haiku',
+  });
+  if (modelOnlySpawn.model !== 'haiku' || modelOnlySpawn.provider) {
+    throw new Error(`headless model-only route must preserve --model without forcing provider: ${JSON.stringify(modelOnlySpawn)}`);
+  }
+}
+if (!/always start background tasks/i.test(AGENT_TOOL.description || '') || !/distinct tags/i.test(AGENT_TOOL.description || '') || !/completion notification/i.test(AGENT_TOOL.description || '') || !/do not (?:call|poll) status\/read/i.test(AGENT_TOOL.description || '')) {
+  throw new Error('agent description must preserve async tagged delegation contract');
+}
+const agentSmoke = createStandaloneAgent({
   cfgMod: {
     loadConfig: () => ({ providers: {}, presets: [] }),
-    resolveRuntimeSpec: () => { throw new Error('bridge smoke should not resolve runtime for read/list errors'); },
+    resolveRuntimeSpec: () => { throw new Error('agent smoke should not resolve runtime for read/list errors'); },
   },
   reg: { initProviders: async () => {} },
   mgr: {
@@ -354,52 +690,642 @@ const bridgeSmoke = createStandaloneBridge({
   cwd: root,
   defaultMode: 'async',
 });
-const bridgeMissingJob = await bridgeSmoke.execute({ type: 'read', task_id: 'job_missing_smoke' }, { invocationSource: 'model-tool', cwd: root });
-if (!/^Error[\s:[]/.test(String(bridgeMissingJob)) || !/job_missing_smoke/.test(String(bridgeMissingJob))) {
-  throw new Error(`bridge missing job must return Error result:\n${bridgeMissingJob}`);
+const agentMissingJob = await agentSmoke.execute({ type: 'read', task_id: 'task_missing_smoke' }, { invocationSource: 'model-tool', cwd: root });
+if (!/^Error[\s:[]/.test(String(agentMissingJob)) || !/task_missing_smoke/.test(String(agentMissingJob))) {
+  throw new Error(`agent missing task must return Error result:\n${agentMissingJob}`);
+}
+const agentBadType = await agentSmoke.execute({ type: 'definitely_bad_type' }, { invocationSource: 'model-tool', cwd: root });
+if (!/^Error[\s:[]/.test(String(agentBadType)) || !/unknown type/i.test(String(agentBadType))) {
+  throw new Error(`agent unknown type must return Error result:\n${agentBadType}`);
+}
+
+async function waitForSmoke(predicate, label, timeoutMs = 1000) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (predicate()) return;
+    await new Promise((resolveWait) => setTimeout(resolveWait, 20));
+  }
+  throw new Error(`timed out waiting for ${label}`);
+}
+
+const channelWorkerTmp = mkdtempSync(join(tmpdir(), 'mixdog-channel-worker-env-'));
+let channelEnvWorker = null;
+const prevChannelDaemon = process.env.MIXDOG_CHANNEL_DAEMON;
+const prevChannelSingleton = process.env.MIXDOG_CHANNEL_SINGLETON;
+const prevChannelWorkerProcess = process.env.MIXDOG_CHANNEL_WORKER_PROCESS;
+const prevRuntimeRoot = process.env.MIXDOG_RUNTIME_ROOT;
+const prevEnvOut = process.env.SMOKE_CHANNEL_ENV_OUT;
+try {
+  const entry = join(channelWorkerTmp, 'entry.mjs');
+  const dataDir = join(channelWorkerTmp, 'data');
+  const runtimeDir = join(channelWorkerTmp, 'runtime');
+  const envOut = join(channelWorkerTmp, 'env.json');
+  mkdirSync(dataDir, { recursive: true });
+  mkdirSync(runtimeDir, { recursive: true });
+  writeFileSync(entry, `
+import { writeFileSync } from 'node:fs';
+writeFileSync(process.env.SMOKE_CHANNEL_ENV_OUT, JSON.stringify({
+  cliOwned: process.env.MIXDOG_CLI_OWNED,
+  daemon: process.env.MIXDOG_CHANNEL_DAEMON,
+}));
+process.send?.({ type: 'ready' });
+process.on('message', (msg) => {
+  if (msg?.type === 'shutdown') process.exit(0);
+});
+setInterval(() => {}, 10000);
+`);
+  process.env.MIXDOG_CHANNEL_DAEMON = '1';
+  process.env.MIXDOG_CHANNEL_SINGLETON = '1';
+  process.env.MIXDOG_CHANNEL_WORKER_PROCESS = '1';
+  process.env.MIXDOG_RUNTIME_ROOT = runtimeDir;
+  process.env.SMOKE_CHANNEL_ENV_OUT = envOut;
+  channelEnvWorker = createStandaloneChannelWorker({
+    entry,
+    rootDir: root,
+    dataDir,
+    cwd: root,
+  });
+  await channelEnvWorker.start();
+  const childEnv = JSON.parse(readFileSync(envOut, 'utf8'));
+  if (childEnv.daemon !== '1') {
+    throw new Error(`channel daemon smoke expected daemon=1, got ${childEnv.daemon}`);
+  }
+  if (childEnv.cliOwned !== '0') {
+    throw new Error(`channel daemon must advertise owner HTTP (MIXDOG_CLI_OWNED=0), got ${childEnv.cliOwned}`);
+  }
+} finally {
+  try { await channelEnvWorker?.stop?.('channel-worker-env-smoke', { force: true }); } catch {}
+  if (prevChannelDaemon == null) delete process.env.MIXDOG_CHANNEL_DAEMON;
+  else process.env.MIXDOG_CHANNEL_DAEMON = prevChannelDaemon;
+  if (prevChannelSingleton == null) delete process.env.MIXDOG_CHANNEL_SINGLETON;
+  else process.env.MIXDOG_CHANNEL_SINGLETON = prevChannelSingleton;
+  if (prevChannelWorkerProcess == null) delete process.env.MIXDOG_CHANNEL_WORKER_PROCESS;
+  else process.env.MIXDOG_CHANNEL_WORKER_PROCESS = prevChannelWorkerProcess;
+  if (prevRuntimeRoot == null) delete process.env.MIXDOG_RUNTIME_ROOT;
+  else process.env.MIXDOG_RUNTIME_ROOT = prevRuntimeRoot;
+  if (prevEnvOut == null) delete process.env.SMOKE_CHANNEL_ENV_OUT;
+  else process.env.SMOKE_CHANNEL_ENV_OUT = prevEnvOut;
+  rmSync(channelWorkerTmp, { recursive: true, force: true });
 }
-const bridgeBadType = await bridgeSmoke.execute({ type: 'definitely_bad_type' }, { invocationSource: 'model-tool', cwd: root });
-if (!/^Error[\s:[]/.test(String(bridgeBadType)) || !/unknown type/i.test(String(bridgeBadType))) {
-  throw new Error(`bridge unknown type must return Error result:\n${bridgeBadType}`);
+
+const agentNotifyTmp = mkdtempSync(join(tmpdir(), 'mixdog-agent-notify-'));
+try {
+  const ownerNotifications = [];
+  const workerQueued = [];
+  const agentNotifySmoke = createStandaloneAgent({
+    cfgMod: {
+      loadConfig: () => ({
+        providers: { 'openai-oauth': { enabled: true } },
+        presets: [
+          { id: 'sonnet-high', name: 'sonnet-high', provider: 'openai-oauth', model: 'smoke-model', type: 'agent', tools: 'full' },
+          { id: 'haiku', name: 'HAIKU', provider: 'openai-oauth', model: 'smoke-haiku', type: 'agent', tools: 'full' },
+        ],
+      }),
+      resolveRuntimeSpec: () => ({ scopeKey: 'smoke-notify', lane: 'agent' }),
+    },
+    reg: { initProviders },
+    mgr: {
+      askSession: async (sessionId, _prompt, _context, _onToolCall, _cwdOverride, _prefetch, askOpts = {}) => {
+        const nestedText = `background task\ntask_id: task_shell_notify_smoke\nsurface: shell\noperation: shell\nstatus: completed\nstarted: 2026-01-01T00:00:00.000Z\nfinished: 2026-01-01T00:00:01.000Z\n\nnested background done for ${sessionId}`;
+        askOpts.notifyFn?.(nestedText, {
+          type: 'shell_task_result',
+          execution_surface: 'shell',
+          execution_id: 'task_shell_notify_smoke',
+          status: 'completed',
+        });
+        askOpts.onTerminalResult?.({ content: 'worker completed' }, { sessionId, beforeSave: true });
+        return { content: 'worker completed' };
+      },
+      enqueuePendingMessage: (sessionId, message) => {
+        workerQueued.push({ sessionId, message });
+        return 1;
+      },
+      getSession: () => null,
+      listSessions: () => [],
+      closeSession: () => false,
+      hideSessionFromList: () => false,
+    },
+    dataDir: agentNotifyTmp,
+    cwd: root,
+    defaultMode: 'async',
+  });
+  const notifyContext = {
+    invocationSource: 'model-tool',
+    callerCwd: root,
+    callerSessionId: 'sess_owner_notify_smoke',
+    clientHostPid: 424242,
+    notifyFn: (text, meta) => {
+      ownerNotifications.push({ text, meta });
+      return true;
+    },
+  };
+  const notifyStart = await agentNotifySmoke.execute({ type: 'spawn', agent: 'worker', tag: 'notify-smoke', prompt: 'notify smoke' }, notifyContext);
+  if (!/agent task:/i.test(String(notifyStart)) || !/status: running/i.test(String(notifyStart))) {
+    throw new Error(`agent async notify smoke did not start task:\n${notifyStart}`);
+  }
+  await waitForSmoke(
+    () => ownerNotifications.some((event) => /task_shell_notify_smoke/.test(event.text))
+      && workerQueued.some((event) => /task_shell_notify_smoke/.test(event.message)),
+    'agent child background completion routing',
+  );
+  await waitForSmoke(
+    () => ownerNotifications.some((event) => /worker completed/.test(event.text)),
+    'agent early completion routing',
+  );
+  const agentCompletionCount = ownerNotifications.filter((event) => /worker completed/.test(event.text)).length;
+  if (agentCompletionCount !== 1) {
+    throw new Error(`agent early completion should suppress duplicate final notify, got ${agentCompletionCount}: ${JSON.stringify(ownerNotifications)}`);
+  }
+  await agentNotifySmoke.execute({ type: 'cleanup', force: true }, notifyContext);
+} finally {
+  rmSync(agentNotifyTmp, { recursive: true, force: true });
 }
 if (EXPLORE_TOOL.annotations?.readOnlyHint !== true || EXPLORE_TOOL.annotations?.destructiveHint === true) {
   throw new Error('explore must stay read-only so readonly surfaces can use it');
 }
+if (EXPLORE_TOOL.annotations?.agentHidden === true) {
+  throw new Error('explore must stay visible to agent sessions');
+}
 const exploreProps = EXPLORE_TOOL.inputSchema?.properties || {};
-if (!/Broad-scope locator only/i.test(EXPLORE_TOOL.description || '') || !/code_graph\/grep\/glob first/i.test(EXPLORE_TOOL.description || '')) {
-  throw new Error('explore description must preserve broad-locator and direct-tool-first guidance');
+if (!/Repo anchor locator/i.test(EXPLORE_TOOL.description || '') || !/broad\/uncertain/i.test(EXPLORE_TOOL.description || '') || !/independent targets/i.test(EXPLORE_TOOL.description || '') || (EXPLORE_TOOL.description || '').length > 90) {
+  throw new Error('explore description must stay compact and anchor-oriented');
 }
-if (!/Never pass a whole brief/i.test(exploreProps.query?.description || '') || !/relevant repo or subtree/i.test(exploreProps.cwd?.description || '')) {
-  throw new Error('explore schema must preserve query narrowness and cwd narrowing guidance');
+if (!/Narrow locator query/i.test(exploreProps.query?.description || '') || !/independent targets/i.test(exploreProps.query?.description || '') || !/Project\/root/i.test(exploreProps.cwd?.description || '')) {
+  throw new Error('explore schema must stay compact and preserve query/cwd shape');
 }
-const normalizedExplore = normalizeExploreQueries('["where is model selection?","  ","which file owns bridge async?"]');
+const normalizedExplore = normalizeExploreQueries('["where is model selection?","  ","which file owns agent async?"]');
 if (normalizedExplore.length !== 2 || normalizedExplore[0] !== 'where is model selection?') {
   throw new Error(`explore query normalization failed: ${JSON.stringify(normalizedExplore)}`);
 }
 if (MAX_FANOUT_QUERIES !== 8) throw new Error(`explore fanout cap changed: ${MAX_FANOUT_QUERIES}`);
-const explorerPrompt = buildExplorerPrompt('where is <bridge> & status?');
-if (!explorerPrompt.includes('&lt;bridge&gt;') || !explorerPrompt.includes('&amp;') || /verdicts, ratings, or recommendations/.test(explorerPrompt) === false) {
+const explorerPrompt = buildExplorerPrompt('where is <agent> & status?');
+if (!explorerPrompt.includes('&lt;agent&gt;') || !explorerPrompt.includes('&amp;') || /verdicts, ratings, or recommendations/.test(explorerPrompt) === false) {
   throw new Error(`explorer prompt contract failed: ${explorerPrompt}`);
 }
-const patchDescription = PATCH_TOOL_DEFS[0]?.inputSchema?.properties?.patch?.description || '';
+setInternalToolsProvider({
+  executor: async () => 'tool-smoke internal tool',
+  tools: [
+    EXPLORE_TOOL,
+    { name: 'memory', description: 'Destructive memory surface.', inputSchema: { type: 'object', properties: {} }, annotations: { destructiveHint: true } },
+    { name: 'recall', description: 'Memory recall surface.', inputSchema: { type: 'object', properties: {} }, annotations: { readOnlyHint: true } },
+    { name: 'search', description: 'Web search surface.', inputSchema: { type: 'object', properties: {} }, annotations: { readOnlyHint: true, openWorldHint: true } },
+    { name: 'reply', description: 'Channel reply surface.', inputSchema: { type: 'object', properties: {} }, annotations: { destructiveHint: true } },
+    { name: 'edit_message', description: 'Channel edit surface.', inputSchema: { type: 'object', properties: {} }, annotations: { destructiveHint: true } },
+    { name: 'web_fetch', description: 'Web fetch surface.', inputSchema: { type: 'object', properties: {} }, annotations: { readOnlyHint: true, openWorldHint: true } },
+    { name: 'reload_config', description: 'Config reload surface.', inputSchema: { type: 'object', properties: {} }, annotations: { destructiveHint: true } },
+    { name: 'inject_command', description: 'Command injection surface.', inputSchema: { type: 'object', properties: {} }, annotations: { destructiveHint: true } },
+  ],
+});
+{
+  await initProviders({ 'openai-oauth': { enabled: true } });
+  const skillManifestTmp = mkdtempSync(join(tmpdir(), 'mixdog-skill-manifest-'));
+  try {
+    const skillDir = join(skillManifestTmp, '.mixdog', 'skills', 'demo-skill');
+    mkdirSync(skillDir, { recursive: true });
+    writeFileSync(join(skillDir, 'SKILL.md'), [
+      '---',
+      'name: demo-skill',
+      'description: Use when validating compact skill manifest matching.',
+      '---',
+      '',
+      '# Demo Skill',
+      '',
+      'Use this skill for manifest smoke tests.',
+      '',
+    ].join('\n'));
+    const skillSession = createSession({
+      provider: 'openai-oauth',
+      model: 'tool-smoke-model',
+      owner: 'cli',
+      role: 'lead',
+      cwd: skillManifestTmp,
+      permission: 'read-write',
+    });
+    try {
+      const visible = (skillSession.messages || []).map((m) => String(m.content || '')).join('\n');
+      if (!/available-skills/i.test(visible) || !/demo-skill/i.test(visible) || !/Skill\(\{"name":"<skill-name>"\}\)/.test(visible)) {
+        throw new Error(`lead skill manifest missing compact skill listing: ${visible.slice(0, 1200)}`);
+      }
+      const skillToolNames = (skillSession.tools || []).map((tool) => tool?.name).filter(Boolean);
+      if (!skillToolNames.includes('Skill')) {
+        throw new Error(`lead skill manifest session must expose Skill loader: ${skillToolNames.join(', ')}`);
+      }
+    } finally {
+      closeSession(skillSession.id, 'tool-smoke');
+    }
+    const agentSkillSession = createSession({
+      provider: 'openai-oauth',
+      model: 'tool-smoke-model',
+      owner: AGENT_OWNER,
+      role: 'worker',
+      cwd: skillManifestTmp,
+      permission: 'read-write',
+    });
+    try {
+      const systemVisible = (agentSkillSession.messages || [])
+        .filter((m) => m?.role === 'system')
+        .map((m) => String(m.content || ''))
+        .join('\n');
+      // Agent (Pool B/C) sessions FREEZE the Skill meta-tool into the schema
+      // unconditionally so the tool bytes stay bit-identical across roles/cwds
+      // (provider cache shard stability). The BP1 manifest rides alongside it
+      // so the model knows which Skill names exist — a loader without the
+      // manifest cannot be targeted. Both must be present together.
+      if (!/available-skills/i.test(systemVisible) || !/demo-skill/i.test(systemVisible) || !/Skill\(\{"name":"<skill-name>"\}\)/.test(systemVisible)) {
+        throw new Error(`agent BP1 must carry the compact skill manifest alongside the frozen Skill tool: ${systemVisible.slice(0, 1200)}`);
+      }
+      if (!/# Tool Use/i.test(systemVisible) || !/# Agent Constraints/i.test(systemVisible)) {
+        throw new Error(`agent system layers must carry BP1 tool policy and BP2 role rules: ${systemVisible.slice(0, 1200)}`);
+      }
+      const agentSkillToolNames = (agentSkillSession.tools || []).map((tool) => tool?.name).filter(Boolean);
+      if (agentSkillToolNames.includes('Skill')) {
+        throw new Error(`read-write agent schema must omit Skill loader: ${agentSkillToolNames.join(', ')}`);
+      }
+    } finally {
+      closeSession(agentSkillSession.id, 'tool-smoke');
+    }
+  } finally {
+    rmSync(skillManifestTmp, { recursive: true, force: true });
+  }
+  const explorerSession = createSession({
+    provider: 'openai-oauth',
+    model: 'tool-smoke-model',
+    owner: AGENT_OWNER,
+    role: 'explorer',
+    cwd: root,
+    permission: 'read',
+    skipSkills: true,
+    schemaAllowedTools: ['code_graph', 'find', 'glob', 'list', 'grep', 'read'],
+  });
+  try {
+    const visible = (explorerSession.messages || []).map((m) => String(m.content || '')).join('\n');
+    const systemVisible = (explorerSession.messages || [])
+      .filter((m) => m?.role === 'system')
+      .map((m) => String(m.content || ''))
+      .join('\n');
+    const userReminderVisible = (explorerSession.messages || [])
+      .filter((m) => m?.role === 'user')
+      .map((m) => String(m.content || ''))
+      .join('\n');
+    if (!/Read-only retrieval role/i.test(visible) || /# environment/i.test(visible) || /git operations deferred to Lead/i.test(visible)) {
+      throw new Error(`explorer hidden retrieval context should stay slim: ${visible.slice(0, 1200)}`);
+    }
+    if (!/# Role: explorer/i.test(systemVisible) || /# Role: explorer/i.test(userReminderVisible) || !/Locator only/i.test(systemVisible)) {
+      throw new Error(`explorer role md must ride BP2 system, not BP3 user reminder: system=${systemVisible.slice(0, 600)} user=${userReminderVisible.slice(0, 600)}`);
+    }
+    const visibleBytes = Buffer.byteLength(visible, 'utf8');
+    if (visibleBytes > 1800) {
+      throw new Error(`explorer hidden retrieval context too large: ${visibleBytes} bytes`);
+    }
+  } finally {
+    closeSession(explorerSession.id, 'tool-smoke');
+  }
+  const workerSession = createSession({
+    provider: 'openai-oauth',
+    model: 'tool-smoke-model',
+    owner: AGENT_OWNER,
+    role: 'worker',
+    cwd: root,
+    permission: 'read-write',
+    taskBrief: 'Implement a scoped smoke check.',
+  });
+  try {
+    const visible = (workerSession.messages || []).map((m) => String(m.content || '')).join('\n');
+    const userReminderVisible = (workerSession.messages || [])
+      .filter((m) => m?.role === 'user')
+      .map((m) => String(m.content || ''))
+      .join('\n');
+    if (/(^|\n)# role\n/i.test(visible) || /(^|\n)permission:/i.test(visible)) {
+      throw new Error(`agent context must not repeat raw role/permission labels: ${visible.slice(0, 1200)}`);
+    }
+    if (/# role-identity/i.test(visible)) {
+      throw new Error(`agent context must not repeat role identity: ${visible.slice(0, 1200)}`);
+    }
+    if (/# task-brief/i.test(visible)) {
+      throw new Error(`agent context must not repeat task brief: ${visible.slice(0, 1200)}`);
+    }
+    if (/available-skills/i.test(userReminderVisible)) {
+      throw new Error(`agent skill manifest must stay in system BP1, not user reminders: ${userReminderVisible.slice(0, 1200)}`);
+    }
+    if (/(^|\n)# environment/i.test(visible)) {
+      throw new Error(`agent context must not inject environment reminder: ${visible.slice(0, 1200)}`);
+    }
+    const workerToolNames = (workerSession.tools || []).map((tool) => tool?.name).filter(Boolean);
+    if (workerToolNames.includes('tool_search')) {
+      throw new Error(`agent session schema must not expose deferred tool_search: ${workerToolNames.join(', ')}`);
+    }
+    if (workerToolNames.includes('shell')) {
+      throw new Error(`read-write agent session schema must not expose shell: ${workerToolNames.join(', ')}`);
+    }
+    for (const name of ['skills_list', 'skill_view', 'skill_execute']) {
+      if (workerToolNames.includes(name)) {
+        throw new Error(`agent session schema must not expose legacy skill tool ${name}: ${workerToolNames.join(', ')}`);
+      }
+    }
+  } finally {
+    closeSession(workerSession.id, 'tool-smoke');
+  }
+  const readAgentSession = createSession({
+    provider: 'openai-oauth',
+    model: 'tool-smoke-model',
+    owner: AGENT_OWNER,
+    role: 'worker',
+    cwd: root,
+    permission: 'read',
+  });
+  const writeAgentSession = createSession({
+    provider: 'openai-oauth',
+    model: 'tool-smoke-model',
+    owner: AGENT_OWNER,
+    role: 'worker',
+    cwd: root,
+    permission: 'read-write',
+  });
+  const fullAgentSession = createSession({
+    provider: 'openai-oauth',
+    model: 'tool-smoke-model',
+    owner: AGENT_OWNER,
+    role: 'worker',
+    cwd: root,
+    permission: 'full',
+  });
+  const publicExploreSession = createSession({
+    provider: 'openai-oauth',
+    model: 'tool-smoke-model',
+    owner: AGENT_OWNER,
+    role: 'explore',
+    cwd: root,
+    permission: 'read',
+  });
+  try {
+    const readTools = (readAgentSession.tools || []).map((tool) => tool?.name).filter(Boolean);
+    const writeTools = (writeAgentSession.tools || []).map((tool) => tool?.name).filter(Boolean);
+    const fullTools = (fullAgentSession.tools || []).map((tool) => tool?.name).filter(Boolean);
+    const publicExploreTools = (publicExploreSession.tools || []).map((tool) => tool?.name).filter(Boolean);
+    const expectedReadTools = ['code_graph', 'find', 'glob', 'list', 'grep', 'read', 'explore', 'search', 'web_fetch'];
+    const expectedWriteTools = ['code_graph', 'find', 'glob', 'list', 'grep', 'read', 'apply_patch', 'explore', 'search', 'web_fetch'];
+    if (JSON.stringify(readTools) !== JSON.stringify(expectedReadTools)) {
+      throw new Error(`read agent schema must be fixed allow-list: expected=${expectedReadTools.join(', ')} actual=${readTools.join(', ')}`);
+    }
+    if (JSON.stringify(writeTools) !== JSON.stringify(expectedWriteTools)) {
+      throw new Error(`read-write agent schema must be fixed allow-list: expected=${expectedWriteTools.join(', ')} actual=${writeTools.join(', ')}`);
+    }
+    if (readTools.includes('tool_search') || writeTools.includes('tool_search')) {
+      throw new Error(`agent session fixed schemas must omit tool_search: read=${readTools.join(', ')} write=${writeTools.join(', ')}`);
+    }
+    if (readTools.includes('shell') || writeTools.includes('shell')) {
+      throw new Error(`read/read-write agent schemas must omit shell: read=${readTools.join(', ')} write=${writeTools.join(', ')}`);
+    }
+    for (const name of ['shell', 'apply_patch', 'task', 'diagnostics', 'open_config', 'Skill']) {
+      if (readTools.includes(name)) {
+        throw new Error(`read agent schema must omit non-read tool ${name}: read=${readTools.join(', ')}`);
+      }
+    }
+    for (const name of ['apply_patch', 'task', 'diagnostics']) {
+      if (name === 'apply_patch' && !writeTools.includes(name)) {
+        throw new Error(`read-write agent schema must preserve apply_patch: write=${writeTools.join(', ')}`);
+      }
+      if (name !== 'apply_patch' && writeTools.includes(name)) {
+        throw new Error(`read-write agent schema must omit non-edit tool ${name}: write=${writeTools.join(', ')}`);
+      }
+    }
+    for (const name of ['open_config', 'Skill']) {
+      if (writeTools.includes(name)) {
+        throw new Error(`read-write agent schema must omit config/skill tool ${name}: write=${writeTools.join(', ')}`);
+      }
+    }
+    for (const name of ['memory', 'recall', 'reply', 'edit_message', 'reload_config', 'inject_command']) {
+      if (readTools.includes(name) || writeTools.includes(name)) {
+        throw new Error(`read/read-write agent schema must not expose full-runtime internal tool ${name}: read=${readTools.join(', ')} write=${writeTools.join(', ')}`);
+      }
+    }
+    if (!readTools.includes('explore') || !writeTools.includes('explore')) {
+      throw new Error(`read/read-write agent schemas must expose explore: read=${readTools.join(', ')} write=${writeTools.join(', ')}`);
+    }
+    if (!fullTools.includes('shell')) {
+      throw new Error(`full agent schema must retain shell: full=${fullTools.join(', ')}`);
+    }
+    if (!fullTools.includes('explore')) {
+      throw new Error(`full agent schema must expose explore: full=${fullTools.join(', ')}`);
+    }
+    if (publicExploreTools.includes('explore')) {
+      throw new Error(`public explore role must not expose recursive explore tool: ${publicExploreTools.join(', ')}`);
+    }
+  } finally {
+    closeSession(readAgentSession.id, 'tool-smoke');
+    closeSession(writeAgentSession.id, 'tool-smoke');
+    closeSession(fullAgentSession.id, 'tool-smoke');
+    closeSession(publicExploreSession.id, 'tool-smoke');
+  }
+  const resumeAgentSession = createSession({
+    provider: 'openai-oauth',
+    model: 'tool-smoke-model',
+    owner: AGENT_OWNER,
+    role: 'worker',
+    cwd: root,
+    permission: 'read-write',
+  });
+  try {
+    const resumed = await resumeSession(resumeAgentSession.id, 'full');
+    const resumedTools = (resumed?.tools || []).map((tool) => tool?.name).filter(Boolean);
+    const expectedWriteTools = ['code_graph', 'find', 'glob', 'list', 'grep', 'read', 'apply_patch', 'explore', 'search', 'web_fetch'];
+    if (JSON.stringify(resumedTools) !== JSON.stringify(expectedWriteTools)) {
+      throw new Error(`resumed read-write agent schema must keep fixed allow-list: expected=${expectedWriteTools.join(', ')} actual=${resumedTools.join(', ')}`);
+    }
+  } finally {
+    closeSession(resumeAgentSession.id, 'tool-smoke');
+  }
+  const noneAgentSession = createSession({
+    provider: 'openai-oauth',
+    model: 'tool-smoke-model',
+    owner: AGENT_OWNER,
+    role: 'worker',
+    cwd: root,
+    permission: 'none',
+  });
+  try {
+    const resumedNone = await resumeSession(noneAgentSession.id, 'full');
+    const noneTools = (resumedNone?.tools || []).map((tool) => tool?.name).filter(Boolean);
+    if (noneTools.length !== 0) {
+      throw new Error(`resumed permission=none agent schema must stay empty: actual=${noneTools.join(', ')}`);
+    }
+  } finally {
+    closeSession(noneAgentSession.id, 'tool-smoke');
+  }
+  const objectPermissionSession = createSession({
+    provider: 'openai-oauth',
+    model: 'tool-smoke-model',
+    owner: AGENT_OWNER,
+    role: 'worker',
+    cwd: root,
+    permission: { allow: ['read', 'grep'], deny: ['grep'] },
+  });
+  try {
+    const resumedObject = await resumeSession(objectPermissionSession.id, 'full');
+    const objectTools = (resumedObject?.tools || []).map((tool) => tool?.name).filter(Boolean);
+    if (JSON.stringify(objectTools) !== JSON.stringify(['read'])) {
+      throw new Error(`resumed object-permission agent schema must reapply allow/deny and agent filters: actual=${objectTools.join(', ')}`);
+    }
+  } finally {
+    closeSession(objectPermissionSession.id, 'tool-smoke');
+  }
+  const hiddenRoles = JSON.parse(readFileSync(join(root, 'src', 'defaults', 'hidden-roles.json'), 'utf8')).roles || [];
+  const hiddenPreset = { id: 'hidden-smoke', name: 'hidden-smoke', type: 'agent', provider: 'openai-oauth', model: 'tool-smoke-model', tools: 'full' };
+  const hiddenRuntimeSpec = { scopeKey: 'hidden-role-smoke', lane: 'agent' };
+  const hiddenBadTools = new Set(['shell', 'task', 'diagnostics', 'open_config', 'Skill', 'memory', 'reply', 'edit_message', 'recall', 'reload_config', 'inject_command']);
+  const expectedForHiddenRole = (permission, schemaAllowedTools) => {
+    if (Array.isArray(schemaAllowedTools)) return schemaAllowedTools.slice();
+    if (permission === 'none') return [];
+    if (permission === 'read') return ['code_graph', 'find', 'glob', 'list', 'grep', 'read', 'explore', 'search', 'web_fetch'];
+    if (permission === 'read-write') return ['code_graph', 'find', 'glob', 'list', 'grep', 'read', 'apply_patch', 'explore', 'search', 'web_fetch'];
+    return null;
+  };
+  for (const entry of hiddenRoles) {
+    const role = String(entry?.name || '').trim();
+    if (!role) continue;
+    const hidden = getHiddenRole(role);
+    const permission = resolveAgentSessionPermission(role, hidden?.permission || null);
+    const schemaAllowedTools = resolveHiddenRoleSchemaAllowedTools(hidden);
+    const { session } = prepareAgentSession({
+      role,
+      presetName: 'hidden-smoke',
+      preset: hiddenPreset,
+      runtimeSpec: hiddenRuntimeSpec,
+      permission,
+      cwd: root,
+      sourceType: 'hidden-role-smoke',
+      sourceName: role,
+      schemaAllowedTools,
+    });
+    try {
+      const tools = (session.tools || []).map((tool) => tool?.name).filter(Boolean);
+      const resumed = await resumeSession(session.id, 'full');
+      const resumedTools = (resumed?.tools || []).map((tool) => tool?.name).filter(Boolean);
+      const expected = expectedForHiddenRole(permission, schemaAllowedTools);
+      if (expected && (JSON.stringify(tools) !== JSON.stringify(expected) || JSON.stringify(resumedTools) !== JSON.stringify(expected))) {
+        throw new Error(`hidden role ${role} schema mismatch: expected=${expected.join(', ')} tools=${tools.join(', ')} resumed=${resumedTools.join(', ')}`);
+      }
+      const leaked = tools.filter((name) => hiddenBadTools.has(name) && !(expected || []).includes(name));
+      if (leaked.length) {
+        throw new Error(`hidden role ${role} leaked forbidden full-runtime tools: ${leaked.join(', ')} from ${tools.join(', ')}`);
+      }
+      const systemVisible = (session.messages || [])
+        .filter((m) => m?.role === 'system')
+        .map((m) => String(m.content || ''))
+        .join('\n');
+      if (/available-skills|Skill\(/i.test(systemVisible)) {
+        throw new Error(`hidden role ${role} must not carry Skill manifest without Skill tool`);
+      }
+      if (/effective-cwd|Override cwd|# environment|# task-brief/i.test(systemVisible)) {
+        throw new Error(`hidden role ${role} must not carry cwd/environment/task-brief injection`);
+      }
+    } finally {
+      closeSession(session.id, 'tool-smoke');
+    }
+  }
+}
+const patchTool = PATCH_TOOL_DEFS[0];
+const patchDescription = patchTool?.inputSchema?.properties?.patch?.description || '';
 if (!/V4A/i.test(patchDescription) || !/one (?:file )?block per target file/i.test(patchDescription) || !/exact current context/i.test(patchDescription)) {
-  throw new Error('apply_patch schema must keep V4A, per-target block, and exact-context guidance');
+  throw new Error('apply_patch JSON fallback schema must keep V4A, per-target block, and exact-context guidance');
+}
+if (!/FREEFORM tool/i.test(patchTool?.freeformDescription || '') || patchTool?.freeform?.type !== 'grammar' || patchTool?.freeform?.syntax !== 'lark') {
+  throw new Error(`apply_patch must expose freeform grammar metadata: ${JSON.stringify(patchTool)}`);
+}
+for (const requiredGrammarLine of [
+  'start: begin_patch hunk+ end_patch',
+  'add_hunk: "*** Add File: " filename LF add_line+',
+  'change_move: "*** Move to: " filename LF',
+  '%import common.LF',
+]) {
+  if (!patchTool.freeform.definition.includes(requiredGrammarLine)) {
+    throw new Error(`apply_patch freeform grammar missing required line: ${requiredGrammarLine}`);
+  }
+}
+{
+  const rawPatch = '*** Begin Patch\n*** Add File: custom-wire.txt\n+ok\n*** End Patch\n';
+  const body = buildRequestBody(
+    [
+      { role: 'system', content: 'sys' },
+      { role: 'user', content: 'patch please' },
+      {
+        role: 'assistant',
+        content: '',
+        toolCalls: [{ id: 'call_patch_1', name: 'apply_patch', arguments: { patch: rawPatch }, nativeType: 'custom_tool_call' }],
+      },
+      { role: 'tool', toolCallId: 'call_patch_1', content: 'OK' },
+    ],
+    'gpt-5.5',
+    PATCH_TOOL_DEFS,
+    {},
+  );
+  const wirePatchTool = body.tools?.find((tool) => tool.name === 'apply_patch');
+  if (wirePatchTool?.type !== 'custom' || wirePatchTool?.format?.syntax !== 'lark') {
+    throw new Error(`OpenAI Responses apply_patch must serialize as a custom grammar tool: ${JSON.stringify(wirePatchTool)}`);
+  }
+  if (!/FREEFORM tool/i.test(wirePatchTool.description || '')) {
+    throw new Error(`OpenAI Responses apply_patch must use freeform description: ${JSON.stringify(wirePatchTool)}`);
+  }
+  const customCall = body.input?.find((item) => item.type === 'custom_tool_call');
+  const customOutput = body.input?.find((item) => item.type === 'custom_tool_call_output');
+  if (customCall?.input !== rawPatch || customCall?.call_id !== 'call_patch_1') {
+    throw new Error(`custom apply_patch replay must keep raw patch input: ${JSON.stringify(body.input)}`);
+  }
+  if (customOutput?.call_id !== 'call_patch_1' || customOutput?.output !== 'OK') {
+    throw new Error(`custom apply_patch output must replay as custom_tool_call_output: ${JSON.stringify(body.input)}`);
+  }
+}
+{
+  const rawPatch = '*** Begin Patch\n*** Add File: custom-parser.txt\n+ok\n*** End Patch\n';
+  const encoder = new TextEncoder();
+  const frames = [
+    { type: 'response.created', response: { id: 'resp_custom_patch', model: 'gpt-5.5' } },
+    { type: 'response.custom_tool_call_input.delta', delta: rawPatch.slice(0, 16) },
+    { type: 'response.output_item.done', item: { type: 'custom_tool_call', call_id: 'call_patch_sse', name: 'apply_patch', input: rawPatch } },
+    { type: 'response.completed', response: { id: 'resp_custom_patch', model: 'gpt-5.5', usage: { input_tokens: 1, output_tokens: 1 }, output: [] } },
+  ];
+  const bodyText = frames.map((frame) => `data: ${JSON.stringify(frame)}\n\n`).join('');
+  let emitted = null;
+  const response = await sendViaHttpSse({
+    auth: { access_token: 'fake-token', account_id: '' },
+    body: { model: 'gpt-5.5', input: [], stream: true },
+    opts: {},
+    onToolCall: (call) => { emitted = call; },
+    externalSignal: null,
+    poolKey: 'tool-smoke-custom-patch',
+    cacheKey: 'tool-smoke-custom-patch',
+    iteration: 1,
+    useModel: 'gpt-5.5',
+    fetchFn: async () => new Response(new ReadableStream({
+      start(controller) {
+        controller.enqueue(encoder.encode(bodyText));
+        controller.close();
+      },
+    }), { status: 200, headers: { 'content-type': 'text/event-stream' } }),
+  });
+  const call = response.toolCalls?.[0];
+  if (call?.nativeType !== 'custom_tool_call' || call?.name !== 'apply_patch' || call?.arguments?.patch !== rawPatch) {
+    throw new Error(`custom apply_patch SSE parser must produce internal patch args: ${JSON.stringify(response.toolCalls)}`);
+  }
+  if (emitted?.arguments?.patch !== rawPatch) {
+    throw new Error(`custom apply_patch SSE parser must eager-emit patch args: ${JSON.stringify(emitted)}`);
+  }
 }
 const readPathDescription = BUILTIN_TOOLS.find((tool) => tool.name === 'read')?.inputSchema?.properties?.path?.description || '';
-if (!/file path only/i.test(readPathDescription)) {
+if (!/File path or array/i.test(readPathDescription) || !/Dirs use list/i.test(readPathDescription)) {
   throw new Error('read schema must keep directory-vs-file guidance');
 }
 const readDescription = BUILTIN_TOOLS.find((tool) => tool.name === 'read')?.description || '';
-if (!/specific file window or symbol body/i.test(readDescription) || !/after narrowing/i.test(readDescription)) {
+if (!/known file path\(s\)/i.test(readDescription) || !/line\+context/i.test(readDescription)) {
   throw new Error('read description must stay narrow-target oriented');
 }
 const codeGraphDescription = CODE_GRAPH_TOOL_DEFS[0]?.description || '';
 const codeGraphProps = CODE_GRAPH_TOOL_DEFS[0]?.inputSchema?.properties || {};
-if (!/Top-level entry for code-related questions/i.test(codeGraphDescription) || !/Use before read/i.test(codeGraphDescription)) {
-  throw new Error('code_graph description must stay top-level for code questions');
+if (!/Code structure/i.test(codeGraphDescription) || !/symbols/i.test(codeGraphDescription) || codeGraphDescription.length > 90) {
+  throw new Error('code_graph description must stay compact and structure-oriented');
 }
-if (!/Operation:/i.test(codeGraphProps.mode?.description || '') || !/Directory scope is only for references\/callers/i.test(codeGraphProps.file?.description || '')) {
-  throw new Error('code_graph schema must explain mode and file scoping');
+if (!/^Operation\.$/i.test(codeGraphProps.mode?.description || '') || !/^Source file\.$/i.test(codeGraphProps.file?.description || '')) {
+  throw new Error('code_graph schema must keep compact field descriptions');
 }
 const recallTool = MEMORY_TOOL_DEFS.find((tool) => tool.name === 'recall');
 const recallProps = recallTool?.inputSchema?.properties || {};
@@ -409,6 +1335,64 @@ if (!/when in doubt, recall first/i.test(recallTool?.description || '') || !reca
 if (!/array for independent fan-out/i.test(recallProps.query?.description || '') || !/Project pool selector/i.test(recallProps.projectScope?.description || '')) {
   throw new Error('recall schema must explain fan-out query and project scope filters');
 }
+// Cross-session / raw recall surface: includeMembers stays a chunk-member
+// output knob, includeRaw exposes unchunked raw/episode turns, and sessionOnly
+// is the explicit opt-in that restores the old single-session hard scope.
+if (!/chunk members/i.test(recallProps.includeMembers?.description || '') || !/does not widen the search pool/i.test(recallProps.includeMembers?.description || '')) {
+  throw new Error('recall includeMembers must stay scoped to chunk-member output only');
+}
+if (!recallProps.includeRaw || !/raw\/episode/i.test(recallProps.includeRaw?.description || '')) {
+  throw new Error('recall schema must expose includeRaw for unchunked raw/episode turns');
+}
+if (!recallProps.sessionOnly || !/session only/i.test(recallProps.sessionOnly?.description || '')) {
+  throw new Error('recall schema must expose sessionOnly as the explicit single-session opt-in');
+}
+// Behaviour-level checks for the cross-session merge contract. These exercise
+// the pure mergeSessionRowsIntoGlobal() helper (no DB) so the starve-prevention
+// + dedupe + includeRaw-parity invariants are guarded, not just the schema.
+{
+  // 1) Starve prevention: a flood of session rows must NOT push global hybrid
+  //    hits off the first page. Global rows carry a real retrievalScore; the
+  //    session rows (score 0) must sort AFTER them under importance.
+  const globalHits = [
+    { id: 1, retrievalScore: 0.9, ts: 100 },
+    { id: 2, retrievalScore: 0.8, ts: 110 },
+  ];
+  const sessionFlood = Array.from({ length: 20 }, (_, i) => ({ id: 1000 + i, retrievalScore: 0, ts: 200 + i }));
+  const mergedImportance = mergeSessionRowsIntoGlobal(globalHits, sessionFlood, { sort: 'importance' });
+  if (mergedImportance.slice(0, 2).map((r) => r.id).join(',') !== '1,2') {
+    throw new Error(`session merge must not starve global first page under importance: ${JSON.stringify(mergedImportance.slice(0, 3))}`);
+  }
+  if (mergedImportance.length !== globalHits.length + sessionFlood.length) {
+    throw new Error('session merge must append all non-duplicate session rows');
+  }
+  // 2) Dedupe by id AND by global root member id (member/leaf double-output).
+  const globalWithMembers = [{ id: 5, retrievalScore: 0.7, ts: 100, members: [{ id: 51 }, { id: 52 }] }];
+  const sessionDupes = [
+    { id: 5, retrievalScore: 0, ts: 300 }, // dup root id
+    { id: 51, retrievalScore: 0, ts: 301 }, // dup member id
+    { id: 99, retrievalScore: 0, ts: 302 }, // genuinely new
+  ];
+  const mergedDedupe = mergeSessionRowsIntoGlobal(globalWithMembers, sessionDupes, { sort: 'importance' });
+  const dedupeIds = mergedDedupe.map((r) => Number(r.id)).sort((a, b) => a - b);
+  if (dedupeIds.join(',') !== '5,99') {
+    throw new Error(`session merge must dedupe root+member ids, leaving only new rows: ${JSON.stringify(dedupeIds)}`);
+  }
+  // 3) date sort keeps newest-first across the merged set.
+  const mergedDate = mergeSessionRowsIntoGlobal(
+    [{ id: 1, retrievalScore: 0.9, ts: 100 }],
+    [{ id: 2, retrievalScore: 0, ts: 999 }],
+    { sort: 'date' },
+  );
+  if (Number(mergedDate[0].id) !== 2) {
+    throw new Error(`session merge under date sort must order by ts desc: ${JSON.stringify(mergedDate)}`);
+  }
+  // 4) Empty session rows is a no-op passthrough (no crash, same array).
+  const passthrough = mergeSessionRowsIntoGlobal(globalHits, [], { sort: 'importance' });
+  if (passthrough.length !== globalHits.length) {
+    throw new Error('session merge with no session rows must be a passthrough');
+  }
+}
 const memoryTool = MEMORY_TOOL_DEFS.find((tool) => tool.name === 'memory');
 const memoryProps = memoryTool?.inputSchema?.properties || {};
 if (!/explicit mutation/i.test(memoryTool?.description || '') || !/Destructive jobs require exact confirm/i.test(memoryTool?.description || '') || !/Exact confirmation phrase/i.test(memoryProps.confirm?.description || '')) {
@@ -416,8 +1400,8 @@ if (!/explicit mutation/i.test(memoryTool?.description || '') || !/Destructive j
 }
 const searchTool = SEARCH_TOOL_DEFS.find((tool) => tool.name === 'search');
 const searchProps = searchTool?.inputSchema?.properties || {};
-if (!/Prefer mode=async/i.test(searchTool?.description || '') || !searchProps.query?.anyOf || !/array for fan-out/i.test(searchProps.query?.description || '')) {
-  throw new Error('search schema must preserve async guidance and string/array query shape');
+if (!/Runs synchronously/i.test(searchTool?.description || '') || searchProps.mode || searchProps.action || searchProps.task_id || !searchProps.query?.anyOf || !/array for fan-out/i.test(searchProps.query?.description || '')) {
+  throw new Error('search schema must preserve sync execution guidance and string/array query shape');
 }
 if (!/Default web/i.test(searchProps.type?.description || '') || !/locale hint/i.test(searchProps.locale?.description || '') || !/Default low/i.test(searchProps.contextSize?.description || '')) {
   throw new Error('search schema must describe type, locale, and contextSize defaults');
@@ -430,9 +1414,153 @@ if (!/Use after search/i.test(webFetchTool?.description || '') || !webFetchProps
 if (!/offset/i.test(webFetchProps.startIndex?.description || '') || !/Maximum characters/i.test(webFetchProps.maxLength?.description || '')) {
   throw new Error('web_fetch schema must describe paging window fields');
 }
-if (!/tools\/skills/i.test(TOOL_SEARCH_TOOL.description || '') || !/deferred/i.test(TOOL_SEARCH_TOOL.description || '') || !TOOL_SEARCH_TOOL.inputSchema?.properties?.select) {
+if (!/deferred tools/i.test(TOOL_SEARCH_TOOL.description || '') || !TOOL_SEARCH_TOOL.inputSchema?.properties?.select) {
   throw new Error('tool_search schema must preserve selection guidance and select field');
 }
+const toolSearchSession = {
+  tools: smokeCatalog.filter((tool) => fullDefaults.has(tool?.name)),
+  deferredToolCatalog: smokeCatalog.slice(),
+  deferredSelectedTools: [...fullDefaults],
+};
+const searchOnlyResult = JSON.parse(__renderToolSearchForTest({ query: 'shell' }, toolSearchSession, 'full'));
+for (const name of ['shell', 'task']) {
+  if (!searchOnlyResult.selected?.tools?.added?.includes(name)) {
+    throw new Error(`tool_search high-confidence query should auto-load ${name}: ${JSON.stringify(searchOnlyResult.selected)}`);
+  }
+}
+if (!searchOnlyResult.activeTools.includes('shell') || !searchOnlyResult.activeTools.includes('task')) {
+  throw new Error(`tool_search query should activate legacy selected tools: ${searchOnlyResult.activeTools.join(',')}`);
+}
+const bulkSelectResult = JSON.parse(__renderToolSearchForTest({ query: 'select:shell,recall' }, toolSearchSession, 'full'));
+for (const name of ['shell', 'task', 'recall']) {
+  if (!bulkSelectResult.activeTools.includes(name)) {
+    throw new Error(`tool_search bulk select missing ${name}: ${JSON.stringify(bulkSelectResult)}`);
+  }
+}
+const prefixedSelectSession = {
+  tools: smokeCatalog.filter((tool) => fullDefaults.has(tool?.name)),
+  deferredToolCatalog: smokeCatalog.slice(),
+  deferredSelectedTools: [...fullDefaults],
+};
+const prefixedSelectResult = JSON.parse(__renderToolSearchForTest({ select: 'select:shell,recall' }, prefixedSelectSession, 'full'));
+if (!prefixedSelectResult.activeTools.includes('shell') || !prefixedSelectResult.activeTools.includes('recall')) {
+  throw new Error(`tool_search select field should accept select: prefix: ${JSON.stringify(prefixedSelectResult)}`);
+}
+if (!Array.isArray(toolSearchSession.deferredDiscoveredTools) || !toolSearchSession.deferredDiscoveredTools.includes('shell')) {
+  throw new Error('tool_search must persist discovered tool state on the session');
+}
+const nativeToolSearchSession = {
+  tools: smokeCatalog.filter((tool) => fullDefaults.has(tool?.name)),
+  deferredToolCatalog: smokeCatalog.slice(),
+  deferredSelectedTools: [...fullDefaults],
+  deferredDiscoveredTools: [],
+  deferredProviderMode: 'native',
+  deferredNativeTools: true,
+};
+const nativeSelectResult = JSON.parse(__renderToolSearchForTest({ select: 'shell,recall' }, nativeToolSearchSession, 'full'));
+if (nativeSelectResult.activeTools.includes('shell') || nativeSelectResult.activeTools.includes('recall')) {
+  throw new Error(`native tool_search must not mutate active tool schemas: ${JSON.stringify(nativeSelectResult)}`);
+}
+for (const name of ['shell', 'task', 'recall']) {
+  if (!nativeSelectResult.discoveredTools.includes(name)) {
+    throw new Error(`native tool_search missing discovered ${name}: ${JSON.stringify(nativeSelectResult)}`);
+  }
+}
+if (!nativeSelectResult.nativeToolSearch?.openaiTools?.some((tool) => tool?.name === 'shell' && tool?.defer_loading === true)) {
+  throw new Error(`native tool_search must return OpenAI loadable deferred tools: ${JSON.stringify(nativeSelectResult.nativeToolSearch)}`);
+}
+if (!nativeSelectResult.nativeToolSearch?.toolReferences?.includes('shell')) {
+  throw new Error(`native tool_search must return Anthropic tool references: ${JSON.stringify(nativeSelectResult.nativeToolSearch)}`);
+}
+const nativePatchSearchSession = {
+  provider: 'openai-oauth',
+  tools: smokeCatalog.filter((tool) => fullDefaults.has(tool?.name) && tool?.name !== 'apply_patch'),
+  deferredToolCatalog: smokeCatalog.slice(),
+  deferredSelectedTools: [...fullDefaults].filter((name) => name !== 'apply_patch'),
+  deferredDiscoveredTools: [],
+  deferredProviderMode: 'native',
+  deferredNativeTools: true,
+};
+const nativePatchSelectResult = JSON.parse(__renderToolSearchForTest({ select: 'apply_patch' }, nativePatchSearchSession, 'full'));
+const nativePatchTool = nativePatchSelectResult.nativeToolSearch?.openaiTools?.find((tool) => tool?.name === 'apply_patch');
+if (nativePatchTool?.type !== 'custom' || nativePatchTool?.format?.syntax !== 'lark') {
+  throw new Error(`native tool_search must preserve apply_patch as OpenAI custom freeform: ${JSON.stringify(nativePatchSelectResult.nativeToolSearch)}`);
+}
+if (nativePatchTool.defer_loading === true || nativePatchTool.parameters) {
+  throw new Error(`native tool_search custom apply_patch must not be downgraded to deferred function schema: ${JSON.stringify(nativePatchTool)}`);
+}
+const nativeGrokPatchSearchSession = {
+  provider: 'grok-oauth',
+  tools: smokeCatalog.filter((tool) => fullDefaults.has(tool?.name) && tool?.name !== 'apply_patch'),
+  deferredToolCatalog: smokeCatalog.slice(),
+  deferredSelectedTools: [...fullDefaults].filter((name) => name !== 'apply_patch'),
+  deferredDiscoveredTools: [],
+  deferredProviderMode: 'native',
+  deferredNativeTools: true,
+};
+const nativeGrokPatchSelectResult = JSON.parse(__renderToolSearchForTest({ select: 'apply_patch' }, nativeGrokPatchSearchSession, 'full'));
+const nativeGrokPatchTool = nativeGrokPatchSelectResult.nativeToolSearch?.openaiTools?.find((tool) => tool?.name === 'apply_patch');
+if (nativeGrokPatchTool?.type !== 'function' || nativeGrokPatchTool?.format || nativeGrokPatchTool?.defer_loading !== true) {
+  throw new Error(`Grok native tool_search apply_patch must use JSON function schema, not OpenAI custom: ${JSON.stringify(nativeGrokPatchTool)}`);
+}
+if (nativeGrokPatchTool.parameters?.properties?.patch?.type !== 'string') {
+  throw new Error(`Grok native tool_search apply_patch must preserve patch JSON schema: ${JSON.stringify(nativeGrokPatchTool)}`);
+}
+const nativeRunQuerySession = {
+  tools: smokeCatalog.filter((tool) => fullDefaults.has(tool?.name)),
+  deferredToolCatalog: smokeCatalog.slice(),
+  deferredSelectedTools: [...fullDefaults],
+  deferredDiscoveredTools: [],
+  deferredProviderMode: 'native',
+  deferredNativeTools: true,
+};
+const nativeRunQueryResult = JSON.parse(__renderToolSearchForTest({ query: 'run tests' }, nativeRunQuerySession, 'full'));
+for (const name of ['shell', 'task']) {
+  if (!nativeRunQueryResult.discoveredTools.includes(name)) {
+    throw new Error(`native tool_search run/tests query should discover ${name}: ${JSON.stringify(nativeRunQueryResult)}`);
+  }
+}
+if (nativeRunQueryResult.activeTools.includes('shell') || nativeRunQueryResult.activeTools.includes('task')) {
+  throw new Error(`native tool_search query must not mutate active schemas: ${JSON.stringify(nativeRunQueryResult)}`);
+}
+const nativeWebQuerySession = {
+  tools: smokeCatalog.filter((tool) => fullDefaults.has(tool?.name)),
+  deferredToolCatalog: smokeCatalog.slice(),
+  deferredSelectedTools: [...fullDefaults],
+  deferredDiscoveredTools: [],
+  deferredProviderMode: 'native',
+  deferredNativeTools: true,
+};
+const nativeWebQueryResult = JSON.parse(__renderToolSearchForTest({ query: 'web docs' }, nativeWebQuerySession, 'full'));
+for (const name of ['search', 'web_fetch']) {
+  if (!nativeWebQueryResult.discoveredTools.includes(name)) {
+    throw new Error(`native tool_search web/docs query should discover ${name}: ${JSON.stringify(nativeWebQueryResult)}`);
+  }
+}
+const nativeRecallQuerySession = {
+  tools: smokeCatalog.filter((tool) => fullDefaults.has(tool?.name)),
+  deferredToolCatalog: smokeCatalog.slice(),
+  deferredSelectedTools: [...fullDefaults],
+  deferredDiscoveredTools: [],
+  deferredProviderMode: 'native',
+  deferredNativeTools: true,
+};
+const nativeRecallQueryResult = JSON.parse(__renderToolSearchForTest({ query: 'memory previous' }, nativeRecallQuerySession, 'full'));
+if (!nativeRecallQueryResult.discoveredTools.includes('recall') || nativeRecallQueryResult.discoveredTools.includes('memory')) {
+  throw new Error(`native tool_search memory previous should discover recall only: ${JSON.stringify(nativeRecallQueryResult)}`);
+}
+const ambiguousStatusSession = {
+  tools: smokeCatalog.filter((tool) => fullDefaults.has(tool?.name)),
+  deferredToolCatalog: smokeCatalog.slice(),
+  deferredSelectedTools: [...fullDefaults],
+  deferredDiscoveredTools: [],
+  deferredProviderMode: 'native',
+  deferredNativeTools: true,
+};
+const ambiguousStatusResult = JSON.parse(__renderToolSearchForTest({ query: 'status' }, ambiguousStatusSession, 'full'));
+if (ambiguousStatusResult.selected || ambiguousStatusResult.discoveredTools.length) {
+  throw new Error(`tool_search ambiguous status query must not auto-load: ${JSON.stringify(ambiguousStatusResult)}`);
+}
 const replyTool = CHANNEL_TOOL_DEFS.find((tool) => tool.name === 'reply');
 if (!/configured channel/i.test(replyTool?.description || '') || !/local .*paths/i.test(replyTool?.inputSchema?.properties?.files?.description || '')) {
   throw new Error('channel reply schema must describe target channel and attachment paths');
@@ -444,8 +1572,8 @@ if (!/NOT for URLs/i.test(fetchTool?.description || '') || !/web_fetch/i.test(fe
 const grepTool = BUILTIN_TOOLS.find((tool) => tool.name === 'grep');
 const grepPatternDescription = grepTool?.inputSchema?.properties?.pattern?.description || '';
 const grepPathDescription = grepTool?.inputSchema?.properties?.path?.description || '';
-if (!/(array for OR|array = OR)/i.test(grepPatternDescription) || !/one file or directory/i.test(grepPathDescription)) {
-  throw new Error('grep schema must keep array-OR and one-path guidance');
+if (!/Array = OR/i.test(grepPatternDescription) || !/^File or directory\.$/i.test(grepPathDescription)) {
+  throw new Error('grep schema must keep compact pattern/path guidance');
 }
 
 const longToolSearchText = compactToolSearchDescription(`${patchDescription}\n${patchDescription}`);