@bongos/core 1.20.34 → 1.20.36

package/docs/module-api-changelog.md

@@ -2725,5 +2725,9 @@ is load-bearing: the script throws rather than guess if it is missing, and
         landed since 1.20.32 with no explicit bump. run 36783765458. (task 1002620)
   1.20.34 — CI auto-patch (publish-on-merge, ADR 0161): carrier for merges
         landed since 1.20.33 with no explicit bump. run 36784565937. (task 1002620)
+  1.20.35 — CI auto-patch (publish-on-merge, ADR 0161): carrier for merges
+        landed since 1.20.34 with no explicit bump. run 36787635391. (task 1002620)
+  1.20.36 — CI auto-patch (publish-on-merge, ADR 0161): carrier for merges
+        landed since 1.20.35 with no explicit bump. run 36788696388. (task 1002620)
 ---------------------------------------------------------------------------
 ```

package/docs/page-readings.json

@@ -136,8 +136,8 @@
       "surface": "builders",
       "title": "Collab",
       "states_read": ["board","out"],
-      "files_hash": "b12cee016dc9088c",
-      "reading_hash": "692c1f7b2658dd35",
+      "files_hash": "793b7af1446ab69e",
+      "reading_hash": "cedb8171693a308e",
       "counts": {"lines":68,"placed":23,"shared":4,"unplaced":41},
       "omitted": {"data":12},
       "notes": [],
@@ -145,7 +145,7 @@
         {"key":"L0001","section":"skip link","text":"Skip to content","placement":"shared","file":"modules/hall-ui/public/shell.js","line":767,"string_id":"87cee78ca134"},
         {"key":"L0002","section":"top bar","text":"Collab","placement":"shared"},
         {"key":"L0003","section":"top bar","text":"Jump to…","placement":"shared","file":"modules/hall-ui/public/shell.js","line":487,"string_id":"eba610d25523"},
-        {"key":"L0004","section":"top bar","text":"Ctrl K","placement":"shared"},
+        {"key":"L0004","section":"top bar","text":"⌘K","placement":"shared"},
         {"key":"L0005","section":"Collab","text":"Collab","placement":"unplaced"},
         {"key":"L0006","section":"Collab","text":"{…} and {…}","placement":"placed","file":"modules/hall-ui/public/profile-nudge.js","line":77,"string_id":"56b00d773232"},
         {"key":"L0007","section":"Collab","text":"Waiting on you","placement":"unplaced"},
@@ -162,7 +162,7 @@
         {"key":"L0018","section":"Asked {…}","text":"task #{…}","placement":"placed","file":"modules/hall-ui/public/copy-desk.js","line":105,"string_id":"a6e803a31a4d"},
         {"key":"L0019","section":"Asked {…}","text":"Reply","placement":"unplaced","occurrences":2},
         {"key":"L0020","section":"Asked {…}","text":"just asked","placement":"unplaced","occurrences":2},
-        {"key":"L0021","section":"Asked {…}","text":"Close this ask","placement":"placed","file":"modules/hall-ui/public/collab.js","line":270,"string_id":"b16bd3e36632","occurrences":3},
+        {"key":"L0021","section":"Asked {…}","text":"Mark resolved","placement":"placed","file":"modules/hall-ui/public/collab.js","line":278,"string_id":"4924438fb299","occurrences":3},
         {"key":"L0022","section":"Asked {…}","text":"The worktree junction keeps dragging the shared node_modules with it when I remove a stale worktree.","placement":"unplaced"},
         {"key":"L0023","section":"Asked {…}","text":"{…} of {…}","placement":"placed","file":"modules/hall-ui/public/sky-panel.js","line":120,"string_id":"73c1372b43d9","occurrences":2},
         {"key":"L0024","section":"Asked {…}","text":"Could you look at the oversight contact sheet before I ship?","placement":"unplaced"},
@@ -171,9 +171,9 @@
         {"key":"L0027","section":"Asked {…}","text":"6 days ago","placement":"unplaced"},
         {"key":"L0028","section":"Asked {…}","text":"5 days ago","placement":"unplaced"},
         {"key":"L0029","section":"Asked {…}","text":"Add a reply","placement":"unplaced"},
-        {"key":"L0030","section":"Asked {…}","text":"waiting 3 days","placement":"unplaced"},
-        {"key":"L0031","section":"Asked {…}","text":"Show all {…}","placement":"placed","file":"modules/hall-ui/public/collab.js","line":415,"string_id":"6dde12eb0c78"},
-        {"key":"L0032","section":"Asked {…}","text":"Copy all {…} for Session Start","placement":"placed","file":"modules/hall-ui/public/collab.js","line":461,"string_id":"4fb972405d3d"},
+        {"key":"L0030","section":"Asked {…}","text":"waiting 2 days","placement":"unplaced"},
+        {"key":"L0031","section":"Asked {…}","text":"Show all {…}","placement":"placed","file":"modules/hall-ui/public/collab.js","line":432,"string_id":"6dde12eb0c78"},
+        {"key":"L0032","section":"Asked {…}","text":"Copy all {…} for Session Start","placement":"placed","file":"modules/hall-ui/public/collab.js","line":478,"string_id":"4fb972405d3d"},
         {"key":"L0033","section":"Your asks 2","text":"Your asks","placement":"placed","file":"modules/hall-ui/public/collab.html","line":68,"string_id":"7d26333b5fb0"},
         {"key":"L0034","section":"Your asks 2","text":"{…} and {…}","placement":"placed","file":"modules/hall-ui/public/profile-nudge.js","line":77,"string_id":"56b00d773232","occurrences":2},
         {"key":"L0035","section":"Your asks 2","text":"{…} of {…}","placement":"placed","file":"modules/hall-ui/public/sky-panel.js","line":120,"string_id":"73c1372b43d9"},
@@ -181,15 +181,15 @@
         {"key":"L0037","section":"Your asks 2","text":"You asked","placement":"unplaced"},
         {"key":"L0038","section":"Your asks 2","text":"by name","placement":"unplaced"},
         {"key":"L0039","section":"Your asks 2","text":"task #{…}","placement":"placed","file":"modules/hall-ui/public/copy-desk.js","line":105,"string_id":"a6e803a31a4d"},
-        {"key":"L0040","section":"Your asks 2","text":"waiting a day","placement":"unplaced"},
+        {"key":"L0040","section":"Your asks 2","text":"just asked","placement":"unplaced"},
         {"key":"L0041","section":"Your asks 2","text":"Reply","placement":"unplaced"},
-        {"key":"L0042","section":"Your asks 2","text":"Someone helped","placement":"placed","file":"modules/hall-ui/public/collab.js","line":296,"string_id":"7da6a848cd26","occurrences":2},
+        {"key":"L0042","section":"Your asks 2","text":"Mark resolved","placement":"placed","file":"modules/hall-ui/public/collab.js","line":278,"string_id":"4924438fb299","occurrences":2},
         {"key":"L0043","section":"Your asks 2","text":"Withdraw","placement":"unplaced","occurrences":2},
         {"key":"L0044","section":"Your asks 2","text":"A","placement":"unplaced"},
         {"key":"L0045","section":"Your asks 2","text":"I need an {…}'s read on whether a forest plate under the glass rail is worth shooting, or whether the void stands.","placement":"unplaced"},
         {"key":"L0046","section":"Your asks 2","text":"You asked artists","placement":"unplaced"},
         {"key":"L0047","section":"Your asks 2","text":"goal #1000081","placement":"unplaced"},
-        {"key":"L0048","section":"Your asks 2","text":"waiting 6 days","placement":"unplaced"},
+        {"key":"L0048","section":"Your asks 2","text":"waiting 5 days","placement":"unplaced"},
         {"key":"L0049","section":"Your asks 2","text":"5 days ago","placement":"unplaced"},
         {"key":"L0050","section":"Your asks 2","text":"Add a reply","placement":"unplaced"},
         {"key":"L0051","section":"All {…} asks 8","text":"All open asks","placement":"placed","file":"modules/hall-ui/public/collab.html","line":79,"string_id":"9c34bccb06ef"},
@@ -207,7 +207,7 @@
         {"key":"L0063","section":"All {…} asks 8","text":"by name","placement":"unplaced"},
         {"key":"L0064","section":"All {…} asks 8","text":"task #{…}","placement":"placed","file":"modules/hall-ui/public/copy-desk.js","line":105,"string_id":"a6e803a31a4d","occurrences":2},
         {"key":"L0065","section":"All {…} asks 8","text":"asked builders","placement":"unplaced"},
-        {"key":"L0066","section":"All {…} asks 8","text":"Show all {…}","placement":"placed","file":"modules/hall-ui/public/collab.js","line":415,"string_id":"6dde12eb0c78"},
+        {"key":"L0066","section":"All {…} asks 8","text":"Show all {…}","placement":"placed","file":"modules/hall-ui/public/collab.js","line":432,"string_id":"6dde12eb0c78"},
         {"key":"L0067","section":"All {…} asks 8","text":"Archive","placement":"unplaced"},
         {"key":"L0068","section":"All {…} asks 8","text":"Answering is optional and declining costs nothing. Nobody is assigned by being asked.","placement":"placed","file":"modules/hall-ui/public/collab.html","line":143,"string_id":"05761b08ec8f"}
       ]
@@ -336,7 +336,7 @@
       "surface": "builders",
       "title": "Deploy",
       "states_read": ["work","out"],
-      "files_hash": "75b0ee946374f727",
+      "files_hash": "786235bca48a981a",
       "reading_hash": "eb5acd9bd5fc73e9",
       "counts": {"lines":7,"placed":0,"shared":5,"unplaced":2},
       "omitted": {"data":1},
@@ -838,7 +838,7 @@
       "surface": "builders",
       "title": "Fleet costs",
       "states_read": ["ledger","out"],
-      "files_hash": "8462e8335cad7288",
+      "files_hash": "23ae0ec03adc9b80",
       "reading_hash": "9493385a64bb0e9f",
       "counts": {"lines":22,"placed":6,"shared":5,"unplaced":11},
       "omitted": {"data":11},
@@ -2222,7 +2222,7 @@
       "surface": "builders",
       "title": "Project settings",
       "states_read": ["default"],
-      "files_hash": "8835144757c866f3",
+      "files_hash": "f3007d41f4f59d9f",
       "reading_hash": "940a00917a01cd2e",
       "counts": {"lines":10,"placed":5,"shared":5,"unplaced":0},
       "omitted": {"data":1},
@@ -2637,7 +2637,7 @@
       "surface": "builders",
       "title": "Studio",
       "states_read": ["home","out","flow","flow-pick","status","words-offer","words-edit","reviews","full","full-back","approvals","approvals-before","approvals-phone","approvals-note","approved","sent-back"],
-      "files_hash": "cc1b84f3754bfcc7",
+      "files_hash": "85650f845556e185",
       "reading_hash": "7ad6eaf33f933983",
       "counts": {"lines":70,"placed":42,"shared":3,"unplaced":25},
       "omitted": {"data":18},
@@ -2645,7 +2645,7 @@
       "lines": [
         {"key":"L0001","section":"skip link","text":"Skip to content","placement":"shared","file":"modules/hall-ui/public/shell.js","line":767,"string_id":"87cee78ca134"},
         {"key":"L0002","section":"top bar","text":"Jump to…","placement":"shared","file":"modules/hall-ui/public/shell.js","line":487,"string_id":"eba610d25523"},
-        {"key":"L0003","section":"top bar","text":"Ctrl K","placement":"shared"},
+        {"key":"L0003","section":"top bar","text":"⌘K","placement":"shared"},
         {"key":"L0004","section":"page top","text":"{{worldName}} · studio","placement":"placed","file":"modules/hall-ui/public/studio.html","line":79,"string_id":"3d8611c2e79d"},
         {"key":"L0005","section":"page top","text":"pages tweaked","placement":"placed","file":"modules/hall-ui/public/studio.html","line":83,"string_id":"271de72308a4"},
         {"key":"L0006","section":"page top","text":"this week","placement":"placed","file":"modules/hall-ui/public/studio.html","line":85,"string_id":"130c3731ad83"},
@@ -3608,7 +3608,7 @@
       "surface": "landing",
       "title": "{{productName}} — projects",
       "states_read": ["out-map","in-map","in-map-projects","in-map-profile","in-map-kbd","in-map-search","in-map-mine-on","in-table","in-table-by-builders","in-mine","in-manage","in-manage-address","in-manage-planet","in-manage-card","in-manage-kind","in-manage-invite","in-manage-invite-handoff","in-manage-app-live","in-manage-app-building","in-manage-app-failed","in-manage-app-retry","in-manage-app-offer","in-manage-app-connect","in-manage-snag","in-manage-gone","in-manage-missing","out-manage","in-new","out-new","in-new-type","in-new-about","in-new-modules","in-new-modules-search","in-new-home","in-new-address","in-new-app","in-new-app-render","in-new-review","in-new-done","in-new-resume-offer","out-map-projects","card","card-noart","card-self","in-mine-empty","card-floor","card-backdrop"],
-      "files_hash": "0175af500182c5d2",
+      "files_hash": "f6bf47d00fcd6fee",
       "reading_hash": "1b2c6ce40c79925e",
       "counts": {"lines":517,"placed":182,"shared":20,"unplaced":315},
       "omitted": {"data":107},

package/modules/hall-ui/public/approval-queue.js

@@ -233,7 +233,7 @@
       paint();
       try {
         const url = kind === 'approved' ? writes.approve(item.page_id) : writes.sendBack(item.page_id);
-        const res = await api.request('POST', url, body);
+        const res = await api.request('POST', url, { body });
         if (!res.ok) {
           state.error = errWords(res.data, 'That could not be recorded. Nothing changed.');
           return;

package/modules/hall-ui/public/collab-lib.js

@@ -560,6 +560,15 @@
     return !!req.needs_craft && crafts.indexOf(req.needs_craft) !== -1;
   }
 
+  // Whether the reader may REOPEN a settled ask (task 1004458): only the person
+  // who asked, ticket style. Mirrors reopenHelpRequest's WHERE; the server stays
+  // the authority, this only decides whether to draw the button.
+  function canReopen(req, meId) {
+    if (!req || meId == null) return false;
+    if (String(req.status || '') === 'open') return false;
+    return String(req.requested_by) === String(meId);
+  }
+
   // ---- the archive (task 1004224) -------------------------------------------
   //
   // HOW AN ASK ENDED, in one sentence. This is the only thing an archived row has
@@ -613,7 +622,7 @@
     SKILL_COMMAND: SKILL_COMMAND, sessionStartPrompt: sessionStartPrompt,
     queueStartPrompt: queueStartPrompt, contextSentence: contextSentence,
     saidLabel: saidLabel, replyAuthor: replyAuthor, threadOf: threadOf,
-    canClose: canClose, validateReplyBody: validateReplyBody, MAX_REPLY: MAX_REPLY,
+    canClose: canClose, canReopen: canReopen, validateReplyBody: validateReplyBody, MAX_REPLY: MAX_REPLY,
     outcomeLine: outcomeLine,
   };
 })();

package/modules/hall-ui/public/collab.js

@@ -158,10 +158,17 @@
   // The composer is CLOSED until asked for. A textarea open on every row would
   // turn a page you read into a page you are being asked to type on, and the
   // blocks are condensed to three rows precisely so the page stays readable.
+  //
+  // "Post & resolve" (task 1004458) is the answer and the close in one press,
+  // drawn only for someone L.canClose says may close the ask. The asker can
+  // reopen it from their archive if the answer did not do it.
   function threadHtml(req, key, nowMs) {
     const thread = L.threadOf(req);
     const id = escapeHtml(String(req.id));
     const fid = `cb-reply-${escapeHtml(key)}-${id}`;
+    const resolve = L.canClose(req, meId, myCrafts)
+      ? `<button class="btn-ghost" type="submit" data-reply-send="${id}" data-reply-resolve>Post &amp; resolve</button>`
+      : '';
     const list = thread.length
       ? `<ul class="cb-thread">${thread.map((r) => replyHtml(r, nowMs)).join('')}</ul>`
       : '';
@@ -172,6 +179,7 @@
         <textarea class="cb-reply-input" name="body" rows="3" maxlength="${L.MAX_REPLY}" placeholder="Write a reply…"></textarea>
         <div class="cb-reply-actions">
           <button class="btn-accent" type="submit" data-reply-send="${id}">Post reply</button>
+          ${resolve}
           <button class="btn-ghost" type="button" data-reply-cancel="${fid}">Cancel</button>
         </div>
       </form>`;
