@moxxy/cli 0.14.1 → 0.14.2

package/dist/bin.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { createRequire } from 'node:module';
-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, 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, startChannelWith, parseFrontmatterFile, createDeferredPermissionResolver, getInstallHint, defineTranscriber, summarizeTokensByModel, countNodes, moxxyPackageSchema, encodeLoginPrompt, classifyNetworkError, addModelTotals, createJsonFileStore, ISOLATION_RANK, MOXXY_PCM16_24KHZ_MIME, fileDiffVerb, parseFrontmatter, createCallbackResolver, autoAllowResolver, asSessionId, asToolCallId, defineViewRenderer, DEFAULT_VIEW_TAGS, 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, unlinkSync, chmodSync, watch, createReadStream } from 'fs';
 import * as path3 from 'path';
@@ -145831,6 +145831,12 @@ function buildBrowserSurface(deps) {
           } else if (msg.type === "move" && typeof msg.fx === "number" && typeof msg.fy === "number") {
             await browserSidecarCall("mousemove", { x: msg.fx * vw, y: msg.fy * vh }, deps).catch(() => void 0);
             void tick();
+          } else if (msg.type === "pick" && typeof msg.fx === "number" && typeof msg.fy === "number") {
+            const element = await browserSidecarCall("pick", { x: msg.fx * vw, y: msg.fy * vh }, deps).catch(() => null);
+            emit2({ type: "picked", element });
+          } else if (msg.type === "zoom" && typeof msg.factor === "number") {
+            await browserSidecarCall("zoom", { factor: msg.factor }, deps).catch(() => void 0);
+            bump();
           } else if (msg.type === "key" && typeof msg.key === "string") {
             await browserSidecarCall("key", { key: msg.key }, deps).catch(() => void 0);
             bump();
@@ -151228,6 +151234,15 @@ async function probeSession(opts, read, boot = setupSessionWithConfig) {
   }
 }
 
+// src/setup/close-session.ts
+async function closeSession(session, persistence) {
+  if (persistence) {
+    await persistence.flush().catch(() => void 0);
+    await persistence.settleWrites().catch(() => void 0);
+  }
+  await session.close("cli-exit").catch(() => void 0);
+}
+
 // src/argv-helpers.ts
 function argvToSetupOptions(argv, overrides = {}) {
   return {
@@ -151310,7 +151325,7 @@ ${stdinBuf}` : prompt;
   }
   const model = stringFlag(argv, "model");
   const resolver2 = allowAll ? denyByDefaultResolver : allowTools.length > 0 ? createAllowListResolver(allowTools) : denyByDefaultResolver;
-  const session = await setupSession({
+  const { session, persistence } = await setupSessionWithConfig({
     ...argvToSetupOptions(argv),
     resolver: resolver2
   });
@@ -151345,7 +151360,9 @@ ${stdinBuf}` : prompt;
     }
   } catch (err) {
     printError(`fatal: ${err instanceof Error ? err.message : String(err)}`);
-    return 1;
+    exitCode = 1;
+  } finally {
+    await closeSession(session, persistence);
   }
   return exitCode;
 }
