clementine-agent 1.18.33 → 1.18.34

package/dist/agent/assistant.js

@@ -15,7 +15,7 @@ import { query as rawQuery, listSubagents, getSubagentMessages, SYSTEM_PROMPT_DY
 import pino from 'pino';
 import { BASE_DIR, PKG_DIR, VAULT_DIR, DAILY_NOTES_DIR, SOUL_FILE, AGENTS_FILE, MEMORY_FILE, AGENTS_DIR, ASSISTANT_NAME, OWNER_NAME, MODEL, MODELS, HEARTBEAT_MAX_TURNS, SEARCH_CONTEXT_LIMIT, SEARCH_RECENCY_LIMIT, SYSTEM_PROMPT_MAX_CONTEXT_CHARS, SESSION_EXCHANGE_HISTORY_SIZE, SESSION_EXCHANGE_MAX_CHARS, INJECTED_CONTEXT_MAX_CHARS, UNLEASHED_PHASE_TURNS, UNLEASHED_DEFAULT_MAX_HOURS, UNLEASHED_MAX_PHASES, PROJECTS_META_FILE, CRON_PROGRESS_DIR, CRON_REFLECTIONS_DIR, HANDOFFS_DIR, BUDGET, TASK_BUDGET_TOKENS, IDENTITY_FILE, CLAUDE_CODE_OAUTH_TOKEN, ANTHROPIC_API_KEY as CONFIG_ANTHROPIC_API_KEY, claudeCodeDisableOneMillionForModel, currentOneMillionContextMode, normalizeClaudeModelForOneMillionContext, normalizeClaudeSdkOptionsForOneMillionContext, applyOneMillionContextRecovery, looksLikeClaudeOneMillionContextError, usesOneMillionContext, envSnapshot, } from '../config.js';
 import { summarizeIntegrationStatus } from '../config/integrations-registry.js';
-import { loadToolPreferences, computeAvailability, buildPromptInstruction, buildComposioStatusBlock, } from '../integrations/tool-preferences.js';
+import { loadToolPreferences, computeAvailability, buildPromptInstruction, buildComposioStatusBlock, KNOWN_SERVICES, } from '../integrations/tool-preferences.js';
 import { loadClaudeIntegrations } from './mcp-bridge.js';
 import { detectFrustrationSignals, detectRepeatedTopics } from './insight-engine.js';
 import { DEFAULT_CHANNEL_CAPABILITIES } from '../types.js';
@@ -32,7 +32,7 @@ import { PromptCache } from './prompt-cache.js';
 import { searchSkills as searchSkillsSync } from './skill-extractor.js';
 import { classifyIntent, getStrategyGuidance } from './intent-classifier.js';
 import { getEventLog } from './session-event-log.js';
-import { routeToolSurface, TOOL_SURFACE_HARD_LIMIT, TOOL_SURFACE_WARN_THRESHOLD } from './tool-router.js';
+import { applyServiceDedup, routeToolSurface, TOOL_SURFACE_HARD_LIMIT, TOOL_SURFACE_WARN_THRESHOLD } from './tool-router.js';
 import { isRestrictedToolset, toolsetAllowsLocalWrites } from './toolsets.js';
 import { looksLikeApprovalPrompt } from './local-turn.js';
 import { decideTurn } from './turn-policy.js';
@@ -2436,6 +2436,65 @@ You have a cost budget per message — not a hard turn limit. Work until the tas
                 whitelist.add(mcpTool('goal_work'));
                 allowedTools = allowedTools.filter(t => whitelist.has(t));
             }