@@ -267,7 +275,7 @@
     // draw it and the server's own WHERE decides whether it works — so the worst
     // a wrong answer here can do is offer a button that refuses.
     const close = L.canClose(req, meId, myCrafts)
-      ? `<div class="ov-row__actions"><button class="btn-ghost" data-settle="answered" data-id="${escapeHtml(String(req.id))}">Close this ask</button></div>`
+      ? `<div class="ov-row__actions"><button class="btn-ghost" data-settle="answered" data-id="${escapeHtml(String(req.id))}">Mark resolved</button></div>`
       : '';
     return `<li class="ov-row ov-row--lead cb-row${live}" data-id="${escapeHtml(String(req.id))}"${extra ? ' data-extra hidden' : ''}>
       ${faceHtml(L.faceOf(req, 'in'))}
@@ -301,7 +309,7 @@
       </div>
       <div class="ov-row__right">
         <div class="ov-row__actions">
-          <button class="btn-accent" data-settle="answered" data-id="${id}">Someone helped</button>
+          <button class="btn-accent" data-settle="answered" data-id="${id}">Mark resolved</button>
           <button class="btn-ghost" data-settle="withdrawn" data-id="${id}">Withdraw</button>
         </div>
       </div>
@@ -338,6 +346,11 @@
   // and the sentence: 'in' on the asks made OF them (the asker's face), 'out' on
   // the asks they made (the addressee's). Exactly the pairing forMeRow and
   // mineRow use, which is why an archived row reads like the open row it was.
+  //
+  // ONE ACTION, ON ONE SIDE (task 1004458): the asker's own archived asks carry
+  // "Reopen", ticket style — whoever closed it, the person who needed the answer
+  // has the last word. The server's WHERE holds the rule (asker only); the button
+  // is only drawn where it can work.
   function archiveRow(dir) {
     return (req, nowMs, extra, key) => {
       const outcome = L.outcomeLine(req);
@@ -350,11 +363,15 @@
       // holds the other facts, and the row keeps no right column at all: there
       // is nothing on an archived row to act on.
       const fact = outcome ? `<span class="ov-fact cb-outcome">${escapeHtml(outcome)}</span>` : '';
-      return `<li class="ov-row ov-row--lead cb-row cb-row--archived" data-id="${escapeHtml(String(req.id))}"${extra ? ' data-extra hidden' : ''}>
+      const id = escapeHtml(String(req.id));
+      const reopen = L.canReopen(req, meId)
+        ? `<div class="ov-row__right"><div class="ov-row__actions"><button class="btn-ghost" data-reopen data-id="${id}">Reopen</button></div></div>`
+        : '';
+      return `<li class="ov-row ov-row--lead cb-row cb-row--archived" data-id="${id}"${extra ? ' data-extra hidden' : ''}>
         ${faceHtml(L.faceOf(req, dir))}
         <div class="ov-row__main">${askHtml(req, key, true)}
           <div class="ov-row__facts">${directionFact(req, dir)}${contextChip(req)}${fact}</div>
-        </div>
+        </div>${reopen}
       </li>`;
     };
   }
