@gethmy/agent 1.8.1 → 1.9.1

package/dist/cli.js

@@ -337,6 +337,9 @@ function loadDaemonConfig() {
     throw new Error("No user email configured. Run `npx @gethmy/mcp setup` first.");
   }
   let agentOverrides = {};
+  let agentName = "Harmony Agent";
+  let agentIdentifier2 = "harmony-daemon";
+  let agentColor = "#57b8a5";
   try {
     const configPath = join(homedir(), ".harmony-mcp", "config.json");
     const raw = readFileSync(configPath, "utf-8");
@@ -344,6 +347,12 @@ function loadDaemonConfig() {
     if (parsed.agent) {
       agentOverrides = parsed.agent;
     }
+    if (typeof parsed.agentName === "string" && parsed.agentName.trim())
+      agentName = parsed.agentName.trim();
+    if (typeof parsed.agentIdentifier === "string" && parsed.agentIdentifier.trim())
+      agentIdentifier2 = parsed.agentIdentifier.trim();
+    if (typeof parsed.agentColor === "string" && parsed.agentColor.trim())
+      agentColor = parsed.agentColor.trim();
   } catch {}
   const agent = {
     ...DEFAULT_AGENT_CONFIG,
@@ -381,7 +390,17 @@ function loadDaemonConfig() {
       ...agentOverrides.timing ?? {}
     }
   };
-  return { apiKey, apiUrl, workspaceId, projectId, userEmail, agent };
+  return {
+    apiKey,
+    apiUrl,
+    workspaceId,
+    projectId,
+    userEmail,
+    agentName,
+    agentIdentifier: agentIdentifier2,
+    agentColor,
+    agent
+  };
 }
 async function fetchRealtimeCredentials(client) {
   const result = await client.request("GET", "/config/realtime");
@@ -3739,6 +3758,7 @@ import { createHash } from "node:crypto";
 class ReviewWorker {
   config;
   client;
+  agentId;
   onDone;
   stateStore;
   workspaceId;
@@ -3759,9 +3779,10 @@ class ReviewWorker {
   runId = null;
   lastRunLogPath = null;
   sessionId = null;
-  constructor(id, config, client, _userEmail, onDone, stateStore, workspaceId, _projectId) {
+  constructor(id, config, client, agentId, onDone, stateStore, workspaceId, _projectId) {
     this.config = config;
     this.client = client;
+    this.agentId = agentId;
     this.onDone = onDone;
     this.stateStore = stateStore;
     this.workspaceId = workspaceId;
@@ -3860,6 +3881,7 @@ class ReviewWorker {
       const { session: reviewSession } = await this.client.startAgentSession(card.id, {
         agentIdentifier: agentIdentifier(this.id),
         agentName: `${AGENT_NAME} (Review)`,
+        agentId: this.agentId,
         status: "working",
         currentTask: localMode ? "Reviewing local changes" : "Setting up review worktree",
         progressPercent: 5
@@ -3960,6 +3982,10 @@ class ReviewWorker {
       const sessionStats = this.lastSessionStats;
       if (this.aborted)
         return;
+      if (this.timeoutTimer) {
+        clearTimeout(this.timeoutTimer);
+        this.timeoutTimer = null;
+      }
       this.state = "completing";
       await this.recordPhase("completing");
       log.info(this.tag, `Claude review finished for #${card.short_id}`);
@@ -4311,14 +4337,21 @@ class SleepGuard {
       const child = spawn3("caffeinate", ["-i", "-w", String(process.pid)], {
         stdio: "ignore"
       });
+      let spawned = false;
+      child.on("spawn", () => {
+        spawned = true;
+      });
       child.on("error", (err) => {
         log.warn(TAG20, `caffeinate unavailable: ${err.message}`);
         if (this.child === child)
           this.child = null;
       });
       child.on("exit", () => {
-        if (this.child === child)
-          this.child = null;
+        if (this.child !== child)
+          return;
+        this.child = null;
+        if (spawned && this.holds > 0)
+          this.start();
       });
       child.unref();
       this.child = child;
@@ -4376,7 +4409,7 @@ async function promoteUnblockedSuccessors(completedCard, deps) {
     const successorId = link.target_card.id;
     try {
       const { card } = await deps.client.getCard(successorId);
-      if (card.assignee_id !== deps.agentUserId) {
+      if (card.assigned_agent_id !== deps.agentId) {
         log.debug(TAG21, `successor #${card.short_id} not assigned to agent — skipping promotion`);
         continue;
       }
@@ -4653,6 +4686,7 @@ var init_prompt = __esm(() => {
 class Worker {
   config;
   client;
+  agentId;
   onDone;
   workspaceId;
   projectId;
@@ -4674,9 +4708,10 @@ class Worker {
   verificationFailed = false;
   sessionId = null;
   runId = null;
-  constructor(id, config, client, _userEmail, onDone, workspaceId, projectId, stateStore, onCardCompleted) {
+  constructor(id, config, client, agentId, onDone, workspaceId, projectId, stateStore, onCardCompleted) {
     this.config = config;
     this.client = client;
+    this.agentId = agentId;
     this.onDone = onDone;
     this.workspaceId = workspaceId;
     this.projectId = projectId;
@@ -4757,6 +4792,7 @@ class Worker {
       const { session } = await this.client.startAgentSession(card.id, {
         agentIdentifier: agentIdentifier(this.id),
         agentName: AGENT_NAME,
+        agentId: this.agentId,
         status: "working",
         currentTask: "Setting up worktree",
         progressPercent: 5
@@ -4801,6 +4837,10 @@ class Worker {
       await this.spawnClaude(prompt, card, subtasks);
       if (this.aborted)
         return;
+      if (this.timeoutTimer) {
+        clearTimeout(this.timeoutTimer);
+        this.timeoutTimer = null;
+      }
       this.state = "verifying";
       await this.recordPhase("verifying");
       log.info(this.tag, `Claude finished for #${card.short_id}, running verification & completion`);
@@ -4843,6 +4883,14 @@ class Worker {
         } catch {}
         await this.recordOutcome(card.id, "success");
       } else if (this.runId && this.timedOut) {
+        if (this.worktreePath) {
+          try {
+            cleanupWorktree(this.worktreePath, this.branchName ?? undefined);
+          } catch {
+            log.warn(this.tag, "Failed to cleanup worktree before requeue");
+          }
+          this.worktreePath = null;
+        }
         try {
           await runTransition(this.client, card, {
             move: { columnName: this.config.pickupColumns[0] ?? "To Do" },
@@ -5098,24 +5146,30 @@ class Pool {
   client;
   projectId;
   stateStore;
+  agentId;
   implWorkers = [];
   reviewWorkers = [];
   implQueue;
   reviewQueue;
   budget;
   sleepGuard = new SleepGuard;
+  shuttingDown = false;
   onCardCompleted = null;
-  constructor(config, client, userEmail, workspaceId, projectId, stateStore) {
+  constructor(config, client, _userEmail, workspaceId, projectId, stateStore, agentId) {
     this.client = client;
     this.projectId = projectId;
     this.stateStore = stateStore;
+    this.agentId = agentId;
     this.implQueue = new PriorityQueue(config);
     this.reviewQueue = new PriorityQueue(config);
     this.budget = new BudgetGuard(config.budget, this.stateStore);
     for (let i = 0;i < config.poolSize; i++) {
-      this.implWorkers.push(new Worker(i, config, client, userEmail, () => {
-        this.tryDispatchFor(this.implWorkers, this.implQueue, "impl");
-        this.sleepGuard.release();
+      this.implWorkers.push(new Worker(i, config, client, this.agentId, () => {
+        try {
+          this.tryDispatchFor(this.implWorkers, this.implQueue, "impl");
+        } finally {
+          this.sleepGuard.release();
+        }
       }, workspaceId, projectId, stateStore, async (completedCard) => {
         await this.onCardCompleted?.(completedCard);
       }));
@@ -5123,9 +5177,12 @@ class Pool {
     if (config.review.enabled) {
       for (let i = 0;i < config.review.poolSize; i++) {
         const reviewWorkerId = config.poolSize + i;
-        this.reviewWorkers.push(new ReviewWorker(reviewWorkerId, config, client, userEmail, () => {
-          this.tryDispatchFor(this.reviewWorkers, this.reviewQueue, "review");
-          this.sleepGuard.release();
+        this.reviewWorkers.push(new ReviewWorker(reviewWorkerId, config, client, this.agentId, () => {
+          try {
+            this.tryDispatchFor(this.reviewWorkers, this.reviewQueue, "review");
+          } finally {
+            this.sleepGuard.release();
+          }
         }, stateStore, workspaceId, projectId));
       }
     }
@@ -5276,6 +5333,7 @@ class Pool {
   }
   async shutdown() {
     log.info(TAG24, "Shutting down pool...");
+    this.shuttingDown = true;
     const active = [
       ...this.implWorkers.filter((w) => w.isActive),
       ...this.reviewWorkers.filter((w) => w.isActive)
@@ -5286,6 +5344,8 @@ class Pool {
   }
   cardDataCache = new Map;
   tryDispatchFor(workers, queue, label) {
+    if (this.shuttingDown)
+      return false;
     const idle = workers.find((w) => w.isIdle);
     if (!idle) {
       log.debug(TAG24, `No idle ${label} workers (queue: ${queue.length})`);
@@ -5433,7 +5493,7 @@ class Reconciler {
   client;
   pool;
   projectId;
-  agentUserId;
+  agentId;
   pickupColumns;
   reviewColumns;
   approvedLabel;
@@ -5448,11 +5508,11 @@ class Reconciler {
   get isRunning() {
     return this.timer !== null;
   }
-  constructor(client, pool, projectId, agentUserId, pickupColumns, reviewColumns, approvedLabel, intervalMs = 60000, stateStore, agentConfig) {
+  constructor(client, pool, projectId, agentId, pickupColumns, reviewColumns, approvedLabel, intervalMs = 60000, stateStore, agentConfig) {
     this.client = client;
     this.pool = pool;
     this.projectId = projectId;
-    this.agentUserId = agentUserId;
+    this.agentId = agentId;
     this.pickupColumns = pickupColumns;
     this.reviewColumns = reviewColumns;
     this.approvedLabel = approvedLabel;
@@ -5510,9 +5570,9 @@ class Reconciler {
       }
       const pickupColumnIds = new Set(columns.filter((c) => this.pickupColumns.some((name) => name.toLowerCase() === c.name.toLowerCase())).map((c) => c.id));
       const reviewColumnIds = new Set(columns.filter((c) => this.reviewColumns.some((name) => name.toLowerCase() === c.name.toLowerCase())).map((c) => c.id));
-      const assignedCards = cards.filter((c) => c.assignee_id === this.agentUserId && !c.archived_at && (pickupColumnIds.has(c.column_id) || reviewColumnIds.has(c.column_id)));
+      const assignedCards = cards.filter((c) => c.assigned_agent_id === this.agentId && !c.archived_at && (pickupColumnIds.has(c.column_id) || reviewColumnIds.has(c.column_id)));
       const knownCardIds = this.pool.knownCardIds();
-      const allAgentCardIds = new Set(cards.filter((c) => c.assignee_id === this.agentUserId && !c.archived_at).map((c) => c.id));
+      const allAgentCardIds = new Set(cards.filter((c) => c.assigned_agent_id === this.agentId && !c.archived_at).map((c) => c.id));
       for (const card of assignedCards) {
         if (!knownCardIds.has(card.id)) {
           const column = columnMap.get(card.column_id);
@@ -5897,6 +5957,7 @@ class Watcher {
           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
@@ -6233,20 +6294,27 @@ async function main() {
     const errored = outcomes.filter((o) => o.errors.length).length;
     banner.check(`Recovery: ${outcomes.length} orphan(s) handled${errored > 0 ? `, ${errored} with errors` : ""}`);
   }
+  const { agent: registeredAgent } = await client.registerWorkspaceAgent(config.workspaceId, {
+    identifier: config.agentIdentifier,
+    name: config.agentName,
+    color: config.agentColor
+  });
+  const agentId = registeredAgent.id;
+  banner.check(`Agent registered (${config.agentName})`);
   const realtimeCreds = await fetchRealtimeCredentials(client);
   banner.check("Realtime credentials");
-  const pool = new Pool(config.agent, client, config.userEmail, config.workspaceId, config.projectId, stateStore);
+  const pool = new Pool(config.agent, client, config.userEmail, config.workspaceId, config.projectId, stateStore, agentId);
   const promoteSuccessors = async (completedCard) => {
     await promoteUnblockedSuccessors(completedCard, {
       client,
-      agentUserId,
-      enqueue: (cardId) => tryEnqueueCard(cardId, client, pool, config)
+      agentId,
+      enqueue: (cardId) => tryEnqueueCard(cardId, client, pool, config, agentId)
     });
   };
   pool.onCardCompleted = promoteSuccessors;
   const reviewColumns = config.agent.review.enabled ? config.agent.review.pickupColumns : [];
   const approvedLabel = config.agent.review.enabled ? config.agent.review.approvedLabel : "";
-  const reconciler = new Reconciler(client, pool, config.projectId, agentUserId, config.agent.pickupColumns, reviewColumns, approvedLabel, config.agent.timing.reconcileIntervalMs, stateStore, config.agent);
+  const reconciler = new Reconciler(client, pool, config.projectId, agentId, config.agent.pickupColumns, reviewColumns, approvedLabel, config.agent.timing.reconcileIntervalMs, stateStore, config.agent);
   let mergeMonitor = null;
   if (config.agent.review.enabled && config.agent.review.mergeMonitor) {
     mergeMonitor = new MergeMonitor(client, config.projectId, config.agent);
@@ -6305,11 +6373,12 @@ async function main() {
   }) : null;
   const watcher = new Watcher(realtimeCreds, config.projectId, {
     userId: agentUserId,
+    agentId,
     userEmail: config.userEmail,
-    agentIdentifier: "harmony-daemon",
-    agentName: AGENT_NAME
+    agentIdentifier: config.agentIdentifier,
+    agentName: config.agentName
   }, async (event) => {
-    await handleBroadcast(event, client, pool, config, agentUserId);
+    await handleBroadcast(event, client, pool, config, agentId);
   }, async (command) => {
     await pool.handleAgentCommand(command.cardId, command.command);
   });
@@ -6375,18 +6444,18 @@ async function main() {
   await banner.ready("watching for card assignments");
   watcher.allowStartupLogs();
 }
-async function handleBroadcast(event, client, pool, config, agentUserId) {
+async function handleBroadcast(event, client, pool, config, agentId) {
   const payload = event.payload;
   const cardId = payload.card_id;
   if (!cardId)
     return;
-  const assigneeId = payload.assignee_id;
-  if (assigneeId === undefined)
+  const assignedAgentId = payload.assigned_agent_id;
+  if (assignedAgentId === undefined)
     return;
-  if (assigneeId === agentUserId) {
+  if (assignedAgentId === agentId) {
     log.info(TAG30, `Broadcast: card ${cardId} assigned to agent`);
     try {
-      await tryEnqueueCard(cardId, client, pool, config);
+      await tryEnqueueCard(cardId, client, pool, config, agentId);
     } catch (err) {
       log.error(TAG30, `Failed to process assignment: ${err instanceof Error ? err.message : err}`);
     }
@@ -6395,8 +6464,12 @@ async function handleBroadcast(event, client, pool, config, agentUserId) {
     await pool.removeCard(cardId);
   }
 }
-async function tryEnqueueCard(cardId, client, pool, config) {
+async function tryEnqueueCard(cardId, client, pool, config, agentId) {
   const { card } = await client.getCard(cardId);
+  if (card.assigned_agent_id !== agentId) {
+    log.debug(TAG30, `Card ${cardId} no longer assigned to agent — skipping`);
+    return;
+  }
   const board = await client.getBoard(config.projectId, { summary: true });
   const columns = board.columns;
   const column = columns.find((c) => c.id === card.column_id);
@@ -6440,7 +6513,6 @@ var init_src = __esm(() => {
   init_startup_banner();
   init_state_store();
   init_stream_parser_selftest();
-  init_types();
   init_unblock();
   init_watcher();
   init_worktree_gc();

package/dist/index.js

@@ -336,6 +336,9 @@ function loadDaemonConfig() {
     throw new Error("No user email configured. Run `npx @gethmy/mcp setup` first.");
   }
   let agentOverrides = {};
+  let agentName = "Harmony Agent";
+  let agentIdentifier2 = "harmony-daemon";
+  let agentColor = "#57b8a5";
   try {
     const configPath = join(homedir(), ".harmony-mcp", "config.json");
     const raw = readFileSync(configPath, "utf-8");
@@ -343,6 +346,12 @@ function loadDaemonConfig() {
     if (parsed.agent) {
       agentOverrides = parsed.agent;
     }
+    if (typeof parsed.agentName === "string" && parsed.agentName.trim())
+      agentName = parsed.agentName.trim();
+    if (typeof parsed.agentIdentifier === "string" && parsed.agentIdentifier.trim())
+      agentIdentifier2 = parsed.agentIdentifier.trim();
+    if (typeof parsed.agentColor === "string" && parsed.agentColor.trim())
+      agentColor = parsed.agentColor.trim();
   } catch {}
   const agent = {
     ...DEFAULT_AGENT_CONFIG,
@@ -380,7 +389,17 @@ function loadDaemonConfig() {
       ...agentOverrides.timing ?? {}
     }
   };
-  return { apiKey, apiUrl, workspaceId, projectId, userEmail, agent };
+  return {
+    apiKey,
+    apiUrl,
+    workspaceId,
+    projectId,
+    userEmail,
+    agentName,
+    agentIdentifier: agentIdentifier2,
+    agentColor,
+    agent
+  };
 }
 async function fetchRealtimeCredentials(client) {
   const result = await client.request("GET", "/config/realtime");
@@ -3738,6 +3757,7 @@ import { createHash } from "node:crypto";
 class ReviewWorker {
   config;
   client;
+  agentId;
   onDone;
   stateStore;
   workspaceId;
@@ -3758,9 +3778,10 @@ class ReviewWorker {
   runId = null;
   lastRunLogPath = null;
   sessionId = null;
-  constructor(id, config, client, _userEmail, onDone, stateStore, workspaceId, _projectId) {
+  constructor(id, config, client, agentId, onDone, stateStore, workspaceId, _projectId) {
     this.config = config;
     this.client = client;
+    this.agentId = agentId;
     this.onDone = onDone;
     this.stateStore = stateStore;
     this.workspaceId = workspaceId;
@@ -3859,6 +3880,7 @@ class ReviewWorker {
       const { session: reviewSession } = await this.client.startAgentSession(card.id, {
         agentIdentifier: agentIdentifier(this.id),
         agentName: `${AGENT_NAME} (Review)`,
+        agentId: this.agentId,
         status: "working",
         currentTask: localMode ? "Reviewing local changes" : "Setting up review worktree",
         progressPercent: 5
@@ -3959,6 +3981,10 @@ class ReviewWorker {
       const sessionStats = this.lastSessionStats;
       if (this.aborted)
         return;
+      if (this.timeoutTimer) {
+        clearTimeout(this.timeoutTimer);
+        this.timeoutTimer = null;
+      }
       this.state = "completing";
       await this.recordPhase("completing");
       log.info(this.tag, `Claude review finished for #${card.short_id}`);
@@ -4310,14 +4336,21 @@ class SleepGuard {
       const child = spawn3("caffeinate", ["-i", "-w", String(process.pid)], {
         stdio: "ignore"
       });
+      let spawned = false;
+      child.on("spawn", () => {
+        spawned = true;
+      });
       child.on("error", (err) => {
         log.warn(TAG20, `caffeinate unavailable: ${err.message}`);
         if (this.child === child)
           this.child = null;
       });
       child.on("exit", () => {
-        if (this.child === child)
-          this.child = null;
+        if (this.child !== child)
+          return;
+        this.child = null;
+        if (spawned && this.holds > 0)
+          this.start();
       });
       child.unref();
       this.child = child;
@@ -4375,7 +4408,7 @@ async function promoteUnblockedSuccessors(completedCard, deps) {
     const successorId = link.target_card.id;
     try {
       const { card } = await deps.client.getCard(successorId);
-      if (card.assignee_id !== deps.agentUserId) {
+      if (card.assigned_agent_id !== deps.agentId) {
         log.debug(TAG21, `successor #${card.short_id} not assigned to agent — skipping promotion`);
         continue;
       }
@@ -4652,6 +4685,7 @@ var init_prompt = __esm(() => {
 class Worker {
   config;
   client;
+  agentId;
   onDone;
   workspaceId;
   projectId;
@@ -4673,9 +4707,10 @@ class Worker {
   verificationFailed = false;
   sessionId = null;
   runId = null;
-  constructor(id, config, client, _userEmail, onDone, workspaceId, projectId, stateStore, onCardCompleted) {
+  constructor(id, config, client, agentId, onDone, workspaceId, projectId, stateStore, onCardCompleted) {
     this.config = config;
     this.client = client;
+    this.agentId = agentId;
     this.onDone = onDone;
     this.workspaceId = workspaceId;
     this.projectId = projectId;
@@ -4756,6 +4791,7 @@ class Worker {
       const { session } = await this.client.startAgentSession(card.id, {
         agentIdentifier: agentIdentifier(this.id),
         agentName: AGENT_NAME,
+        agentId: this.agentId,
         status: "working",
         currentTask: "Setting up worktree",
         progressPercent: 5
@@ -4800,6 +4836,10 @@ class Worker {
       await this.spawnClaude(prompt, card, subtasks);
       if (this.aborted)
         return;
+      if (this.timeoutTimer) {
+        clearTimeout(this.timeoutTimer);
+        this.timeoutTimer = null;
+      }
       this.state = "verifying";
       await this.recordPhase("verifying");
       log.info(this.tag, `Claude finished for #${card.short_id}, running verification & completion`);
@@ -4842,6 +4882,14 @@ class Worker {
         } catch {}
         await this.recordOutcome(card.id, "success");
       } else if (this.runId && this.timedOut) {
+        if (this.worktreePath) {
+          try {
+            cleanupWorktree(this.worktreePath, this.branchName ?? undefined);
+          } catch {
+            log.warn(this.tag, "Failed to cleanup worktree before requeue");
+          }
+          this.worktreePath = null;
+        }
         try {
           await runTransition(this.client, card, {
             move: { columnName: this.config.pickupColumns[0] ?? "To Do" },
@@ -5097,24 +5145,30 @@ class Pool {
   client;
   projectId;
   stateStore;
+  agentId;
   implWorkers = [];
   reviewWorkers = [];
   implQueue;
   reviewQueue;
   budget;
   sleepGuard = new SleepGuard;
+  shuttingDown = false;
   onCardCompleted = null;
-  constructor(config, client, userEmail, workspaceId, projectId, stateStore) {
+  constructor(config, client, _userEmail, workspaceId, projectId, stateStore, agentId) {
     this.client = client;
     this.projectId = projectId;
     this.stateStore = stateStore;
+    this.agentId = agentId;
     this.implQueue = new PriorityQueue(config);
     this.reviewQueue = new PriorityQueue(config);
     this.budget = new BudgetGuard(config.budget, this.stateStore);
     for (let i = 0;i < config.poolSize; i++) {
-      this.implWorkers.push(new Worker(i, config, client, userEmail, () => {
-        this.tryDispatchFor(this.implWorkers, this.implQueue, "impl");
-        this.sleepGuard.release();
+      this.implWorkers.push(new Worker(i, config, client, this.agentId, () => {
+        try {
+          this.tryDispatchFor(this.implWorkers, this.implQueue, "impl");
+        } finally {
+          this.sleepGuard.release();
+        }
       }, workspaceId, projectId, stateStore, async (completedCard) => {
         await this.onCardCompleted?.(completedCard);
       }));
@@ -5122,9 +5176,12 @@ class Pool {
     if (config.review.enabled) {
       for (let i = 0;i < config.review.poolSize; i++) {
         const reviewWorkerId = config.poolSize + i;
-        this.reviewWorkers.push(new ReviewWorker(reviewWorkerId, config, client, userEmail, () => {
-          this.tryDispatchFor(this.reviewWorkers, this.reviewQueue, "review");
-          this.sleepGuard.release();
+        this.reviewWorkers.push(new ReviewWorker(reviewWorkerId, config, client, this.agentId, () => {
+          try {
+            this.tryDispatchFor(this.reviewWorkers, this.reviewQueue, "review");
+          } finally {
+            this.sleepGuard.release();
+          }
         }, stateStore, workspaceId, projectId));
       }
     }
@@ -5275,6 +5332,7 @@ class Pool {
   }
   async shutdown() {
     log.info(TAG24, "Shutting down pool...");
+    this.shuttingDown = true;
     const active = [
       ...this.implWorkers.filter((w) => w.isActive),
       ...this.reviewWorkers.filter((w) => w.isActive)
@@ -5285,6 +5343,8 @@ class Pool {
   }
   cardDataCache = new Map;
   tryDispatchFor(workers, queue, label) {
+    if (this.shuttingDown)
+      return false;
     const idle = workers.find((w) => w.isIdle);
     if (!idle) {
       log.debug(TAG24, `No idle ${label} workers (queue: ${queue.length})`);
@@ -5432,7 +5492,7 @@ class Reconciler {
   client;
   pool;
   projectId;
-  agentUserId;
+  agentId;
   pickupColumns;
   reviewColumns;
   approvedLabel;
@@ -5447,11 +5507,11 @@ class Reconciler {
   get isRunning() {
     return this.timer !== null;
   }
-  constructor(client, pool, projectId, agentUserId, pickupColumns, reviewColumns, approvedLabel, intervalMs = 60000, stateStore, agentConfig) {
+  constructor(client, pool, projectId, agentId, pickupColumns, reviewColumns, approvedLabel, intervalMs = 60000, stateStore, agentConfig) {
     this.client = client;
     this.pool = pool;
     this.projectId = projectId;
-    this.agentUserId = agentUserId;
+    this.agentId = agentId;
     this.pickupColumns = pickupColumns;
     this.reviewColumns = reviewColumns;
     this.approvedLabel = approvedLabel;
@@ -5509,9 +5569,9 @@ class Reconciler {
       }
       const pickupColumnIds = new Set(columns.filter((c) => this.pickupColumns.some((name) => name.toLowerCase() === c.name.toLowerCase())).map((c) => c.id));
       const reviewColumnIds = new Set(columns.filter((c) => this.reviewColumns.some((name) => name.toLowerCase() === c.name.toLowerCase())).map((c) => c.id));
-      const assignedCards = cards.filter((c) => c.assignee_id === this.agentUserId && !c.archived_at && (pickupColumnIds.has(c.column_id) || reviewColumnIds.has(c.column_id)));
+      const assignedCards = cards.filter((c) => c.assigned_agent_id === this.agentId && !c.archived_at && (pickupColumnIds.has(c.column_id) || reviewColumnIds.has(c.column_id)));
       const knownCardIds = this.pool.knownCardIds();
-      const allAgentCardIds = new Set(cards.filter((c) => c.assignee_id === this.agentUserId && !c.archived_at).map((c) => c.id));
+      const allAgentCardIds = new Set(cards.filter((c) => c.assigned_agent_id === this.agentId && !c.archived_at).map((c) => c.id));
       for (const card of assignedCards) {
         if (!knownCardIds.has(card.id)) {
           const column = columnMap.get(card.column_id);
@@ -5896,6 +5956,7 @@ class Watcher {
           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
@@ -6232,20 +6293,27 @@ async function main() {
     const errored = outcomes.filter((o) => o.errors.length).length;
     banner.check(`Recovery: ${outcomes.length} orphan(s) handled${errored > 0 ? `, ${errored} with errors` : ""}`);
   }
+  const { agent: registeredAgent } = await client.registerWorkspaceAgent(config.workspaceId, {
+    identifier: config.agentIdentifier,
+    name: config.agentName,
+    color: config.agentColor
+  });
+  const agentId = registeredAgent.id;
+  banner.check(`Agent registered (${config.agentName})`);
   const realtimeCreds = await fetchRealtimeCredentials(client);
   banner.check("Realtime credentials");
-  const pool = new Pool(config.agent, client, config.userEmail, config.workspaceId, config.projectId, stateStore);
+  const pool = new Pool(config.agent, client, config.userEmail, config.workspaceId, config.projectId, stateStore, agentId);
   const promoteSuccessors = async (completedCard) => {
     await promoteUnblockedSuccessors(completedCard, {
       client,
-      agentUserId,
-      enqueue: (cardId) => tryEnqueueCard(cardId, client, pool, config)
+      agentId,
+      enqueue: (cardId) => tryEnqueueCard(cardId, client, pool, config, agentId)
     });
   };
   pool.onCardCompleted = promoteSuccessors;
   const reviewColumns = config.agent.review.enabled ? config.agent.review.pickupColumns : [];
   const approvedLabel = config.agent.review.enabled ? config.agent.review.approvedLabel : "";
-  const reconciler = new Reconciler(client, pool, config.projectId, agentUserId, config.agent.pickupColumns, reviewColumns, approvedLabel, config.agent.timing.reconcileIntervalMs, stateStore, config.agent);
+  const reconciler = new Reconciler(client, pool, config.projectId, agentId, config.agent.pickupColumns, reviewColumns, approvedLabel, config.agent.timing.reconcileIntervalMs, stateStore, config.agent);
   let mergeMonitor = null;
   if (config.agent.review.enabled && config.agent.review.mergeMonitor) {
     mergeMonitor = new MergeMonitor(client, config.projectId, config.agent);
@@ -6304,11 +6372,12 @@ async function main() {
   }) : null;
   const watcher = new Watcher(realtimeCreds, config.projectId, {
     userId: agentUserId,
+    agentId,
     userEmail: config.userEmail,
-    agentIdentifier: "harmony-daemon",
-    agentName: AGENT_NAME
+    agentIdentifier: config.agentIdentifier,
+    agentName: config.agentName
   }, async (event) => {
-    await handleBroadcast(event, client, pool, config, agentUserId);
+    await handleBroadcast(event, client, pool, config, agentId);
   }, async (command) => {
     await pool.handleAgentCommand(command.cardId, command.command);
   });
@@ -6374,18 +6443,18 @@ async function main() {
   await banner.ready("watching for card assignments");
   watcher.allowStartupLogs();
 }
-async function handleBroadcast(event, client, pool, config, agentUserId) {
+async function handleBroadcast(event, client, pool, config, agentId) {
   const payload = event.payload;
   const cardId = payload.card_id;
   if (!cardId)
     return;
-  const assigneeId = payload.assignee_id;
-  if (assigneeId === undefined)
+  const assignedAgentId = payload.assigned_agent_id;
+  if (assignedAgentId === undefined)
     return;
-  if (assigneeId === agentUserId) {
+  if (assignedAgentId === agentId) {
     log.info(TAG30, `Broadcast: card ${cardId} assigned to agent`);
     try {
-      await tryEnqueueCard(cardId, client, pool, config);
+      await tryEnqueueCard(cardId, client, pool, config, agentId);
     } catch (err) {
       log.error(TAG30, `Failed to process assignment: ${err instanceof Error ? err.message : err}`);
     }
@@ -6394,8 +6463,12 @@ async function handleBroadcast(event, client, pool, config, agentUserId) {
     await pool.removeCard(cardId);
   }
 }
-async function tryEnqueueCard(cardId, client, pool, config) {
+async function tryEnqueueCard(cardId, client, pool, config, agentId) {
   const { card } = await client.getCard(cardId);
+  if (card.assigned_agent_id !== agentId) {
+    log.debug(TAG30, `Card ${cardId} no longer assigned to agent — skipping`);
+    return;
+  }
   const board = await client.getBoard(config.projectId, { summary: true });
   const columns = board.columns;
   const column = columns.find((c) => c.id === card.column_id);
@@ -6439,7 +6512,6 @@ var init_src = __esm(() => {
   init_startup_banner();
   init_state_store();
   init_stream_parser_selftest();
-  init_types();
   init_unblock();
   init_watcher();
   init_worktree_gc();

package/package.json

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