@staff0rd/assist 0.922.0 → 0.924.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.922.0",
9
+ version: "0.924.0",
10
10
  type: "module",
11
11
  main: "dist/index.js",
12
12
  bin: {
@@ -14051,7 +14051,9 @@ function parsePreviewDecision(line, requestId) {
14051
14051
  const msg = JSON.parse(line);
14052
14052
  if (msg.type === "error" && (msg.message ?? "").includes("pr-preview"))
14053
14053
  return { kind: "error", message: msg.message ?? "pr-preview failed" };
14054
- 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;
14055
14057
  const decision = toPreviewDecision(msg);
14056
14058
  return decision ? { kind: "decision", decision } : null;
14057
14059
  } catch {
@@ -14064,17 +14066,19 @@ function requestPreviewDecision(request) {
14064
14066
  return new Promise((resolve31, reject) => {
14065
14067
  connectToDaemon().then((socket) => {
14066
14068
  let settled = false;
14067
- const finish2 = (error, decision) => {
14069
+ const finish2 = (error, outcome) => {
14068
14070
  if (settled) return;
14069
14071
  settled = true;
14070
14072
  socket.destroy();
14071
14073
  if (error) reject(error);
14072
- else resolve31(decision);
14074
+ else resolve31(outcome);
14073
14075
  };
14074
14076
  readSocketLines(socket, (line) => {
14075
14077
  const incoming = parsePreviewDecision(line, request.requestId);
14076
14078
  if (!incoming) return;
14077
14079
  if (incoming.kind === "error") finish2(new Error(incoming.message));
14080
+ else if (incoming.kind === "superseded")
14081
+ finish2(void 0, "superseded");
14078
14082
  else finish2(void 0, incoming.decision);
14079
14083
  });
14080
14084
  socket.on("error", (error) => finish2(error));
@@ -14091,19 +14095,25 @@ function requestPreviewDecision(request) {
14091
14095
  // src/commands/sessions/shared/awaitPreviewApproval.ts
14092
14096
  async function awaitPreviewApproval(subject, request, options2 = {}) {
14093
14097
  console.log("Awaiting your approval in the assist web UI preview pane\u2026");
14094
- let decision;
14098
+ let outcome;
14095
14099
  try {
14096
- decision = await requestPreviewDecision(request);
14100
+ outcome = await requestPreviewDecision(request);
14097
14101
  } catch (error) {
14098
14102
  console.error(
14099
14103
  `Error: ${error instanceof Error ? error.message : String(error)}`
14100
14104
  );
14101
14105
  process.exit(1);
14102
14106
  }
14103
- if (decision.body !== void 0) options2.saveEditedBody?.(decision.body);
14104
- if (decision.decision === "reject" && !options2.rejectIsOutcome)
14105
- reportPreviewRejection(subject, decision, options2.rejectionAdvice);
14106
- 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;
14107
14117
  }
14108
14118
 
14109
14119
  // src/commands/ask.ts
@@ -46390,6 +46400,33 @@ function placeShowPreview(session, show4) {
46390
46400
  return true;
46391
46401
  }
46392
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 void 0;
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 pending.requestId;
46417
+ }
46418
+
46419
+ // src/commands/sessions/daemon/holdBlockingPreview.ts
46420
+ function holdBlockingPreview(session, waiters, client, preview) {
46421
+ const supersedes = supersedePendingPreview(
46422
+ session,
46423
+ waiters,
46424
+ preview.requestId
46425
+ );
46426
+ session.pendingPrPreview = supersedes ? { ...preview, supersedes } : preview;
46427
+ waiters.set(session.id, client);
46428
+ }
46429
+
46393
46430
  // src/commands/sessions/daemon/setPrPreview.ts
46394
46431
  function setPrPreview(sessions, waiters, notify2, client, d) {
46395
46432
  const id = d.sessionId;
@@ -46408,10 +46445,7 @@ function setPrPreview(sessions, waiters, notify2, client, d) {
46408
46445
  if (kind === "show") {
46409
46446
  sendTo(client, { type: "show-ack", requestId: d.requestId });
46410
46447
  if (placeShowPreview(session, preview)) return notify2();
46411
- } else {
46412
- session.pendingPrPreview = preview;
46413
- waiters.set(id, client);
46414
- }
46448
+ } else holdBlockingPreview(session, waiters, client, preview);
46415
46449
  const target = previewTargetLabel(
46416
46450
  kind,
46417
46451
  d.itemType === "bug" ? "bug" : "story",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@staff0rd/assist",
3
- "version": "0.922.0",
3
+ "version": "0.924.0",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "bin": {