@@ -151370,8 +151387,6 @@ async function readStdinIfPiped() {
 await init_dist9();
 await init_build2();
 var import_react70 = __toESM(require_react());
-
-// src/commands/web-surface.ts
 var REMOTE_CHANNELS = /* @__PURE__ */ new Set(["telegram"]);
 async function coAttachWebSurface(opts) {
   const { primary, session, vault, config } = opts;
@@ -151385,7 +151400,7 @@ async function coAttachWebSurface(opts) {
   await resolveTunnel(primary, session, webCfg, write);
   try {
     const web = def.create({ cwd: process.cwd(), vault, logger: session.logger, options: webCfg });
-    const handle2 = await web.start({ session });
+    const handle2 = await startChannelWith(web, { session });
     const url2 = web.shareUrl;
     if (url2) write(`  web surface  ${url2}
 `);
@@ -151824,14 +151839,21 @@ function renderLogo(width = process.stdout.columns ?? 80, opts = {}) {
 }
 async function runInitCommand(argv) {
   const interactive = Boolean(process.stdin.isTTY);
-  const { session, vault } = await bootSessionWithConfig(argv, {
+  const { session, vault, persistence } = await bootSessionWithConfig(argv, {
     skipKeyPrompt: true,
     skipProviderActivation: true,
     ...interactive ? { passphrasePrompt: promptVaultPassphrase } : {}
   });
-  if (!interactive) {
-    return await runHeadlessInit(session, vault);
+  try {
+    if (!interactive) {
+      return await runHeadlessInit(session, vault);
+    }
+    return await runInteractiveInit(session, vault);
+  } finally {
+    await closeSession(session, persistence);
   }
+}
+async function runInteractiveInit(session, vault) {
   process.stdout.write(renderLogo());
   await vault.open();
   const providerDefs = session.providers.list();
@@ -152798,8 +152820,6 @@ function stringFlag2(argv, name) {
 function errorMessage(err) {
   return err instanceof Error ? err.message : String(err);
 }
-
-// src/commands/start-registered-channel.ts
 async function startRegisteredChannel(name, argv) {
   const standalone = hasBoolFlag(argv, "standalone");
   const mode = chooseClientMode({ standalone, runnerUp: standalone ? false : await isRunnerUp() });
@@ -152835,7 +152855,7 @@ async function runAttachedChannel(name, argv) {
     options: { ...configOpts, ...argv.flags }
   });
   remote.setPermissionResolver(channel.permissionResolver);
-  const handle2 = await channel.start({
+  const handle2 = await startChannelWith(channel, {
     session: remote,
     model: stringFlag(argv, "model"),
     ...collectExtraFlags(argv)
@@ -152881,7 +152901,7 @@ async function runSelfHostedChannel(name, argv, standalone) {
       runnerServer = null;
     }
   }
-  const handle2 = await channel.start({
+  const handle2 = await startChannelWith(channel, {
     session,
     model: stringFlag(argv, "model"),
     ...collectExtraFlags(argv)
@@ -154222,7 +154242,7 @@ async function runScheduleNow(argv) {
     process.stderr.write(colors.red("missing id") + "\n  usage: moxxy schedule run <id>\n");
     return 2;
   }
-  const { session, scheduler: full } = await setupSessionWithConfig({
+  const { session, scheduler: full, persistence } = await setupSessionWithConfig({
     cwd: process.cwd(),
     skipInitHooks: true
   });
@@ -154253,7 +154273,7 @@ async function runScheduleNow(argv) {
     );
     return outcome.ok ? 0 : 1;
   } finally {
-    await session.close("schedule-run").catch(() => void 0);
+    await closeSession(session, persistence);
   }
 }
 
@@ -154334,7 +154354,25 @@ async function runDoctorCommand(argv) {
     });
     return emit(checks, asJson);
   }
-  const { session, config, configSources, vault, memory, pluginRegistration } = setupResult.value;
+  const { session, config, configSources, vault, memory, pluginRegistration, persistence } = setupResult.value;
+  try {
+    return await runDoctorChecks({
+      session,
+      config,
+      configSources,
+      vault,
+      memory,
+      pluginRegistration,
+      checks,
+      checkKeys,
+      asJson
+    });
+  } finally {
+    await closeSession(session, persistence);
+  }
+}
+async function runDoctorChecks(deps) {
+  const { session, config, configSources, vault, memory, pluginRegistration, checks, checkKeys, asJson } = deps;
   if (configSources.length > 0) {
     const summary = configSources.map((s2) => `${s2.scope}:${s2.path}`).join(", ");
     checks.push({ id: "config", status: "ok", message: `loaded from ${summary}` });
@@ -154407,8 +154445,8 @@ async function runDoctorCommand(argv) {
       checks.push({ id: `provider:${name}`, status: "ok", message: "key resolved" });
     }
   }
-  const deps = { cwd: process.cwd(), vault, logger: session.logger, options: {} };
-  const channelEntries = await session.channels.listWithAvailability(deps);
+  const channelDeps = { cwd: process.cwd(), vault, logger: session.logger, options: {} };
+  const channelEntries = await session.channels.listWithAvailability(channelDeps);
   for (const { def, availability } of channelEntries) {
     if (availability.ok) {
       checks.push({ id: `channel:${def.name}`, status: "ok", message: "available" });
@@ -154620,12 +154658,18 @@ async function runLoginCommand(argv) {
   if (!sub || sub === "help" || sub === "--help" || sub === "-h") {
     let session = null;
     try {
-      const { session: s2 } = await bootSessionWithConfig(argv, {
+      const { session: s2, persistence } = await bootSessionWithConfig(argv, {
         skipKeyPrompt: true,
         skipProviderActivation: true,
         tolerateNoProvider: true
       });
       session = s2;
+      try {
+        process.stdout.write(buildHelp(session));
+      } finally {
+        await closeSession(s2, persistence);
+      }
+      return sub ? 0 : 2;
     } catch {
     }
     process.stdout.write(buildHelp(session));
@@ -154636,11 +154680,18 @@ async function runLoginCommand(argv) {
   return await loginProvider(argv, sub);
 }
 async function loginProvider(argv, providerName2) {
-  const { session, vault } = await bootSessionWithConfig(argv, {
+  const { session, vault, persistence } = await bootSessionWithConfig(argv, {
     skipKeyPrompt: true,
     skipProviderActivation: true,
     tolerateNoProvider: true
   });
+  try {
+    return await runLoginProvider(argv, providerName2, session, vault);
+  } finally {
+    await closeSession(session, persistence);
+  }
+}
+async function runLoginProvider(argv, providerName2, session, vault) {
   const def = session.providers.list().find((d2) => d2.name === providerName2);
   if (!def) {
     process.stderr.write(
@@ -154691,11 +154742,18 @@ Run \`moxxy init\` to store its key in the vault.
   }
 }
 async function loginStatus(argv) {
-  const { session, vault } = await bootSessionWithConfig(argv, {
+  const { session, vault, persistence } = await bootSessionWithConfig(argv, {
     skipKeyPrompt: true,
     skipProviderActivation: true,
     tolerateNoProvider: true
   });
+  try {
+    return await runLoginStatus(argv, session, vault);
+  } finally {
+    await closeSession(session, persistence);
+  }
+}
+async function runLoginStatus(argv, session, vault) {
   await vault.open();
   const ctx = buildProviderAuthContext(vault, { headless: true });
   const filter = argv.positional[1];
@@ -154762,11 +154820,18 @@ async function loginLogout(argv) {
     );
     return 2;
   }
-  const { session, vault } = await bootSessionWithConfig(argv, {
+  const { session, vault, persistence } = await bootSessionWithConfig(argv, {
     skipKeyPrompt: true,
     skipProviderActivation: true,
     tolerateNoProvider: true
   });
+  try {
+    return await runLoginLogout(providerName2, session, vault);
+  } finally {
+    await closeSession(session, persistence);
+  }
+}
+async function runLoginLogout(providerName2, session, vault) {
   await vault.open();
   const def = session.providers.list().find((d2) => d2.name === providerName2);
   if (!def || def.auth?.kind !== "oauth") {
@@ -155202,8 +155267,6 @@ async function runPath(spec) {
   process.stdout.write(s2.unitPath + "\n");
   return 0;
 }
-
-// src/commands/serve.ts
 var BACKGROUND_UNITS = [
   {
     id: "scheduler",
@@ -155452,7 +155515,7 @@ async function startChannel(def, setup, installResolver) {
   if (installResolver) {
     session.setPermissionResolver(channel.permissionResolver);
   }
-  return channel.start({ session, ...channelOpts });
+  return startChannelWith(channel, { session, ...channelOpts });
 }
 function failureHint(_name, error2) {
   const e3 = error2.toLowerCase();