+            // ── Per-service dedup (intelligent routing) ───────────────────
+            // When a service has BOTH Composio + Claude Desktop sources
+            // connected (e.g. Composio outlook + claude.ai Microsoft 365),
+            // bundles in tool-router list both so either path can route to
+            // whichever is connected. But if BOTH are connected, today's
+            // behavior loaded both — and worse, claude.ai's auto-attach
+            // would pull in every other connector the user authorized
+            // (Drive, Gmail, Calendar, Slack…) via the env path. ~300+ tool
+            // schemas leak in this way and leave Sonnet's autocompact no
+            // room to work.
+            //
+            // Dedup walks each (Composio↔claude.ai) pair, picks ONE per
+            // user preference (default Composio), drops the loser from
+            // mcpServers + allowedTools, and turns inheritFullClaudeEnv off
+            // when no claude.ai service survived (so SAFE_ENV is used and
+            // the SDK can't auto-attach the other connectors).
+            if (!toolsDisabledForCall && !isPlanStep && !toolRoute.fullSurface) {
+                const composioConnected = new Set(Object.keys(composioMcpServers));
+                const cdIntegrationsForDedup = loadClaudeIntegrations();
+                const claudeDesktopActive = new Set(Object.values(cdIntegrationsForDedup).filter(i => i.connected).map(i => i.name));
+                const prefs = loadToolPreferences();
+                const dedupResult = applyServiceDedup(toolRoute, {
+                    composioConnected,
+                    claudeDesktopActive,
+                    preferences: prefs.preferences,
+                    knownServices: KNOWN_SERVICES,
+                });
+                if (dedupResult.droppedClaudeAi.length > 0 || dedupResult.droppedComposio.length > 0) {
+                    const beforeAllowed = allowedTools.length;
+                    const beforeInherit = toolRoute.inheritFullClaudeEnv;
+                    toolRoute = dedupResult.route;
+                    for (const name of dedupResult.droppedClaudeAi) {
+                        delete externalMcpServers[name];
+                    }
+                    for (const slug of dedupResult.droppedComposio) {
+                        delete composioMcpServers[slug];
+                    }
+                    const droppedServers = new Set([
+                        ...dedupResult.droppedClaudeAi,
+                        ...dedupResult.droppedComposio,
+                    ]);
+                    allowedTools = allowedTools.filter(tool => {
+                        if (!tool.startsWith('mcp__'))
+                            return true;
+                        const serverName = tool.slice('mcp__'.length).split('__')[0];
+                        return !droppedServers.has(serverName);
+                    });
+                    logger.info({
+                        sessionKey,
+                        droppedClaudeAi: dedupResult.droppedClaudeAi,
+                        droppedComposio: dedupResult.droppedComposio,
+                        anyClaudeDesktopKept: dedupResult.anyClaudeDesktopKept,
+                        inheritFullClaudeEnvBefore: beforeInherit,
+                        inheritFullClaudeEnvAfter: toolRoute.inheritFullClaudeEnv,
+                        allowedToolCountBefore: beforeAllowed,
+                        allowedToolCountAfter: allowedTools.length,
+                    }, 'Tool route deduped per user tool-preferences');
+                }
+            }
             // Tool-surface cap. Applies to chat AND to autonomous runs (cron,
             // unleashed, heartbeat). Without this cap on cron, a single job got
             // 300+ MCP tool schemas in the system prompt — leaving Sonnet's SDK

package/dist/agent/tool-router.d.ts

@@ -31,5 +31,32 @@ export declare const TOOL_SURFACE_WARN_THRESHOLD = 150;
 export declare const TOOL_SURFACE_HARD_LIMIT = 220;
 export declare const TOOL_BUNDLES: readonly ToolBundleDefinition[];
 export declare function routeToolSurface(text: string | undefined): ToolRouteDecision;
+import type { ServiceDefinition, ToolSource } from '../integrations/tool-preferences.js';
+export interface ServiceDedupOptions {
+    /** Composio toolkit slugs the user has actually connected. */
+    composioConnected: Set<string>;
+    /** Claude Desktop integration names the user has actually connected. */
+    claudeDesktopActive: Set<string>;
+    /** User-selected source per service id (from tool-preferences.json). */
+    preferences: Record<string, ToolSource>;
+    /** The KNOWN_SERVICES registry. Passed in so this module stays
+     *  decoupled from tool-preferences (and tests can stub the table). */
+    knownServices: readonly ServiceDefinition[];
+}
+export interface ServiceDedupResult {
+    /** The route with losing sources removed from external + composio sets. */
+    route: ToolRouteDecision;
+    /** Claude Desktop integration names that were dropped. Used by the
+     *  caller to add disallowedTools and decide whether the SDK subprocess
+     *  needs claude.ai env inheritance at all. */
+    droppedClaudeAi: string[];
+    /** Composio toolkit slugs that were dropped. Mirror of the above. */
+    droppedComposio: string[];
+    /** True if any claude.ai integration survived dedup. When false, the
+     *  caller can drop CLAUDE_CODE_OAUTH_TOKEN from the subprocess env so
+     *  Claude Code doesn't auto-attach claude.ai connectors. */
+    anyClaudeDesktopKept: boolean;
+}
+export declare function applyServiceDedup(route: ToolRouteDecision, opts: ServiceDedupOptions): ServiceDedupResult;
 export {};
 //# sourceMappingURL=tool-router.d.ts.map

