@gethmy/agent 1.11.2 → 1.12.0

package/dist/cli.js

@@ -390,7 +390,7 @@ var init_types = __esm(() => {
     pickupColumns: ["To Do"],
     priorityLabels: { urgent: 100, critical: 90, bug: 50 },
     columnBoost: true,
-    runner: "cli",
+    runner: "sdk",
     completion: {
       createPR: false,
       moveToColumn: "Review",
@@ -565,7 +565,7 @@ function loadDaemonConfig() {
     }
   };
   if (agent.runner !== "cli" && agent.runner !== "sdk") {
-    agent.runner = "cli";
+    agent.runner = DEFAULT_AGENT_CONFIG.runner;
   }
   return {
     apiKey,
@@ -6227,6 +6227,15 @@ class Worker {
             ...this.runLedger()
           });
         } catch {}
+        const stopCost = this.lastSessionStats?.cost;
+        if (stopCost) {
+          const cents = Math.round(stopCost.totalCostUsd * 100);
+          if (cents > 0) {
+            try {
+              await this.stateStore.addCost(card.id, cents);
+            } catch {}
+          }
+        }
       } else if (this.runId && this.verificationFailed) {
         try {
           await this.stateStore.endRun(this.runId, "paused", {
@@ -6709,7 +6718,7 @@ class Worker {
       clearTimeout(this.timeoutTimer);
       this.timeoutTimer = null;
     }
-    if (this.worktreePath && (this.state === "error" || this.timedOut)) {
+    if (this.worktreePath && (this.state === "error" || this.timedOut || this.aborted)) {
       try {
         cleanupWorktree(this.worktreePath, this.branchName ?? undefined);
       } catch {
@@ -7681,6 +7690,10 @@ class Watcher {
   readyPromise = new Promise((resolve3) => {
     this.readyResolve = resolve3;
   });
+  stopping = false;
+  reconnectTimer = null;
+  reconnectAttempts = 0;
+  broadcastGen = 0;
   get isConnected() {
     return this.connected;
   }
@@ -7709,7 +7722,34 @@ class Watcher {
     }
     this.supabase = createClient(this.credentials.supabaseUrl, this.credentials.supabaseAnonKey);
     const presenceChannel = this.supabase.channel(`board-presence-${this.projectId}`);
-    const channel = this.supabase.channel(`board-${this.projectId}`).on("broadcast", { event: "card_update" }, (msg) => {
+    this.subscribeBroadcast();
+    presenceChannel.on("presence", { event: "sync" }, () => {
+      log.debug(TAG32, "Presence sync");
+    }).subscribe(async (status) => {
+      if (status === "SUBSCRIBED") {
+        await presenceChannel.track({
+          daemonId: this.daemonId,
+          startedAt: new Date().toISOString(),
+          userId: this.identity.userId,
+          agentId: this.identity.agentId,
+          userEmail: this.identity.userEmail,
+          agentIdentifier: this.identity.agentIdentifier,
+          agentName: this.identity.agentName
+        });
+        if (!isPretty() || !this.suppressStartupLogs) {
+          log.info(TAG32, "Presence tracked on board-presence channel");
+        }
+        this.presenceTracked = true;
+        this.maybeResolveReady();
+      }
+    });
+    this.presenceChannel = presenceChannel;
+  }
+  subscribeBroadcast() {
+    if (!this.supabase)
+      return;
+    const gen = ++this.broadcastGen;
+    this.channel = this.supabase.channel(`board-${this.projectId}`).on("broadcast", { event: "card_update" }, (msg) => {
       log.debug(TAG32, `Broadcast: card_update ${JSON.stringify(msg.payload)}`);
       this.onCardBroadcast({
         event: "card_update",
@@ -7730,46 +7770,54 @@ class Watcher {
         this.onAgentCommand?.({ cardId, command });
       }
     }).subscribe((status) => {
+      if (gen !== this.broadcastGen)
+        return;
       if (status === "SUBSCRIBED") {
         this.connected = true;
+        this.reconnectAttempts = 0;
         if (!isPretty() || !this.suppressStartupLogs) {
           log.info(TAG32, "Broadcast subscription active");
         }
         this.maybeResolveReady();
-      } else if (status === "CHANNEL_ERROR") {
-        this.connected = false;
-        log.error(TAG32, "Broadcast channel error — will rely on reconciliation");
-      } else if (status === "TIMED_OUT") {
-        this.connected = false;
-        log.warn(TAG32, "Broadcast subscription timed out — retrying...");
-      } else if (status === "CLOSED") {
+      } else if (status === "CHANNEL_ERROR" || status === "TIMED_OUT" || status === "CLOSED") {
         this.connected = false;
-      }
-    });
-    this.channel = channel;
-    presenceChannel.on("presence", { event: "sync" }, () => {
-      log.debug(TAG32, "Presence sync");
-    }).subscribe(async (status) => {
-      if (status === "SUBSCRIBED") {
-        await presenceChannel.track({
-          daemonId: this.daemonId,
-          startedAt: new Date().toISOString(),
-          userId: this.identity.userId,
-          agentId: this.identity.agentId,
-          userEmail: this.identity.userEmail,
-          agentIdentifier: this.identity.agentIdentifier,
-          agentName: this.identity.agentName
-        });
-        if (!isPretty() || !this.suppressStartupLogs) {
-          log.info(TAG32, "Presence tracked on board-presence channel");
+        if (!this.stopping) {
+          log.warn(TAG32, `Broadcast subscription ${status} — scheduling reconnect`);
+          this.scheduleReconnect();
         }
-        this.presenceTracked = true;
-        this.maybeResolveReady();
       }
     });
-    this.presenceChannel = presenceChannel;
+  }
+  scheduleReconnect() {
+    if (this.stopping || this.reconnectTimer)
+      return;
+    const delay = Math.min(30000, 1000 * 2 ** this.reconnectAttempts);
+    this.reconnectAttempts++;
+    this.reconnectTimer = setTimeout(() => {
+      this.reconnectTimer = null;
+      this.reconnectBroadcast();
+    }, delay);
+  }
+  async reconnectBroadcast() {
+    if (this.stopping || !this.supabase)
+      return;
+    log.warn(TAG32, `Reconnecting broadcast subscription (attempt ${this.reconnectAttempts})`);
+    if (this.channel) {
+      const old = this.channel;
+      this.channel = null;
+      this.broadcastGen++;
+      try {
+        await this.supabase.removeChannel(old);
+      } catch {}
+    }
+    this.subscribeBroadcast();
   }
   async stop() {
+    this.stopping = true;
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
     if (this.presenceChannel) {
       await this.supabase?.removeChannel(this.presenceChannel);
       this.presenceChannel = null;

package/dist/index.js

@@ -389,7 +389,7 @@ var init_types = __esm(() => {
     pickupColumns: ["To Do"],
     priorityLabels: { urgent: 100, critical: 90, bug: 50 },
     columnBoost: true,
-    runner: "cli",
+    runner: "sdk",
     completion: {
       createPR: false,
       moveToColumn: "Review",
@@ -564,7 +564,7 @@ function loadDaemonConfig() {
     }
   };
   if (agent.runner !== "cli" && agent.runner !== "sdk") {
-    agent.runner = "cli";
+    agent.runner = DEFAULT_AGENT_CONFIG.runner;
   }
   return {
     apiKey,
@@ -6226,6 +6226,15 @@ class Worker {
             ...this.runLedger()
           });
         } catch {}
+        const stopCost = this.lastSessionStats?.cost;
+        if (stopCost) {
+          const cents = Math.round(stopCost.totalCostUsd * 100);
+          if (cents > 0) {
+            try {
+              await this.stateStore.addCost(card.id, cents);
+            } catch {}
+          }
+        }
       } else if (this.runId && this.verificationFailed) {
         try {
           await this.stateStore.endRun(this.runId, "paused", {
@@ -6708,7 +6717,7 @@ class Worker {
       clearTimeout(this.timeoutTimer);
       this.timeoutTimer = null;
     }
-    if (this.worktreePath && (this.state === "error" || this.timedOut)) {
+    if (this.worktreePath && (this.state === "error" || this.timedOut || this.aborted)) {
       try {
         cleanupWorktree(this.worktreePath, this.branchName ?? undefined);
       } catch {
@@ -7680,6 +7689,10 @@ class Watcher {
   readyPromise = new Promise((resolve3) => {
     this.readyResolve = resolve3;
   });
+  stopping = false;
+  reconnectTimer = null;
+  reconnectAttempts = 0;
+  broadcastGen = 0;
   get isConnected() {
     return this.connected;
   }
@@ -7708,7 +7721,34 @@ class Watcher {
     }
     this.supabase = createClient(this.credentials.supabaseUrl, this.credentials.supabaseAnonKey);
     const presenceChannel = this.supabase.channel(`board-presence-${this.projectId}`);
-    const channel = this.supabase.channel(`board-${this.projectId}`).on("broadcast", { event: "card_update" }, (msg) => {
+    this.subscribeBroadcast();
+    presenceChannel.on("presence", { event: "sync" }, () => {
+      log.debug(TAG32, "Presence sync");
+    }).subscribe(async (status) => {
+      if (status === "SUBSCRIBED") {
+        await presenceChannel.track({
+          daemonId: this.daemonId,
+          startedAt: new Date().toISOString(),
+          userId: this.identity.userId,
+          agentId: this.identity.agentId,
+          userEmail: this.identity.userEmail,
+          agentIdentifier: this.identity.agentIdentifier,
+          agentName: this.identity.agentName
+        });
+        if (!isPretty() || !this.suppressStartupLogs) {
+          log.info(TAG32, "Presence tracked on board-presence channel");
+        }
+        this.presenceTracked = true;
+        this.maybeResolveReady();
+      }
+    });
+    this.presenceChannel = presenceChannel;
+  }
+  subscribeBroadcast() {
+    if (!this.supabase)
+      return;
+    const gen = ++this.broadcastGen;
+    this.channel = this.supabase.channel(`board-${this.projectId}`).on("broadcast", { event: "card_update" }, (msg) => {
       log.debug(TAG32, `Broadcast: card_update ${JSON.stringify(msg.payload)}`);
       this.onCardBroadcast({
         event: "card_update",
@@ -7729,46 +7769,54 @@ class Watcher {
         this.onAgentCommand?.({ cardId, command });
       }
     }).subscribe((status) => {
+      if (gen !== this.broadcastGen)
+        return;
       if (status === "SUBSCRIBED") {
         this.connected = true;
+        this.reconnectAttempts = 0;
         if (!isPretty() || !this.suppressStartupLogs) {
           log.info(TAG32, "Broadcast subscription active");
         }
         this.maybeResolveReady();
-      } else if (status === "CHANNEL_ERROR") {
-        this.connected = false;
-        log.error(TAG32, "Broadcast channel error — will rely on reconciliation");
-      } else if (status === "TIMED_OUT") {
-        this.connected = false;
-        log.warn(TAG32, "Broadcast subscription timed out — retrying...");
-      } else if (status === "CLOSED") {
+      } else if (status === "CHANNEL_ERROR" || status === "TIMED_OUT" || status === "CLOSED") {
         this.connected = false;
-      }
-    });
-    this.channel = channel;
-    presenceChannel.on("presence", { event: "sync" }, () => {
-      log.debug(TAG32, "Presence sync");
-    }).subscribe(async (status) => {
-      if (status === "SUBSCRIBED") {
-        await presenceChannel.track({
-          daemonId: this.daemonId,
-          startedAt: new Date().toISOString(),
-          userId: this.identity.userId,
-          agentId: this.identity.agentId,
-          userEmail: this.identity.userEmail,
-          agentIdentifier: this.identity.agentIdentifier,
-          agentName: this.identity.agentName
-        });
-        if (!isPretty() || !this.suppressStartupLogs) {
-          log.info(TAG32, "Presence tracked on board-presence channel");
+        if (!this.stopping) {
+          log.warn(TAG32, `Broadcast subscription ${status} — scheduling reconnect`);
+          this.scheduleReconnect();
         }
-        this.presenceTracked = true;
-        this.maybeResolveReady();
       }
     });
-    this.presenceChannel = presenceChannel;
+  }
+  scheduleReconnect() {
+    if (this.stopping || this.reconnectTimer)
+      return;
+    const delay = Math.min(30000, 1000 * 2 ** this.reconnectAttempts);
+    this.reconnectAttempts++;
+    this.reconnectTimer = setTimeout(() => {
+      this.reconnectTimer = null;
+      this.reconnectBroadcast();
+    }, delay);
+  }
+  async reconnectBroadcast() {
+    if (this.stopping || !this.supabase)
+      return;
+    log.warn(TAG32, `Reconnecting broadcast subscription (attempt ${this.reconnectAttempts})`);
+    if (this.channel) {
+      const old = this.channel;
+      this.channel = null;
+      this.broadcastGen++;
+      try {
+        await this.supabase.removeChannel(old);
+      } catch {}
+    }
+    this.subscribeBroadcast();
   }
   async stop() {
+    this.stopping = true;
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
     if (this.presenceChannel) {
       await this.supabase?.removeChannel(this.presenceChannel);
       this.presenceChannel = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethmy/agent",
-  "version": "1.11.2",
+  "version": "1.12.0",
   "description": "Push-based agent daemon for Harmony — watches board assignments and spawns Claude CLI workers",
   "type": "module",
   "main": "dist/index.js",