@ash-cloud/ash-ai 0.1.19 → 0.1.20

package/dist/index.js

@@ -885,6 +885,32 @@ var init_mcp = __esm({
 });
 
 // src/agent/claude-sdk.ts
+function isStandardMcpServerConfig(config) {
+  if (!config || typeof config !== "object") return false;
+  const candidate = config;
+  if (typeof candidate.command === "string") return true;
+  if (typeof candidate.url === "string") return true;
+  if (candidate.type === "stdio" || candidate.type === "http" || candidate.type === "sse") return true;
+  return false;
+}
+function hasCustomMcpServers(mcpServers) {
+  if (!mcpServers) return false;
+  return Object.values(mcpServers).some((config) => !isStandardMcpServerConfig(config));
+}
+async function* toStreamingPrompt(prompt) {
+  yield {
+    type: "user",
+    message: {
+      role: "user",
+      content: prompt
+    }
+  };
+}
+function normalizePromptForSdk(prompt, mcpServers) {
+  if (typeof prompt !== "string") return prompt;
+  if (!hasCustomMcpServers(mcpServers)) return prompt;
+  return toStreamingPrompt(prompt);
+}
 function convertClaudeMessage(claudeMessage, sessionId) {
   if (claudeMessage.type !== "assistant" || !claudeMessage.message) {
     return null;
@@ -928,16 +954,17 @@ function normalizeMcpServers(mcpServers) {
   if (!mcpServers) return mcpServers;
   return Object.fromEntries(
     Object.entries(mcpServers).map(([name, config]) => {
-      if (!config.auth) {
+      const configWithAuth = config;
+      if (!configWithAuth.auth) {
         return [name, config];
       }
-      const authHeaders = mcpAuthToHeaders(config.auth);
-      const { auth: _auth, ...rest } = config;
+      const authHeaders = mcpAuthToHeaders(configWithAuth.auth);
+      const { auth: _auth, ...rest } = configWithAuth;
       return [name, {
         ...rest,
         headers: {
           ...authHeaders,
-          ...config.headers
+          ...configWithAuth.headers
           // Explicit headers take precedence
         }
       }];
@@ -964,8 +991,22 @@ var init_claude_sdk = __esm({
       async *query(prompt, options = {}) {
         const model = options.model ?? this.defaultModel;
         if (await this.checkSdkAvailable()) {
-          yield* this.executeRealQuery(prompt, { ...options, model });
+          const normalizedOptions = { ...options, model };
+          if (normalizedOptions.agents) {
+            const allowedTools = normalizedOptions.allowedTools ?? [];
+            if (!allowedTools.includes("Task")) {
+              normalizedOptions.allowedTools = [...allowedTools, "Task"];
+            }
+          }
+          yield* this.executeRealQuery(prompt, normalizedOptions);
         } else {
+          if (typeof prompt !== "string") {
+            yield {
+              type: "error",
+              error: "Streaming prompts require the real Claude Agent SDK to be installed."
+            };
+            return;
+          }
           yield* this.executeSimulatedQuery(prompt, { ...options, model });
         }
       }
@@ -979,8 +1020,9 @@ var init_claude_sdk = __esm({
         }
         try {
           const { query } = await import('@anthropic-ai/claude-agent-sdk');
+          const normalizedMcpServers = normalizeMcpServers(options.mcpServers);
           const queryOptions = {
-            prompt,
+            prompt: normalizePromptForSdk(prompt, options.mcpServers),
             options: {
               model: options.model,
               allowedTools: options.allowedTools,
@@ -989,10 +1031,12 @@ var init_claude_sdk = __esm({
               maxTurns: options.maxTurns,
               resume: options.resume,
               forkSession: options.forkSession,
-              mcpServers: options.mcpServers,
+              mcpServers: normalizedMcpServers,
               agents: options.agents,
               hooks: options.hooks,
+              plugins: options.plugins,
               settingSources: options.settingSources,
+              outputFormat: options.outputFormat,
               // Enable streaming partial messages for real-time text deltas
               includePartialMessages: true,
               // Environment variables for the SDK
@@ -1015,7 +1059,8 @@ var init_claude_sdk = __esm({
             if (message.type === "system" && message.subtype === "init") {
               yield {
                 type: "session_init",
-                sessionId: message.session_id
+                sessionId: message.session_id,
+                slashCommands: message.slash_commands
               };
               continue;
             }
@@ -1066,12 +1111,17 @@ var init_claude_sdk = __esm({
               }
             }
             if (message.type === "result") {
+              const usage = message.usage;
+              const hasUsageTokens = !!usage && (usage.input_tokens !== void 0 || usage.output_tokens !== void 0);
+              const totalTokens = hasUsageTokens ? (usage?.input_tokens ?? 0) + (usage?.output_tokens ?? 0) : message.tokens ? message.tokens.input + message.tokens.output : void 0;
+              const totalCost = usage?.total_cost_usd ?? message.cost ?? message.total_cost_usd;
               yield {
                 type: "complete",
                 sessionId: message.session_id,
                 result: message.result,
-                totalCost: message.cost,
-                totalTokens: message.tokens ? message.tokens.input + message.tokens.output : void 0
+                structured_output: message.structured_output,
+                totalCost,
+                totalTokens
               };
             }
           }
@@ -1079,6 +1129,13 @@ var init_claude_sdk = __esm({
           const errorMessage = error instanceof Error ? error.message : "Unknown error";
           if (errorMessage.includes("Cannot find module") || errorMessage.includes("MODULE_NOT_FOUND")) {
             console.warn("Claude Agent SDK not installed, using simulation mode");
+            if (typeof prompt !== "string") {
+              yield {
+                type: "error",
+                error: "Streaming prompts require the real Claude Agent SDK to be installed."
+              };
+              return;
+            }
             yield* this.executeSimulatedQuery(prompt, options);
           } else {
             yield {
@@ -1256,7 +1313,11 @@ var init_claude_sdk = __esm({
             this.sessionId = msg.session_id;
           }
           if (msg.type === "system" && msg.subtype === "init") {
-            yield { type: "session_init", sessionId: msg.session_id };
+            yield {
+              type: "session_init",
+              sessionId: msg.session_id,
+              slashCommands: msg.slash_commands
+            };
           } else if (msg.type === "assistant" && msg.message) {
             for (const block of msg.message.content) {
               if (block.type === "text") {
@@ -1684,6 +1745,13 @@ function createGeminiBackendExecutor(options) {
     defaultModel: options.model ?? DEFAULT_MODELS.gemini
   });
   return async function* (prompt, queryOptions) {
+    if (typeof prompt !== "string") {
+      yield {
+        type: "error",
+        error: "Gemini backend does not support streaming prompt inputs."
+      };
+      return;
+    }
     const geminiOptions = mapClaudeOptionsToGemini(queryOptions);
     if (queryOptions.signal) {
       geminiOptions.signal = queryOptions.signal;
@@ -1848,6 +1916,11 @@ var init_sandbox_logger = __esm({
     };
   }
 });
+function getClaudeSdkOverrides(config) {
+  const raw = config?.claudeSdkOptions;
+  if (!raw || typeof raw !== "object") return void 0;
+  return raw;
+}
 var AgentHarness;
 var init_harness = __esm({
   "src/agent/harness.ts"() {
@@ -2104,6 +2177,7 @@ var init_harness = __esm({
             yield sessionStartEvent;
             yield* yieldQueuedLogs();
             const assistantContent = [];
+            let structuredOutput;
             let wasAborted = false;
             try {
               logger3.info("execution", "Starting Claude Agent SDK query");
@@ -2194,6 +2268,10 @@ var init_harness = __esm({
                   };
                   writeEvent?.(toolResultEvent);
                   yield toolResultEvent;
+                } else if (event.type === "complete") {
+                  if (event.structured_output !== void 0) {
+                    structuredOutput = event.structured_output;
+                  }
                 }
               }
               if (wasAborted || controller.signal.aborted) {
@@ -2245,7 +2323,8 @@ var init_harness = __esm({
                   [
                     {
                       role: "assistant",
-                      content: assistantContent
+                      content: assistantContent,
+                      ...structuredOutput !== void 0 ? { metadata: { structured_output: structuredOutput } } : {}
                     }
                   ]
                 );
@@ -2366,11 +2445,15 @@ var init_harness = __esm({
       async *executeAgentQuery(session, prompt, options, signal, _logger) {
         const sessionEnvVars = session.metadata?.envVars;
         const sessionStartupScript = session.metadata?.startupScript;
+        const sdkOverrides = getClaudeSdkOverrides(this.config.config);
         const mergedEnvVars = {
           MAX_THINKING_TOKENS: "1024",
           ...this.config.envVars,
           ...sessionEnvVars
         };
+        if (sdkOverrides?.enableFileCheckpointing) {
+          mergedEnvVars.CLAUDE_CODE_ENABLE_SDK_FILE_CHECKPOINTING = "1";
+        }
         const hasEnvVars = Object.keys(mergedEnvVars).length > 0;
         const startupScript = sessionStartupScript ?? this.config.startupScript;
         const queryOptions = {
@@ -2379,7 +2462,9 @@ var init_harness = __esm({
           disallowedTools: this.config.disallowedTools,
           permissionMode: this.config.permissionMode,
           maxTurns: this.config.maxTurns,
+          outputFormat: options.outputFormat,
           mcpServers: this.config.mcpServers,
+          settingSources: this.config.settingSources ?? ["project"],
           // Pass the harness session ID for sandbox caching
           harnessSessionId: session.id,
           // Pass environment and startup configuration
@@ -2388,6 +2473,17 @@ var init_harness = __esm({
           // Pass config file URL for cloud-hosted .claude directory (downloaded in sandbox)
           ...this.config.configFileUrl && { configFileUrl: this.config.configFileUrl }
         };
+        if (sdkOverrides) {
+          if (sdkOverrides.hooks) queryOptions.hooks = sdkOverrides.hooks;
+          if (typeof sdkOverrides.enableFileCheckpointing === "boolean") {
+            queryOptions.enableFileCheckpointing = sdkOverrides.enableFileCheckpointing;
+            if (sdkOverrides.enableFileCheckpointing && !sdkOverrides.extraArgs) {
+              queryOptions.extraArgs = { "replay-user-messages": null };
+            }
+          }
+          if (sdkOverrides.extraArgs) queryOptions.extraArgs = sdkOverrides.extraArgs;
+          if (sdkOverrides.permissionMode) queryOptions.permissionMode = sdkOverrides.permissionMode;
+        }
         const sessionApiKey = this.sessionApiKeys.get(session.id);
         if (sessionApiKey) {
           queryOptions.apiKey = sessionApiKey;
@@ -2423,7 +2519,9 @@ ${prompt}`;
         const skillsDir = this.sessionSkillDirs.get(session.id);
         if (skillsDir) {
           queryOptions.cwd = skillsDir;
-          queryOptions.settingSources = ["project"];
+          if (queryOptions.settingSources === void 0) {
+            queryOptions.settingSources = ["project"];
+          }
           if (queryOptions.allowedTools && !queryOptions.allowedTools.includes("Skill")) {
             queryOptions.allowedTools = [...queryOptions.allowedTools, "Skill"];
           }
@@ -2452,6 +2550,7 @@ ${prompt}`;
             await this.sessionManager.updateSession(session.id, {
               sdkSessionId: event.sessionId
             });
+            yield { type: "session_init", sessionId: event.sessionId, slashCommands: event.slashCommands };
           } else if (event.type === "text_delta" && event.delta) {
             yield { type: "text_delta", delta: event.delta };
           } else if (event.type === "thinking_delta" && event.delta) {
@@ -2472,6 +2571,11 @@ ${prompt}`;
               content: event.content,
               isError: event.isError
             };
+          } else if (event.type === "complete") {
+            yield {
+              type: "complete",
+              structured_output: event.structured_output
+            };
           } else if (event.type === "error") {
             throw new Error(event.error ?? "Unknown error from Claude SDK");
           }
@@ -4613,6 +4717,12 @@ echo "[warmup] Warmup complete!"
       startPromise = null;
       /** Registered warmup specs by tag (e.g. agentId -> spec) */
       warmupSpecs = /* @__PURE__ */ new Map();
+      /** Tags currently being warmed (prevents duplicate warming of same spec) */
+      warmingTags = /* @__PURE__ */ new Set();
+      /** Max warmup specs to keep (LRU eviction above this) */
+      static MAX_SPECS = 10;
+      /** Timeout for spec setup in ms (prevents hanging S3 pulls / install.sh) */
+      static SPEC_SETUP_TIMEOUT_MS = 12e4;
       /** Consecutive warmup failure count (reset on success) */
       consecutiveFailures = 0;
       /** Timestamp of last warmup attempt — used for backoff */
@@ -4625,7 +4735,7 @@ echo "[warmup] Warmup complete!"
         this.config = {
           minPoolSize: config.minPoolSize ?? parseInt(process.env.SANDBOX_POOL_MIN_SIZE ?? "2"),
           maxPoolSize: config.maxPoolSize ?? parseInt(process.env.SANDBOX_POOL_MAX_SIZE ?? "5"),
-          sandboxTimeout: config.sandboxTimeout ?? parseInt(process.env.SANDBOX_TIMEOUT ?? "900"),
+          sandboxTimeout: config.sandboxTimeout ?? parseInt(process.env.SANDBOX_TIMEOUT ?? "300"),
           expiryThresholdMs: config.expiryThresholdMs ?? parseInt(process.env.SANDBOX_EXPIRY_THRESHOLD_MS ?? "120000"),
           maintenanceIntervalMs: config.maintenanceIntervalMs ?? parseInt(process.env.SANDBOX_POOL_MAINTENANCE_MS ?? "30000"),
           runtime: config.runtime ?? "node22",
@@ -4831,18 +4941,28 @@ echo "[warmup] Warmup complete!"
       }
       /**
        * Register a warmup spec so the pool can pre-warm agent-specific sandboxes.
-       * If a spec with the same tag already exists, it is replaced.
+       * If a spec with the same tag and configHash already exists, only updates priority (skip #7).
+       * Evicts lowest-priority specs when exceeding MAX_SPECS (fix #2).
        * Triggers replenishment to warm a sandbox for this spec.
        */
       registerWarmupSpec(spec) {
-        const isNew = !this.warmupSpecs.has(spec.tag);
+        const existing = this.warmupSpecs.get(spec.tag);
+        if (existing && spec.configHash && existing.configHash === spec.configHash) {
+          existing.priority = spec.priority;
+          return;
+        }
+        const isNew = !existing;
         this.warmupSpecs.set(spec.tag, spec);
-        console.log(`[POOL] ${isNew ? "Registered" : "Updated"} warmup spec: ${spec.tag} (priority=${spec.priority})`);
+        if (this.warmupSpecs.size > _SandboxPool.MAX_SPECS) {
+          this.evictLowestPrioritySpecs();
+        }
+        console.log(`[POOL] ${isNew ? "Registered" : "Updated"} warmup spec: ${spec.tag} (priority=${spec.priority}, specs=${this.warmupSpecs.size})`);
         this.emitMetric("spec_registered", {
           tag: spec.tag,
           priority: spec.priority,
           isNew,
-          totalSpecs: this.warmupSpecs.size
+          totalSpecs: this.warmupSpecs.size,
+          configHash: spec.configHash
         });
         if (this.running) {
           this.triggerReplenishment();
@@ -4969,20 +5089,41 @@ echo "[warmup] Warmup complete!"
           }
           let warmupTag;
           let agentSetupComplete = false;
+          let warmupInstallRan = false;
+          let warmupStartupRan = false;
           if (spec) {
+            this.warmingTags.add(spec.tag);
             console.log(`[POOL] Running spec setup for tag=${spec.tag} on sandbox ${sandbox.sandboxId}...`);
             this.emitMetric("spec_setup_started", { tag: spec.tag, sandboxId: sandbox.sandboxId });
             const specStartTime = Date.now();
             try {
-              await spec.setup(sandbox);
+              const setupResult = await new Promise((resolve3, reject) => {
+                const timer = setTimeout(
+                  () => reject(new Error(`Spec setup timed out after ${_SandboxPool.SPEC_SETUP_TIMEOUT_MS / 1e3}s`)),
+                  _SandboxPool.SPEC_SETUP_TIMEOUT_MS
+                );
+                spec.setup(sandbox).then((result) => {
+                  clearTimeout(timer);
+                  resolve3(result);
+                }).catch((error) => {
+                  clearTimeout(timer);
+                  reject(error);
+                });
+              });
               warmupTag = spec.tag;
               agentSetupComplete = true;
+              if (setupResult && typeof setupResult === "object") {
+                warmupInstallRan = setupResult.installRan === true;
+                warmupStartupRan = setupResult.startupRan === true;
+              }
               const specDuration = Date.now() - specStartTime;
-              console.log(`[POOL] Spec setup completed for tag=${spec.tag} on sandbox ${sandbox.sandboxId} (${specDuration}ms)`);
+              console.log(`[POOL] Spec setup completed for tag=${spec.tag} on sandbox ${sandbox.sandboxId} (${specDuration}ms, install=${warmupInstallRan}, startup=${warmupStartupRan})`);
               this.emitMetric("spec_setup_completed", {
                 tag: spec.tag,
                 sandboxId: sandbox.sandboxId,
-                durationMs: specDuration
+                durationMs: specDuration,
+                warmupInstallRan,
+                warmupStartupRan
               });
             } catch (specError) {
               const specDuration = Date.now() - specStartTime;
@@ -4996,6 +5137,8 @@ echo "[warmup] Warmup complete!"
                 durationMs: specDuration,
                 error: specErrorMessage
               });
+            } finally {
+              this.warmingTags.delete(spec.tag);
             }
           }
           const warmupTime = Date.now() - startTime;
@@ -5009,7 +5152,9 @@ echo "[warmup] Warmup complete!"
             eligible: true,
             lastHeartbeat: now,
             warmupTag,
-            agentSetupComplete
+            agentSetupComplete,
+            warmupInstallRan,
+            warmupStartupRan
           };
           const tagInfo = warmupTag ? ` [tag=${warmupTag}]` : "";
           console.log(`[POOL] Warmup completed for ${sandbox.sandboxId} (took ${warmupTime}ms)${useTarball ? " [tarball]" : ""}${tagInfo}`);
@@ -5211,15 +5356,20 @@ echo "[warmup] Warmup complete!"
       }
       /**
        * Decide which specs to apply to new sandboxes during replenishment.
-       * Strategy: cover uncovered specs first (highest priority), then fill remaining as generic.
+       * Strategy:
+       * - Always reserve at least 1 slot for generic (fix #3)
+       * - Cover uncovered specs first (highest priority), skipping in-flight tags (fix #4)
+       * - Fill remaining as generic
        * Returns an array of length `needed`, where each element is a spec or undefined (generic).
        */
       selectSpecsForReplenishment(needed) {
-        if (this.warmupSpecs.size === 0) {
+        if (this.warmupSpecs.size === 0 || needed === 0) {
           return new Array(needed).fill(void 0);
         }
+        const maxTaggedSlots = Math.max(0, needed - 1);
         const uncoveredSpecs = [];
         for (const spec of this.warmupSpecs.values()) {
+          if (this.warmingTags.has(spec.tag)) continue;
           let hasCoverage = false;
           for (const pooled of this.pool.values()) {
             if (pooled.warmupTag === spec.tag && pooled.eligible && !pooled.assignedTo) {
@@ -5234,7 +5384,7 @@ echo "[warmup] Warmup complete!"
         uncoveredSpecs.sort((a, b) => b.priority - a.priority);
         const assignments = [];
         for (const spec of uncoveredSpecs) {
-          if (assignments.length >= needed) break;
+          if (assignments.length >= maxTaggedSlots) break;
           assignments.push(spec);
         }
         while (assignments.length < needed) {
@@ -5242,6 +5392,27 @@ echo "[warmup] Warmup complete!"
         }
         return assignments;
       }
+      /**
+       * Evict lowest-priority specs when over MAX_SPECS capacity (fix #2).
+       */
+      evictLowestPrioritySpecs() {
+        while (this.warmupSpecs.size > _SandboxPool.MAX_SPECS) {
+          let lowestTag;
+          let lowestPriority = Infinity;
+          for (const [tag, spec] of this.warmupSpecs.entries()) {
+            if (spec.priority < lowestPriority) {
+              lowestPriority = spec.priority;
+              lowestTag = tag;
+            }
+          }
+          if (lowestTag) {
+            this.warmupSpecs.delete(lowestTag);
+            console.log(`[POOL] Evicted warmup spec: ${lowestTag} (priority=${lowestPriority}, specs=${this.warmupSpecs.size})`);
+          } else {
+            break;
+          }
+        }
+      }
       /**
        * Destroy a sandbox and clean up
        */
@@ -5561,6 +5732,8 @@ async function getOrCreateSandbox(options) {
       const pooled = await pool.acquire(sessionId, preferTag);
       const tagInfo = pooled.warmupTag ? ` [tag=${pooled.warmupTag}, agentSetup=${pooled.agentSetupComplete}]` : "";
       console.log(`[SANDBOX] Acquired pre-warmed sandbox: ${pooled.sandboxId}${tagInfo}`);
+      const installDone = pooled.warmupInstallRan === true;
+      const startupDone = pooled.warmupStartupRan === true;
       const agentSetupDone = pooled.agentSetupComplete === true;
       const now2 = Date.now();
       const entry2 = {
@@ -5569,24 +5742,26 @@ async function getOrCreateSandbox(options) {
         createdAt: pooled.createdAt,
         lastUsedAt: now2,
         sdkInstalled: pooled.sdkInstalled,
-        startupScriptRan: agentSetupDone,
-        installScriptRan: agentSetupDone
+        startupScriptRan: startupDone,
+        installScriptRan: installDone
       };
       sandboxCache.set(sessionId, entry2);
       return {
         sandbox: pooled.sandbox,
         sandboxId: pooled.sandboxId,
         sdkInstalled: pooled.sdkInstalled,
-        startupScriptRan: agentSetupDone,
+        startupScriptRan: startupDone,
         startupScriptHash: void 0,
-        installScriptRan: agentSetupDone,
+        installScriptRan: installDone,
         installScriptHash: void 0,
         isNew: false,
         // Not new - came from pool
         configFileUrl: void 0,
         configInstalledAt: agentSetupDone ? now2 : void 0,
         warmupTag: pooled.warmupTag,
-        agentSetupComplete: pooled.agentSetupComplete
+        agentSetupComplete: pooled.agentSetupComplete,
+        warmupInstallRan: pooled.warmupInstallRan,
+        warmupStartupRan: pooled.warmupStartupRan
       };
     } catch (error) {
       console.warn(
@@ -5931,6 +6106,13 @@ function createVercelSandboxExecutor(apiKey) {
   };
 }
 async function* executeInSandbox(prompt, apiKey, options) {
+  if (typeof prompt !== "string") {
+    yield {
+      type: "error",
+      error: "Vercel sandbox executor does not support streaming prompt inputs."
+    };
+    return;
+  }
   const sessionId = options.harnessSessionId || `temp-${Date.now()}-${Math.random().toString(36).slice(2)}`;
   try {
     const { sandbox, sdkInstalled, startupScriptRan, startupScriptHash: cachedScriptHash, configFileUrl: cachedConfigUrl } = await getOrCreateSandbox({
@@ -6072,9 +6254,13 @@ async function* executeInSandbox(prompt, apiKey, options) {
       permissionMode: options.permissionMode || "bypassPermissions",
       includePartialMessages: true
     };
+    if (options.settingSources !== void 0) {
+      sdkOptions.settingSources = options.settingSources;
+    } else {
+      sdkOptions.settingSources = ["project"];
+    }
     const hasConfig = options.configFileUrl || cachedConfigUrl;
     if (hasConfig) {
-      sdkOptions.settingSources = ["project"];
       if (options.allowedTools && options.allowedTools.length > 0) {
         const allowedTools = [...options.allowedTools];
         if (!allowedTools.includes("Skill")) {
@@ -6110,12 +6296,47 @@ async function* executeInSandbox(prompt, apiKey, options) {
     if (options.resume) {
       sdkOptions.resume = options.resume;
     }
+    try {
+      const pluginFindResult = await sandbox.runCommand({
+        cmd: "bash",
+        args: [
+          "-c",
+          [
+            'for base in ".claude/plugins" "$HOME/.claude/plugins"; do',
+            '  if [ -d "$base" ]; then',
+            '    find "$base" -type f -path "*/.claude-plugin/plugin.json" -print',
+            "  fi",
+            "done | sed 's#/.claude-plugin/plugin.json$##'"
+          ].join("\n")
+        ]
+      });
+      const rawPluginRoots = (await pluginFindResult.stdout()).trim();
+      const pluginRoots = rawPluginRoots ? rawPluginRoots.split("\n").map((line) => line.trim()).filter(Boolean) : [];
+      const uniquePluginRoots = Array.from(new Set(pluginRoots));
+      if (uniquePluginRoots.length > 0) {
+        sdkOptions.plugins = uniquePluginRoots.map((path15) => ({ type: "local", path: path15 }));
+        console.log("[SANDBOX] Plugins detected:", uniquePluginRoots);
+      }
+    } catch (pluginError) {
+      console.warn("[SANDBOX] Failed to detect plugins:", pluginError);
+    }
     const agentScript = `
 const { query } = require('@anthropic-ai/claude-agent-sdk');
+const fs = require('fs');
 
 const prompt = ${JSON.stringify(prompt)};
 const options = ${JSON.stringify(sdkOptions)};
 
+// Enable subagents if .claude/agents exists (requires Task tool)
+if (fs.existsSync('.claude/agents')) {
+  if (!Array.isArray(options.allowedTools)) {
+    options.allowedTools = [];
+  }
+  if (!options.allowedTools.includes('Task')) {
+    options.allowedTools.push('Task');
+  }
+}
+
 let queryCompleted = false;
 
 async function run() {
@@ -6212,7 +6433,11 @@ SCRIPT_EOF`]
           });
         }
         if (event.type === "system" && event.subtype === "init") {
-          events.push({ type: "session_init", sessionId: event.session_id || "" });
+          events.push({
+            type: "session_init",
+            sessionId: event.session_id || "",
+            slashCommands: event.slash_commands
+          });
         } else if (event.type === "stream_event" && event.event) {
           const streamEvent = event.event;
           if (streamEvent.type === "content_block_delta") {
@@ -6247,12 +6472,16 @@ SCRIPT_EOF`]
             }
           }
         } else if (event.type === "result") {
+          const usage = event.usage;
+          const hasUsageTokens = !!usage && (usage.input_tokens !== void 0 || usage.output_tokens !== void 0);
+          const totalTokens = hasUsageTokens ? (usage?.input_tokens ?? 0) + (usage?.output_tokens ?? 0) : event.total_tokens ?? (event.tokens ? event.tokens.input + event.tokens.output : void 0);
+          const totalCost = usage?.total_cost_usd ?? event.total_cost_usd ?? event.cost ?? event.total_cost;
           events.push({
             type: "complete",
             sessionId: event.session_id,
             result: event.result,
-            totalCost: event.total_cost_usd,
-            totalTokens: event.total_tokens
+            totalCost,
+            totalTokens
           });
         }
         return events;
@@ -12831,6 +13060,7 @@ __export(schemas_exports, {
   RunAgentRequestSchema: () => RunAgentRequestSchema,
   SendMessageRequestSchema: () => SendMessageRequestSchema,
   SessionEndEventSchema: () => SessionEndEventSchema,
+  SessionInitEventSchema: () => SessionInitEventSchema,
   SessionSchema: () => SessionSchema,
   SessionStartEventSchema: () => SessionStartEventSchema,
   SessionStatusSchema: () => SessionStatusSchema,
@@ -12850,7 +13080,7 @@ __export(schemas_exports, {
   TurnCompleteEventSchema: () => TurnCompleteEventSchema,
   UpdateAgentRequestSchema: () => UpdateAgentRequestSchema
 });
-var ErrorResponseSchema, SuccessResponseSchema, PaginationQuerySchema, OrderQuerySchema, TextContentSchema, ToolUseContentSchema, ToolResultContentSchema, ImageContentSchema, FileContentSchema, MessageContentSchema, MessageSchema, PaginatedMessagesSchema, SessionStatusSchema, SessionSchema, PaginatedSessionsSchema, CreateSessionRequestSchema, SendMessageRequestSchema, ResumeSessionRequestSchema, ListSessionsQuerySchema, AgentStatusSchema, PermissionModeSchema, McpServerConfigSchema, StoredAgentSchema, SimpleAgentSchema, PaginatedAgentsSchema, CreateAgentRequestSchema, UpdateAgentRequestSchema, RunAgentRequestSchema, ListAgentsQuerySchema, GitHubSkillSourceSchema, LocalSkillSourceSchema, SkillSourceSchema, BrowseSkillsRequestSchema, ReadSkillFileRequestSchema, FileEntrySchema, BrowseSkillsResponseSchema, SkillFileContentSchema, ReadSkillFileResponseSchema, SessionStartEventSchema, TextDeltaEventSchema, ThinkingDeltaEventSchema, MessageEventSchema, ToolUseEventSchema, ToolResultEventSchema, SessionEndEventSchema, TurnCompleteEventSchema, StreamErrorEventSchema, HealthResponseSchema;
+var ErrorResponseSchema, SuccessResponseSchema, PaginationQuerySchema, OrderQuerySchema, TextContentSchema, ToolUseContentSchema, ToolResultContentSchema, ImageContentSchema, FileContentSchema, MessageContentSchema, MessageSchema, PaginatedMessagesSchema, SessionStatusSchema, SessionSchema, PaginatedSessionsSchema, CreateSessionRequestSchema, SendMessageRequestSchema, ResumeSessionRequestSchema, ListSessionsQuerySchema, AgentStatusSchema, PermissionModeSchema, McpServerConfigSchema, StoredAgentSchema, SimpleAgentSchema, PaginatedAgentsSchema, CreateAgentRequestSchema, UpdateAgentRequestSchema, RunAgentRequestSchema, ListAgentsQuerySchema, GitHubSkillSourceSchema, LocalSkillSourceSchema, SkillSourceSchema, BrowseSkillsRequestSchema, ReadSkillFileRequestSchema, FileEntrySchema, BrowseSkillsResponseSchema, SkillFileContentSchema, ReadSkillFileResponseSchema, SessionStartEventSchema, SessionInitEventSchema, TextDeltaEventSchema, ThinkingDeltaEventSchema, MessageEventSchema, ToolUseEventSchema, ToolResultEventSchema, SessionEndEventSchema, TurnCompleteEventSchema, StreamErrorEventSchema, HealthResponseSchema;
 var init_schemas = __esm({
   "src/server/openapi/schemas.ts"() {
     init_dist3();
@@ -13076,6 +13306,15 @@ var init_schemas = __esm({
       sessionId: z.string().openapi({ description: "Session ID" }),
       claudeSessionId: z.string().openapi({ description: "Claude SDK session ID" })
     }).openapi("SessionStartEvent");
+    SessionInitEventSchema = z.object({
+      type: z.literal("session_init"),
+      sessionId: z.string().openapi({ description: "Claude SDK session ID" }),
+      slashCommands: z.array(z.object({
+        name: z.string().openapi({ description: "Slash command name" }),
+        description: z.string().optional().openapi({ description: "Slash command description" }),
+        prompt: z.string().optional().openapi({ description: "Slash command prompt" })
+      })).optional().openapi({ description: "Slash commands advertised by the SDK" })
+    }).openapi("SessionInitEvent");
     TextDeltaEventSchema = z.object({
       type: z.literal("text_delta"),
       delta: z.string().openapi({ description: "Text chunk", example: "Hello" })
@@ -13402,6 +13641,7 @@ var init_sessions2 = __esm({
 The stream emits the following event types:
 
 - \`session_start\` - Session started, includes sessionId and sdkSessionId
+- \`session_init\` - Claude SDK session initialized (includes slash commands)
 - \`text_delta\` - Text chunk being generated
 - \`thinking_delta\` - Thinking/reasoning text chunk
 - \`message\` - Complete message saved to storage
@@ -13850,6 +14090,7 @@ This is a convenience endpoint that combines session creation and message sendin
 The stream emits the following event types:
 
 - \`session_start\` - Session started
+- \`session_init\` - Claude SDK session initialized (includes slash commands)
 - \`text_delta\` - Text chunk being generated
 - \`thinking_delta\` - Thinking/reasoning text chunk
 - \`message\` - Complete message saved