@moxxy/cli 0.13.0 → 0.13.2

package/dist/bin.js

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-import { z as z$1, createMutex, defineTunnelProvider, isCliTunnelAvailable, definePlugin, defineProvider, defineTool, MoxxyError, writeFileAtomic, asTurnId, defineMode, asPluginId, defineCommand, defineChannel, spawnCliTunnel, defineWorkflowExecutor, toFriendlyError, estimateTextTokens, classifyHttpStatus, createStuckLoopDetector, runCompactionIfNeeded, runElisionIfNeeded, collectProviderStream, usageEventFields, isContextOverflowError, emitRequestsAndDetectStuck, executeToolUses, buildSystemPromptWithSkills, projectMessages, defineCompactor, defineCacheStrategy, denyByDefaultResolver, createAllowListResolver, moxxyPath, moxxyHome, zodToJsonSchema, fileDiffSummary, runSingleShotTurn, bearerTokenMatches, resolveChannelToken, rotateChannelToken, defineSurface, estimateContextTokens as estimateContextTokens$1, readRequestBody, isFileDiffDisplay, MOXXY_WS_SUBPROTOCOL, renderFrontmatter, defineEmbedder, migrateModeName, bearerGuard, tokenFromWsProtocolHeader, skillFrontmatterSchema, asSkillId, getInstallHint, parseFrontmatterFile, createDeferredPermissionResolver, writeFileAtomicSync, encodeLoginPrompt, defineTranscriber, summarizeTokensByModel, countNodes, moxxyPackageSchema, classifyNetworkError, addModelTotals, createJsonFileStore, ISOLATION_RANK, fileDiffVerb, parseFrontmatter, 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 { z as z$1, createMutex, defineTunnelProvider, definePlugin, defineProvider, defineTool, MoxxyError, asTurnId, defineMode, asPluginId, defineCommand, defineChannel, defineWorkflowExecutor, toFriendlyError, estimateTextTokens, classifyHttpStatus, createStuckLoopDetector, runCompactionIfNeeded, runElisionIfNeeded, collectProviderStream, usageEventFields, isContextOverflowError, emitRequestsAndDetectStuck, executeToolUses, buildSystemPromptWithSkills, projectMessages, defineCompactor, defineCacheStrategy, denyByDefaultResolver, createAllowListResolver, zodToJsonSchema, fileDiffSummary, runSingleShotTurn, defineSurface, runManualCompaction, isFileDiffDisplay, renderFrontmatter, defineEmbedder, migrateModeName, skillFrontmatterSchema, asSkillId, getInstallHint, parseFrontmatterFile, createDeferredPermissionResolver, encodeLoginPrompt, defineTranscriber, summarizeTokensByModel, countNodes, moxxyPackageSchema, classifyNetworkError, addModelTotals, createJsonFileStore, ISOLATION_RANK, MOXXY_PCM16_24KHZ_MIME, fileDiffVerb, parseFrontmatter, 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 fs32 from 'fs';
-import fs32__default, { existsSync, promises, ReadStream, mkdirSync, statSync, readdirSync, writeFileSync, readFileSync, chmodSync, unlinkSync, watch, createReadStream } from 'fs';
+import fs32__default, { existsSync, promises, ReadStream, mkdirSync, statSync, readdirSync, writeFileSync, readFileSync, unlinkSync, chmodSync, watch, createReadStream } from 'fs';
 import * as path3 from 'path';
 import path3__default, { join, dirname, basename } from 'path';
+import { isCliTunnelAvailable, writeFileAtomic, spawnCliTunnel, moxxyPath, moxxyHome, bearerTokenMatches, resolveChannelToken, rotateChannelToken, readRequestBody, MOXXY_WS_SUBPROTOCOL, bearerGuard, tokenFromWsProtocolHeader, writeFileAtomicSync } from '@moxxy/sdk/server';
 import { z } from 'zod';
 import * as os5 from 'os';
 import os5__default, { homedir, tmpdir, userInfo } from 'os';
@@ -14,7 +15,7 @@ import Stream, { Readable as Readable$1, PassThrough as PassThrough$2, Stream as
 import http, { createServer } from 'http';
 import https from 'https';
 import zlib from 'zlib';
-import { webcrypto, randomBytes, createHash, randomUUID, scryptSync, createCipheriv, createDecipheriv, createHmac, timingSafeEqual } from 'crypto';
+import { randomUUID, webcrypto, randomBytes, createHash, scryptSync, createCipheriv, createDecipheriv, createHmac, timingSafeEqual } from 'crypto';
 import 'zod/v3';
 import * as z4mini from 'zod/v4-mini';
 import * as z53 from 'zod/v4';
@@ -223,6 +224,8 @@ var init_log = __esm({
         this.now = opts.now ?? Date.now;
         for (const e3 of seed)
           this.events.push(e3);
+        if (seed.length > 0)
+          this.base = seed[0].seq;
       }
       get length() {
         return this.events.length;
@@ -447,15 +450,20 @@ async function streamChildEventToParent(parentSession, parentTurnId, label3, chi
   const mapped = mapChildEvent(label3, childSessionId, childEvt);
   if (!mapped)
     return;
-  await parentSession.log.append({
-    type: "plugin_event",
-    sessionId: parentSession.id,
-    turnId: parentTurnId,
-    source: "plugin",
-    pluginId: SUBAGENT_PLUGIN_ID,
-    subtype: mapped.subtype,
-    payload: mapped.payload
-  });
+  try {
+    await parentSession.log.append({
+      type: "plugin_event",
+      sessionId: parentSession.id,
+      turnId: parentTurnId,
+      source: "plugin",
+      pluginId: SUBAGENT_PLUGIN_ID,
+      subtype: mapped.subtype,
+      payload: mapped.payload
+    });
+  } catch (err) {
+    process.stderr.write(`moxxy: dropped subagent progress event (${mapped.subtype}) \u2014 parent log append failed: ${err instanceof Error ? err.message : String(err)}
+`);
+  }
 }
 function mapChildEvent(label3, childSessionId, childEvt) {
   const payload = {
@@ -1561,7 +1569,16 @@ var init_providers = __esm({
         if (instance)
           this.instances.set(def.name, instance);
       }
-      /** Overwrite an existing def (also drops the cached instance so the new createClient gets called). */
+      /**
+       * Overwrite an existing def (also drops the cached instance so the new
+       * createClient gets called).
+       *
+       * Invariant: replacing the ACTIVE provider's def leaves `active` pointing at
+       * it but with no cached instance, so `getActive()` throws until the caller
+       * rebuilds the instance. Callers replacing the active provider MUST follow
+       * with `setActive(name, config)` (replace can't rebuild itself — it has no
+       * config). The sole production caller does exactly that.
+       */
       replace(def, instance) {
         this.defs.set(def.name, def);
         this.instances.delete(def.name);
@@ -1654,8 +1671,12 @@ var init_modes = __esm({
       }
       replace(mode) {
         this.modes.set(mode.name, mode);
-        if (!this.active)
+        if (!this.active) {
           this.activate(mode);
+        } else if (this.active === mode.name) {
+          for (const fn of this.changeListeners)
+            fn();
+        }
       }
       /**
        * Remove a mode. If it was active, the active slot is cleared —
@@ -1994,16 +2015,17 @@ function coerceValue(tag2, name, value, spec, errors2) {
     }
     return num;
   }
+  const decoded = decodeEntities(value);
   if (spec.type === "enum") {
-    if (!spec.values?.includes(value)) {
+    if (!spec.values?.includes(decoded)) {
       errors2.push({ message: `<${tag2}> attribute "${name}" must be one of: ${spec.values?.join(", ")}` });
     }
-    return value;
+    return decoded;
   }
-  if ((name === "href" || name === "src") && !isSafeViewUrl(value, name)) {
+  if ((name === "href" || name === "src") && !isSafeViewUrl(decoded, name)) {
     errors2.push({ message: `<${tag2}> attribute "${name}" has a disallowed URL scheme` });
   }
-  return value;
+  return decoded;
 }
 function coerceAttrs(b3, spec, errors2) {
   const out = {};
@@ -2015,7 +2037,8 @@ function coerceAttrs(b3, spec, errors2) {
     }
     const aspec = spec?.attrs[a2.name];
     if (!aspec) {
-      errors2.push({ message: `<${b3.tag}> unknown attribute "${a2.name}"` });
+      if (spec)
+        errors2.push({ message: `<${b3.tag}> unknown attribute "${a2.name}"` });
       continue;
     }
     seen.add(a2.name);
@@ -2229,10 +2252,13 @@ var init_localhost = __esm({
   "../core/dist/tunnel/localhost.js"() {
     localhostTunnel = defineTunnelProvider({
       name: "localhost",
-      open: (opts) => Promise.resolve({
-        url: `http://${opts.host}:${opts.port}`,
-        close: () => Promise.resolve()
-      }),
+      open: (opts) => {
+        const host = opts.host.includes(":") ? `[${opts.host}]` : opts.host;
+        return Promise.resolve({
+          url: `http://${host}:${opts.port}`,
+          close: () => Promise.resolve()
+        });
+      },
       isAvailable: () => Promise.resolve(true)
     });
   }
@@ -3092,7 +3118,7 @@ function matchRule(rule, call, intent) {
     if (!input || typeof input !== "object")
       return false;
     for (const [k3, v3] of Object.entries(rule.inputMatches)) {
-      const candidate = String(input[k3] ?? "");
+      const candidate = stringifyCandidate(input[k3]);
       let re2;
       try {
         re2 = new RegExp(v3);
@@ -3108,6 +3134,18 @@ function matchRule(rule, call, intent) {
   }
   return true;
 }
+function stringifyCandidate(value) {
+  if (value === null || value === void 0)
+    return "";
+  if (typeof value === "object") {
+    try {
+      return JSON.stringify(value) ?? "";
+    } catch {
+      return String(value);
+    }
+  }
+  return String(value);
+}
 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)";
@@ -3760,7 +3798,16 @@ async function loadDir(dir, scope, logger) {
     if (!entry.isFile() || !entry.name.endsWith(".md"))
       continue;
     const full = path3.join(dir, entry.name);
-    const raw = await promises.readFile(full, "utf8");
+    let raw;
+    try {
+      raw = await promises.readFile(full, "utf8");
+    } catch (err) {
+      logger?.warn("skill: unreadable file, skipping", {
+        path: full,
+        error: err instanceof Error ? err.message : String(err)
+      });
+      continue;
+    }
     const { frontmatter, body } = parseSkillFile(raw);
     const parsed = skillFrontmatterSchema.safeParse(frontmatter);
     if (!parsed.success) {
@@ -4211,6 +4258,17 @@ var init_persistence = __esm({
         this.indexUpdateScheduled = false;
         await this.writeIndex();
       }
+      /**
+       * Resolve once every event-log write queued so far has settled. Appends are
+       * enqueued fire-and-forget (`enqueueAppend`), so callers that need to observe
+       * the on-disk result of prior appends — graceful shutdown, or a test that
+       * mutates the filesystem between writes — await this to drain the queue
+       * rather than guessing at timing. Enqueues a no-op at the tail of the same
+       * mutex, so it can only resolve after all earlier appends/truncates have run.
+       */
+      async settleWrites() {
+        await this.writeQueue.run(() => void 0);
+      }
       /**
        * Manually update header fields (provider/model) when the user
        * switches mid-session. The /model picker calls this so the index
@@ -4233,7 +4291,7 @@ var init_persistence = __esm({
         };
         this.scheduleIndexWrite();
         const line = JSON.stringify(event) + "\n";
-        void this.writeQueue.run(() => promises.appendFile(this.logPath, line, "utf8")).then(() => this.noteWriteOk()).catch((err) => this.noteWriteFailure("append", err));
+        void this.writeQueue.run(() => this.ensureReady().then(() => promises.appendFile(this.logPath, line, "utf8"))).then(() => this.noteWriteOk()).catch((err) => this.noteWriteFailure("append", err));
       }
       /**
        * True while event-log writes are failing (history is no longer being
@@ -4274,7 +4332,7 @@ var init_persistence = __esm({
           lastActivity: (/* @__PURE__ */ new Date()).toISOString()
         };
         this.scheduleIndexWrite();
-        void this.writeQueue.run(() => promises.writeFile(this.logPath, "", "utf8")).then(() => this.noteWriteOk()).catch((err) => this.noteWriteFailure("truncate", err));
+        void this.writeQueue.run(() => this.ensureReady().then(() => promises.writeFile(this.logPath, "", "utf8"))).then(() => this.noteWriteOk()).catch((err) => this.noteWriteFailure("truncate", err));
       }
       scheduleIndexWrite() {
         if (this.indexUpdateScheduled)
@@ -30607,7 +30665,7 @@ var require_api = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.Api = void 0;
     var client_js_1 = require_client();
-    var Api = class {
+    var Api2 = class {
       /**
        * Constructs a new instance of `Api`. It is independent from all other
        * instances of this class. For example, this lets you install a custom set
@@ -32942,7 +33000,7 @@ var require_api = __commonJS({
         return this.raw.getGameHighScores({ inline_message_id, user_id }, signal);
       }
     };
-    exports.Api = Api;
+    exports.Api = Api2;
   }
 });
 
@@ -32986,7 +33044,7 @@ var require_bot = __commonJS({
       "chat_boost",
       "removed_chat_boost"
     ];
-    var Bot3 = class extends composer_js_1.Composer {
+    var Bot2 = class extends composer_js_1.Composer {
       /**
        * Creates a new Bot with the given token.
        *
@@ -33352,7 +33410,7 @@ var require_bot = __commonJS({
         await sleep7(sleepSeconds);
       }
     };
-    exports.Bot = Bot3;
+    exports.Bot = Bot2;
     async function withRetries(task, signal) {
       const INITIAL_DELAY = 50;
       let lastDelay = INITIAL_DELAY;
@@ -49252,11 +49310,25 @@ function renderResult(content, isError) {
     else if (block.type === "image")
       parts.push(`[image:${block.mimeType}]`);
     else if (block.type === "resource")
-      parts.push(`[resource]`);
+      parts.push(renderResource(block.resource));
   }
   const text = parts.join("\n");
   return isError ? `[error] ${text}` : text;
 }
+function renderResource(resource) {
+  if (resource && typeof resource === "object") {
+    const r2 = resource;
+    if (typeof r2.text === "string")
+      return r2.text;
+    const meta = [
+      typeof r2.uri === "string" ? r2.uri : null,
+      typeof r2.mimeType === "string" ? r2.mimeType : null
+    ].filter((v3) => v3 !== null);
+    if (meta.length > 0)
+      return `[resource:${meta.join(" ")}]`;
+  }
+  return `[resource]`;
+}
 var MCP_CALL_TIMEOUT_MS;
 var init_wrap = __esm({
   "../plugin-mcp/dist/wrap.js"() {
@@ -49264,13 +49336,16 @@ var init_wrap = __esm({
     MCP_CALL_TIMEOUT_MS = 5 * 60 * 1e3;
   }
 });
-var mcpStoredServerSchema, mcpStoredConfigSchema;
+var mcpStoredServerSchema, mcpStoredConfigRootSchema;
 var init_config_schema = __esm({
   "../plugin-mcp/dist/admin/config-schema.js"() {
     mcpStoredServerSchema = z$1.object({
       name: z$1.string().min(1)
     }).passthrough();
-    mcpStoredConfigSchema = z$1.object({
+    mcpStoredConfigRootSchema = z$1.object({
+      servers: z$1.array(z$1.unknown())
+    }).passthrough();
+    z$1.object({
       servers: z$1.array(mcpStoredServerSchema)
     }).passthrough().transform((value) => value);
   }
@@ -49281,10 +49356,17 @@ function mcpConfigPath() {
 async function readMcpConfig() {
   try {
     const raw = await promises.readFile(mcpConfigPath(), "utf8");
-    const parsed = mcpStoredConfigSchema.safeParse(JSON.parse(raw));
-    if (parsed.success) {
-      return parsed.data;
+    const root = mcpStoredConfigRootSchema.safeParse(JSON.parse(raw));
+    if (!root.success) {
+      return { servers: [] };
     }
+    const servers = [];
+    for (const entry of root.data.servers) {
+      const parsed = mcpStoredServerSchema.safeParse(entry);
+      if (parsed.success)
+        servers.push(parsed.data);
+    }
+    return { servers };
   } catch {
   }
   return { servers: [] };
@@ -49917,23 +49999,19 @@ __export(dist_exports2, {
 });
 async function createMcpPlugin(opts) {
   const factory2 = opts.clientFactory ?? defaultClientFactory;
-  const clients = [];
-  const tools = [];
-  try {
-    for (const server of opts.servers) {
-      const client = await factory2(server, opts);
-      clients.push(client);
-      const wrapped = await wrapMcpServerTools({
-        server,
-        client,
-        toolNamePrefix: opts.toolNamePrefix
-      });
-      tools.push(...wrapped);
-    }
-  } catch (err) {
-    await Promise.allSettled(clients.map((c2) => c2.close()));
-    throw err;
+  const opened = [];
+  const results = await Promise.allSettled(opts.servers.map(async (server) => {
+    const client = await factory2(server, opts);
+    opened.push(client);
+    return wrapMcpServerTools({ server, client, toolNamePrefix: opts.toolNamePrefix });
+  }));
+  const failure = results.find((r2) => r2.status === "rejected");
+  if (failure) {
+    await Promise.allSettled(opened.map((c2) => c2.close()));
+    throw failure.reason;
   }
+  const tools = results.flatMap((r2) => r2.value);
+  const clients = opened;
   return definePlugin({
     name: "@moxxy/plugin-mcp",
     version: "0.0.0",
@@ -51297,7 +51375,7 @@ var require_react_development = __commonJS({
           var dispatcher = resolveDispatcher();
           return dispatcher.useRef(initialValue);
         }
-        function useEffect19(create2, deps) {
+        function useEffect18(create2, deps) {
           var dispatcher = resolveDispatcher();
           return dispatcher.useEffect(create2, deps);
         }
@@ -52080,7 +52158,7 @@ var require_react_development = __commonJS({
         exports.useContext = useContext7;
         exports.useDebugValue = useDebugValue;
         exports.useDeferredValue = useDeferredValue;
-        exports.useEffect = useEffect19;
+        exports.useEffect = useEffect18;
         exports.useId = useId;
         exports.useImperativeHandle = useImperativeHandle;
         exports.useInsertionEffect = useInsertionEffect;
@@ -84849,7 +84927,11 @@ function parseInputChunk(chunk, ctx) {
       continue;
     }
     if (c2 === "") {
-      process.exit(0);
+      if (ctx.onInterrupt)
+        ctx.onInterrupt();
+      else
+        process.exit(0);
+      return remainder;
     }
     if (c2 === "\x7F" || c2 === "\b") {
       ctx.dispatch({ type: "delete-back" });
@@ -84973,7 +85055,7 @@ var init_PromptInput = __esm({
     init_external_insert();
     init_reducer();
     init_parse_input();
-    PromptInput = ({ onSubmit, disabled, placeholder, slashCommands = BUILTIN_SLASH_COMMANDS, onPasteText, commandHotkeys, onShiftTab, externalInsert }) => {
+    PromptInput = ({ onSubmit, disabled, placeholder, slashCommands = BUILTIN_SLASH_COMMANDS, onPasteText, commandHotkeys, onShiftTab, onInterrupt, externalInsert }) => {
       const [state, dispatch3] = (0, import_react26.useReducer)(reducer, INITIAL);
       const [slashCursor, setSlashCursor] = import_react26.default.useState(0);
       const stateRef = (0, import_react26.useRef)(state);
@@ -85033,6 +85115,8 @@ var init_PromptInput = __esm({
       commandHotkeysRef.current = commandHotkeys;
       const onShiftTabRef = (0, import_react26.useRef)(onShiftTab);
       onShiftTabRef.current = onShiftTab;
+      const onInterruptRef = (0, import_react26.useRef)(onInterrupt);
+      onInterruptRef.current = onInterrupt;
       const lastExternalInsertIdRef = (0, import_react26.useRef)(null);
       (0, import_react26.useEffect)(() => {
         const decision = nextExternalInsertAction(lastExternalInsertIdRef.current, externalInsert);
@@ -85058,6 +85142,13 @@ var init_PromptInput = __esm({
           onSlashDown: () => setSlashCursor((c2) => Math.min(slashMatchesRef.current.length - 1, c2 + 1)),
           onSlashAccept: handleSlashAccept,
           onShiftTab: () => onShiftTabRef.current?.(),
+          onInterrupt: () => {
+            const fn = onInterruptRef.current;
+            if (fn)
+              fn();
+            else
+              process.exit(0);
+          },
           onPasteText: (text) => onPasteTextRef.current?.(text) ?? text,
           slashOpen: false,
           bufferRef: { current: { buffer: "", cursor: 0 } },
@@ -85415,12 +85506,9 @@ function handleCollabEvent(e3, ref, root) {
     root.push(block2);
     return;
   }
-  let block = ref.current;
-  if (!block) {
-    block = newCollabBlock(e3.id, atMs);
-    ref.current = block;
-    root.push(block);
-  }
+  const block = ref.current;
+  if (!block)
+    return;
   switch (e3.subtype) {
     case "collab_fallback_sequential":
       block.fallbackReason = String(p3.reason ?? "");
@@ -87122,8 +87210,37 @@ var init_image_attachments = __esm({
     };
   }
 });
+function reapStale(dir, now = Date.now()) {
+  let entries;
+  try {
+    entries = readdirSync(dir);
+  } catch {
+    return;
+  }
+  for (const name of entries) {
+    const m3 = CLIP_NAME_RE.exec(name);
+    if (!m3)
+      continue;
+    const stamp = Number(m3[1]);
+    let age = Number.isFinite(stamp) ? now - stamp : Number.NaN;
+    if (!Number.isFinite(age)) {
+      try {
+        age = now - statSync(path3__default.join(dir, name)).mtimeMs;
+      } catch {
+        continue;
+      }
+    }
+    if (age > CACHE_TTL_MS) {
+      try {
+        unlinkSync(path3__default.join(dir, name));
+      } catch {
+      }
+    }
+  }
+}
 function ensureCacheDir() {
   mkdirSync(CACHE_DIR, { recursive: true });
+  reapStale(CACHE_DIR, Date.now());
   return CACHE_DIR;
 }
 function nextCachePath() {
@@ -87208,10 +87325,12 @@ function readClipboardImageSync() {
     return readClipboardImageLinux();
   return null;
 }
-var CACHE_DIR;
+var CACHE_DIR, CACHE_TTL_MS, CLIP_NAME_RE;
 var init_clipboard_image = __esm({
   "../plugin-cli/dist/clipboard-image.js"() {
     CACHE_DIR = moxxyPath("image-cache");
+    CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
+    CLIP_NAME_RE = /^clip-(\d+)-[a-z0-9]+\.png$/;
   }
 });
 
@@ -87641,7 +87760,7 @@ function useVoiceInput(opts) {
           const pcm = await recording.stop();
           const transcriber = resolveCodexTranscriber(session);
           const result = await transcriber.transcribe(pcm, {
-            mimeType: MOXXY_PCM16_24KHZ_MIME2
+            mimeType: MOXXY_PCM16_24KHZ_MIME
           });
           const text = result.text.trim();
           if (!text) {
@@ -87748,13 +87867,12 @@ function formatVoiceError(err) {
     return `voice: ${message}`;
   return `voice: ${message || "failed"}`;
 }
-var import_react51, CODEX_TRANSCRIBER_NAME, MOXXY_PCM16_24KHZ_MIME2;
+var import_react51, CODEX_TRANSCRIBER_NAME;
 var init_use_voice_input = __esm({
   "../plugin-cli/dist/session/use-voice-input.js"() {
     import_react51 = __toESM(require_react());
     init_voice_input();
     CODEX_TRANSCRIBER_NAME = "openai-codex-transcribe";
-    MOXXY_PCM16_24KHZ_MIME2 = "audio/x-moxxy-pcm16-24khz";
   }
 });
 
@@ -88044,13 +88162,17 @@ function startCollab(deps, arg) {
     deps.submitPrompt(objective);
 }
 function openModePicker(deps, arg = "") {
-  const modes = deps.session.modes.list();
+  const modes = deps.session.modes.list().filter((m3) => !COLLAB_HIDDEN_MODES.has(m3.name));
   if (modes.length === 0) {
     deps.setSystemNotice("no modes registered");
     return;
   }
   const target = arg.trim().toLowerCase();
   if (target) {
+    if (COLLAB_HIDDEN_MODES.has(target)) {
+      deps.setSystemNotice("Use /collab <goal> to run a collaborative team (only one runs at a time).");
+      return;
+    }
     const match = modes.find((m3) => m3.name.toLowerCase() === target);
     if (match) {
       try {
@@ -88076,7 +88198,7 @@ function openModePicker(deps, arg = "") {
 function truncate5(s2, n2) {
   return s2.length <= n2 ? s2 : s2.slice(0, n2 - 1) + "\u2026";
 }
-var PLUGIN_KIND_TAB, OTHER_TAB, PLUGIN_TAB_ORDER;
+var PLUGIN_KIND_TAB, OTHER_TAB, PLUGIN_TAB_ORDER, COLLAB_HIDDEN_MODES;
 var init_run_slash = __esm({
   async "../plugin-cli/dist/session/run-slash.js"() {
     init_dist();
@@ -88091,6 +88213,11 @@ var init_run_slash = __esm({
     };
     OTHER_TAB = { id: "others", label: "Others" };
     PLUGIN_TAB_ORDER = ["providers", "modes", "channels", "tools", "others"];
+    COLLAB_HIDDEN_MODES = /* @__PURE__ */ new Set([
+      "collaborative",
+      "collab-architect",
+      "collab-peer"
+    ]);
   }
 });
 
@@ -89063,11 +89190,11 @@ var init_OverlayOrNotice = __esm({
 });
 
 // ../plugin-cli/dist/components/PermissionDialog.js
-var import_jsx_runtime32, import_react60, PermissionDialog;
+var import_jsx_runtime32, PermissionDialog;
 var init_PermissionDialog = __esm({
   async "../plugin-cli/dist/components/PermissionDialog.js"() {
     import_jsx_runtime32 = __toESM(require_jsx_runtime());
-    import_react60 = __toESM(require_react());
+    __toESM(require_react());
     await init_build2();
     init_theme();
     await init_Modal();
@@ -89083,8 +89210,6 @@ var init_PermissionDialog = __esm({
         else if (ch === "n" || key.escape)
           onDecide({ mode: "deny", reason: "user declined" });
       });
-      (0, import_react60.useEffect)(() => {
-      }, []);
       const title = queueDepth > 0 ? `Tool permission requested (${queueDepth} more queued)` : "Tool permission requested";
       return (0, import_jsx_runtime32.jsxs)(Modal, { title, hints: "y allow \xB7 a session \xB7 p always \xB7 n deny", children: [(0, import_jsx_runtime32.jsxs)(Text, { children: ["Tool: ", (0, import_jsx_runtime32.jsx)(Text, { bold: true, children: call.name }), toolDescription ? (0, import_jsx_runtime32.jsxs)(Text, { dimColor: true, children: [" \u2014 ", toolDescription] }) : null] }), (0, import_jsx_runtime32.jsxs)(Text, { dimColor: true, children: ["Input: ", JSON.stringify(call.input).slice(0, 200)] }), (0, import_jsx_runtime32.jsxs)(Text, { children: [(0, import_jsx_runtime32.jsx)(Text, { children: "[y]" }), (0, import_jsx_runtime32.jsx)(Text, { dimColor: true, children: " allow once \xB7 " }), (0, import_jsx_runtime32.jsx)(Text, { children: "[a]" }), (0, import_jsx_runtime32.jsx)(Text, { dimColor: true, children: " allow session \xB7 " }), (0, import_jsx_runtime32.jsx)(Text, { children: "[p]" }), (0, import_jsx_runtime32.jsx)(Text, { dimColor: true, children: " always \xB7 " }), (0, import_jsx_runtime32.jsx)(Text, { color: Colors.danger, children: "[n]" }), (0, import_jsx_runtime32.jsx)(Text, { dimColor: true, children: " deny" })] })] });
     };
@@ -89092,6 +89217,11 @@ var init_PermissionDialog = __esm({
 });
 
 // ../plugin-cli/dist/components/ApprovalDialog.js
+function jkScrolls(letter, renderedLineCount, options) {
+  if (renderedLineCount <= MAX_BODY_LINES)
+    return false;
+  return !options.some((o2) => o2.hotkey === letter);
+}
 function isDiffBody(body) {
   return /```diff\b/.test(body) || /^\s*diff --git\b/m.test(body);
 }
@@ -89148,6 +89278,10 @@ var init_ApprovalDialog = __esm({
       const [cursor, setCursor] = (0, import_react61.useState)(initialCursor);
       const [textEntry, setTextEntry] = (0, import_react61.useState)(null);
       const [scrollOffset, setScrollOffset] = (0, import_react61.useState)(0);
+      const rawLines = request.body.split("\n");
+      const diffMode = isDiffBody(request.body);
+      const rendered = diffMode ? renderDiffLines(rawLines) : rawLines.map((text) => ({ text }));
+      const scrollClaims = (letter) => jkScrolls(letter, rendered.length, request.options);
       use_input_default((input, key) => {
         if (textEntry) {
           if (key.return) {
@@ -89171,11 +89305,12 @@ var init_ApprovalDialog = __esm({
           }
           return;
         }
-        if (input === "j" || key.pageDown) {
-          setScrollOffset((o2) => o2 + Math.max(1, Math.floor(MAX_BODY_LINES / 2)));
+        const maxScroll = Math.max(0, rendered.length - MAX_BODY_LINES);
+        if (input === "j" && scrollClaims("j") || key.pageDown) {
+          setScrollOffset((o2) => Math.min(maxScroll, o2 + Math.max(1, Math.floor(MAX_BODY_LINES / 2))));
           return;
         }
-        if (input === "k" || key.pageUp) {
+        if (input === "k" && scrollClaims("k") || key.pageUp) {
           setScrollOffset((o2) => Math.max(0, o2 - Math.max(1, Math.floor(MAX_BODY_LINES / 2))));
           return;
         }
@@ -89223,9 +89358,6 @@ var init_ApprovalDialog = __esm({
         }
         onDecide({ optionId: id });
       };
-      const rawLines = request.body.split("\n");
-      const diffMode = isDiffBody(request.body);
-      const rendered = diffMode ? renderDiffLines(rawLines) : rawLines.map((text) => ({ text }));
       const maxOffset = Math.max(0, rendered.length - MAX_BODY_LINES);
       const offset = Math.min(scrollOffset, maxOffset);
       const visible = rendered.slice(offset, offset + MAX_BODY_LINES);
@@ -113398,7 +113530,7 @@ async function provisionWorkspace(opts) {
   if (install.code !== 0) {
     const loose = await run("pnpm", ["install"], dir);
     if (loose.code !== 0)
-      return { ok: false, message: `pnpm install failed: ${trunc(install.output, 400)}`, repoDir: dir };
+      return { ok: false, message: `pnpm install failed: ${trunc(loose.output, 400)}`, repoDir: dir };
   }
   return { ok: true, message: "workspace provisioned", repoDir: dir };
 }
@@ -114031,6 +114163,23 @@ async function escalate(deps, ctx, journal, reason) {
 }
 
 // src/argv.ts
+var BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
+  "help",
+  "h",
+  "version",
+  "v",
+  "yes",
+  "y",
+  "verbose",
+  "allow-all",
+  "standalone",
+  "attach",
+  "reload",
+  "all",
+  "stop",
+  "status",
+  "background"
+]);
 function parseArgv(argv) {
   const result = { command: "", flags: {}, positional: [] };
   if (argv.length === 0) {
@@ -114053,7 +114202,7 @@ function parseArgv(argv) {
       } else {
         const key = a2.slice(2);
         const next = argv[i2 + 1];
-        if (next && !next.startsWith("-")) {
+        if (next && !next.startsWith("-") && !BOOLEAN_FLAGS.has(key)) {
           result.flags[key] = next;
           i2++;
         } else {
@@ -114063,7 +114212,7 @@ function parseArgv(argv) {
     } else if (a2.startsWith("-")) {
       const key = a2.slice(1);
       const next = argv[i2 + 1];
-      if (next && !next.startsWith("-")) {
+      if (next && !next.startsWith("-") && !BOOLEAN_FLAGS.has(key)) {
         result.flags[key] = next;
         i2++;
       } else {
@@ -114317,17 +114466,19 @@ async function loadOne(filePath) {
   }
   return parsed.data;
 }
-var cachedJiti = null;
+var cachedJiti = /* @__PURE__ */ new Map();
 async function getJiti2(cwd2) {
-  if (cachedJiti)
-    return cachedJiti;
+  const existing = cachedJiti.get(cwd2);
+  if (existing)
+    return existing;
   try {
     const mod = await Promise.resolve().then(() => (init_jiti(), jiti_exports));
     const factory2 = mod.createJiti ?? mod.default;
     if (!factory2)
       return null;
-    cachedJiti = factory2(cwd2, { interopDefault: true });
-    return cachedJiti;
+    const instance = factory2(cwd2, { interopDefault: true });
+    cachedJiti.set(cwd2, instance);
+    return instance;
   } catch {
     return null;
   }
@@ -114586,9 +114737,22 @@ function decrypt(blob, key) {
   return plaintext.toString("utf8");
 }
 function randomCode(digits = 6) {
-  const max = 10 ** digits;
-  const value = randomBytes(4).readUInt32BE(0) % max;
-  return value.toString().padStart(digits, "0");
+  if (!Number.isInteger(digits) || digits < 1) {
+    throw new Error(`randomCode: digits must be a positive integer, got ${digits}`);
+  }
+  const modulus = 10n ** BigInt(digits);
+  const byteLen = Math.ceil(digits * Math.log2(10) / 8) + 1;
+  const space = 1n << BigInt(byteLen * 8);
+  const limit2 = space - space % modulus;
+  for (; ; ) {
+    let value = 0n;
+    for (const byte of randomBytes(byteLen)) {
+      value = value << 8n | BigInt(byte);
+    }
+    if (value < limit2) {
+      return (value % modulus).toString().padStart(digits, "0");
+    }
+  }
 }
 
 // ../plugin-vault/dist/keysource.js
@@ -114609,10 +114773,10 @@ function createCombinedKeySource(opts) {
     },
     async obtain(salt) {
       const envName = opts.envVar ?? "MOXXY_VAULT_PASSPHRASE";
-      const envValue = process.env[envName];
-      if (envValue) {
+      const envValue2 = process.env[envName];
+      if (envValue2) {
         resolvedName = `env:${envName}`;
-        return deriveKey(envValue, salt);
+        return deriveKey(envValue2, salt);
       }
       if (!opts.disableKeytar) {
         const fromKeychain = await tryKeychainGet();
@@ -115404,7 +115568,7 @@ async function safeRead(filePath) {
     const result = memoryFrontmatterSchema.safeParse(parsed.frontmatter);
     if (!result.success)
       return null;
-    return { frontmatter: result.data, body: parsed.body };
+    return { frontmatter: result.data, body: parsed.body.trim() };
   } catch {
     return null;
   }
@@ -117036,6 +117200,14 @@ async function syncSkillSchedules(registry, store) {
 }
 
 // ../plugin-scheduler/dist/poller.js
+function cronBaseline(entry) {
+  return entry.lastRunAt ?? entry.createdAt;
+}
+function nextCronFire(entry) {
+  if (!entry.cron)
+    return null;
+  return nextFireTime(entry.cron, new Date(cronBaseline(entry)), entry.timeZone);
+}
 function isDue(entry, now) {
   if (!entry.enabled)
     return false;
@@ -117044,8 +117216,7 @@ function isDue(entry, now) {
   }
   if (!entry.cron)
     return false;
-  const since = entry.lastRunAt ?? entry.createdAt;
-  const next = nextFireTime(entry.cron, new Date(since), entry.timeZone);
+  const next = nextCronFire(entry);
   if (!next)
     return false;
   return next.getTime() <= now;
@@ -117079,23 +117250,12 @@ var SchedulerPoller = class {
     await this.tickPromise.catch(() => void 0);
   }
   /** Fire any due schedules right now, ignoring the timer cadence.
-   *  Returns the number of schedules that ran. */
+   *  Returns the number of due schedules that were attempted — counted at the
+   *  attempt point, so a schedule that fired but failed mid-run (e.g. a
+   *  store.update throw) is still counted, unlike piggy-backing on onFired
+   *  (which only fires on a clean run). */
   async tickOnce() {
-    let count = 0;
-    const original = this.opts.onFired;
-    let wrapped;
-    if (original) {
-      wrapped = (entry, outcome) => {
-        count += 1;
-        original(entry, outcome);
-      };
-    } else {
-      wrapped = () => {
-        count += 1;
-      };
-    }
-    await this.tickWith(wrapped);
-    return count;
+    return this.tickWith(this.opts.onFired);
   }
   async tick() {
     if (!this.running)
@@ -117120,11 +117280,13 @@ var SchedulerPoller = class {
       this.opts.logger?.error?.("scheduler: failed to read store", {
         err: err instanceof Error ? err.message : String(err)
       });
-      return;
+      return 0;
     }
+    let attempted = 0;
     for (const entry of schedules) {
       if (!isDue(entry, now))
         continue;
+      attempted += 1;
       try {
         const outcome = await runSchedule(entry, this.opts.runner, this.opts.store, this.opts.inbox);
         this.opts.logger?.info?.("scheduler: fired", {
@@ -117140,6 +117302,7 @@ var SchedulerPoller = class {
         });
       }
     }
+    return attempted;
   }
 };
 
@@ -117382,11 +117545,9 @@ var cronOrTimestamp = z$1.object({
   message: "provide either `cron` or `runAt`"
 });
 function describeEntry(entry) {
-  const now = Date.now();
   let nextFireAt = null;
   if (entry.cron) {
-    const since = entry.lastRunAt ?? Math.max(entry.createdAt, now);
-    const next = nextFireTime(entry.cron, new Date(since), entry.timeZone);
+    const next = nextCronFire(entry);
     nextFireAt = next ? next.getTime() : null;
   } else if (entry.runAt && entry.enabled) {
     nextFireAt = entry.runAt;
@@ -117680,7 +117841,8 @@ function defaultWebhookInboxDir() {
 async function writeInbox2(trigger, result, deliveryId, opts = {}) {
   const dir = opts.dir ?? defaultWebhookInboxDir();
   const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  const file = path3__default.join(dir, `${stamp}-${trigger.name}.md`);
+  const suffix = deliveryId ? deliveryId.replace(/[^A-Za-z0-9._-]/g, "_") : randomUUID().slice(0, 8);
+  const file = path3__default.join(dir, `${stamp}-${trigger.name}-${suffix}.md`);
   const header = [
     "---",
     `webhook: ${trigger.name}`,
@@ -118047,14 +118209,6 @@ var WebhookServer = class {
       res.end(JSON.stringify({ error: "verification_failed" }));
       return;
     }
-    if (!shouldFire(trigger.filters, { headers: req.headers, body })) {
-      this.opts.logger?.info?.("webhooks: filtered out, not firing", {
-        trigger: trigger.name
-      });
-      res.writeHead(200, { "content-type": "application/json" });
-      res.end(JSON.stringify({ status: "filtered" }));
-      return;
-    }
     const idempKey = idempotencyKey(trigger, req.headers);
     if (idempKey && !this.dedupe.check(trigger.id, idempKey)) {
       this.opts.logger?.info?.("webhooks: duplicate delivery, dropped", {
@@ -118065,6 +118219,14 @@ var WebhookServer = class {
       res.end(JSON.stringify({ status: "duplicate" }));
       return;
     }
+    if (!shouldFire(trigger.filters, { headers: req.headers, body })) {
+      this.opts.logger?.info?.("webhooks: filtered out, not firing", {
+        trigger: trigger.name
+      });
+      res.writeHead(200, { "content-type": "application/json" });
+      res.end(JSON.stringify({ status: "filtered" }));
+      return;
+    }
     res.writeHead(202, { "content-type": "application/json" });
     res.end(JSON.stringify({ status: "accepted", trigger: trigger.name }));
     const prompt = renderPrompt({
@@ -119138,17 +119300,28 @@ function isPathKey(key) {
 function isUrlKey(key) {
   return tokenize4(key).some((w4) => URL_WORDS.has(w4));
 }
+var INVALID_FILE_URL_PATH = "/\0moxxy-invalid-file-url";
 function extractPaths(input) {
   const out = [];
   walkStrings(input, (key, value) => {
-    if (isPathKey(key)) {
+    if (value.startsWith("file://")) {
+      out.push(fileUrlPath(value));
+    } else if (isPathKey(key)) {
       out.push(value);
-    } else if (value.startsWith("file://")) {
-      out.push(value.slice("file://".length));
     }
   });
   return out;
 }
+function fileUrlPath(value) {
+  try {
+    const url2 = new URL(value);
+    if (url2.host)
+      return INVALID_FILE_URL_PATH;
+    return decodeURIComponent(url2.pathname);
+  } catch {
+    return INVALID_FILE_URL_PATH;
+  }
+}
 function extractUrls(input) {
   const out = [];
   walkStrings(input, (key, value) => {
@@ -119181,11 +119354,20 @@ function resolvePattern(pattern, cwd2) {
   }
   return path3.isAbsolute(pattern) ? path3.normalize(pattern) : path3.resolve(cwd2, pattern);
 }
+var globRegexCache = /* @__PURE__ */ new Map();
+function compileGlob(pattern) {
+  let re2 = globRegexCache.get(pattern);
+  if (!re2) {
+    const src = "^" + pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*\*/g, "<<DOUBLESTAR>>").replace(/\*/g, "[^/]*").replace(/<<DOUBLESTAR>>/g, ".*") + "$";
+    re2 = new RegExp(src);
+    globRegexCache.set(pattern, re2);
+  }
+  return re2;
+}
 function matchesGlob(p3, pattern) {
   if (pattern.endsWith("/**") && p3 === pattern.slice(0, -3))
     return true;
-  const re2 = "^" + pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*\*/g, "<<DOUBLESTAR>>").replace(/\*/g, "[^/]*").replace(/<<DOUBLESTAR>>/g, ".*") + "$";
-  return new RegExp(re2).test(p3);
+  return compileGlob(pattern).test(p3);
 }
 function hostMatches(host, pattern) {
   if (pattern.startsWith("*.")) {
@@ -119297,6 +119479,7 @@ var IsolatorRegistry2 = class {
   }
 };
 var MAX_BROKER_OUTPUT_BYTES = 8 * 1024 * 1024;
+var BROKER_KILL_GRACE_MS = 2e3;
 var MAX_FETCH_REDIRECTS = 5;
 var BLOCKED_HANDLER_MODULES = Object.freeze([
   "node:fs",
@@ -119589,12 +119772,21 @@ async function brokerExec(args, { caps, cwd: cwd2, signal }) {
     const errChunks = [];
     let total = 0;
     let settled = false;
-    const timer = opts.timeoutMs ? setTimeout(() => {
+    let killTimer = null;
+    const terminate2 = () => {
       child.kill("SIGTERM");
+      if (killTimer)
+        return;
+      killTimer = setTimeout(() => child.kill("SIGKILL"), BROKER_KILL_GRACE_MS);
+      killTimer.unref?.();
+    };
+    const timer = opts.timeoutMs ? setTimeout(() => {
+      terminate2();
       finish(() => reject(new Error(`[broker:exec] '${command}' exceeded ${opts.timeoutMs}ms`)));
     }, opts.timeoutMs) : null;
     const onAbort = () => {
-      child.kill("SIGTERM");
+      terminate2();
+      finish(() => reject(new Error(`[broker:exec] '${command}' aborted`)));
     };
     const finish = (settle) => {
       if (settled)
@@ -119605,12 +119797,18 @@ async function brokerExec(args, { caps, cwd: cwd2, signal }) {
       signal.removeEventListener("abort", onAbort);
       settle();
     };
+    const clearKill = () => {
+      if (killTimer) {
+        clearTimeout(killTimer);
+        killTimer = null;
+      }
+    };
     const accumulate = (chunks, b3) => {
       if (settled)
         return;
       total += b3.byteLength;
       if (total > MAX_BROKER_OUTPUT_BYTES) {
-        child.kill("SIGTERM");
+        terminate2();
         finish(() => reject(new Error(`[broker:exec] '${command}' output exceeded the ${MAX_BROKER_OUTPUT_BYTES}-byte limit`)));
         return;
       }
@@ -119620,9 +119818,11 @@ async function brokerExec(args, { caps, cwd: cwd2, signal }) {
     child.stderr.on("data", (b3) => accumulate(errChunks, b3));
     signal.addEventListener("abort", onAbort, { once: true });
     child.on("error", (e3) => {
+      clearKill();
       finish(() => reject(e3));
     });
     child.on("close", (exitCode) => {
+      clearKill();
       finish(() => resolve12({
         stdout: Buffer.concat(outChunks).toString("utf8"),
         stderr: Buffer.concat(errChunks).toString("utf8"),
@@ -119899,7 +120099,8 @@ function createWorkerIsolator(opts = {}) {
         let terminated = false;
         const hardTerminate = () => {
           terminated = true;
-          void worker.terminate();
+          worker.terminate().catch(() => {
+          });
         };
         const finish = (action, graceful = false) => {
           if (settled)
@@ -120263,6 +120464,7 @@ async function invoke(call, caps, _signal) {
   if (typeof exports.alloc !== "function") {
     throw new Error(`[security:wasm] module does not export 'alloc(size: i32) -> i32'`);
   }
+  memoryHolder.alloc = (size) => exports.alloc(size);
   const handler = exports[call.moduleRef.export];
   if (typeof handler !== "function") {
     throw new Error(`[security:wasm] export '${call.moduleRef.export}' is ${typeof handler}, expected function`);
@@ -120295,8 +120497,10 @@ function buildWasmHostImports(memoryHolder, caps, cwd2) {
     return new TextDecoder().decode(new Uint8Array(memOf().buffer, ptr, len));
   };
   const sendBytes = (outPtrOut, outLenOut, bytes) => {
-    const region = reserveScratch(memOf(), bytes.length);
-    new Uint8Array(memOf().buffer, region, bytes.length).set(bytes);
+    const region = bytes.length === 0 ? SCRATCH_BASE : memoryHolder.alloc ? memoryHolder.alloc(bytes.length) : reserveScratch(memOf(), bytes.length);
+    if (bytes.length > 0) {
+      new Uint8Array(memOf().buffer, region, bytes.length).set(bytes);
+    }
     writePtrPair(memOf(), outPtrOut, outLenOut, region, bytes.length);
   };
   const sendStr = (outPtrOut, outLenOut, s2) => {
@@ -120337,13 +120541,13 @@ function buildWasmHostImports(memoryHolder, caps, cwd2) {
      */
     broker_fs_write_file: (pathPtr, pathLen, dataPtr, dataLen, outPtrOut, outLenOut) => {
       const filePath = readStr(pathPtr, pathLen);
-      const data = readStr(dataPtr, dataLen);
+      const data = new Uint8Array(memOf().buffer, dataPtr, dataLen).slice();
       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");
+        writeFileSync(filePath, Buffer$1.from(data));
         writePtrPair(memOf(), outPtrOut, outLenOut, 0, 0);
         return SUCCESS;
       } catch (e3) {
@@ -124450,6 +124654,8 @@ var AnthropicProvider = class {
     const parts = [this.oauth?.systemPreamble, system, req.system].filter((s2) => typeof s2 === "string" && s2.length > 0);
     const systemForCount = parts.length > 0 ? parts.join("\n\n") : void 0;
     try {
+      if (this.oauth)
+        await this.ensureFreshOauth();
       const result = await this.client.messages.countTokens({
         model: req.model || this.defaultModel,
         ...systemForCount !== void 0 ? { system: systemForCount } : {},
@@ -130898,7 +131104,16 @@ var OpenAIProvider = class {
       ...tools ? { tools } : {},
       ...req.temperature !== void 0 ? { temperature: req.temperature } : {},
       ...req.maxTokens ? { [tokenLimitKey]: req.maxTokens } : {},
-      ...emitReasoning && usesCompletionTokens && reasoningEffort ? { reasoning_effort: reasoningEffort } : {},
+      // Send `reasoning_effort` independently of the token-field heuristic.
+      // The two are unrelated concerns: `usesCompletionTokens` picks the cap
+      // FIELD NAME for the OpenAI-hosted reasoning models, while effort applies
+      // to any reasoning backend. OpenAI-compatible vendors (z.ai GLM,
+      // DeepSeek-R1, vLLM, Ollama) honor reasoning_effort but their model ids
+      // never match the gpt-5/o1/o3 regex, so gating effort on it silently
+      // dropped a user-requested effort for exactly those backends. The
+      // descriptor's `supportsReasoning` already gates this upstream via
+      // req.reasoning.
+      ...emitReasoning && reasoningEffort ? { reasoning_effort: reasoningEffort } : {},
       stream: true,
       // OpenAI only emits the final `usage` chunk when this is set;
       // without it `raw.usage` is null on every chunk and token usage
@@ -131162,7 +131377,6 @@ function waitForCallback(opts) {
       if (err) {
         res.writeHead(400, { "Content-Type": "text/html; charset=utf-8" });
         res.end(htmlPage("OAuth error", `${err}${errDesc ? `: ${errDesc}` : ""}`));
-        clearTimeout(timer);
         const denied = err === "access_denied";
         settle(() => reject(new MoxxyError({
           code: denied ? "OAUTH_FLOW_DENIED" : "AUTH_INVALID",
@@ -131177,7 +131391,6 @@ function waitForCallback(opts) {
       if (!code || !returnedState) {
         res.writeHead(400, { "Content-Type": "text/html; charset=utf-8" });
         res.end(htmlPage("OAuth error", "callback was missing code or state"));
-        clearTimeout(timer);
         settle(() => reject(new MoxxyError({
           code: "AUTH_INVALID",
           message: "OAuth callback was missing code or state \u2014 the upstream redirect is malformed.",
@@ -131188,7 +131401,6 @@ function waitForCallback(opts) {
       if (returnedState !== opts.expectedState) {
         res.writeHead(400, { "Content-Type": "text/html; charset=utf-8" });
         res.end(htmlPage("OAuth error", "state mismatch \u2014 possible CSRF, refusing"));
-        clearTimeout(timer);
         settle(() => reject(new MoxxyError({
           code: "OAUTH_FLOW_STATE_MISMATCH",
           message: "OAuth state mismatch \u2014 possible CSRF attempt, refusing to continue.",
@@ -131246,7 +131458,8 @@ async function exchangeCodeForToken(input, fetchImpl2 = fetch) {
   const res = await fetchImpl2(input.tokenUrl, {
     method: "POST",
     headers: { "Content-Type": "application/x-www-form-urlencoded", Accept: "application/json" },
-    body: body.toString()
+    body: body.toString(),
+    ...input.signal ? { signal: input.signal } : {}
   });
   if (!res.ok) {
     const text = await res.text().catch(() => "");
@@ -131362,7 +131575,10 @@ async function runAuthorizationCodeFlow(opts) {
   });
 }
 async function pollUntil(fn, opts) {
-  const state = { intervalMs: opts.intervalMs };
+  const state = {
+    intervalMs: opts.intervalMs,
+    ...opts.signal ? { signal: opts.signal } : {}
+  };
   const leadingWait = opts.leadingWait ?? true;
   const deadline = Date.now() + opts.timeoutMs;
   const label3 = opts.label ?? "poll";
@@ -131512,7 +131728,8 @@ async function pollOnce(opts, deviceCode, state) {
   const pollRes = await fetch(opts.tokenUrl, {
     method: "POST",
     headers: { "Content-Type": "application/x-www-form-urlencoded", Accept: "application/json" },
-    body: body.toString()
+    body: body.toString(),
+    ...state.signal ? { signal: state.signal } : {}
   });
   const pollJson = await pollRes.json().catch(() => ({}));
   return classifyDeviceTokenResponse(pollRes, pollJson, state);
@@ -132110,12 +132327,13 @@ function openaiDeviceFlow(opts) {
         }
       };
     },
-    async poll(init3, _state) {
+    async poll(init3, state) {
       const { deviceAuthId, userCode, clientId } = init3.providerData;
       const res = await fetch(pollUrl, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ device_auth_id: deviceAuthId, user_code: userCode })
+        body: JSON.stringify({ device_auth_id: deviceAuthId, user_code: userCode }),
+        ...state.signal ? { signal: state.signal } : {}
       });
       if (res.ok) {
         const data = await res.json();
@@ -132125,7 +132343,8 @@ function openaiDeviceFlow(opts) {
             code: data.authorization_code,
             redirectUri: exchangeRedirectUri,
             clientId,
-            codeVerifier: data.code_verifier
+            codeVerifier: data.code_verifier,
+            ...state.signal ? { signal: state.signal } : {}
           })
         };
       }
@@ -132547,9 +132766,16 @@ async function* consumeResponsesSse(body, signal, emitReasoning = false) {
     if (errored)
       return;
     for (const entry of pending2.values()) {
+      const outId = entry.callId || entry.id;
+      if (!entry.emittedStart && entry.name) {
+        entry.emittedStart = true;
+        yield { type: "tool_use_start", id: outId, name: entry.name };
+      }
       if (entry.emittedStart) {
         sawToolCall = true;
-        yield { type: "tool_use_end", id: entry.callId || entry.id, input: parseToolArgs(entry.args) };
+        yield { type: "tool_use_end", id: outId, input: parseToolArgs(entry.args) };
+      } else if (process.env.MOXXY_DEBUG) {
+        console.error(`[openai-codex] dropping a truncated function_call with no name (id=${outId}, args=${entry.args.length}B)`);
       }
     }
     if (stopReason === "end_turn" && sawToolCall) {
@@ -132629,6 +132855,14 @@ var CodexProvider = class {
         yield toErrorEvent(err);
         return;
       }
+      if (response.status === 401) {
+        yield {
+          type: "error",
+          message: "ChatGPT OAuth credentials were rejected after a token refresh. Run `moxxy login openai-codex` to re-authenticate.",
+          retryable: false
+        };
+        return;
+      }
     }
     if (!response.ok || !response.body) {
       const text = await response.text().catch(() => "");
@@ -133253,9 +133487,6 @@ var localPlugin = definePlugin({
   version: "0.0.0",
   providers: [localProviderDef]
 });
-
-// ../plugin-stt-whisper/dist/audio.js
-var MOXXY_PCM16_24KHZ_MIME = "audio/x-moxxy-pcm16-24khz";
 var WHISPER_FILENAME_BY_MIME = {
   "audio/ogg": "audio.ogg",
   "audio/opus": "audio.opus",
@@ -134823,6 +135054,18 @@ async function* runGoalMode(ctx) {
       continue;
     }
     reactiveCompactions = 0;
+    if (reasoning) {
+      yield await ctx.emit({
+        type: "reasoning_message",
+        sessionId: ctx.sessionId,
+        turnId: ctx.turnId,
+        source: "model",
+        content: reasoning.text,
+        ...reasoning.signature ? { signature: reasoning.signature } : {},
+        ...reasoning.redacted ? { redacted: true } : {},
+        ...reasoning.encrypted ? { encrypted: reasoning.encrypted } : {}
+      });
+    }
     if (totalTokens > GOAL_TOKEN_BUDGET) {
       yield await ctx.emit({
         type: "plugin_event",
@@ -134843,18 +135086,6 @@ async function* runGoalMode(ctx) {
       });
       return;
     }
-    if (reasoning) {
-      yield await ctx.emit({
-        type: "reasoning_message",
-        sessionId: ctx.sessionId,
-        turnId: ctx.turnId,
-        source: "model",
-        content: reasoning.text,
-        ...reasoning.signature ? { signature: reasoning.signature } : {},
-        ...reasoning.redacted ? { redacted: true } : {},
-        ...reasoning.encrypted ? { encrypted: reasoning.encrypted } : {}
-      });
-    }
     const stuck = yield* emitRequestsAndDetectStuck(ctx, toolUses, detector, {
       abortedResultMessage: "goal mode aborted (stuck pattern) before this call ran",
       nearHint: "against the same target (only volatile args varied)",
@@ -135455,6 +135686,16 @@ async function* runDeepResearchMode(ctx) {
   const synthesisText = await collectSynthesis(ctx, synthesisInput);
   if (synthesisText === null)
     return;
+  if (ctx.signal.aborted) {
+    yield await ctx.emit({
+      type: "abort",
+      sessionId: ctx.sessionId,
+      turnId: ctx.turnId,
+      source: "system",
+      reason: "aborted during synthesis"
+    });
+    return;
+  }
   yield await ctx.emit({
     type: "assistant_message",
     sessionId: ctx.sessionId,
@@ -135907,11 +136148,10 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
   } else {
     warnWindowsPipeAclOnce(logger, socketPath);
   }
-  const connectionHandlers = [];
+  let connectionHandler;
   const server = net2.createServer((socket) => {
     const transport = new NdjsonTransport(socket);
-    for (const handler of connectionHandlers)
-      handler(transport);
+    connectionHandler?.(transport);
   });
   await new Promise((resolve12, reject) => {
     server.once("error", reject);
@@ -135933,7 +136173,7 @@ async function createUnixSocketServer(socketPath, logger = stderrLogger) {
   return {
     address: socketPath,
     onConnection(handler) {
-      connectionHandlers.push(handler);
+      connectionHandler = handler;
     },
     close() {
       return new Promise((resolve12) => {
@@ -138842,6 +139082,57 @@ async function integrate(input) {
   }
   return { merged, conflicts, resolvedByOwnership, stagingBranch: branchName, promoted };
 }
+var COLLAB_LOCK_PATH = join(homedir(), ".moxxy", "collab", "active.lock");
+function collabLockPath() {
+  return process.env.MOXXY_COLLAB_LOCK || COLLAB_LOCK_PATH;
+}
+function readRaw() {
+  try {
+    return JSON.parse(readFileSync(collabLockPath(), "utf8"));
+  } catch {
+    return null;
+  }
+}
+function isAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (err) {
+    return err.code === "EPERM";
+  }
+}
+function readActiveCollab() {
+  const info = readRaw();
+  if (!info)
+    return null;
+  if (!isAlive(info.pid)) {
+    try {
+      unlinkSync(collabLockPath());
+    } catch {
+    }
+    return null;
+  }
+  return info;
+}
+function tryAcquireCollabLock(args) {
+  mkdirSync(dirname(collabLockPath()), { recursive: true });
+  const existing = readActiveCollab();
+  if (existing && existing.sessionId !== args.sessionId) {
+    return { ok: false, holder: existing };
+  }
+  const info = { pid: process.pid, ...args };
+  writeFileSync(collabLockPath(), JSON.stringify(info));
+  return { ok: true };
+}
+function releaseCollabLock(sessionId) {
+  const info = readRaw();
+  if (info && info.sessionId === sessionId) {
+    try {
+      unlinkSync(collabLockPath());
+    } catch {
+    }
+  }
+}
 
 // ../mode-collaborative/dist/collab-loop.js
 var POLL_MS = 500;
@@ -138860,47 +139151,56 @@ async function* runCollaborative(ctx, deps) {
     yield await ctx.emit(assistant(ctx, "Collaborative mode needs a task to work on."));
     return;
   }
-  const runId = collabRunId(String(ctx.sessionId), String(ctx.turnId));
-  mkdirSync(collabRunDir(runId), { recursive: true });
-  const { installed: gitInstalled2, repo: gitRepo } = await detectGit(cwd2);
-  const parallel = cfg.concurrency === "parallel" && gitRepo;
-  if (!parallel) {
-    yield await ctx.emit(plugin4(ctx, "collab_fallback_sequential", {
-      reason: !gitInstalled2 ? "git is not installed \u2014 running agents sequentially in your workspace" : !gitRepo ? "this folder is not a git repository \u2014 running agents sequentially in your workspace" : "sequential mode selected"
-    }));
-  }
-  let baseSha = "";
-  if (parallel) {
-    const base2 = await resolveBase(cwd2);
-    baseSha = base2.baseSha;
+  const lock = tryAcquireCollabLock({ sessionId: String(ctx.sessionId), task, startedAtMs: Date.now() });
+  if (!lock.ok) {
+    yield await ctx.emit(plugin4(ctx, "collab_blocked", { reason: "already-running", holderTask: lock.holder.task }));
+    yield await ctx.emit(assistant(ctx, `A collaboration is already running ("${lock.holder.task}"). Only one runs at a time to save resources \u2014 stop it first, then start again.`));
+    return;
   }
+  const runId = collabRunId(String(ctx.sessionId), String(ctx.turnId));
   const worktrees = /* @__PURE__ */ new Map();
-  const architectEntry = {
-    id: ARCHITECT_AGENT_ID,
-    name: "Architect",
-    role: "architect",
-    subtask: task
-  };
-  const hub = await createCollaborationHub({
-    socketPath: hubSocketPath(runId),
-    task,
-    roster: [architectEntry],
-    peerReader: peerReaderFor(worktrees, baseSha)
-  });
-  registerActiveHub(String(ctx.sessionId), hub);
-  const unsubscribe = hub.subscribe((e3) => {
-    void ctx.emit(toCollabEvent(ctx, e3));
-  });
-  const supervisorOpts = {
-    runId,
-    hubSocket: hub.socketPath,
-    coordinatorSessionId: String(ctx.sessionId),
-    parentTask: task,
-    ...cfg.defaultModel ? { defaultModel: cfg.defaultModel } : {},
-    signal: ctx.signal
-  };
-  const supervisor = (deps.createSupervisor ?? ((o2) => new PeerSupervisor(o2)))(supervisorOpts, hub);
+  let hub = null;
+  let supervisor = null;
+  let unsubscribe = null;
   try {
+    mkdirSync(collabRunDir(runId), { recursive: true });
+    const { installed: gitInstalled2, repo: gitRepo } = await detectGit(cwd2);
+    const parallel = cfg.concurrency === "parallel" && gitRepo;
+    if (!parallel) {
+      yield await ctx.emit(plugin4(ctx, "collab_fallback_sequential", {
+        reason: !gitInstalled2 ? "git is not installed \u2014 running agents sequentially in your workspace" : !gitRepo ? "this folder is not a git repository \u2014 running agents sequentially in your workspace" : "sequential mode selected"
+      }));
+    }
+    let baseSha = "";
+    if (parallel) {
+      const base2 = await resolveBase(cwd2, { snapshotDirty: true });
+      baseSha = base2.baseSha;
+    }
+    const architectEntry = {
+      id: ARCHITECT_AGENT_ID,
+      name: "Architect",
+      role: "architect",
+      subtask: task
+    };
+    hub = await createCollaborationHub({
+      socketPath: hubSocketPath(runId),
+      task,
+      roster: [architectEntry],
+      peerReader: peerReaderFor(worktrees, baseSha)
+    });
+    registerActiveHub(String(ctx.sessionId), hub);
+    unsubscribe = hub.subscribe((e3) => {
+      void ctx.emit(toCollabEvent(ctx, e3));
+    });
+    const supervisorOpts = {
+      runId,
+      hubSocket: hub.socketPath,
+      coordinatorSessionId: String(ctx.sessionId),
+      parentTask: task,
+      ...cfg.defaultModel ? { defaultModel: cfg.defaultModel } : {},
+      signal: ctx.signal
+    };
+    supervisor = (deps.createSupervisor ?? ((o2) => new PeerSupervisor(o2)))(supervisorOpts, hub);
     yield await ctx.emit(plugin4(ctx, "collab_started", { task, parallel, gitInstalled: gitInstalled2, gitRepo }));
     supervisor.spawn({ entry: architectEntry, cwd: cwd2, mode: COLLAB_ARCHITECT_MODE_NAME });
     yield await ctx.emit(plugin4(ctx, "collab_agent_spawned", { id: ARCHITECT_AGENT_ID, role: "architect" }));
@@ -138998,10 +139298,14 @@ ${summaryBlock}${mergeNote ? `
 ${mergeNote}` : ""}`));
     yield await ctx.emit(plugin4(ctx, "collab_completed", { done: doneIds, total: roster.length }));
   } finally {
-    await supervisor.shutdownAll("collaboration complete");
-    unsubscribe();
+    if (supervisor)
+      await supervisor.shutdownAll("collaboration complete");
+    if (unsubscribe)
+      unsubscribe();
     unregisterActiveHub(String(ctx.sessionId));
-    await hub.close();
+    if (hub)
+      await hub.close();
+    releaseCollabLock(String(ctx.sessionId));
   }
 }
 function lastUserPromptText(ctx) {
@@ -139655,6 +139959,7 @@ var import_grammy6 = __toESM(require_mod2());
 
 // ../plugin-telegram/dist/channel.js
 var import_grammy5 = __toESM(require_mod2());
+init_dist();
 
 // ../plugin-telegram/dist/permission.js
 var TelegramPermissionResolver = class {
@@ -140111,7 +140416,16 @@ function composeFrame(snap) {
   return parts.join("\n\n");
 }
 function stripHtml(html) {
-  return html.replace(/<\/?[a-z][^>]*>/gi, "").replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"');
+  return html.replace(/<\/?[a-z][^>]*>/gi, "").replace(/&#(\d+);/g, (_2, dec) => safeFromCodePoint(parseInt(dec, 10))).replace(/&#x([0-9a-f]+);/gi, (_2, hex) => safeFromCodePoint(parseInt(hex, 16))).replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&amp;/g, "&");
+}
+function safeFromCodePoint(cp) {
+  if (!Number.isFinite(cp) || cp < 0 || cp > 1114111)
+    return "";
+  try {
+    return String.fromCodePoint(cp);
+  } catch {
+    return "";
+  }
 }
 function truncate3(s2, n2) {
   return s2.length <= n2 ? s2 : s2.slice(0, n2) + "\u2026";
@@ -140882,13 +141196,11 @@ function mapChoice(choice) {
 }
 
 // ../plugin-telegram/dist/channel/turn-runner.js
-init_dist();
 async function runUserTurn(ctx, deps, opts) {
   const { session, bot, framePump, typing, logger } = deps;
-  const { chatId, text, model, controller } = opts;
+  const { chatId, text, model, controller, turnId } = opts;
   framePump.beginTurn(chatId);
   typing.start(bot, chatId);
-  const turnId = newTurnId();
   const unsubscribe = session.log.subscribe((event) => {
     if (event.turnId !== turnId)
       return;
@@ -141089,6 +141401,12 @@ var TelegramChannel = class {
   // without poisoning the session-level signal (which other channels
   // sharing the same Session would also observe).
   turnController = null;
+  // turnIds of turns THIS channel initiated. mirrorForeignTurn filters on these
+  // (invariant #8: filter event-log subscribers by turnId when multiplexing
+  // turns on one Session) rather than the coarse `busy` flag alone — so an
+  // assistant_message dispatched for our own turn AFTER `busy` flips false
+  // (async event ordering / RemoteSession replay) isn't re-mirrored as foreign.
+  ownTurnIds = /* @__PURE__ */ new Set();
   // When a user clicks an approval option that needs text follow-up
   // (e.g. plan-execute "Redraft with feedback"), we stash the
   // approval+option pair and capture the user's NEXT message as the
@@ -141234,6 +141552,13 @@ var TelegramChannel = class {
     const controller = new AbortController();
     this.turnController = controller;
     const effectiveModel = this.activeModelOverride ?? this.model;
+    const turnId = newTurnId();
+    this.ownTurnIds.add(turnId);
+    if (this.ownTurnIds.size > 64) {
+      const oldest = this.ownTurnIds.values().next().value;
+      if (oldest !== void 0)
+        this.ownTurnIds.delete(oldest);
+    }
     try {
       await runUserTurn(ctx, {
         session: this.session,
@@ -141241,7 +141566,7 @@ var TelegramChannel = class {
         framePump: this.framePump,
         typing: this.typing,
         ...this.opts.logger ? { logger: this.opts.logger } : {}
-      }, { chatId, text, model: effectiveModel, controller });
+      }, { chatId, text, model: effectiveModel, controller, turnId });
     } finally {
       this.busy = false;
       this.turnController = null;
@@ -141255,7 +141580,11 @@ var TelegramChannel = class {
    * avoid parse-mode pitfalls; the view itself lives on the web surface.
    */
   mirrorForeignTurn(event) {
-    if (event.type !== "assistant_message" || this.busy)
+    if (event.type !== "assistant_message")
+      return;
+    if (this.ownTurnIds.has(event.turnId))
+      return;
+    if (this.busy)
       return;
     if (!this.bot || this.lastChatId == null)
       return;
@@ -142332,10 +142661,16 @@ async function runPairFlow(ctx) {
     await session.close("SIGINT").catch(() => void 0);
     process.exit(0);
   };
-  process.on("SIGINT", () => void shutdown());
-  process.on("SIGTERM", () => void shutdown());
-  await handle2.running;
-  return 0;
+  const onSignal = () => void shutdown();
+  process.once("SIGINT", onSignal);
+  process.once("SIGTERM", onSignal);
+  try {
+    await handle2.running;
+    return 0;
+  } finally {
+    process.removeListener("SIGINT", onSignal);
+    process.removeListener("SIGTERM", onSignal);
+  }
 }
 
 // ../plugin-telegram/dist/setup-wizard.js
@@ -142582,8 +142917,8 @@ function buildTelegramPlugin(opts) {
           if (!targetChat) {
             throw new Error("no authorized chat \u2014 run `moxxy channels telegram pair` first or pass `chatId` explicitly");
           }
-          const bot = new import_grammy6.Bot(token);
-          await bot.api.sendMessage(targetChat, text, parseMode ? { parse_mode: parseMode } : {});
+          const api = new import_grammy6.Api(token);
+          await api.sendMessage(targetChat, text, parseMode ? { parse_mode: parseMode } : {});
           return { delivered: true, chatId: targetChat, length: text.length };
         }
       }),
@@ -142816,6 +143151,9 @@ var HttpChannel = class {
     this.permissionResolver = opts.allowedTools && opts.allowedTools.length > 0 ? createAllowListResolver([...opts.allowedTools]) : denyByDefaultResolver;
   }
   async start(startOpts) {
+    if (this.server) {
+      throw new Error("HttpChannel is already started \u2014 call stop() before starting again.");
+    }
     const ctx = {
       session: startOpts.session,
       authToken: this.authToken,
@@ -142874,11 +143212,16 @@ var HttpChannel = class {
     return {
       running,
       stop: async () => {
+        const srv = this.server;
         await new Promise((resolve12) => {
-          if (!this.server)
+          if (!srv)
             return resolve12();
-          this.server.close(() => resolve12());
+          srv.close(() => resolve12());
         });
+        if (this.server === srv) {
+          this.server = null;
+          this.boundPortValue = 0;
+        }
       }
     };
   }
@@ -143052,13 +143395,19 @@ async function pidCommand2(pid) {
 function looksLikeMoxxy(command) {
   return command.length > 0 && /moxxy/i.test(command);
 }
-async function freeTcpPortIfMoxxy(port, logger) {
+var realFreePortDeps = {
+  pidsListeningOn,
+  pidCommand: pidCommand2,
+  kill: (pid, signal) => process.kill(pid, signal),
+  graceMs: 400
+};
+async function freeTcpPortIfMoxxy(port, logger, deps = realFreePortDeps) {
   if (process.platform === "win32")
     return false;
-  const pids = (await pidsListeningOn(port)).filter((pid) => pid !== process.pid);
+  const pids = (await deps.pidsListeningOn(port)).filter((pid) => pid !== process.pid);
   if (pids.length === 0)
     return false;
-  const holders = await Promise.all(pids.map(async (pid) => ({ pid, command: await pidCommand2(pid) })));
+  const holders = await Promise.all(pids.map(async (pid) => ({ pid, command: await deps.pidCommand(pid) })));
   const foreign = holders.filter((h3) => !looksLikeMoxxy(h3.command));
   if (foreign.length > 0) {
     logger?.warn?.(`port ${port} is held by non-moxxy process(es); not killing them`, {
@@ -143066,17 +143415,29 @@ async function freeTcpPortIfMoxxy(port, logger) {
     });
     return false;
   }
+  let attempted = false;
   for (const { pid } of holders) {
+    if (!looksLikeMoxxy(await deps.pidCommand(pid)))
+      continue;
     try {
-      process.kill(pid, "SIGTERM");
+      deps.kill(pid, "SIGTERM");
+      attempted = true;
     } catch {
     }
   }
-  await new Promise((r2) => setTimeout(r2, 400));
+  if (!attempted)
+    return false;
+  await new Promise((r2) => setTimeout(r2, deps.graceMs ?? 400));
   for (const { pid } of holders) {
     try {
-      process.kill(pid, 0);
-      process.kill(pid, "SIGKILL");
+      deps.kill(pid, 0);
+    } catch {
+      continue;
+    }
+    if (!looksLikeMoxxy(await deps.pidCommand(pid)))
+      continue;
+    try {
+      deps.kill(pid, "SIGKILL");
     } catch {
     }
   }
@@ -143634,6 +143995,7 @@ async function createWebSocketTransportServer(opts) {
   let currentToken = opts.authToken;
   let currentAllowedOrigins = opts.allowedOrigins ?? [];
   let connections = 0;
+  let pending2 = 0;
   const wss = new import_websocket_server.default({
     host,
     port: opts.port,
@@ -143643,11 +144005,14 @@ async function createWebSocketTransportServer(opts) {
         console.warn(`[moxxy] ws bridge: rejected browser-origin upgrade (Origin: ${String(info.req.headers.origin)})`);
         return false;
       }
-      if (connections >= maxConnections) {
+      if (connections + pending2 >= maxConnections) {
         console.warn(`[moxxy] ws bridge: rejected upgrade \u2014 connection cap (${maxConnections}) reached`);
         return false;
       }
-      return checkWsAuth(info.req, currentToken, { allowQueryToken: opts.allowQueryToken });
+      const ok = checkWsAuth(info.req, currentToken, { allowQueryToken: opts.allowQueryToken });
+      if (ok)
+        pending2 += 1;
+      return ok;
     },
     // When the client offers subprotocols (the moxxy.bearer.* convention),
     // select the moxxy protocol WITHOUT echoing the token-bearing entry back.
@@ -143655,6 +144020,8 @@ async function createWebSocketTransportServer(opts) {
   });
   const connectionHandlers = [];
   wss.on("connection", (ws) => {
+    if (pending2 > 0)
+      pending2 -= 1;
     connections += 1;
     ws.once("close", () => {
       connections -= 1;
@@ -143762,6 +144129,7 @@ var optionalWorkspace = z.string().min(1).max(256).optional();
 var MAX_AUDIO_BASE64 = 4e7;
 var MAX_INLINE_ATTACHMENT_CONTENT = 12e6;
 var commandName = z.string().min(1).max(64).regex(/^[A-Za-z0-9][A-Za-z0-9._-]*$/, "invalid command name");
+var appId = z.string().min(1).max(64).regex(/^[a-z][a-z0-9-]*$/, "invalid app id");
 var workflowName = z.string().min(1).max(200).refine((s2) => !s2.includes("..") && !s2.includes("/") && !s2.includes("\\"), "invalid workflow name");
 var ipcInputSchemas = {
   // No-arg, but spawns a child process (npm install) — pin the payload to
@@ -143871,6 +144239,20 @@ var ipcInputSchemas = {
   "settings.writeSkill": z.object({ name: skillName, body: z.string().max(1e6) }),
   "settings.readSkill": z.object({ name: skillName }),
   "settings.deleteSkill": z.object({ name: skillName }),
+  // Desktop apps: appId keys the per-app install dir + a network download, so
+  // pin it to a non-traversing slug. (pickDocument is no-arg → see below.)
+  "apps.status": z.object({ appId }),
+  "apps.install": z.object({ appId }),
+  "apps.uninstall": z.object({ appId }),
+  // Anonymizer: parseDocument reads a file (bound the path), saveRedacted writes
+  // one (bound name + cap content so a renderer can't OOM main). pickDocument
+  // takes nothing — pin it to "nothing" so no args can be smuggled across.
+  "anonymizer.pickDocument": z.undefined(),
+  "anonymizer.parseDocument": z.object({ path: z.string().min(1).max(4096) }),
+  "anonymizer.saveRedacted": z.object({
+    suggestedName: z.string().min(1).max(255),
+    content: z.string().max(2e7)
+  }),
   "desks.create": z.object({ name: z.string().min(1).max(200), cwd: z.string().min(1).max(4096) }),
   // Mirror desks.create's name bounds — rename writes the name into the desks
   // JSON, so an unbounded string would let a renderer bloat the state file.
@@ -144105,6 +144487,7 @@ var MobileSessionHost = class {
     this.bus.handle("session.newSession", async () => {
       for (const controller of this.turns.values())
         controller.abort();
+      this.autoApprove = false;
       if (this.session.reset)
         await this.session.reset();
       else
@@ -144251,6 +144634,8 @@ var MobileSessionHost = class {
     return { turnId };
   }
   openAsk(req) {
+    if (this.disposed)
+      return Promise.resolve({ mode: "deny" });
     const requestId = `ask-${++this.askCounter}`;
     return new Promise((resolve12) => {
       this.pendingAsks.set(requestId, resolve12);
@@ -144562,7 +144947,7 @@ function htmlToMarkdown(html, opts = {}) {
 ${"#".repeat(Number(lvl))} ${stripTags(inner).trim()}
 
 `);
-  body = body.replace(/<a\b[^>]*\bhref="([^"]+)"[^>]*>([\s\S]*?)<\/a>/gi, (_2, href, inner) => `[${stripTags(inner).trim()}](${href})`);
+  body = body.replace(/<a\b[^>]*\bhref=(?:"([^"]+)"|'([^']+)'|([^\s>]+))[^>]*>([\s\S]*?)<\/a>/gi, (_2, dq, sq, uq, inner) => `[${stripTags(inner).trim()}](${dq ?? sq ?? uq})`);
   body = body.replace(/<pre\b[^>]*>([\s\S]*?)<\/pre>/gi, (_2, inner) => `
 
 \`\`\`
@@ -145479,6 +145864,8 @@ var TerminalProcessImpl = class {
       child.stderr.on("data", (b3) => this.emitData(b3.toString("utf8")));
       child.on("exit", (code) => this.emitExit(code ?? 0));
       child.on("error", () => this.emitExit(1));
+      child.stdin.on("error", () => {
+      });
     }
   }
   emitData(d2) {
@@ -145518,10 +145905,13 @@ var TerminalProcessImpl = class {
   write(data) {
     if (!this.alive)
       return;
-    if (this.pty)
-      this.pty.write(data);
-    else
-      this.child?.stdin.write(data);
+    try {
+      if (this.pty)
+        this.pty.write(data);
+      else
+        this.child?.stdin.write(data);
+    } catch {
+    }
   }
   resize(cols, rows) {
     if (this.pty && this.alive) {
@@ -146137,16 +146527,16 @@ function buildProviderAdminPlugin(opts) {
 // ../plugin-usage-stats/dist/index.js
 init_dist();
 function buildUsageStatsPlugin(opts = {}) {
-  let cursor = 0;
+  let initMaxSeq = null;
   return definePlugin({
     name: "@moxxy/plugin-usage-stats",
     version: "0.0.0",
     hooks: {
       onInit(ctx) {
-        cursor = ctx.log.length;
+        initMaxSeq = maxSeq(ctx.log.slice());
       },
       async onShutdown(ctx) {
-        const live = ctx.log.slice(cursor);
+        const live = initMaxSeq === null ? ctx.log.slice() : ctx.log.slice().filter((e3) => e3.seq > initMaxSeq);
         if (live.length === 0)
           return;
         const delta = summarizeTokensByModel(live);
@@ -146155,6 +146545,13 @@ function buildUsageStatsPlugin(opts = {}) {
     }
   });
 }
+function maxSeq(events) {
+  let max = null;
+  for (const e3 of events)
+    if (max === null || e3.seq > max)
+      max = e3.seq;
+  return max;
+}
 var infoCmd = {
   name: "info",
   description: "Show provider \xB7 model \xB7 mode \xB7 plugin/skill counts",
@@ -146247,36 +146644,25 @@ async function compactSession(session) {
   if (events.length === 0) {
     return { kind: "text", text: "nothing to compact: event log is empty" };
   }
-  const providerCtxWindow = resolveActiveContextWindow(s2);
   const provider = safe(() => s2.providers?.getActive()) ?? void 0;
   const model = provider?.models[0]?.id;
+  const contextWindow = provider?.models[0]?.contextWindow;
   try {
-    const result = await compactor.compact(events, {
-      log: s2.log.asReader ? s2.log.asReader() : s2.log,
-      budget: {
-        contextWindow: providerCtxWindow,
-        estimatedTokens: estimateContextTokens$1(s2.log.asReader ? s2.log.asReader() : s2.log),
-        reserveForOutput: 0
-      },
-      signal: s2.signal ?? new AbortController().signal,
+    const result = await runManualCompaction({
+      compactor,
+      log: s2.log,
+      signal: s2.signal,
       ...provider ? { provider } : {},
-      ...model ? { model } : {}
+      ...model !== void 0 ? { model } : {},
+      ...contextWindow !== void 0 ? { contextWindow } : {},
+      ...s2.id !== void 0 ? { sessionId: s2.id } : {}
     });
-    if (result.tokensSaved <= 0 || result.summary.trim().length === 0) {
+    if (!result.compacted) {
       return { kind: "text", text: "nothing to compact yet" };
     }
-    const lastEvent = events[events.length - 1];
-    const emittable = {
-      sessionId: s2.id ?? lastEvent?.sessionId,
-      turnId: lastEvent?.turnId,
-      source: "compactor",
-      ...result
-    };
-    await s2.log.append(emittable);
-    const compactedEvents = result.replacedRange[1] - result.replacedRange[0] + 1;
     return {
       kind: "text",
-      text: `context compacted: ${formatCount2(compactedEvents)} ${plural2(compactedEvents, "event")}, ~${formatTokenCount2(result.tokensSaved)} tokens saved`
+      text: `context compacted: ${formatCount2(result.eventsCompacted)} ${plural2(result.eventsCompacted, "event")}, ~${formatTokenCount2(result.tokensSaved)} tokens saved`
     };
   } catch (err) {
     return {
@@ -146285,17 +146671,6 @@ async function compactSession(session) {
     };
   }
 }
-function resolveActiveContextWindow(s2) {
-  try {
-    const provider = s2.providers?.getActive();
-    if (!provider)
-      return Number.MAX_SAFE_INTEGER;
-    const window2 = provider.models[0]?.contextWindow;
-    return window2 && window2 > 0 ? window2 : Number.MAX_SAFE_INTEGER;
-  } catch {
-    return Number.MAX_SAFE_INTEGER;
-  }
-}
 function formatCount2(value) {
   return new Intl.NumberFormat("en-US").format(value);
 }
@@ -146348,15 +146723,26 @@ function buildViewPlugin(opts) {
   });
 }
 var IS_DARWIN = process.platform === "darwin";
+function procFailureCause(proc, timeoutMs) {
+  if (proc.timedOut) {
+    return timeoutMs ? `timed out after ${timeoutMs}ms` : "timed out";
+  }
+  if (proc.aborted)
+    return "aborted (turn cancelled)";
+  return "";
+}
 function runProcess2(cmd, args, opts = {}) {
   return new Promise((resolve12, reject) => {
     const child = spawn(cmd, [...args], { stdio: ["pipe", "pipe", "pipe"] });
     const stdoutChunks = [];
     let stderr = "";
     let settled = false;
+    let timedOut = false;
+    let aborted = false;
     const onAbort = () => {
       if (settled)
         return;
+      aborted = true;
       try {
         child.kill("SIGTERM");
       } catch {
@@ -146366,6 +146752,7 @@ function runProcess2(cmd, args, opts = {}) {
     const timer = opts.timeoutMs ? setTimeout(() => {
       if (settled)
         return;
+      timedOut = true;
       try {
         child.kill("SIGTERM");
       } catch {
@@ -146396,7 +146783,9 @@ function runProcess2(cmd, args, opts = {}) {
       resolve12({
         exitCode: code ?? -1,
         stdout: Buffer.concat(stdoutChunks).toString("utf8"),
-        stderr
+        stderr,
+        timedOut,
+        aborted
       });
     });
     if (opts.input !== void 0) {
@@ -146429,10 +146818,11 @@ var applescriptTool = defineTool({
       timeoutMs: 3e4
     });
     if (proc.exitCode !== 0) {
+      const cause = procFailureCause(proc, 3e4);
       throw new MoxxyError({
         code: "TOOL_ERROR",
-        message: `osascript failed (exit ${proc.exitCode}): ${proc.stderr.trim() || "(no error message)"}`,
-        context: { tool: "computer_applescript", exitCode: proc.exitCode }
+        message: cause ? `osascript ${cause}` : `osascript failed (exit ${proc.exitCode}): ${proc.stderr.trim() || "(no error message)"}`,
+        context: { tool: "computer_applescript", exitCode: proc.exitCode, timedOut: proc.timedOut ? 1 : 0 }
       });
     }
     return { ok: true, output: proc.stdout.trim() };
@@ -146460,10 +146850,11 @@ end tell`;
       timeoutMs: 1e4
     });
     if (proc.exitCode !== 0) {
+      const cause = procFailureCause(proc, 1e4);
       throw new MoxxyError({
         code: "TOOL_ERROR",
-        message: `click failed (exit ${proc.exitCode}): ${proc.stderr.trim() || "(check Accessibility permission in System Settings \u2192 Privacy & Security \u2192 Accessibility)"}`,
-        context: { tool: "computer_click", exitCode: proc.exitCode }
+        message: cause ? `click ${cause}` : `click failed (exit ${proc.exitCode}): ${proc.stderr.trim() || "(check Accessibility permission in System Settings \u2192 Privacy & Security \u2192 Accessibility)"}`,
+        context: { tool: "computer_click", exitCode: proc.exitCode, timedOut: proc.timedOut ? 1 : 0 }
       });
     }
     return { ok: true, x: x4, y: y2, count: n2 };
@@ -146485,10 +146876,11 @@ var clipboardTool = defineTool({
         timeoutMs: 5e3
       });
       if (proc2.exitCode !== 0) {
+        const cause = procFailureCause(proc2, 5e3);
         throw new MoxxyError({
           code: "TOOL_ERROR",
-          message: `pbpaste failed (exit ${proc2.exitCode}): ${proc2.stderr.trim()}`,
-          context: { tool: "computer_clipboard", exitCode: proc2.exitCode }
+          message: cause ? `pbpaste ${cause}` : `pbpaste failed (exit ${proc2.exitCode}): ${proc2.stderr.trim()}`,
+          context: { tool: "computer_clipboard", exitCode: proc2.exitCode, timedOut: proc2.timedOut ? 1 : 0 }
         });
       }
       return { ok: true, text: proc2.stdout };
@@ -146506,10 +146898,11 @@ var clipboardTool = defineTool({
       timeoutMs: 5e3
     });
     if (proc.exitCode !== 0) {
+      const cause = procFailureCause(proc, 5e3);
       throw new MoxxyError({
         code: "TOOL_ERROR",
-        message: `pbcopy failed (exit ${proc.exitCode}): ${proc.stderr.trim()}`,
-        context: { tool: "computer_clipboard", exitCode: proc.exitCode }
+        message: cause ? `pbcopy ${cause}` : `pbcopy failed (exit ${proc.exitCode}): ${proc.stderr.trim()}`,
+        context: { tool: "computer_clipboard", exitCode: proc.exitCode, timedOut: proc.timedOut ? 1 : 0 }
       });
     }
     return { ok: true, length: text.length };
@@ -146547,6 +146940,16 @@ var KEY_CODES = {
   f11: 103,
   f12: 111
 };
+var WHITESPACE_KEY_CODES = {
+  " ": 49,
+  // space
+  "	": 48,
+  // tab
+  "\r": 36,
+  // return
+  "\n": 36
+  // return
+};
 var keyTool = defineTool({
   name: "computer_key",
   description: "Send a single key chord with optional modifiers. Use this for shortcuts (cmd+c, cmd+tab, cmd+shift+4) and named keys (return, tab, escape, arrows, page_up/down, f1\u2013f12). For typing arbitrary text, use computer_type.",
@@ -146564,10 +146967,11 @@ var keyTool = defineTool({
       timeoutMs: 1e4
     });
     if (proc.exitCode !== 0) {
+      const cause = procFailureCause(proc, 1e4);
       throw new MoxxyError({
         code: "TOOL_ERROR",
-        message: `key failed (exit ${proc.exitCode}): ${proc.stderr.trim() || "(check Accessibility permission)"}`,
-        context: { tool: "computer_key", exitCode: proc.exitCode }
+        message: cause ? `key ${cause}` : `key failed (exit ${proc.exitCode}): ${proc.stderr.trim() || "(check Accessibility permission)"}`,
+        context: { tool: "computer_key", exitCode: proc.exitCode, timedOut: proc.timedOut ? 1 : 0 }
       });
     }
     return { ok: true, key, modifiers: mods };
@@ -146579,6 +146983,12 @@ function buildKeyScript(key, modifiers) {
   if (lower2 in KEY_CODES) {
     return `tell application "System Events" to key code ${KEY_CODES[lower2]}${usingClause}`;
   }
+  if (key.length === 1) {
+    const wsCode = WHITESPACE_KEY_CODES[key];
+    if (wsCode !== void 0) {
+      return `tell application "System Events" to key code ${wsCode}${usingClause}`;
+    }
+  }
   if (key.length === 1) {
     const literal3 = `"${key.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
     return `tell application "System Events" to keystroke ${literal3}${usingClause}`;
@@ -146630,10 +147040,11 @@ var openTool = defineTool({
       timeoutMs: 1e4
     });
     if (proc.exitCode !== 0) {
+      const cause = procFailureCause(proc, 1e4);
       throw new MoxxyError({
         code: "TOOL_ERROR",
-        message: `open failed (exit ${proc.exitCode}): ${proc.stderr.trim() || "(no error message)"}`,
-        context: { tool: "computer_open", exitCode: proc.exitCode }
+        message: cause ? `open ${cause}` : `open failed (exit ${proc.exitCode}): ${proc.stderr.trim() || "(no error message)"}`,
+        context: { tool: "computer_open", exitCode: proc.exitCode, timedOut: proc.timedOut ? 1 : 0 }
       });
     }
     return { ok: true, app, target };
@@ -146664,7 +147075,8 @@ var screenshotTool = defineTool({
     const fmt2 = format ?? DEFAULT_FORMAT;
     const dim3 = maxDim ?? DEFAULT_MAX_DIM;
     const q3 = quality ?? DEFAULT_JPEG_QUALITY;
-    const captureTmp = path3.join(os5.tmpdir(), `moxxy-screencap-${process.pid}-${Date.now()}.png`);
+    const uniq = randomUUID();
+    const captureTmp = path3.join(os5.tmpdir(), `moxxy-screencap-${process.pid}-${Date.now()}-${uniq}.png`);
     const captureArgs = ["-x", "-t", "png"];
     if (region) {
       captureArgs.push("-R", `${region.x},${region.y},${region.width},${region.height}`);
@@ -146675,14 +147087,15 @@ var screenshotTool = defineTool({
       timeoutMs: 15e3
     });
     if (cap.exitCode !== 0) {
+      const cause = procFailureCause(cap, 15e3);
       throw new MoxxyError({
         code: "TOOL_ERROR",
-        message: `screencapture failed (exit ${cap.exitCode}): ${cap.stderr.trim() || "(no stderr \u2014 likely Screen Recording permission missing \u2014 grant in System Settings \u2192 Privacy & Security)"}`,
-        context: { tool: "computer_screenshot", exitCode: cap.exitCode }
+        message: cause ? `screencapture ${cause}` : `screencapture failed (exit ${cap.exitCode}): ${cap.stderr.trim() || "(no stderr \u2014 likely Screen Recording permission missing \u2014 grant in System Settings \u2192 Privacy & Security)"}`,
+        context: { tool: "computer_screenshot", exitCode: cap.exitCode, timedOut: cap.timedOut ? 1 : 0 }
       });
     }
     const outExt = fmt2 === "jpeg" ? "jpg" : "png";
-    const outTmp = path3.join(os5.tmpdir(), `moxxy-screencap-${process.pid}-${Date.now()}-out.${outExt}`);
+    const outTmp = path3.join(os5.tmpdir(), `moxxy-screencap-${process.pid}-${Date.now()}-${uniq}-out.${outExt}`);
     const sipsArgs = [
       "-Z",
       String(dim3),
@@ -146701,10 +147114,11 @@ var screenshotTool = defineTool({
     await promises.rm(captureTmp, { force: true });
     if (sip.exitCode !== 0) {
       await promises.rm(outTmp, { force: true });
+      const cause = procFailureCause(sip, 15e3);
       throw new MoxxyError({
         code: "TOOL_ERROR",
-        message: `sips resize/convert failed (exit ${sip.exitCode}): ${sip.stderr.trim() || "(no error message)"}`,
-        context: { tool: "computer_screenshot", exitCode: sip.exitCode }
+        message: cause ? `sips resize/convert ${cause}` : `sips resize/convert failed (exit ${sip.exitCode}): ${sip.stderr.trim() || "(no error message)"}`,
+        context: { tool: "computer_screenshot", exitCode: sip.exitCode, timedOut: sip.timedOut ? 1 : 0 }
       });
     }
     try {
@@ -146747,10 +147161,11 @@ var typeTool = defineTool({
       timeoutMs: 3e4
     });
     if (proc.exitCode !== 0) {
+      const cause = procFailureCause(proc, 3e4);
       throw new MoxxyError({
         code: "TOOL_ERROR",
-        message: `type failed (exit ${proc.exitCode}): ${proc.stderr.trim() || "(check Accessibility permission)"}`,
-        context: { tool: "computer_type", exitCode: proc.exitCode }
+        message: cause ? `type ${cause}` : `type failed (exit ${proc.exitCode}): ${proc.stderr.trim() || "(check Accessibility permission)"}`,
+        context: { tool: "computer_type", exitCode: proc.exitCode, timedOut: proc.timedOut ? 1 : 0 }
       });
     }
     return { ok: true, length: text.length };
@@ -147254,6 +147669,8 @@ var stepSchema = z.object({
   needs: z.array(z.string().min(1)).default([]),
   when: z.string().min(1).optional(),
   onError: z.enum(["fail", "continue", "retry"]).default("fail"),
+  // `retries` only takes effect when `onError: 'retry'`; with 'fail'/'continue'
+  // the step runs exactly one attempt (see runStep in executor/steps.ts).
   retries: z.number().int().min(0).max(3).default(0),
   label: z.string().max(60).optional(),
   format: z.enum(["json", "plain"]).optional(),
@@ -147682,7 +148099,16 @@ async function loadDir2(dir, scope, logger) {
     if (!entry.isFile() || !/\.ya?ml$/i.test(entry.name))
       continue;
     const full = path3.join(dir, entry.name);
-    const raw = await promises.readFile(full, "utf8");
+    let raw;
+    try {
+      raw = await promises.readFile(full, "utf8");
+    } catch (err) {
+      logger?.warn?.("workflow: unreadable file, skipping", {
+        path: full,
+        error: err instanceof Error ? err.message : String(err)
+      });
+      continue;
+    }
     const result = parseWorkflowYaml(raw);
     if (!result.ok || !result.workflow) {
       logger?.warn?.("workflow: invalid file, skipping", { path: full, errors: result.errors });
@@ -147719,6 +148145,12 @@ var WorkflowStore = class {
   byName = /* @__PURE__ */ new Map();
   opts;
   loaded = false;
+  // Per-instance lock (invariant: serialize whole-map RMW). A reload
+  // (`load()` clears then refills byName) must never interleave with a save
+  // (read byName → write file → set byName) — e.g. an autonomous onChanged
+  // re-sync racing a user `/workflows enable`, or two concurrent toggles —
+  // or the in-memory registry briefly desyncs from disk.
+  mutex = createMutex();
   constructor(opts) {
     this.opts = opts;
   }
@@ -147730,6 +148162,14 @@ var WorkflowStore = class {
   }
   /** (Re)scan all sources and rebuild the in-memory map. */
   async load() {
+    await this.mutex.run(() => this.loadUnlocked());
+  }
+  /**
+   * Rebuild the map without acquiring the mutex — only call from a context
+   * that already holds it (mutators below), so the clear+refill is atomic
+   * with respect to other mutators.
+   */
+  async loadUnlocked() {
     const discovered = await discoverWorkflows({
       userDir: this.userDir(),
       projectDir: this.projectDir(),
@@ -147742,6 +148182,10 @@ var WorkflowStore = class {
       this.byName.set(wf.workflow.name, wf);
     this.loaded = true;
   }
+  async ensureLoadedUnlocked() {
+    if (!this.loaded)
+      await this.loadUnlocked();
+  }
   async ensureLoaded() {
     if (!this.loaded)
       await this.load();
@@ -147760,17 +148204,19 @@ var WorkflowStore = class {
   }
   /** Write a new workflow file and register it. Rejects duplicate names. */
   async create(workflow, scope) {
-    await this.ensureLoaded();
-    if (this.byName.has(workflow.name)) {
-      throw new Error(`workflow "${workflow.name}" already exists \u2014 use update instead`);
-    }
-    const dir = scope === "project" ? this.projectDir() : this.userDir();
-    await promises.mkdir(dir, { recursive: true });
-    const file = await uniqueFilename2(dir, workflow.name);
-    await writeFileAtomic(file, serializeWorkflow(workflow));
-    const entry = { workflow, path: file, scope };
-    this.byName.set(workflow.name, entry);
-    return entry;
+    return this.mutex.run(async () => {
+      await this.ensureLoadedUnlocked();
+      if (this.byName.has(workflow.name)) {
+        throw new Error(`workflow "${workflow.name}" already exists \u2014 use update instead`);
+      }
+      const dir = scope === "project" ? this.projectDir() : this.userDir();
+      await promises.mkdir(dir, { recursive: true });
+      const file = await uniqueFilename2(dir, workflow.name);
+      await writeFileAtomic(file, serializeWorkflow(workflow));
+      const entry = { workflow, path: file, scope };
+      this.byName.set(workflow.name, entry);
+      return entry;
+    });
   }
   /**
    * Replace a workflow with a new definition. In-place rewrite for user/project
@@ -147781,7 +148227,10 @@ var WorkflowStore = class {
    * rename doesn't leave an orphaned duplicate file + stale entry behind.
    */
   async save(workflow, previousName) {
-    await this.ensureLoaded();
+    return this.mutex.run(() => this.saveUnlocked(workflow, previousName));
+  }
+  async saveUnlocked(workflow, previousName) {
+    await this.ensureLoadedUnlocked();
     const renamed = previousName != null && previousName !== workflow.name ? this.byName.get(previousName) : void 0;
     if (renamed && (renamed.scope === "user" || renamed.scope === "project")) {
       await promises.rm(renamed.path, { force: true });
@@ -147806,24 +148255,28 @@ var WorkflowStore = class {
   }
   /** Toggle a workflow's `enabled` flag, persisting the change. */
   async setEnabled(name, enabled) {
-    await this.ensureLoaded();
-    const existing = this.byName.get(name);
-    if (!existing)
-      return null;
-    return this.save({ ...existing.workflow, enabled });
+    return this.mutex.run(async () => {
+      await this.ensureLoadedUnlocked();
+      const existing = this.byName.get(name);
+      if (!existing)
+        return null;
+      return this.saveUnlocked({ ...existing.workflow, enabled });
+    });
   }
   /** Delete a user/project workflow file. Read-only scopes cannot be deleted. */
   async delete(name) {
-    await this.ensureLoaded();
-    const existing = this.byName.get(name);
-    if (!existing)
-      return { ok: false, reason: "not found" };
-    if (existing.scope !== "user" && existing.scope !== "project") {
-      return { ok: false, reason: `cannot delete a ${existing.scope} workflow` };
-    }
-    await promises.rm(existing.path, { force: true });
-    this.byName.delete(name);
-    return { ok: true };
+    return this.mutex.run(async () => {
+      await this.ensureLoadedUnlocked();
+      const existing = this.byName.get(name);
+      if (!existing)
+        return { ok: false, reason: "not found" };
+      if (existing.scope !== "user" && existing.scope !== "project") {
+        return { ok: false, reason: `cannot delete a ${existing.scope} workflow` };
+      }
+      await promises.rm(existing.path, { force: true });
+      this.byName.delete(name);
+      return { ok: true };
+    });
   }
 };
 async function uniqueFilename2(dir, base2) {
@@ -148127,7 +148580,7 @@ function buildRunResult(ctx, status, ok, extra) {
   };
 }
 async function runStep(step, scope, ctx) {
-  const attempts = 1 + Math.max(0, step.retries);
+  const attempts = step.onError === "retry" ? 1 + Math.max(0, step.retries) : 1;
   let lastError = "";
   for (let attempt = 0; attempt < attempts; attempt++) {
     if (ctx.deps.signal.aborted)
@@ -148648,7 +149101,7 @@ ${userMessage.trim()}${FINALIZE_REPLY_SUFFIX}`;
 var DAG_EXECUTOR_NAME = "dag";
 var dagExecutor = defineWorkflowExecutor({
   name: DAG_EXECUTOR_NAME,
-  description: "DAG runner: steps with settled dependencies are scheduled in waves of up to `concurrency` ready steps, then executed sequentially within each wave (no overlap yet \u2014 `concurrency` caps the batch size, not wall-clock latency).",
+  description: "DAG runner: steps with settled dependencies are scheduled in waves of up to `concurrency` ready steps, then executed sequentially within each wave (no overlap \u2014 `concurrency` caps the batch size drained per pass, not wall-clock latency).",
   run: runExecutor
 });
 
@@ -148715,7 +149168,7 @@ A workflow is a DAG of steps. Schema:
     - args: templated args object for tool/workflow steps
     - needs: [ <upstream step ids> ]  (defines the DAG; omit only for true sources)
     - when (optional, legacy): simple guards only \u2014 '{{ steps.x.output }} is not empty'. Do NOT use when for semantic decisions (use condition/switch).
-    - onError (optional): fail | continue | retry ; retries (optional, 0-3)
+    - onError (optional): fail | continue | retry ; retries (optional, 0-3 \u2014 only applies when onError is retry; fail/continue always run exactly one attempt)
 
 Operator data \u2014 two ways: declare a value the operator can supply UP FRONT as an \`inputs\` field (filled in before Run). To PAUSE mid-run and ask a question whose answer depends on earlier steps, set \`awaitInput: true\` on a prompt or skill step: the workflow pauses, surfaces the step's prompt to the operator, and resumes with their reply once they answer. Prefer \`inputs\` for known-up-front values; use \`awaitInput\` only for genuinely mid-run questions.
 
@@ -149501,46 +149954,61 @@ function buildWorkflowRunner(args) {
   }
   async function resumeNow(runId, reply2) {
     const checkpoint = await defaultWorkflowRunStore.load(runId);
-    const turnId = session.startTurn().turnId;
-    const spawner = createSubagentSpawner({
-      parentSession: session,
-      parentTurnId: turnId,
-      parentSignal: session.signal,
-      parentModel: activeModel(session)
-    });
-    const result = await resumeWorkflowRun(
-      runId,
-      reply2,
-      {
-        spawner,
-        tools: session.tools,
-        lookup: {
-          skill: (n2) => session.skills.byName(n2),
-          workflow: (n2) => store.lookup(n2)
-        },
-        signal: session.signal,
-        now: () => Date.now(),
-        emit: (subtype, payload) => void session.log.append({
-          type: "plugin_event",
-          sessionId: session.id,
-          turnId,
-          source: "plugin",
-          pluginId: PLUGIN_ID3,
-          subtype,
-          payload
-        }),
-        ...logger ? { logger } : {}
-      },
-      defaultWorkflowRunStore
-    );
-    if (result.status === "paused") {
-      logger?.warn?.("workflows: run paused again awaiting operator input; not delivering to inbox", {
-        runId: result.runId
+    const name = checkpoint?.workflow?.name;
+    if (name && inFlight.has(name)) {
+      return {
+        ok: false,
+        status: "failed",
+        steps: [],
+        output: "",
+        error: `workflow "${name}" is already running`
+      };
+    }
+    if (name) inFlight.add(name);
+    try {
+      const turnId = session.startTurn().turnId;
+      const spawner = createSubagentSpawner({
+        parentSession: session,
+        parentTurnId: turnId,
+        parentSignal: session.signal,
+        parentModel: activeModel(session)
       });
+      const result = await resumeWorkflowRun(
+        runId,
+        reply2,
+        {
+          spawner,
+          tools: session.tools,
+          lookup: {
+            skill: (n2) => session.skills.byName(n2),
+            workflow: (n2) => store.lookup(n2)
+          },
+          signal: session.signal,
+          now: () => Date.now(),
+          emit: (subtype, payload) => void session.log.append({
+            type: "plugin_event",
+            sessionId: session.id,
+            turnId,
+            source: "plugin",
+            pluginId: PLUGIN_ID3,
+            subtype,
+            payload
+          }),
+          ...logger ? { logger } : {}
+        },
+        defaultWorkflowRunStore
+      );
+      if (result.status === "paused") {
+        logger?.warn?.("workflows: run paused again awaiting operator input; not delivering to inbox", {
+          runId: result.runId
+        });
+        return result;
+      }
+      if (checkpoint?.workflow) await deliverToInbox(checkpoint.workflow, result, logger);
       return result;
+    } finally {
+      if (name) inFlight.delete(name);
     }
-    if (checkpoint?.workflow) await deliverToInbox(checkpoint.workflow, result, logger);
-    return result;
   }
   return { runNow, resumeNow };
 }
@@ -150018,7 +150486,7 @@ function buildSchedulerRunner(session) {
         for await (const event of runTurn(session, prompt, model ? { model } : {})) {
           if (event.type === "assistant_message") {
             text = event.content;
-            if (event.stopReason === "error") lastError = "turn ended with error stop reason";
+            lastError = event.stopReason === "error" ? "turn ended with error stop reason" : null;
           } else if (event.type === "error") {
             lastError = event.message;
           }
@@ -150043,7 +150511,7 @@ function buildWebhookRunner(session) {
         for await (const event of runTurn(target, prompt, model ? { model } : {})) {
           if (event.type === "assistant_message") {
             text = event.content;
-            if (event.stopReason === "error") lastError = "turn ended with error stop reason";
+            lastError = event.stopReason === "error" ? "turn ended with error stop reason" : null;
           } else if (event.type === "error") {
             lastError = event.message;
           }
@@ -150910,7 +151378,7 @@ async function fetchLatest(pkg = DEFAULT_PKG, opts = {}) {
 }
 
 // src/update/check.ts
-var CACHE_TTL_MS = 12 * 60 * 60 * 1e3;
+var CACHE_TTL_MS2 = 12 * 60 * 60 * 1e3;
 var PKG = "@moxxy/cli";
 function defaultCacheFile() {
   return moxxyPath("update-check.json");
@@ -150965,7 +151433,7 @@ async function checkForCliUpdate(current, opts = {}) {
   const file = opts.cacheFile ?? defaultCacheFile();
   if (!opts.force) {
     const cache4 = readCache(file);
-    if (cache4 && now - cache4.checkedAt < CACHE_TTL_MS) {
+    if (cache4 && now - cache4.checkedAt < CACHE_TTL_MS2) {
       return shape(current, cache4.latest);
     }
   }
@@ -151179,12 +151647,14 @@ async function collectKey(providerId, controller) {
     if (!controller.testKey) return value;
     const s2 = ft2();
     s2.start(`Validating ${providerId} key`);
+    let rejected = false;
     try {
       const result = await controller.testKey(providerId, value);
       if (result.ok) {
         s2.stop(`${colors.bold("\u2713")} ${providerId} key looks good`);
         return value;
       }
+      rejected = true;
       s2.stop(`${colors.red("\u2717")} ${providerId} rejected the key: ${result.message}`);
     } catch (err) {
       s2.stop(
@@ -151197,6 +151667,7 @@ async function collectKey(providerId, controller) {
     });
     const retry = guard(retryRaw);
     if (!retry) {
+      if (rejected) bail();
       return value;
     }
   }
@@ -152435,7 +152906,7 @@ ${available}`
 async function runChannelsCommand(argv) {
   const [name, sub, ...rest] = argv.positional;
   if (!name || name === "list") {
-    return runList2();
+    return runList2(argv);
   }
   const outcome = await probeSession(
     argvToSetupOptions(argv, {
@@ -152489,12 +152960,13 @@ ${available}`
   if (outcome !== "run-channel") return outcome.code;
   return runChannelByName(name, argv);
 }
-async function runList2() {
+async function runList2(argv) {
   const { entries, config } = await probeSession(
-    argvToSetupOptions(
-      { flags: {} },
-      { skipKeyPrompt: true, tolerateNoProvider: true, skipProviderActivation: true }
-    ),
+    argvToSetupOptions(argv, {
+      skipKeyPrompt: true,
+      tolerateNoProvider: true,
+      skipProviderActivation: true
+    }),
     async ({ session, vault, config: config2 }) => ({
       config: config2,
       entries: await session.channels.listWithAvailability({
@@ -153171,7 +153643,7 @@ function unitPath(spec) {
 }
 function renderUnit(spec, ctx) {
   const execStart = [ctx.node, ctx.cli, ...spec.execArgs].map(quote).join(" ");
-  const envLines = Object.entries(spec.env ?? {}).map(([k3, v3]) => `Environment=${k3}=${v3}`).join("\n");
+  const envLines = Object.entries(spec.env ?? {}).map(([k3, v3]) => `Environment=${k3}=${envValue(v3)}`).join("\n");
   return `[Unit]
 Description=${spec.description}
 After=network-online.target
@@ -153195,6 +153667,11 @@ function quote(s2) {
   if (!/[\s"]/.test(s2)) return s2;
   return '"' + s2.replace(/"/g, '\\"') + '"';
 }
+function envValue(v3) {
+  const s2 = v3.replace(/[\r\n]+/g, " ");
+  if (!/[\s"\\]/.test(s2)) return s2;
+  return '"' + s2.replace(/\\/g, "\\\\").replace(/"/g, '\\"') + '"';
+}
 var systemdService = {
   platform: "linux",
   async getStatus(spec) {
@@ -153423,21 +153900,23 @@ async function runDaemonBackground() {
   return result.ok ? 0 : 1;
 }
 async function runDaemonForeground() {
-  const { session, scheduler } = await setupSessionWithConfig({ cwd: process.cwd() });
+  const { session } = await setupSessionWithConfig({ cwd: process.cwd() });
   process.stdout.write(
     `${colors.bold("scheduler daemon")}  ${colors.dim("provider=" + (session.providers.getActiveName() ?? "(none)"))}
 ` + colors.dim("                 ^C to stop. Schedules fire while this process is alive.\n")
   );
   let stopRequested = false;
-  const shutdown = async () => {
+  const shutdown = async (signal) => {
     if (stopRequested) return;
     stopRequested = true;
+    const force = setTimeout(() => process.exit(0), 4e3);
+    force.unref?.();
     process.stdout.write("\nstopping scheduler\u2026\n");
-    await scheduler.poller.stop();
+    await session.close(signal).catch(() => void 0);
     process.exit(0);
   };
-  process.on("SIGINT", () => void shutdown());
-  process.on("SIGTERM", () => void shutdown());
+  process.on("SIGINT", () => void shutdown("SIGINT"));
+  process.on("SIGTERM", () => void shutdown("SIGTERM"));
   setInterval(() => {
   }, 6e4);
   return await new Promise(() => {