@moxxy/cli 0.12.0 → 0.12.2

package/dist/bin.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { z as z$1, defineProvider, definePlugin, defineTool, MoxxyError, writeFileAtomic, asTurnId, defineMode, asPluginId, defineChannel, defineTunnelProvider, spawnCliTunnel, isCliTunnelAvailable, createMutex, defineWorkflowExecutor, toFriendlyError, estimateTextTokens, classifyHttpStatus, createStuckLoopDetector, runCompactionIfNeeded, runElisionIfNeeded, collectProviderStream, usageEventFields, isContextOverflowError, emitRequestsAndDetectStuck, executeToolUses, buildSystemPromptWithSkills, projectMessages, defineCompactor, defineCacheStrategy, denyByDefaultResolver, createAllowListResolver, moxxyPath, zodToJsonSchema, fileDiffSummary, runSingleShotTurn, bearerTokenMatches, resolveChannelToken, rotateChannelToken, defineSurface, estimateContextTokens as estimateContextTokens$1, readRequestBody, isFileDiffDisplay, MOXXY_WS_SUBPROTOCOL, defineEmbedder, migrateModeName, bearerGuard, tokenFromWsProtocolHeader, skillFrontmatterSchema, asSkillId, getInstallHint, moxxyHome, defineTranscriber, summarizeTokensByModel, createDeferredPermissionResolver, encodeLoginPrompt, classifyNetworkError, addModelTotals, ISOLATION_RANK, moxxyPackageSchema, defineCommand, fileDiffVerb, createCallbackResolver, autoAllowResolver, asSessionId, asToolCallId, defineViewRenderer, DEFAULT_VIEW_TAGS, isSafeViewUrl, evaluateToolRule, summarizeSessionTokensFromEvents, toDiffRows, diffGutterNo, computeElisionState, toolResultStubbed, toolResultStub, toolResultBytes, conversationalStubbed, conversationalStub, asEventId } from '@moxxy/sdk';
+import { z as z$1, defineProvider, definePlugin, defineTool, MoxxyError, writeFileAtomic, asTurnId, defineMode, asPluginId, defineChannel, defineTunnelProvider, spawnCliTunnel, isCliTunnelAvailable, createMutex, defineWorkflowExecutor, toFriendlyError, estimateTextTokens, classifyHttpStatus, createStuckLoopDetector, runCompactionIfNeeded, runElisionIfNeeded, collectProviderStream, usageEventFields, isContextOverflowError, emitRequestsAndDetectStuck, executeToolUses, buildSystemPromptWithSkills, projectMessages, defineCompactor, defineCacheStrategy, denyByDefaultResolver, createAllowListResolver, moxxyPath, zodToJsonSchema, fileDiffSummary, runSingleShotTurn, bearerTokenMatches, resolveChannelToken, rotateChannelToken, defineSurface, estimateContextTokens as estimateContextTokens$1, readRequestBody, isFileDiffDisplay, MOXXY_WS_SUBPROTOCOL, defineEmbedder, migrateModeName, bearerGuard, tokenFromWsProtocolHeader, skillFrontmatterSchema, asSkillId, getInstallHint, moxxyHome, defineTranscriber, summarizeTokensByModel, countNodes, createDeferredPermissionResolver, writeFileAtomicSync, encodeLoginPrompt, classifyNetworkError, addModelTotals, ISOLATION_RANK, moxxyPackageSchema, defineCommand, fileDiffVerb, createCallbackResolver, autoAllowResolver, asSessionId, asToolCallId, defineViewRenderer, DEFAULT_VIEW_TAGS, assertNever, isSafeViewUrl, evaluateToolRule, summarizeSessionTokensFromEvents, toDiffRows, diffGutterNo, computeElisionState, toolResultStubbed, toolResultStub, toolResultBytes, conversationalStubbed, conversationalStub, asEventId } from '@moxxy/sdk';
 import * as fs28 from 'fs';
-import fs28__default, { existsSync, promises, ReadStream, readFileSync, statSync, readdirSync, mkdirSync, writeFileSync, unlinkSync, renameSync, watch, createReadStream } from 'fs';
+import fs28__default, { existsSync, promises, ReadStream, readFileSync, statSync, readdirSync, mkdirSync, writeFileSync, unlinkSync, watch, createReadStream } from 'fs';
 import * as path3 from 'path';
 import path3__default, { join, dirname, basename } from 'path';
 import { z } from 'zod';
@@ -806,7 +806,7 @@ async function* runTurn(session, prompt, opts = {}) {
         yield queue.shift();
       if (done)
         break;
-      await new Promise((resolve12) => waiters.push(resolve12));
+      await new Promise((resolve13) => waiters.push(resolve13));
     }
   } finally {
     unsubscribe();
@@ -1551,44 +1551,83 @@ var init_modes = __esm({
   }
 });
 
