clementine-agent 1.0.63 → 1.0.65

package/dist/agent/assistant.js

@@ -702,6 +702,21 @@ export class PersonalAssistant {
         if (sysMsg.mcp_servers) {
             this._lastMcpStatus = sysMsg.mcp_servers;
             this._lastMcpStatusTime = new Date().toISOString();
+            // Diagnostic (1.0.64+): log per-server connection status on every
+            // init so we can tell whether "No such tool available" errors are
+            // caused by a failed spawn vs misconfigured allowedTools vs session
+            // weirdness. Single-line grep target: 'SDK init — MCP servers'.
+            try {
+                const statuses = sysMsg.mcp_servers.map((s) => `${s.name}:${s.status}`);
+                logger.info({
+                    statuses,
+                    toolCount: Array.isArray(sysMsg.tools) ? sysMsg.tools.length : 0,
+                    sessionId: sysMsg.session_id,
+                    cwd: sysMsg.cwd,
+                    model: sysMsg.model,
+                }, 'SDK init — MCP servers');
+            }
+            catch { /* non-fatal */ }
         }
         // Auto-register Claude Desktop integrations from the authoritative tool
         // list the SDK reports on init. Previously the claude-integrations file
@@ -1659,7 +1674,16 @@ You have a cost budget per message — not a hard turn limit. Work until the tas
             ...(abortController ? { abortController } : {}),
             maxTurns: effectiveMaxTurns,
             cwd: BASE_DIR,
-            env: SAFE_ENV,
+            // NOTE: do NOT pass `env: SAFE_ENV` here. The SDK's `env` option
+            // replaces process.env for the claude CLI subprocess, and the CLI's
+            // claude.ai remote connector bootstrap (Drive, Gmail, Calendar, M365,
+            // Slack) silently drops when vars it expects aren't present. The
+            // probeAvailableTools() call doesn't pass `env`, inherits process.env,
+            // and correctly surfaces claude.ai connectors. Matching that behavior
+            // here is the fix for the week-long "No such tool available:
+            // mcp__claude_ai_Google_Drive__*" bug. Per-MCP-server env isolation
+            // still happens inside the mcpServers entries (line ~1855) — this
+            // change only affects the CLI subprocess's own env.
             ...(computedEffort ? { effort: computedEffort } : {}),
             // maxBudgetUsd intentionally omitted — see comment above.
             ...(computedThinking ? { thinking: computedThinking } : {}),
@@ -2246,6 +2270,20 @@ You have a cost budget per message — not a hard turn limit. Work until the tas
                     eventLog.emitQueryStart(sessionKey, prompt, { model: sdkOptions.model ?? undefined, source: 'chat' });
                 }
                 try {
+                    // Diagnostic (1.0.64+): log the exact options we hand to query().
+                    // Compare against a known-working standalone call to pinpoint
+                    // config drift. Single-line grep target: 'query() options'.
+                    logger.info({
+                        sessionKey,
+                        cwd: sdkOptions.cwd,
+                        mcpServerKeys: Object.keys(sdkOptions.mcpServers ?? {}),
+                        toolsCount: Array.isArray(sdkOptions.tools) ? sdkOptions.tools.length : 'preset-or-omitted',
+                        allowedToolsCount: sdkOptions.allowedTools?.length ?? 0,
+                        disallowedToolsCount: sdkOptions.disallowedTools?.length ?? 0,
+                        hasResume: !!sdkOptions.resume,
+                        resumeSessionId: sdkOptions.resume,
+                        model: sdkOptions.model,
+                    }, 'query() options');
                     const stream = query({ prompt, options: sdkOptions });
                     let gotStreamEvents = false;
                     for await (const message of stream) {
@@ -2609,6 +2647,41 @@ You have a cost budget per message — not a hard turn limit. Work until the tas
                                 })(),
                                 replyPreview: responseText.slice(0, 200).replace(/\n/g, ' '),
                             }, 'Contradiction validator pass');
+                            // Diagnostic (1.0.64+): dump EVERY tool_result whose content
+                            // looks like the SDK's "No such tool available" error, with
+                            // its full content + corresponding tool_use. The specific
+                            // pairing is what we need to diagnose whether a particular
+                            // server failed to register vs a specific tool was dropped.
+                            try {
+                                const useById = new Map();
+                                for (const msg of collectedSdkMessages) {
+                                    if (msg.type !== 'assistant' || !msg.message?.content)
+                                        continue;
+                                    for (const b of (Array.isArray(msg.message.content) ? msg.message.content : [])) {
+                                        if (b?.type === 'tool_use' && b.id && b.name)
+                                            useById.set(b.id, b.name);
+                                    }
+                                }
+                                for (const msg of collectedSdkMessages) {
+                                    if (msg.type !== 'user' || !msg.message?.content)
+                                        continue;
+                                    for (const b of (Array.isArray(msg.message.content) ? msg.message.content : [])) {
+                                        if (b?.type !== 'tool_result')
+                                            continue;
+                                        const contentStr = typeof b.content === 'string' ? b.content : JSON.stringify(b.content);
+                                        if (/tool_use_error/i.test(contentStr)) {
+                                            logger.warn({
+                                                sessionKey,
+                                                tool_use_id: b.tool_use_id,
+                                                tool_name: useById.get(b.tool_use_id) ?? '(unknown)',
+                                                is_error: b.is_error,
+                                                content: contentStr.slice(0, 600),
+                                            }, 'SDK tool_use_error surfaced');
+                                        }
+                                    }
+                                }
+                            }
+                            catch { /* non-fatal */ }
                         }
                         const finding = detectContradiction(responseText, toolCallRecords);
                         if (finding) {

package/package.json

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