@staff0rd/assist 0.589.0 → 0.590.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.589.0",
+  version: "0.590.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -8001,6 +8001,17 @@ function isAck(line) {
   }
 }
 
+// src/commands/sessions/readHookClaudeSessionId.ts
+async function readHookClaudeSessionId() {
+  if (process.stdin.isTTY) return void 0;
+  try {
+    const data = JSON.parse(await readStdin());
+    return data.session_id;
+  } catch {
+    return void 0;
+  }
+}
+
 // src/commands/sessions/setSessionStatus.ts
 var DELIVERY_ATTEMPTS = 3;
 var RETRY_DELAY_MS = 100;
@@ -8008,16 +8019,22 @@ async function setSessionStatus(status3, opts = {}) {
   const sessionId = process.env.ASSIST_SESSION_ID;
   logHookFired(status3, sessionId, opts.source);
   if (!sessionId) return;
-  const payload = buildPayload(sessionId, status3, opts);
+  const payload = buildPayload(
+    sessionId,
+    status3,
+    opts,
+    await readHookClaudeSessionId()
+  );
   if (opts.ack) await deliverReliably(sessionId, status3, payload);
   else await deliverBestEffort(sessionId, status3, payload);
 }
-function buildPayload(sessionId, status3, opts) {
+function buildPayload(sessionId, status3, opts, claudeSessionId) {
   const payload = {
     type: "set-status",
     sessionId,
     status: status3
   };
+  if (claudeSessionId) payload.claudeSessionId = claudeSessionId;
   if (opts.source) payload.source = opts.source;
   if (opts.ack) payload.ack = true;
   return payload;
@@ -35319,26 +35336,6 @@ function makeSessionSpawner(sessions, clients, counter, onStatusChange, notify2)
   };
 }
 
-// src/commands/sessions/daemon/applySetStatus.ts
-function applySetStatus(sessions, id, status3, source, onStatusChange) {
-  const session = sessions.get(id);
-  if (!session) {
-    daemonLog(
-      `set-status for unknown session id=${id} status=${status3} (no live session; ignoring)`
-    );
-    return;
-  }
-  if (session.status === "stopped") {
-    daemonLog(
-      `set-status for stopped session id=${id} status=${status3} (held pending durable close; ignoring)`
-    );
-    return;
-  }
-  if (source === "permission") session.permissionActive = true;
-  if (status3 === "running") session.permissionActive = false;
-  onStatusChange(session, status3);
-}
-
 // src/shared/db/recordPhaseCycleContext.ts
 import { sql as sql21 } from "drizzle-orm";
 async function recordPhaseCycleContext(db, itemId2, phaseIdx, window, resetsAt, pct) {
@@ -35616,6 +35613,55 @@ function makeStatusChangeHandler(sessions, dismiss, notify2, reuseForRun) {
   );
 }
 
+// src/commands/sessions/daemon/applySetStatus.ts
+function applySetStatus(sessions, id, status3, source, onStatusChange, rebind) {
+  const session = sessions.get(id);
+  if (!session) {
+    daemonLog(
+      `set-status for unknown session id=${id} status=${status3} (no live session; ignoring)`
+    );
+    return;
+  }
+  if (session.status === "stopped") {
+    daemonLog(
+      `set-status for stopped session id=${id} status=${status3} (held pending durable close; ignoring)`
+    );
+    return;
+  }
+  rebind?.(session);
+  if (source === "permission") session.permissionActive = true;
+  if (status3 === "running") session.permissionActive = false;
+  onStatusChange(session, status3);
+}
+
+// src/commands/sessions/daemon/rebindClaudeSession.ts
+function rebindClaudeSession(session, claudeSessionId, notify2, onStatusChange) {
+  if (!claudeSessionId) return;
+  if (session.claudeSessionId === claudeSessionId) return;
+  daemonLog(
+    `session ${session.id} claude session moved: ${session.claudeSessionId ?? "none"} -> ${claudeSessionId}`
+  );
+  session.claudeSessionId = claudeSessionId;
+  watchTranscript(session, notify2, onStatusChange);
+}
+
+// src/commands/sessions/daemon/setStatusFromHook.ts
+function setStatusFromHook(sessions, report2, notify2, onStatusChange) {
+  applySetStatus(
+    sessions,
+    report2.id,
+    report2.status,
+    report2.source,
+    onStatusChange,
+    (session) => rebindClaudeSession(
+      session,
+      report2.claudeSessionId,
+      notify2,
+      onStatusChange
+    )
+  );
+}
+
 // src/commands/sessions/daemon/refuseSpawn.ts
 function refuseSpawn(session, error, clients, onStatusChange, stage = "respawned") {
   const reason4 = error instanceof Error ? error.message : String(error);
@@ -38059,8 +38105,8 @@ var SessionManager = class {
   setStarred(id, starred) {
     if (setStarred2(this.sessions, id, starred)) this.notify();
   }
-  setStatus(id, status3, source) {
-    applySetStatus(this.sessions, id, status3, source, this.onStatusChange);
+  setStatus(report2) {
+    setStatusFromHook(this.sessions, report2, this.notify, this.onStatusChange);
   }
   /* why: the status line relays token totals keyed by Claude's session id; join
    * it to the running backlog phase so the spend accumulates against that row. */
@@ -38173,11 +38219,12 @@ function handleSetStatus(client, m, d) {
     `set-status received: id=${d.sessionId} status=${d.status}${d.source ? ` source=${d.source}` : ""}`
   );
   if (m.windowsProxy.route(client, d)) return;
-  m.setStatus(
-    d.sessionId,
-    d.status,
-    d.source
-  );
+  m.setStatus({
+    id: d.sessionId,
+    status: d.status,
+    source: d.source,
+    claudeSessionId: d.claudeSessionId
+  });
   if (d.ack) sendTo(client, { type: "ack", sessionId: d.sessionId });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.589.0",
+	"version": "0.590.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {