tokmon 0.28.2 → 0.28.4

package/dist/{chunk-LKYOWBD4.js → chunk-FLANGRI6.js}

@@ -1,20 +1,21 @@
 #!/usr/bin/env node
 import {
-  isAlive,
-  probeHealth,
   readLock,
-  reclaimDeadLock,
+  retireIncompatibleCliOwner,
   verifyLock
-} from "./chunk-J3JW3RFP.js";
+} from "./chunk-5B3XCEMC.js";
+import {
+  daemonChannelFromWire,
+  resolveDaemonChannel
+} from "./chunk-UYPDMVW5.js";
 import {
   TOKMON_PROTOCOL_VERSION
-} from "./chunk-WUK3MQUB.js";
+} from "./chunk-JZSZEHVD.js";
 
 // src/client/daemon-handle.ts
 import { spawn } from "child_process";
 import { extname } from "path";
 var HANDSHAKE_TIMEOUT_MS = process.platform === "win32" ? 15e3 : 1e4;
-var UPGRADE_SHUTDOWN_TIMEOUT_MS = 5e3;
 function runtimeExecArgv(entry, override) {
   if (override) return override;
   const ext = extname(entry).toLowerCase();
@@ -37,7 +38,7 @@ function runtimeExecArgv(entry, override) {
 function parseHandshake(line) {
   try {
     const value = JSON.parse(line);
-    return value?.ready === 1 && typeof value.url === "string" && typeof value.wsToken === "string" && typeof value.version === "string" && typeof value.protocolVersion === "number" && Array.isArray(value.capabilities) && value.capabilities.every((capability) => typeof capability === "string") && (value.ownerKind === "cli" || value.ownerKind === "desktop") ? value : null;
+    return value?.ready === 1 && typeof value.url === "string" && typeof value.wsToken === "string" && typeof value.version === "string" && typeof value.protocolVersion === "number" && Array.isArray(value.capabilities) && value.capabilities.every((capability) => typeof capability === "string") && (value.ownerKind === "cli" || value.ownerKind === "desktop") && daemonChannelFromWire(value.channel) !== null ? { ...value, channel: daemonChannelFromWire(value.channel) } : null;
   } catch {
     return null;
   }
@@ -50,48 +51,26 @@ async function attach(opts, protocolVersion) {
   const lock = await verifyLock(readLock(opts), protocolVersion);
   return lock ? connected(lock.url) : null;
 }
-var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-async function retireIncompatibleDaemon(opts, protocolVersion, timeoutMs) {
-  const lock = readLock(opts);
-  if (!lock || lock.state !== "ready" || lock.protocolVersion === protocolVersion || lock.ownerKind === "desktop" || lock.pid === process.pid || !isAlive(lock.pid)) return;
-  const authenticated = await probeHealth(
-    lock.url,
-    lock.wsToken,
-    lock,
-    Math.min(1e3, timeoutMs)
-  );
-  if (!authenticated) return;
-  try {
-    process.kill(lock.pid, "SIGTERM");
-  } catch {
-    if (!isAlive(lock.pid)) reclaimDeadLock(opts);
-    return;
-  }
-  const deadline = Date.now() + Math.min(timeoutMs, UPGRADE_SHUTDOWN_TIMEOUT_MS);
-  while (Date.now() < deadline) {
-    const current = readLock(opts);
-    if (!current || current.ownerId !== lock.ownerId) return;
-    if (!isAlive(lock.pid)) {
-      reclaimDeadLock(opts);
-      return;
-    }
-    await delay(50);
-  }
-}
 async function attachOrSpawn(opts = {}) {
   const protocolVersion = TOKMON_PROTOCOL_VERSION;
   const timeoutMs = opts.timeoutMs ?? HANDSHAKE_TIMEOUT_MS;
-  const existing = await attach(opts, protocolVersion);
+  const baseEnv = opts.env ?? process.env;
+  const channel = resolveDaemonChannel(opts.channel, baseEnv);
+  const lockOpts = { cachePath: opts.cachePath, channel };
+  const existing = await attach(lockOpts, protocolVersion);
   if (existing) return existing;
-  await retireIncompatibleDaemon(opts, protocolVersion, timeoutMs);
-  const upgraded = await attach(opts, protocolVersion);
+  await retireIncompatibleCliOwner(lockOpts, protocolVersion, timeoutMs);
+  const upgraded = await attach(lockOpts, protocolVersion);
   if (upgraded) return upgraded;
   const entry = opts.entry ?? process.argv[1];
   if (!entry) return degraded();
   const execPath = opts.execPath ?? process.execPath;
   const args = ["__daemon", "--port", "0", "--no-open"];
-  const baseEnv = opts.env ?? process.env;
-  const env = opts.cachePath ? { ...baseEnv, TOKMON_DAEMON_CACHE_DIR: opts.cachePath } : baseEnv;
+  const env = {
+    ...baseEnv,
+    TOKMON_CHANNEL: channel,
+    ...opts.cachePath ? { TOKMON_DAEMON_CACHE_DIR: opts.cachePath } : {}
+  };
   return new Promise((resolve) => {
     let child;
     try {
@@ -117,7 +96,7 @@ async function attachOrSpawn(opts = {}) {
       resolve(handle);
     };
     const tryAttach = (final = false) => {
-      void attach(opts, protocolVersion).then((found) => {
+      void attach(lockOpts, protocolVersion).then((found) => {
         if (found) {
           finish(found);
           return;
@@ -143,7 +122,7 @@ async function attachOrSpawn(opts = {}) {
         const line = stdout.slice(0, newline).trim();
         stdout = stdout.slice(newline + 1);
         const handshake = parseHandshake(line);
-        if (!handshake || handshake.protocolVersion !== protocolVersion) continue;
+        if (!handshake || handshake.protocolVersion !== protocolVersion || handshake.channel !== channel) continue;
         tryAttach();
         return;
       }