wispy-cli 2.7.6 → 2.7.8

package/bin/wispy.mjs

@@ -265,27 +265,102 @@ if (command === "handoff") {
 if (command === "model") {
   try {
     const { loadConfig, saveConfig, detectProvider, PROVIDERS } = await import(join(rootDir, "core/config.mjs"));
-    const config = await loadConfig();
-    const detected = await detectProvider();
 
-    if (args[1]) {
-      config.model = args[1];
-      await saveConfig(config);
-      console.log(`Model set to: ${args[1]}`);
-    } else {
-      console.log(`\n  Provider: ${detected?.provider ?? "none"}`);
-      console.log(`  Model:    ${detected?.model ?? "none"}`);
-      console.log(`\n  Override: wispy model <model-name>`);
-      console.log(`  Env var:  WISPY_MODEL=<model-name>`);
-
-      if (PROVIDERS) {
-        console.log(`\n  Available providers:`);
-        for (const [key, p] of Object.entries(PROVIDERS)) {
-          console.log(`    ${key.padEnd(14)} ${p.defaultModel}`);
+    const sub = args[1];
+
+    // wispy model list → print all providers and their models
+    if (sub === "list") {
+      console.log("\n  Available models by provider:\n");
+      for (const [key, p] of Object.entries(PROVIDERS)) {
+        console.log(`  ${key}`);
+        const models = p.models ?? [p.defaultModel];
+        for (const m of models) {
+          const tag = m === p.defaultModel ? " (default)" : "";
+          console.log(`    ${m}${tag}`);
         }
       }
       console.log("");
+      process.exit(0);
     }
+
+    // wispy model <name> → set directly
+    if (sub && sub !== "list") {
+      const config = await loadConfig();
+      config.model = sub;
+      await saveConfig(config);
+      console.log(`Model set to: ${sub}`);
+      process.exit(0);
+    }
+
+    // wispy model (no args) → show current + interactive picker
+    const { select } = await import("@inquirer/prompts");
+    const config = await loadConfig();
+    const detected = await detectProvider();
+
+    console.log(`\n  Current provider: ${detected?.provider ?? "none"}`);
+    console.log(`  Current model:    ${detected?.model ?? "none"}\n`);
+
+    // Find providers with configured keys (or local providers)
+    const availableProviders = Object.entries(PROVIDERS).filter(([key, p]) => {
+      if (p.local) return true;
+      // Check env keys
+      for (const k of (p.envKeys ?? [])) {
+        if (process.env[k]) return true;
+      }
+      // Check config
+      if (config.provider === key && config.apiKey) return true;
+      if (config.providers?.[key]) return true;
+      return false;
+    });
+
+    let providerChoices = availableProviders.map(([key, p]) => ({
+      name: p.label ?? key,
+      value: key,
+    }));
+
+    // If no providers detected, show all
+    if (providerChoices.length === 0) {
+      providerChoices = Object.entries(PROVIDERS).map(([key, p]) => ({
+        name: p.label ?? key,
+        value: key,
+      }));
+    }
+
+    let selectedProvider;
+    try {
+      selectedProvider = await select({
+        message: "Select provider:",
+        choices: providerChoices,
+        default: detected?.provider,
+      });
+    } catch {
+      console.log("  Cancelled.");
+      process.exit(0);
+    }
+
+    const providerInfo = PROVIDERS[selectedProvider];
+    const modelList = providerInfo.models ?? [providerInfo.defaultModel];
+
+    let selectedModel;
+    try {
+      selectedModel = await select({
+        message: "Select model:",
+        choices: modelList.map((m) => ({
+          name: m === providerInfo.defaultModel ? `${m} (default)` : m,
+          value: m,
+        })),
+        default: providerInfo.defaultModel,
+      });
+    } catch {
+      console.log("  Cancelled.");
+      process.exit(0);
+    }
+
+    config.provider = selectedProvider;
+    config.model = selectedModel;
+    await saveConfig(config);
+    console.log(`\n  Provider set to: ${selectedProvider}`);
+    console.log(`  Model set to:    ${selectedModel}\n`);
   } catch (err) {
     console.error("Model error:", err.message);
     process.exit(1);

package/core/config.mjs

@@ -19,47 +19,74 @@ export const MEMORY_DIR = path.join(WISPY_DIR, "memory");
 
 export const PROVIDERS = {
   // ── Tier 0: Custom API providers ────────────────────────────────────────────
-  google:      { envKeys: ["GOOGLE_AI_KEY", "GOOGLE_GENERATIVE_AI_KEY", "GEMINI_API_KEY"], defaultModel: "gemini-2.5-flash",                     label: "Google AI (Gemini)",        signupUrl: "https://aistudio.google.com/apikey" },
-  anthropic:   { envKeys: ["ANTHROPIC_API_KEY"],                                           defaultModel: "claude-sonnet-4-20250514",              label: "Anthropic (Claude)",         signupUrl: "https://console.anthropic.com/settings/keys" },
+  google:      { envKeys: ["GOOGLE_AI_KEY", "GOOGLE_GENERATIVE_AI_KEY", "GEMINI_API_KEY"], defaultModel: "gemini-2.5-flash",                     label: "Google AI (Gemini)",        signupUrl: "https://aistudio.google.com/apikey",
+                 models: ["gemini-2.5-pro", "gemini-2.5-flash", "gemini-2.0-flash", "gemini-2.0-flash-lite", "gemini-1.5-pro", "gemini-1.5-flash"] },
+  anthropic:   { envKeys: ["ANTHROPIC_API_KEY"],                                           defaultModel: "claude-sonnet-4-20250514",              label: "Anthropic (Claude)",         signupUrl: "https://console.anthropic.com/settings/keys",
+                 models: ["claude-opus-4-20250514", "claude-sonnet-4-20250514", "claude-3-5-sonnet-20241022", "claude-3-5-haiku-20241022", "claude-3-opus-20240229"] },
 
   // ── Tier 1: Popular OpenAI-compat ──────────────────────────────────────────
-  openai:      { envKeys: ["OPENAI_API_KEY"],                                               defaultModel: "gpt-4o",                                label: "OpenAI",                     signupUrl: "https://platform.openai.com/api-keys" },
-  xai:         { envKeys: ["XAI_API_KEY"],                                                  defaultModel: "grok-3-mini",                           label: "xAI (Grok)",                 signupUrl: "https://console.x.ai/" },
-  mistral:     { envKeys: ["MISTRAL_API_KEY"],                                              defaultModel: "mistral-large-latest",                  label: "Mistral",                    signupUrl: "https://console.mistral.ai/api-keys/" },
-  together:    { envKeys: ["TOGETHER_API_KEY"],                                             defaultModel: "meta-llama/Llama-3.3-70B-Instruct-Turbo", label: "Together AI",              signupUrl: "https://api.together.xyz/settings/api-keys" },
-  nvidia:      { envKeys: ["NVIDIA_API_KEY"],                                               defaultModel: "meta/llama-3.3-70b-instruct",           label: "NVIDIA NIM",                 signupUrl: "https://build.nvidia.com/" },
+  openai:      { envKeys: ["OPENAI_API_KEY"],                                               defaultModel: "gpt-4o",                                label: "OpenAI",                     signupUrl: "https://platform.openai.com/api-keys",
+                 models: ["gpt-4o", "gpt-4o-mini", "gpt-4-turbo", "o1", "o1-mini", "o3", "o3-mini", "o4-mini"] },
+  xai:         { envKeys: ["XAI_API_KEY"],                                                  defaultModel: "grok-3-mini",                           label: "xAI (Grok)",                 signupUrl: "https://console.x.ai/",
+                 models: ["grok-3", "grok-3-mini", "grok-3-fast", "grok-2", "grok-2-mini"] },
+  mistral:     { envKeys: ["MISTRAL_API_KEY"],                                              defaultModel: "mistral-large-latest",                  label: "Mistral",                    signupUrl: "https://console.mistral.ai/api-keys/",
+                 models: ["mistral-large-latest", "mistral-medium-latest", "mistral-small-latest", "codestral-latest", "open-mistral-nemo"] },
+  together:    { envKeys: ["TOGETHER_API_KEY"],                                             defaultModel: "meta-llama/Llama-3.3-70B-Instruct-Turbo", label: "Together AI",              signupUrl: "https://api.together.xyz/settings/api-keys",
+                 models: ["meta-llama/Llama-3.3-70B-Instruct-Turbo", "meta-llama/Llama-3.1-8B-Instruct-Turbo", "mistralai/Mixtral-8x22B-Instruct-v0.1", "Qwen/Qwen2.5-72B-Instruct-Turbo", "deepseek-ai/deepseek-r1"] },
+  nvidia:      { envKeys: ["NVIDIA_API_KEY"],                                               defaultModel: "meta/llama-3.3-70b-instruct",           label: "NVIDIA NIM",                 signupUrl: "https://build.nvidia.com/",
+                 models: ["meta/llama-3.3-70b-instruct", "meta/llama-3.1-8b-instruct", "mistralai/mistral-7b-instruct-v0.3", "google/gemma-2-9b-it"] },
 
   // ── Tier 1: Fast/free ───────────────────────────────────────────────────────
-  groq:        { envKeys: ["GROQ_API_KEY"],                                                 defaultModel: "llama-3.3-70b-versatile",               label: "Groq (fast inference)",      signupUrl: "https://console.groq.com/keys" },
-  deepseek:    { envKeys: ["DEEPSEEK_API_KEY"],                                             defaultModel: "deepseek-chat",                         label: "DeepSeek",                   signupUrl: "https://platform.deepseek.com/api_keys" },
-  chutes:      { envKeys: ["CHUTES_API_KEY"],                                               defaultModel: "deepseek-ai/DeepSeek-V3-0324",          label: "Chutes",                     signupUrl: "https://chutes.ai/" },
+  groq:        { envKeys: ["GROQ_API_KEY"],                                                 defaultModel: "llama-3.3-70b-versatile",               label: "Groq (fast inference)",      signupUrl: "https://console.groq.com/keys",
+                 models: ["llama-3.3-70b-versatile", "llama-3.1-8b-instant", "mixtral-8x7b-32768", "gemma2-9b-it", "llama-3.3-70b-specdec"] },
+  deepseek:    { envKeys: ["DEEPSEEK_API_KEY"],                                             defaultModel: "deepseek-chat",                         label: "DeepSeek",                   signupUrl: "https://platform.deepseek.com/api_keys",
+                 models: ["deepseek-chat", "deepseek-coder", "deepseek-reasoner"] },
+  chutes:      { envKeys: ["CHUTES_API_KEY"],                                               defaultModel: "deepseek-ai/DeepSeek-V3-0324",          label: "Chutes",                     signupUrl: "https://chutes.ai/",
+                 models: ["deepseek-ai/DeepSeek-V3-0324", "deepseek-ai/DeepSeek-R1", "Qwen/Qwen3-235B-A22B"] },
 
   // ── Tier 1: Aggregators ─────────────────────────────────────────────────────
-  openrouter:  { envKeys: ["OPENROUTER_API_KEY"],                                           defaultModel: "anthropic/claude-sonnet-4-20250514",    label: "OpenRouter (multi-model)",   signupUrl: "https://openrouter.ai/keys" },
-  vercelai:    { envKeys: ["VERCEL_AI_TOKEN"],                                              defaultModel: "anthropic/claude-3-5-sonnet",           label: "Vercel AI Gateway",          signupUrl: "https://vercel.com/docs/ai-gateway" },
+  openrouter:  { envKeys: ["OPENROUTER_API_KEY"],                                           defaultModel: "anthropic/claude-sonnet-4-20250514",    label: "OpenRouter (multi-model)",   signupUrl: "https://openrouter.ai/keys",
+                 models: ["anthropic/claude-sonnet-4-20250514", "anthropic/claude-opus-4", "openai/gpt-4o", "openai/o3", "google/gemini-2.5-pro", "google/gemini-2.5-flash", "meta-llama/llama-3.3-70b-instruct", "deepseek/deepseek-r1"] },
+  vercelai:    { envKeys: ["VERCEL_AI_TOKEN"],                                              defaultModel: "anthropic/claude-3-5-sonnet",           label: "Vercel AI Gateway",          signupUrl: "https://vercel.com/docs/ai-gateway",
+                 models: ["anthropic/claude-3-5-sonnet", "anthropic/claude-3-5-haiku", "openai/gpt-4o", "openai/gpt-4o-mini"] },
 
   // ── Tier 2: Useful ──────────────────────────────────────────────────────────
-  kimi:        { envKeys: ["MOONSHOT_API_KEY", "KIMI_API_KEY"],                             defaultModel: "moonshot-v1-8k",                        label: "Kimi/Moonshot",              signupUrl: "https://platform.moonshot.cn/console/api-keys" },
-  minimax:     { envKeys: ["MINIMAX_API_KEY"],                                              defaultModel: "MiniMax-Text-01",                       label: "MiniMax",                    signupUrl: "https://www.minimaxi.com/" },
-  venice:      { envKeys: ["VENICE_API_KEY"],                                               defaultModel: "llama-3.3-70b",                         label: "Venice AI",                  signupUrl: "https://venice.ai/chat/api" },
-  huggingface: { envKeys: ["HF_TOKEN", "HUGGINGFACE_API_KEY"],                              defaultModel: "meta-llama/Llama-3.3-70B-Instruct",     label: "Hugging Face",               signupUrl: "https://huggingface.co/settings/tokens", special: "hf_model_in_url" },
-  cloudflare:  { envKeys: ["CF_API_TOKEN"],                                                 defaultModel: "@cf/meta/llama-3.3-70b-instruct-fp8-fast", label: "Cloudflare AI",           signupUrl: "https://dash.cloudflare.com/", special: "cf_account_id" },
+  kimi:        { envKeys: ["MOONSHOT_API_KEY", "KIMI_API_KEY"],                             defaultModel: "moonshot-v1-8k",                        label: "Kimi/Moonshot",              signupUrl: "https://platform.moonshot.cn/console/api-keys",
+                 models: ["moonshot-v1-8k", "moonshot-v1-32k", "moonshot-v1-128k"] },
+  minimax:     { envKeys: ["MINIMAX_API_KEY"],                                              defaultModel: "MiniMax-Text-01",                       label: "MiniMax",                    signupUrl: "https://www.minimaxi.com/",
+                 models: ["MiniMax-Text-01", "abab6.5s-chat", "abab6.5g-chat"] },
+  venice:      { envKeys: ["VENICE_API_KEY"],                                               defaultModel: "llama-3.3-70b",                         label: "Venice AI",                  signupUrl: "https://venice.ai/chat/api",
+                 models: ["llama-3.3-70b", "mistral-31-24b", "deepseek-r1-671b"] },
+  huggingface: { envKeys: ["HF_TOKEN", "HUGGINGFACE_API_KEY"],                              defaultModel: "meta-llama/Llama-3.3-70B-Instruct",     label: "Hugging Face",               signupUrl: "https://huggingface.co/settings/tokens", special: "hf_model_in_url",
+                 models: ["meta-llama/Llama-3.3-70B-Instruct", "meta-llama/Llama-3.1-8B-Instruct", "mistralai/Mistral-7B-Instruct-v0.3", "Qwen/Qwen2.5-72B-Instruct"] },
+  cloudflare:  { envKeys: ["CF_API_TOKEN"],                                                 defaultModel: "@cf/meta/llama-3.3-70b-instruct-fp8-fast", label: "Cloudflare AI",           signupUrl: "https://dash.cloudflare.com/", special: "cf_account_id",
+                 models: ["@cf/meta/llama-3.3-70b-instruct-fp8-fast", "@cf/mistral/mistral-7b-instruct-v0.2", "@cf/google/gemma-7b-it", "@cf/qwen/qwen1.5-14b-chat-awq"] },
 
   // ── Tier 3: Regional / niche ────────────────────────────────────────────────
-  volcengine:  { envKeys: ["VOLCENGINE_API_KEY", "ARK_API_KEY"],                            defaultModel: "doubao-pro-32k",                        label: "Volcengine (ByteDance)",     signupUrl: "https://console.volcengine.com/ark" },
-  byteplus:    { envKeys: ["BYTEPLUS_API_KEY"],                                             defaultModel: "doubao-pro-32k",                        label: "BytePlus",                   signupUrl: "https://console.byteplux.com/" },
-  zai:         { envKeys: ["ZAI_API_KEY", "GLM_API_KEY", "ZHIPU_API_KEY"],                  defaultModel: "glm-4-flash",                           label: "Z.AI / GLM",                 signupUrl: "https://open.bigmodel.cn/" },
-  dashscope:   { envKeys: ["DASHSCOPE_API_KEY"],                                            defaultModel: "qwen-max",                              label: "DashScope (Alibaba)",         signupUrl: "https://dashscope.aliyun.com/" },
-  xiaomi:      { envKeys: ["XIAOMI_API_KEY"],                                               defaultModel: "MiMo-7B-RL",                            label: "Xiaomi AI",                  signupUrl: "https://ai.xiaomi.com/" },
+  volcengine:  { envKeys: ["VOLCENGINE_API_KEY", "ARK_API_KEY"],                            defaultModel: "doubao-pro-32k",                        label: "Volcengine (ByteDance)",     signupUrl: "https://console.volcengine.com/ark",
+                 models: ["doubao-pro-32k", "doubao-pro-128k", "doubao-lite-32k"] },
+  byteplus:    { envKeys: ["BYTEPLUS_API_KEY"],                                             defaultModel: "doubao-pro-32k",                        label: "BytePlus",                   signupUrl: "https://console.byteplux.com/",
+                 models: ["doubao-pro-32k", "doubao-lite-32k"] },
+  zai:         { envKeys: ["ZAI_API_KEY", "GLM_API_KEY", "ZHIPU_API_KEY"],                  defaultModel: "glm-4-flash",                           label: "Z.AI / GLM",                 signupUrl: "https://open.bigmodel.cn/",
+                 models: ["glm-4-flash", "glm-4-plus", "glm-4-long", "glm-z1-flash"] },
+  dashscope:   { envKeys: ["DASHSCOPE_API_KEY"],                                            defaultModel: "qwen-max",                              label: "DashScope (Alibaba)",         signupUrl: "https://dashscope.aliyun.com/",
+                 models: ["qwen-max", "qwen-plus", "qwen-turbo", "qwen-long", "qwen2.5-72b-instruct"] },
+  xiaomi:      { envKeys: ["XIAOMI_API_KEY"],                                               defaultModel: "MiMo-7B-RL",                            label: "Xiaomi AI",                  signupUrl: "https://ai.xiaomi.com/",
+                 models: ["MiMo-7B-RL", "MiMo-7B-SFT"] },
 
   // ── OAuth / subscription-based ────────────────────────────────────────────
-  "github-copilot": { envKeys: ["GITHUB_COPILOT_TOKEN"],                                    defaultModel: "gpt-4o",                                label: "GitHub Copilot",             signupUrl: "https://github.com/features/copilot", auth: "oauth" },
+  "github-copilot": { envKeys: ["GITHUB_COPILOT_TOKEN"],                                    defaultModel: "gpt-4o",                                label: "GitHub Copilot",             signupUrl: "https://github.com/features/copilot", auth: "oauth",
+                 models: ["gpt-4o", "gpt-4o-mini", "claude-sonnet-4-20250514", "o3-mini"] },
 
   // ── Local / self-hosted ─────────────────────────────────────────────────────
-  ollama:      { envKeys: [],                                                                defaultModel: "llama3.2",                              label: "Ollama (local)",             signupUrl: null, local: true },
-  vllm:        { envKeys: [],                                                                defaultModel: "meta-llama/Llama-3.3-70B-Instruct",     label: "vLLM (self-hosted)",         signupUrl: "https://docs.vllm.ai/", local: true },
-  sglang:      { envKeys: [],                                                                defaultModel: "meta-llama/Llama-3.3-70B-Instruct",     label: "SGLang (self-hosted)",       signupUrl: "https://docs.sglang.ai/", local: true },
-  litellm:     { envKeys: ["LITELLM_API_KEY"],                                              defaultModel: "gpt-4o",                                label: "LiteLLM (proxy)",            signupUrl: "https://docs.litellm.ai/", local: true },
+  ollama:      { envKeys: [],                                                                defaultModel: "llama3.2",                              label: "Ollama (local)",             signupUrl: null, local: true,
+                 models: ["llama3.2", "llama3.1", "llama3.1:70b", "mistral", "mixtral", "deepseek-r1", "qwen2.5", "phi4", "gemma3"] },
+  vllm:        { envKeys: [],                                                                defaultModel: "meta-llama/Llama-3.3-70B-Instruct",     label: "vLLM (self-hosted)",         signupUrl: "https://docs.vllm.ai/", local: true,
+                 models: ["meta-llama/Llama-3.3-70B-Instruct", "meta-llama/Llama-3.1-8B-Instruct", "mistralai/Mistral-7B-Instruct-v0.3", "Qwen/Qwen2.5-72B-Instruct"] },
+  sglang:      { envKeys: [],                                                                defaultModel: "meta-llama/Llama-3.3-70B-Instruct",     label: "SGLang (self-hosted)",       signupUrl: "https://docs.sglang.ai/", local: true,
+                 models: ["meta-llama/Llama-3.3-70B-Instruct", "meta-llama/Llama-3.1-8B-Instruct", "deepseek-ai/DeepSeek-V3", "Qwen/Qwen2.5-72B-Instruct"] },
+  litellm:     { envKeys: ["LITELLM_API_KEY"],                                              defaultModel: "gpt-4o",                                label: "LiteLLM (proxy)",            signupUrl: "https://docs.litellm.ai/", local: true,
+                 models: ["gpt-4o", "claude-sonnet-4-20250514", "gemini/gemini-2.5-flash", "bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0"] },
 };
 
 async function tryKeychainKey(service) {

package/core/onboarding.mjs

@@ -569,10 +569,31 @@ export class OnboardingWizard {
         const result = await validateApiKey(provKey, apiKey.trim());
 
         if (result.ok) {
-          console.log(green(` ✅ Connected! (${result.model ?? getProviderDefaultModel(provKey)})`));
+          console.log(green(` ✅ Connected!`));
+
+          // Model selection step
+          const provInfo = PROVIDERS[provKey];
+          const modelList = provInfo?.models ?? [getProviderDefaultModel(provKey)];
+          let chosenModel = result.model ?? getProviderDefaultModel(provKey);
+          if (modelList.length > 1) {
+            try {
+              chosenModel = await select({
+                message: `  Select model for ${info?.label ?? provKey}:`,
+                choices: modelList.map((m) => ({
+                  name: m === getProviderDefaultModel(provKey) ? `${m} (default)` : m,
+                  value: m,
+                })),
+                default: chosenModel,
+              });
+            } catch {
+              // keep default
+            }
+          }
+          console.log(dim(`  Using model: ${chosenModel}`));
+
           providers[provKey] = {
             apiKey: apiKey.trim(),
-            model: result.model ?? getProviderDefaultModel(provKey),
+            model: chosenModel,
           };
           validated = true;
         } else {

package/core/subagent-worker.mjs

@@ -0,0 +1,325 @@
+/**
+ * core/subagent-worker.mjs — Worker thread code for sub-agent isolation
+ *
+ * Runs inside a worker_threads Worker. Receives task/config via workerData,
+ * communicates back to the main thread via parentPort.postMessage().
+ *
+ * Message protocol (worker → main):
+ *   { type: 'progress',     agentId, round, content }
+ *   { type: 'tool_call',    agentId, round, call: { name, args, id } }
+ *   { type: 'tool_result',  agentId, round, toolName, result }
+ *   { type: 'completed',    agentId, result }
+ *   { type: 'failed',       agentId, error }
+ *
+ * Message protocol (main → worker):
+ *   { type: 'tool_result',  callId, result }
+ *   { type: 'steer',        message }
+ *   { type: 'kill' }
+ */
+
+import { workerData, parentPort } from "node:worker_threads";
+
+if (!parentPort) {
+  throw new Error("subagent-worker.mjs must be run as a Worker thread");
+}
+
+const { agentId, task, systemPrompt, model, timeout, providerConfig, toolDefs } = workerData;
+
+const MAX_ROUNDS = 30;
+const TOKEN_LIMIT = 128_000;
+const COMPACT_THRESHOLD = 0.8; // compact at 80%
+
+/** Estimate token count as chars/4 */
+function estimateTokens(text) {
+  return Math.ceil((text?.length ?? 0) / 4);
+}
+
+function estimateMessages(msgs) {
+  return msgs.reduce((sum, m) => {
+    const content = m.content ?? JSON.stringify(m);
+    return sum + estimateTokens(content);
+  }, 0);
+}
+
+/** Pending tool call resolvers: callId → { resolve, reject } */
+const pendingToolCalls = new Map();
+/** Pending steer messages */
+const steerMessages = [];
+let killed = false;
+
+// Listen for messages from the main thread
+parentPort.on("message", (msg) => {
+  if (msg.type === "tool_result") {
+    const pending = pendingToolCalls.get(msg.callId);
+    if (pending) {
+      pendingToolCalls.delete(msg.callId);
+      if (msg.error) {
+        pending.reject(new Error(msg.error));
+      } else {
+        pending.resolve(msg.result);
+      }
+    }
+  } else if (msg.type === "steer") {
+    steerMessages.push(msg.message);
+  } else if (msg.type === "kill") {
+    killed = true;
+  }
+});
+
+/**
+ * Request a tool call from the main thread.
+ * Returns a Promise that resolves when the main thread sends back the result.
+ */
+function requestToolCall(call, round) {
+  return new Promise((resolve, reject) => {
+    const callId = call.id ?? `${call.name}-${Date.now()}`;
+    pendingToolCalls.set(callId, { resolve, reject });
+
+    parentPort.postMessage({
+      type: "tool_call",
+      agentId,
+      round,
+      call: { name: call.name, args: call.args, id: callId },
+    });
+
+    // Tool timeout: 60s
+    setTimeout(() => {
+      if (pendingToolCalls.has(callId)) {
+        pendingToolCalls.delete(callId);
+        reject(new Error(`Tool '${call.name}' timed out in worker`));
+      }
+    }, 60_000);
+  });
+}
+
+/**
+ * Compact messages when approaching token limit.
+ * Keep system prompt + last 3 rounds, summarize the middle.
+ *
+ * @param {Array} messages
+ * @returns {Array} compacted messages
+ */
+function compactMessages(messages) {
+  const system = messages.filter(m => m.role === "system");
+  const nonSystem = messages.filter(m => m.role !== "system");
+
+  // Keep last 6 messages (≈3 rounds of user+assistant)
+  const keepTail = nonSystem.slice(-6);
+  const toSummarize = nonSystem.slice(0, -6);
+
+  if (toSummarize.length === 0) {
+    return messages; // Nothing to compact
+  }
+
+  const summaryContent = toSummarize
+    .filter(m => m.role === "user" || m.role === "assistant")
+    .map(m => `[${m.role}]: ${(m.content ?? "").slice(0, 300)}`)
+    .join("\n");
+
+  const summaryMsg = {
+    role: "user",
+    content: `[Context summary from earlier in this conversation]\n${summaryContent}\n[End of summary]`,
+  };
+
+  return [...system, summaryMsg, ...keepTail];
+}
+
+/**
+ * Make an HTTP call to the provider API.
+ * Uses the providerConfig passed from the main thread.
+ */
+async function callProvider(messages) {
+  const { provider, apiKey, model: configModel, endpoint } = providerConfig;
+  const useModel = model ?? configModel;
+
+  // Build request based on provider
+  if (provider === "anthropic") {
+    const systemMsg = messages.find(m => m.role === "system")?.content ?? "";
+    const nonSystem = messages.filter(m => m.role !== "system");
+
+    const response = await fetch("https://api.anthropic.com/v1/messages", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "x-api-key": apiKey,
+        "anthropic-version": "2023-06-01",
+      },
+      body: JSON.stringify({
+        model: useModel ?? "claude-3-5-haiku-20241022",
+        max_tokens: 4096,
+        system: systemMsg,
+        messages: nonSystem.map(m => ({
+          role: m.role === "tool_result" ? "user" : m.role,
+          content: m.role === "tool_result"
+            ? [{ type: "tool_result", tool_use_id: m.toolUseId, content: JSON.stringify(m.result) }]
+            : m.role === "assistant" && m.toolCalls?.length
+              ? m.toolCalls.map(tc => ({ type: "tool_use", id: tc.id, name: tc.name, input: tc.args ?? tc.input ?? {} }))
+              : [{ type: "text", text: m.content ?? "" }],
+        })),
+        tools: (toolDefs ?? []).map(t => ({
+          name: t.name,
+          description: t.description,
+          input_schema: t.parameters,
+        })),
+      }),
+    });
+
+    const data = await response.json();
+    if (!response.ok) throw new Error(data.error?.message ?? `API error ${response.status}`);
+
+    const textBlock = data.content?.find(b => b.type === "text");
+    const toolUseBlocks = data.content?.filter(b => b.type === "tool_use") ?? [];
+
+    if (toolUseBlocks.length > 0) {
+      return {
+        type: "tool_calls",
+        calls: toolUseBlocks.map(b => ({ id: b.id, name: b.name, args: b.input })),
+      };
+    }
+    return { type: "text", text: textBlock?.text ?? "" };
+  }
+
+  // Default: OpenAI-compat
+  const url = endpoint ?? "https://api.openai.com/v1/chat/completions";
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      "Authorization": `Bearer ${apiKey}`,
+    },
+    body: JSON.stringify({
+      model: useModel ?? "gpt-4o-mini",
+      messages: messages.map(m => {
+        if (m.role === "tool_result") {
+          return { role: "tool", tool_call_id: m.toolUseId, content: JSON.stringify(m.result) };
+        }
+        if (m.role === "assistant" && m.toolCalls?.length) {
+          return {
+            role: "assistant",
+            content: m.content ?? null,
+            tool_calls: m.toolCalls.map(tc => ({
+              id: tc.id,
+              type: "function",
+              function: { name: tc.name, arguments: JSON.stringify(tc.args ?? {}) },
+            })),
+          };
+        }
+        return { role: m.role, content: m.content ?? "" };
+      }),
+      tools: (toolDefs ?? []).map(t => ({
+        type: "function",
+        function: { name: t.name, description: t.description, parameters: t.parameters },
+      })),
+    }),
+  });
+
+  const data = await response.json();
+  if (!response.ok) throw new Error(data.error?.message ?? `API error ${response.status}`);
+
+  const choice = data.choices?.[0];
+  const msg = choice?.message;
+
+  if (msg?.tool_calls?.length) {
+    return {
+      type: "tool_calls",
+      calls: msg.tool_calls.map(tc => ({
+        id: tc.id,
+        name: tc.function.name,
+        args: JSON.parse(tc.function.arguments ?? "{}"),
+      })),
+    };
+  }
+  return { type: "text", text: msg?.content ?? "" };
+}
+
+/** Main agent loop */
+async function runLoop() {
+  const messages = [
+    { role: "system", content: systemPrompt },
+    { role: "user", content: task },
+  ];
+
+  for (let round = 0; round < MAX_ROUNDS; round++) {
+    if (killed) {
+      parentPort.postMessage({ type: "failed", agentId, error: "killed" });
+      return;
+    }
+
+    // Inject steer messages
+    while (steerMessages.length > 0) {
+      const steer = steerMessages.shift();
+      messages.push({ role: "user", content: `[Guidance from orchestrator]: ${steer}` });
+    }
+
+    // Context compaction
+    const totalTokens = estimateMessages(messages);
+    if (totalTokens > TOKEN_LIMIT * COMPACT_THRESHOLD) {
+      const compacted = compactMessages(messages);
+      messages.length = 0;
+      messages.push(...compacted);
+    }
+
+    // Emit progress
+    parentPort.postMessage({ type: "progress", agentId, round, content: `Starting round ${round + 1}` });
+
+    // Provider call with retry + fallback handled by main thread
+    // Here we just call via the providerConfig directly
+    let result;
+    try {
+      result = await callProvider(messages);
+    } catch (err) {
+      parentPort.postMessage({ type: "failed", agentId, error: err.message });
+      return;
+    }
+
+    if (result.type === "text") {
+      parentPort.postMessage({ type: "completed", agentId, result: result.text });
+      return;
+    }
+
+    // Handle tool calls
+    messages.push({ role: "assistant", toolCalls: result.calls, content: "" });
+
+    for (const call of result.calls) {
+      if (killed) {
+        parentPort.postMessage({ type: "failed", agentId, error: "killed" });
+        return;
+      }
+
+      let toolResult;
+      try {
+        toolResult = await requestToolCall(call, round);
+      } catch (err) {
+        toolResult = { error: err.message, success: false };
+      }
+
+      parentPort.postMessage({
+        type: "tool_result",
+        agentId,
+        round,
+        toolName: call.name,
+        result: toolResult,
+      });
+
+      messages.push({
+        role: "tool_result",
+        toolName: call.name,
+        toolUseId: call.id ?? call.name,
+        result: toolResult,
+      });
+    }
+  }
+
+  // Max rounds
+  parentPort.postMessage({ type: "completed", agentId, result: "(max rounds reached — partial work above)" });
+}
+
+// Start the loop with a timeout
+const timeoutMs = timeout ?? 300_000;
+const timeoutPromise = new Promise((_, reject) =>
+  setTimeout(() => reject(new Error("Sub-agent timed out")), timeoutMs)
+);
+
+Promise.race([runLoop(), timeoutPromise]).catch((err) => {
+  parentPort.postMessage({ type: "failed", agentId, error: err.message ?? String(err) });
+});