@moxxy/cli 0.13.1 → 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';
@@ -85505,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 ?? "");
@@ -87762,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) {
@@ -87869,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";
   }
 });
 
@@ -88165,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 {
@@ -88197,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();
@@ -88212,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"
+    ]);
   }
 });
 
@@ -133481,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",
@@ -139079,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;
@@ -139097,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" }));
@@ -139235,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) {
@@ -144062,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
@@ -144171,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.
@@ -146562,37 +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 [fromSeq, toSeq] = result.replacedRange;
-    const compactedEvents = events.filter((e3) => e3.seq >= fromSeq && e3.seq <= toSeq).length;
     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 {
@@ -146601,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);
 }
@@ -147610,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(),
@@ -148519,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)
@@ -149040,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
 });
 
@@ -149107,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.