@implicit-ai/relay 0.0.3 → 0.0.4

package/dist/cli.js

@@ -25,24 +25,35 @@ function detectClaudeCodeInstalled() {
   }
 }
 function detectClaudeAuth() {
-  if (process.env.CLAUDE_CODE_OAUTH_TOKEN) {
-    return { method: "oauth" };
+  const available = [];
+  if (hasOAuthCredentials()) available.push("oauth");
+  if (process.env.ANTHROPIC_API_KEY) available.push("api_key");
+  const preferApiKey = process.env.IMPLICIT_USE_API_KEY === "1";
+  let method;
+  if (preferApiKey && available.includes("api_key")) {
+    method = "api_key";
+  } else if (available.includes("oauth")) {
+    method = "oauth";
+  } else if (available.includes("api_key")) {
+    method = "api_key";
+  } else {
+    method = "none";
   }
-  if (process.env.ANTHROPIC_API_KEY) {
-    return { method: "api_key" };
+  let apiKeyOverridden = false;
+  if (method === "oauth" && process.env.ANTHROPIC_API_KEY) {
+    delete process.env.ANTHROPIC_API_KEY;
+    apiKeyOverridden = true;
   }
+  return { method, available, apiKeyOverridden };
+}
+function hasOAuthCredentials() {
+  if (process.env.CLAUDE_CODE_OAUTH_TOKEN) return true;
   if (process.platform === "darwin") {
     const keychainServices = ["Claude Code-credentials", "claude.ai"];
     for (const service of keychainServices) {
       try {
-        const result = execaSync("security", [
-          "find-generic-password",
-          "-s",
-          service
-        ]);
-        if (result.exitCode === 0) {
-          return { method: "oauth" };
-        }
+        const result = execaSync("security", ["find-generic-password", "-s", service]);
+        if (result.exitCode === 0) return true;
       } catch {
       }
     }
@@ -52,13 +63,11 @@ function detectClaudeAuth() {
     if (fs.existsSync(credentialsPath)) {
       const raw = fs.readFileSync(credentialsPath, "utf-8");
       const parsed = JSON.parse(raw);
-      if (parsed !== null && typeof parsed === "object") {
-        return { method: "oauth" };
-      }
+      if (parsed !== null && typeof parsed === "object") return true;
     }
   } catch {
   }
-  return { method: "none" };
+  return false;
 }
 function printAuthGuidance() {
   console.log("Claude Code auth not found. To set up authentication:");
@@ -1111,6 +1120,8 @@ var AblyTransport = class {
   firstConnectDone = false;
   /** Guards against re-registering connection state listeners on reconnect. */
   connectionListenersWired = false;
+  /** Guards against re-registering channel state listeners across attach attempts. */
+  channelListenersWired = false;
   reconnectHandlers = [];
   errorHandlers = [];
   connectionStateHandlers = [];
@@ -1146,7 +1157,7 @@ var AblyTransport = class {
     if (!this.connectionListenersWired) {
       this.connectionListenersWired = true;
       this.realtime.connection.on("connected", () => {
-        log.info("connection state: connected");
+        log.info({ connectionId: this.realtime?.connection.id, connectionKey: this.realtime?.connection.key }, "connection state: connected");
         this._isConnected = true;
         if (this.firstConnectDone) {
           log.info({ handlers: this.reconnectHandlers.length }, "reconnected \u2014 firing handlers");
@@ -1181,7 +1192,58 @@ var AblyTransport = class {
       });
     }
     this.channel = this.realtime.channels.get(this.channelName);
-    await this.channel.attach();
+    if (!this.channelListenersWired) {
+      this.channelListenersWired = true;
+      const ch = this.channel;
+      ch.on("attached", (stateChange) => {
+        log.info(
+          {
+            channel: this.channelName,
+            resumed: stateChange?.resumed,
+            hasBacklog: stateChange?.hasBacklog
+          },
+          "channel state: attached"
+        );
+      });
+      ch.on("failed", (stateChange) => {
+        log.error(
+          { channel: this.channelName, reason: stateChange?.reason?.message, code: stateChange?.reason?.code },
+          "channel state: failed"
+        );
+      });
+      ch.on("detached", (stateChange) => {
+        log.warn(
+          { channel: this.channelName, reason: stateChange?.reason?.message, code: stateChange?.reason?.code },
+          "channel state: detached"
+        );
+      });
+      ch.on("suspended", (stateChange) => {
+        log.warn(
+          { channel: this.channelName, reason: stateChange?.reason?.message, code: stateChange?.reason?.code },
+          "channel state: suspended"
+        );
+      });
+      ch.on("update", (stateChange) => {
+        log.info(
+          {
+            channel: this.channelName,
+            current: stateChange?.current,
+            previous: stateChange?.previous,
+            reason: stateChange?.reason?.message
+          },
+          "channel state: update"
+        );
+      });
+    }
+    log.info({ channel: this.channelName }, "attaching channel");
+    try {
+      await this.channel.attach();
+      log.info({ channel: this.channelName, state: this.channel.state }, "attach() resolved");
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      log.error({ channel: this.channelName, err: message }, "attach() rejected");
+      throw err;
+    }
     for (const { event, handler } of this.pendingSubscriptions) {
       this.channel.subscribe(event, (msg) => {
         handler(msg.data);
@@ -1240,8 +1302,15 @@ var AblyTransport = class {
   // --- Presence ---
   async presenceEnter(data) {
     if (!this.channel) throw new Error("AblyTransport: not connected \u2014 call connect() first");
-    log.info({ data }, "entering presence");
-    await this.channel.presence.enter(data);
+    log.info({ data, channelState: this.channel.state }, "entering presence");
+    try {
+      await this.channel.presence.enter(data);
+      log.info({ channel: this.channelName }, "presence.enter() resolved");
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      log.error({ channel: this.channelName, err: message }, "presence.enter() rejected");
+      throw err;
+    }
   }
   async presenceLeave() {
     if (!this.channel) return;
@@ -1324,7 +1393,17 @@ async function connect(options) {
     printAuthGuidance();
     process.exit(1);
   }
-  if (!isHeadless) console.log(`  \u2713 Claude auth detected (${claudeAuth.method})`);
+  if (!isHeadless) {
+    console.log(`  \u2713 Claude auth detected (${claudeAuth.method})`);
+    if (claudeAuth.apiKeyOverridden) {
+      console.log(
+        "    \u21B3 ANTHROPIC_API_KEY found but ignored \u2014 using Claude Pro/Max OAuth."
+      );
+      console.log(
+        "      Set IMPLICIT_USE_API_KEY=1 to bill via API instead."
+      );
+    }
+  }
   let auth = options.token ? authFromAccessToken(options.token, env) : loadAuth();
   if (!auth) {
     if (isHeadless) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@implicit-ai/relay",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Control Claude Code from your phone with Implicit",
   "type": "module",
   "bin": {