@@ -691,7 +708,7 @@
     if (settling) return;
     settling = true;
     try {
-      const r = await api.request('POST', `/mingle/pairs/${id}/decide`, { decision });
+      const r = await api.request('POST', `/mingle/pairs/${id}/decide`, { body: { decision } });
       if (!r.ok) {
         toast(window.OTB.errMessage ? window.OTB.errMessage(r.data) : 'Could not answer that introduction.');
         return;
@@ -709,7 +726,11 @@
   // Post a reply. One in flight at a time (the `replying` latch), the same guard
   // `settling` gives the settle actions: a double-submit on an APPEND-ONLY table
   // writes the answer twice and there is no edit or delete to take it back with.
-  async function postReply(form) {
+  //
+  // `resolve` (task 1004458) closes the ask as 'answered' once the reply has
+  // landed — never before, so a refused reply cannot leave an ask closed on words
+  // nobody can read.
+  async function postReply(form, resolve) {
     if (replying) return;
     const id = form.getAttribute('data-reply-form');
     const input = form.querySelector('.cb-reply-input');
@@ -725,13 +746,22 @@
     const send = form.querySelector('[data-reply-send]');
     if (send) { send.disabled = true; send.textContent = 'Posting…'; }
     try {
-      const r = await api.request('POST', `/help-requests/${id}/replies`, { body: v.body });
+      // The reply's field is ALSO called `body`, so it is nested: the client's
+      // `body` option is the whole JSON payload. Passing the bare string sent a
+      // top-level JSON string, which the server's strict parser refuses as
+      // bad_json (task 1004458).
+      const r = await api.request('POST', `/help-requests/${id}/replies`, { body: { body: v.body } });
       if (!r.ok) {
         toast(window.OTB.errMessage ? window.OTB.errMessage(r.data) : 'Could not post that reply.');
         return;
       }
       if (input) input.value = '';
-      toast('Replied.');
+      if (resolve) {
+        const c = await api.helpRequests.patchHelpRequestsId({ id: Number(id), body: { status: 'answered' } });
+        toast(c.ok ? 'Replied and resolved.' : 'Replied, but could not resolve it.');
+      } else {
+        toast('Replied.');
+      }
       await load();
     } finally {
       replying = false;
@@ -758,7 +788,7 @@
         toast(window.OTB.errMessage ? window.OTB.errMessage(r.data) : 'Could not update that request.');
         return;
       }
-      toast(status === 'answered' ? 'Closed.' : 'Withdrawn.');
+      toast(status === 'answered' ? 'Resolved.' : status === 'open' ? 'Reopened.' : 'Withdrawn.');
       await load();
     } finally {
       settling = false;
@@ -785,6 +815,12 @@
       decideMingle(Number(mingleBtn.getAttribute('data-id')), mingleBtn.getAttribute('data-mingle'));
       return;
     }
+    const reopenBtn = closest('[data-reopen]');
+    if (reopenBtn) {
+      ev.preventDefault();
+      settle(Number(reopenBtn.getAttribute('data-id')), 'open');
+      return;
+    }
     const btn = closest('[data-settle]');
     if (!btn) return;
     ev.preventDefault();
@@ -799,7 +835,8 @@
     const form = ev.target && ev.target.closest ? ev.target.closest('[data-reply-form]') : null;
     if (!form) return;
     ev.preventDefault();
-    postReply(form);
+    const resolve = !!(ev.submitter && ev.submitter.hasAttribute('data-reply-resolve'));
+    postReply(form, resolve);
   });
 
   load().catch(() => {

package/modules/hall-ui/public/deploy.js

@@ -130,6 +130,178 @@
     return v ? `<span class="ov-mono">${escapeHtml(String(v))}</span>` : '<span class="ps-pill ps-pill--absent">no reading</span>';
   }
 
+  // ---- why a move stopped, in words (task 1004450) ---------------------------
+  //
+  // The runner classifies every failed move (scripts/gds/upgrade-outcome.js) into one of
+  // four kinds, each with a fixed reason code. The page used to show only the runner's raw
+  // output, addressed to someone holding a shell. These are the same reasons in the
+  // owner's words. A code with no entry falls back to a plain "no words for this" rather
+  // than a guess — the raw output is still one click away.
+  const REASON_WORDS = {
+    registry_unreadable: 'the list of published versions could not be read',
+    not_published: 'that version is not published yet',
+    npm_install: 'installing the new core stopped part-way',
+    dirty_tree: 'the project had unsaved file changes on its machine',
+    disk_full: 'the machine ran out of disk space',
+    schema_pending: 'the project’s database was behind its code',
+    outside_channel: 'that version is outside this project’s update rule',
+    shape_not_automated: 'this kind of project is not moved from this page',
+    downgrade: 'that version is older than the one running',
+    artist_gate: 'an artist review has to pass first',
+    module_incompatible: 'a module this project uses is not ready for that core',
+    remedy_did_not_hold: 'the automatic fix was tried once and the same problem came back',
+    remedy_failed: 'the automatic fix itself did not work',
+    health: 'the project did not answer after restarting on the new core',
+    migrate: 'updating the project’s database failed',
+    restart: 'the project would not restart',
+    rollback_failed: 'the new core failed, and putting the old one back failed too',
+    no_target: 'the move did not say which version to go to',
+    bad_slug: 'the project’s name on the machine could not be used',
+    installed_unreadable: 'the version installed on the machine could not be read',
+    served_mismatch: 'the project was not serving the version its machine had installed',
+    already_on: 'the project is already on that version',
+    db_unresolvable: 'the machine could not tell which database belongs to this project',
+    db_identity: 'the project’s database did not match the one the move expected',
+    health_url_missing: 'there was no address to check the project was answering after the move',
+    core_source: 'the new core could not be found to install',
+    integrity_pin: 'the new core did not match the checksum it was published with',
+  };
+  const reasonWords = (f) => (f && REASON_WORDS[f.reason]) || 'the upgrade stopped for a reason this page has no words for yet';
+  // What the runner's one automatic fix (scripts/gds/wedge-remedy.js) did for a known snag.
+  const REMEDY_WORDS = {
+    dirty_tree: 'saved those changes',
+    disk_full: 'cleared out old backups',
+    schema_pending: 'brought the database up to date',
+  };
+
+  // A pending move whose next try is in the FUTURE is waiting out a retry, not moving. The
+  // runner re-queues a failed move as pending with a not_before (task 1004447), so "pending"
+  // alone cannot tell the two apart — and treating a six-hour wait as a move in flight is
+  // how the page used to poll for five minutes and then say "still working".
+  function waitingOf(i) {
+    return !!(i && i.state === 'pending' && i.not_before && new Date(i.not_before).getTime() > Date.now());
+  }
+
+  // "14:05, in about 40 min" — when a waiting move tries again, as a clock time the owner
+  // can hold the page to, and the distance to it.
+  function whenNext(iso) {
+    const t = new Date(iso);
+    const mins = Math.max(1, Math.round((t.getTime() - Date.now()) / 60000));
+    const dist = mins < 90 ? `${mins} min` : `${Math.round(mins / 60)}h`;
+    let clock = '';
+    try { clock = t.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }); } catch (e) { clock = ''; }
+    return clock ? `${clock}, in about ${dist}` : `in about ${dist}`;
+  }
+
+  // A move waiting to try again. The press it offers is the SAME move, sooner: the route
+  // brings a waiting move's retry forward rather than refusing it (enqueueCoreUpgrade).
+  function waitingHtml(p) {
+    const i = p.open_intent;
+    const f = i.failure;
+    const at = escapeHtml(whenNext(i.not_before));
+    const to = escapeHtml(String(i.target_version || ''));
+    let body;
+    if (f && f.class === 'known_wedge') {
+      const did = REMEDY_WORDS[f.reason];
+      body = `<strong>A known snag stopped the move to core ${to}:</strong> ${escapeHtml(reasonWords(f))}.
+        ${did ? `It ${escapeHtml(did)} on its own, and` : 'It'} tries the move once more at ${at}.`;
+    } else if (f && f.class === 'transient') {
+      body = `<strong>Waiting to try core ${to} again at ${at}.</strong> The last try stopped because
+        ${escapeHtml(reasonWords(f))} — that is usually temporary, so it tries again on its own.`;
+    } else {
+      body = `<strong>Waiting to try core ${to} again at ${at}.</strong>`;
+    }
+    return `
+      <div class="dp-settled dp-settled--waiting">
+        <p class="ov-row__sub">${body} Nothing needs doing — this page shows the result when it lands.</p>
+        <div class="ps-controls">
+          <button type="button" class="btn" id="dp-retry-${escapeHtml(String(p.instance_id))}">Try now</button>
+        </div>
+      </div>`;
+  }
+
+  // A move that stopped for good, worded by what KIND of stop it was. Each kind says what
+  // happens next, because that is the question the owner is left with: is anything still
+  // being done about this, and is any of it mine to do?
+  const BLOCKERS_LINK = '<a href="/blockers">the owner’s blockers</a>';
+  function failureHtml(p, m, when, detail) {
+    const f = m.failure;
+    const cls = f && f.class;
+    const id = escapeHtml(String(p.instance_id));
+    const to = escapeHtml(String(m.target_version));
+    const still = `This project is still running core ${escapeHtml(String(p.served_version))}.`;
+    const card = (mod, head, rest, action = '') => `
+        <div class="dp-settled dp-settled--${mod}">
+          <p class="ov-row__sub"><strong>${head}</strong>${rest}</p>
+          ${action}
+          ${detail}
+        </div>`;
+    // A row from before the runner classified failures: the old wording, unchanged.
+    if (!cls) return card('failed', `The move to core ${to} did not land`, ` — attempted${when}. ${still}`);
+    const why = escapeHtml(reasonWords(f));
+    if (f.reason === 'rollback_failed') {
+      return card('failed', `The move to core ${to} failed, and the old core could not be put back`,
+        ` — attempted${when}. This project may be down. A person needs to look; it has been filed in ${BLOCKERS_LINK}.`);
+    }
+    if (cls === 'needs_decision') {
+      let action = '';
+      if (f.reason === 'outside_channel' && p.update_channel !== 'minor') {
+        action = `<div class="ps-controls">
+            <button type="button" class="btn btn--primary" id="dp-allow-${id}">Allow new releases and move to ${to}</button>
+          </div>`;
+      }
+      const next = {
+        outside_channel: action ? ' Allowing new releases changes this project’s update rule, then makes the move.' : ' Change the update rule below, then move again.',
+        artist_gate: ' Approve the artist review, or change the artist gate in this project’s settings, then move again.',
+        downgrade: ' Nothing to do unless you meant to go back to an older core.',
+        module_incompatible: ' Turn that module off in this project’s settings and move again, or wait for a core it works with — the technical detail below names the module.',
+        shape_not_automated: ' Whoever runs this project’s machine moves its core there.',
+      }[f.reason] || '';
+      return card('decision', `Your call: the move to core ${to} is waiting on a decision`,
+        ` — ${why}. Attempted${when}. ${still}${next}`, action);
+    }
+    if (cls === 'transient') {
+      const retry = String(m.target_version) === String(p.recommended_version)
+        ? `<div class="ps-controls"><button type="button" class="btn" id="dp-again-${id}">Try again</button></div>` : '';
+      return card('failed', `The move to core ${to} kept stopping`,
+        ` — ${why}. That is usually temporary, so it tried again on its own over several hours, then gave up${when}. ${still}`, retry);
+    }
+    // NO blockers link here, deliberately: move-escalation.js files one only for an unknown
+    // failure or a failed rollback, so pointing at the list would send the owner to look for
+    // a row that does not exist. The step is named instead.
+    if (cls === 'known_wedge') {
+      return card('failed', `The move to core ${to} hit a known snag it could not fix here`,
+        ` — ${why}. Attempted${when}. ${still} The automatic fix could not be applied on this project’s
+          machine, so whoever runs that machine clears the snag; the technical detail below says what it is.
+          After that, the move can be pressed again.`);
+    }
+    return card('failed', `The move to core ${to} did not land, and nothing automatic can fix it`,
+      ` — ${why}. Attempted${when}. ${still} It has been filed in ${BLOCKERS_LINK} for a person to look at.`);
+  }
+
+  // The project's update rule (task 1004445): how far the runner may move its core. A
+  // RULE, never a move — saving one queues nothing and restarts nothing.
+  const RULES = [
+    ['pinned', 'Stay put', 'no new versions are offered; this project stays on the core it runs'],
+    ['patch', 'Fixes only', 'takes fixes within the release line it is on'],
+    ['minor', 'Fixes and new releases', 'also takes the next release line when one comes out'],
+  ];
+  function ruleHtml(p) {
+    const cur = RULES.find((r) => r[0] === p.update_channel);
+    if (!cur) return '';
+    const id = escapeHtml(String(p.instance_id));
+    const opts = RULES.map(([k, label]) => `<option value="${k}"${k === cur[0] ? ' selected' : ''}>${escapeHtml(label)}</option>`).join('');
+    return `
+      <div class="dp-rule">
+        <p class="ov-row__sub"><strong>Update rule: ${escapeHtml(cur[1])}</strong> — ${escapeHtml(cur[2])}.</p>
+        <div class="ps-controls">
+          <label class="dp-rule__label" for="dp-rule-sel-${id}">Change to</label>
+          <select id="dp-rule-sel-${id}" class="dp-rule__select">${opts}</select>
+          <button type="button" class="btn" id="dp-rule-save-${id}">Save rule</button>
+        </div>
+      </div>`;
+  }
+
   // ---- the states ONE box can be in ----------------------------------------
 
   // Something is already running. The press is not offered at all — offering a button
