@staff0rd/assist 0.297.3 → 0.298.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.297.3",
+  version: "0.298.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -4897,17 +4897,25 @@ async function deleteItemComment(res, itemId, commentId) {
 
 // src/commands/backlog/web/rewindItemPhase.ts
 import { eq as eq14 } from "drizzle-orm";
+
+// src/commands/backlog/resolveRewindPlan.ts
+function resolveRewindPlan(item) {
+  return [...resolvePlan(item), buildReviewPhase()];
+}
+
+// src/commands/backlog/web/rewindItemPhase.ts
 async function rewindItemPhase(req, res, id2) {
   const { phase, reason } = await parseRewindBody(req);
   const result = await findItemOr404(res, id2);
   if (!result) return;
   const { orm, item } = result;
-  const error = validateRewind(item, phase);
+  const plan2 = resolveRewindPlan(item);
+  const error = validateRewind(item, plan2, phase);
   if (error) {
     respondJson(res, 400, { error });
     return;
   }
-  const phaseName = item.plan?.[phase - 1].name;
+  const phaseName = plan2[phase - 1].name;
   await appendComment(
     orm,
     id2,
@@ -4917,12 +4925,9 @@ async function rewindItemPhase(req, res, id2) {
   await orm.update(items).set({ currentPhase: phase, status: "in-progress" }).where(eq14(items.id, id2));
   respondJson(res, 200, await loadItem(orm, id2));
 }
-function validateRewind(item, phase) {
-  if (!item.plan || item.plan.length === 0) {
-    return "Item has no plan phases.";
-  }
-  if (phase < 1 || phase > item.plan.length) {
-    return `Phase ${phase} does not exist. Valid range: 1\u2013${item.plan.length}.`;
+function validateRewind(item, plan2, phase) {
+  if (phase < 1 || phase > plan2.length) {
+    return `Phase ${phase} does not exist. Valid range: 1\u2013${plan2.length}.`;
   }
   const currentPhase = item.currentPhase ?? 1;
   if (phase >= currentPhase) {
@@ -6832,12 +6837,9 @@ function registerRefineCommand(cmd) {
 
 // src/commands/backlog/rewindPhase.ts
 import chalk66 from "chalk";
-function validateRewind2(item, phaseNumber) {
-  if (!item.plan || item.plan.length === 0) {
-    return `Item #${item.id} has no plan phases.`;
-  }
-  if (phaseNumber < 1 || phaseNumber > item.plan.length) {
-    return `Phase ${phaseNumber} does not exist. Valid range: 1\u2013${item.plan.length}.`;
+function validateRewind2(item, plan2, phaseNumber) {
+  if (phaseNumber < 1 || phaseNumber > plan2.length) {
+    return `Phase ${phaseNumber} does not exist. Valid range: 1\u2013${plan2.length}.`;
   }
   const currentPhase = item.currentPhase ?? 1;
   if (phaseNumber >= currentPhase) {
@@ -6854,13 +6856,14 @@ async function rewindPhase(id2, phase, opts) {
     console.log(chalk66.red(`Item #${id2} not found.`));
     return;
   }
-  const error = validateRewind2(item, phaseNumber);
+  const plan2 = resolveRewindPlan(item);
+  const error = validateRewind2(item, plan2, phaseNumber);
   if (error) {
     console.log(chalk66.red(error));
     process.exitCode = 1;
     return;
   }
-  const phaseName = item.plan?.[phaseIndex].name;
+  const phaseName = plan2[phaseIndex].name;
   await appendComment(
     orm,
     item.id,
@@ -18409,6 +18412,44 @@ function daemonLog(message) {
   console.log(`${(/* @__PURE__ */ new Date()).toISOString()} [${process.pid}] ${message}`);
 }
 
+// src/commands/sessions/daemon/loadActiveSelection.ts
+import { z as z5 } from "zod";
+var ACTIVE_FILE = "active.json";
+var activeSelectionSchema = z5.record(z5.string(), z5.string());
+function loadActiveSelection() {
+  const parsed = activeSelectionSchema.safeParse(
+    loadJson(ACTIVE_FILE)
+  );
+  return parsed.success ? parsed.data : {};
+}
+function saveActiveSelection(active) {
+  saveJson(ACTIVE_FILE, active);
+}
+
+// src/commands/sessions/daemon/ActiveSelection.ts
+var ActiveSelection = class {
+  // why: onChange triggers a broadcast only when the selection actually changes
+  constructor(onChange) {
+    this.onChange = onChange;
+  }
+  byRepo = /* @__PURE__ */ new Map();
+  set(cwd, sessionId) {
+    if (!cwd) return;
+    this.byRepo.delete(cwd);
+    this.byRepo.set(cwd, sessionId);
+    saveActiveSelection(this.toJSON());
+    this.onChange();
+  }
+  // why: on daemon restart, reload persisted selections but drop any whose session was not restored
+  restore(isLive) {
+    for (const [cwd, sessionId] of Object.entries(loadActiveSelection()))
+      if (isLive(sessionId)) this.byRepo.set(cwd, sessionId);
+  }
+  toJSON() {
+    return Object.fromEntries(this.byRepo);
+  }
+};
+
 // src/commands/sessions/daemon/broadcast.ts
 function sendTo(client, msg) {
   client.send(JSON.stringify(msg));
@@ -18421,17 +18462,17 @@ function broadcast(clients, msg) {
 }
 
 // src/commands/sessions/daemon/loadPersistedSessions.ts
-import { z as z5 } from "zod";
+import { z as z6 } from "zod";
 var SESSIONS_FILE = "sessions.json";
-var persistedSessionSchema = z5.object({
-  name: z5.string(),
-  commandType: z5.enum(["claude", "run", "assist"]),
-  cwd: z5.string(),
-  startedAt: z5.number(),
-  claudeSessionId: z5.string().optional(),
-  runName: z5.string().optional(),
-  runArgs: z5.array(z5.string()).optional(),
-  assistArgs: z5.array(z5.string()).optional(),
+var persistedSessionSchema = z6.object({
+  name: z6.string(),
+  commandType: z6.enum(["claude", "run", "assist"]),
+  cwd: z6.string(),
+  startedAt: z6.number(),
+  claudeSessionId: z6.string().optional(),
+  runName: z6.string().optional(),
+  runArgs: z6.array(z6.string()).optional(),
+  assistArgs: z6.array(z6.string()).optional(),
   activity: activitySchema.optional()
 });
 function loadPersistedSessions() {
@@ -18498,11 +18539,13 @@ function toSessionInfo({
 }
 
 // src/commands/sessions/daemon/broadcastSessions.ts
-function broadcastSessions(sessions, clients, windowsSessions = []) {
+function broadcastSessions(sessions, clients, windowsSessions = [], active) {
   persistLiveSessions(sessions);
+  const local = [...sessions.values()].map(toSessionInfo);
   broadcast(clients, {
     type: "sessions",
-    sessions: [...sessions.values()].map(toSessionInfo).concat(windowsSessions)
+    sessions: local.concat(windowsSessions),
+    active: active?.toJSON() ?? {}
   });
 }
 
@@ -18640,8 +18683,7 @@ function replayScrollback(sessions, client) {
 }
 
 // src/commands/sessions/daemon/greetClient.ts
-function greetClient(client, sessions, list4, windowsProxy) {
-  sendTo(client, { type: "sessions", sessions: list4() });
+function greetClient(client, sessions, windowsProxy) {
   replayScrollback(sessions, client);
   windowsProxy.replayScrollback(client);
   void windowsProxy.discover();
@@ -19685,6 +19727,8 @@ var SessionManager = class {
     this.onIdleChange = onIdleChange;
   }
   sessions = /* @__PURE__ */ new Map();
+  // why: dispatch calls active.set() on card click; broadcasts include active.toJSON()
+  active = new ActiveSelection(() => this.notify());
   clients = new ClientHub();
   nextId = 1;
   shuttingDown = false;
@@ -19692,16 +19736,14 @@ var SessionManager = class {
   windowsProxy = new WindowsProxy(this.clients, () => this.notify());
   addClient(client) {
     this.clients.add(client);
-    this.onIdleChange?.(this.isIdle());
-    greetClient(client, this.sessions, this.listSessions, this.windowsProxy);
+    this.notify();
+    greetClient(client, this.sessions, this.windowsProxy);
   }
   removeClient(client) {
     this.clients.delete(client);
     this.onIdleChange?.(this.isIdle());
   }
-  isIdle() {
-    return this.sessions.size === 0 && this.clients.size === 0;
-  }
+  isIdle = () => this.sessions.size === 0 && this.clients.size === 0;
   shutdown() {
     this.shuttingDown = true;
     shutdownSessions(this.sessions);
@@ -19769,7 +19811,7 @@ var SessionManager = class {
   notify = () => {
     if (this.shuttingDown) return;
     const windows = this.windowsProxy.sessions();
-    broadcastSessions(this.sessions, this.clients, windows);
+    broadcastSessions(this.sessions, this.clients, windows, this.active);
     this.onIdleChange?.(this.isIdle());
   };
 };
@@ -19947,7 +19989,8 @@ var handlers = {
   ),
   "set-autoadvance": routed(
     (_client, m, d) => m.setAutoAdvance(d.sessionId, d.enabled)
-  )
+  ),
+  "set-active": (_client, m, d) => m.active.set(d.cwd, d.sessionId)
 };
 function dispatchMessage(client, manager, data) {
   handlers[data.type]?.(client, manager, data);
@@ -20018,6 +20061,8 @@ function onListening(manager, checkAutoExit) {
   });
   process.on("exit", cleanupOwnedFiles);
   const restored = manager.restore();
+  const liveIds = new Set(manager.listSessions().map((s) => s.id));
+  manager.active.restore((id2) => liveIds.has(id2));
   daemonLog(
     restored.length > 0 ? `restored ${restored.length} session(s): ${restored.join(", ")}` : "no persisted sessions to restore"
   );

package/package.json

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