@staff0rd/assist 0.921.0 → 0.923.0

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.921.0",
9
+ version: "0.923.0",
10
10
  type: "module",
11
11
  main: "dist/index.js",
12
12
  bin: {
@@ -803,7 +803,8 @@ var LEGACY_SESSIONS_KEYS = [
803
803
  "windowsVersionCheck",
804
804
  "topBar",
805
805
  "floatWaiting",
806
- "floatWaitingAfterMs"
806
+ "floatWaitingAfterMs",
807
+ "parkWaitingAfterMs"
807
808
  ];
808
809
  var LEGACY_WORKTREE_KEYS = ["watcher", "includeDrafts"];
809
810
  function withoutKeys(value, keys) {
@@ -1306,7 +1307,6 @@ var assistConfigShape = {
1306
1307
  linkVersionCheck: z6.enum(["block", "warn", "off"]).default("block"),
1307
1308
  tailscaleServe: z6.boolean().default(true),
1308
1309
  includeCommittedChanges: z6.boolean().default(true),
1309
- parkWaitingAfterMs: z6.number().default(3e5),
1310
1310
  maxLive: z6.number().default(24),
1311
1311
  newSessionMode: z6.enum(["draft", "bug", "prompt", "design"]).default("draft"),
1312
1312
  hotkeys: hotkeysSchema.optional()
@@ -6388,11 +6388,6 @@ var sessionsConfigHelp = [
6388
6388
  setter: "assist config set sessions.includeCommittedChanges false -g",
6389
6389
  note: "default on: session card counts, /diff and the diff scope picker span the commits recorded against the session's backlog item as well as uncommitted work, so they survive the agent committing. Set false to show only uncommitted changes"
6390
6390
  },
6391
- {
6392
- key: "sessions.parkWaitingAfterMs",
6393
- setter: "assist config set sessions.parkWaitingAfterMs 600000 -g",
6394
- note: "how long every session in a repo group must have been waiting on input before the group collapses and parks at the bottom of the sidebar (default: 300000ms)"
6395
- },
6396
6391
  {
6397
6392
  key: "sessions.maxLive",
6398
6393
  setter: "assist config set sessions.maxLive 24 -g",
@@ -10327,19 +10322,6 @@ async function nodeDoctor(req, res) {
10327
10322
  respondJson(res, 200, { hop: await firstBrokenHop(link3) ?? null });
10328
10323
  }
10329
10324
 
10330
- // src/commands/sessions/shared/sessionViewDefaults.ts
10331
- var sessionViewDefaults = {
10332
- parkWaitingAfterMs: 3e5
10333
- };
10334
-
10335
- // src/commands/sessions/web/sessionView.ts
10336
- function sessionView(_req, res) {
10337
- const sessions = loadConfig().sessions;
10338
- respondJson(res, 200, {
10339
- parkWaitingAfterMs: sessions?.parkWaitingAfterMs ?? sessionViewDefaults.parkWaitingAfterMs
10340
- });
10341
- }
10342
-
10343
10325
  // src/commands/config/applyDbBackedConfigWrite.ts
10344
10326
  async function applyDbBackedConfigWrite(key, scope, write) {
10345
10327
  if (scope !== "global")
@@ -11515,7 +11497,6 @@ var routes2 = {
11515
11497
  "GET /api/rules": listScopedRules,
11516
11498
  "GET /api/jira-site": jiraSite,
11517
11499
  "GET /api/harness": harnessCapabilities,
11518
- "GET /api/session-view": sessionView,
11519
11500
  "GET /api/hotkeys": hotkeyBindings,
11520
11501
  "GET /api/new-session-defaults": newSessionDefaults,
11521
11502
  "GET /api/pr-status": prStatus,
@@ -14070,7 +14051,9 @@ function parsePreviewDecision(line, requestId) {
14070
14051
  const msg = JSON.parse(line);
14071
14052
  if (msg.type === "error" && (msg.message ?? "").includes("pr-preview"))
14072
14053
  return { kind: "error", message: msg.message ?? "pr-preview failed" };
14073
- if (msg.type !== "pr-decision" || msg.requestId !== requestId) return null;
14054
+ if (msg.requestId !== requestId) return null;
14055
+ if (msg.type === "pr-superseded") return { kind: "superseded" };
14056
+ if (msg.type !== "pr-decision") return null;
14074
14057
  const decision = toPreviewDecision(msg);
14075
14058
  return decision ? { kind: "decision", decision } : null;
14076
14059
  } catch {
@@ -14083,17 +14066,19 @@ function requestPreviewDecision(request) {
14083
14066
  return new Promise((resolve31, reject) => {
14084
14067
  connectToDaemon().then((socket) => {
14085
14068
  let settled = false;
14086
- const finish2 = (error, decision) => {
14069
+ const finish2 = (error, outcome) => {
14087
14070
  if (settled) return;
14088
14071
  settled = true;
14089
14072
  socket.destroy();
14090
14073
  if (error) reject(error);
14091
- else resolve31(decision);
14074
+ else resolve31(outcome);
14092
14075
  };
14093
14076
  readSocketLines(socket, (line) => {
14094
14077
  const incoming = parsePreviewDecision(line, request.requestId);
14095
14078
  if (!incoming) return;
14096
14079
  if (incoming.kind === "error") finish2(new Error(incoming.message));
14080
+ else if (incoming.kind === "superseded")
14081
+ finish2(void 0, "superseded");
14097
14082
  else finish2(void 0, incoming.decision);
14098
14083
  });
14099
14084
  socket.on("error", (error) => finish2(error));
@@ -14110,19 +14095,25 @@ function requestPreviewDecision(request) {
14110
14095
  // src/commands/sessions/shared/awaitPreviewApproval.ts
14111
14096
  async function awaitPreviewApproval(subject, request, options2 = {}) {
14112
14097
  console.log("Awaiting your approval in the assist web UI preview pane\u2026");
14113
- let decision;
14098
+ let outcome;
14114
14099
  try {
14115
- decision = await requestPreviewDecision(request);
14100
+ outcome = await requestPreviewDecision(request);
14116
14101
  } catch (error) {
14117
14102
  console.error(
14118
14103
  `Error: ${error instanceof Error ? error.message : String(error)}`
14119
14104
  );
14120
14105
  process.exit(1);
14121
14106
  }
14122
- if (decision.body !== void 0) options2.saveEditedBody?.(decision.body);
14123
- if (decision.decision === "reject" && !options2.rejectIsOutcome)
14124
- reportPreviewRejection(subject, decision, options2.rejectionAdvice);
14125
- return decision;
14107
+ if (outcome === "superseded") {
14108
+ console.log(
14109
+ "Superseded by a newer preview \u2014 no decision; ignore this result."
14110
+ );
14111
+ process.exit(0);
14112
+ }
14113
+ if (outcome.body !== void 0) options2.saveEditedBody?.(outcome.body);
14114
+ if (outcome.decision === "reject" && !options2.rejectIsOutcome)
14115
+ reportPreviewRejection(subject, outcome, options2.rejectionAdvice);
14116
+ return outcome;
14126
14117
  }
14127
14118
 
14128
14119
  // src/commands/ask.ts
@@ -46409,6 +46400,22 @@ function placeShowPreview(session, show4) {
46409
46400
  return true;
46410
46401
  }
46411
46402
 
46403
+ // src/commands/sessions/daemon/supersedePendingPreview.ts
46404
+ function supersedePendingPreview(session, waiters, newRequestId) {
46405
+ const pending = session.pendingPrPreview;
46406
+ const waiter = waiters.get(session.id);
46407
+ if (!pending || pending.kind === "show" || !waiter) return false;
46408
+ sendTo(waiter, {
46409
+ type: "pr-superseded",
46410
+ requestId: pending.requestId,
46411
+ supersededBy: newRequestId
46412
+ });
46413
+ daemonLog(
46414
+ `pr-preview superseded: id=${session.id} old=${pending.requestId} new=${newRequestId}`
46415
+ );
46416
+ return true;
46417
+ }
46418
+
46412
46419
  // src/commands/sessions/daemon/setPrPreview.ts
46413
46420
  function setPrPreview(sessions, waiters, notify2, client, d) {
46414
46421
  const id = d.sessionId;
@@ -46428,6 +46435,7 @@ function setPrPreview(sessions, waiters, notify2, client, d) {
46428
46435
  sendTo(client, { type: "show-ack", requestId: d.requestId });
46429
46436
  if (placeShowPreview(session, preview)) return notify2();
46430
46437
  } else {
46438
+ supersedePendingPreview(session, waiters, d.requestId);
46431
46439
  session.pendingPrPreview = preview;
46432
46440
  waiters.set(id, client);
46433
46441
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@staff0rd/assist",
3
- "version": "0.921.0",
3
+ "version": "0.923.0",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "bin": {