@drisp/cli 0.4.4 → 0.4.5

package/dist/athena-gateway.js

@@ -4,7 +4,7 @@ import {
   loadOrCreateToken,
   requireTokenForBind,
   timingSafeTokenEqual
-} from "./chunk-6TJHAUNB.js";
+} from "./chunk-M44KEGM7.js";
 import {
   CHANNEL_REQUEST_ID_REGEX,
   createUdsServerTransport,
@@ -353,11 +353,11 @@ function makeFrameId() {
 }
 
 // src/gateway/adapters/console/adapter.ts
-var CONSOLE_ID = "console";
+var CONSOLE_DEFAULT_ID = "console";
 var CLIENT_NAME = "athena-cli";
 var CLIENT_VERSION = "0.0.0";
 var ConsoleAdapter = class {
-  id = CONSOLE_ID;
+  id;
   capabilities = {
     chat: true,
     threads: true,
@@ -369,8 +369,9 @@ var ConsoleAdapter = class {
   ctx = null;
   pendingPermissions = /* @__PURE__ */ new Map();
   pendingQuestions = /* @__PURE__ */ new Map();
-  constructor(opts) {
+  constructor(opts, id = CONSOLE_DEFAULT_ID) {
     this.opts = opts;
+    this.id = id;
   }
   async start(ctx) {
     if (this.client) {
@@ -502,7 +503,7 @@ var ConsoleAdapter = class {
     if (!entry) return;
     this.pendingPermissions.delete(channelRequestId);
     entry.signal.removeEventListener("abort", entry.abortListener);
-    entry.resolve({ kind: "verdict", behavior: decision, channelId: CONSOLE_ID });
+    entry.resolve({ kind: "verdict", behavior: decision, channelId: this.id });
   }
   disposePermissions(reason = "auto_resolved") {
     for (const [id, entry] of [...this.pendingPermissions.entries()]) {
@@ -571,7 +572,7 @@ var ConsoleAdapter = class {
       entry.resolve({ kind: "cancelled", reason: "auto_resolved" });
       return;
     }
-    entry.resolve({ kind: "answer", answers: filtered, channelId: CONSOLE_ID });
+    entry.resolve({ kind: "answer", answers: filtered, channelId: this.id });
   }
   disposeQuestions(reason = "auto_resolved") {
     for (const [id, entry] of [...this.pendingQuestions.entries()]) {
@@ -612,7 +613,7 @@ var ConsoleAdapter = class {
       this.ctx?.log("warn", "console.message.in dropped: missing messageId");
       return;
     }
-    const inbound = normalizeInbound(frame, this.opts.runnerId);
+    const inbound = normalizeInbound(frame, this.opts.runnerId, this.id);
     if (!inbound || !this.ctx) return;
     try {
       this.ctx.emitInbound(inbound);
@@ -723,13 +724,13 @@ function isValidConsoleAddress(value) {
   }
   return true;
 }
-function normalizeInbound(frame, runnerId) {
+function normalizeInbound(frame, runnerId, channelId) {
   if (typeof frame.text !== "string" || frame.text.length === 0) return null;
   const userId = frame.address.userId ?? "console-user";
   const idempotencyKey = typeof frame.idempotencyKey === "string" && frame.idempotencyKey.length > 0 ? frame.idempotencyKey : `console:${runnerId}:${frame.messageId}`;
   return {
     location: {
-      channelId: CONSOLE_ID,
+      channelId,
       accountId: frame.address.workspaceId ?? runnerId,
       peer: { id: userId, kind: "user" },
       ...frame.address.threadId !== void 0 ? { thread: { id: frame.address.threadId } } : frame.address.conversationId !== void 0 ? { thread: { id: frame.address.conversationId } } : {}
@@ -810,8 +811,8 @@ var consoleModule = {
     };
     return { ok: true, config };
   },
-  create(config) {
-    return new ConsoleAdapter(config);
+  create(config, instanceId) {
+    return new ConsoleAdapter(config, instanceId);
   }
 };
 function isLoopbackUrl(url) {
@@ -1520,9 +1521,9 @@ function buildCancelText(reason) {
 }
 
 // src/gateway/adapters/telegram/adapter.ts
-var TELEGRAM_ID = "telegram";
+var TELEGRAM_DEFAULT_ID = "telegram";
 var TelegramAdapter = class {
-  id = TELEGRAM_ID;
+  id;
   capabilities = {
     chat: true,
     threads: true,
@@ -1538,8 +1539,9 @@ var TelegramAdapter = class {
   lastInboundAt;
   lastTransportOk = true;
   ctx = null;
-  constructor(opts) {
+  constructor(opts, id = TELEGRAM_DEFAULT_ID) {
     this.opts = opts;
+    this.id = id;
     this.relay = new TelegramRelay({
       resolveTarget: () => {
         if (this.opts.defaultChatId === void 0) return null;
@@ -1638,7 +1640,7 @@ var TelegramAdapter = class {
           this.markHealth(true);
           continue;
         }
-        const inbound = normalizeInbound2(update, allow);
+        const inbound = normalizeInbound2(update, allow, this.id);
         if (!inbound) continue;
         this.lastInboundAt = inbound.receivedAt;
         this.markHealth(true);
@@ -1676,7 +1678,7 @@ var TelegramAdapter = class {
     }
   }
 };
-function normalizeInbound2(update, allow) {
+function normalizeInbound2(update, allow, channelId) {
   const message = update.message ?? update.edited_message;
   if (!message) return null;
   const text = message.text;
@@ -1691,7 +1693,7 @@ function normalizeInbound2(update, allow) {
   const threadId = typeof message.message_thread_id === "number" ? String(message.message_thread_id) : void 0;
   return {
     location: {
-      channelId: TELEGRAM_ID,
+      channelId,
       accountId,
       ...isPrivate ? { peer: { id: chatId, kind: "user" } } : {
         room: {
@@ -1746,8 +1748,8 @@ var telegramModule = {
     };
     return { ok: true, config };
   },
-  create(config) {
-    return new TelegramAdapter(config);
+  create(config, instanceId) {
+    return new TelegramAdapter(config, instanceId);
   }
 };
 
@@ -1762,18 +1764,18 @@ function findAdapterModule(name) {
 
 // src/gateway/adapters/factory.ts
 function instantiateAdapter(sidecar) {
-  const module = findAdapterModule(sidecar.name);
+  const module = findAdapterModule(sidecar.kind);
   if (!module) {
-    return { ok: false, reason: `unknown channel: ${sidecar.name}` };
+    return { ok: false, reason: `unknown channel kind: ${sidecar.kind}` };
   }
   const parsed = module.parseConfig({
     options: sidecar.options,
     allowedUserIds: sidecar.allowedUserIds
   });
   if (!parsed.ok) {
-    return { ok: false, reason: `${sidecar.name}: ${parsed.reason}` };
+    return { ok: false, reason: `${sidecar.instanceId}: ${parsed.reason}` };
   }
-  return { ok: true, adapter: module.create(parsed.config) };
+  return { ok: true, adapter: module.create(parsed.config, sidecar.instanceId) };
 }
 
 // src/gateway/channelManager.ts
@@ -2088,7 +2090,7 @@ var cachedVersion = null;
 function readVersion() {
   if (cachedVersion !== null) return cachedVersion;
   try {
-    const injected = "0.4.4";
+    const injected = "0.4.5";
     if (typeof injected === "string" && injected.length > 0) {
       cachedVersion = injected;
       return cachedVersion;
@@ -3094,6 +3096,64 @@ function acquireLock(lockPath) {
   throw new Error(`failed to acquire gateway lock at ${lockPath}`);
 }
 
+// src/gateway/relay/pendingRegistry.ts
+var PendingRegistry = class {
+  entries = /* @__PURE__ */ new Map();
+  inspect(channelRequestId, kind, fingerprint, runtimeId) {
+    const existing = this.entries.get(channelRequestId);
+    if (!existing) return { kind: "absent" };
+    if (existing.kind !== kind) return { kind: "collision", reason: "kind" };
+    if (existing.fingerprint !== fingerprint) {
+      return { kind: "collision", reason: "payload" };
+    }
+    if (existing.runtimeId !== runtimeId) {
+      return { kind: "collision", reason: "owner" };
+    }
+    return { kind: "attach", entry: existing };
+  }
+  register(entry) {
+    this.entries.set(entry.channelRequestId, entry);
+  }
+  settle(channelRequestId, result) {
+    const entry = this.entries.get(channelRequestId);
+    if (!entry || entry.settled) return false;
+    entry.settled = true;
+    this.entries.delete(channelRequestId);
+    clearTimeout(entry.timer);
+    for (const ctrl of entry.controllers) {
+      if (!ctrl.signal.aborted) ctrl.abort();
+    }
+    entry.resolve(result);
+    return true;
+  }
+  cancel(channelRequestId, reason, expectedRuntimeId) {
+    const entry = this.entries.get(channelRequestId);
+    if (!entry) return false;
+    if (expectedRuntimeId !== void 0 && entry.runtimeId !== void 0 && entry.runtimeId !== expectedRuntimeId) {
+      return false;
+    }
+    return this.settle(channelRequestId, { kind: "cancelled", reason });
+  }
+  disposeAll(reason) {
+    for (const id of [...this.entries.keys()]) {
+      this.cancel(id, reason, void 0);
+    }
+  }
+  count() {
+    return this.entries.size;
+  }
+};
+function collisionMessage(channelRequestId, reason, newKind) {
+  if (reason === "owner") {
+    return `channel_request_owner_mismatch: ${channelRequestId} owned by a different runtime`;
+  }
+  if (reason === "kind") {
+    const otherKind = newKind === "permission" ? "question" : "permission";
+    return `channel_request_id_collision: ${channelRequestId} is bound to a ${otherKind} relay`;
+  }
+  return `channel_request_id_collision: ${channelRequestId} payload mismatch`;
+}
+
 // src/gateway/relay/coordinator.ts
 var DEFAULT_RELAY_TTL_MS = 5 * 6e4;
 var RelayCoordinator = class {
@@ -3101,7 +3161,7 @@ var RelayCoordinator = class {
   defaultTtlMs;
   idFactory;
   log;
-  pending = /* @__PURE__ */ new Map();
+  registry = new PendingRegistry();
   constructor(opts) {
     this.adapters = opts.adapters;
     this.defaultTtlMs = opts.defaultTtlMs ?? DEFAULT_RELAY_TTL_MS;
@@ -3110,180 +3170,151 @@ var RelayCoordinator = class {
   }
   requestPermission(req) {
     const channelRequestId = req.channelRequestId ?? this.idFactory();
-    const ttlMs = req.ttlMs ?? this.defaultTtlMs;
     const targets = this.adapters().filter(
       (a) => a.capabilities.relayPermission && typeof a.requestPermissionVerdict === "function"
     );
     if (targets.length === 0) {
-      return {
-        channelRequestId,
-        result: Promise.resolve({ kind: "no_relay" })
-      };
+      return { channelRequestId, result: Promise.resolve({ kind: "no_relay" }) };
     }
     const fingerprint = permissionFingerprint(req);
-    const existing = this.pending.get(channelRequestId);
-    if (existing) {
-      if (existing.kind !== "permission") {
-        throw new Error(
-          `channel_request_id_collision: ${channelRequestId} is bound to a question relay`
-        );
-      }
-      if (existing.fingerprint !== fingerprint) {
-        throw new Error(
-          `channel_request_id_collision: ${channelRequestId} payload mismatch`
-        );
-      }
-      if (existing.runtimeId !== req.runtimeId) {
-        throw new Error(
-          `channel_request_owner_mismatch: ${channelRequestId} owned by a different runtime`
-        );
-      }
-      return { channelRequestId, result: existing.result };
-    }
-    const controllers = targets.map(() => new AbortController());
-    let resolveFn;
-    const result = new Promise((resolve) => {
-      resolveFn = resolve;
-    });
-    const timer = setTimeout(() => {
-      this.settle(channelRequestId, { kind: "cancelled", reason: "timeout" });
-    }, ttlMs);
-    if (typeof timer.unref === "function") timer.unref();
-    const entry = {
-      kind: "permission",
+    const inspect = this.registry.inspect(
       channelRequestId,
+      "permission",
       fingerprint,
-      ...req.runtimeId !== void 0 ? { runtimeId: req.runtimeId } : {},
-      controllers,
-      timer,
-      resolve: resolveFn,
-      result,
-      settled: false
-    };
-    this.pending.set(channelRequestId, entry);
+      req.runtimeId
+    );
+    if (inspect.kind === "collision") {
+      throw new Error(
+        collisionMessage(channelRequestId, inspect.reason, "permission")
+      );
+    }
+    if (inspect.kind === "attach") {
+      return {
+        channelRequestId,
+        result: inspect.entry.result
+      };
+    }
     const fullReq = {
       channelRequestId,
       toolName: req.toolName,
       description: req.description,
       inputPreview: req.inputPreview
     };
-    targets.forEach((adapter, idx) => {
-      const ctrl = controllers[idx];
-      Promise.resolve().then(() => adapter.requestPermissionVerdict(fullReq, ctrl.signal)).then((res) => {
-        if (res.kind === "verdict") {
-          this.settle(channelRequestId, { ...res, channelId: adapter.id });
-        }
-      }).catch((err) => {
-        this.log?.(
-          "warn",
-          `adapter ${adapter.id} permission relay failed: ${err instanceof Error ? err.message : String(err)}`
-        );
-      });
+    const result = this.broadcast({
+      kind: "permission",
+      channelRequestId,
+      ttlMs: req.ttlMs ?? this.defaultTtlMs,
+      runtimeId: req.runtimeId,
+      fingerprint,
+      targets,
+      perAdapter: async (adapter, signal) => {
+        const res = await adapter.requestPermissionVerdict(fullReq, signal);
+        return res.kind === "verdict" ? { ...res, channelId: adapter.id } : null;
+      }
     });
     return { channelRequestId, result };
   }
   requestQuestion(req) {
     const channelRequestId = req.channelRequestId ?? this.idFactory();
-    const ttlMs = req.ttlMs ?? this.defaultTtlMs;
     const targets = this.adapters().filter(
       (a) => a.capabilities.relayQuestion && typeof a.requestQuestionAnswer === "function"
     );
     if (targets.length === 0) {
+      return { channelRequestId, result: Promise.resolve({ kind: "no_relay" }) };
+    }
+    const fingerprint = questionFingerprint(req);
+    const inspect = this.registry.inspect(
+      channelRequestId,
+      "question",
+      fingerprint,
+      req.runtimeId
+    );
+    if (inspect.kind === "collision") {
+      throw new Error(
+        collisionMessage(channelRequestId, inspect.reason, "question")
+      );
+    }
+    if (inspect.kind === "attach") {
       return {
         channelRequestId,
-        result: Promise.resolve({ kind: "no_relay" })
+        result: inspect.entry.result
       };
     }
-    const fingerprint = questionFingerprint(req);
-    const existing = this.pending.get(channelRequestId);
-    if (existing) {
-      if (existing.kind !== "question") {
-        throw new Error(
-          `channel_request_id_collision: ${channelRequestId} is bound to a permission relay`
-        );
-      }
-      if (existing.fingerprint !== fingerprint) {
-        throw new Error(
-          `channel_request_id_collision: ${channelRequestId} payload mismatch`
-        );
-      }
-      if (existing.runtimeId !== req.runtimeId) {
-        throw new Error(
-          `channel_request_owner_mismatch: ${channelRequestId} owned by a different runtime`
-        );
+    const fullReq = {
+      channelRequestId,
+      title: req.title,
+      questions: req.questions
+    };
+    const result = this.broadcast({
+      kind: "question",
+      channelRequestId,
+      ttlMs: req.ttlMs ?? this.defaultTtlMs,
+      runtimeId: req.runtimeId,
+      fingerprint,
+      targets,
+      perAdapter: async (adapter, signal) => {
+        const res = await adapter.requestQuestionAnswer(fullReq, signal);
+        return res.kind === "answer" ? { ...res, channelId: adapter.id } : null;
       }
-      return { channelRequestId, result: existing.result };
-    }
+    });
+    return { channelRequestId, result };
+  }
+  cancel(channelRequestId, reason, expectedRuntimeId) {
+    return this.registry.cancel(channelRequestId, reason, expectedRuntimeId);
+  }
+  pendingCount() {
+    return this.registry.count();
+  }
+  disposeAll(reason = "auto_resolved") {
+    this.registry.disposeAll(reason);
+  }
+  broadcast(args) {
+    const {
+      kind,
+      channelRequestId,
+      ttlMs,
+      runtimeId,
+      fingerprint,
+      targets,
+      perAdapter
+    } = args;
     const controllers = targets.map(() => new AbortController());
     let resolveFn;
     const result = new Promise((resolve) => {
       resolveFn = resolve;
     });
     const timer = setTimeout(() => {
-      this.settle(channelRequestId, { kind: "cancelled", reason: "timeout" });
+      this.registry.settle(channelRequestId, {
+        kind: "cancelled",
+        reason: "timeout"
+      });
     }, ttlMs);
     if (typeof timer.unref === "function") timer.unref();
-    const entry = {
-      kind: "question",
+    this.registry.register({
+      kind,
       channelRequestId,
       fingerprint,
-      ...req.runtimeId !== void 0 ? { runtimeId: req.runtimeId } : {},
+      runtimeId,
       controllers,
       timer,
       resolve: resolveFn,
       result,
       settled: false
-    };
-    this.pending.set(channelRequestId, entry);
-    const fullReq = {
-      channelRequestId,
-      title: req.title,
-      questions: req.questions
-    };
+    });
     targets.forEach((adapter, idx) => {
       const ctrl = controllers[idx];
-      Promise.resolve().then(() => adapter.requestQuestionAnswer(fullReq, ctrl.signal)).then((res) => {
-        if (res.kind === "answer") {
-          this.settle(channelRequestId, { ...res, channelId: adapter.id });
+      Promise.resolve().then(() => perAdapter(adapter, ctrl.signal)).then((res) => {
+        if (res !== null) {
+          this.registry.settle(channelRequestId, res);
         }
       }).catch((err) => {
         this.log?.(
           "warn",
-          `adapter ${adapter.id} question relay failed: ${err instanceof Error ? err.message : String(err)}`
+          `adapter ${adapter.id} ${kind} relay failed: ${err instanceof Error ? err.message : String(err)}`
         );
       });
     });
-    return { channelRequestId, result };
-  }
-  cancel(channelRequestId, reason, expectedRuntimeId) {
-    const entry = this.pending.get(channelRequestId);
-    if (!entry) return false;
-    if (expectedRuntimeId !== void 0 && entry.runtimeId !== void 0 && entry.runtimeId !== expectedRuntimeId) {
-      return false;
-    }
-    this.settle(channelRequestId, { kind: "cancelled", reason });
-    return true;
-  }
-  pendingCount() {
-    return this.pending.size;
-  }
-  disposeAll(reason = "auto_resolved") {
-    for (const id of [...this.pending.keys()]) {
-      this.cancel(id, reason);
-    }
-  }
-  settle(channelRequestId, result) {
-    const entry = this.pending.get(channelRequestId);
-    if (!entry || entry.settled) return;
-    entry.settled = true;
-    this.pending.delete(channelRequestId);
-    clearTimeout(entry.timer);
-    for (const ctrl of entry.controllers) {
-      if (!ctrl.signal.aborted) ctrl.abort();
-    }
-    entry.resolve(
-      result
-    );
+    return result;
   }
 };
 function permissionFingerprint(req) {
@@ -3650,7 +3681,7 @@ async function startDaemon(opts) {
         reason: err.reason
       });
     }
-    const sidecarIds = new Set(sidecars.map((s) => s.name));
+    const sidecarIds = new Set(sidecars.map((s) => s.instanceId));
     for (const channel of channelManager.listChannels()) {
       if (sidecarIds.has(channel.id)) continue;
       try {
@@ -3670,13 +3701,13 @@ async function startDaemon(opts) {
       }
     }
     for (const sidecar of sidecars) {
-      const existed = channelManager.listChannels().some((channel) => channel.id === sidecar.name);
+      const existed = channelManager.listChannels().some((channel) => channel.id === sidecar.instanceId);
       if (existed) {
         try {
-          await channelManager.unregister(sidecar.name, "shutdown");
+          await channelManager.unregister(sidecar.instanceId, "shutdown");
         } catch (err) {
           results.push({
-            id: sidecar.name,
+            id: sidecar.instanceId,
             ok: false,
             action: "failed",
             reason: err instanceof Error ? err.message : String(err)
@@ -3687,7 +3718,7 @@ async function startDaemon(opts) {
       const built = instantiateAdapter(sidecar);
       if (!built.ok) {
         results.push({
-          id: sidecar.name,
+          id: sidecar.instanceId,
           ok: false,
           action: "failed",
           reason: built.reason
@@ -3697,17 +3728,19 @@ async function startDaemon(opts) {
       try {
         await channelManager.register(built.adapter);
         results.push({
-          id: sidecar.name,
+          id: sidecar.instanceId,
           ok: true,
           action: existed ? "replaced" : "registered"
         });
         if (!opts.silent) {
-          process.stdout.write(`athena-gateway: registered ${sidecar.name}
-`);
+          process.stdout.write(
+            `athena-gateway: registered ${sidecar.instanceId}
+`
+          );
         }
       } catch (err) {
         results.push({
-          id: sidecar.name,
+          id: sidecar.instanceId,
           ok: false,
           action: "failed",
           reason: err instanceof Error ? err.message : String(err)
@@ -3728,7 +3761,7 @@ async function startDaemon(opts) {
       const built = instantiateAdapter(sidecar);
       if (!built.ok) {
         process.stderr.write(
-          `athena-gateway: ${sidecar.name}: ${built.reason}
+          `athena-gateway: ${sidecar.instanceId}: ${built.reason}
 `
         );
         continue;
@@ -3736,12 +3769,14 @@ async function startDaemon(opts) {
       try {
         await channelManager.register(built.adapter);
         if (!opts.silent) {
-          process.stdout.write(`athena-gateway: registered ${sidecar.name}
-`);
+          process.stdout.write(
+            `athena-gateway: registered ${sidecar.instanceId}
+`
+          );
         }
       } catch (err) {
         process.stderr.write(
-          `athena-gateway: register ${sidecar.name} failed: ${err instanceof Error ? err.message : String(err)}
+          `athena-gateway: register ${sidecar.instanceId} failed: ${err instanceof Error ? err.message : String(err)}
 `
         );
       }

package/dist/{chunk-6TJHAUNB.js → chunk-M44KEGM7.js}

@@ -139,14 +139,26 @@ function loadOne(name, filePath) {
         };
     }
   }
+  const kindRaw = obj["kind"];
+  if (kindRaw !== void 0 && (typeof kindRaw !== "string" || kindRaw.length === 0)) {
+    return { ok: false, reason: "kind must be a non-empty string" };
+  }
+  const kind = kindRaw ?? name;
+  const instanceIdRaw = obj["instance_id"];
+  if (instanceIdRaw !== void 0 && (typeof instanceIdRaw !== "string" || instanceIdRaw.length === 0)) {
+    return { ok: false, reason: "instance_id must be a non-empty string" };
+  }
+  const instanceId = instanceIdRaw ?? kind;
   const options = {};
   for (const [key, value] of Object.entries(obj)) {
-    if (key === "allowed_user_ids") continue;
+    if (key === "allowed_user_ids" || key === "kind" || key === "instance_id") {
+      continue;
+    }
     options[key] = value;
   }
   return {
     ok: true,
-    sidecar: { name, path: filePath, allowedUserIds, options }
+    sidecar: { name, path: filePath, kind, instanceId, allowedUserIds, options }
   };
 }
 
@@ -158,4 +170,4 @@ export {
   channelSidecarDir,
   loadChannelSidecars
 };
-//# sourceMappingURL=chunk-6TJHAUNB.js.map
+//# sourceMappingURL=chunk-M44KEGM7.js.map