@@ -141,6 +313,7 @@
   // reload, and neither is being watched — so it says what is true instead.
   function busyHtml(p) {
     const i = p.open_intent;
+    if (waitingOf(i)) return waitingHtml(p);
     return `
       <p class="ov-row__sub">A <strong>${escapeHtml(i.action)}</strong> is ${escapeHtml(i.state)} for this box${
         i.target_version ? ` (to core ${escapeHtml(i.target_version)})` : ''}.
@@ -186,7 +359,7 @@
     // verbatim and kept CLOSED: the owner cannot run `sudo -u`, so 30 lines of it (the
     // dirty-tree refusal prints a whole `git status`) is not what a deploy page leads on.
     const detail = m.error
-      ? `<details class="dp-settled__detail"><summary>What the upgrade said</summary>
+      ? `<details class="dp-settled__detail"><summary>Technical detail — what the upgrade said</summary>
           <pre class="dp-preflight__error">${escapeHtml(String(m.error))}</pre></details>`
       : '';
     if (m.state === 'error' && m.superseded) {
@@ -199,14 +372,7 @@
           ${detail}
         </div>`;
     }
-    if (m.state === 'error') {
-      return `
-        <div class="dp-settled dp-settled--failed">
-          <p class="ov-row__sub"><strong>The move to core ${escapeHtml(String(m.target_version))} did not land</strong>
-            — attempted${when}. This project is still running core ${escapeHtml(String(p.served_version))}.</p>
-          ${detail}
-        </div>`;
-    }
+    if (m.state === 'error') return failureHtml(p, m, when, detail);
     // LANDED, BUT GITHUB DID NOT GET IT (task 1004065). The runner pushes a hosted
     // project's new pin to its repo after the move; when it could not, the move is still
     // done — the site runs the new core — and `warning` says why the repo was not updated.
@@ -439,6 +605,7 @@
           : ''}
         ${schemaBehindHtml(p)}
         ${action}
+        ${ruleHtml(p)}
       </div></li>`;
   }
 
@@ -463,6 +630,54 @@
     if (cancel) cancel.addEventListener('click', () => { steps.set(p.instance_id, 'preview'); repaint(); });
     const confirm = $(`dp-confirm-${id}`);
     if (confirm) confirm.addEventListener('click', () => move(p));
+    // Task 1004450: the waiting move, sooner; a stopped temporary one, again; the one-click
+    // answer to an update-rule refusal; and the rule itself.
+    const retry = $(`dp-retry-${id}`);
+    if (retry && p.open_intent) retry.addEventListener('click', () => move(p, p.open_intent.target_version));
+    const again = $(`dp-again-${id}`);
+    if (again && p.last_move) again.addEventListener('click', () => move(p, p.last_move.target_version));
+    const allow = $(`dp-allow-${id}`);
+    if (allow && p.last_move) allow.addEventListener('click', () => allowAndMove(p, p.last_move.target_version, allow));
+    const save = $(`dp-rule-save-${id}`);
+    if (save) save.addEventListener('click', () => saveRule(p, save));
+  }
+
+  // Change the rule, then report the server's own sentence and re-read the row.
+  async function setRule(p, channel) {
+    const r = await sendJson('POST', `/provisioning/instances/${p.instance_id}/update-channel`, { channel });
+    toast(r.message || 'Update rule saved.');
+    return r;
+  }
+
+  async function saveRule(p, btn) {
+    const sel = $(`dp-rule-sel-${p.instance_id}`);
+    const channel = sel && sel.value;
+    if (!channel) return;
+    btn.disabled = true;
+    try {
+      await setRule(p, channel);
+    } catch (e) {
+      if (e && e.kind === '401') return;
+      toast(e.message || 'Could not change the update rule.');
+      btn.disabled = false;
+      return;
+    }
+    await refreshOne(p);
+  }
+
+  // "Allow new releases and move": the rule first, and only if it took, the move — a move
+  // queued under the old rule would be refused the same way again.
+  async function allowAndMove(p, to, btn) {
+    if (btn) { btn.disabled = true; btn.textContent = 'Changing the rule…'; }
+    try {
+      await setRule(p, 'minor');
+    } catch (e) {
+      if (e && e.kind === '401') return;
+      toast(e.message || 'Could not change the update rule.');
+      if (btn) { btn.disabled = false; btn.textContent = `Allow new releases and move to ${to}`; }
+      return;
+    }
+    await move(p, to);
   }
 
   // What the page is currently showing: the ONE box this hall is about, whether that box
@@ -491,11 +706,12 @@
     if (view.box) wire(view.box);
   }
 
-  async function move(p) {
+  // `to` defaults to the version the owner was SHOWN; the retry buttons pass the move they
+  // are retrying, which is also a version on screen.
+  async function move(p, to = p.recommended_version) {
     const btn = $(`dp-confirm-${p.instance_id}`);
     if (btn) { btn.disabled = true; btn.textContent = 'Queueing…'; }
     const id = String(p.instance_id);
-    const to = p.recommended_version;
     try {
       // `p.recommended_version` — the version this owner was SHOWN for THIS box, not
       // whatever is newest at the moment of the click.
@@ -532,6 +748,10 @@
       // that "done" would drop the row out of its in-flight state early.
       if (!now.open_intent && now.served_version === to) { settled = true; break; }
       if (!now.open_intent && now.last_move && now.last_move.state === 'error') { settled = true; break; }
+      // WAITING IS SETTLED TOO (task 1004450). A pending move whose next try is minutes or
+      // hours away is not in flight; the row says when it tries again, and watching it for
+      // five minutes would end in a "still working" toast about a move that is not running.
+      if (waitingOf(now.open_intent)) { settled = true; break; }
     }
     moving.delete(p.instance_id);
     repaint();