@drisp/cli 0.5.8 → 0.5.11

package/dist/athena-gateway.js

@@ -24,6 +24,159 @@ import {
 // src/gateway/daemon.ts
 import fs4 from "fs";
 
+// src/gateway/channelManager.ts
+var DEFAULT_DEDUP_WINDOW = 1024;
+var DuplicateChannelError = class extends Error {
+  constructor(id) {
+    super(`channel ${id} already registered`);
+    this.name = "DuplicateChannelError";
+  }
+};
+var UnknownChannelError = class extends Error {
+  constructor(id) {
+    super(`channel ${id} not registered`);
+    this.name = "UnknownChannelError";
+  }
+};
+var ChannelManager = class {
+  entries = /* @__PURE__ */ new Map();
+  dedup = [];
+  dedupSet = /* @__PURE__ */ new Set();
+  dedupMax;
+  log;
+  inboundSink = null;
+  healthSink = null;
+  stopped = false;
+  constructor(opts = {}) {
+    this.dedupMax = opts.dedupWindow ?? DEFAULT_DEDUP_WINDOW;
+    this.log = opts.log;
+  }
+  /** Register the single inbound dispatch target. M5 wires the router here. */
+  setInboundSink(sink) {
+    this.inboundSink = sink;
+  }
+  /**
+   * Returns the attachmentId associated with `channelId` at registration
+   * time, or undefined if the channel is unknown or registered without one.
+   */
+  getAttachmentId(channelId) {
+    return this.entries.get(channelId)?.attachmentId;
+  }
+  setHealthSink(sink) {
+    this.healthSink = sink;
+  }
+  listChannels() {
+    return [...this.entries.values()].map((e) => ({
+      id: e.adapter.id,
+      health: e.lastHealth
+    }));
+  }
+  /** Snapshot of currently registered adapters; used by the relay coordinator. */
+  listAdapters() {
+    return [...this.entries.values()].map((e) => e.adapter);
+  }
+  async register(adapter, opts = {}) {
+    if (this.stopped) {
+      throw new Error("channel manager already stopped");
+    }
+    if (this.entries.has(adapter.id)) {
+      throw new DuplicateChannelError(adapter.id);
+    }
+    const abort = new AbortController();
+    const inboundListener = (msg) => this.handleInbound(adapter.id, msg);
+    const healthListener = (sample) => {
+      const entry2 = this.entries.get(adapter.id);
+      if (entry2) entry2.lastHealth = sample;
+      this.healthSink?.(sample);
+    };
+    const startPromise = adapter.start({
+      log: (level, msg) => this.log?.(level, `[${adapter.id}] ${msg}`),
+      signal: abort.signal,
+      emitInbound: inboundListener,
+      emitHealth: healthListener
+    });
+    const entry = {
+      adapter,
+      abort,
+      startPromise
+    };
+    if (opts.attachmentId !== void 0) entry.attachmentId = opts.attachmentId;
+    this.entries.set(adapter.id, entry);
+    try {
+      await startPromise;
+    } catch (err) {
+      this.entries.delete(adapter.id);
+      throw err;
+    }
+  }
+  async unregister(id, reason) {
+    const entry = this.entries.get(id);
+    if (!entry) {
+      throw new UnknownChannelError(id);
+    }
+    this.entries.delete(id);
+    entry.abort.abort();
+    await entry.adapter.stop(reason);
+  }
+  async send(channelId, msg) {
+    const entry = this.entries.get(channelId);
+    if (!entry) {
+      throw new UnknownChannelError(channelId);
+    }
+    return entry.adapter.send(msg);
+  }
+  async probe(channelId) {
+    const entry = this.entries.get(channelId);
+    if (!entry) {
+      throw new UnknownChannelError(channelId);
+    }
+    return entry.adapter.probe();
+  }
+  async stop(reason = "shutdown") {
+    if (this.stopped) return;
+    this.stopped = true;
+    const ids = [...this.entries.keys()];
+    for (const id of ids.reverse()) {
+      try {
+        await this.unregister(id, reason);
+      } catch (err) {
+        this.log?.(
+          "warn",
+          `channel ${id} stop failed: ${err instanceof Error ? err.message : String(err)}`
+        );
+      }
+    }
+  }
+  handleInbound(channelId, msg) {
+    if (this.dedupSet.has(msg.idempotencyKey)) {
+      this.log?.("debug", `dropping duplicate inbound ${msg.idempotencyKey}`);
+      return;
+    }
+    this.dedupSet.add(msg.idempotencyKey);
+    this.dedup.push(msg.idempotencyKey);
+    while (this.dedup.length > this.dedupMax) {
+      const evicted = this.dedup.shift();
+      if (evicted !== void 0) this.dedupSet.delete(evicted);
+    }
+    const sink = this.inboundSink;
+    if (!sink) {
+      this.log?.(
+        "debug",
+        `no inbound sink registered; dropping ${msg.idempotencyKey}`
+      );
+      return;
+    }
+    try {
+      sink(msg, { attachmentId: this.entries.get(channelId)?.attachmentId });
+    } catch (err) {
+      this.log?.(
+        "warn",
+        `inbound sink threw: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
+};
+
 // src/infra/config/channels.ts
 import fs from "fs";
 import os from "os";
@@ -1886,158 +2039,144 @@ function instantiateAdapter(sidecar) {
   return { ok: true, adapter: module.create(parsed.config, sidecar.instanceId) };
 }
 
-// src/gateway/channelManager.ts
-var DEFAULT_DEDUP_WINDOW = 1024;
-var DuplicateChannelError = class extends Error {
-  constructor(id) {
-    super(`channel ${id} already registered`);
-    this.name = "DuplicateChannelError";
-  }
-};
-var UnknownChannelError = class extends Error {
-  constructor(id) {
-    super(`channel ${id} not registered`);
-    this.name = "UnknownChannelError";
-  }
-};
-var ChannelManager = class {
-  entries = /* @__PURE__ */ new Map();
-  dedup = [];
-  dedupSet = /* @__PURE__ */ new Set();
-  dedupMax;
-  log;
-  inboundSink = null;
-  healthSink = null;
-  stopped = false;
-  constructor(opts = {}) {
-    this.dedupMax = opts.dedupWindow ?? DEFAULT_DEDUP_WINDOW;
-    this.log = opts.log;
-  }
-  /** Register the single inbound dispatch target. M5 wires the router here. */
-  setInboundSink(sink) {
-    this.inboundSink = sink;
-  }
-  /**
-   * Returns the attachmentId associated with `channelId` at registration
-   * time, or undefined if the channel is unknown or registered without one.
-   */
-  getAttachmentId(channelId) {
-    return this.entries.get(channelId)?.attachmentId;
-  }
-  setHealthSink(sink) {
-    this.healthSink = sink;
-  }
-  listChannels() {
-    return [...this.entries.values()].map((e) => ({
-      id: e.adapter.id,
-      health: e.lastHealth
-    }));
-  }
-  /** Snapshot of currently registered adapters; used by the relay coordinator. */
-  listAdapters() {
-    return [...this.entries.values()].map((e) => e.adapter);
-  }
-  async register(adapter, opts = {}) {
-    if (this.stopped) {
-      throw new Error("channel manager already stopped");
-    }
-    if (this.entries.has(adapter.id)) {
-      throw new DuplicateChannelError(adapter.id);
-    }
-    const abort = new AbortController();
-    const inboundListener = (msg) => this.handleInbound(adapter.id, msg);
-    const healthListener = (sample) => {
-      const entry2 = this.entries.get(adapter.id);
-      if (entry2) entry2.lastHealth = sample;
-      this.healthSink?.(sample);
-    };
-    const startPromise = adapter.start({
-      log: (level, msg) => this.log?.(level, `[${adapter.id}] ${msg}`),
-      signal: abort.signal,
-      emitInbound: inboundListener,
-      emitHealth: healthListener
-    });
-    const entry = {
-      adapter,
-      abort,
-      startPromise
-    };
-    if (opts.attachmentId !== void 0) entry.attachmentId = opts.attachmentId;
-    this.entries.set(adapter.id, entry);
-    try {
-      await startPromise;
-    } catch (err) {
-      this.entries.delete(adapter.id);
-      throw err;
-    }
-  }
-  async unregister(id, reason) {
-    const entry = this.entries.get(id);
-    if (!entry) {
-      throw new UnknownChannelError(id);
-    }
-    this.entries.delete(id);
-    entry.abort.abort();
-    await entry.adapter.stop(reason);
-  }
-  async send(channelId, msg) {
-    const entry = this.entries.get(channelId);
-    if (!entry) {
-      throw new UnknownChannelError(channelId);
+// src/gateway/channelSidecarReconciler.ts
+var ChannelSidecarReconciler = class {
+  channelManager;
+  home;
+  loadSidecars;
+  instantiateAdapter;
+  stdout;
+  stderr;
+  constructor(opts) {
+    this.channelManager = opts.channelManager;
+    this.home = opts.home;
+    this.loadSidecars = opts.loadSidecars ?? loadChannelSidecars;
+    this.instantiateAdapter = opts.instantiateAdapter ?? instantiateAdapter;
+    this.stdout = opts.stdout ?? ((message) => process.stdout.write(message));
+    this.stderr = opts.stderr ?? ((message) => process.stderr.write(message));
+  }
+  async reconcile(opts) {
+    const results = [];
+    const { sidecars, errors } = this.loadSidecars(this.home);
+    for (const err of errors) {
+      const id = pathIdFromSidecarPath(err.path);
+      results.push({
+        id,
+        ok: false,
+        action: "failed",
+        reason: err.reason
+      });
+      if (opts.logFailures) {
+        this.stderr(`athena-gateway: skipping ${err.path}: ${err.reason}
+`);
+      }
     }
-    return entry.adapter.send(msg);
-  }
-  async probe(channelId) {
-    const entry = this.entries.get(channelId);
-    if (!entry) {
-      throw new UnknownChannelError(channelId);
+    if (opts.unregisterStale) {
+      const sidecarIds = new Set(sidecars.map((sidecar) => sidecar.instanceId));
+      for (const channel of this.channelManager.listChannels()) {
+        if (sidecarIds.has(channel.id)) continue;
+        try {
+          await this.channelManager.unregister(channel.id, "shutdown");
+          results.push({
+            id: channel.id,
+            ok: true,
+            action: "unregistered"
+          });
+        } catch (err) {
+          const reason = errorReason(err);
+          results.push({
+            id: channel.id,
+            ok: false,
+            action: "failed",
+            reason
+          });
+          if (opts.logFailures) {
+            this.stderr(
+              `athena-gateway: unregister ${channel.id} failed: ${reason}
+`
+            );
+          }
+        }
+      }
     }
-    return entry.adapter.probe();
-  }
-  async stop(reason = "shutdown") {
-    if (this.stopped) return;
-    this.stopped = true;
-    const ids = [...this.entries.keys()];
-    for (const id of ids.reverse()) {
+    for (const sidecar of sidecars) {
+      const existed = this.channelManager.listChannels().some((channel) => channel.id === sidecar.instanceId);
+      if (existed) {
+        try {
+          await this.channelManager.unregister(sidecar.instanceId, "shutdown");
+        } catch (err) {
+          const reason = errorReason(err);
+          results.push({
+            id: sidecar.instanceId,
+            ok: false,
+            action: "failed",
+            reason
+          });
+          if (opts.logFailures) {
+            this.stderr(
+              `athena-gateway: unregister ${sidecar.instanceId} failed: ${reason}
+`
+            );
+          }
+          continue;
+        }
+      }
+      const built = this.instantiateAdapter(sidecar);
+      if (!built.ok) {
+        results.push({
+          id: sidecar.instanceId,
+          ok: false,
+          action: "failed",
+          reason: built.reason
+        });
+        if (opts.logFailures) {
+          this.stderr(
+            `athena-gateway: ${sidecar.instanceId}: ${built.reason}
+`
+          );
+        }
+        continue;
+      }
       try {
-        await this.unregister(id, reason);
-      } catch (err) {
-        this.log?.(
-          "warn",
-          `channel ${id} stop failed: ${err instanceof Error ? err.message : String(err)}`
+        await this.channelManager.register(
+          built.adapter,
+          sidecar.attachmentId !== void 0 ? { attachmentId: sidecar.attachmentId } : {}
         );
+        results.push({
+          id: sidecar.instanceId,
+          ok: true,
+          action: existed ? "replaced" : "registered"
+        });
+        if (opts.logRegistrations) {
+          this.stdout(`athena-gateway: registered ${sidecar.instanceId}
+`);
+        }
+      } catch (err) {
+        const reason = errorReason(err);
+        results.push({
+          id: sidecar.instanceId,
+          ok: false,
+          action: "failed",
+          reason
+        });
+        if (opts.logFailures) {
+          this.stderr(
+            `athena-gateway: register ${sidecar.instanceId} failed: ${reason}
+`
+          );
+        }
       }
     }
-  }
-  handleInbound(channelId, msg) {
-    if (this.dedupSet.has(msg.idempotencyKey)) {
-      this.log?.("debug", `dropping duplicate inbound ${msg.idempotencyKey}`);
-      return;
-    }
-    this.dedupSet.add(msg.idempotencyKey);
-    this.dedup.push(msg.idempotencyKey);
-    while (this.dedup.length > this.dedupMax) {
-      const evicted = this.dedup.shift();
-      if (evicted !== void 0) this.dedupSet.delete(evicted);
-    }
-    const sink = this.inboundSink;
-    if (!sink) {
-      this.log?.(
-        "debug",
-        `no inbound sink registered; dropping ${msg.idempotencyKey}`
-      );
-      return;
-    }
-    try {
-      sink(msg, { attachmentId: this.entries.get(channelId)?.attachmentId });
-    } catch (err) {
-      this.log?.(
-        "warn",
-        `inbound sink threw: ${err instanceof Error ? err.message : String(err)}`
-      );
-    }
+    return { results };
   }
 };
+function pathIdFromSidecarPath(filePath) {
+  const base = filePath.split(/[\\/]/).pop() ?? filePath;
+  return base.endsWith(".json") ? base.slice(0, -".json".length) : base;
+}
+function errorReason(err) {
+  return err instanceof Error ? err.message : String(err);
+}
 
 // src/gateway/control/handlers.ts
 import { createRequire } from "module";
@@ -2241,7 +2380,7 @@ var cachedVersion = null;
 function readVersion() {
   if (cachedVersion !== null) return cachedVersion;
   try {
-    const injected = "0.5.8";
+    const injected = "0.5.11";
     if (typeof injected === "string" && injected.length > 0) {
       cachedVersion = injected;
       return cachedVersion;
@@ -3848,10 +3987,6 @@ function buildListenerStatus(spec, resolvedPort) {
     loopback: isLoopbackHost(spec.host)
   };
 }
-function pathIdFromSidecarPath(filePath) {
-  const base = filePath.split(/[\\/]/).pop() ?? filePath;
-  return base.endsWith(".json") ? base.slice(0, -".json".length) : base;
-}
 async function startDaemon(opts) {
   const startedAt = Date.now();
   const pid = process.pid;
@@ -3905,125 +4040,20 @@ async function startDaemon(opts) {
   channelManager.setInboundSink((inbound, ctx) => {
     pipeline.handleInbound(inbound, ctx);
   });
-  const channelConfigHome = opts.env?.HOME;
-  const reloadChannels = async () => {
-    const results = [];
-    const { sidecars, errors } = loadChannelSidecars(channelConfigHome);
-    for (const err of errors) {
-      const id = pathIdFromSidecarPath(err.path);
-      results.push({
-        id,
-        ok: false,
-        action: "failed",
-        reason: err.reason
-      });
-    }
-    const sidecarIds = new Set(sidecars.map((s) => s.instanceId));
-    for (const channel of channelManager.listChannels()) {
-      if (sidecarIds.has(channel.id)) continue;
-      try {
-        await channelManager.unregister(channel.id, "shutdown");
-        results.push({
-          id: channel.id,
-          ok: true,
-          action: "unregistered"
-        });
-      } catch (err) {
-        results.push({
-          id: channel.id,
-          ok: false,
-          action: "failed",
-          reason: err instanceof Error ? err.message : String(err)
-        });
-      }
-    }
-    for (const sidecar of sidecars) {
-      const existed = channelManager.listChannels().some((channel) => channel.id === sidecar.instanceId);
-      if (existed) {
-        try {
-          await channelManager.unregister(sidecar.instanceId, "shutdown");
-        } catch (err) {
-          results.push({
-            id: sidecar.instanceId,
-            ok: false,
-            action: "failed",
-            reason: err instanceof Error ? err.message : String(err)
-          });
-          continue;
-        }
-      }
-      const built = instantiateAdapter(sidecar);
-      if (!built.ok) {
-        results.push({
-          id: sidecar.instanceId,
-          ok: false,
-          action: "failed",
-          reason: built.reason
-        });
-        continue;
-      }
-      try {
-        await channelManager.register(
-          built.adapter,
-          sidecar.attachmentId !== void 0 ? { attachmentId: sidecar.attachmentId } : {}
-        );
-        results.push({
-          id: sidecar.instanceId,
-          ok: true,
-          action: existed ? "replaced" : "registered"
-        });
-        if (!opts.silent) {
-          process.stdout.write(
-            `athena-gateway: registered ${sidecar.instanceId}
-`
-          );
-        }
-      } catch (err) {
-        results.push({
-          id: sidecar.instanceId,
-          ok: false,
-          action: "failed",
-          reason: err instanceof Error ? err.message : String(err)
-        });
-      }
-    }
-    return { results };
-  };
+  const channelSidecarReconciler = new ChannelSidecarReconciler({
+    channelManager,
+    home: opts.env?.HOME
+  });
+  const reloadChannels = async () => channelSidecarReconciler.reconcile({
+    unregisterStale: true,
+    logRegistrations: !opts.silent
+  });
   if (!opts.skipChannelLoad) {
-    const { sidecars, errors } = loadChannelSidecars(channelConfigHome);
-    for (const err of errors) {
-      process.stderr.write(
-        `athena-gateway: skipping ${err.path}: ${err.reason}
-`
-      );
-    }
-    for (const sidecar of sidecars) {
-      const built = instantiateAdapter(sidecar);
-      if (!built.ok) {
-        process.stderr.write(
-          `athena-gateway: ${sidecar.instanceId}: ${built.reason}
-`
-        );
-        continue;
-      }
-      try {
-        await channelManager.register(
-          built.adapter,
-          sidecar.attachmentId !== void 0 ? { attachmentId: sidecar.attachmentId } : {}
-        );
-        if (!opts.silent) {
-          process.stdout.write(
-            `athena-gateway: registered ${sidecar.instanceId}
-`
-          );
-        }
-      } catch (err) {
-        process.stderr.write(
-          `athena-gateway: register ${sidecar.instanceId} failed: ${err instanceof Error ? err.message : String(err)}
-`
-        );
-      }
-    }
+    await channelSidecarReconciler.reconcile({
+      unregisterStale: false,
+      logFailures: true,
+      logRegistrations: !opts.silent
+    });
   }
   const handler = createDispatcher({
     startedAt,