package/dist/agent/tool-router.js

@@ -193,4 +193,89 @@ export function routeToolSurface(text) {
         reason: bundles.size > 0 || external.size > 0 || composio.size > 0 ? 'matched' : 'empty',
     };
 }
+export function applyServiceDedup(route, opts) {
+    const droppedClaudeAi = [];
+    const droppedComposio = [];
+    // fullSurface routes intentionally load everything — admin/debug paths.
+    // Skip dedup so behavior matches the user's explicit "all tools" intent.
+    if (route.fullSurface) {
+        return {
+            route,
+            droppedClaudeAi,
+            droppedComposio,
+            anyClaudeDesktopKept: true,
+        };
+    }
+    const externalSet = new Set(route.externalMcpServers ?? []);
+    const composioSet = new Set(route.composioToolkits ?? []);
+    for (const service of opts.knownServices) {
+        const cdName = service.claudeDesktopName;
+        const composioSlug = service.composioSlug;
+        if (!cdName || !composioSlug)
+            continue;
+        const routeHasCd = externalSet.has(cdName);
+        const routeHasComposio = composioSet.has(composioSlug);
+        if (!routeHasCd || !routeHasComposio)
+            continue;
+        // Both sources are in the route. Resolve based on availability + pref.
+        const cdAvailable = opts.claudeDesktopActive.has(cdName);
+        const composioAvailable = opts.composioConnected.has(composioSlug);
+        if (!cdAvailable && !composioAvailable) {
+            // Neither connected — drop both (the route lists them, but they'll
+            // fail at attach time). Cleaner to remove now.
+            externalSet.delete(cdName);
+            composioSet.delete(composioSlug);
+            droppedClaudeAi.push(cdName);
+            droppedComposio.push(composioSlug);
+            continue;
+        }
+        if (!cdAvailable) {
+            // Only Composio connected — drop the claude.ai entry.
+            externalSet.delete(cdName);
+            droppedClaudeAi.push(cdName);
+            continue;
+        }
+        if (!composioAvailable) {
+            composioSet.delete(composioSlug);
+            droppedComposio.push(composioSlug);
+            continue;
+        }
+        // Conflict: both connected. Pick per user preference, default Composio.
+        const userPref = opts.preferences[service.id];
+        const effective = userPref === 'off'
+            ? 'off'
+            : userPref ?? 'composio';
+        if (effective === 'off') {
+            externalSet.delete(cdName);
+            composioSet.delete(composioSlug);
+            droppedClaudeAi.push(cdName);
+            droppedComposio.push(composioSlug);
+        }
+        else if (effective === 'composio') {
+            externalSet.delete(cdName);
+            droppedClaudeAi.push(cdName);
+        }
+        else if (effective === 'claude-desktop') {
+            composioSet.delete(composioSlug);
+            droppedComposio.push(composioSlug);
+        }
+    }
+    // After dedup, the SDK subprocess needs claude.ai env inheritance ONLY
+    // if some claude.ai integration is still in the route. If everything
+    // routed to Composio, force inheritFullClaudeEnv off so Claude Code
+    // can't auto-attach the rest of the user's authorized integrations.
+    const anyClaudeDesktopKept = externalSet.size > 0
+        && [...externalSet].some(name => opts.claudeDesktopActive.has(name));
+    return {
+        route: {
+            ...route,
+            externalMcpServers: [...externalSet],
+            composioToolkits: [...composioSet],
+            inheritFullClaudeEnv: route.inheritFullClaudeEnv && anyClaudeDesktopKept,
+        },
+        droppedClaudeAi,
+        droppedComposio,
+        anyClaudeDesktopKept,
+    };
+}
 //# sourceMappingURL=tool-router.js.map

package/package.json

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