@staff0rd/assist 0.824.3 → 0.824.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -6,7 +6,7 @@ import { Command } from "commander";
6
6
  // package.json
7
7
  var package_default = {
8
8
  name: "@staff0rd/assist",
9
- version: "0.824.3",
9
+ version: "0.824.5",
10
10
  type: "module",
11
11
  main: "dist/index.js",
12
12
  bin: {
@@ -1995,7 +1995,8 @@ var daemonPaths = {
1995
1995
  pid: join11(DAEMON_DIR, "daemon.pid"),
1996
1996
  autoUpdatePaused: join11(DAEMON_DIR, "auto-update-paused"),
1997
1997
  spawnLock: join11(DAEMON_DIR, "spawn.lock"),
1998
- hooksSettings: join11(DAEMON_DIR, "hooks-settings.json")
1998
+ hooksSettings: join11(DAEMON_DIR, "hooks-settings.json"),
1999
+ viewerSize: join11(DAEMON_DIR, "viewer-size.json")
1999
2000
  };
2000
2001
 
2001
2002
  // src/commands/sessions/daemon/connectToDaemon.ts
@@ -43171,13 +43172,45 @@ function sessionSnapshot(s) {
43171
43172
  return stripReplayQueries(s.screen?.snapshot() ?? s.scrollback);
43172
43173
  }
43173
43174
 
43174
- // src/commands/sessions/daemon/sendTakeoverSnapshot.ts
43175
- function sendTakeoverSnapshot(s, send) {
43175
+ // src/commands/sessions/daemon/sendResizeSnapshot.ts
43176
+ function sendResizeSnapshot(s, send) {
43176
43177
  const data = sessionSnapshot(s);
43177
- daemonLog(`session ${s.id} takeover snapshot ${data.length} chars`);
43178
+ daemonLog(`session ${s.id} resize snapshot ${data.length} chars`);
43178
43179
  send(data);
43179
43180
  }
43180
43181
 
43182
+ // src/commands/sessions/daemon/viewerSize.ts
43183
+ import { readFileSync as readFileSync68, writeFileSync as writeFileSync55 } from "fs";
43184
+ var DEFAULT_SIZE = { cols: 120, rows: 30 };
43185
+ var remembered;
43186
+ function rememberViewerSize(cols, rows) {
43187
+ if (cols <= 0 || rows <= 0) return;
43188
+ if (remembered?.cols === cols && remembered.rows === rows) return;
43189
+ remembered = { cols, rows };
43190
+ try {
43191
+ writeFileSync55(daemonPaths.viewerSize, JSON.stringify(remembered));
43192
+ } catch (error) {
43193
+ daemonLog(
43194
+ `viewer size ${cols}x${rows} not saved: ${error instanceof Error ? error.message : String(error)}`
43195
+ );
43196
+ }
43197
+ }
43198
+ function viewerSize() {
43199
+ remembered ??= readSavedSize();
43200
+ return remembered ?? DEFAULT_SIZE;
43201
+ }
43202
+ function readSavedSize() {
43203
+ try {
43204
+ const { cols, rows } = JSON.parse(
43205
+ readFileSync68(daemonPaths.viewerSize, "utf8")
43206
+ );
43207
+ if (typeof cols === "number" && typeof rows === "number" && cols > 0)
43208
+ return { cols, rows };
43209
+ } catch {
43210
+ }
43211
+ return void 0;
43212
+ }
43213
+
43181
43214
  // src/commands/sessions/daemon/resizeSession.ts
43182
43215
  function resizeSession(sessions, id, cols, rows, viewer = {}) {
43183
43216
  const s = sessions.get(id);
@@ -43191,11 +43224,12 @@ function resizeSession(sessions, id, cols, rows, viewer = {}) {
43191
43224
  );
43192
43225
  s.cols = cols;
43193
43226
  s.rows = rows;
43227
+ rememberViewerSize(cols, rows);
43194
43228
  const resize = (c, r) => resizePty(s, c, r);
43195
43229
  resize(cols, rows);
43196
- if (!viewer.claim) return;
43197
- if (viewer.sendSnapshot) sendTakeoverSnapshot(s, viewer.sendSnapshot);
43198
- else if (unchanged) nudgePty(s, resize);
43230
+ if (viewer.sendSnapshot && (viewer.claim || viewer.refresh))
43231
+ sendResizeSnapshot(s, viewer.sendSnapshot);
43232
+ else if (viewer.claim && unchanged) nudgePty(s, resize);
43199
43233
  }
43200
43234
  function isInactiveViewer(s, { viewerId, claim }) {
43201
43235
  if (claim || !viewerId || !s.activeViewer) return false;
@@ -43517,8 +43551,7 @@ function spawnPty(args, cwd, sessionId, extraEnv) {
43517
43551
  } = process.env;
43518
43552
  return pty.spawn(command.file, command.args, {
43519
43553
  name: "xterm-256color",
43520
- cols: 120,
43521
- rows: 30,
43554
+ ...viewerSize(),
43522
43555
  cwd: cwd ?? process.cwd(),
43523
43556
  env: {
43524
43557
  ...parentEnv,
@@ -43702,12 +43735,12 @@ function createRunSession(id, { runName, runArgs, cwd, meta }) {
43702
43735
  }
43703
43736
 
43704
43737
  // src/commands/sessions/daemon/autoUpdate/autoUpdateControl.ts
43705
- import { existsSync as existsSync88, rmSync as rmSync9, writeFileSync as writeFileSync55 } from "fs";
43738
+ import { existsSync as existsSync88, rmSync as rmSync9, writeFileSync as writeFileSync56 } from "fs";
43706
43739
  var paused;
43707
43740
  var wake;
43708
43741
  function persist2(value) {
43709
43742
  try {
43710
- if (value) writeFileSync55(daemonPaths.autoUpdatePaused, "");
43743
+ if (value) writeFileSync56(daemonPaths.autoUpdatePaused, "");
43711
43744
  else rmSync9(daemonPaths.autoUpdatePaused, { force: true });
43712
43745
  } catch {
43713
43746
  }
@@ -43832,19 +43865,19 @@ async function runAutoUpdateLoop(deps2, maxLaps = Number.POSITIVE_INFINITY) {
43832
43865
  }
43833
43866
 
43834
43867
  // src/commands/sessions/daemon/autoUpdate/trimWatcherLog.ts
43835
- import { readFileSync as readFileSync69, writeFileSync as writeFileSync56 } from "fs";
43868
+ import { readFileSync as readFileSync70, writeFileSync as writeFileSync57 } from "fs";
43836
43869
  var KEEP_TAIL = 256 * 1024;
43837
43870
  var MAX_LOG_SIZE = 4 * 1024 * 1024;
43838
43871
  function trimWatcherLog(cwd) {
43839
43872
  const path108 = watcherLogPath(cwd);
43840
43873
  let log2;
43841
43874
  try {
43842
- log2 = readFileSync69(path108, "utf8");
43875
+ log2 = readFileSync70(path108, "utf8");
43843
43876
  } catch {
43844
43877
  return;
43845
43878
  }
43846
43879
  if (log2.length <= MAX_LOG_SIZE) return;
43847
- writeFileSync56(path108, log2.slice(-KEEP_TAIL));
43880
+ writeFileSync57(path108, log2.slice(-KEEP_TAIL));
43848
43881
  daemonLog(`auto-update: log ${path108} trimmed to its last ${KEEP_TAIL} chars`);
43849
43882
  }
43850
43883
 
@@ -45058,13 +45091,12 @@ function createScreenMirror(cols, rows) {
45058
45091
  }
45059
45092
 
45060
45093
  // src/commands/sessions/daemon/sessionScreen.ts
45061
- var DEFAULT_COLS = 120;
45062
- var DEFAULT_ROWS = 30;
45063
45094
  function sessionScreen(session) {
45064
45095
  if (!session.screen) {
45096
+ const fallback = viewerSize();
45065
45097
  session.screen = createScreenMirror(
45066
- session.cols ?? DEFAULT_COLS,
45067
- session.rows ?? DEFAULT_ROWS
45098
+ session.cols ?? session.pty?.cols ?? fallback.cols,
45099
+ session.rows ?? session.pty?.rows ?? fallback.rows
45068
45100
  );
45069
45101
  if (session.scrollback) session.screen.write(session.scrollback);
45070
45102
  }
@@ -48583,10 +48615,10 @@ function autoUpdateReply() {
48583
48615
  }
48584
48616
 
48585
48617
  // src/commands/sessions/daemon/autoUpdate/applyAutoUpdateAction.ts
48586
- import { rmSync as rmSync11, writeFileSync as writeFileSync57 } from "fs";
48618
+ import { rmSync as rmSync11, writeFileSync as writeFileSync58 } from "fs";
48587
48619
  function signalLap(installDir, marker2) {
48588
48620
  const control = watchControlPaths(installDir);
48589
- if (control) writeFileSync57(control[marker2], "");
48621
+ if (control) writeFileSync58(control[marker2], "");
48590
48622
  }
48591
48623
  function applyAutoUpdateAction(action) {
48592
48624
  const installDir = getInstallDir();
@@ -49042,6 +49074,21 @@ var lifecycleHandlers = {
49042
49074
  shutdown: handleShutdown
49043
49075
  };
49044
49076
 
49077
+ // src/commands/sessions/daemon/handleSnapshotRequest.ts
49078
+ var handleSnapshotRequest = (client, m, d) => {
49079
+ const sessionId = d.sessionId;
49080
+ let data;
49081
+ m.update((sessions) => {
49082
+ const s = sessions.get(sessionId);
49083
+ if (s) data = sessionSnapshot(s);
49084
+ return false;
49085
+ });
49086
+ daemonLog(
49087
+ `snapshot requested: id=${sessionId} ${data === void 0 ? "not local" : `${data.length} chars`}`
49088
+ );
49089
+ if (data !== void 0) sendTo(client, { type: "snapshot", sessionId, data });
49090
+ };
49091
+
49045
49092
  // src/commands/sessions/daemon/viewed.ts
49046
49093
  function viewed(handler) {
49047
49094
  return (client, m, d) => {
@@ -49065,14 +49112,17 @@ var viewerHandlers = {
49065
49112
  routed((client, m, d) => {
49066
49113
  const sessionId = d.sessionId;
49067
49114
  const claim = d.claim === true;
49115
+ const refresh = d.refresh === true;
49068
49116
  const localViewer = d.viewerNode === m.links.localNode();
49069
49117
  m.io.resize(sessionId, d.cols, d.rows, {
49070
49118
  ...viewerOf(d),
49071
49119
  claim,
49072
- sendSnapshot: claim && localViewer ? (data) => sendTo(client, { type: "snapshot", sessionId, data }) : void 0
49120
+ refresh,
49121
+ sendSnapshot: localViewer ? (data) => sendTo(client, { type: "snapshot", sessionId, data }) : void 0
49073
49122
  });
49074
49123
  })
49075
49124
  ),
49125
+ snapshot: handleSnapshotRequest,
49076
49126
  "viewer-left": (client, m, d) => {
49077
49127
  if (typeof d.viewerId === "string") m.io.viewerLeft(client, d.viewerId);
49078
49128
  }
@@ -49276,10 +49326,10 @@ function handleConnection(socket, manager) {
49276
49326
  }
49277
49327
 
49278
49328
  // src/commands/sessions/daemon/onListening.ts
49279
- import { unlinkSync as unlinkSync22, writeFileSync as writeFileSync58 } from "fs";
49329
+ import { unlinkSync as unlinkSync22, writeFileSync as writeFileSync59 } from "fs";
49280
49330
 
49281
49331
  // src/commands/sessions/daemon/startPidFileWatchdog.ts
49282
- import { readFileSync as readFileSync70 } from "fs";
49332
+ import { readFileSync as readFileSync71 } from "fs";
49283
49333
  var WATCHDOG_INTERVAL_MS = 5e3;
49284
49334
  function startPidFileWatchdog(onLost, intervalMs = WATCHDOG_INTERVAL_MS) {
49285
49335
  const timer = setInterval(() => {
@@ -49290,7 +49340,7 @@ function startPidFileWatchdog(onLost, intervalMs = WATCHDOG_INTERVAL_MS) {
49290
49340
  }
49291
49341
  function ownsPidFile() {
49292
49342
  try {
49293
- return readFileSync70(daemonPaths.pid, "utf8").trim() === String(process.pid);
49343
+ return readFileSync71(daemonPaths.pid, "utf8").trim() === String(process.pid);
49294
49344
  } catch {
49295
49345
  return false;
49296
49346
  }
@@ -49298,7 +49348,7 @@ function ownsPidFile() {
49298
49348
 
49299
49349
  // src/commands/sessions/daemon/onListening.ts
49300
49350
  function onListening(manager, checkAutoExit) {
49301
- writeFileSync58(daemonPaths.pid, String(process.pid));
49351
+ writeFileSync59(daemonPaths.pid, String(process.pid));
49302
49352
  startPidFileWatchdog(() => {
49303
49353
  daemonLog("lost daemon.pid ownership; shutting down sessions and exiting");
49304
49354
  void manager.flushActiveMs().finally(() => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@staff0rd/assist",
3
- "version": "0.824.3",
3
+ "version": "0.824.5",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "bin": {