harnery 0.31.5 → 0.31.6

package/dist/core/agents/coord-client.d.ts

@@ -162,7 +162,10 @@ export declare function resolveOwnerByPidmap(root: string): {
  * `instance_id`, or null if there's no session-id env var or no live heartbeat
  * carries it. "Live" reuses the same 10-minute freshness window the singleton
  * fallback applies, so a stale heartbeat from a prior session of the same id
- * doesn't resolve.
+ * doesn't resolve. When legacy Cursor Glass state contains both the canonical
+ * bare id and its raw `bc-` alias, candidate order wins first; ties prefer a
+ * named heartbeat, then the newest heartbeat, with instance id as a stable
+ * final tie-breaker. Filesystem enumeration order never decides identity.
  *
  * Exported for unit testing with an injectable root.
  */

package/dist/core/agents/coord-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coord-client.d.ts","sourceRoot":"","sources":["../../../src/core/agents/coord-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"coord-client.d.ts","sourceRoot":"","sources":["../../../src/core/agents/coord-client.ts"],"names":[],"mappings":"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"}

package/dist/core/agents/coord-client.js

@@ -482,7 +482,10 @@ function shouldPreferSessionEnv() {
  * `instance_id`, or null if there's no session-id env var or no live heartbeat
  * carries it. "Live" reuses the same 10-minute freshness window the singleton
  * fallback applies, so a stale heartbeat from a prior session of the same id
- * doesn't resolve.
+ * doesn't resolve. When legacy Cursor Glass state contains both the canonical
+ * bare id and its raw `bc-` alias, candidate order wins first; ties prefer a
+ * named heartbeat, then the newest heartbeat, with instance id as a stable
+ * final tie-breaker. Filesystem enumeration order never decides identity.
  *
  * Exported for unit testing with an injectable root.
  */
@@ -502,24 +505,38 @@ export function resolveOwnerBySessionEnv(root) {
     catch {
         return null;
     }
+    const matches = [];
     for (const file of files) {
         if (!file.endsWith(".json"))
             continue;
         try {
             const parsed = JSON.parse(readFileSync(resolve(activeDir, file), "utf8"));
-            if (!parsed || !sessionIds.includes(parsed.session_id))
+            if (!parsed)
+                continue;
+            const sessionPreference = sessionIds.indexOf(parsed.session_id);
+            if (sessionPreference === -1)
                 continue;
             if (typeof parsed.instance_id !== "string")
                 continue;
             const ts = Date.parse(parsed.last_heartbeat);
-            if (Number.isFinite(ts) && ts >= cutoffMs)
-                return parsed.instance_id;
+            if (!Number.isFinite(ts) || ts < cutoffMs)
+                continue;
+            matches.push({
+                instanceId: parsed.instance_id,
+                sessionPreference,
+                hasName: typeof parsed.name === "string" && parsed.name.trim().length > 0,
+                lastHeartbeatMs: ts,
+            });
         }
         catch {
             // skip malformed
         }
     }
-    return null;
+    matches.sort((a, b) => a.sessionPreference - b.sessionPreference ||
+        Number(b.hasName) - Number(a.hasName) ||
+        b.lastHeartbeatMs - a.lastHeartbeatMs ||
+        a.instanceId.localeCompare(b.instanceId));
+    return matches[0]?.instanceId ?? null;
 }
 /**
  * Return the instance_id of the sole live agent in this coord root, or null

package/dist/core/hooks/adapter/parse.d.ts

@@ -40,7 +40,7 @@ export interface ParsedPayload {
  * Parse the raw stdin payload string for any adapter. Returns null when JSON
  * parse fails (Cursor occasionally fires hooks with no payload).
  */
-export declare function parsePayload(raw: string, _adapter: Adapter): ParsedPayload | null;
+export declare function parsePayload(raw: string, adapter: Adapter): ParsedPayload | null;
 /**
  * Pull the bash command string out of a Bash/Shell tool_input. Returns
  * undefined for non-shell tools.

package/dist/core/hooks/adapter/parse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../../src/core/hooks/adapter/parse.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,WAAW,aAAa;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uFAAuF;IACvF,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC9B;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,aAAa,GAAG,IAAI,CAkCjF;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,SAAS,EAAE,OAAO,GACjB,MAAM,GAAG,SAAS,CASpB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAO7E;AAmBD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,GAChB;IAAE,UAAU,EAAE,mBAAmB,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAiCjE;AAED,MAAM,MAAM,mBAAmB,GAC3B,eAAe,GACf,aAAa,GACb,oBAAoB,GACpB,WAAW,GACX,gBAAgB,GAChB,eAAe,GACf,cAAc,GACd,eAAe,GACf,uBAAuB,GACvB,4BAA4B,GAC5B,8BAA8B,CAAC"}
+{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../../src/core/hooks/adapter/parse.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,WAAW,aAAa;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uFAAuF;IACvF,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC9B;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,aAAa,GAAG,IAAI,CA+ChF;AAQD;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,SAAS,EAAE,OAAO,GACjB,MAAM,GAAG,SAAS,CASpB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAO7E;AAmBD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,GAChB;IAAE,UAAU,EAAE,mBAAmB,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAiCjE;AAED,MAAM,MAAM,mBAAmB,GAC3B,eAAe,GACf,aAAa,GACb,oBAAoB,GACpB,WAAW,GACX,gBAAgB,GAChB,eAAe,GACf,cAAc,GACd,eAAe,GACf,uBAAuB,GACvB,4BAA4B,GAC5B,8BAA8B,CAAC"}

package/dist/core/hooks/adapter/parse.js

@@ -13,7 +13,7 @@
  * Parse the raw stdin payload string for any adapter. Returns null when JSON
  * parse fails (Cursor occasionally fires hooks with no payload).
  */
-export function parsePayload(raw, _adapter) {
+export function parsePayload(raw, adapter) {
     if (!raw || raw.trim().length === 0)
         return null;
     let json;
@@ -23,13 +23,24 @@ export function parsePayload(raw, _adapter) {
     catch {
         return null;
     }
+    const sessionId = normalizeSessionId(adapter, pickStr(json, "session_id"));
+    const conversationId = normalizeSessionId(adapter, pickStr(json, "conversation_id"));
+    const parentSessionId = normalizeSessionId(adapter, pickStr(json, "parent_session_id"));
+    const normalizedRaw = adapter === "cursor"
+        ? {
+            ...json,
+            ...(sessionId ? { session_id: sessionId } : {}),
+            ...(conversationId ? { conversation_id: conversationId } : {}),
+            ...(parentSessionId ? { parent_session_id: parentSessionId } : {}),
+        }
+        : json;
     return {
         hook_event_name: pickStr(json, "hook_event_name"),
-        session_id: pickStr(json, "session_id"),
+        session_id: sessionId,
         agent_id: pickStr(json, "agent_id"),
         subagent_id: pickStr(json, "subagent_id"),
-        conversation_id: pickStr(json, "conversation_id"),
-        parent_session_id: pickStr(json, "parent_session_id"),
+        conversation_id: conversationId,
+        parent_session_id: parentSessionId,
         turn_id: pickStr(json, "turn_id"),
         parent_turn_id: pickStr(json, "parent_turn_id"),
         transcript_path: pickStr(json, "transcript_path"),
@@ -46,9 +57,15 @@ export function parsePayload(raw, _adapter) {
         clean_exit: pickBool(json, "clean_exit"),
         exit_status: pickStr(json, "exit_status"),
         reason: pickStr(json, "reason"),
-        raw: json,
+        raw: normalizedRaw,
     };
 }
+/** Cursor Glass prefixes conversation ids with `bc-`; coordination uses the bare id everywhere. */
+function normalizeSessionId(adapter, value) {
+    if (adapter !== "cursor" || !value?.startsWith("bc-") || value.length <= 3)
+        return value;
+    return value.slice(3);
+}
 /**
  * Pull the bash command string out of a Bash/Shell tool_input. Returns
  * undefined for non-shell tools.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "harnery",
-  "version": "0.31.5",
+  "version": "0.31.6",
   "description": "Multi-agent coordination for AI coding agents - Claude Code, Cursor, and Codex.",
   "license": "MIT",
   "author": "Ryan Kelly",

package/src/core/agents/coord-client.ts

@@ -528,7 +528,10 @@ function shouldPreferSessionEnv(): boolean {
  * `instance_id`, or null if there's no session-id env var or no live heartbeat
  * carries it. "Live" reuses the same 10-minute freshness window the singleton
  * fallback applies, so a stale heartbeat from a prior session of the same id
- * doesn't resolve.
+ * doesn't resolve. When legacy Cursor Glass state contains both the canonical
+ * bare id and its raw `bc-` alias, candidate order wins first; ties prefer a
+ * named heartbeat, then the newest heartbeat, with instance id as a stable
+ * final tie-breaker. Filesystem enumeration order never decides identity.
  *
  * Exported for unit testing with an injectable root.
  */
@@ -546,19 +549,40 @@ export function resolveOwnerBySessionEnv(root: string): string | null {
   } catch {
     return null;
   }
+  const matches: Array<{
+    instanceId: string;
+    sessionPreference: number;
+    hasName: boolean;
+    lastHeartbeatMs: number;
+  }> = [];
   for (const file of files) {
     if (!file.endsWith(".json")) continue;
     try {
       const parsed = JSON.parse(readFileSync(resolve(activeDir, file), "utf8"));
-      if (!parsed || !sessionIds.includes(parsed.session_id)) continue;
+      if (!parsed) continue;
+      const sessionPreference = sessionIds.indexOf(parsed.session_id);
+      if (sessionPreference === -1) continue;
       if (typeof parsed.instance_id !== "string") continue;
       const ts = Date.parse(parsed.last_heartbeat);
-      if (Number.isFinite(ts) && ts >= cutoffMs) return parsed.instance_id;
+      if (!Number.isFinite(ts) || ts < cutoffMs) continue;
+      matches.push({
+        instanceId: parsed.instance_id,
+        sessionPreference,
+        hasName: typeof parsed.name === "string" && parsed.name.trim().length > 0,
+        lastHeartbeatMs: ts,
+      });
     } catch {
       // skip malformed
     }
   }
-  return null;
+  matches.sort(
+    (a, b) =>
+      a.sessionPreference - b.sessionPreference ||
+      Number(b.hasName) - Number(a.hasName) ||
+      b.lastHeartbeatMs - a.lastHeartbeatMs ||
+      a.instanceId.localeCompare(b.instanceId),
+  );
+  return matches[0]?.instanceId ?? null;
 }
 
 /**

package/src/core/hooks/adapter/parse.ts

@@ -43,7 +43,7 @@ export interface ParsedPayload {
  * Parse the raw stdin payload string for any adapter. Returns null when JSON
  * parse fails (Cursor occasionally fires hooks with no payload).
  */
-export function parsePayload(raw: string, _adapter: Adapter): ParsedPayload | null {
+export function parsePayload(raw: string, adapter: Adapter): ParsedPayload | null {
   if (!raw || raw.trim().length === 0) return null;
   let json: Record<string, unknown>;
   try {
@@ -52,13 +52,26 @@ export function parsePayload(raw: string, _adapter: Adapter): ParsedPayload | nu
     return null;
   }
 
+  const sessionId = normalizeSessionId(adapter, pickStr(json, "session_id"));
+  const conversationId = normalizeSessionId(adapter, pickStr(json, "conversation_id"));
+  const parentSessionId = normalizeSessionId(adapter, pickStr(json, "parent_session_id"));
+  const normalizedRaw =
+    adapter === "cursor"
+      ? {
+          ...json,
+          ...(sessionId ? { session_id: sessionId } : {}),
+          ...(conversationId ? { conversation_id: conversationId } : {}),
+          ...(parentSessionId ? { parent_session_id: parentSessionId } : {}),
+        }
+      : json;
+
   return {
     hook_event_name: pickStr(json, "hook_event_name"),
-    session_id: pickStr(json, "session_id"),
+    session_id: sessionId,
     agent_id: pickStr(json, "agent_id"),
     subagent_id: pickStr(json, "subagent_id"),
-    conversation_id: pickStr(json, "conversation_id"),
-    parent_session_id: pickStr(json, "parent_session_id"),
+    conversation_id: conversationId,
+    parent_session_id: parentSessionId,
     turn_id: pickStr(json, "turn_id"),
     parent_turn_id: pickStr(json, "parent_turn_id"),
     transcript_path: pickStr(json, "transcript_path"),
@@ -75,10 +88,16 @@ export function parsePayload(raw: string, _adapter: Adapter): ParsedPayload | nu
     clean_exit: pickBool(json, "clean_exit"),
     exit_status: pickStr(json, "exit_status"),
     reason: pickStr(json, "reason"),
-    raw: json,
+    raw: normalizedRaw,
   };
 }
 
+/** Cursor Glass prefixes conversation ids with `bc-`; coordination uses the bare id everywhere. */
+function normalizeSessionId(adapter: Adapter, value: string | undefined): string | undefined {
+  if (adapter !== "cursor" || !value?.startsWith("bc-") || value.length <= 3) return value;
+  return value.slice(3);
+}
+
 /**
  * Pull the bash command string out of a Bash/Shell tool_input. Returns
  * undefined for non-shell tools.