@staff0rd/assist 0.759.0 → 0.759.2

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.759.0",
+  version: "0.759.2",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -40651,7 +40651,8 @@ function toSessionInfo(session) {
     verifying,
     pendingPrPreview,
     undurable,
-    lastUserMessage
+    lastUserMessage,
+    activeViewer
   } = session;
   return {
     ...toSessionRunInfo(session),
@@ -40677,6 +40678,7 @@ function toSessionInfo(session) {
     pendingPrPreview,
     undurable,
     lastUserMessage,
+    activeViewer,
     joinable: joinRefusal(session) === void 0
   };
 }
@@ -40695,6 +40697,121 @@ function broadcastSessions(sessions, clients, linkedSessions = [], active) {
   broadcast(peers, { type: "sessions", sessions: local, active: {} });
 }
 
+// src/commands/sessions/daemon/claimViewer.ts
+function claimViewer(session, { viewerId, onClaim }, via) {
+  if (!viewerId || session.activeViewer === viewerId) return;
+  session.activeViewer = viewerId;
+  daemonLog(`session ${session.id} active viewer ${viewerId} (${via})`);
+  onClaim?.();
+}
+
+// src/commands/sessions/daemon/nudgePty.ts
+var NUDGE_RESTORE_MS = 50;
+function nudgePty(session, resize) {
+  const { cols, rows } = session;
+  if (!cols || !rows || cols < 2) return;
+  resize(cols - 1, rows);
+  setTimeout(() => {
+    if (session.cols === cols && session.rows === rows) resize(cols, rows);
+  }, NUDGE_RESTORE_MS);
+}
+
+// src/commands/sessions/daemon/resizeSession.ts
+function resizeSession(sessions, id, cols, rows, viewer = {}) {
+  const s = sessions.get(id);
+  if (!s || s.status === "done" || !s.pty) return;
+  if (isInactiveViewer(s, viewer)) return;
+  claimViewer(s, viewer, "resize");
+  const unchanged = s.cols === cols && s.rows === rows;
+  s.cols = cols;
+  s.rows = rows;
+  const resize = (c, r) => resizePty(s, c, r);
+  resize(cols, rows);
+  if (viewer.claim && unchanged) nudgePty(s, resize);
+}
+function isInactiveViewer(s, { viewerId, claim }) {
+  if (claim || !viewerId || !s.activeViewer) return false;
+  return s.activeViewer !== viewerId;
+}
+function resizePty(s, cols, rows) {
+  try {
+    s.pty?.resize(cols, rows);
+  } catch (error) {
+    daemonLog(
+      `session ${s.id} resize skipped (dead pty): ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+}
+
+// src/commands/sessions/daemon/watchPromptSubmit.ts
+var CARRIAGE_RETURN = "\r";
+function isPromptSubmit(data) {
+  return data.includes(CARRIAGE_RETURN);
+}
+function watchPromptSubmit(session, data, onStatusChange) {
+  if (session.restored !== true) return;
+  if (session.status !== "waiting") return;
+  if (!isPromptSubmit(data)) return;
+  daemonLog(`session ${session.id} resumed-prompt submit -> running`);
+  onStatusChange(session, "running");
+}
+
+// src/commands/sessions/daemon/writeToSession.ts
+function writeToSession(sessions, id, data, onStatusChange, viewer = {}) {
+  const s = sessions.get(id);
+  if (!s || s.status === "done") return;
+  s.pty?.write(data);
+  watchPromptSubmit(s, data, onStatusChange);
+  claimViewer(s, viewer, "input");
+}
+function setAutoRun(sessions, id, enabled) {
+  const s = sessions.get(id);
+  if (!s) return false;
+  s.autoRun = enabled;
+  daemonLog(`session ${id} autorun ${enabled ? "on" : "off"}`);
+  return true;
+}
+function setStarred2(sessions, id, starred) {
+  const s = sessions.get(id);
+  if (!s) return false;
+  s.starred = starred;
+  daemonLog(`session ${id} starred ${starred ? "on" : "off"}`);
+  return true;
+}
+function setAutoAdvance(sessions, id, enabled) {
+  const s = sessions.get(id);
+  if (!s) return false;
+  s.autoAdvance = enabled;
+  const itemId2 = s.activity?.itemId;
+  if (itemId2 != null) {
+    if (enabled) clearPause(itemId2);
+    else requestPause(itemId2);
+  }
+  daemonLog(`session ${id} autoadvance ${enabled ? "on" : "off"}`);
+  return true;
+}
+
+// src/commands/sessions/daemon/SessionIo.ts
+var SessionIo = class {
+  constructor(sessions, onStatusChange, notify2) {
+    this.sessions = sessions;
+    this.onStatusChange = onStatusChange;
+    this.notify = notify2;
+  }
+  write(id, data, viewerId) {
+    writeToSession(this.sessions, id, data, this.onStatusChange(), {
+      viewerId,
+      onClaim: this.notify
+    });
+  }
+  resize(id, cols, rows, viewer) {
+    resizeSession(this.sessions, id, cols, rows, {
+      ...viewer,
+      onClaim: this.notify
+    });
+  }
+};
+
 // src/shared/activeWindows.ts
 function activeWindows(rateLimits, harness) {
   if (!rateLimits) return [];
@@ -45595,66 +45712,6 @@ function spawnAssistInTree(ctx, assistArgs, cwd, meta, context) {
   return id;
 }
 
-// src/commands/sessions/daemon/watchPromptSubmit.ts
-var CARRIAGE_RETURN = "\r";
-function isPromptSubmit(data) {
-  return data.includes(CARRIAGE_RETURN);
-}
-function watchPromptSubmit(session, data, onStatusChange) {
-  if (session.restored !== true) return;
-  if (session.status !== "waiting") return;
-  if (!isPromptSubmit(data)) return;
-  daemonLog(`session ${session.id} resumed-prompt submit -> running`);
-  onStatusChange(session, "running");
-}
-
-// src/commands/sessions/daemon/writeToSession.ts
-function writeToSession(sessions, id, data, onStatusChange) {
-  const s = sessions.get(id);
-  if (!s || s.status === "done") return;
-  s.pty?.write(data);
-  watchPromptSubmit(s, data, onStatusChange);
-}
-function resizeSession(sessions, id, cols, rows) {
-  const s = sessions.get(id);
-  if (!s || s.status === "done" || !s.pty) return;
-  s.cols = cols;
-  s.rows = rows;
-  try {
-    s.pty.resize(cols, rows);
-  } catch (error) {
-    daemonLog(
-      `session ${id} resize skipped (dead pty): ${error instanceof Error ? error.message : String(error)}`
-    );
-  }
-}
-function setAutoRun(sessions, id, enabled) {
-  const s = sessions.get(id);
-  if (!s) return false;
-  s.autoRun = enabled;
-  daemonLog(`session ${id} autorun ${enabled ? "on" : "off"}`);
-  return true;
-}
-function setStarred2(sessions, id, starred) {
-  const s = sessions.get(id);
-  if (!s) return false;
-  s.starred = starred;
-  daemonLog(`session ${id} starred ${starred ? "on" : "off"}`);
-  return true;
-}
-function setAutoAdvance(sessions, id, enabled) {
-  const s = sessions.get(id);
-  if (!s) return false;
-  s.autoAdvance = enabled;
-  const itemId2 = s.activity?.itemId;
-  if (itemId2 != null) {
-    if (enabled) clearPause(itemId2);
-    else requestPause(itemId2);
-  }
-  daemonLog(`session ${id} autoadvance ${enabled ? "on" : "off"}`);
-  return true;
-}
-
 // src/commands/sessions/daemon/worktree/resumeInTree.ts
 import { existsSync as existsSync95 } from "fs";
 
@@ -45859,12 +45916,11 @@ var SessionManager = class {
       this.treeCtx()
     )
   );
-  writeToSession(id, data) {
-    writeToSession(this.sessions, id, data, this.onStatusChange);
-  }
-  resizeSession(id, cols, rows) {
-    resizeSession(this.sessions, id, cols, rows);
-  }
+  io = new SessionIo(
+    this.sessions,
+    () => this.onStatusChange,
+    () => this.notify()
+  );
   retrySession(id, replace = false) {
     return runRetry(this.sessions, id, replace, {
       clients: this.clients,
@@ -46482,10 +46538,17 @@ var messageHandlers = {
   ),
   "codex-usage": handleCodexUsage,
   input: routed(
-    (_client, m, d) => m.writeToSession(d.sessionId, d.data)
+    (_client, m, d) => m.io.write(
+      d.sessionId,
+      d.data,
+      d.viewerId
+    )
   ),
   resize: routed(
-    (_client, m, d) => m.resizeSession(d.sessionId, d.cols, d.rows)
+    (_client, m, d) => m.io.resize(d.sessionId, d.cols, d.rows, {
+      viewerId: d.viewerId,
+      claim: d.claim === true
+    })
   ),
   retry: routed((client, m, d) => {
     const conflict = m.retrySession(d.sessionId, d.replace === true);

package/package.json

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