khala-cli 0.4.5 → 0.4.7

package/dist/{chunk-T7YRVE43.mjs → chunk-OP2HZ7EM.mjs}

@@ -11,11 +11,7 @@ import {
   stateKey,
   writeJsonAtomic,
   writeStateFile
-} from "./chunk-KCJFSVDN.mjs";
-import {
-  DEFAULT_LISTENING_MODE,
-  decodeListeningMode
-} from "./chunk-AUJEUKVM.mjs";
+} from "./chunk-WNOIHCCC.mjs";
 
 // src/inbox.ts
 import * as fs from "node:fs/promises";
@@ -157,9 +153,12 @@ async function migrateLegacy(files) {
   const nested = channelFiles(files, id);
   await ensureStateDir(nested.dir);
   const destinationInbox = await exists(nested.inbox);
-  if (present[2] && !destinationInbox && present[0] && await exists(nested.cursor)) {
-    if (await fs2.readFile(files.cursor, "utf8") !== await fs2.readFile(nested.cursor, "utf8")) {
-      throw new StateError("storage_failed");
+  if (!destinationInbox && present[0] && await exists(nested.cursor)) {
+    const [legacyCursor, channelCursor] = await Promise.all([readCursor(files), readCursor(nested)]);
+    if (legacyCursor.deliveredCount !== channelCursor.deliveredCount || legacyCursor.lastDeliveredEventId !== channelCursor.lastDeliveredEventId) {
+      const safe = legacyCursor.deliveredCount < channelCursor.deliveredCount ? legacyCursor : channelCursor;
+      await writeStateFile(nested.dir, "cursor.json", safe);
+      console.warn(`Khala cursor migration: conflicting cursors for ${id}; using earlier position ${safe.deliveredCount} to avoid skipping messages (legacy=${legacyCursor.deliveredCount}, channel=${channelCursor.deliveredCount}).`);
     }
   }
   const status = await readStatus(files);
@@ -203,25 +202,6 @@ function resolveChannel(list, ref) {
   return { ok: false, code: matches.length ? "channel_ambiguous" : "channel_unknown", channels };
 }
 
-// src/mode.ts
-async function readListeningMode(files) {
-  const content = await readJson(files.mode);
-  const decoded = decodeListeningMode(typeof content === "object" && content !== null ? content.mode : void 0);
-  return decoded.ok ? decoded.value : DEFAULT_LISTENING_MODE;
-}
-async function applyListeningMode(files, next, meta, now = () => /* @__PURE__ */ new Date()) {
-  const previous = await readListeningMode(files);
-  if (previous === "async" && next !== "async") {
-    for (let attempt = 0; attempt < 2; attempt++) {
-      const { cursor, entries } = await unread(files);
-      if (await advanceCursor(files, cursor, entries) !== "conflict") break;
-      if (attempt === 1) throw new StateError("storage_failed");
-    }
-  }
-  await writeJsonAtomic(files.mode, { mode: next, ...meta, updatedAt: now().toISOString() });
-  return { previous, next };
-}
-
 export {
   readEntries,
   readCursor,
@@ -232,7 +212,5 @@ export {
   channelKey,
   listChannels,
   migrateLegacy,
-  resolveChannel,
-  readListeningMode,
-  applyListeningMode
+  resolveChannel
 };

package/dist/{chunk-RSDOTTZQ.mjs → chunk-S3FX7VCY.mjs}

@@ -1,11 +1,16 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
   bundle
-} from "./chunk-OLZ62X7S.mjs";
+} from "./chunk-SU6362YU.mjs";
 import {
-  CURSOR_WORKSPACE_ENV
-} from "./chunk-VUE2DDYY.mjs";
-import "./chunk-PXKGKVGW.mjs";
+  CURSOR_WORKSPACE_ENV,
+  adapterFor
+} from "./chunk-JEI32DEA.mjs";
+import "./chunk-OP2HZ7EM.mjs";
+import "./chunk-WNOIHCCC.mjs";
+import "./chunk-3OFKVYOX.mjs";
+import "./chunk-U3MKSPRO.mjs";
+import "./chunk-APIWKRKG.mjs";
 
 // src/install/main.ts
 import { spawnSync } from "node:child_process";
@@ -193,7 +198,14 @@ async function installCursor(input) {
 // src/install/main.ts
 var MCP_MARKER = "# Khala MCP server, managed by `khala install codex`";
 var USAGE = "usage: khala install codex [--codex-home <dir>] [--uninstall] | khala install cursor [--uninstall]";
-async function runCursorInstall(flags, deps, env, stdout, stderr) {
+async function runCursorInstall(flags, deps) {
+  const env = deps.env ?? process.env;
+  const stdout = deps.stdout ?? ((line) => {
+    process.stdout.write(line + "\n");
+  });
+  const stderr = deps.stderr ?? ((line) => {
+    process.stderr.write(line + "\n");
+  });
   let uninstall = false;
   for (const flag of flags) {
     if (flag === "--uninstall") uninstall = true;
@@ -272,7 +284,7 @@ async function readOr(file, fallback) {
     throw error;
   }
 }
-async function runInstall(argv, deps = {}) {
+async function runCodexInstall(flags, deps) {
   const env = deps.env ?? process.env;
   const stdout = deps.stdout ?? ((line) => {
     process.stdout.write(line + "\n");
@@ -280,8 +292,6 @@ async function runInstall(argv, deps = {}) {
   const stderr = deps.stderr ?? ((line) => {
     process.stderr.write(line + "\n");
   });
-  const [target, ...flags] = argv;
-  if (target === "cursor") return runCursorInstall(flags, deps, env, stdout, stderr);
   let codexHome = env.CODEX_HOME && path.isAbsolute(env.CODEX_HOME) ? env.CODEX_HOME : path.join(env.HOME ?? os.homedir(), ".codex");
   let uninstall = false;
   for (let i = 0; i < flags.length; i++) {
@@ -292,10 +302,6 @@ async function runInstall(argv, deps = {}) {
       return 1;
     }
   }
-  if (target !== "codex") {
-    stderr(USAGE);
-    return 1;
-  }
   const pkg = "package" in deps ? deps.package : bundle;
   if (!pkg && !uninstall) {
     stderr("khala: install runs from the published package (npx -y <package> install codex); from a checkout follow packages/agent/docs/install-codex.md");
@@ -355,6 +361,16 @@ async function runInstall(argv, deps = {}) {
   }
   return 0;
 }
+async function runInstall(argv, deps = {}) {
+  const [target = "", ...flags] = argv;
+  const adapter = adapterFor(target);
+  const run = adapter?.install;
+  if (run) return run(flags, deps);
+  (deps.stderr ?? ((line) => {
+    process.stderr.write(line + "\n");
+  }))(USAGE);
+  return 1;
+}
 async function main(argv) {
   return runInstall(argv);
 }
@@ -362,6 +378,8 @@ export {
   MCP_MARKER,
   codexMcpBlock,
   main as default,
+  runCodexInstall,
+  runCursorInstall,
   runInstall,
   shellQuote,
   updateCodexToml

package/dist/{chunk-OLZ62X7S.mjs → chunk-SU6362YU.mjs}

@@ -1,7 +1,7 @@
 import { createRequire as __khalaCreateRequire } from 'node:module'; const require = __khalaCreateRequire(import.meta.url);
 import {
   define_KHALA_BUNDLE_default
-} from "./chunk-PXKGKVGW.mjs";
+} from "./chunk-APIWKRKG.mjs";
 
 // src/bundle.ts
 var bundle = typeof define_KHALA_BUNDLE_default === "undefined" ? void 0 : define_KHALA_BUNDLE_default;