@staff0rd/assist 0.875.1 → 0.875.2

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.875.1",
9
+ version: "0.875.2",
10
10
  type: "module",
11
11
  main: "dist/index.js",
12
12
  bin: {
@@ -44171,6 +44171,7 @@ function toSessionInfo(session) {
44171
44171
  verifying,
44172
44172
  seeding,
44173
44173
  pendingPrPreview,
44174
+ pendingShow,
44174
44175
  undurable,
44175
44176
  lastUserMessage,
44176
44177
  activeViewer,
@@ -44198,6 +44199,7 @@ function toSessionInfo(session) {
44198
44199
  verifying,
44199
44200
  seeding,
44200
44201
  pendingPrPreview,
44202
+ pendingShow,
44201
44203
  undurable,
44202
44204
  lastUserMessage,
44203
44205
  activeViewer,
@@ -45896,6 +45898,14 @@ function decidePrPreview(sessions, waiters, notify2, d) {
45896
45898
  const id = d.sessionId;
45897
45899
  const requestId = d.requestId;
45898
45900
  const session = sessions.get(id);
45901
+ if (session?.pendingShow?.requestId === requestId) {
45902
+ daemonLog(
45903
+ `pr-preview stacked show closed: id=${id} requestId=${requestId}`
45904
+ );
45905
+ session.pendingShow = void 0;
45906
+ notify2();
45907
+ return;
45908
+ }
45899
45909
  if (!session || session.pendingPrPreview?.requestId !== requestId) {
45900
45910
  daemonLog(
45901
45911
  `pr-decision for stale/unknown preview id=${id} requestId=${requestId} (ignoring)`
@@ -46014,10 +46024,15 @@ function previewTargetLabel(kind, itemType, prNumber, draft) {
46014
46024
  return draft ? "create draft" : "create";
46015
46025
  }
46016
46026
 
46017
- // src/commands/sessions/daemon/refuseShowOverApproval.ts
46018
- function refuseShowOverApproval(session, client, d) {
46027
+ // src/commands/sessions/daemon/placeShowPreview.ts
46028
+ function placeShowPreview(session, show4) {
46019
46029
  const pending = session.pendingPrPreview;
46020
- if (!pending || pending.kind === "show") return false;
46030
+ if (!pending || pending.kind === "show") {
46031
+ session.pendingPrPreview = show4;
46032
+ session.pendingShow = void 0;
46033
+ return false;
46034
+ }
46035
+ session.pendingShow = show4;
46021
46036
  const target = previewTargetLabel(
46022
46037
  pending.kind ?? "pr",
46023
46038
  pending.itemType ?? "story",
@@ -46025,13 +46040,8 @@ function refuseShowOverApproval(session, client, d) {
46025
46040
  pending.draft === true
46026
46041
  );
46027
46042
  daemonLog(
46028
- `pr-preview show refused: id=${session.id} requestId=${d.requestId} pending=${target}`
46043
+ `pr-preview show stacked: id=${session.id} requestId=${show4.requestId} over=${target}`
46029
46044
  );
46030
- sendTo(client, {
46031
- type: "show-refused",
46032
- requestId: d.requestId,
46033
- message: `A ${target} preview is awaiting approval in this session's preview pane; approve or reject it before showing anything else.`
46034
- });
46035
46045
  return true;
46036
46046
  }
46037
46047
 
@@ -46049,11 +46059,14 @@ function setPrPreview(sessions, waiters, notify2, client, d) {
46049
46059
  }
46050
46060
  const prNumber = typeof d.prNumber === "number" ? d.prNumber : null;
46051
46061
  const kind = isPreviewKind(d.kind) ? d.kind : "pr";
46052
- if (kind === "show" && refuseShowOverApproval(session, client, d)) return;
46053
- session.pendingPrPreview = buildPrPreview(d, kind, prNumber);
46054
- if (kind === "show")
46062
+ const preview = buildPrPreview(d, kind, prNumber);
46063
+ if (kind === "show") {
46055
46064
  sendTo(client, { type: "show-ack", requestId: d.requestId });
46056
- else waiters.set(id, client);
46065
+ if (placeShowPreview(session, preview)) return notify2();
46066
+ } else {
46067
+ session.pendingPrPreview = preview;
46068
+ waiters.set(id, client);
46069
+ }
46057
46070
  const target = previewTargetLabel(
46058
46071
  kind,
46059
46072
  d.itemType === "bug" ? "bug" : "story",
@@ -46061,7 +46074,7 @@ function setPrPreview(sessions, waiters, notify2, client, d) {
46061
46074
  d.draft === true
46062
46075
  );
46063
46076
  daemonLog(
46064
- `pr-preview set: id=${id} requestId=${d.requestId} kind=${kind} target=${target} screenshots=${session.pendingPrPreview.screenshots?.length ?? 0}`
46077
+ `pr-preview set: id=${id} requestId=${d.requestId} kind=${kind} target=${target} screenshots=${preview.screenshots?.length ?? 0}`
46065
46078
  );
46066
46079
  if (autoApprovePreview(sessions, waiters, notify2, session)) return;
46067
46080
  notify2();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@staff0rd/assist",
3
- "version": "0.875.1",
3
+ "version": "0.875.2",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "bin": {