@runfusion/fusion 0.43.0 → 0.44.0

package/dist/pi-claude-cli/src/event-bridge.ts

@@ -420,6 +420,13 @@ export function createEventBridge(
       if (usage.input_tokens != null) output.usage.input = usage.input_tokens;
       if (usage.output_tokens != null)
         output.usage.output = usage.output_tokens;
+      // Cache tokens (parity with handleMessageStart) — the ACP usage path
+      // (OQ3) carries these too; without this they'd be silently dropped and
+      // cost for cached turns would be understated.
+      if (usage.cache_read_input_tokens != null)
+        output.usage.cacheRead = usage.cache_read_input_tokens;
+      if (usage.cache_creation_input_tokens != null)
+        output.usage.cacheWrite = usage.cache_creation_input_tokens;
       output.usage.totalTokens =
         output.usage.input +
         output.usage.output +

package/dist/pi-claude-cli/src/mcp-config.ts

@@ -142,3 +142,32 @@ export function writeMcpConfig(
 
   return configFilePath;
 }
+
+/** A stdio MCP server spec for ACP `session/new.mcpServers` (U11 — Route A). */
+export interface AcpMcpServerSpec {
+  name: string;
+  command: string;
+  args: string[];
+  env: { name: string; value: string }[];
+}
+
+/**
+ * Build the ACP `mcpServers` spec for the same schema-only `custom-tools` server
+ * `writeMcpConfig` produces for `--mcp-config` — but as the inline ACP shape
+ * (`session/new.mcpServers`) instead of a config-file path (U11). Writes the
+ * tool-schema file and points the server at the shared `mcp-schema-server.cjs`.
+ * Returns `[]` when there are no custom tools (Route B read-only posture).
+ */
+export function buildAcpMcpServers(
+  toolDefs: McpToolDef[],
+  cacheKey?: string,
+): AcpMcpServerSpec[] {
+  if (toolDefs.length === 0) return [];
+  const suffix = cacheKey ? `${process.pid}-${cacheKey}` : `${process.pid}`;
+  const schemaFilePath = join(tmpdir(), `pi-claude-mcp-schemas-${suffix}.json`);
+  writeFileSync(schemaFilePath, JSON.stringify(toolDefs));
+  const serverPath = join(dirname(fileURLToPath(import.meta.url)), "mcp-schema-server.cjs");
+  return [
+    { name: "custom-tools", command: "node", args: [serverPath, schemaFilePath], env: [] },
+  ];
+}

package/dist/pi-claude-cli/src/process-manager.ts

@@ -6,7 +6,7 @@
  * Also provides startup validation for CLI presence and authentication.
  */
 
-import { execSync, spawn, type ChildProcess } from "node:child_process";
+import { spawn, type ChildProcess } from "node:child_process";
 import { writeFileSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
@@ -208,47 +208,15 @@ export function captureStderr(proc: ChildProcess): () => string {
   return () => buffer;
 }
 
-/**
- * Validate that the Claude CLI is installed and on PATH.
- * Throws with install instructions if not found.
- */
-export function validateCliPresence(): void {
-  try {
-    execSync("claude --version", { stdio: "pipe", timeout: 5000 });
-  } catch {
-    throw new Error(
-      "Claude Code CLI not found. Install it: npm install -g @anthropic-ai/claude-code\n" +
-        "Then authenticate: claude auth login",
-    );
-  }
-}
-
-/**
- * Validate that the Claude CLI is authenticated.
- * Returns false and warns if not authenticated.
- *
- * @returns true if authenticated, false otherwise
- */
-export function validateCliAuth(): boolean {
-  try {
-    execSync("claude auth status", { stdio: "pipe", timeout: 5000 });
-    return true;
-  } catch {
-    console.warn(
-      "[pi-claude-cli] Claude CLI is not authenticated. " +
-        "Run 'claude auth login' to authenticate.",
-    );
-    return false;
-  }
-}
-
 /**
  * Run a one-shot `claude <args>` and resolve to the exit code.
  *
- * Why: the sync execSync variants block the Node event loop for the duration
- * of a Claude CLI cold start (1–3s, occasionally longer). When pi-claude-cli's
+ * FNXC:CliRuntime 2026-06-15-07:35:
+ * Third-party CLI presence/auth probes must be non-blocking in Fusion request and session-startup paths. Use spawn-based probes here because synchronous shell probes freeze the dashboard event loop during CLI cold start.
+ *
+ * Why: a Claude CLI cold start can take 1–3s, occasionally longer. When pi-claude-cli's
  * factory is invoked from a per-request createFnAgent path (Fusion dashboard
- * does this on every chat send), those sync probes freeze every other request.
+ * does this on every chat send), sync probes freeze every other request.
  * This async variant uses spawn so the loop keeps turning while the subprocess
  * starts up.
  */