-// ../core/dist/registries/cache-strategies.js
-var CacheStrategyRegistry;
-var init_cache_strategies = __esm({
-  "../core/dist/registries/cache-strategies.js"() {
-    CacheStrategyRegistry = class {
-      strategies = /* @__PURE__ */ new Map();
+// ../core/dist/registries/active-def-registry.js
+var ActiveDefRegistry;
+var init_active_def_registry = __esm({
+  "../core/dist/registries/active-def-registry.js"() {
+    ActiveDefRegistry = class {
+      defs = /* @__PURE__ */ new Map();
       active = null;
-      register(s2) {
-        if (this.strategies.has(s2.name)) {
-          throw new Error(`Cache strategy already registered: ${s2.name}`);
+      noun;
+      autoAdoptFirst;
+      constructor(opts) {
+        this.noun = opts.noun;
+        this.autoAdoptFirst = opts.autoAdoptFirst ?? true;
+      }
+      /**
+       * Register a def. Throws on duplicate — use `replace()` to overwrite.
+       * Auto-activates the first registration (when `autoAdoptFirst`).
+       */
+      register(def) {
+        if (this.defs.has(def.name)) {
+          throw new Error(`${this.noun} already registered: ${def.name}`);
         }
-        this.strategies.set(s2.name, s2);
-        if (!this.active)
-          this.active = s2.name;
+        this.defs.set(def.name, def);
+        if (this.autoAdoptFirst && !this.active)
+          this.active = def.name;
       }
-      replace(s2) {
-        this.strategies.set(s2.name, s2);
-        if (!this.active)
-          this.active = s2.name;
+      /** Overwrite an existing def (or add a new one) without throwing.
+       *  Auto-activates when nothing is active yet (mirrors `register`). */
+      replace(def) {
+        this.defs.set(def.name, def);
+        if (this.autoAdoptFirst && !this.active)
+          this.active = def.name;
       }
+      /**
+       * Remove a def. If it was active, the active slot is cleared (callers must
+       * `setActive()` rather than getting an arbitrary "next").
+       */
       unregister(name) {
-        this.strategies.delete(name);
+        this.defs.delete(name);
         if (this.active === name)
           this.active = null;
       }
       list() {
-        return [...this.strategies.values()];
+        return [...this.defs.values()];
+      }
+      has(name) {
+        return this.defs.has(name);
       }
       setActive(name) {
-        const strategy = this.strategies.get(name);
-        if (!strategy)
-          throw new Error(`Cache strategy not registered: ${name}`);
-        this.active = strategy.name;
+        const def = this.defs.get(name);
+        if (!def)
+          throw new Error(`${this.noun} not registered: ${name}`);
+        this.active = def.name;
+      }
+      /** Deactivate the current def (callers fall back to their default). */
+      clearActive() {
+        this.active = null;
       }
       getActive() {
         if (!this.active)
           return null;
-        return this.strategies.get(this.active) ?? null;
+        return this.defs.get(this.active) ?? null;
+      }
+      getActiveName() {
+        return this.active;
+      }
+    };
+  }
+});
+
+// ../core/dist/registries/cache-strategies.js
+var CacheStrategyRegistry;
+var init_cache_strategies = __esm({
+  "../core/dist/registries/cache-strategies.js"() {
+    init_active_def_registry();
+    CacheStrategyRegistry = class extends ActiveDefRegistry {
+      constructor() {
+        super({ noun: "Cache strategy" });
       }
     };
   }
@@ -1598,40 +1637,10 @@ var init_cache_strategies = __esm({
 var ViewRendererRegistry;
 var init_view_renderers = __esm({
   "../core/dist/registries/view-renderers.js"() {
-    ViewRendererRegistry = class {
-      renderers = /* @__PURE__ */ new Map();
-      active = null;
-      register(r2) {
-        if (this.renderers.has(r2.name)) {
-          throw new Error(`View renderer already registered: ${r2.name}`);
-        }
-        this.renderers.set(r2.name, r2);
-        if (!this.active)
-          this.active = r2.name;
-      }
-      replace(r2) {
-        this.renderers.set(r2.name, r2);
-        if (!this.active)
-          this.active = r2.name;
-      }
-      unregister(name) {
-        this.renderers.delete(name);
-        if (this.active === name)
-          this.active = null;
-      }
-      list() {
-        return [...this.renderers.values()];
-      }
-      setActive(name) {
-        const renderer2 = this.renderers.get(name);
-        if (!renderer2)
-          throw new Error(`View renderer not registered: ${name}`);
-        this.active = renderer2.name;
-      }
-      getActive() {
-        if (!this.active)
-          return null;
-        return this.renderers.get(this.active) ?? null;
+    init_active_def_registry();
+    ViewRendererRegistry = class extends ActiveDefRegistry {
+      constructor() {
+        super({ noun: "View renderer" });
       }
     };
   }
@@ -2034,11 +2043,6 @@ function validateDoc(doc, allowList) {
   walk3(doc.root);
   return errors2;
 }
-function countNodes(node) {
-  if (node.kind === "text")
-    return 1;
-  return 1 + node.children.reduce((sum, c2) => sum + countNodes(c2), 0);
-}
 var ParseFail;
 var init_parse = __esm({
   "../core/dist/view/parse.js"() {
@@ -2068,40 +2072,10 @@ var init_default_renderer = __esm({
 var TunnelProviderRegistry;
 var init_tunnel_providers = __esm({
   "../core/dist/registries/tunnel-providers.js"() {
-    TunnelProviderRegistry = class {
-      providers = /* @__PURE__ */ new Map();
-      active = null;
-      register(p3) {
-        if (this.providers.has(p3.name)) {
-          throw new Error(`Tunnel provider already registered: ${p3.name}`);
-        }
-        this.providers.set(p3.name, p3);
-        if (!this.active)
-          this.active = p3.name;
-      }
-      replace(p3) {
-        this.providers.set(p3.name, p3);
-        if (!this.active)
-          this.active = p3.name;
-      }
-      unregister(name) {
-        this.providers.delete(name);
-        if (this.active === name)
-          this.active = null;
-      }
-      list() {
-        return [...this.providers.values()];
-      }
-      setActive(name) {
-        const provider = this.providers.get(name);
-        if (!provider)
-          throw new Error(`Tunnel provider not registered: ${name}`);
-        this.active = provider.name;
-      }
-      getActive() {
-        if (!this.active)
-          return null;
-        return this.providers.get(this.active) ?? null;
+    init_active_def_registry();
+    TunnelProviderRegistry = class extends ActiveDefRegistry {
+      constructor() {
+        super({ noun: "Tunnel provider" });
       }
     };
   }
@@ -2124,51 +2098,52 @@ var init_localhost = __esm({
 var CompactorRegistry;
 var init_compactors = __esm({
   "../core/dist/registries/compactors.js"() {
-    CompactorRegistry = class {
-      compactors = /* @__PURE__ */ new Map();
-      active = null;
+    init_active_def_registry();
+    CompactorRegistry = class extends ActiveDefRegistry {
+      constructor() {
+        super({ noun: "Compactor" });
+      }
+    };
+  }
+});
+
+// ../core/dist/registries/def-map-registry.js
+var DefMapRegistry;
+var init_def_map_registry = __esm({
+  "../core/dist/registries/def-map-registry.js"() {
+    DefMapRegistry = class {
+      defs = /* @__PURE__ */ new Map();
+      noun;
+      keyOf;
+      constructor(opts) {
+        this.noun = opts.noun;
+        this.keyOf = opts.keyOf;
+      }
       /**
-       * Register a compactor. Throws on duplicate — use `replace()` for
-       * overwrite. Auto-activates on first registration.
+       * Register a definition. Throws on duplicate so two plugins can't silently
+       * shadow each other — use `replace()` when you really want to override.
        */
-      register(c2) {
-        if (this.compactors.has(c2.name)) {
-          throw new Error(`Compactor already registered: ${c2.name}`);
+      register(def) {
+        const key = this.keyOf(def);
+        if (this.defs.has(key)) {
+          throw new Error(`${this.noun} already registered: ${String(key)}`);
         }
-        this.compactors.set(c2.name, c2);
-        if (!this.active)
-          this.activate(c2);
+        this.defs.set(key, def);
       }
-      replace(c2) {
-        this.compactors.set(c2.name, c2);
-        if (!this.active)
-          this.activate(c2);
+      replace(def) {
+        this.defs.set(this.keyOf(def), def);
       }
-      /**
-       * Remove a compactor. If it was active, the active slot is cleared
-       * (callers must `setActive()` rather than getting an arbitrary "next").
-       */
-      unregister(name) {
-        this.compactors.delete(name);
-        if (this.active === name)
-          this.active = null;
+      unregister(key) {
+        this.defs.delete(key);
       }
       list() {
-        return [...this.compactors.values()];
-      }
-      setActive(name) {
-        const compactor = this.compactors.get(name);
-        if (!compactor)
-          throw new Error(`Compactor not registered: ${name}`);
-        this.activate(compactor);
+        return [...this.defs.values()];
       }
-      getActive() {
-        if (!this.active)
-          return null;
-        return this.compactors.get(this.active) ?? null;
+      get(key) {
+        return this.defs.get(key);
       }
-      activate(compactor) {
-        this.active = compactor.name;
+      has(key) {
+        return this.defs.has(key);
       }
     };
   }
@@ -2178,25 +2153,10 @@ var init_compactors = __esm({
 var ChannelRegistryImpl;
 var init_channels = __esm({
   "../core/dist/registries/channels.js"() {
-    ChannelRegistryImpl = class {
-      defs = /* @__PURE__ */ new Map();
-      register(def) {
-        if (this.defs.has(def.name)) {
-          throw new Error(`Channel already registered: ${def.name}`);
-        }
-        this.defs.set(def.name, def);
-      }
-      unregister(name) {
-        this.defs.delete(name);
-      }
-      list() {
-        return [...this.defs.values()];
-      }
-      get(name) {
-        return this.defs.get(name);
-      }
-      has(name) {
-        return this.defs.has(name);
+    init_def_map_registry();
+    ChannelRegistryImpl = class extends DefMapRegistry {
+      constructor() {
+        super({ noun: "Channel", keyOf: (def) => def.name });
       }
       async listWithAvailability(deps) {
         const out = [];
@@ -2226,25 +2186,10 @@ var init_channels = __esm({
 var SurfaceRegistryImpl;
 var init_surfaces = __esm({
   "../core/dist/registries/surfaces.js"() {
-    SurfaceRegistryImpl = class {
-      defs = /* @__PURE__ */ new Map();
-      register(def) {
-        if (this.defs.has(def.kind)) {
-          throw new Error(`Surface already registered: ${def.kind}`);
-        }
-        this.defs.set(def.kind, def);
-      }
-      unregister(kind3) {
-        this.defs.delete(kind3);
-      }
-      list() {
-        return [...this.defs.values()];
-      }
-      get(kind3) {
-        return this.defs.get(kind3);
-      }
-      has(kind3) {
-        return this.defs.has(kind3);
+    init_def_map_registry();
+    SurfaceRegistryImpl = class extends DefMapRegistry {
+      constructor() {
+        super({ noun: "Surface", keyOf: (def) => def.kind });
       }
     };
   }
@@ -2541,33 +2486,10 @@ var init_tools2 = __esm({
 var AgentRegistry;
 var init_agents = __esm({
   "../core/dist/registries/agents.js"() {
-    AgentRegistry = class {
-      agents = /* @__PURE__ */ new Map();
-      /**
-       * Register a definition. Throws on duplicate so two plugins can't
-       * silently shadow each other — use `replace()` when you really want
-       * to override (e.g. user-config overrides).
-       */
-      register(def) {
-        if (this.agents.has(def.name)) {
-          throw new Error(`Agent already registered: ${def.name}`);
-        }
-        this.agents.set(def.name, def);
-      }
-      replace(def) {
-        this.agents.set(def.name, def);
-      }
-      unregister(name) {
-        this.agents.delete(name);
-      }
-      list() {
-        return [...this.agents.values()];
-      }
-      get(name) {
-        return this.agents.get(name);
-      }
-      has(name) {
-        return this.agents.has(name);
+    init_def_map_registry();
+    AgentRegistry = class extends DefMapRegistry {
+      constructor() {
+        super({ noun: "Agent", keyOf: (def) => def.name });
       }
     };
   }
@@ -2824,46 +2746,14 @@ var init_isolators = __esm({
 var WorkflowExecutorRegistry;
 var init_workflow_executors = __esm({
   "../core/dist/registries/workflow-executors.js"() {
-    WorkflowExecutorRegistry = class {
-      executors = /* @__PURE__ */ new Map();
-      active = null;
-      register(def) {
-        if (this.executors.has(def.name)) {
-          throw new Error(`Workflow executor already registered: ${def.name}`);
-        }
-        this.executors.set(def.name, def);
-        if (!this.active)
-          this.active = def.name;
-      }
-      replace(def) {
-        this.executors.set(def.name, def);
-        if (!this.active)
-          this.active = def.name;
-      }
-      unregister(name) {
-        this.executors.delete(name);
-        if (this.active === name)
-          this.active = null;
-      }
-      list() {
-        return [...this.executors.values()];
-      }
-      setActive(name) {
-        const def = this.executors.get(name);
-        if (!def)
-          throw new Error(`Workflow executor not registered: ${name}`);
-        this.active = def.name;
-      }
-      getActive() {
-        if (!this.active)
-          return null;
-        return this.executors.get(this.active) ?? null;
+    init_active_def_registry();
+    WorkflowExecutorRegistry = class extends ActiveDefRegistry {
+      constructor() {
+        super({ noun: "Workflow executor" });
       }
     };
   }
 });
-
-// ../core/dist/requirements.js
 function issue(requirement, code, message) {
   return {
     requirement,
@@ -2990,6 +2880,8 @@ var init_requirements = __esm({
           }
           case "runtime":
             return null;
+          default:
+            return assertNever(kind3);
         }
       }
     };
@@ -3005,7 +2897,7 @@ function sanitizeRule(rule) {
   }
   return out;
 }
-function matchRule(rule, call) {
+function matchRule(rule, call, intent) {
   if (!nameMatches(rule.name, call.name))
     return false;
   if (rule.inputMatches) {
@@ -3014,17 +2906,27 @@ function matchRule(rule, call) {
       return false;
     for (const [k3, v3] of Object.entries(rule.inputMatches)) {
       const candidate = String(input[k3] ?? "");
+      let re2;
       try {
-        if (!new RegExp(v3).test(candidate))
-          return false;
-      } catch {
-        if (candidate !== v3)
-          return false;
+        re2 = new RegExp(v3);
+      } catch (err) {
+        warnBadPattern(rule.name, k3, v3, intent, err);
+        if (intent === "deny")
+          continue;
+        return false;
       }
+      if (!re2.test(candidate))
+        return false;
     }
   }
   return true;
 }
+function warnBadPattern(ruleName, field, pattern, intent, err) {
+  const detail = err instanceof Error ? err.message : String(err);
+  const resolution = intent === "deny" ? "failing closed (rule still denies)" : "this field cannot match (rule will not grant)";
+  process.stderr.write(`moxxy: invalid regex in ${intent} permission rule "${ruleName}" (inputMatches.${field} = ${JSON.stringify(pattern)}): ${detail} \u2014 ${resolution}
+`);
+}
 function nameMatches(pattern, candidate) {
   if (pattern === candidate)
     return true;
@@ -3081,12 +2983,12 @@ var init_engine = __esm({
       }
       check(call) {
         for (const rule of this.policy.deny) {
-          if (matchRule(rule, call)) {
+          if (matchRule(rule, call, "deny")) {
             return { mode: "deny", reason: rule.reason ?? `Denied by policy: ${rule.name}` };
           }
         }
         for (const rule of this.policy.allow) {
-          if (matchRule(rule, call)) {
+          if (matchRule(rule, call, "allow")) {
             return { mode: "allow", reason: rule.reason ?? `Allowed by policy: ${rule.name}` };
           }
         }
@@ -3549,18 +3451,22 @@ async function loadPreferences() {
   }
 }
 async function savePreferences(patch) {
-  const current = await loadPreferences();
-  const next = { ...current, ...patch };
-  const target = preferencesPath();
-  try {
-    await writeFileAtomic(target, JSON.stringify(next, null, 2) + "\n");
-  } catch (err) {
-    process.stderr.write(`moxxy: failed to persist preferences to ${target}: ${err instanceof Error ? err.message : String(err)}
+  return writeMutex.run(async () => {
+    const current = await loadPreferences();
+    const next = { ...current, ...patch };
+    const target = preferencesPath();
+    try {
+      await writeFileAtomic(target, JSON.stringify(next, null, 2) + "\n");
+    } catch (err) {
+      process.stderr.write(`moxxy: failed to persist preferences to ${target}: ${err instanceof Error ? err.message : String(err)}
 `);
-  }
+    }
+  });
 }
+var writeMutex;
 var init_preferences = __esm({
   "../core/dist/preferences.js"() {
+    writeMutex = createMutex();
   }
 });
 function usageStatsPath() {
@@ -3805,83 +3711,6 @@ var init_loader = __esm({
   }
 });
 
-// ../core/dist/skills/router.js
-function buildSkillIndexPrompt(skills) {
-  if (skills.length === 0)
-    return "";
-  const lines = skills.map((s2) => `- ${s2.frontmatter.name}: ${s2.frontmatter.description}`);
-  return `Available skills:
-${lines.join("\n")}`;
-}
-var SkillRouter;
-var init_router = __esm({
-  "../core/dist/skills/router.js"() {
-    SkillRouter = class {
-      skills;
-      provider;
-      classifierModel;
-      constructor(opts) {
-        this.skills = opts.skills;
-        this.provider = opts.provider;
-        this.classifierModel = opts.classifierModel ?? "claude-haiku-4-5-20251001";
-      }
-      async resolve(prompt) {
-        const candidates = this.filterByTriggers(prompt);
-        if (candidates.length === 0)
-          return null;
-        if (candidates.length === 1) {
-          return { skill: candidates[0], confidence: 0.9, reason: "trigger_match" };
-        }
-        if (this.provider) {
-          const winner = await this.classify(prompt, candidates);
-          if (winner)
-            return { skill: winner, confidence: 0.7, reason: "classifier" };
-        }
-        return { skill: candidates[0], confidence: 0.5, reason: "trigger_match" };
-      }
-      filterByTriggers(prompt) {
-        const lower2 = prompt.toLowerCase();
-        const out = [];
-        for (const skill of this.skills) {
-          const triggers = skill.frontmatter.triggers ?? [];
-          if (triggers.some((t2) => lower2.includes(t2.toLowerCase())))
-            out.push(skill);
-        }
-        return out;
-      }
-      async classify(prompt, candidates) {
-        if (!this.provider)
-          return null;
-        const list = candidates.map((s2, i2) => `${i2 + 1}. ${s2.frontmatter.name} \u2014 ${s2.frontmatter.description}`).join("\n");
-        const system = "You are a skill classifier. Given a user prompt and a list of candidate skills, reply with ONLY the number of the best-fit skill, or 0 if none.";
-        let acc = "";
-        for await (const event of this.provider.stream({
-          model: this.classifierModel,
-          system,
-          messages: [
-            {
-              role: "user",
-              content: [{ type: "text", text: `Prompt:
-${prompt}
-
-Candidates:
-${list}` }]
-            }
-          ]
-        })) {
-          if (event.type === "text_delta")
-            acc += event.delta;
-        }
-        const match = /(\d+)/.exec(acc);
-        const index = match ? Number(match[1]) - 1 : -1;
-        if (index < 0 || index >= candidates.length)
-          return null;
-        return candidates[index] ?? null;
-      }
-    };
-  }
-});
-
 // ../core/dist/skills/synthesize-draft.js
 async function draftSkill(provider, model, intent, signal) {
   let accumulated = "";
@@ -4090,7 +3919,6 @@ var init_skills2 = __esm({
   "../core/dist/skills/index.js"() {
     init_parse2();
     init_loader();
-    init_router();
     init_synthesize();
   }
 });
@@ -4207,6 +4035,8 @@ var init_persistence = __esm({
       logPath;
       meta;
       indexUpdateScheduled = false;
+      /** Handle for the in-flight debounce timer, so `flush()` can cancel it. */
+      indexTimer = null;
       /**
        * In-flight writes are serialized through this mutex so the file
        * stays append-ordered even when events arrive faster than the disk
@@ -4268,6 +4098,23 @@ var init_persistence = __esm({
           this.scheduleIndexWrite();
         };
       }
+      /**
+       * Force the pending (debounced) index write to happen now and resolve once
+       * the meta sidecar is on disk. Cancels the in-flight debounce timer so the
+       * write isn't also re-run on its original schedule. Intended for awaitable
+       * shutdown: `detach()` only *schedules* the final write (an `unref`'d timer
+       * an immediate `process.exit` can drop), whereas `await flush()` guarantees
+       * it completed. The steady-state debounce in `scheduleIndexWrite` is
+       * untouched, so calling this mid-session just collapses the next write early.
+       */
+      async flush() {
+        if (this.indexTimer) {
+          clearTimeout(this.indexTimer);
+          this.indexTimer = null;
+        }
+        this.indexUpdateScheduled = false;
+        await this.writeIndex();
+      }
       /**
        * Manually update header fields (provider/model) when the user
        * switches mid-session. The /model picker calls this so the index
@@ -4337,15 +4184,20 @@ var init_persistence = __esm({
         if (this.indexUpdateScheduled)
           return;
         this.indexUpdateScheduled = true;
-        setTimeout(() => {
+        const timer = setTimeout(() => {
           this.indexUpdateScheduled = false;
+          this.indexTimer = null;
           void this.writeIndex();
-        }, 250).unref?.();
+        }, 250);
+        timer.unref?.();
+        this.indexTimer = timer;
       }
       async writeIndex() {
         try {
-          await this.ensureDir();
-          await this.ensureLogFile();
+          if (!this.closed) {
+            await this.ensureDir();
+            await this.ensureLogFile();
+          }
           await writeJsonAtomic(metaPath(this.dir, this.meta.id), this.meta);
         } catch {
         }
@@ -7303,8 +7155,8 @@ var require_jiti = __commonJS({
         }
         const He2 = /^[/\\]{2}/, ze2 = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/, Je2 = /^[A-Za-z]:$/, Ye2 = /.(\.[^./]+|\.)$/, pathe_M_eThtNZ_normalize = function(e5) {
           if (0 === e5.length) return ".";
-          const t4 = (e5 = pathe_M_eThtNZ_normalizeWindowsPath(e5)).match(He2), i3 = isAbsolute4(e5), n3 = "/" === e5[e5.length - 1];
-          return 0 === (e5 = normalizeString(e5, !i3)).length ? i3 ? "/" : n3 ? "./" : "." : (n3 && (e5 += "/"), Je2.test(e5) && (e5 += "/"), t4 ? i3 ? `//${e5}` : `//./${e5}` : i3 && !isAbsolute4(e5) ? `/${e5}` : e5);
+          const t4 = (e5 = pathe_M_eThtNZ_normalizeWindowsPath(e5)).match(He2), i3 = isAbsolute5(e5), n3 = "/" === e5[e5.length - 1];
+          return 0 === (e5 = normalizeString(e5, !i3)).length ? i3 ? "/" : n3 ? "./" : "." : (n3 && (e5 += "/"), Je2.test(e5) && (e5 += "/"), t4 ? i3 ? `//${e5}` : `//./${e5}` : i3 && !isAbsolute5(e5) ? `/${e5}` : e5);
         }, pathe_M_eThtNZ_join = function(...e5) {
           let t4 = "";
           for (const i3 of e5) if (i3) if (t4.length > 0) {
@@ -7320,9 +7172,9 @@ var require_jiti = __commonJS({
           let t4 = "", i3 = false;
           for (let n3 = (e5 = e5.map((e6) => pathe_M_eThtNZ_normalizeWindowsPath(e6))).length - 1; n3 >= -1 && !i3; n3--) {
             const a3 = n3 >= 0 ? e5[n3] : pathe_M_eThtNZ_cwd();
-            a3 && 0 !== a3.length && (t4 = `${a3}/${t4}`, i3 = isAbsolute4(a3));
+            a3 && 0 !== a3.length && (t4 = `${a3}/${t4}`, i3 = isAbsolute5(a3));
           }
-          return t4 = normalizeString(t4, !i3), i3 && !isAbsolute4(t4) ? `/${t4}` : t4.length > 0 ? t4 : ".";
+          return t4 = normalizeString(t4, !i3), i3 && !isAbsolute5(t4) ? `/${t4}` : t4.length > 0 ? t4 : ".";
         };
         function normalizeString(e5, t4) {
           let i3 = "", n3 = 0, a3 = -1, c3 = 0, l3 = null;
@@ -7353,7 +7205,7 @@ var require_jiti = __commonJS({
           }
           return i3;
         }
-        const isAbsolute4 = function(e5) {
+        const isAbsolute5 = function(e5) {
           return ze2.test(e5);
         }, extname2 = function(e5) {
           if (".." === e5) return "";
@@ -7361,7 +7213,7 @@ var require_jiti = __commonJS({
           return t4 && t4[1] || "";
         }, pathe_M_eThtNZ_dirname = function(e5) {
           const t4 = pathe_M_eThtNZ_normalizeWindowsPath(e5).replace(/\/$/, "").split("/").slice(0, -1);
-          return 1 === t4.length && Je2.test(t4[0]) && (t4[0] += "/"), t4.join("/") || (isAbsolute4(e5) ? "/" : ".");
+          return 1 === t4.length && Je2.test(t4[0]) && (t4[0] += "/"), t4.join("/") || (isAbsolute5(e5) ? "/" : ".");
         }, basename7 = function(e5, t4) {
           const i3 = pathe_M_eThtNZ_normalizeWindowsPath(e5).split("/");
           let n3 = "";
@@ -7837,7 +7689,7 @@ Default "index" lookups for the main are deprecated for ES modules.`, "Deprecati
           }
           if (/(?:node|data|http|https):/.test(e5)) return e5;
           if (st3.has(e5)) return "node:" + e5;
-          if (e5.startsWith("file://") && (e5 = fileURLToPath10(e5)), isAbsolute4(e5)) try {
+          if (e5.startsWith("file://") && (e5 = fileURLToPath10(e5)), isAbsolute5(e5)) try {
             if ((0, $e2.statSync)(e5).isFile()) return pathToFileURL3(e5);
           } catch (e6) {
             if ("ENOENT" !== e6?.code) throw e6;
@@ -8074,7 +7926,7 @@ Default "index" lookups for the main are deprecated for ES modules.`, "Deprecati
         }
         function nativeImportOrRequire(e5, t4, i3) {
           return i3 && e5.nativeImport ? e5.nativeImport((function(e6) {
-            return ni && isAbsolute4(e6) ? pathToFileURL3(e6) : e6;
+            return ni && isAbsolute5(e6) ? pathToFileURL3(e6) : e6;
           })(t4)).then((t5) => jitiInteropDefault(e5, t5)) : jitiInteropDefault(e5, e5.nativeRequire(t4));
         }
         const Ti = "9";
@@ -8364,14 +8216,12 @@ __export(dist_exports, {
   Session: () => Session,
   SessionPersistence: () => SessionPersistence,
   SkillRegistryImpl: () => SkillRegistryImpl,
-  SkillRouter: () => SkillRouter,
   SynthesizerRegistry: () => SynthesizerRegistry,
   ToolRegistryImpl: () => ToolRegistryImpl,
   TranscriberRegistry: () => TranscriberRegistry,
   TunnelProviderRegistry: () => TunnelProviderRegistry,
   ViewRendererRegistry: () => ViewRendererRegistry,
   autoAllowResolver: () => autoAllowResolver,
-  buildSkillIndexPrompt: () => buildSkillIndexPrompt,
   buildSynthesizeSkillPlugin: () => buildSynthesizeSkillPlugin,
   clearRetainedChildren: () => clearRetainedChildren,
   clearUsageStats: () => clearUsageStats,
@@ -12364,10 +12214,10 @@ var require_resolve_block_map = __commonJS({
       let offset = bm.offset;
       let commentEnd = null;
       for (const collItem of bm.items) {
-        const { start, key, sep: sep2, value } = collItem;
+        const { start, key, sep: sep3, value } = collItem;
         const keyProps = resolveProps.resolveProps(start, {
           indicator: "explicit-key-ind",
-          next: key ?? sep2?.[0],
+          next: key ?? sep3?.[0],
           offset,
           onError: onError2,
           parentIndent: bm.indent,
@@ -12381,7 +12231,7 @@ var require_resolve_block_map = __commonJS({
             else if ("indent" in key && key.indent !== bm.indent)
               onError2(offset, "BAD_INDENT", startColMsg);
           }
-          if (!keyProps.anchor && !keyProps.tag && !sep2) {
+          if (!keyProps.anchor && !keyProps.tag && !sep3) {
             commentEnd = keyProps.end;
             if (keyProps.comment) {
               if (map2.comment)
@@ -12405,7 +12255,7 @@ var require_resolve_block_map = __commonJS({
         ctx.atKey = false;
         if (utilMapIncludes.mapIncludes(ctx, map2.items, keyNode))
           onError2(keyStart, "DUPLICATE_KEY", "Map keys must be unique");
-        const valueProps = resolveProps.resolveProps(sep2 ?? [], {
+        const valueProps = resolveProps.resolveProps(sep3 ?? [], {
           indicator: "map-value-ind",
           next: value,
           offset: keyNode.range[2],
@@ -12421,7 +12271,7 @@ var require_resolve_block_map = __commonJS({
             if (ctx.options.strict && keyProps.start < valueProps.found.offset - 1024)
               onError2(keyNode.range, "KEY_OVER_1024_CHARS", "The : indicator must be at most 1024 chars after the start of an implicit block mapping key");
           }
-          const valueNode = value ? composeNode(ctx, value, valueProps, onError2) : composeEmptyNode(ctx, offset, sep2, null, valueProps, onError2);
+          const valueNode = value ? composeNode(ctx, value, valueProps, onError2) : composeEmptyNode(ctx, offset, sep3, null, valueProps, onError2);
           if (ctx.schema.compat)
             utilFlowIndentCheck.flowIndentCheck(bm.indent, value, onError2);
           offset = valueNode.range[2];
@@ -12510,7 +12360,7 @@ var require_resolve_end = __commonJS({
       let comment = "";
       if (end) {
         let hasSpace = false;
-        let sep2 = "";
+        let sep3 = "";
         for (const token of end) {
           const { source, type } = token;
           switch (type) {
@@ -12524,13 +12374,13 @@ var require_resolve_end = __commonJS({
               if (!comment)
                 comment = cb;
               else
-                comment += sep2 + cb;
-              sep2 = "";
+                comment += sep3 + cb;
+              sep3 = "";
               break;
             }
             case "newline":
               if (comment)
-                sep2 += source;
+                sep3 += source;
               hasSpace = true;
               break;
             default:
@@ -12572,18 +12422,18 @@ var require_resolve_flow_collection = __commonJS({
       let offset = fc.offset + fc.start.source.length;
       for (let i2 = 0; i2 < fc.items.length; ++i2) {
         const collItem = fc.items[i2];
-        const { start, key, sep: sep2, value } = collItem;
+        const { start, key, sep: sep3, value } = collItem;
         const props = resolveProps.resolveProps(start, {
           flow: fcName,
           indicator: "explicit-key-ind",
-          next: key ?? sep2?.[0],
+          next: key ?? sep3?.[0],
           offset,
           onError: onError2,
           parentIndent: fc.indent,
           startOnNewline: false
         });
         if (!props.found) {
-          if (!props.anchor && !props.tag && !sep2 && !value) {
+          if (!props.anchor && !props.tag && !sep3 && !value) {
             if (i2 === 0 && props.comma)
               onError2(props.comma, "UNEXPECTED_TOKEN", `Unexpected , in ${fcName}`);
             else if (i2 < fc.items.length - 1)
@@ -12637,8 +12487,8 @@ var require_resolve_flow_collection = __commonJS({
             }
           }
         }
-        if (!isMap && !sep2 && !props.found) {
-          const valueNode = value ? composeNode(ctx, value, props, onError2) : composeEmptyNode(ctx, props.end, sep2, null, props, onError2);
+        if (!isMap && !sep3 && !props.found) {
+          const valueNode = value ? composeNode(ctx, value, props, onError2) : composeEmptyNode(ctx, props.end, sep3, null, props, onError2);
           coll.items.push(valueNode);
           offset = valueNode.range[2];
           if (isBlock(value))
@@ -12650,7 +12500,7 @@ var require_resolve_flow_collection = __commonJS({
           if (isBlock(key))
             onError2(keyNode.range, "BLOCK_IN_FLOW", blockMsg);
           ctx.atKey = false;
-          const valueProps = resolveProps.resolveProps(sep2 ?? [], {
+          const valueProps = resolveProps.resolveProps(sep3 ?? [], {
             flow: fcName,
             indicator: "map-value-ind",
             next: value,
@@ -12661,8 +12511,8 @@ var require_resolve_flow_collection = __commonJS({
           });
           if (valueProps.found) {
             if (!isMap && !props.found && ctx.options.strict) {
-              if (sep2)
-                for (const st3 of sep2) {
+              if (sep3)
+                for (const st3 of sep3) {
                   if (st3 === valueProps.found)
                     break;
                   if (st3.type === "newline") {
@@ -12679,7 +12529,7 @@ var require_resolve_flow_collection = __commonJS({
             else
               onError2(valueProps.start, "MISSING_CHAR", `Missing , or : between ${fcName} items`);
           }
-          const valueNode = value ? composeNode(ctx, value, valueProps, onError2) : valueProps.found ? composeEmptyNode(ctx, valueProps.end, sep2, null, valueProps, onError2) : null;
+          const valueNode = value ? composeNode(ctx, value, valueProps, onError2) : valueProps.found ? composeEmptyNode(ctx, valueProps.end, sep3, null, valueProps, onError2) : null;
           if (valueNode) {
             if (isBlock(value))
               onError2(valueNode.range, "BLOCK_IN_FLOW", blockMsg);
@@ -12857,7 +12707,7 @@ var require_resolve_block_scalar = __commonJS({
           chompStart = i2 + 1;
       }
       let value = "";
-      let sep2 = "";
+      let sep3 = "";
       let prevMoreIndented = false;
       for (let i2 = 0; i2 < contentStart; ++i2)
         value += lines[i2][0].slice(trimIndent) + "\n";
@@ -12874,24 +12724,24 @@ var require_resolve_block_scalar = __commonJS({
           indent = "";
         }
         if (type === Scalar.Scalar.BLOCK_LITERAL) {
-          value += sep2 + indent.slice(trimIndent) + content;
-          sep2 = "\n";
+          value += sep3 + indent.slice(trimIndent) + content;
+          sep3 = "\n";
         } else if (indent.length > trimIndent || content[0] === "	") {
-          if (sep2 === " ")
-            sep2 = "\n";
-          else if (!prevMoreIndented && sep2 === "\n")
-            sep2 = "\n\n";
-          value += sep2 + indent.slice(trimIndent) + content;
-          sep2 = "\n";
+          if (sep3 === " ")
+            sep3 = "\n";
+          else if (!prevMoreIndented && sep3 === "\n")
+            sep3 = "\n\n";
+          value += sep3 + indent.slice(trimIndent) + content;
+          sep3 = "\n";
           prevMoreIndented = true;
         } else if (content === "") {
-          if (sep2 === "\n")
+          if (sep3 === "\n")
             value += "\n";
           else
-            sep2 = "\n";
+            sep3 = "\n";
         } else {
-          value += sep2 + content;
-          sep2 = " ";
+          value += sep3 + content;
+          sep3 = " ";
           prevMoreIndented = false;
         }
       }
@@ -13072,25 +12922,25 @@ var require_resolve_flow_scalar = __commonJS({
       if (!match)
         return source;
       let res = match[1];
-      let sep2 = " ";
+      let sep3 = " ";
       let pos = first.lastIndex;
       line.lastIndex = pos;
       while (match = line.exec(source)) {
         if (match[1] === "") {
-          if (sep2 === "\n")
-            res += sep2;
+          if (sep3 === "\n")
+            res += sep3;
           else
-            sep2 = "\n";
+            sep3 = "\n";
         } else {
-          res += sep2 + match[1];
-          sep2 = " ";
+          res += sep3 + match[1];
+          sep3 = " ";
         }
         pos = line.lastIndex;
       }
       const last = /[ \t]*(.*)/sy;
       last.lastIndex = pos;
       match = last.exec(source);
-      return res + sep2 + (match?.[1] ?? "");
+      return res + sep3 + (match?.[1] ?? "");
     }
     function doubleQuotedValue(source, onError2) {
       let res = "";
@@ -13893,14 +13743,14 @@ var require_cst_stringify = __commonJS({
         }
       }
     }
-    function stringifyItem({ start, key, sep: sep2, value }) {
+    function stringifyItem({ start, key, sep: sep3, value }) {
       let res = "";
       for (const st3 of start)
         res += st3.source;
       if (key)
         res += stringifyToken(key);
-      if (sep2)
-        for (const st3 of sep2)
+      if (sep3)
+        for (const st3 of sep3)
           res += st3.source;
       if (value)
         res += stringifyToken(value);
@@ -15062,18 +14912,18 @@ var require_parser = __commonJS({
         if (this.type === "map-value-ind") {
           const prev = getPrevProps(this.peek(2));
           const start = getFirstKeyStartProps(prev);
-          let sep2;
+          let sep3;
           if (scalar.end) {
-            sep2 = scalar.end;
-            sep2.push(this.sourceToken);
+            sep3 = scalar.end;
+            sep3.push(this.sourceToken);
             delete scalar.end;
           } else
-            sep2 = [this.sourceToken];
+            sep3 = [this.sourceToken];
           const map2 = {
             type: "block-map",
             offset: scalar.offset,
             indent: scalar.indent,
-            items: [{ start, key: scalar, sep: sep2 }]
+            items: [{ start, key: scalar, sep: sep3 }]
           };
           this.onKeyLine = true;
           this.stack[this.stack.length - 1] = map2;
@@ -15226,15 +15076,15 @@ var require_parser = __commonJS({
                 } else if (isFlowToken(it4.key) && !includesToken(it4.sep, "newline")) {
                   const start2 = getFirstKeyStartProps(it4.start);
                   const key = it4.key;
-                  const sep2 = it4.sep;
-                  sep2.push(this.sourceToken);
+                  const sep3 = it4.sep;
+                  sep3.push(this.sourceToken);
                   delete it4.key;
                   delete it4.sep;
                   this.stack.push({
                     type: "block-map",
                     offset: this.offset,
                     indent: this.indent,
-                    items: [{ start: start2, key, sep: sep2 }]
+                    items: [{ start: start2, key, sep: sep3 }]
                   });
                 } else if (start.length > 0) {
                   it4.sep = it4.sep.concat(start, this.sourceToken);
@@ -15428,13 +15278,13 @@ var require_parser = __commonJS({
             const prev = getPrevProps(parent);
             const start = getFirstKeyStartProps(prev);
             fixFlowSeqItems(fc);
-            const sep2 = fc.end.splice(1, fc.end.length);
-            sep2.push(this.sourceToken);
+            const sep3 = fc.end.splice(1, fc.end.length);
+            sep3.push(this.sourceToken);
             const map2 = {
               type: "block-map",
               offset: fc.offset,
               indent: fc.indent,
-              items: [{ start, key: fc, sep: sep2 }]
+              items: [{ start, key: fc, sep: sep3 }]
             };
             this.onKeyLine = true;
             this.stack[this.stack.length - 1] = map2;
@@ -16147,7 +15997,7 @@ var require_tr46 = __commonJS({
       TRANSITIONAL: 0,
       NONTRANSITIONAL: 1
     };
-    function normalize3(str2) {
+    function normalize4(str2) {
       return str2.split("\0").map(function(s2) {
         return s2.normalize("NFC");
       }).join("\0");
@@ -16227,7 +16077,7 @@ var require_tr46 = __commonJS({
         PROCESSING_OPTIONS.NONTRANSITIONAL;
       }
       var error2 = false;
-      if (normalize3(label3) !== label3 || label3[3] === "-" && label3[4] === "-" || label3[0] === "-" || label3[label3.length - 1] === "-" || label3.indexOf(".") !== -1 || label3.search(combiningMarksRegex) === 0) {
+      if (normalize4(label3) !== label3 || label3[3] === "-" && label3[4] === "-" || label3[0] === "-" || label3[label3.length - 1] === "-" || label3.indexOf(".") !== -1 || label3.search(combiningMarksRegex) === 0) {
         error2 = true;
       }
       var len = countSymbols(label3);
@@ -16245,7 +16095,7 @@ var require_tr46 = __commonJS({
     }
     function processing(domain_name, useSTD3, processing_option) {
       var result = mapChars(domain_name, useSTD3, processing_option);
-      result.string = normalize3(result.string);
+      result.string = normalize4(result.string);
       var labels = result.string.split(".");
       for (var i2 = 0; i2 < labels.length; ++i2) {
         try {
@@ -21461,7 +21311,7 @@ function consumeBody() {
   let accum = [];
   let accumBytes = 0;
   let abort = false;
-  return new Body.Promise(function(resolve12, reject) {
+  return new Body.Promise(function(resolve13, reject) {
     let resTimeout;
     if (_this4.timeout) {
       resTimeout = setTimeout(function() {
@@ -21495,7 +21345,7 @@ function consumeBody() {
       }
       clearTimeout(resTimeout);
       try {
-        resolve12(Buffer.concat(accum, accumBytes));
+        resolve13(Buffer.concat(accum, accumBytes));
       } catch (err) {
         reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, "system", err));
       }
@@ -21758,7 +21608,7 @@ function fetch3(url2, opts) {
     throw new Error("native promise missing, set fetch.Promise to your favorite alternative");
   }
   Body.Promise = fetch3.Promise;
-  return new fetch3.Promise(function(resolve12, reject) {
+  return new fetch3.Promise(function(resolve13, reject) {
     const request = new Request2(url2, opts);
     const options = getNodeRequestOptions(request);
     const send = (options.protocol === "https:" ? https : http).request;
@@ -21891,7 +21741,7 @@ function fetch3(url2, opts) {
               requestOpts.body = void 0;
               requestOpts.headers.delete("content-length");
             }
-            resolve12(fetch3(new Request2(locationURL, requestOpts)));
+            resolve13(fetch3(new Request2(locationURL, requestOpts)));
             finalize();
             return;
         }
@@ -21912,7 +21762,7 @@ function fetch3(url2, opts) {
       const codings = headers.get("Content-Encoding");
       if (!request.compress || request.method === "HEAD" || codings === null || res.statusCode === 204 || res.statusCode === 304) {
         response = new Response3(body, response_options);
-        resolve12(response);
+        resolve13(response);
         return;
       }
       const zlibOptions = {
@@ -21922,7 +21772,7 @@ function fetch3(url2, opts) {
       if (codings == "gzip" || codings == "x-gzip") {
         body = body.pipe(zlib.createGunzip(zlibOptions));
         response = new Response3(body, response_options);
-        resolve12(response);
+        resolve13(response);
         return;
       }
       if (codings == "deflate" || codings == "x-deflate") {
@@ -21934,12 +21784,12 @@ function fetch3(url2, opts) {
             body = body.pipe(zlib.createInflateRaw());
           }
           response = new Response3(body, response_options);
-          resolve12(response);
+          resolve13(response);
         });
         raw.on("end", function() {
           if (!response) {
             response = new Response3(body, response_options);
-            resolve12(response);
+            resolve13(response);
           }
         });
         return;
@@ -21947,11 +21797,11 @@ function fetch3(url2, opts) {
       if (codings == "br" && typeof zlib.createBrotliDecompress === "function") {
         body = body.pipe(zlib.createBrotliDecompress());
         response = new Response3(body, response_options);
-        resolve12(response);
+        resolve13(response);
         return;
       }
       response = new Response3(body, response_options);
-      resolve12(response);
+      resolve13(response);
     });
     writeToStream(req, request);
   });
@@ -29798,7 +29648,7 @@ var require_has_flag = __commonJS({
 // ../../node_modules/.pnpm/supports-color@7.2.0/node_modules/supports-color/index.js
 var require_supports_color = __commonJS({
   "../../node_modules/.pnpm/supports-color@7.2.0/node_modules/supports-color/index.js"(exports, module) {
-    var os23 = __require("os");
+    var os22 = __require("os");
     var tty2 = __require("tty");
     var hasFlag2 = require_has_flag();
     var { env: env3 } = process;
@@ -29846,7 +29696,7 @@ var require_supports_color = __commonJS({
         return min;
       }
       if (process.platform === "win32") {
-        const osRelease = os23.release().split(".");
+        const osRelease = os22.release().split(".");
         if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
           return Number(osRelease[2]) >= 14931 ? 3 : 2;
         }
@@ -35470,7 +35320,7 @@ var require_frameworks = __commonJS({
         end: () => resolveResponse({ status: 204 }),
         respond: (json) => resolveResponse({ jsonBody: json }),
         unauthorized: () => resolveResponse({ status: 401, body: WRONG_TOKEN_ERROR }),
-        handlerReturn: new Promise((resolve12) => resolveResponse = resolve12)
+        handlerReturn: new Promise((resolve13) => resolveResponse = resolve13)
       };
     };
     var bun = (request) => {
@@ -35494,8 +35344,8 @@ var require_frameworks = __commonJS({
     };
     var cloudflare = (event) => {
       let resolveResponse;
-      event.respondWith(new Promise((resolve12) => {
-        resolveResponse = resolve12;
+      event.respondWith(new Promise((resolve13) => {
+        resolveResponse = resolve13;
       }));
       return {
         get update() {
@@ -35579,12 +35429,12 @@ var require_frameworks = __commonJS({
       const secretHeaderFromRequest = req.headers[SECRET_HEADER_LOWERCASE];
       return {
         get update() {
-          return new Promise((resolve12, reject) => {
+          return new Promise((resolve13, reject) => {
             const chunks = [];
             req.on("data", (chunk) => chunks.push(chunk)).once("end", () => {
               const raw = Buffer.concat(chunks).toString("utf-8");
               try {
-                resolve12(JSON.parse(raw));
+                resolve13(JSON.parse(raw));
               } catch (err) {
                 reject(err);
               }
@@ -35834,7 +35684,7 @@ var require_webhook = __commonJS({
     function timeoutIfNecessary(task, onTimeout, timeout) {
       if (timeout === Infinity)
         return task;
-      return new Promise((resolve12, reject) => {
+      return new Promise((resolve13, reject) => {
         const handle2 = setTimeout(() => {
           debugErr(`Request timed out after ${timeout} ms`);
           if (onTimeout === "throw") {
@@ -35842,7 +35692,7 @@ var require_webhook = __commonJS({
           } else {
             if (typeof onTimeout === "function")
               onTimeout();
-            resolve12();
+            resolve13();
           }
           const now = Date.now();
           task.finally(() => {
@@ -35850,7 +35700,7 @@ var require_webhook = __commonJS({
             debugErr(`Request completed ${diff2} ms after timeout!`);
           });
         }, timeout);
-        task.then(resolve12).catch(reject).finally(() => clearTimeout(handle2));
+        task.then(resolve13).catch(reject).finally(() => clearTimeout(handle2));
       });
     }
   }
@@ -38461,7 +38311,7 @@ var init_protocol = __esm({
               return;
             }
             const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
-            await new Promise((resolve12) => setTimeout(resolve12, pollInterval));
+            await new Promise((resolve13) => setTimeout(resolve13, pollInterval));
             options?.signal?.throwIfAborted();
           }
         } catch (error2) {
@@ -38478,7 +38328,7 @@ var init_protocol = __esm({
        */
       request(request, resultSchema, options) {
         const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           const earlyReject = (error2) => {
             reject(error2);
           };
@@ -38556,7 +38406,7 @@ var init_protocol = __esm({
               if (!parseResult.success) {
                 reject(parseResult.error);
               } else {
-                resolve12(parseResult.data);
+                resolve13(parseResult.data);
               }
             } catch (error2) {
               reject(error2);
@@ -38817,12 +38667,12 @@ var init_protocol = __esm({
           }
         } catch {
         }
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           if (signal.aborted) {
             reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
             return;
           }
-          const timeoutId = setTimeout(resolve12, interval);
+          const timeoutId = setTimeout(resolve13, interval);
           signal.addEventListener("abort", () => {
             clearTimeout(timeoutId);
             reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -41083,8 +40933,8 @@ var require_resolve = __commonJS({
       }
       return count;
     }
-    function getFullPath(resolver2, id = "", normalize3) {
-      if (normalize3 !== false)
+    function getFullPath(resolver2, id = "", normalize4) {
+      if (normalize4 !== false)
         id = normalizeId(id);
       const p3 = resolver2.parse(id);
       return _getFullPath(resolver2, p3);
@@ -41827,7 +41677,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve12.call(this, root, ref);
+      let _sch = resolve13.call(this, root, ref);
       if (_sch === void 0) {
         const schema = (_a3 = root.localRefs) === null || _a3 === void 0 ? void 0 : _a3[ref];
         const { schemaId } = this.opts;
@@ -41854,7 +41704,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve12(root, ref) {
+    function resolve13(root, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -42472,7 +42322,7 @@ var require_fast_uri = __commonJS({
   "../../node_modules/.pnpm/fast-uri@3.1.2/node_modules/fast-uri/index.js"(exports, module) {
     var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizePercentEncoding, normalizePathEncoding, escapePreservingEscapes, reescapeHostDelimiters, isIPv4, nonSimpleDomain } = require_utils2();
     var { SCHEMES, getSchemeHandler } = require_schemes();
-    function normalize3(uri, options) {
+    function normalize4(uri, options) {
       if (typeof uri === "string") {
         uri = /** @type {T} */
         normalizeString(uri, options);
@@ -42482,7 +42332,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve12(baseURI, relativeURI, options) {
+    function resolve13(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse2(baseURI, schemelessOptions), parse2(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
@@ -42739,8 +42589,8 @@ var require_fast_uri = __commonJS({
     }
     var fastUri = {
       SCHEMES,
-      normalize: normalize3,
-      resolve: resolve12,
+      normalize: normalize4,
+      resolve: resolve13,
       resolveComponent,
       equal,
       serialize,
@@ -46570,12 +46420,12 @@ var require_isexe = __commonJS({
         if (typeof Promise !== "function") {
           throw new TypeError("callback not provided");
         }
-        return new Promise(function(resolve12, reject) {
+        return new Promise(function(resolve13, reject) {
           isexe(path62, options || {}, function(er2, is) {
             if (er2) {
               reject(er2);
             } else {
-              resolve12(is);
+              resolve13(is);
             }
           });
         });
@@ -46641,27 +46491,27 @@ var require_which = __commonJS({
         opt = {};
       const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
       const found = [];
-      const step = (i2) => new Promise((resolve12, reject) => {
+      const step = (i2) => new Promise((resolve13, reject) => {
         if (i2 === pathEnv.length)
-          return opt.all && found.length ? resolve12(found) : reject(getNotFoundError(cmd));
+          return opt.all && found.length ? resolve13(found) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i2];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
         const pCmd = path62.join(pathPart, cmd);
         const p3 = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-        resolve12(subStep(p3, i2, 0));
+        resolve13(subStep(p3, i2, 0));
       });
-      const subStep = (p3, i2, ii) => new Promise((resolve12, reject) => {
+      const subStep = (p3, i2, ii) => new Promise((resolve13, reject) => {
         if (ii === pathExt.length)
-          return resolve12(step(i2 + 1));
+          return resolve13(step(i2 + 1));
         const ext = pathExt[ii];
         isexe(p3 + ext, { pathExt: pathExtExe }, (er2, is) => {
           if (!er2 && is) {
             if (opt.all)
               found.push(p3 + ext);
             else
-              return resolve12(p3 + ext);
+              return resolve13(p3 + ext);
           }
-          return resolve12(subStep(p3, i2, ii + 1));
+          return resolve13(subStep(p3, i2, ii + 1));
         });
       });
       return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
@@ -47057,7 +46907,7 @@ var init_stdio2 = __esm({
         if (this._process) {
           throw new Error("StdioClientTransport already started! If using Client class, note that connect() calls start() automatically.");
         }
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           this._process = (0, import_cross_spawn.default)(this._serverParams.command, this._serverParams.args ?? [], {
             // merge default env with server env because mcp server needs some env vars
             env: {
@@ -47074,7 +46924,7 @@ var init_stdio2 = __esm({
             this.onerror?.(error2);
           });
           this._process.on("spawn", () => {
-            resolve12();
+            resolve13();
           });
           this._process.on("close", (_code) => {
             this._process = void 0;
@@ -47133,22 +46983,22 @@ var init_stdio2 = __esm({
         if (this._process) {
           const processToClose = this._process;
           this._process = void 0;
-          const closePromise = new Promise((resolve12) => {
+          const closePromise = new Promise((resolve13) => {
             processToClose.once("close", () => {
-              resolve12();
+              resolve13();
             });
           });
           try {
             processToClose.stdin?.end();
           } catch {
           }
-          await Promise.race([closePromise, new Promise((resolve12) => setTimeout(resolve12, 2e3).unref())]);
+          await Promise.race([closePromise, new Promise((resolve13) => setTimeout(resolve13, 2e3).unref())]);
           if (processToClose.exitCode === null) {
             try {
               processToClose.kill("SIGTERM");
             } catch {
             }
-            await Promise.race([closePromise, new Promise((resolve12) => setTimeout(resolve12, 2e3).unref())]);
+            await Promise.race([closePromise, new Promise((resolve13) => setTimeout(resolve13, 2e3).unref())]);
           }
           if (processToClose.exitCode === null) {
             try {
@@ -47160,15 +47010,15 @@ var init_stdio2 = __esm({
         this._readBuffer.clear();
       }
       send(message) {
-        return new Promise((resolve12) => {
+        return new Promise((resolve13) => {
           if (!this._process?.stdin) {
             throw new Error("Not connected");
           }
           const json = serializeMessage(message);
           if (this._process.stdin.write(json)) {
-            resolve12();
+            resolve13();
           } else {
-            this._process.stdin.once("drain", resolve12);
+            this._process.stdin.once("drain", resolve13);
           }
         });
       }
@@ -48597,7 +48447,7 @@ var init_sse = __esm({
       }
       _startOrAuth() {
         const fetchImpl2 = this?._eventSourceInit?.fetch ?? this._fetch ?? fetch;
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           this._eventSource = new EventSource(this._url.href, {
             ...this._eventSourceInit,
             fetch: async (url2, init3) => {
@@ -48618,7 +48468,7 @@ var init_sse = __esm({
           this._abortController = new AbortController();
           this._eventSource.onerror = (event) => {
             if (event.code === 401 && this._authProvider) {
-              this._authThenStart().then(resolve12, reject);
+              this._authThenStart().then(resolve13, reject);
               return;
             }
             const error2 = new SseError(event.code, event.message, event);
@@ -48640,7 +48490,7 @@ var init_sse = __esm({
               void this.close();
               return;
             }
-            resolve12();
+            resolve13();
           });
           this._eventSource.onmessage = (event) => {
             const messageEvent = event;
@@ -49234,7 +49084,7 @@ var init_types2 = __esm({
   }
 });
 async function runMcpCallWithFallback(callPromise, signal, toolName) {
-  return await new Promise((resolve12, reject) => {
+  return await new Promise((resolve13, reject) => {
     let settled = false;
     const settle = (fn) => {
       if (settled)
@@ -49251,7 +49101,7 @@ async function runMcpCallWithFallback(callPromise, signal, toolName) {
       settle(() => reject(new Error(`MCP tool "${toolName}" timed out after ${MCP_CALL_TIMEOUT_MS}ms`)));
     }, MCP_CALL_TIMEOUT_MS);
     signal.addEventListener("abort", onAbort, { once: true });
-    callPromise.then((v3) => settle(() => resolve12(v3)), (err) => settle(() => reject(err instanceof Error ? err : new Error(String(err)))));
+    callPromise.then((v3) => settle(() => resolve13(v3)), (err) => settle(() => reject(err instanceof Error ? err : new Error(String(err)))));
   });
 }
 async function wrapMcpServerTools(opts) {
@@ -51987,14 +51837,14 @@ var require_react_development = __commonJS({
               var thenableResult = result;
               var wasAwaited = false;
               var thenable = {
-                then: function(resolve12, reject) {
+                then: function(resolve13, reject) {
                   wasAwaited = true;
                   thenableResult.then(function(returnValue2) {
                     popActScope(prevActScopeDepth);
                     if (actScopeDepth === 0) {
-                      recursivelyFlushAsyncActWork(returnValue2, resolve12, reject);
+                      recursivelyFlushAsyncActWork(returnValue2, resolve13, reject);
                     } else {
-                      resolve12(returnValue2);
+                      resolve13(returnValue2);
                     }
                   }, function(error3) {
                     popActScope(prevActScopeDepth);
@@ -52024,20 +51874,20 @@ var require_react_development = __commonJS({
                   ReactCurrentActQueue.current = null;
                 }
                 var _thenable = {
-                  then: function(resolve12, reject) {
+                  then: function(resolve13, reject) {
                     if (ReactCurrentActQueue.current === null) {
                       ReactCurrentActQueue.current = [];
-                      recursivelyFlushAsyncActWork(returnValue, resolve12, reject);
+                      recursivelyFlushAsyncActWork(returnValue, resolve13, reject);
                     } else {
-                      resolve12(returnValue);
+                      resolve13(returnValue);
                     }
                   }
                 };
                 return _thenable;
               } else {
                 var _thenable2 = {
-                  then: function(resolve12, reject) {
-                    resolve12(returnValue);
+                  then: function(resolve13, reject) {
+                    resolve13(returnValue);
                   }
                 };
                 return _thenable2;
@@ -52053,7 +51903,7 @@ var require_react_development = __commonJS({
             actScopeDepth = prevActScopeDepth;
           }
         }
-        function recursivelyFlushAsyncActWork(returnValue, resolve12, reject) {
+        function recursivelyFlushAsyncActWork(returnValue, resolve13, reject) {
           {
             var queue = ReactCurrentActQueue.current;
             if (queue !== null) {
@@ -52062,16 +51912,16 @@ var require_react_development = __commonJS({
                 enqueueTask(function() {
                   if (queue.length === 0) {
                     ReactCurrentActQueue.current = null;
-                    resolve12(returnValue);
+                    resolve13(returnValue);
                   } else {
-                    recursivelyFlushAsyncActWork(returnValue, resolve12, reject);
+                    recursivelyFlushAsyncActWork(returnValue, resolve13, reject);
                   }
                 });
               } catch (error3) {
                 reject(error3);
               }
             } else {
-              resolve12(returnValue);
+              resolve13(returnValue);
             }
           }
         }
@@ -82746,8 +82596,8 @@ var init_ink = __esm({
         }
       }
       async waitUntilExit() {
-        this.exitPromise ||= new Promise((resolve12, reject) => {
-          this.resolveExitPromise = resolve12;
+        this.exitPromise ||= new Promise((resolve13, reject) => {
+          this.resolveExitPromise = resolve13;
           this.rejectExitPromise = reject;
         });
         return this.exitPromise;
@@ -85409,7 +85259,7 @@ function handleSubagentEvent(e3, subagents, root, groupRef) {
   if (e3.subtype === "subagent_completed") {
     block.completedAtMs = new Date(e3.ts).getTime();
     block.stopReason = String(payload.stopReason ?? "");
-    block.tokensUsed = typeof payload.tokensUsed === "number" ? payload.tokensUsed : 0;
+    block.tokensUsed = typeof payload.tokensUsed === "number" ? payload.tokensUsed : null;
     const text = typeof payload.text === "string" ? payload.text : "";
     if (text)
       block.finalPreview = oneLine(text);
@@ -85732,10 +85582,10 @@ function parseBlocks(src) {
       continue;
     }
     if (line.trim().startsWith("|") && i2 + 1 < lines.length) {
-      const sep2 = lines[i2 + 1];
-      if (isTableSeparator(sep2)) {
+      const sep3 = lines[i2 + 1];
+      if (isTableSeparator(sep3)) {
         const header = parseTableCells(line);
-        const aligns = parseTableAligns(sep2);
+        const aligns = parseTableAligns(sep3);
         const rows = [];
         i2 += 2;
         while (i2 < lines.length && lines[i2].trim().startsWith("|")) {
@@ -85816,8 +85666,8 @@ function stripOuterPipes(s2) {
 function parseTableCells(line) {
   return stripOuterPipes(line).split("|").map((s2) => s2.trim());
 }
-function parseTableAligns(sep2) {
-  const cells = stripOuterPipes(sep2).split("|");
+function parseTableAligns(sep3) {
+  const cells = stripOuterPipes(sep3).split("|");
   return cells.map((c2) => {
     const t2 = c2.trim();
     const left = t2.startsWith(":");
@@ -86910,8 +86760,7 @@ function readClipboardImageLinux() {
     if (result.status === 0 && result.stdout && result.stdout.length > 0) {
       const target = nextCachePath();
       try {
-        const fs45 = __require("fs");
-        fs45.writeFileSync(target, result.stdout);
+        writeFileSync(target, result.stdout);
       } catch {
         return null;
       }
@@ -87091,14 +86940,14 @@ function usePermissionQueue(session, registerInteractiveResolver) {
       if (yoloRef.current) {
         return { mode: "allow", reason: "yolo mode" };
       }
-      return new Promise((resolve12) => {
-        setPendingPermissions((prev) => [...prev, { call, ctx, resolve: resolve12 }]);
+      return new Promise((resolve13) => {
+        setPendingPermissions((prev) => [...prev, { call, ctx, resolve: resolve13 }]);
       });
     });
     session.setApprovalResolver({
       name: "tui-approval",
-      confirm: (request) => new Promise((resolve12) => {
-        setPendingApproval({ request, resolve: resolve12 });
+      confirm: (request) => new Promise((resolve13) => {
+        setPendingApproval({ request, resolve: resolve13 });
       })
     });
     return () => {
@@ -87181,14 +87030,14 @@ async function startVoiceRecording(opts = {}) {
     while (Buffer$1.concat(stderrChunks).byteLength > 16384)
       stderrChunks.shift();
   });
-  const closed = new Promise((resolve12) => {
+  const closed = new Promise((resolve13) => {
     child.once("close", (code, signal) => {
       closeState = { code, signal };
-      resolve12();
+      resolve13();
     });
   });
-  await new Promise((resolve12, reject) => {
-    child.once("spawn", resolve12);
+  await new Promise((resolve13, reject) => {
+    child.once("spawn", resolve13);
     child.once("error", (err) => reject(toSpawnError(command, err)));
   });
   let stopPromise = null;
@@ -87211,14 +87060,14 @@ async function checkVoiceCaptureAvailable(opts = {}) {
   const child = (opts.spawnImpl ?? spawn)(command, ["-version"], {
     stdio: ["ignore", "ignore", "ignore"]
   });
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     let settled = false;
     const done = (check) => {
       if (settled)
         return;
       settled = true;
       clearTimeout(timer);
-      resolve12(check);
+      resolve13(check);
     };
     const timer = setTimeout(() => {
       if (!child.killed)
@@ -87817,9 +87666,9 @@ function makePickerHandler(deps) {
 }
 function handlePluginAction(id, deps) {
   const admin = deps.session.pluginsAdmin;
-  const sep2 = id.lastIndexOf("::");
-  const name = sep2 >= 0 ? id.slice(0, sep2) : id;
-  const action = sep2 >= 0 ? id.slice(sep2 + 2) : "";
+  const sep3 = id.lastIndexOf("::");
+  const name = sep3 >= 0 ? id.slice(0, sep3) : id;
+  const action = sep3 >= 0 ? id.slice(sep3 + 2) : "";
   if (action === "install") {
     deps.setSystemNotice(`to install: run \`moxxy plugins install ${name}\``);
     return;
@@ -88103,18 +87952,13 @@ function orderByScope(skills) {
   }
   return out;
 }
-function oneLine2(s2) {
-  return s2.replace(/[\r\n\t]+/g, " ").replace(/  +/g, " ").trim();
-}
-function truncate5(s2, n2) {
-  return s2.length <= n2 ? s2 : s2.slice(0, n2 - 1) + "\u2026";
-}
 var import_jsx_runtime25, import_react53, NAME_COL, SCOPE_COL, WINDOW, ORDER, SkillsPanel;
 var init_SkillsPanel = __esm({
   async "../plugin-cli/dist/components/SkillsPanel.js"() {
     import_jsx_runtime25 = __toESM(require_jsx_runtime());
     import_react53 = __toESM(require_react());
     await init_build2();
+    init_dist8();
     await init_Modal();
     await init_useScrollableList();
     NAME_COL = 28;
@@ -88163,7 +88007,7 @@ var init_SkillsPanel = __esm({
       return (0, import_jsx_runtime25.jsxs)(Modal, { title: "Skills", subtitle, hints, ...tabs ? { tabs, activeTabId: activeTab, onTabChange: (id) => setActiveTab(id) } : {}, ...onClose ? { onClose } : {}, children: [rows.length === 0 ? (0, import_jsx_runtime25.jsx)(Text, { dimColor: true, children: activeTab === "mcp" ? "(no MCP servers attached)" : "(no skills discovered)" }) : null, scroll.canScrollUp ? (0, import_jsx_runtime25.jsx)(Text, { dimColor: true, children: `  \u2191 ${scroll.offset} more above` }) : null, slice.map((row, i2) => {
         const absoluteIndex = scroll.visible.start + i2;
         const focused = absoluteIndex === scroll.cursor;
-        return (0, import_jsx_runtime25.jsxs)(Box_default, { children: [(0, import_jsx_runtime25.jsx)(Text, { ...focused ? {} : { dimColor: true }, children: focused ? "\u203A " : "  " }), (0, import_jsx_runtime25.jsx)(Box_default, { width: NAME_COL, children: (0, import_jsx_runtime25.jsx)(Text, { bold: true, children: truncate5(row.name, NAME_COL - 1) }) }), (0, import_jsx_runtime25.jsx)(Box_default, { width: SCOPE_COL, children: (0, import_jsx_runtime25.jsx)(Text, { dimColor: true, children: row.scope }) }), (0, import_jsx_runtime25.jsx)(Box_default, { width: descWidth, children: (0, import_jsx_runtime25.jsx)(Text, { dimColor: true, wrap: "truncate", children: oneLine2(row.description) }) })] }, row.key);
+        return (0, import_jsx_runtime25.jsxs)(Box_default, { children: [(0, import_jsx_runtime25.jsx)(Text, { ...focused ? {} : { dimColor: true }, children: focused ? "\u203A " : "  " }), (0, import_jsx_runtime25.jsx)(Box_default, { width: NAME_COL, children: (0, import_jsx_runtime25.jsx)(Text, { bold: true, children: truncate3(row.name, NAME_COL - 2) }) }), (0, import_jsx_runtime25.jsx)(Box_default, { width: SCOPE_COL, children: (0, import_jsx_runtime25.jsx)(Text, { dimColor: true, children: row.scope }) }), (0, import_jsx_runtime25.jsx)(Box_default, { width: descWidth, children: (0, import_jsx_runtime25.jsx)(Text, { dimColor: true, wrap: "truncate", children: oneLine(row.description) }) })] }, row.key);
       }), scroll.canScrollDown ? (0, import_jsx_runtime25.jsx)(Text, { dimColor: true, children: `  \u2193 ${rows.length - scroll.visible.end} more below` }) : null] });
     };
   }
@@ -88180,18 +88024,13 @@ function matchesTab(tool, tab2) {
     return action === "prompt";
   return action === "deny";
 }
-function oneLine3(s2) {
-  return s2.replace(/[\r\n\t]+/g, " ").replace(/  +/g, " ").trim();
-}
-function truncate6(s2, n2) {
-  return s2.length <= n2 ? s2 : s2.slice(0, n2 - 1) + "\u2026";
-}
 var import_jsx_runtime26, import_react54, NAME_COL2, BADGE_COL, WINDOW2, ToolsPanel, ToolRow, PermissionBadge;
 var init_ToolsPanel = __esm({
   async "../plugin-cli/dist/components/ToolsPanel.js"() {
     import_jsx_runtime26 = __toESM(require_jsx_runtime());
     import_react54 = __toESM(require_react());
     await init_build2();
+    init_dist8();
     init_theme();
     await init_Modal();
     await init_useScrollableList();
@@ -88243,8 +88082,8 @@ var init_ToolsPanel = __esm({
       const perm = tool.permission?.action ?? "allow";
       const termWidth = process.stdout.columns ?? 80;
       const descWidth = Math.max(20, termWidth - NAME_COL2 - BADGE_COL - 12);
-      const desc = oneLine3(tool.description ?? "");
-      return (0, import_jsx_runtime26.jsxs)(Box_default, { children: [(0, import_jsx_runtime26.jsx)(Text, { ...focused ? {} : { dimColor: true }, children: focused ? "\u203A " : "  " }), (0, import_jsx_runtime26.jsx)(Box_default, { width: NAME_COL2, children: (0, import_jsx_runtime26.jsx)(Text, { bold: true, children: truncate6(tool.name, NAME_COL2 - 1) }) }), (0, import_jsx_runtime26.jsx)(Box_default, { width: BADGE_COL, children: (0, import_jsx_runtime26.jsx)(PermissionBadge, { action: perm }) }), (0, import_jsx_runtime26.jsx)(Box_default, { width: descWidth, children: (0, import_jsx_runtime26.jsx)(Text, { dimColor: true, wrap: "truncate", children: desc }) })] });
+      const desc = oneLine(tool.description ?? "");
+      return (0, import_jsx_runtime26.jsxs)(Box_default, { children: [(0, import_jsx_runtime26.jsx)(Text, { ...focused ? {} : { dimColor: true }, children: focused ? "\u203A " : "  " }), (0, import_jsx_runtime26.jsx)(Box_default, { width: NAME_COL2, children: (0, import_jsx_runtime26.jsx)(Text, { bold: true, children: truncate3(tool.name, NAME_COL2 - 2) }) }), (0, import_jsx_runtime26.jsx)(Box_default, { width: BADGE_COL, children: (0, import_jsx_runtime26.jsx)(PermissionBadge, { action: perm }) }), (0, import_jsx_runtime26.jsx)(Box_default, { width: descWidth, children: (0, import_jsx_runtime26.jsx)(Text, { dimColor: true, wrap: "truncate", children: desc }) })] });
     };
     PermissionBadge = ({ action }) => {
       if (action === "allow")
@@ -88275,7 +88114,7 @@ function collectAgents(events) {
         completedAtMs: null,
         state: "running",
         activity: [
-          { atMs, text: `started \xB7 ${truncate7(String(payload.prompt ?? ""), 80)}` }
+          { atMs, text: `started \xB7 ${truncate5(String(payload.prompt ?? ""), 80)}` }
         ]
       });
       continue;
@@ -88293,7 +88132,7 @@ function collectAgents(events) {
       const ok = payload.ok === true;
       agent.activity.push({
         atMs,
-        text: ok ? "  \u2190 ok" : `  \u2190 error: ${truncate7(String(payload.error ?? "unknown"), 80)}`,
+        text: ok ? "  \u2190 ok" : `  \u2190 error: ${truncate5(String(payload.error ?? "unknown"), 80)}`,
         ...ok ? {} : { color: Colors.danger }
       });
       continue;
@@ -88301,10 +88140,10 @@ function collectAgents(events) {
     if (e3.subtype === "subagent_completed") {
       agent.completedAtMs = atMs;
       agent.state = payload.error ? "failed" : "done";
-      const text = typeof payload.text === "string" ? oneLine4(payload.text) : "";
+      const text = typeof payload.text === "string" ? oneLine2(payload.text) : "";
       agent.activity.push({
         atMs,
-        text: `completed \xB7 ${truncate7(text, 100)}`,
+        text: `completed \xB7 ${truncate5(text, 100)}`,
         ...agent.state === "failed" ? { color: Colors.danger } : {}
       });
       continue;
@@ -88323,33 +88162,33 @@ function summarizeArgs2(input) {
   if (input == null)
     return "";
   if (typeof input === "string")
-    return truncate7(oneLine4(input), 40);
+    return truncate5(oneLine2(input), 40);
   if (typeof input !== "object")
     return String(input);
   try {
     const entries = Object.entries(input);
     if (entries.length === 0)
       return "";
-    return truncate7(oneLine4(entries.map(([k3, v3]) => `${k3}=${stringifyValue(v3)}`).join(", ")), 60);
+    return truncate5(oneLine2(entries.map(([k3, v3]) => `${k3}=${stringifyValue(v3)}`).join(", ")), 60);
   } catch {
     return "[\u2026]";
   }
 }
 function stringifyValue(v3) {
   if (typeof v3 === "string")
-    return JSON.stringify(truncate7(oneLine4(v3), 24));
+    return JSON.stringify(truncate5(oneLine2(v3), 24));
   if (typeof v3 === "number" || typeof v3 === "boolean" || v3 === null)
     return String(v3);
   try {
-    return truncate7(oneLine4(JSON.stringify(v3)), 24);
+    return truncate5(oneLine2(JSON.stringify(v3)), 24);
   } catch {
     return "[\u2026]";
   }
 }
-function oneLine4(s2) {
+function oneLine2(s2) {
   return s2.replace(/[\r\n\t]+/g, " ").replace(/  +/g, " ").trim();
 }
-function truncate7(s2, n2) {
+function truncate5(s2, n2) {
   return s2.length <= n2 ? s2 : s2.slice(0, n2 - 1) + "\u2026";
 }
 var import_jsx_runtime27, import_react55, SUBAGENT_PLUGIN_ID3, WINDOW3, AgentsPanel, KindsList, AgentSummary;
@@ -88398,21 +88237,21 @@ var init_AgentsPanel = __esm({
         const absoluteIndex = scroll.visible.start + i2;
         const focused = absoluteIndex === scroll.cursor;
         const time = new Date(entry.row.atMs).toISOString().slice(11, 19);
-        return (0, import_jsx_runtime27.jsxs)(Box_default, { children: [(0, import_jsx_runtime27.jsx)(Text, { ...focused ? {} : { dimColor: true }, children: focused ? "\u203A " : "  " }), (0, import_jsx_runtime27.jsx)(Box_default, { width: 10, children: (0, import_jsx_runtime27.jsx)(Text, { dimColor: true, children: time }) }), (0, import_jsx_runtime27.jsx)(Box_default, { width: labelColWidth, children: (0, import_jsx_runtime27.jsx)(Text, { dimColor: true, children: truncate7(entry.agent.label, labelColWidth - 1) }) }), (0, import_jsx_runtime27.jsx)(Box_default, { flexGrow: 1, children: (0, import_jsx_runtime27.jsx)(Text, { ...entry.row.color ? { color: entry.row.color } : {}, wrap: "truncate", children: entry.row.text }) })] }, `${entry.agent.childSessionId}:${absoluteIndex}`);
+        return (0, import_jsx_runtime27.jsxs)(Box_default, { children: [(0, import_jsx_runtime27.jsx)(Text, { ...focused ? {} : { dimColor: true }, children: focused ? "\u203A " : "  " }), (0, import_jsx_runtime27.jsx)(Box_default, { width: 10, children: (0, import_jsx_runtime27.jsx)(Text, { dimColor: true, children: time }) }), (0, import_jsx_runtime27.jsx)(Box_default, { width: labelColWidth, children: (0, import_jsx_runtime27.jsx)(Text, { dimColor: true, children: truncate5(entry.agent.label, labelColWidth - 1) }) }), (0, import_jsx_runtime27.jsx)(Box_default, { flexGrow: 1, children: (0, import_jsx_runtime27.jsx)(Text, { ...entry.row.color ? { color: entry.row.color } : {}, wrap: "truncate", children: entry.row.text }) })] }, `${entry.agent.childSessionId}:${absoluteIndex}`);
       }), scroll.canScrollDown ? (0, import_jsx_runtime27.jsx)(Text, { dimColor: true, children: `  \u2193 ${rows.length - scroll.visible.end} more below` }) : null] });
     };
     KindsList = ({ kinds }) => {
       const termWidth = process.stdout.columns ?? 80;
       const nameCol = 20;
       const descCol = Math.max(20, termWidth - nameCol - 12);
-      return (0, import_jsx_runtime27.jsxs)(Box_default, { flexDirection: "column", children: [(0, import_jsx_runtime27.jsxs)(Box_default, { marginLeft: 2, children: [(0, import_jsx_runtime27.jsx)(Box_default, { width: nameCol, children: (0, import_jsx_runtime27.jsx)(Text, { bold: true, children: "default" }) }), (0, import_jsx_runtime27.jsx)(Box_default, { width: descCol, children: (0, import_jsx_runtime27.jsx)(Text, { dimColor: true, wrap: "truncate", children: "generic tool-use loop (built-in fallback)" }) })] }), kinds.map((k3) => (0, import_jsx_runtime27.jsxs)(Box_default, { marginLeft: 2, children: [(0, import_jsx_runtime27.jsx)(Box_default, { width: nameCol, children: (0, import_jsx_runtime27.jsx)(Text, { bold: true, children: truncate7(k3.name, nameCol - 1) }) }), (0, import_jsx_runtime27.jsx)(Box_default, { width: descCol, children: (0, import_jsx_runtime27.jsx)(Text, { dimColor: true, wrap: "truncate", children: k3.description }) })] }, k3.name)), kinds.length === 0 ? (0, import_jsx_runtime27.jsx)(Box_default, { marginLeft: 2, marginTop: 1, children: (0, import_jsx_runtime27.jsx)(Text, { dimColor: true, children: "install an agent plugin to add kinds" }) }) : null] });
+      return (0, import_jsx_runtime27.jsxs)(Box_default, { flexDirection: "column", children: [(0, import_jsx_runtime27.jsxs)(Box_default, { marginLeft: 2, children: [(0, import_jsx_runtime27.jsx)(Box_default, { width: nameCol, children: (0, import_jsx_runtime27.jsx)(Text, { bold: true, children: "default" }) }), (0, import_jsx_runtime27.jsx)(Box_default, { width: descCol, children: (0, import_jsx_runtime27.jsx)(Text, { dimColor: true, wrap: "truncate", children: "generic tool-use loop (built-in fallback)" }) })] }), kinds.map((k3) => (0, import_jsx_runtime27.jsxs)(Box_default, { marginLeft: 2, children: [(0, import_jsx_runtime27.jsx)(Box_default, { width: nameCol, children: (0, import_jsx_runtime27.jsx)(Text, { bold: true, children: truncate5(k3.name, nameCol - 1) }) }), (0, import_jsx_runtime27.jsx)(Box_default, { width: descCol, children: (0, import_jsx_runtime27.jsx)(Text, { dimColor: true, wrap: "truncate", children: k3.description }) })] }, k3.name)), kinds.length === 0 ? (0, import_jsx_runtime27.jsx)(Box_default, { marginLeft: 2, marginTop: 1, children: (0, import_jsx_runtime27.jsx)(Text, { dimColor: true, children: "install an agent plugin to add kinds" }) }) : null] });
     };
     AgentSummary = ({ agent }) => {
       const elapsedMs = (agent.completedAtMs ?? Date.now()) - agent.startedAtMs;
       const elapsed = formatElapsed(elapsedMs);
       const dot = agent.state === "running" ? Colors.busy : agent.state === "failed" ? Colors.danger : "blue";
       const toolCount = agent.activity.filter((r2) => r2.text.startsWith("\u2192 tool ")).length;
-      return (0, import_jsx_runtime27.jsxs)(Box_default, { children: [(0, import_jsx_runtime27.jsx)(Text, { color: dot, children: "\u25CF " }), (0, import_jsx_runtime27.jsx)(Box_default, { width: 20, children: (0, import_jsx_runtime27.jsx)(Text, { bold: true, children: truncate7(agent.label, 19) }) }), (0, import_jsx_runtime27.jsx)(Text, { dimColor: true, children: `${agent.state} ${elapsed} \xB7 ${toolCount} tool call${toolCount === 1 ? "" : "s"}` })] });
+      return (0, import_jsx_runtime27.jsxs)(Box_default, { children: [(0, import_jsx_runtime27.jsx)(Text, { color: dot, children: "\u25CF " }), (0, import_jsx_runtime27.jsx)(Box_default, { width: 20, children: (0, import_jsx_runtime27.jsx)(Text, { bold: true, children: truncate5(agent.label, 19) }) }), (0, import_jsx_runtime27.jsx)(Text, { dimColor: true, children: `${agent.state} ${elapsed} \xB7 ${toolCount} tool call${toolCount === 1 ? "" : "s"}` })] });
     };
   }
 });
@@ -88538,18 +88377,13 @@ var init_UsagePanel = __esm({
 function stepMark(status) {
   return status === "completed" ? "\u2713" : status === "skipped" ? "\u2013" : status === "failed" ? "\u2717" : "\xB7";
 }
-function oneLine5(s2) {
-  return s2.replace(/[\r\n\t]+/g, " ").replace(/  +/g, " ").trim();
-}
-function truncate8(s2, n2) {
-  return s2.length <= n2 ? s2 : s2.slice(0, n2 - 1) + "\u2026";
-}
 var import_jsx_runtime29, import_react57, NAME_COL3, SCOPE_COL2, TRIG_COL, WINDOW4, WorkflowsPanel;
 var init_WorkflowsPanel = __esm({
   async "../plugin-cli/dist/components/WorkflowsPanel.js"() {
     import_jsx_runtime29 = __toESM(require_jsx_runtime());
     import_react57 = __toESM(require_react());
     await init_build2();
+    init_dist8();
     init_theme();
     await init_Modal();
     await init_useScrollableList();
@@ -88695,8 +88529,8 @@ var init_WorkflowsPanel = __esm({
       return (0, import_jsx_runtime29.jsxs)(Modal, { title: "Workflows", subtitle, hints, ...onClose ? { onClose } : {}, children: [!view ? (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: "(workflows unavailable in this session)" }) : loading ? (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: "loading\u2026" }) : rows.length === 0 ? (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: "(no workflows \u2014 ask the agent to \u201Ccreate a workflow that\u2026\u201D, or scaffold one in chat)" }) : null, scroll.canScrollUp ? (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: `  \u2191 ${scroll.offset} more above` }) : null, slice.map((wf, i2) => {
         const absoluteIndex = scroll.visible.start + i2;
         const focused = absoluteIndex === scroll.cursor;
-        return (0, import_jsx_runtime29.jsxs)(Box_default, { children: [(0, import_jsx_runtime29.jsx)(Text, { ...focused ? {} : { dimColor: true }, children: focused ? "\u203A " : "  " }), (0, import_jsx_runtime29.jsx)(Text, { color: wf.enabled ? Colors.active : void 0, dimColor: !wf.enabled, children: wf.enabled ? "\u25CF " : "\u25CB " }), (0, import_jsx_runtime29.jsx)(Box_default, { width: NAME_COL3, children: (0, import_jsx_runtime29.jsx)(Text, { bold: focused, children: truncate8(wf.name, NAME_COL3 - 1) }) }), (0, import_jsx_runtime29.jsx)(Box_default, { width: SCOPE_COL2, children: (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: wf.scope }) }), (0, import_jsx_runtime29.jsx)(Box_default, { width: TRIG_COL, children: (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, wrap: "truncate", children: wf.triggers }) }), (0, import_jsx_runtime29.jsx)(Box_default, { width: descWidth, children: (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, wrap: "truncate", children: oneLine5(wf.description) }) })] }, wf.name);
-      }), scroll.canScrollDown ? (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: `  \u2193 ${rows.length - scroll.visible.end} more below` }) : null, pending ? (0, import_jsx_runtime29.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, borderStyle: "round", borderColor: Colors.active, paddingX: 1, children: [(0, import_jsx_runtime29.jsxs)(Text, { color: Colors.active, children: ["\u23F8 Workflow waiting \xB7 ", pending.label] }), pending.prompt ? (0, import_jsx_runtime29.jsx)(Text, { wrap: "wrap", children: oneLine5(pending.prompt).slice(0, 280) }) : null, (0, import_jsx_runtime29.jsxs)(Box_default, { marginTop: 1, children: [(0, import_jsx_runtime29.jsx)(Text, { children: "reply \u203A " }), (0, import_jsx_runtime29.jsx)(Text, { children: reply2 || " " })] }), (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: "Enter send \xB7 Esc cancel" })] }) : null, status ? (0, import_jsx_runtime29.jsx)(Box_default, { marginTop: 1, children: (0, import_jsx_runtime29.jsx)(Text, { wrap: "truncate-end", children: status }) }) : null] });
+        return (0, import_jsx_runtime29.jsxs)(Box_default, { children: [(0, import_jsx_runtime29.jsx)(Text, { ...focused ? {} : { dimColor: true }, children: focused ? "\u203A " : "  " }), (0, import_jsx_runtime29.jsx)(Text, { color: wf.enabled ? Colors.active : void 0, dimColor: !wf.enabled, children: wf.enabled ? "\u25CF " : "\u25CB " }), (0, import_jsx_runtime29.jsx)(Box_default, { width: NAME_COL3, children: (0, import_jsx_runtime29.jsx)(Text, { bold: focused, children: truncate3(wf.name, NAME_COL3 - 2) }) }), (0, import_jsx_runtime29.jsx)(Box_default, { width: SCOPE_COL2, children: (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: wf.scope }) }), (0, import_jsx_runtime29.jsx)(Box_default, { width: TRIG_COL, children: (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, wrap: "truncate", children: wf.triggers }) }), (0, import_jsx_runtime29.jsx)(Box_default, { width: descWidth, children: (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, wrap: "truncate", children: oneLine(wf.description) }) })] }, wf.name);
+      }), scroll.canScrollDown ? (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: `  \u2193 ${rows.length - scroll.visible.end} more below` }) : null, pending ? (0, import_jsx_runtime29.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, borderStyle: "round", borderColor: Colors.active, paddingX: 1, children: [(0, import_jsx_runtime29.jsxs)(Text, { color: Colors.active, children: ["\u23F8 Workflow waiting \xB7 ", pending.label] }), pending.prompt ? (0, import_jsx_runtime29.jsx)(Text, { wrap: "wrap", children: oneLine(pending.prompt).slice(0, 280) }) : null, (0, import_jsx_runtime29.jsxs)(Box_default, { marginTop: 1, children: [(0, import_jsx_runtime29.jsx)(Text, { children: "reply \u203A " }), (0, import_jsx_runtime29.jsx)(Text, { children: reply2 || " " })] }), (0, import_jsx_runtime29.jsx)(Text, { dimColor: true, children: "Enter send \xB7 Esc cancel" })] }) : null, status ? (0, import_jsx_runtime29.jsx)(Box_default, { marginTop: 1, children: (0, import_jsx_runtime29.jsx)(Text, { wrap: "truncate-end", children: status }) }) : null] });
     };
   }
 });
@@ -89369,9 +89203,9 @@ var init_SessionView = __esm({
       }, onApprovalDecide: (decision) => {
         if (!pendingApproval)
           return;
-        const { resolve: resolve12 } = pendingApproval;
+        const { resolve: resolve13 } = pendingApproval;
         permissions.setPendingApproval(null);
-        resolve12(decision);
+        resolve13(decision);
       }, onPickerSelect: handlePickerSelect, onPickerCancel: () => setPicker(null), onSubmit: handleSubmit, onPasteText: images.handlePasteText }), (0, import_jsx_runtime36.jsx)(StatusLine, { busyStartedAt: turn.busy && !pendingPermission && !pendingApproval ? turn.busyStartedAt : null, queueCount: turn.queueCount, modeName, modeBadge, provider: providerName2, model: activeModel2, mcp: mcpStatus, contextUsed, ...contextWindow ? { contextWindow } : {}, ...version ? { version } : {}, ...updateAvailable ? { updateLatest: updateAvailable.latest } : {} })] });
     };
   }
@@ -94154,10 +93988,10 @@ var require_browser2 = __commonJS({
           text = canvas;
           canvas = void 0;
         }
-        return new Promise(function(resolve12, reject) {
+        return new Promise(function(resolve13, reject) {
           try {
             const data = QRCode2.create(text, opts);
-            resolve12(renderFunc(data, canvas, opts));
+            resolve13(renderFunc(data, canvas, opts));
           } catch (e3) {
             reject(e3);
           }
@@ -94238,11 +94072,11 @@ var require_server = __commonJS({
     }
     function render2(renderFunc, text, params) {
       if (!params.cb) {
-        return new Promise(function(resolve12, reject) {
+        return new Promise(function(resolve13, reject) {
           try {
             const data = QRCode2.create(text, params.opts);
             return renderFunc(data, params.opts, function(err, data2) {
-              return err ? reject(err) : resolve12(data2);
+              return err ? reject(err) : resolve13(data2);
             });
           } catch (e3) {
             reject(e3);
@@ -96114,9 +95948,9 @@ var require_dispatcher_base = __commonJS({
       }
       close(callback) {
         if (callback === void 0) {
-          return new Promise((resolve12, reject) => {
+          return new Promise((resolve13, reject) => {
             this.close((err, data) => {
-              return err ? reject(err) : resolve12(data);
+              return err ? reject(err) : resolve13(data);
             });
           });
         }
@@ -96154,12 +95988,12 @@ var require_dispatcher_base = __commonJS({
           err = null;
         }
         if (callback === void 0) {
-          return new Promise((resolve12, reject) => {
+          return new Promise((resolve13, reject) => {
             this.destroy(err, (err2, data) => {
               return err2 ? (
                 /* istanbul ignore next: should never error */
                 reject(err2)
-              ) : resolve12(data);
+              ) : resolve13(data);
             });
           });
         }
@@ -98409,8 +98243,8 @@ var require_util3 = __commonJS({
     function createDeferredPromise() {
       let res;
       let rej;
-      const promise = new Promise((resolve12, reject) => {
-        res = resolve12;
+      const promise = new Promise((resolve13, reject) => {
+        res = resolve13;
         rej = reject;
       });
       return { promise, resolve: res, reject: rej };
@@ -100582,12 +100416,12 @@ upgrade: ${upgrade}\r
           cb();
         }
       }
-      const waitForDrain = () => new Promise((resolve12, reject) => {
+      const waitForDrain = () => new Promise((resolve13, reject) => {
         assert(callback === null);
         if (socket[kError]) {
           reject(socket[kError]);
         } else {
-          callback = resolve12;
+          callback = resolve13;
         }
       });
       socket.on("close", onDrain).on("drain", onDrain);
@@ -101223,12 +101057,12 @@ var require_client_h2 = __commonJS({
           cb();
         }
       }
-      const waitForDrain = () => new Promise((resolve12, reject) => {
+      const waitForDrain = () => new Promise((resolve13, reject) => {
         assert(callback === null);
         if (socket[kError]) {
           reject(socket[kError]);
         } else {
-          callback = resolve12;
+          callback = resolve13;
         }
       });
       h2stream.on("close", onDrain).on("drain", onDrain);
@@ -101701,16 +101535,16 @@ var require_client2 = __commonJS({
         return this[kNeedDrain] < 2;
       }
       async [kClose]() {
-        return new Promise((resolve12) => {
+        return new Promise((resolve13) => {
           if (this[kSize]) {
-            this[kClosedResolve] = resolve12;
+            this[kClosedResolve] = resolve13;
           } else {
-            resolve12(null);
+            resolve13(null);
           }
         });
       }
       async [kDestroy](err) {
-        return new Promise((resolve12) => {
+        return new Promise((resolve13) => {
           const requests = this[kQueue].splice(this[kPendingIdx]);
           for (let i2 = 0; i2 < requests.length; i2++) {
             const request = requests[i2];
@@ -101721,7 +101555,7 @@ var require_client2 = __commonJS({
               this[kClosedResolve]();
               this[kClosedResolve] = null;
             }
-            resolve12(null);
+            resolve13(null);
           };
           if (this[kHTTPContext]) {
             this[kHTTPContext].destroy(err, callback);
@@ -101772,7 +101606,7 @@ var require_client2 = __commonJS({
         });
       }
       try {
-        const socket = await new Promise((resolve12, reject) => {
+        const socket = await new Promise((resolve13, reject) => {
           client[kConnector]({
             host,
             hostname,
@@ -101784,7 +101618,7 @@ var require_client2 = __commonJS({
             if (err) {
               reject(err);
             } else {
-              resolve12(socket2);
+              resolve13(socket2);
             }
           });
         });
@@ -102118,8 +101952,8 @@ var require_pool_base = __commonJS({
         if (this[kQueue].isEmpty()) {
           await Promise.all(this[kClients].map((c2) => c2.close()));
         } else {
-          await new Promise((resolve12) => {
-            this[kClosedResolve] = resolve12;
+          await new Promise((resolve13) => {
+            this[kClosedResolve] = resolve13;
           });
         }
       }
@@ -103326,7 +103160,7 @@ var require_readable = __commonJS({
         if (this._readableState.closeEmitted) {
           return null;
         }
-        return await new Promise((resolve12, reject) => {
+        return await new Promise((resolve13, reject) => {
           if (this[kContentLength] > limit2) {
             this.destroy(new AbortError2());
           }
@@ -103339,7 +103173,7 @@ var require_readable = __commonJS({
             if (signal?.aborted) {
               reject(signal.reason ?? new AbortError2());
             } else {
-              resolve12(null);
+              resolve13(null);
             }
           }).on("error", noop3).on("data", function(chunk) {
             limit2 -= chunk.length;
@@ -103358,7 +103192,7 @@ var require_readable = __commonJS({
     }
     async function consume(stream, type) {
       assert(!stream[kConsume]);
-      return new Promise((resolve12, reject) => {
+      return new Promise((resolve13, reject) => {
         if (isUnusable(stream)) {
           const rState = stream._readableState;
           if (rState.destroyed && rState.closeEmitted === false) {
@@ -103375,7 +103209,7 @@ var require_readable = __commonJS({
             stream[kConsume] = {
               type,
               stream,
-              resolve: resolve12,
+              resolve: resolve13,
               reject,
               length: 0,
               body: []
@@ -103445,18 +103279,18 @@ var require_readable = __commonJS({
       return buffer;
     }
     function consumeEnd(consume2) {
-      const { type, body, resolve: resolve12, stream, length } = consume2;
+      const { type, body, resolve: resolve13, stream, length } = consume2;
       try {
         if (type === "text") {
-          resolve12(chunksDecode(body, length));
+          resolve13(chunksDecode(body, length));
         } else if (type === "json") {
-          resolve12(JSON.parse(chunksDecode(body, length)));
+          resolve13(JSON.parse(chunksDecode(body, length)));
         } else if (type === "arrayBuffer") {
-          resolve12(chunksConcat(body, length).buffer);
+          resolve13(chunksConcat(body, length).buffer);
         } else if (type === "blob") {
-          resolve12(new Blob(body, { type: stream[kContentType] }));
+          resolve13(new Blob(body, { type: stream[kContentType] }));
         } else if (type === "bytes") {
-          resolve12(chunksConcat(body, length));
+          resolve13(chunksConcat(body, length));
         }
         consumeFinish(consume2);
       } catch (err) {
@@ -103712,9 +103546,9 @@ var require_api_request = __commonJS({
     };
     function request(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           request.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve12(data);
+            return err ? reject(err) : resolve13(data);
           });
         });
       }
@@ -103936,9 +103770,9 @@ var require_api_stream = __commonJS({
     };
     function stream(opts, factory2, callback) {
       if (callback === void 0) {
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           stream.call(this, opts, factory2, (err, data) => {
-            return err ? reject(err) : resolve12(data);
+            return err ? reject(err) : resolve13(data);
           });
         });
       }
@@ -104221,9 +104055,9 @@ var require_api_upgrade = __commonJS({
     };
     function upgrade(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           upgrade.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve12(data);
+            return err ? reject(err) : resolve13(data);
           });
         });
       }
@@ -104314,9 +104148,9 @@ var require_api_connect = __commonJS({
     };
     function connect(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           connect.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve12(data);
+            return err ? reject(err) : resolve13(data);
           });
         });
       }
@@ -108138,7 +107972,7 @@ var require_fetch = __commonJS({
       function dispatch3({ body }) {
         const url2 = requestCurrentURL(request);
         const agent = fetchParams.controller.dispatcher;
-        return new Promise((resolve12, reject) => agent.dispatch(
+        return new Promise((resolve13, reject) => agent.dispatch(
           {
             path: url2.pathname + url2.search,
             origin: url2.origin,
@@ -108214,7 +108048,7 @@ var require_fetch = __commonJS({
                 }
               }
               const onError2 = this.onError.bind(this);
-              resolve12({
+              resolve13({
                 status,
                 statusText,
                 headersList,
@@ -108260,7 +108094,7 @@ var require_fetch = __commonJS({
               for (let i2 = 0; i2 < rawHeaders.length; i2 += 2) {
                 headersList.append(bufferToLowerCasedHeaderName(rawHeaders[i2]), rawHeaders[i2 + 1].toString("latin1"), true);
               }
-              resolve12({
+              resolve13({
                 status,
                 statusText: STATUS_CODES2[status],
                 headersList,
@@ -111911,8 +111745,8 @@ var require_util9 = __commonJS({
       return true;
     }
     function delay(ms) {
-      return new Promise((resolve12) => {
-        setTimeout(resolve12, ms).unref();
+      return new Promise((resolve13) => {
+        setTimeout(resolve13, ms).unref();
       });
     }
     module.exports = {
@@ -112860,7 +112694,7 @@ function classify(input, signals) {
 }
 var CMD_TIMEOUT_MS = 5 * 6e4;
 function runCmd(cmd, args, cwd2) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     const child = spawn(cmd, [...args], { cwd: cwd2, stdio: ["ignore", "pipe", "pipe"] });
     let output = "";
     const onData = (d2) => {
@@ -112871,11 +112705,11 @@ function runCmd(cmd, args, cwd2) {
     const timer = setTimeout(() => child.kill("SIGKILL"), CMD_TIMEOUT_MS);
     child.on("error", (err) => {
       clearTimeout(timer);
-      resolve12({ exitCode: -1, output: `${cmd} failed to start: ${err.message}` });
+      resolve13({ exitCode: -1, output: `${cmd} failed to start: ${err.message}` });
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve12({ exitCode: code ?? -1, output });
+      resolve13({ exitCode: code ?? -1, output });
     });
   });
 }
@@ -112956,7 +112790,7 @@ function shortName(pkg) {
   return pkg.startsWith(SCOPE) ? pkg.slice(SCOPE.length) : pkg;
 }
 function run(cmd, args, cwd2, timeoutMs = BUILD_TIMEOUT_MS) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     const child = spawn(cmd, [...args], { cwd: cwd2, stdio: ["ignore", "pipe", "pipe"] });
     let output = "";
     const onData = (d2) => {
@@ -112967,11 +112801,11 @@ function run(cmd, args, cwd2, timeoutMs = BUILD_TIMEOUT_MS) {
     const timer = setTimeout(() => child.kill("SIGKILL"), timeoutMs);
     child.on("error", (err) => {
       clearTimeout(timer);
-      resolve12({ code: -1, output: `${cmd} failed to start: ${err.message}` });
+      resolve13({ code: -1, output: `${cmd} failed to start: ${err.message}` });
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve12({ code: code ?? -1, output });
+      resolve13({ code: code ?? -1, output });
     });
   });
 }
@@ -114080,6 +113914,7 @@ function parseValue(raw) {
 function buildConfigPlugin(opts = { cwd: process.cwd() }) {
   const cwd2 = opts.cwd;
   const applier = opts.applier;
+  const writeMutex4 = createMutex();
   return definePlugin({
     name: "@moxxy/plugin-config",
     version: "0.0.0",
@@ -114135,7 +113970,7 @@ function buildConfigPlugin(opts = { cwd: process.cwd() }) {
           value: z$1.string()
         }),
         permission: { action: "prompt" },
-        handler: async ({ scope, path: dotPath, value }) => {
+        handler: async ({ scope, path: dotPath, value }) => writeMutex4.run(async () => {
           const target = await findScopePath(scope, cwd2) ?? scopeDefaultPath(scope, cwd2);
           await promises.mkdir(path3.dirname(target), { recursive: true });
           const { doc, text } = await readDoc(target);
@@ -114168,7 +114003,7 @@ function buildConfigPlugin(opts = { cwd: process.cwd() }) {
             newSize: candidate.length,
             runtime
           };
-        }
+        })
       }),
       defineTool({
         name: "config_reload",
@@ -114187,7 +114022,7 @@ function buildConfigPlugin(opts = { cwd: process.cwd() }) {
         description: "Create a starter moxxy config file at the given scope (yaml format), if one does not already exist.",
         inputSchema: z$1.object({ scope: scopeSchema }),
         permission: { action: "prompt" },
-        handler: async ({ scope }) => {
+        handler: async ({ scope }) => writeMutex4.run(async () => {
           const existing = await findScopePath(scope, cwd2);
           if (existing)
             return { path: existing, created: false };
@@ -114202,7 +114037,7 @@ mode: default
 `;
           await writeFileAtomic(target, template);
           return { path: target, created: true };
-        }
+        })
       }),
       defineTool({
         name: "config_validate",
@@ -117100,8 +116935,8 @@ function _addRequestID(value, response) {
 }
 var APIPromise = class _APIPromise extends Promise {
   constructor(responsePromise, parseResponse2 = defaultParseResponse) {
-    super((resolve12) => {
-      resolve12(null);
+    super((resolve13) => {
+      resolve13(null);
     });
     this.responsePromise = responsePromise;
     this.parseResponse = parseResponse2;
@@ -117693,7 +117528,7 @@ var startsWithSchemeRegexp = /^[a-z][a-z0-9+.-]*:/i;
 var isAbsoluteURL = (url2) => {
   return startsWithSchemeRegexp.test(url2);
 };
-var sleep = (ms) => new Promise((resolve12) => setTimeout(resolve12, ms));
+var sleep = (ms) => new Promise((resolve13) => setTimeout(resolve13, ms));
 var validatePositiveInteger = (name, n2) => {
   if (typeof n2 !== "number" || !Number.isInteger(n2)) {
     throw new AnthropicError(`${name} must be an integer`);
@@ -118303,12 +118138,12 @@ var BetaMessageStream = class _BetaMessageStream {
       }
       return this._emit("error", new AnthropicError(String(error2)));
     });
-    __classPrivateFieldSet7(this, _BetaMessageStream_connectedPromise, new Promise((resolve12, reject) => {
-      __classPrivateFieldSet7(this, _BetaMessageStream_resolveConnectedPromise, resolve12, "f");
+    __classPrivateFieldSet7(this, _BetaMessageStream_connectedPromise, new Promise((resolve13, reject) => {
+      __classPrivateFieldSet7(this, _BetaMessageStream_resolveConnectedPromise, resolve13, "f");
       __classPrivateFieldSet7(this, _BetaMessageStream_rejectConnectedPromise, reject, "f");
     }));
-    __classPrivateFieldSet7(this, _BetaMessageStream_endPromise, new Promise((resolve12, reject) => {
-      __classPrivateFieldSet7(this, _BetaMessageStream_resolveEndPromise, resolve12, "f");
+    __classPrivateFieldSet7(this, _BetaMessageStream_endPromise, new Promise((resolve13, reject) => {
+      __classPrivateFieldSet7(this, _BetaMessageStream_resolveEndPromise, resolve13, "f");
       __classPrivateFieldSet7(this, _BetaMessageStream_rejectEndPromise, reject, "f");
     }));
     __classPrivateFieldGet8(this, _BetaMessageStream_connectedPromise, "f").catch(() => {
@@ -118466,11 +118301,11 @@ var BetaMessageStream = class _BetaMessageStream {
    *   const message = await stream.emitted('message') // rejects if the stream errors
    */
   emitted(event) {
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve13, reject) => {
       __classPrivateFieldSet7(this, _BetaMessageStream_catchingPromiseCreated, true);
       if (event !== "error")
         this.once("error", reject);
-      this.once(event, resolve12);
+      this.once(event, resolve13);
     });
   }
   async done() {
@@ -118751,7 +118586,7 @@ var BetaMessageStream = class _BetaMessageStream {
           if (done) {
             return { value: void 0, done: true };
           }
-          return new Promise((resolve12, reject) => readQueue.push({ resolve: resolve12, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
+          return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
         }
         const chunk = pushQueue.shift();
         return { value: chunk, done: false };
@@ -119023,12 +118858,12 @@ var MessageStream = class _MessageStream {
       }
       return this._emit("error", new AnthropicError(String(error2)));
     });
-    __classPrivateFieldSet8(this, _MessageStream_connectedPromise, new Promise((resolve12, reject) => {
-      __classPrivateFieldSet8(this, _MessageStream_resolveConnectedPromise, resolve12, "f");
+    __classPrivateFieldSet8(this, _MessageStream_connectedPromise, new Promise((resolve13, reject) => {
+      __classPrivateFieldSet8(this, _MessageStream_resolveConnectedPromise, resolve13, "f");
       __classPrivateFieldSet8(this, _MessageStream_rejectConnectedPromise, reject, "f");
     }));
-    __classPrivateFieldSet8(this, _MessageStream_endPromise, new Promise((resolve12, reject) => {
-      __classPrivateFieldSet8(this, _MessageStream_resolveEndPromise, resolve12, "f");
+    __classPrivateFieldSet8(this, _MessageStream_endPromise, new Promise((resolve13, reject) => {
+      __classPrivateFieldSet8(this, _MessageStream_resolveEndPromise, resolve13, "f");
       __classPrivateFieldSet8(this, _MessageStream_rejectEndPromise, reject, "f");
     }));
     __classPrivateFieldGet9(this, _MessageStream_connectedPromise, "f").catch(() => {
@@ -119186,11 +119021,11 @@ var MessageStream = class _MessageStream {
    *   const message = await stream.emitted('message') // rejects if the stream errors
    */
   emitted(event) {
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve13, reject) => {
       __classPrivateFieldSet8(this, _MessageStream_catchingPromiseCreated, true);
       if (event !== "error")
         this.once("error", reject);
-      this.once(event, resolve12);
+      this.once(event, resolve13);
     });
   }
   async done() {
@@ -119471,7 +119306,7 @@ var MessageStream = class _MessageStream {
           if (done) {
             return { value: void 0, done: true };
           }
-          return new Promise((resolve12, reject) => readQueue.push({ resolve: resolve12, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
+          return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
         }
         const chunk = pushQueue.shift();
         return { value: chunk, done: false };
@@ -121254,8 +121089,8 @@ function _addRequestID2(value, response) {
 }
 var APIPromise2 = class _APIPromise extends Promise {
   constructor(responsePromise, parseResponse2 = defaultParseResponse2) {
-    super((resolve12) => {
-      resolve12(null);
+    super((resolve13) => {
+      resolve13(null);
     });
     this.responsePromise = responsePromise;
     this.parseResponse = parseResponse2;
@@ -121830,7 +121665,7 @@ var startsWithSchemeRegexp2 = /^[a-z][a-z0-9+.-]*:/i;
 var isAbsoluteURL2 = (url2) => {
   return startsWithSchemeRegexp2.test(url2);
 };
-var sleep2 = (ms) => new Promise((resolve12) => setTimeout(resolve12, ms));
+var sleep2 = (ms) => new Promise((resolve13) => setTimeout(resolve13, ms));
 var validatePositiveInteger2 = (name, n2) => {
   if (typeof n2 !== "number" || !Number.isInteger(n2)) {
     throw new OpenAIError(`${name} must be an integer`);
@@ -122261,12 +122096,12 @@ var EventStream = class {
     _EventStream_errored.set(this, false);
     _EventStream_aborted.set(this, false);
     _EventStream_catchingPromiseCreated.set(this, false);
-    __classPrivateFieldSet11(this, _EventStream_connectedPromise, new Promise((resolve12, reject) => {
-      __classPrivateFieldSet11(this, _EventStream_resolveConnectedPromise, resolve12, "f");
+    __classPrivateFieldSet11(this, _EventStream_connectedPromise, new Promise((resolve13, reject) => {
+      __classPrivateFieldSet11(this, _EventStream_resolveConnectedPromise, resolve13, "f");
       __classPrivateFieldSet11(this, _EventStream_rejectConnectedPromise, reject, "f");
     }));
-    __classPrivateFieldSet11(this, _EventStream_endPromise, new Promise((resolve12, reject) => {
-      __classPrivateFieldSet11(this, _EventStream_resolveEndPromise, resolve12, "f");
+    __classPrivateFieldSet11(this, _EventStream_endPromise, new Promise((resolve13, reject) => {
+      __classPrivateFieldSet11(this, _EventStream_resolveEndPromise, resolve13, "f");
       __classPrivateFieldSet11(this, _EventStream_rejectEndPromise, reject, "f");
     }));
     __classPrivateFieldGet12(this, _EventStream_connectedPromise, "f").catch(() => {
@@ -122350,11 +122185,11 @@ var EventStream = class {
    *   const message = await stream.emitted('message') // rejects if the stream errors
    */
   emitted(event) {
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve13, reject) => {
       __classPrivateFieldSet11(this, _EventStream_catchingPromiseCreated, true);
       if (event !== "error")
         this.once("error", reject);
-      this.once(event, resolve12);
+      this.once(event, resolve13);
     });
   }
   async done() {
@@ -122505,7 +122340,7 @@ var AssistantStream = class _AssistantStream extends EventStream {
           if (done) {
             return { value: void 0, done: true };
           }
-          return new Promise((resolve12, reject) => readQueue.push({ resolve: resolve12, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
+          return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
         }
         const chunk = pushQueue.shift();
         return { value: chunk, done: false };
@@ -123909,7 +123744,7 @@ var ChatCompletionStream = class _ChatCompletionStream extends AbstractChatCompl
             arguments_delta: toolCallDelta.function?.arguments ?? ""
           });
         } else {
-          assertNever2(toolCallSnapshot?.type);
+          assertNever3(toolCallSnapshot?.type);
         }
       }
     }
@@ -123934,7 +123769,7 @@ var ChatCompletionStream = class _ChatCompletionStream extends AbstractChatCompl
         parsed_arguments: isAutoParsableTool(inputTool) ? inputTool.$parseRaw(toolCallSnapshot.function.arguments) : inputTool?.function.strict ? JSON.parse(toolCallSnapshot.function.arguments) : null
       });
     } else {
-      assertNever2(toolCallSnapshot.type);
+      assertNever3(toolCallSnapshot.type);
     }
   }, _ChatCompletionStream_emitContentDoneEvents = function _ChatCompletionStream_emitContentDoneEvents2(choiceSnapshot) {
     const state = __classPrivateFieldGet15(this, _ChatCompletionStream_instances, "m", _ChatCompletionStream_getChoiceEventState).call(this, choiceSnapshot);
@@ -124110,7 +123945,7 @@ var ChatCompletionStream = class _ChatCompletionStream extends AbstractChatCompl
           if (done) {
             return { value: void 0, done: true };
           }
-          return new Promise((resolve12, reject) => readQueue.push({ resolve: resolve12, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
+          return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((chunk2) => chunk2 ? { value: chunk2, done: false } : { value: void 0, done: true });
         }
         const chunk = pushQueue.shift();
         return { value: chunk, done: false };
@@ -124214,7 +124049,7 @@ ${str(snapshot)}`);
 function str(x4) {
   return JSON.stringify(x4);
 }
-function assertNever2(_x) {
+function assertNever3(_x) {
 }
 
 // ../../node_modules/.pnpm/openai@4.104.0_encoding@0.1.13_ws@8.20.0_zod@3.25.76/node_modules/openai/lib/ChatCompletionStreamingRunner.mjs
@@ -125756,7 +125591,7 @@ var ResponseStream = class _ResponseStream extends EventStream {
           if (done) {
             return { value: void 0, done: true };
           }
-          return new Promise((resolve12, reject) => readQueue.push({ resolve: resolve12, reject })).then((event2) => event2 ? { value: event2, done: false } : { value: void 0, done: true });
+          return new Promise((resolve13, reject) => readQueue.push({ resolve: resolve13, reject })).then((event2) => event2 ? { value: event2, done: false } : { value: void 0, done: true });
         }
         const event = pushQueue.shift();
         return { value: event, done: false };
@@ -126670,6 +126505,34 @@ async function validateKey2(key, deps = {}) {
 function defaultMaker2(apiKey, baseURL) {
   return new openai_default({ apiKey, ...baseURL ? { baseURL } : {} });
 }
+function pickOpenAICompatConfig(config) {
+  const str2 = (v3) => typeof v3 === "string" ? v3 : void 0;
+  return {
+    apiKey: str2(config.apiKey),
+    baseURL: str2(config.baseURL),
+    defaultModel: str2(config.defaultModel)
+  };
+}
+function defineOpenAICompatProvider(spec) {
+  const resolveApiKey = spec.resolveApiKey ?? ((cfg) => cfg.apiKey);
+  const resolveBaseURL = spec.resolveBaseURL ?? ((cfg) => cfg.baseURL ?? spec.baseURL);
+  return defineProvider({
+    name: spec.name,
+    models: [...spec.models],
+    createClient: (config) => {
+      const cfg = pickOpenAICompatConfig(config);
+      return new OpenAIProvider({
+        apiKey: resolveApiKey(cfg),
+        name: spec.name,
+        baseURL: resolveBaseURL(cfg),
+        defaultModel: cfg.defaultModel ?? spec.defaultModel,
+        models: spec.models
+      });
+    },
+    ...spec.validate === false ? {} : { validateKey: (key) => validateKey2(key, { baseURL: spec.baseURL }) },
+    ...spec.auth ? { auth: spec.auth } : {}
+  });
+}
 
 // ../plugin-provider-openai/dist/index.js
 var openaiProviderDef = defineProvider({
@@ -126688,7 +126551,7 @@ var openaiPlugin = definePlugin({
 init_pkce();
 async function openInBrowser(url2) {
   const { cmd, args, verbatim } = browserOpenCommand(url2);
-  await new Promise((resolve12, reject) => {
+  await new Promise((resolve13, reject) => {
     const child = spawn(cmd, args, {
       stdio: "ignore",
       detached: true,
@@ -126698,7 +126561,7 @@ async function openInBrowser(url2) {
     });
     child.once("error", reject);
     child.unref();
-    setTimeout(resolve12, 50);
+    setTimeout(resolve13, 50);
   });
 }
 function browserOpenCommand(url2, platform2 = process.platform) {
@@ -126714,7 +126577,7 @@ function browserOpenCommand(url2, platform2 = process.platform) {
   return { cmd: "xdg-open", args: [url2] };
 }
 function waitForCallback(opts) {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     const servers = [];
     let settled = false;
     const settle = (fn) => {
@@ -126791,7 +126654,7 @@ function waitForCallback(opts) {
       }
       res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
       res.end(htmlPage("Authorized", "You can close this window \u2014 moxxy received the token."));
-      settle(() => resolve12(code));
+      settle(() => resolve13(code));
     };
     const onFatalError = (e3) => {
       if (e3.code === "EADDRINUSE") {
@@ -126979,10 +126842,10 @@ async function pollUntil(fn, opts) {
   throw new Error(`${label3} timed out waiting for completion`);
 }
 function sleep3(ms, signal) {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     if (signal?.aborted)
       return reject(new Error("aborted"));
-    const t2 = setTimeout(resolve12, ms);
+    const t2 = setTimeout(resolve13, ms);
     const onAbort = () => {
       clearTimeout(t2);
       reject(new Error("aborted"));
@@ -127117,20 +126980,19 @@ async function storeTokenSet(vault, provider, tokens, meta) {
   validateProvider(provider);
   const tag2 = `oauth:${provider}`;
   const base2 = `oauth/${provider}`;
+  const upsert = async (key, value) => {
+    if (value !== void 0) {
+      await vault.set(`${base2}/${key}`, value, [tag2]);
+    } else {
+      await vault.delete?.(`${base2}/${key}`);
+    }
+  };
   await vault.set(`${base2}/access_token`, tokens.accessToken, [tag2]);
-  if (tokens.refreshToken !== void 0) {
-    await vault.set(`${base2}/refresh_token`, tokens.refreshToken, [tag2]);
-  }
-  if (tokens.expiresAt !== void 0) {
-    await vault.set(`${base2}/expires_at`, String(tokens.expiresAt), [tag2]);
-  }
-  if (tokens.scope !== void 0) {
-    await vault.set(`${base2}/scope`, tokens.scope, [tag2]);
-  }
+  await upsert("refresh_token", tokens.refreshToken);
+  await upsert("expires_at", tokens.expiresAt !== void 0 ? String(tokens.expiresAt) : void 0);
+  await upsert("scope", tokens.scope);
   await vault.set(`${base2}/token_type`, tokens.tokenType, [tag2]);
-  if (tokens.idToken !== void 0) {
-    await vault.set(`${base2}/id_token`, tokens.idToken, [tag2]);
-  }
+  await upsert("id_token", tokens.idToken);
   await vault.set(`${base2}/client_id`, meta.clientId, [tag2]);
   if (meta.clientSecret) {
     await vault.set(`${base2}/client_secret`, meta.clientSecret, [tag2]);
@@ -127217,8 +127079,79 @@ function parseExtras(raw) {
     return {};
   }
 }
-
-// ../plugin-oauth/dist/tools.js
+var DEFAULT_STALE_MS = 6e4;
+var DEFAULT_POLL_MS = 150;
+var DEFAULT_WAIT_MS = 3e4;
+var inProcessLocks = /* @__PURE__ */ new Map();
+async function withCredentialLock(key, fn, opts = {}) {
+  const safe2 = sanitizeKey(key);
+  let mutex = inProcessLocks.get(safe2);
+  if (!mutex) {
+    mutex = createMutex();
+    inProcessLocks.set(safe2, mutex);
+  }
+  return mutex.run(async () => {
+    const release = await acquireFileLock(join(opts.dir ?? moxxyPath("locks"), `${safe2}.lock`), opts.staleMs ?? DEFAULT_STALE_MS, opts.pollMs ?? DEFAULT_POLL_MS, opts.waitMs ?? DEFAULT_WAIT_MS);
+    try {
+      return await fn();
+    } finally {
+      await release();
+    }
+  });
+}
+function isAuthRejection(err) {
+  return err instanceof MoxxyError && (err.code === "AUTH_INVALID" || err.code === "AUTH_DENIED" || err.code === "AUTH_EXPIRED" || err.code === "PROVIDER_BAD_REQUEST");
+}
+function sanitizeKey(key) {
+  return key.replace(/[^a-zA-Z0-9._-]+/g, "_");
+}
+async function acquireFileLock(lockPath, staleMs, pollMs, waitMs) {
+  const deadline = Date.now() + waitMs;
+  try {
+    await mkdir(dirname(lockPath), { recursive: true });
+  } catch {
+    return async () => {
+    };
+  }
+  for (; ; ) {
+    try {
+      const handle2 = await open(lockPath, "wx");
+      try {
+        await handle2.writeFile(`${process.pid} ${(/* @__PURE__ */ new Date()).toISOString()}
+`, "utf8");
+      } finally {
+        await handle2.close().catch(() => {
+        });
+      }
+      return async () => {
+        await rm(lockPath, { force: true }).catch(() => {
+        });
+      };
+    } catch (err) {
+      if (err.code !== "EEXIST") {
+        return async () => {
+        };
+      }
+    }
+    try {
+      const st3 = await stat(lockPath);
+      if (Date.now() - st3.mtimeMs > staleMs) {
+        await rm(lockPath, { force: true }).catch(() => {
+        });
+        continue;
+      }
+    } catch {
+      continue;
+    }
+    if (Date.now() >= deadline)
+      return async () => {
+      };
+    await sleep4(pollMs);
+  }
+}
+function sleep4(ms) {
+  return new Promise((resolve13) => setTimeout(resolve13, ms));
+}
 var providerNameField = z$1.string().min(1).max(60).describe('Stable provider key used as the vault namespace (e.g. "google", "github", "notion"). Lowercase letters, digits, dot/dash/underscore only.');
 function buildOauthAuthorizeTool(deps) {
   return defineTool({
@@ -127346,31 +127279,20 @@ function buildOauthGetTokenTool(deps) {
           context: { provider }
         });
       }
-      let tokens = stored.tokenSet;
-      if (forceRefresh || isExpired(tokens)) {
-        if (!tokens.refreshToken) {
-          throw new MoxxyError({
-            code: "AUTH_EXPIRED",
-            message: `OAuth token for "${provider}" expired and no refresh_token is stored. Re-run oauth_authorize.`,
-            context: { provider }
-          });
-        }
-        const refreshed = await refreshAccessToken({
-          tokenUrl: stored.tokenUrl,
-          clientId: stored.clientId,
-          ...stored.clientSecret ? { clientSecret: stored.clientSecret } : {},
-          refreshToken: tokens.refreshToken
-        });
-        tokens = {
-          ...refreshed,
-          refreshToken: refreshed.refreshToken ?? tokens.refreshToken
-        };
-        await storeTokenSet(deps.vault, provider, tokens, {
-          clientId: stored.clientId,
-          ...stored.clientSecret ? { clientSecret: stored.clientSecret } : {},
-          tokenUrl: stored.tokenUrl
+      if (!forceRefresh && !isExpired(stored.tokenSet)) {
+        return summarizeTokens(provider, stored.tokenSet, {
+          includeAccess: true,
+          ...includeRefresh ? { includeRefresh: true } : {}
         });
       }
+      const tokens = await withCredentialLock(`oauth-${provider}`, async () => {
+        const current = await readStoredCreds(deps.vault, provider) ?? stored;
+        const rotatedMeanwhile = current.tokenSet.accessToken !== stored.tokenSet.accessToken;
+        if (!isExpired(current.tokenSet) && (!forceRefresh || rotatedMeanwhile)) {
+          return current.tokenSet;
+        }
+        return refreshAndStoreCreds(deps.vault, provider, current);
+      });
       return summarizeTokens(provider, tokens, {
         includeAccess: true,
         ...includeRefresh ? { includeRefresh: true } : {}
@@ -127390,6 +127312,46 @@ function buildOauthClearTool(deps) {
     }
   });
 }
+async function refreshAndStoreCreds(vault, provider, stored, retried = false) {
+  if (!stored.tokenSet.refreshToken) {
+    throw new MoxxyError({
+      code: "AUTH_EXPIRED",
+      message: `OAuth token for "${provider}" expired and no refresh_token is stored. Re-run oauth_authorize.`,
+      context: { provider }
+    });
+  }
+  let refreshed;
+  try {
+    refreshed = await refreshAccessToken({
+      tokenUrl: stored.tokenUrl,
+      clientId: stored.clientId,
+      ...stored.clientSecret ? { clientSecret: stored.clientSecret } : {},
+      refreshToken: stored.tokenSet.refreshToken
+    });
+  } catch (err) {
+    if (!retried && isAuthRejection(err)) {
+      const latest = await readStoredCreds(vault, provider);
+      if (latest?.tokenSet.refreshToken && latest.tokenSet.refreshToken !== stored.tokenSet.refreshToken) {
+        return refreshAndStoreCreds(vault, provider, latest, true);
+      }
+    }
+    const net3 = classifyNetworkError(err, { url: stored.tokenUrl, provider });
+    if (net3)
+      throw net3;
+    throw err;
+  }
+  const merged = {
+    ...refreshed,
+    refreshToken: refreshed.refreshToken ?? stored.tokenSet.refreshToken
+  };
+  await storeTokenSet(vault, provider, merged, {
+    clientId: stored.clientId,
+    ...stored.clientSecret ? { clientSecret: stored.clientSecret } : {},
+    tokenUrl: stored.tokenUrl,
+    ...Object.keys(stored.extras).length > 0 ? { extras: stored.extras } : {}
+  });
+  return merged;
+}
 function summarizeTokens(provider, tokens, opts = {}) {
   return {
     provider,
@@ -127496,81 +127458,6 @@ Polling every ${Math.round(init3.intervalMs / 1e3)}s (${Math.round(init3.expires
     ...ctx.signal ? { signal: ctx.signal } : {}
   });
 }
-var DEFAULT_STALE_MS = 6e4;
-var DEFAULT_POLL_MS = 150;
-var DEFAULT_WAIT_MS = 3e4;
-var inProcessLocks = /* @__PURE__ */ new Map();
-async function withCredentialLock(key, fn, opts = {}) {
-  const safe2 = sanitizeKey(key);
-  let mutex = inProcessLocks.get(safe2);
-  if (!mutex) {
-    mutex = createMutex();
-    inProcessLocks.set(safe2, mutex);
-  }
-  return mutex.run(async () => {
-    const release = await acquireFileLock(join(opts.dir ?? moxxyPath("locks"), `${safe2}.lock`), opts.staleMs ?? DEFAULT_STALE_MS, opts.pollMs ?? DEFAULT_POLL_MS, opts.waitMs ?? DEFAULT_WAIT_MS);
-    try {
-      return await fn();
-    } finally {
-      await release();
-    }
-  });
-}
-function isAuthRejection(err) {
-  return err instanceof MoxxyError && (err.code === "AUTH_INVALID" || err.code === "AUTH_DENIED" || err.code === "AUTH_EXPIRED" || err.code === "PROVIDER_BAD_REQUEST");
-}
-function sanitizeKey(key) {
-  return key.replace(/[^a-zA-Z0-9._-]+/g, "_");
-}
-async function acquireFileLock(lockPath, staleMs, pollMs, waitMs) {
-  const deadline = Date.now() + waitMs;
-  try {
-    await mkdir(dirname(lockPath), { recursive: true });
-  } catch {
-    return async () => {
-    };
-  }
-  for (; ; ) {
-    try {
-      const handle2 = await open(lockPath, "wx");
-      try {
-        await handle2.writeFile(`${process.pid} ${(/* @__PURE__ */ new Date()).toISOString()}
-`, "utf8");
-      } finally {
-        await handle2.close().catch(() => {
-        });
-      }
-      return async () => {
-        await rm(lockPath, { force: true }).catch(() => {
-        });
-      };
-    } catch (err) {
-      if (err.code !== "EEXIST") {
-        return async () => {
-        };
-      }
-    }
-    try {
-      const st3 = await stat(lockPath);
-      if (Date.now() - st3.mtimeMs > staleMs) {
-        await rm(lockPath, { force: true }).catch(() => {
-        });
-        continue;
-      }
-    } catch {
-      continue;
-    }
-    if (Date.now() >= deadline)
-      return async () => {
-      };
-    await sleep4(pollMs);
-  }
-}
-function sleep4(ms) {
-  return new Promise((resolve12) => setTimeout(resolve12, ms));
-}
-
-// ../plugin-oauth/dist/ensure-fresh.js
 async function ensureFreshTokens(profile, vault, opts = {}) {
   const stored = await readStoredCreds(vault, profile.id);
   if (!stored) {
@@ -128082,10 +127969,10 @@ async function* consumeResponsesSse(body, signal, emitReasoning = false) {
           break;
         buffer += decoder.decode(value, { stream: true });
         buffer = buffer.replace(/\r\n/g, "\n");
-        let sep2;
-        while ((sep2 = buffer.indexOf("\n\n")) !== -1) {
-          const frame = buffer.slice(0, sep2);
-          buffer = buffer.slice(sep2 + 2);
+        let sep3;
+        while ((sep3 = buffer.indexOf("\n\n")) !== -1) {
+          const frame = buffer.slice(0, sep3);
+          buffer = buffer.slice(sep3 + 2);
           for (const line of frame.split("\n")) {
             if (!line.startsWith("data:"))
               continue;
@@ -128591,7 +128478,7 @@ async function refreshClaudeUnderLock(vault, baseline) {
 }
 var fetchImpl = fetch;
 var openBrowserImpl = openInBrowser;
-var sleepImpl = (ms) => new Promise((resolve12) => setTimeout(resolve12, ms));
+var sleepImpl = (ms) => new Promise((resolve13) => setTimeout(resolve13, ms));
 var TOKEN_POST_MAX_ATTEMPTS = 3;
 var TOKEN_POST_BACKOFF_MS = [600, 1800];
 async function exchangeClaudeCode(code, state, verifier) {
@@ -128711,20 +128598,11 @@ var glmModels = [
 var ZAI_OPENAI_BASE_URL = "https://api.z.ai/api/paas/v4";
 var ZAI_ANTHROPIC_BASE_URL = "https://api.z.ai/api/anthropic";
 var ZAI_DEFAULT_MODEL = "glm-4.6";
-var zaiProviderDef = defineProvider({
+var zaiProviderDef = defineOpenAICompatProvider({
   name: "zai",
-  models: [...glmModels],
-  createClient: (config) => {
-    const cfg = config;
-    return new OpenAIProvider({
-      ...cfg,
-      name: "zai",
-      baseURL: cfg.baseURL ?? ZAI_OPENAI_BASE_URL,
-      defaultModel: cfg.defaultModel ?? ZAI_DEFAULT_MODEL,
-      models: glmModels
-    });
-  },
-  validateKey: (key) => validateKey2(key, { baseURL: ZAI_OPENAI_BASE_URL }),
+  baseURL: ZAI_OPENAI_BASE_URL,
+  defaultModel: ZAI_DEFAULT_MODEL,
+  models: glmModels,
   auth: {
     kind: "apiKey",
     hint: "z.ai API key (pay-as-you-go) from https://z.ai/manage-apikey/apikey-list"
@@ -128734,9 +128612,9 @@ var zaiCodingPlanProviderDef = defineProvider({
   name: "zai-coding-plan",
   models: [...glmModels],
   createClient: (config) => {
-    const cfg = config;
+    const cfg = pickOpenAICompatConfig(config);
     return new AnthropicProvider({
-      ...cfg,
+      apiKey: cfg.apiKey,
       name: "zai-coding-plan",
       baseURL: cfg.baseURL ?? ZAI_ANTHROPIC_BASE_URL,
       defaultModel: cfg.defaultModel ?? ZAI_DEFAULT_MODEL,
@@ -128770,20 +128648,11 @@ var grokModels = [
 // ../plugin-provider-xai/dist/index.js
 var XAI_BASE_URL = "https://api.x.ai/v1";
 var XAI_DEFAULT_MODEL = "grok-4";
-var xaiProviderDef = defineProvider({
+var xaiProviderDef = defineOpenAICompatProvider({
   name: "xai",
-  models: [...grokModels],
-  createClient: (config) => {
-    const cfg = config;
-    return new OpenAIProvider({
-      ...cfg,
-      name: "xai",
-      baseURL: cfg.baseURL ?? XAI_BASE_URL,
-      defaultModel: cfg.defaultModel ?? XAI_DEFAULT_MODEL,
-      models: grokModels
-    });
-  },
-  validateKey: (key) => validateKey2(key, { baseURL: XAI_BASE_URL }),
+  baseURL: XAI_BASE_URL,
+  defaultModel: XAI_DEFAULT_MODEL,
+  models: grokModels,
   auth: {
     kind: "apiKey",
     hint: "xAI API key (starts with `xai-`) from https://console.x.ai"
@@ -128809,20 +128678,11 @@ var geminiModels = [
 // ../plugin-provider-google/dist/index.js
 var GEMINI_BASE_URL = "https://generativelanguage.googleapis.com/v1beta/openai/";
 var GEMINI_DEFAULT_MODEL = "gemini-2.5-flash";
-var googleProviderDef = defineProvider({
+var googleProviderDef = defineOpenAICompatProvider({
   name: "google",
-  models: [...geminiModels],
-  createClient: (config) => {
-    const cfg = config;
-    return new OpenAIProvider({
-      ...cfg,
-      name: "google",
-      baseURL: cfg.baseURL ?? GEMINI_BASE_URL,
-      defaultModel: cfg.defaultModel ?? GEMINI_DEFAULT_MODEL,
-      models: geminiModels
-    });
-  },
-  validateKey: (key) => validateKey2(key, { baseURL: GEMINI_BASE_URL }),
+  baseURL: GEMINI_BASE_URL,
+  defaultModel: GEMINI_DEFAULT_MODEL,
+  models: geminiModels,
   auth: {
     kind: "apiKey",
     hint: "Google AI Studio (Gemini) API key from https://aistudio.google.com/apikey"
@@ -128843,22 +128703,14 @@ var localModels = [
   { id: "deepseek-r1", contextWindow: 131072, supportsTools: true, supportsStreaming: true },
   { id: "gpt-oss", contextWindow: 131072, supportsTools: true, supportsStreaming: true }
 ];
-var localProviderDef = defineProvider({
+var localProviderDef = defineOpenAICompatProvider({
   name: "local",
-  models: [...localModels],
-  createClient: (config) => {
-    const cfg = config;
-    return new OpenAIProvider({
-      ...cfg,
-      name: "local",
-      apiKey: cfg.apiKey ?? process.env.LOCAL_API_KEY ?? LOCAL_PLACEHOLDER_KEY,
-      baseURL: cfg.baseURL ?? process.env.LOCAL_MODEL_BASE_URL ?? DEFAULT_LOCAL_BASE_URL,
-      defaultModel: cfg.defaultModel ?? LOCAL_DEFAULT_MODEL,
-      models: localModels
-    });
-  },
-  // No validateKey: there is no key to validate, and probing a local server
-  // that may be offline would surface confusing errors during setup.
+  baseURL: DEFAULT_LOCAL_BASE_URL,
+  defaultModel: LOCAL_DEFAULT_MODEL,
+  models: localModels,
+  validate: false,
+  resolveApiKey: (cfg) => cfg.apiKey ?? process.env.LOCAL_API_KEY ?? LOCAL_PLACEHOLDER_KEY,
+  resolveBaseURL: (cfg) => cfg.baseURL ?? process.env.LOCAL_MODEL_BASE_URL ?? DEFAULT_LOCAL_BASE_URL,
   auth: {
     kind: "apiKey",
     envVar: "LOCAL_API_KEY",
@@ -129298,7 +129150,7 @@ var bashTool = defineTool({
     if (ctx.signal.aborted) {
       throw new MoxxyError({ code: "ABORTED", message: `Bash aborted before start: ${command}` });
     }
-    return await new Promise((resolve12, reject) => {
+    return await new Promise((resolve13, reject) => {
       const child = spawn("/bin/sh", ["-lc", command], {
         cwd: cwd2 ?? ctx.cwd,
         env: env3 ? { ...process.env, ...env3 } : process.env,
@@ -129351,9 +129203,9 @@ ${err.text.trimEnd()}
 ` : "") + `[exit ${code ?? "null"}]`;
         const dropped = out.dropped + err.dropped;
         if (dropped === 0) {
-          resolve12(clampString(combined, OUTPUT_LIMIT));
+          resolve13(clampString(combined, OUTPUT_LIMIT));
         } else {
-          resolve12(combined.slice(0, OUTPUT_LIMIT) + `
+          resolve13(combined.slice(0, OUTPUT_LIMIT) + `
 ... [truncated ${combined.length + dropped - OUTPUT_LIMIT} chars]`);
         }
       });
@@ -129934,10 +129786,10 @@ var sleepTool = defineTool({
     if (ctx.signal.aborted) {
       throw new MoxxyError({ code: "ABORTED", message: "Sleep aborted before start" });
     }
-    await new Promise((resolve12, reject) => {
+    await new Promise((resolve13, reject) => {
       const timer = setTimeout(() => {
         ctx.signal.removeEventListener("abort", onAbort);
-        resolve12();
+        resolve13();
       }, totalMs);
       const onAbort = () => {
         clearTimeout(timer);
@@ -131415,11 +131267,11 @@ var TelegramPermissionResolver = class {
     if (!this.deciderFn) {
       return { mode: "deny", reason: "no decider attached (bot not running)" };
     }
-    const decision = await new Promise((resolve12) => {
-      this.pending.set(call.callId, { callId: call.callId, call, ctx, resolve: resolve12 });
+    const decision = await new Promise((resolve13) => {
+      this.pending.set(call.callId, { callId: call.callId, call, ctx, resolve: resolve13 });
       this.deciderFn(call, ctx).catch((err) => {
         this.pending.delete(call.callId);
-        resolve12({ mode: "deny", reason: err instanceof Error ? err.message : String(err) });
+        resolve13({ mode: "deny", reason: err instanceof Error ? err.message : String(err) });
       });
     });
     if (decision.mode === "allow_session")
@@ -131457,11 +131309,11 @@ var TelegramApprovalResolver = class {
       return { optionId: request.defaultOptionId ?? request.options[0]?.id ?? "approve" };
     }
     const id = `appr_${this.nextId++}`;
-    return new Promise((resolve12) => {
-      this.pending.set(id, { id, request, resolve: resolve12 });
+    return new Promise((resolve13) => {
+      this.pending.set(id, { id, request, resolve: resolve13 });
       this.deciderFn(id, request).catch((err) => {
         this.pending.delete(id);
-        resolve12({
+        resolve13({
           optionId: request.defaultOptionId ?? request.options[0]?.id ?? "cancel",
           text: `decider failed: ${err instanceof Error ? err.message : String(err)}`
         });
@@ -133928,8 +133780,8 @@ async function runPairFlow(ctx) {
   });
   session.setPermissionResolver(channel.permissionResolver);
   let issuedResolve = null;
-  const issued = new Promise((resolve12) => {
-    issuedResolve = resolve12;
+  const issued = new Promise((resolve13) => {
+    issuedResolve = resolve13;
   });
   const unsubscribe = channel.onPairingIssued((e3) => {
     issuedResolve?.(e3);
@@ -134502,7 +134354,7 @@ var HttpChannel = class {
       }
     });
     this.server = server;
-    const listening = new Promise((resolve12, reject) => {
+    const listening = new Promise((resolve13, reject) => {
       server.once("error", reject);
       server.listen(this.port, this.host, () => {
         const addr = server.address();
@@ -134512,20 +134364,20 @@ var HttpChannel = class {
           port: this.boundPortValue,
           authEnabled: this.authToken !== null
         });
-        resolve12();
+        resolve13();
       });
     });
     await listening;
-    const running = new Promise((resolve12) => {
-      server.once("close", () => resolve12());
+    const running = new Promise((resolve13) => {
+      server.once("close", () => resolve13());
     });
     return {
       running,
       stop: async () => {
-        await new Promise((resolve12) => {
+        await new Promise((resolve13) => {
           if (!this.server)
-            return resolve12();
-          this.server.close(() => resolve12());
+            return resolve13();
+          this.server.close(() => resolve13());
         });
       }
     };
@@ -134668,17 +134520,17 @@ function isAddrInUse(err) {
 }
 async function captureStdout(cmd, args) {
   const { spawn: spawn15 } = await import('child_process');
-  return await new Promise((resolve12) => {
+  return await new Promise((resolve13) => {
     let out = "";
     try {
       const child = spawn15(cmd, [...args], { stdio: ["ignore", "pipe", "ignore"] });
       child.stdout.on("data", (b3) => {
         out += b3.toString();
       });
-      child.on("error", () => resolve12(""));
-      child.on("close", () => resolve12(out));
+      child.on("error", () => resolve13(""));
+      child.on("close", () => resolve13(out));
     } catch {
-      resolve12("");
+      resolve13("");
     }
   });
 }
@@ -134805,7 +134657,7 @@ var WebChannel = class {
     await this.openTunnel();
     this.publishSurface?.({ url: this.shareUrl, nextViewId: () => `v_srv_${++this.viewSeq}` });
     this.publishControls?.({ retunnel: () => this.retunnel() });
-    const running = new Promise((resolve12) => server.once("close", () => resolve12()));
+    const running = new Promise((resolve13) => server.once("close", () => resolve13()));
     return { running, stop: () => this.stop() };
   }
   /**
@@ -134818,7 +134670,7 @@ var WebChannel = class {
    * surface actually got (the share URL embeds the real port either way).
    */
   async bindServerWithRetry(server) {
-    const tryListen = () => new Promise((resolve12, reject) => {
+    const tryListen = () => new Promise((resolve13, reject) => {
       const onError2 = (err) => {
         server.off("listening", onListening);
         reject(err);
@@ -134829,7 +134681,7 @@ var WebChannel = class {
         if (addr && typeof addr === "object")
           this.port = addr.port;
         this.logger?.info?.("web channel listening", { url: this.url });
-        resolve12();
+        resolve13();
       };
       server.once("error", onError2);
       server.once("listening", onListening);
@@ -134910,8 +134762,8 @@ var WebChannel = class {
       }
     }
     this.clients.clear();
-    await new Promise((resolve12) => this.wss ? this.wss.close(() => resolve12()) : resolve12());
-    await new Promise((resolve12) => this.server ? this.server.close(() => resolve12()) : resolve12());
+    await new Promise((resolve13) => this.wss ? this.wss.close(() => resolve13()) : resolve13());
+    await new Promise((resolve13) => this.server ? this.server.close(() => resolve13()) : resolve13());
   }
   validToken(reqUrl) {
     try {
@@ -135074,6 +134926,7 @@ var ngrokTunnel = defineTunnelProvider({
   })
 });
 var webSettingsSchema = z$1.object({ tunnel: z$1.string().optional() });
+var writeMutex2 = createMutex();
 function webSettingsPath() {
   return moxxyPath("web.json");
 }
@@ -135096,8 +134949,10 @@ function readTunnelSetting(file = webSettingsPath()) {
   return typeof t2 === "string" && t2 ? normalizeTunnelName(t2) : void 0;
 }
 async function writeTunnelSetting(name, file = webSettingsPath()) {
-  const next = { ...readWebSettings(file), tunnel: normalizeTunnelName(name) };
-  await writeFileAtomic(file, JSON.stringify(next, null, 2));
+  await writeMutex2.run(async () => {
+    const next = { ...readWebSettings(file), tunnel: normalizeTunnelName(name) };
+    await writeFileAtomic(file, JSON.stringify(next, null, 2));
+  });
 }
 
 // ../plugin-channel-web/dist/index.js
@@ -135308,9 +135163,9 @@ async function createWebSocketTransportServer(opts) {
     for (const handler of connectionHandlers)
       handler(transport);
   });
-  await new Promise((resolve12, reject) => {
+  await new Promise((resolve13, reject) => {
     wss.once("error", reject);
-    wss.once("listening", resolve12);
+    wss.once("listening", resolve13);
   });
   const bound = wss.address();
   const boundPort = typeof bound === "object" && bound !== null ? bound.port : opts.port;
@@ -135331,10 +135186,10 @@ async function createWebSocketTransportServer(opts) {
       return connections;
     },
     close() {
-      return new Promise((resolve12) => {
+      return new Promise((resolve13) => {
         for (const client of wss.clients)
           client.terminate();
-        wss.close(() => resolve12());
+        wss.close(() => resolve13());
       });
     }
   };
@@ -135386,8 +135241,8 @@ var JsonRpcPeer = class {
     if (this.closed)
       return Promise.reject(new RpcError("rpc peer is closed"));
     const id = this.nextId++;
-    return new Promise((resolve12, reject) => {
-      this.pending.set(id, { resolve: resolve12, reject });
+    return new Promise((resolve13, reject) => {
+      this.pending.set(id, { resolve: resolve13, reject });
       const frame = { id, method, ...params !== void 0 ? { params } : {} };
       this.transport.send(frame);
     });
@@ -135539,11 +135394,11 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
     for (const handler of connectionHandlers)
       handler(transport);
   });
-  await new Promise((resolve12, reject) => {
+  await new Promise((resolve13, reject) => {
     server.once("error", reject);
     server.listen(socketPath, () => {
       server.removeListener("error", reject);
-      resolve12();
+      resolve13();
     });
   });
   if (process.platform !== "win32") {
@@ -135562,7 +135417,7 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
       connectionHandlers.push(handler);
     },
     close() {
-      return new Promise((resolve12) => {
+      return new Promise((resolve13) => {
         server.close(() => {
           if (process.platform !== "win32") {
             try {
@@ -135570,14 +135425,14 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
             } catch {
             }
           }
-          resolve12();
+          resolve13();
         });
       });
     }
   };
 }
 function connectUnixSocket(socketPath) {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     const socket = net.connect(socketPath);
     const onError2 = (err) => {
       socket.destroy();
@@ -135586,7 +135441,7 @@ function connectUnixSocket(socketPath) {
     socket.once("error", onError2);
     socket.once("connect", () => {
       socket.removeListener("error", onError2);
-      resolve12(new NdjsonTransport(socket));
+      resolve13(new NdjsonTransport(socket));
     });
   });
 }
@@ -135618,11 +135473,11 @@ function warnWindowsPipeAclOnce(logger, pipePath) {
 async function reclaimStaleSocket(socketPath) {
   if (!fs28__default.existsSync(socketPath))
     return;
-  const alive = await new Promise((resolve12) => {
+  const alive = await new Promise((resolve13) => {
     const probe = net.connect(socketPath);
     const finish = (up) => {
       probe.destroy();
-      resolve12(up);
+      resolve13(up);
     };
     probe.once("connect", () => finish(true));
     probe.once("error", () => finish(false));
@@ -135647,11 +135502,11 @@ function runnerSocketPath() {
   return platformSocket("serve", path3__default.join(os5__default.homedir(), ".moxxy", "serve.sock"));
 }
 function isRunnerUp(socketPath = runnerSocketPath()) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     const socket = net.connect(socketPath);
     const finish = (up) => {
       socket.destroy();
-      resolve12(up);
+      resolve13(up);
     };
     socket.once("connect", () => finish(true));
     socket.once("error", () => finish(false));
@@ -135898,6 +135753,23 @@ var RunnerServer = class {
   fallbackPermission;
   fallbackApproval;
   closed = false;
+  /**
+   * Serializes this runner's preferences read-modify-write handlers
+   * ({@link handleProviderSetActive} / {@link handleProviderSetEnabled}).
+   *
+   * Invariant #5: a whole-file RMW store needs an atomic write PLUS a
+   * per-instance promise-mutex. The atomic-write half lives in core's
+   * `savePreferences`; the serialization half lives here because the
+   * `disabledProviders` toggle reads the current set via `loadPreferences`
+   * BEFORE handing the merged patch to `savePreferences` — that load→compute
+   * step spans core's own critical section, so two overlapping toggles could
+   * otherwise both read the same set and the second clobber the first. Running
+   * the whole load→compute→save body under one mutex makes every prefs write
+   * issued by this runner serialize. (Core would ideally expose a single
+   * mutexed updater covering all callers; until it does, cross-process /
+   * cross-runner prefs writes remain best-effort behind the atomic rename.)
+   */
+  prefsMutex = createMutex();
   constructor(session, transport) {
     this.session = session;
     this.transport = transport;
@@ -136091,7 +135963,7 @@ var RunnerServer = class {
     if (def)
       this.session.providers.replace(def);
     this.session.providers.setActive(name, cfg);
-    void savePreferences({ providerName: name });
+    void this.prefsMutex.run(() => savePreferences({ providerName: name }));
     this.broadcastInfo();
     return {};
   }
@@ -136101,7 +135973,7 @@ var RunnerServer = class {
       throw new Error(`Provider not registered: ${name}`);
     }
     this.session.providers.setEnabled(name, enabled);
-    void (async () => {
+    void this.prefsMutex.run(async () => {
       const prefs = await loadPreferences();
       const current = new Set(prefs.disabledProviders ?? []);
       if (enabled)
@@ -136109,7 +135981,7 @@ var RunnerServer = class {
       else
         current.add(name);
       await savePreferences({ disabledProviders: [...current] });
-    })();
+    });
     this.broadcastInfo();
     return {};
   }
@@ -136421,12 +136293,13 @@ var TurnStream = class {
         yield this.queue.shift();
       if (this.done)
         break;
-      await new Promise((resolve12) => this.waiters.push(resolve12));
+      await new Promise((resolve13) => this.waiters.push(resolve13));
     }
     if (this.error)
       throw new Error(this.error);
   }
 };
+var MAX_COMPLETED_TURNS = 64;
 var RemoteSession = class {
   peer;
   mirror = new EventLog();
@@ -136453,6 +136326,14 @@ var RemoteSession = class {
    * finish. We record it here and apply it the moment the stream registers -
    * otherwise the stream would hang forever. Maps turnId -> error (or
    * undefined for a clean finish).
+   *
+   * Bounded (insertion-ordered, drop-oldest — same shape as
+   * {@link DeliveryDedupeCache} in plugin-webhooks): the server broadcasts
+   * `turn.complete` to EVERY attached client, so an observer that never calls
+   * `runTurn` for a turn (the desktop watching a TUI-driven session) would
+   * otherwise accumulate an entry per turn forever. Only the last
+   * {@link MAX_COMPLETED_TURNS} are kept; a legit fast-turn completion is
+   * consumed within a tick of arriving, so it is never the one evicted.
    */
   completedTurns = /* @__PURE__ */ new Map();
   permissionResolver = null;
@@ -136483,7 +136364,7 @@ var RemoteSession = class {
       if (stream)
         stream.finish(error2);
       else
-        this.completedTurns.set(turnId, error2);
+        this.recordCompletedTurn(turnId, error2);
     });
     this.peer.on(RunnerNotification.InfoChanged, (params) => {
       this.info = params.info;
@@ -136527,6 +136408,7 @@ var RemoteSession = class {
       for (const stream of this.turnStreams.values())
         stream.finish("runner disconnected");
       this.turnStreams.clear();
+      this.completedTurns.clear();
     });
     this.providers = this.makeProvidersView();
     this.modes = this.makeModesView();
@@ -136542,6 +136424,23 @@ var RemoteSession = class {
     this.providerAdmin = this.makeProviderAdminView();
     this.workflows = this.makeWorkflowsView();
   }
+  /**
+   * Buffer a completion whose `runTurn` stream isn't registered yet (fast turn)
+   * or that belongs to a turn this client only observes. Bounded, insertion-
+   * ordered drop-oldest — mirrors {@link DeliveryDedupeCache}: re-insert on
+   * update so a refreshed entry is the youngest, then evict the oldest once over
+   * {@link MAX_COMPLETED_TURNS}. A pending fast-turn entry is drained by
+   * `runTurn` within a tick, so it can't be the one evicted under normal load.
+   */
+  recordCompletedTurn(turnId, error2) {
+    this.completedTurns.delete(turnId);
+    this.completedTurns.set(turnId, error2);
+    if (this.completedTurns.size > MAX_COMPLETED_TURNS) {
+      const oldest = this.completedTurns.keys().next();
+      if (!oldest.done)
+        this.completedTurns.delete(oldest.value);
+    }
+  }
   /**
    * Providers the runner has activated. Exposed as a plain field (the TUI
    * model-picker reads it via a structural cast, same as it does on a local
@@ -137029,7 +136928,7 @@ async function isMoxxyProcess(pid) {
 }
 async function pidCommand2(pid) {
   const { spawn: spawn15 } = await import('child_process');
-  return await new Promise((resolve12) => {
+  return await new Promise((resolve13) => {
     let out = "";
     try {
       const child = spawn15("ps", ["-p", String(pid), "-o", "command="], {
@@ -137038,10 +136937,10 @@ async function pidCommand2(pid) {
       child.stdout.on("data", (b3) => {
         out += b3.toString();
       });
-      child.on("error", () => resolve12(""));
-      child.on("close", () => resolve12(out.trim()));
+      child.on("error", () => resolve13(""));
+      child.on("close", () => resolve13(out.trim()));
     } catch {
-      resolve12("");
+      resolve13("");
     }
   });
 }
@@ -137071,7 +136970,7 @@ async function pidsListeningOnPort(port) {
 }
 async function runLsof(args) {
   const { spawn: spawn15 } = await import('child_process');
-  return await new Promise((resolve12) => {
+  return await new Promise((resolve13) => {
     let out = "";
     try {
       const child = spawn15("lsof", [...args], {
@@ -137080,10 +136979,10 @@ async function runLsof(args) {
       child.stdout.on("data", (b3) => {
         out += b3.toString();
       });
-      child.on("error", () => resolve12([]));
-      child.on("close", () => resolve12(parsePids(out)));
+      child.on("error", () => resolve13([]));
+      child.on("close", () => resolve13(parsePids(out)));
     } catch {
-      resolve12([]);
+      resolve13([]);
     }
   });
 }
@@ -137220,6 +137119,17 @@ var ipcInputSchemas = {
     audioBase64: z.string().max(MAX_AUDIO_BASE64),
     mimeType: z.string().max(128).optional()
   }),
+  // Read-only snapshots and the abort RPC are reachable over the remote (WS)
+  // bridge — they carry free-form ids/workspaceId, so bound them like the
+  // sibling validated commands so a hostile remote can't OOM/log-bloat the host
+  // with an oversized string. All currently-valid payloads (a short turn id, an
+  // optional workspace slug, an optional desk id, or no arg at all) still pass.
+  "session.info": z.object({ workspaceId: optionalWorkspace }).optional(),
+  "session.abortTurn": z.object({
+    workspaceId: optionalWorkspace,
+    turnId: z.string().min(1).max(256)
+  }),
+  "sessions.list": z.object({ deskId: z.string().min(1).max(256).optional() }).optional(),
   "session.setProvider": z.object({ workspaceId: optionalWorkspace, provider: providerName }),
   "session.setMode": z.object({ workspaceId: optionalWorkspace, mode: z.string().min(1).max(64) }),
   "session.newSession": z.object({ workspaceId: optionalWorkspace }),
@@ -137612,8 +137522,8 @@ var MobileSessionHost = class {
     for (const controller of this.turns.values())
       controller.abort();
     this.turns.clear();
-    for (const resolve12 of this.pendingAsks.values())
-      resolve12({ mode: "deny" });
+    for (const resolve13 of this.pendingAsks.values())
+      resolve13({ mode: "deny" });
     this.pendingAsks.clear();
     this.session.setApprovalResolver(null);
   }
@@ -137663,17 +137573,17 @@ var MobileSessionHost = class {
   }
   openAsk(req) {
     const requestId = `ask-${++this.askCounter}`;
-    return new Promise((resolve12) => {
-      this.pendingAsks.set(requestId, resolve12);
+    return new Promise((resolve13) => {
+      this.pendingAsks.set(requestId, resolve13);
       this.bus.broadcast("ask.request", { ...req, requestId });
     });
   }
   answerAsk(requestId, response) {
-    const resolve12 = this.pendingAsks.get(requestId);
-    if (!resolve12)
+    const resolve13 = this.pendingAsks.get(requestId);
+    if (!resolve13)
       return;
     this.pendingAsks.delete(requestId);
-    resolve12(response);
+    resolve13(response);
   }
 };
 var TOKEN_FILE = "mobile-token";
@@ -137885,8 +137795,8 @@ var MobileChannel = class {
     const loopbackOnly = !tunnelUrl && isLoopbackHost(this.bindHost);
     await printConnectInfo(connectUrl, this.token, loopbackOnly ? "Bound to loopback \u2014 this QR only works on THIS machine (e.g. an iOS/Android\n  simulator). For a real phone: opt in to a LAN bind with MOXXY_MOBILE_HOST=0.0.0.0\n  (or channels.mobile.bindHost in moxxy.config.ts), or use a tunnel\n  (channels.mobile.tunnel: 'cloudflared' | 'ngrok', or MOXXY_MOBILE_TUNNEL)." : void 0);
     let resolveRunning;
-    const running = new Promise((resolve12) => {
-      resolveRunning = resolve12;
+    const running = new Promise((resolve13) => {
+      resolveRunning = resolve13;
     });
     return {
       running,
@@ -138352,9 +138262,6 @@ var Sidecar = class {
    *  install-progress feedback in their own logger/UI. A Set (not a single
    *  slot) so concurrent browser_session calls don't clobber each other. */
   stderrListeners = /* @__PURE__ */ new Set();
-  /** Listeners for unsolicited sidecar EVENT lines (no `id`) — the browser
-   *  surface's screencast frame push. */
-  eventListeners = /* @__PURE__ */ new Set();
   /** Last few sidecar stderr lines, kept so the `exit` handler can put the
    *  ACTUAL failure (e.g. "Cannot find module …" or Playwright's "Executable
    *  doesn't exist, run npx playwright install") into the error instead of a
@@ -138369,12 +138276,6 @@ var Sidecar = class {
     this.stderrListeners.add(fn);
     return () => this.stderrListeners.delete(fn);
   }
-  /** Subscribe to unsolicited sidecar EVENT lines (no `id`) — e.g. the browser
-   *  surface's `screencastFrame` push. Returns an unsubscribe function. */
-  onEvent(fn) {
-    this.eventListeners.add(fn);
-    return () => this.eventListeners.delete(fn);
-  }
   async ensure() {
     if (this.child)
       return;
@@ -138433,15 +138334,6 @@ ${tail}` : " (no stderr captured)")
     } catch {
       return;
     }
-    if (reply2.event && !reply2.id) {
-      for (const fn of this.eventListeners) {
-        try {
-          fn(reply2);
-        } catch {
-        }
-      }
-      return;
-    }
     const p3 = reply2.id ? this.pending.get(reply2.id) : void 0;
     if (!p3 || !reply2.id)
       return;
@@ -138464,7 +138356,7 @@ ${tail}` : " (no stderr captured)")
       throw new MoxxyError({ code: "NETWORK_ABORTED", message: "browser_session aborted" });
     const id = randomUUID();
     const req = { id, method, params };
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve13, reject) => {
       const onAbort = () => {
         if (this.pending.delete(id))
           reject(new MoxxyError({ code: "NETWORK_ABORTED", message: "browser_session aborted" }));
@@ -138473,7 +138365,7 @@ ${tail}` : " (no stderr captured)")
       this.pending.set(id, {
         resolve: (v3) => {
           cleanup();
-          resolve12(v3);
+          resolve13(v3);
         },
         reject: (e3) => {
           cleanup();
@@ -138594,54 +138486,48 @@ function buildBrowserSessionTool(deps) {
 function browserSidecarCall(method, params = {}, deps) {
   return getSidecar(deps).call(method, params);
 }
-function browserSidecarOnEvent(fn, deps) {
-  return getSidecar(deps).onEvent(fn);
-}
 async function closeBrowserSidecar() {
   if (SIDECAR_INSTANCE) {
     await SIDECAR_INSTANCE.close();
     SIDECAR_INSTANCE = null;
   }
 }
+var FRAME_INTERVAL_MS = 450;
+var FAIL_GRACE = 4;
 function buildBrowserSurface(deps) {
   return defineSurface({
     kind: "browser",
     description: "A live view of the agent's browser; click, type, and navigate.",
     open: () => {
       const dataSubs = /* @__PURE__ */ new Set();
-      let lastBase64 = null;
-      let lastUrl = "";
-      let vw = 1280;
-      let vh = 800;
+      let last = null;
+      let timer = null;
+      let inFlight = false;
+      let fails = 0;
       const emit2 = (payload) => {
         for (const cb of dataSubs)
           cb(payload);
       };
-      const offEvent = browserSidecarOnEvent((event) => {
-        if (event.event !== "screencastFrame")
+      const tick = async () => {
+        if (inFlight)
           return;
-        const data = typeof event.data === "string" ? event.data : null;
-        if (!data)
-          return;
-        lastBase64 = data;
-        if (typeof event.url === "string")
-          lastUrl = event.url;
-        emit2({ type: "frame", base64: data, mime: "image/jpeg", url: lastUrl });
-      }, deps);
-      const refreshViewport = async () => {
+        inFlight = true;
         try {
-          const f3 = await browserSidecarCall("frame", {}, deps);
-          if (f3.width)
-            vw = f3.width;
-          if (f3.height)
-            vh = f3.height;
-          if (typeof f3.url === "string")
-            lastUrl = f3.url;
-        } catch {
+          const frame = await browserSidecarCall("frame", {}, deps);
+          last = frame;
+          fails = 0;
+          emit2({ type: "frame", base64: frame.base64, mime: frame.mediaType, url: frame.url });
+        } catch (err) {
+          if (++fails === FAIL_GRACE && !last) {
+            const message = err instanceof Error ? err.message : String(err);
+            emit2({ type: "status", text: `Browser unavailable: ${message}` });
+          }
+        } finally {
+          inFlight = false;
         }
       };
-      void browserSidecarCall("startScreencast", {}, deps).catch(() => void 0);
-      void refreshViewport();
+      void tick();
+      timer = setInterval(() => void tick(), FRAME_INTERVAL_MS);
       return {
         id: "browser",
         kind: "browser",
@@ -138649,23 +138535,34 @@ function buildBrowserSurface(deps) {
           dataSubs.add(cb);
           return () => dataSubs.delete(cb);
         },
-        snapshot: () => lastBase64 ? { type: "frame", base64: lastBase64, mime: "image/jpeg", url: lastUrl } : { type: "frame", url: lastUrl },
+        snapshot: () => last ? { type: "frame", base64: last.base64, mime: last.mediaType, url: last.url } : { type: "status", text: "Starting browser\u2026" },
         input: async (msg) => {
+          const vw = last?.width ?? 1280;
+          const vh = last?.height ?? 720;
           if (msg.type === "navigate" && typeof msg.url === "string") {
-            await browserSidecarCall("goto", { url: msg.url }, deps).catch(() => void 0);
-            void refreshViewport();
+            try {
+              await browserSidecarCall("goto", { url: msg.url }, deps);
+            } catch (err) {
+              const text = err instanceof Error ? err.message : String(err);
+              emit2({ type: "status", text });
+            }
+            void tick();
           } else if (msg.type === "click" && typeof msg.fx === "number" && typeof msg.fy === "number") {
             await browserSidecarCall("mouse", { x: msg.fx * vw, y: msg.fy * vh }, deps).catch(() => void 0);
+            void tick();
           } else if (msg.type === "key" && typeof msg.key === "string") {
             await browserSidecarCall("key", { key: msg.key }, deps).catch(() => void 0);
+            void tick();
           } else if (msg.type === "scroll" && typeof msg.dy === "number") {
             await browserSidecarCall("scroll", { dy: msg.dy }, deps).catch(() => void 0);
+            void tick();
           }
         },
         close: () => {
-          offEvent();
+          if (timer)
+            clearInterval(timer);
+          timer = null;
           dataSubs.clear();
-          void browserSidecarCall("stopScreencast", {}, deps).catch(() => void 0);
         }
       };
     }
@@ -138876,7 +138773,7 @@ function buildTerminalTool() {
   });
 }
 function runCommand(proc, command, marker, timeoutMs) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     let acc = "";
     let settled = false;
     const finish = (exitCode, timedOut) => {
@@ -138885,7 +138782,7 @@ function runCommand(proc, command, marker, timeoutMs) {
       settled = true;
       unsub();
       clearTimeout(timer);
-      resolve12({ output: cleanOutput(acc, command, marker), exitCode, timedOut });
+      resolve13({ output: cleanOutput(acc, command, marker), exitCode, timedOut });
     };
     const unsub = proc.onData((d2) => {
       acc += d2;
@@ -139032,7 +138929,7 @@ async function installPluginPackage(opts) {
   await ensurePackageJson(dir);
   const { exitCode, stderr } = await runNpm(["install", "--prefix", dir, "--no-fund", "--no-audit", "--save", spec], opts.signal);
   if (exitCode !== 0) {
-    throw new Error(`npm install failed (exit ${exitCode}): ${truncate9(stderr, 400)}`);
+    throw new Error(`npm install failed (exit ${exitCode}): ${truncate6(stderr, 400)}`);
   }
   return { installed: spec, dir };
 }
@@ -139042,7 +138939,7 @@ async function removePluginPackage(opts) {
   await ensurePackageJson(dir);
   const { exitCode, stderr } = await runNpm(["uninstall", "--prefix", dir, "--no-fund", "--no-audit", "--save", spec], opts.signal);
   if (exitCode !== 0) {
-    throw new Error(`npm uninstall failed (exit ${exitCode}): ${truncate9(stderr, 400)}`);
+    throw new Error(`npm uninstall failed (exit ${exitCode}): ${truncate6(stderr, 400)}`);
   }
   return { removed: spec, dir };
 }
@@ -139131,7 +139028,7 @@ async function ensurePackageJson(dir) {
   }
 }
 function runNpm(args, signal) {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     if (signal?.aborted) {
       reject(new Error("npm aborted before start"));
       return;
@@ -139157,11 +139054,11 @@ function runNpm(args, signal) {
     });
     child.on("close", (code) => {
       signal?.removeEventListener("abort", onAbort);
-      resolve12({ exitCode: code ?? -1, stdout, stderr });
+      resolve13({ exitCode: code ?? -1, stdout, stderr });
     });
   });
 }
-function truncate9(s2, n2) {
+function truncate6(s2, n2) {
   return s2.length <= n2 ? s2 : s2.slice(0, n2 - 1) + "\u2026";
 }
 function buildDisablePluginTool(deps) {
@@ -139311,6 +139208,7 @@ function buildSearchPluginsTool(opts = {}) {
   });
 }
 var import_yaml = __toESM(require_dist());
+var configMutex2 = createMutex();
 function defaultUserConfigPath() {
   return moxxyPath("config.yaml");
 }
@@ -139325,21 +139223,27 @@ async function loadDisabledPackageNames(opts = {}) {
 }
 async function setPluginEnabled(packageName, enabled, opts = {}) {
   const configPath = opts.configPath ?? defaultUserConfigPath();
-  const config = await readUserConfig(configPath);
-  const plugins = { ...config.plugins ?? {} };
-  plugins[packageName] = { ...plugins[packageName] ?? {}, enabled };
-  await writeUserConfig(configPath, { ...config, plugins });
+  await configMutex2.run(async () => {
+    const config = await readUserConfig(configPath);
+    const plugins = { ...config.plugins ?? {} };
+    plugins[packageName] = { ...plugins[packageName] ?? {}, enabled };
+    await writeUserConfig(configPath, { ...config, plugins });
+  });
 }
 async function clearPluginState(packageName, opts = {}) {
   const configPath = opts.configPath ?? defaultUserConfigPath();
-  const config = await readUserConfig(configPath);
-  if (!config.plugins || !(packageName in config.plugins))
-    return;
-  const plugins = { ...config.plugins };
-  delete plugins[packageName];
-  await writeUserConfig(configPath, {
-    ...config,
-    ...Object.keys(plugins).length > 0 ? { plugins } : { plugins: void 0 }
+  await configMutex2.run(async () => {
+    const config = await readUserConfig(configPath);
+    if (!config.plugins || !(packageName in config.plugins))
+      return;
+    const plugins = { ...config.plugins };
+    delete plugins[packageName];
+    const next = { ...config };
+    if (Object.keys(plugins).length > 0)
+      next.plugins = plugins;
+    else
+      delete next.plugins;
+    await writeUserConfig(configPath, next);
   });
 }
 async function readUserConfig(configPath) {
@@ -139386,21 +139290,11 @@ function buildPluginsAdminPlugin(opts) {
 }
 function buildProviderDef(entry) {
   if (entry.kind === "openai-compat") {
-    return defineProvider({
+    return defineOpenAICompatProvider({
       name: entry.name,
-      models: entry.models,
-      createClient: (config) => new OpenAIProvider({
-        ...config,
-        // The vendor's registered slug, NOT 'openai' — usage stats,
-        // provider_request/response events and error context all read
-        // `provider.name`, so without this every runtime vendor was
-        // misattributed to OpenAI.
-        name: entry.name,
-        baseURL: entry.baseURL,
-        defaultModel: entry.defaultModel,
-        models: entry.models
-      }),
-      validateKey: (key) => validateKey2(key, { baseURL: entry.baseURL })
+      baseURL: entry.baseURL,
+      defaultModel: entry.defaultModel,
+      models: entry.models
     });
   }
   throw new MoxxyError({
@@ -139441,9 +139335,9 @@ async function readProvidersConfig(filePath = providersConfigPath()) {
 async function writeProvidersConfig(cfg, filePath = providersConfigPath()) {
   await writeFileAtomic(filePath, JSON.stringify(cfg, null, 2) + "\n");
 }
-var writeMutex = createMutex();
+var writeMutex3 = createMutex();
 async function upsertStoredProvider(entry, filePath = providersConfigPath()) {
-  return writeMutex.run(async () => {
+  return writeMutex3.run(async () => {
     const cfg = await readProvidersConfig(filePath);
     const next = cfg.providers.filter((p3) => p3.name !== entry.name);
     next.push(entry);
@@ -139453,7 +139347,7 @@ async function upsertStoredProvider(entry, filePath = providersConfigPath()) {
   });
 }
 async function removeStoredProvider(name, filePath = providersConfigPath()) {
-  return writeMutex.run(async () => {
+  return writeMutex3.run(async () => {
     const cfg = await readProvidersConfig(filePath);
     const next = cfg.providers.filter((p3) => p3.name !== name);
     if (next.length === cfg.providers.length)
@@ -139477,6 +139371,15 @@ async function storedProviderApiKeyName(providerName2, configPath) {
 }
 
 // ../plugin-provider-admin/dist/index.js
+function getWarnLogger(ctx) {
+  if (typeof ctx !== "object" || ctx === null)
+    return void 0;
+  const candidate = ctx.logger;
+  if (typeof candidate === "object" && candidate !== null && typeof candidate.warn === "function") {
+    return candidate;
+  }
+  return void 0;
+}
 var PROVIDER_NAME_RE = /^[a-z][a-z0-9-]*$/;
 var providerNameSchema = z$1.string().min(1).max(60).regex(PROVIDER_NAME_RE, "name must be slug-like (lowercase letters, digits, hyphens; must start with a letter)");
 var modelDescriptorSchema = z$1.object({
@@ -139511,8 +139414,15 @@ var testProviderInput = z$1.object({
 });
 function buildProviderAdminPluginWithApi(opts) {
   const { providerRegistry, configPath } = opts;
+  const builtinNames = reservedBuiltinNames(providerRegistry);
   const api = {
     configure: async (name, patch) => {
+      if (builtinNames.has(name)) {
+        throw new MoxxyError({
+          code: "CONFIG_INVALID",
+          message: `provider-admin: "${name}" is a built-in provider and cannot be reconfigured here \u2014 built-ins are code. Only runtime-registered (providers.json) providers are editable.`
+        });
+      }
       const cfg = await readProvidersConfig(configPath);
       const entry = cfg.providers.find((p3) => p3.name === name);
       if (!entry) {
@@ -139554,8 +139464,12 @@ function buildProviderAdminPluginWithApi(opts) {
   };
   return { plugin: buildProviderAdminPlugin(opts), api };
 }
+function reservedBuiltinNames(providerRegistry) {
+  return new Set(providerRegistry.list().map((p3) => p3.name));
+}
 function buildProviderAdminPlugin(opts) {
   const { providerRegistry, configPath } = opts;
+  const builtinNames = reservedBuiltinNames(providerRegistry);
   return definePlugin({
     name: "@moxxy/plugin-provider-admin",
     version: "0.0.0",
@@ -139566,6 +139480,12 @@ function buildProviderAdminPlugin(opts) {
         inputSchema: addProviderInput,
         permission: { action: "prompt" },
         handler: async (input) => {
+          if (builtinNames.has(input.name)) {
+            throw new MoxxyError({
+              code: "CONFIG_INVALID",
+              message: `provider_add: "${input.name}" is a built-in provider and cannot be shadowed or redirected. Pick a different slug for your OpenAI-compatible vendor (e.g. "${input.name}-compat").`
+            });
+          }
           const entry = {
             kind: "openai-compat",
             name: input.name,
@@ -139671,18 +139591,22 @@ function buildProviderAdminPlugin(opts) {
     ],
     hooks: {
       onInit: async (ctx) => {
-        const log = ctx.logger;
+        const log = getWarnLogger(ctx);
         let cfg;
         try {
           cfg = await readProvidersConfig(configPath);
         } catch (err) {
-          log?.warn?.("provider-admin: failed to read providers.json", {
+          log?.warn("provider-admin: failed to read providers.json", {
             err: err instanceof Error ? err.message : String(err)
           });
           return;
         }
         for (const entry of cfg.providers) {
           try {
+            if (builtinNames.has(entry.name)) {
+              log?.warn(`provider-admin: skipping stored provider "${entry.name}" \u2014 it collides with a built-in`);
+              continue;
+            }
             const def = buildProviderDef(entry);
             const already = providerRegistry.list().some((p3) => p3.name === entry.name);
             if (already)
@@ -139690,7 +139614,7 @@ function buildProviderAdminPlugin(opts) {
             else
               providerRegistry.register(def);
           } catch (err) {
-            log?.warn?.(`provider-admin: failed to register "${entry.name}"`, {
+            log?.warn(`provider-admin: failed to register "${entry.name}"`, {
               err: err instanceof Error ? err.message : String(err)
             });
           }
@@ -139867,11 +139791,6 @@ function trimFixed2(value) {
 function plural2(count, noun) {
   return count === 1 ? noun : `${noun}s`;
 }
-function countNodes2(node) {
-  if (node.kind === "text")
-    return 1;
-  return 1 + node.children.reduce((sum, c2) => sum + countNodes2(c2), 0);
-}
 function buildViewPlugin(opts) {
   const presentView = defineTool({
     name: "present_view",
@@ -139896,7 +139815,7 @@ function buildViewPlugin(opts) {
         rendered: surface != null,
         ...surface?.url ? { url: surface.url } : {},
         ...viewId ? { viewId } : {},
-        nodeCount: countNodes2(result.doc.root),
+        nodeCount: countNodes(result.doc.root),
         ast: result.doc
       };
     }
@@ -139909,7 +139828,7 @@ function buildViewPlugin(opts) {
 }
 var IS_DARWIN = process.platform === "darwin";
 function runProcess(cmd, args, opts = {}) {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     const child = spawn(cmd, [...args], { stdio: ["pipe", "pipe", "pipe"] });
     let stdout = Buffer.alloc(0);
     let stderr = "";
@@ -139953,7 +139872,7 @@ function runProcess(cmd, args, opts = {}) {
       if (timer)
         clearTimeout(timer);
       opts.signal?.removeEventListener("abort", onAbort);
-      resolve12({
+      resolve13({
         exitCode: code ?? -1,
         stdout: stdout.toString("utf8"),
         stderr
@@ -141499,14 +141418,14 @@ var WebhookServer = class {
       });
     });
     this.server = server;
-    await new Promise((resolve12, reject) => {
+    await new Promise((resolve13, reject) => {
       server.once("error", reject);
       server.listen(this.opts.port, this.opts.host, () => {
         this.opts.logger?.info?.("webhooks: listening", {
           host: this.opts.host,
           port: this.opts.port
         });
-        resolve12();
+        resolve13();
       });
     });
     return {
@@ -141520,7 +141439,7 @@ var WebhookServer = class {
       return;
     const s2 = this.server;
     this.server = null;
-    await new Promise((resolve12) => s2.close(() => resolve12()));
+    await new Promise((resolve13) => s2.close(() => resolve13()));
   }
   async handle(req, res) {
     const url2 = req.url ?? "/";
@@ -142715,23 +142634,34 @@ var inprocIsolator = {
     }
     if (caps.timeMs === void 0)
       return handler(call.input);
-    return new Promise((resolve12, reject) => {
+    const internal = new AbortController();
+    const handlerSignal = internal.signal;
+    const onExternalAbort = () => {
+      if (!internal.signal.aborted) {
+        internal.abort(signal.reason ?? new Error(`[security:inproc] tool '${call.toolName}' aborted`));
+      }
+    };
+    return new Promise((resolve13, reject) => {
       if (signal.aborted) {
+        onExternalAbort();
         reject(new Error(`[security:inproc] tool '${call.toolName}' aborted`));
         return;
       }
       const timer = setTimeout(() => {
-        reject(new Error(`[security:inproc] tool '${call.toolName}' exceeded ${caps.timeMs}ms budget`));
+        const budgetErr = new Error(`[security:inproc] tool '${call.toolName}' exceeded ${caps.timeMs}ms budget`);
+        internal.abort(budgetErr);
+        reject(budgetErr);
       }, caps.timeMs);
       const onAbort = () => {
         clearTimeout(timer);
+        onExternalAbort();
         reject(new Error(`[security:inproc] tool '${call.toolName}' aborted`));
       };
       signal.addEventListener("abort", onAbort, { once: true });
-      handler(call.input).then((out) => {
+      runHandler(handler, call.input, handlerSignal).then((out) => {
         clearTimeout(timer);
         signal.removeEventListener("abort", onAbort);
-        resolve12(out);
+        resolve13(out);
       }, (err) => {
         clearTimeout(timer);
         signal.removeEventListener("abort", onAbort);
@@ -142740,6 +142670,9 @@ var inprocIsolator = {
     });
   }
 };
+function runHandler(handler, input, signal) {
+  return Promise.resolve(handler(input, signal));
+}
 
 // ../plugin-security/dist/registry.js
 var IsolatorRegistry2 = class {
@@ -142760,6 +142693,8 @@ var IsolatorRegistry2 = class {
     return [...this.impls.values()];
   }
 };
+var MAX_BROKER_OUTPUT_BYTES = 8 * 1024 * 1024;
+var MAX_FETCH_REDIRECTS = 5;
 var BLOCKED_HANDLER_MODULES = Object.freeze([
   "node:fs",
   "node:fs/promises",
@@ -142828,16 +142763,78 @@ async function dispatch2(req, ctx) {
     }
   }
 }
+async function realpathInScope(filePath, caps, cwd2, mode, label3) {
+  if (!pathInScope(filePath, caps.fs, cwd2, mode)) {
+    throw new Error(`[${label3}] path '${filePath}' is outside the tool's declared fs.${mode} capability`);
+  }
+  const abs = path3.isAbsolute(filePath) ? path3.normalize(filePath) : path3.resolve(cwd2, filePath);
+  let real;
+  try {
+    real = await promises.realpath(abs);
+  } catch {
+    real = await realpathDeepest(abs);
+  }
+  if (real === abs)
+    return real;
+  const globs = mode === "read" ? caps.fs?.read : caps.fs?.write;
+  const allowed = await canonicalScopeRoots(globs ?? [], cwd2);
+  if (!allowed.some((root) => isWithin(real, root))) {
+    throw new Error(`[${label3}] path '${filePath}' resolves (via symlink) to '${real}', outside the tool's declared fs.${mode} capability`);
+  }
+  return real;
+}
+async function canonicalScopeRoots(globs, cwd2) {
+  const roots = [];
+  for (const glob of globs) {
+    const expanded = expandPattern(glob, cwd2);
+    const wildcard = expanded.search(/[*?[]/);
+    const literal3 = wildcard === -1 ? expanded : expanded.slice(0, wildcard);
+    const base2 = literal3.endsWith(path3.sep) ? literal3.slice(0, -1) : path3.dirname(literal3);
+    const normalized = path3.normalize(base2 || path3.sep);
+    try {
+      roots.push(await promises.realpath(normalized));
+    } catch {
+      roots.push(await realpathDeepest(normalized));
+    }
+  }
+  return roots;
+}
+function expandPattern(pattern, cwd2) {
+  if (pattern.startsWith("$cwd"))
+    return path3.normalize(cwd2 + pattern.slice("$cwd".length));
+  if (pattern.startsWith("~/")) {
+    const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
+    return path3.normalize(home + pattern.slice(1));
+  }
+  return path3.isAbsolute(pattern) ? path3.normalize(pattern) : path3.resolve(cwd2, pattern);
+}
+function isWithin(child, root) {
+  if (child === root)
+    return true;
+  const withSep = root.endsWith(path3.sep) ? root : root + path3.sep;
+  return child.startsWith(withSep);
+}
+async function realpathDeepest(abs) {
+  const parts = abs.split(path3.sep);
+  for (let i2 = parts.length; i2 > 0; i2--) {
+    const candidate = parts.slice(0, i2).join(path3.sep) || path3.sep;
+    try {
+      const real = await promises.realpath(candidate);
+      const remainder = parts.slice(i2);
+      return remainder.length ? path3.join(real, ...remainder) : real;
+    } catch {
+    }
+  }
+  return abs;
+}
 async function brokerReadFile(args, { caps, cwd: cwd2 }) {
   const filePath = args[0];
   if (typeof filePath !== "string") {
     throw new Error("[broker:fs.readFile] expected (path: string) at args[0]");
   }
-  if (!pathInScope(filePath, caps.fs, cwd2, "read")) {
-    throw new Error(`[broker:fs.readFile] path '${filePath}' is outside the tool's declared fs.read capability`);
-  }
+  const real = await realpathInScope(filePath, caps, cwd2, "read", "broker:fs.readFile");
   const opts = args[1] ?? {};
-  const buf = await promises.readFile(filePath);
+  const buf = await promises.readFile(real);
   return buf.toString(opts.encoding ?? "utf8");
 }
 async function brokerWriteFile(args, { caps, cwd: cwd2 }) {
@@ -142849,31 +142846,25 @@ async function brokerWriteFile(args, { caps, cwd: cwd2 }) {
   if (typeof data !== "string") {
     throw new Error("[broker:fs.writeFile] expected (data: string) at args[1]");
   }
-  if (!pathInScope(filePath, caps.fs, cwd2, "write")) {
-    throw new Error(`[broker:fs.writeFile] path '${filePath}' is outside the tool's declared fs.write capability`);
-  }
-  await promises.mkdir(path3.dirname(filePath), { recursive: true });
-  await promises.writeFile(filePath, data, "utf8");
+  const real = await realpathInScope(filePath, caps, cwd2, "write", "broker:fs.writeFile");
+  await promises.mkdir(path3.dirname(real), { recursive: true });
+  await promises.writeFile(real, data, "utf8");
 }
 async function brokerReaddir(args, { caps, cwd: cwd2 }) {
   const dirPath = args[0];
   if (typeof dirPath !== "string") {
     throw new Error("[broker:fs.readdir] expected (path: string) at args[0]");
   }
-  if (!pathInScope(dirPath, caps.fs, cwd2, "read")) {
-    throw new Error(`[broker:fs.readdir] path '${dirPath}' is outside the tool's declared fs.read capability`);
-  }
-  return await promises.readdir(dirPath);
+  const real = await realpathInScope(dirPath, caps, cwd2, "read", "broker:fs.readdir");
+  return await promises.readdir(real);
 }
 async function brokerStat(args, { caps, cwd: cwd2 }) {
   const filePath = args[0];
   if (typeof filePath !== "string") {
     throw new Error("[broker:fs.stat] expected (path: string) at args[0]");
   }
-  if (!pathInScope(filePath, caps.fs, cwd2, "read")) {
-    throw new Error(`[broker:fs.stat] path '${filePath}' is outside the tool's declared fs.read capability`);
-  }
-  const st3 = await promises.stat(filePath);
+  const real = await realpathInScope(filePath, caps, cwd2, "read", "broker:fs.stat");
+  const st3 = await promises.stat(real);
   return {
     size: st3.size,
     mtimeMs: st3.mtimeMs,
@@ -142890,13 +142881,34 @@ async function brokerFetch(args, { caps, signal }) {
     throw new Error(`[broker:fetch] URL '${url2}' is outside the tool's declared net capability`);
   }
   const init3 = args[1] ?? {};
-  const res = await fetch(url2, {
-    method: init3.method ?? "GET",
-    ...init3.headers ? { headers: init3.headers } : {},
-    ...init3.body !== void 0 ? { body: init3.body } : {},
-    signal
-  });
-  const body = await res.text();
+  let current = url2;
+  let res;
+  for (let hop = 0; ; hop++) {
+    res = await fetch(current, {
+      method: init3.method ?? "GET",
+      ...init3.headers ? { headers: init3.headers } : {},
+      ...init3.body !== void 0 ? { body: init3.body } : {},
+      redirect: "manual",
+      signal
+    });
+    const location = res.status >= 300 && res.status < 400 ? res.headers.get("location") : null;
+    if (!location)
+      break;
+    if (hop >= MAX_FETCH_REDIRECTS) {
+      throw new Error(`[broker:fetch] too many redirects (>${MAX_FETCH_REDIRECTS}) starting from '${url2}'`);
+    }
+    let next;
+    try {
+      next = new URL(location, current).toString();
+    } catch {
+      throw new Error(`[broker:fetch] redirect to unparseable Location '${location}'`);
+    }
+    if (!urlInScope(next, caps.net)) {
+      throw new Error(`[broker:fetch] redirect target '${next}' is outside the tool's declared net capability`);
+    }
+    current = next;
+  }
+  const body = await readBodyCapped(res, MAX_BROKER_OUTPUT_BYTES, url2);
   const headers = {};
   res.headers.forEach((v3, k3) => {
     headers[k3] = v3;
@@ -142908,6 +142920,30 @@ async function brokerFetch(args, { caps, signal }) {
     body
   };
 }
+async function readBodyCapped(res, maxBytes, url2) {
+  const reader = res.body?.getReader();
+  if (!reader)
+    return res.text();
+  const chunks = [];
+  let total = 0;
+  try {
+    for (; ; ) {
+      const { done, value } = await reader.read();
+      if (done)
+        break;
+      if (value) {
+        total += value.byteLength;
+        if (total > maxBytes) {
+          throw new Error(`[broker:fetch] response body from '${url2}' exceeded the ${maxBytes}-byte limit`);
+        }
+        chunks.push(value);
+      }
+    }
+  } finally {
+    reader.cancel().catch(() => void 0);
+  }
+  return Buffer.concat(chunks).toString("utf8");
+}
 var BROKER_DEFAULT_ENV = ["PATH", "HOME", "USER", "SHELL", "LANG", "LC_ALL", "TERM"];
 function buildBrokerEnv(caps, optsEnv) {
   const allow = caps.env ?? BROKER_DEFAULT_ENV;
@@ -142936,7 +142972,7 @@ async function brokerExec(args, { caps, cwd: cwd2, signal }) {
       throw new Error(`[broker:exec] command '${command}' is outside the tool's declared commands allowlist`);
     }
   }
-  return await new Promise((resolve12, reject) => {
+  return await new Promise((resolve13, reject) => {
     const child = spawn(command, [...argv], {
       cwd: opts.cwd ?? cwd2,
       // Filter the parent env through the tool's `caps.env` allowlist (or a
@@ -142946,33 +142982,49 @@ async function brokerExec(args, { caps, cwd: cwd2, signal }) {
       env: buildBrokerEnv(caps, opts.env),
       stdio: ["ignore", "pipe", "pipe"]
     });
-    let out = "";
-    let err = "";
-    child.stdout.on("data", (b3) => {
-      out += b3.toString("utf8");
-    });
-    child.stderr.on("data", (b3) => {
-      err += b3.toString("utf8");
-    });
+    const outChunks = [];
+    const errChunks = [];
+    let total = 0;
+    let settled = false;
     const timer = opts.timeoutMs ? setTimeout(() => {
       child.kill("SIGTERM");
-      reject(new Error(`[broker:exec] '${command}' exceeded ${opts.timeoutMs}ms`));
+      finish(() => reject(new Error(`[broker:exec] '${command}' exceeded ${opts.timeoutMs}ms`)));
     }, opts.timeoutMs) : null;
     const onAbort = () => {
       child.kill("SIGTERM");
     };
-    signal.addEventListener("abort", onAbort, { once: true });
-    child.on("error", (e3) => {
+    const finish = (settle) => {
+      if (settled)
+        return;
+      settled = true;
       if (timer)
         clearTimeout(timer);
       signal.removeEventListener("abort", onAbort);
-      reject(e3);
+      settle();
+    };
+    const accumulate = (chunks, b3) => {
+      if (settled)
+        return;
+      total += b3.byteLength;
+      if (total > MAX_BROKER_OUTPUT_BYTES) {
+        child.kill("SIGTERM");
+        finish(() => reject(new Error(`[broker:exec] '${command}' output exceeded the ${MAX_BROKER_OUTPUT_BYTES}-byte limit`)));
+        return;
+      }
+      chunks.push(b3);
+    };
+    child.stdout.on("data", (b3) => accumulate(outChunks, b3));
+    child.stderr.on("data", (b3) => accumulate(errChunks, b3));
+    signal.addEventListener("abort", onAbort, { once: true });
+    child.on("error", (e3) => {
+      finish(() => reject(e3));
     });
     child.on("close", (exitCode) => {
-      if (timer)
-        clearTimeout(timer);
-      signal.removeEventListener("abort", onAbort);
-      resolve12({ stdout: out, stderr: err, exitCode });
+      finish(() => resolve13({
+        stdout: Buffer.concat(outChunks).toString("utf8"),
+        stderr: Buffer.concat(errChunks).toString("utf8"),
+        exitCode
+      }));
     });
   });
 }
@@ -142994,6 +143046,8 @@ function buildSecurityPlugin(opts) {
     for (const t2 of tools.list()) {
       if (!t2.isolation)
         continue;
+      if (isSecurityWrapped(t2))
+        continue;
       const wrapped = wrapWithIsolator(t2, registry, pickIsolatorName(t2.name));
       if (wrapped !== t2) {
         tools.unregister(t2.name);
@@ -143082,12 +143136,25 @@ function wrapWithIsolator(tool, registry, isolatorName) {
         cwd: ctx.cwd,
         ...moduleRef ? { moduleRef } : {}
       };
-      const bound = (i2) => Promise.resolve(tool.handler(i2, ctx));
+      const bound = (i2, derived) => Promise.resolve(tool.handler(i2, derived ? { ...ctx, signal: derived } : ctx));
       return iso2.run(call, bound, caps, ctx.signal);
     }
   };
+  markWrapped(wrapped);
   return wrapped;
 }
+var WRAPPED_MARKER = "__moxxySecurityWrapped";
+function markWrapped(tool) {
+  Object.defineProperty(tool, WRAPPED_MARKER, {
+    value: true,
+    enumerable: false,
+    configurable: true,
+    writable: false
+  });
+}
+function isSecurityWrapped(tool) {
+  return tool[WRAPPED_MARKER] === true;
+}
 var SHIM_SOURCE = `
 const { parentPort, workerData } = await import('node:worker_threads');
 const { moduleUrl, exportName, input, syntheticCtx, loaderUrl } = workerData;
@@ -143104,8 +143171,21 @@ register(loaderUrl, import.meta.url);
 let nextId = 1;
 const pending = new Map();
 
+// Cooperative-cancel signal handed to the handler as ctx.signal. The
+// parent posts { type: 'abort' } on timeout / host-abort (before the
+// hard worker.terminate()), giving a well-behaved handler that wired
+// ctx.signal into fetch / long loops a chance to bail out and flush.
+const abortController = new AbortController();
+
 parentPort.on('message', (msg) => {
-  if (msg && msg.type === 'broker-response') {
+  if (!msg) return;
+  if (msg.type === 'abort') {
+    abortController.abort(
+      new DOMException('aborted by isolator', 'AbortError'),
+    );
+    return;
+  }
+  if (msg.type === 'broker-response') {
     const p = pending.get(msg.id);
     if (!p) return;
     pending.delete(msg.id);
@@ -143154,7 +143234,7 @@ try {
       turnId: syntheticCtx.turnId,
       callId: syntheticCtx.callId,
       cwd: syntheticCtx.cwd,
-      signal: new AbortController().signal,
+      signal: abortController.signal,
       log: { length: 0, at: () => undefined, slice: () => [], ofType: () => [], byTurn: () => [], toJSON: () => [] },
       logger: { debug: () => {}, info: () => {}, warn: () => {}, error: () => {} },
       fs: broker.fs,
@@ -143210,47 +143290,63 @@ function createWorkerIsolator(opts = {}) {
           maxYoungGenerationSizeMb: Math.max(16, Math.floor(memMb / 4))
         }
       });
-      return new Promise((resolve12, reject) => {
+      return new Promise((resolve13, reject) => {
         const cleanup = /* @__PURE__ */ new Set();
         let settled = false;
-        const finish = (action) => {
+        let terminated = false;
+        const hardTerminate = () => {
+          terminated = true;
+          void worker.terminate();
+        };
+        const finish = (action, graceful = false) => {
           if (settled)
             return;
           settled = true;
           cleanup.forEach((fn) => fn());
           cleanup.clear();
           action();
-          void worker.terminate();
+          if (graceful) {
+            try {
+              worker.postMessage({ type: "abort" });
+            } catch {
+            }
+            const grace = setTimeout(hardTerminate, 150);
+            grace.unref?.();
+          } else {
+            hardTerminate();
+          }
         };
         if (signal.aborted) {
-          finish(() => reject(new Error(`[security:worker] tool '${call.toolName}' aborted`)));
+          finish(() => reject(new Error(`[security:worker] tool '${call.toolName}' aborted`)), true);
           return;
         }
         const timer = setTimeout(() => {
-          finish(() => reject(new Error(`[security:worker] tool '${call.toolName}' exceeded ${timeMs}ms budget`)));
+          finish(() => reject(new Error(`[security:worker] tool '${call.toolName}' exceeded ${timeMs}ms budget`)), true);
         }, timeMs);
         cleanup.add(() => clearTimeout(timer));
         const onAbort = () => {
-          finish(() => reject(new Error(`[security:worker] tool '${call.toolName}' aborted`)));
+          finish(() => reject(new Error(`[security:worker] tool '${call.toolName}' aborted`)), true);
         };
         signal.addEventListener("abort", onAbort, { once: true });
         cleanup.add(() => signal.removeEventListener("abort", onAbort));
         worker.on("message", (msg) => {
-          if (settled)
-            return;
           if (msg.type === "broker-request") {
+            if (terminated)
+              return;
             void handleBrokerRequest(msg, {
               caps,
               cwd: call.cwd,
               signal
             }).then((response) => {
-              if (!settled)
+              if (!terminated)
                 worker.postMessage(response);
             });
             return;
           }
+          if (settled)
+            return;
           if (msg.ok) {
-            finish(() => resolve12(msg.value));
+            finish(() => resolve13(msg.value));
           } else {
             const e3 = new Error(msg.errorMessage);
             e3.name = msg.errorName;
@@ -143370,6 +143466,7 @@ async function runTask() {
 }
 `;
 var DEFAULT_ENV = ["PATH", "HOME", "USER", "SHELL", "LANG", "LC_ALL", "TERM"];
+var KILL_GRACE_MS = 2e3;
 function createSubprocessIsolator(opts = {}) {
   const defaultTimeMs = opts.defaultTimeMs ?? 6e4;
   const envAllowlist = opts.defaultEnvAllowlist ?? DEFAULT_ENV;
@@ -143394,13 +143491,16 @@ function createSubprocessIsolator(opts = {}) {
           env3[key] = v3;
       }
       const child = spawn(nodePath, ["--input-type=module", "-e", SHIM_SOURCE2], {
+        cwd: call.cwd,
         env: env3,
         stdio: ["pipe", "pipe", "pipe"]
       });
-      return new Promise((resolve12, reject) => {
+      return new Promise((resolve13, reject) => {
         let stderr = "";
         let stdoutBuffer = "";
         let settled = false;
+        let exited = false;
+        let killEscalation;
         const cleanup = /* @__PURE__ */ new Set();
         const finish = (action) => {
           if (settled)
@@ -143409,8 +143509,14 @@ function createSubprocessIsolator(opts = {}) {
           cleanup.forEach((fn) => fn());
           cleanup.clear();
           action();
-          if (!child.killed)
+          if (!exited) {
             child.kill("SIGTERM");
+            killEscalation = setTimeout(() => {
+              if (!exited)
+                child.kill("SIGKILL");
+            }, KILL_GRACE_MS);
+            killEscalation.unref?.();
+          }
         };
         if (signal.aborted) {
           finish(() => reject(new Error(`[security:subprocess] tool '${call.toolName}' aborted`)));
@@ -143463,7 +143569,7 @@ function createSubprocessIsolator(opts = {}) {
             return;
           }
           if (msg.ok) {
-            finish(() => resolve12(msg.value));
+            finish(() => resolve13(msg.value));
           } else {
             const e3 = new Error(msg.errorMessage);
             e3.name = msg.errorName;
@@ -143496,6 +143602,9 @@ function createSubprocessIsolator(opts = {}) {
           finish(() => reject(e3 instanceof Error ? e3 : new Error(String(e3))));
         });
         child.once("exit", (code) => {
+          exited = true;
+          if (killEscalation)
+            clearTimeout(killEscalation);
           if (!settled) {
             const msg = stderr.trim() || `subprocess exited with code ${code}`;
             finish(() => reject(new Error(`[security:subprocess] '${call.toolName}': ${msg}`)));
@@ -143618,21 +143727,29 @@ function buildWasmHostImports(memoryHolder, caps, cwd2) {
       }
     },
     /**
-     * `broker_fs_write_file(pathPtr, pathLen, dataPtr, dataLen) -> i32`
-     * Writes UTF-8 bytes to a file. No out-pointer pair (no result data).
-     * Returns 0 on success, 1 on cap-deny or IO error.
+     * `broker_fs_write_file(pathPtr, pathLen, dataPtr, dataLen, outPtrOut, outLenOut) -> i32`
+     *
+     * Slightly extended ABI (6 args instead of 4) because the write
+     * carries both a path string and a data payload, and — like every
+     * other bridge — surfaces a descriptive error to the caller on
+     * failure. On success no result bytes are produced (the host still
+     * writes a zero-length `(0, 0)` pair to the out-pointers). On
+     * cap-deny or IO error the out-pointer pair points at the error
+     * message bytes. Returns 0 on success, 1 on error.
      */
-    broker_fs_write_file: (pathPtr, pathLen, dataPtr, dataLen) => {
+    broker_fs_write_file: (pathPtr, pathLen, dataPtr, dataLen, outPtrOut, outLenOut) => {
       const filePath = readStr(pathPtr, pathLen);
       const data = readStr(dataPtr, dataLen);
-      if (!pathInScope(filePath, caps.fs, cwd2, "write"))
-        return ERROR;
+      if (!pathInScope(filePath, caps.fs, cwd2, "write")) {
+        return sendErr(outPtrOut, outLenOut, `[broker:fs.writeFile] path '${filePath}' is outside the tool's declared fs.write capability`);
+      }
       try {
         mkdirSync(path3.dirname(filePath), { recursive: true });
         writeFileSync(filePath, data, "utf8");
+        writePtrPair(memOf(), outPtrOut, outLenOut, 0, 0);
         return SUCCESS;
-      } catch {
-        return ERROR;
+      } catch (e3) {
+        return sendErr(outPtrOut, outLenOut, `[broker:fs.writeFile] ${e3.message}`);
       }
     },
     /**
@@ -145917,7 +146034,7 @@ async function runCmd2(deps, name) {
   return { kind: "text", text: `${head}
 ${steps}
 
-${truncate10(result.output, 1200)}` };
+${truncate7(result.output, 1200)}` };
 }
 async function toggleCmd(deps, name, enabled) {
   if (!name)
@@ -146037,7 +146154,7 @@ ${stepLines}`;
     return null;
   }
 }
-function truncate10(s2, max) {
+function truncate7(s2, max) {
   return s2.length > max ? `${s2.slice(0, max)}
 \u2026 (truncated)` : s2;
 }
@@ -147877,10 +147994,7 @@ function readCache(file) {
 }
 function writeCache(file, value) {
   try {
-    mkdirSync(path3.dirname(file), { recursive: true });
-    const tmp = `${file}.tmp-${process.pid}`;
-    writeFileSync(tmp, JSON.stringify(value, null, 2));
-    renameSync(tmp, file);
+    writeFileAtomicSync(file, JSON.stringify(value, null, 2));
   } catch {
   }
 }
@@ -148179,7 +148293,7 @@ function readStdinLine() {
   const queued = lineQueue.shift();
   if (queued !== void 0) return Promise.resolve(queued);
   if (stdinEnded) return Promise.resolve("");
-  return new Promise((resolve12) => lineWaiters.push(resolve12));
+  return new Promise((resolve13) => lineWaiters.push(resolve13));
 }
 async function stdinLinePrompt(question, opts) {
   process.stdout.write(encodeLoginPrompt({ question, mask: opts?.mask === true }));
@@ -148335,8 +148449,8 @@ function titleCase(s2) {
 // src/commands/run-tui.ts
 async function killStaleRunnerAt(socketPath) {
   if (!existsSync(socketPath)) return;
-  const pid = await new Promise((resolve12) => {
-    if (process.platform === "win32") return resolve12(null);
+  const pid = await new Promise((resolve13) => {
+    if (process.platform === "win32") return resolve13(null);
     let out = "";
     try {
       const child = spawn("lsof", ["-t", socketPath], {
@@ -148345,13 +148459,13 @@ async function killStaleRunnerAt(socketPath) {
       child.stdout.on("data", (b3) => {
         out += b3.toString();
       });
-      child.on("error", () => resolve12(null));
+      child.on("error", () => resolve13(null));
       child.on("close", () => {
         const parsed = parseInt(out.trim().split("\n")[0] ?? "", 10);
-        resolve12(Number.isFinite(parsed) && parsed > 0 ? parsed : null);
+        resolve13(Number.isFinite(parsed) && parsed > 0 ? parsed : null);
       });
     } catch {
-      resolve12(null);
+      resolve13(null);
     }
   });
   if (pid && pid !== process.pid) {
@@ -148632,6 +148746,7 @@ var HELP2 = formatHelp({
   ]
 });
 var AUDIT_PATH = () => path3.join(os5.homedir(), ".moxxy", "skills", ".meta", "created.jsonl");
+var auditMutex = createMutex();
 async function runSkillsCommand(argv) {
   const sub = argv.positional[0] ?? "list";
   if (sub === "help" || helpRequested(argv)) {
@@ -148704,7 +148819,7 @@ async function runAudit(argv) {
     for (const group of groups) {
       const header = group.length === 1 ? "" : colors.dim(`  \xB7 ${group.length} similar`);
       process.stdout.write(`
-${colors.bold(truncate11(group[0].originatingPrompt, 80))}${header}
+${colors.bold(truncate8(group[0].originatingPrompt, 80))}${header}
 `);
       for (const e3 of group) {
         process.stdout.write(
@@ -148784,20 +148899,22 @@ async function readAuditLog() {
   }
 }
 async function removeAuditEntry(slug) {
-  try {
-    const text = await promises.readFile(AUDIT_PATH(), "utf8");
-    const kept = text.split("\n").filter((line) => {
-      if (!line.trim()) return false;
-      try {
-        const e3 = JSON.parse(line);
-        return e3.slug !== slug;
-      } catch {
-        return true;
-      }
-    }).join("\n");
-    await promises.writeFile(AUDIT_PATH(), kept + (kept ? "\n" : ""));
-  } catch {
-  }
+  await auditMutex.run(async () => {
+    try {
+      const text = await promises.readFile(AUDIT_PATH(), "utf8");
+      const kept = text.split("\n").filter((line) => {
+        if (!line.trim()) return false;
+        try {
+          const e3 = JSON.parse(line);
+          return e3.slug !== slug;
+        } catch {
+          return true;
+        }
+      }).join("\n");
+      await writeFileAtomic(AUDIT_PATH(), kept + (kept ? "\n" : ""));
+    } catch {
+    }
+  });
 }
 function groupSimilarPrompts(entries) {
   const groups = [];
@@ -148820,7 +148937,7 @@ function groupSimilarPrompts(entries) {
 function tokenize8(s2) {
   return s2.toLowerCase().split(/[^a-z0-9_-]+/).filter((t2) => t2.length >= 3);
 }
-function truncate11(s2, n2) {
+function truncate8(s2, n2) {
   return s2.length <= n2 ? s2 : s2.slice(0, n2 - 1) + "\u2026";
 }
 var HELP3 = `moxxy plugins new \u2014 scaffold a new user-scope plugin
@@ -152132,14 +152249,14 @@ var HELP14 = formatHelp({
 async function runCommand2(cmd) {
   const [bin, ...args] = cmd;
   if (!bin) return 1;
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     const proc = spawn(bin, args, {
       stdio: "inherit",
       // npm/pnpm/yarn/bun are `.cmd` shims on Windows — needs a shell to launch.
       shell: process.platform === "win32"
     });
-    proc.on("error", () => resolve12(127));
-    proc.on("exit", (code) => resolve12(code ?? 1));
+    proc.on("error", () => resolve13(127));
+    proc.on("exit", (code) => resolve13(code ?? 1));
   });
 }
 async function runUpdateCommand(argv, deps = {}) {