@gotcos/glasses-server 6.99.25 → 6.99.33

package/server/web-control/panes/meetings.js

@@ -102,7 +102,7 @@
   // "2026-11-03 · 9:05 PM · P · 60 minutes · Mac System Audio"
   function subtitle(m) {
     var parts = [];
-    if (m.date) parts.push(m.date);
+    if (m.date) parts.push(W.plainDay ? W.plainDay(m.date) : m.date);   // "Today" or "Nov 7", never 2026-11-07 (6.99.30)
     if (m.time) parts.push(fmtTime(m.time));
     var d = domainLabel(m); if (d) parts.push(d);
     if (m.duration) parts.push(m.duration); else if (num(m.durationMinutes) > 0) parts.push(num(m.durationMinutes) + ' min');
@@ -2352,7 +2352,13 @@
   function prepCapsNow() { var cc = W.cosChat; return cc && typeof cc.prepCaps === 'function' ? cc.prepCaps() : null; }
   function livePrep(sid) { if (!S.lprep || S.lprep.sid !== sid) S.lprep = { sid: sid, asked: false, state: 'idle', drafts: [], busy: '', done: null, note: '', changed: '' }; return S.lprep; }
   function notePrepInstance(b) { var cc = W.cosChat; if (b && cc && typeof cc.notePrepInstance === 'function') cc.notePrepInstance(b.serverInstanceId); }
-  function prepBoundTo(d, sid) { return ((d && d.bindings) || []).some(function (b) { return b && b.sessionId === sid && !b.removedAt; }); }
+  function prepBoundTo(d, sid) { return ((d && d.bindings) || []).some(function (b) { return b && b.sessionId === sid && !b.removedAt && b.state !== 'applying'; }); }
+  // An interrupted bind owns frozen rows at its original revision. A later editable draft is not its retry.
+  function prepPendingBind(d, sid) {
+    return ((d && d.bindings) || []).filter(function (b) {
+      return b && b.sessionId === sid && !b.removedAt && b.state === 'applying' && Number.isSafeInteger(b.revision) && b.revision >= 0;
+    })[0] || null;
+  }
   function prepReadyFiles(d) { return ((d && d.files) || []).filter(function (x) { return x && x.status === 'ready'; }); }
   function prepHasNotes(d) { return !!String((d && d.steer) || '').trim(); }
   // Whether this live view may offer a prep at all: the area is reserved exactly when this is true.
@@ -2376,7 +2382,7 @@
         if (S.lprep !== p) return;
         notePrepInstance(r.body);
         p.drafts = r.status === 200 && Array.isArray(r.body.drafts) ? r.body.drafts.filter(function (d) {
-          return d && typeof d.id === 'string' && !prepBoundTo(d, f.sid) && (prepHasNotes(d) || prepReadyFiles(d).length > 0);
+          return d && typeof d.id === 'string' && !prepBoundTo(d, f.sid) && (prepPendingBind(d, f.sid) || prepHasNotes(d) || prepReadyFiles(d).length > 0);
         }).slice(0, 5) : [];
         p.state = r.status === 200 ? 'ready' : 'failed';
         paintLivePrep();
@@ -2388,7 +2394,7 @@
     return prepHasNotes(d) ? (n ? 'its notes and ' + files : 'its notes') : 'its ' + files;
   }
   function prepAddBtn(p, d) {
-    return '<button type="button" class="cx-btn quiet" data-mt="prep-bind" data-id="' + esc(d.id) + '"' + (p.busy ? ' disabled' : '') + '>' + (p.busy === d.id ? 'Adding…' : 'Add to this meeting') + '</button>';
+    return '<button type="button" class="cx-btn quiet" data-mt="prep-bind" data-id="' + esc(d.id) + '"' + (p.busy ? ' disabled' : '') + '>' + (p.busy === d.id ? 'Adding…' : prepPendingBind(d, p.sid) ? 'Retry add prep' : 'Add to this meeting') + '</button>';
   }
   function prepQuiet(text, warn) { return '<div class="mt-prepline" role="status"><span class="mt-prepline-text' + (warn ? ' mt-amber' : '') + '">' + esc(text) + '</span></div>'; }
   function livePrepHtml() {
@@ -2402,14 +2408,14 @@
     else if (!p.drafts.length) html = prepQuiet('No prep for this meeting. Make one from a Prep me card in COS chat.');
     else if (p.drafts.length === 1) {
       var d = p.drafts[0], title = cleanTitle(d.title) || 'this meeting';
-      var text = p.note || 'Prep for ' + title + (p.changed === d.id ? ' changed since it was offered: add ' : ' is ready: add ') + prepWhat(d) + ' to this meeting';
+      var text = p.note || (prepPendingBind(d, p.sid) ? 'Finish adding the saved prep for ' + title + '. Later edits are not included.' : 'Prep for ' + title + (p.changed === d.id ? ' changed since it was offered: add ' : ' is ready: add ') + prepWhat(d) + ' to this meeting');
       html = '<div class="mt-prepline"><span class="mt-prepline-text' + (p.note ? ' mt-amber' : '') + '" title="' + esc(text) + '">' + esc(text) + '</span>' + prepAddBtn(p, d) + '</div>';
     } else {
       // Several: the person picks. Each row says what it adds; the list scrolls inside the same box.
       html = '<div class="mt-prepline list"><ul class="mt-preplist" aria-label="' + esc(p.drafts.length + ' preps are ready for this meeting') + '">' +
         (p.note ? '<li class="mt-prepnote"><span class="mt-prepline-text mt-amber">' + esc(p.note) + '</span></li>' : '') +
         p.drafts.map(function (d) {
-          var label = (cleanTitle(d.title) || 'Prep') + (p.changed === d.id ? ' (changed)' : '') + ': ' + prepWhat(d).replace(/^its /, '');
+          var label = (cleanTitle(d.title) || 'Prep') + (prepPendingBind(d, p.sid) ? ': finish adding the saved prep. Later edits are not included.' : (p.changed === d.id ? ' (changed)' : '') + ': ' + prepWhat(d).replace(/^its /, ''));
           return '<li><span class="mt-prepline-text" title="' + esc(label) + '">' + esc(label) + '</span>' + prepAddBtn(p, d) + '</li>';
         }).join('') + '</ul></div>';
     }
@@ -2432,16 +2438,21 @@
   // v1.1: the bind names the revision the offer described ({revision, sessionId, serverInstanceId, surface}), so a newer
   // version nobody has seen is never attached. The server id is the newest one read: capabilities.prep or the most
   // recent Prep answer (W.cosChat.prepInstance), else Meeting Ask's, which is the same id.
-  function bindOnce(sid, d) {
+  function bindOnce(sid, d, retry) {
     var cc = W.cosChat, known = cc && typeof cc.prepInstance === 'function' ? cc.prepInstance() : '';
     return (known ? Promise.resolve(known) : loadConfig().then(function (conf) { return conf && conf.serverInstanceId; })).then(function (inst) {
       if (!inst) throw new Error(S.conf.notice || 'Meeting assistance is not available on this server.');
       // Amendment 19: the header is what authorizes the write; the body carries the same id.
-      return answer('/api/prep/drafts/' + encodeURIComponent(d.id) + '/bind', { method: 'POST', headers: { 'X-COS-Expected-Server-Instance': inst }, body: { revision: d.revision, sessionId: sid, serverInstanceId: inst, surface: 'web' } });
+      return answer('/api/prep/drafts/' + encodeURIComponent(d.id) + '/bind', { method: 'POST', headers: { 'X-COS-Expected-Server-Instance': inst }, body: { revision: retry ? retry.revision : d.revision, sessionId: sid, serverInstanceId: inst, surface: 'web' } });
     }).then(function (a) {
       var b = a.body || {}, code = typeof b.error === 'string' ? b.error : (b.error && b.error.code) || b.reason || '';
       if (a.status >= 200 && a.status < 300 || a.status === 409) notePrepInstance(b);
-      if (a.status >= 200 && a.status < 300) return b;
+      if (a.status >= 200 && a.status < 300) {
+        if (retry && !((b.draft && b.draft.bindings) || []).some(function (bound) {
+          return bound && bound.sessionId === sid && bound.revision === retry.revision && bound.state === 'applied' && !bound.removedAt;
+        })) throw new Error('The server has not confirmed adding this prep. Retry add prep.');
+        return b;
+      }
       // A different server than the one that offered it: the prep is read again (amendment 19) and the line says so.
       // Adding it takes another tap, against the server that answers now.
       if (a.status === 409 && code === 'server_instance_mismatch') {
@@ -2469,7 +2480,7 @@
     if (!f || !p || p.sid !== f.sid || p.busy || p.done || f.endedAt) return;
     var d = p.drafts.filter(function (x) { return x.id === id; })[0]; if (!d) return;
     p.busy = id; p.note = ''; paintLivePrep();
-    bindOnce(f.sid, d).then(function (b) {
+    bindOnce(f.sid, d, prepPendingBind(d, f.sid)).then(function (b) {
       p.busy = ''; p.done = (b && b.draft) || d;
       var a = A(f.sid);
       // The meeting's files as the bind answered them, when it answered Meeting Ask files; and read again either way.

package/server/web-control/panes/memories.css

@@ -128,7 +128,7 @@
 .mm-try { margin: 8px 0 2px; }
 .mm-tries { margin: 0; padding: 0; list-style: none; display: grid; gap: 4px; }
 .mm-tries .mm-link { font-size: 13.5px; overflow-wrap: anywhere; }
-.mm-answer { margin: 12px 0 8px; padding: 12px 14px; border-radius: 10px; background: var(--qopen); font-size: 14.5px; line-height: 1.55; overflow-wrap: anywhere; max-height: 60vh; overflow-y: auto; }
+.mm-answer { margin: 12px 0 8px; padding: 12px 14px; border-radius: 10px; background: var(--qopen); font-size: 14.5px; line-height: 1.55; overflow-wrap: anywhere; max-height: 60vh; max-height: 60dvh; overflow-y: auto; }
 .mm-answer h4 { margin: 10px 0 4px; font: 600 14.5px/1.3 var(--body); }
 .mm-answer p { margin: 0 0 8px; }
 .mm-answer ul { margin: 0 0 8px; padding-left: 1.2em; }

package/server/web-control/panes/memories.js

@@ -109,19 +109,14 @@
     // Copy stays in this browser: the same copy the rest of Control Web uses (plain-http fallback included).
     if (op === 'copy') return W.copyText(String(a.text || '')).then(function () { return {}; });
     var limit = READ_LIMIT[op] != null ? READ_LIMIT[op] : (isRead(op, a) ? 45000 : 0);
-    return W.api('/api/web-bridge/memories', { method: 'POST', body: { id: ++seq, op: op, args: a }, timeoutMs: limit }).then(null, plainNetError).then(function (r) {
+    return W.api('/api/web-bridge/memories', { method: 'POST', body: { id: ++seq, op: op, args: a }, timeoutMs: limit }).then(function (r) {
       if (r && r.ok) return r.details || {};
       var raw = (r && r.message) || 'Your Mac did not answer that.';
       var err = new Error(PLAIN[raw] || raw); err.code = raw; throw err;
     });
   }
-  // No HTTP status means the request never reached COS: the browser's own words ("Failed to fetch", "Load failed") say
-  // nothing to a person, so say what happened and what to do. A timeout already says it in plain words (W.api).
-  var UNREACHABLE = 'Could not reach COS on your Mac. Check that the Mac is awake and on Tailscale, then try again.';
-  function plainNetError(err) {
-    if (err && !err.status && err.code !== 'timeout') { var e = new Error(UNREACHABLE); e.code = 'unreachable'; throw e; }
-    throw err;
-  }
+  // A request that never reached COS is said in plain words by W.api itself (app.js, 6.99.30: code 'unreachable'),
+  // as a timeout is: nothing to translate here.
   function codeOf(e) { return String((e && (e.code || e.message)) || ''); }
 
   // ── state ────────────────────────────────────────────────

package/server/web-control/panes/questions.css

@@ -1,4 +1,4 @@
-/* COS Control Web: session questions and approvals (panes/questions.js), server 6.99.12. */
+/* COS Control Web: session questions and approvals (panes/questions.js), from server 6.99.12. */
 .sq-host { display: grid; gap: 12px; margin: 0 0 16px; }
 .sq-host[hidden] { display: none; }
 .sq-card { background: var(--panel); border: 1px solid color-mix(in srgb, var(--hot) 45%, var(--panel-border)); border-radius: 16px; padding: 14px 16px 12px; min-width: 0; }
@@ -6,7 +6,7 @@
 .sq-title { margin: 0; font: 600 16px/1.3 var(--body); color: var(--ink); overflow-wrap: anywhere; }
 .sq-secs { font: 500 12.5px/1.3 var(--body); color: var(--hot); white-space: nowrap; }
 .sq-q { border: 0; margin: 12px 0 0; padding: 0; min-width: 0; }
-.sq-q-text { padding: 0; font: 500 15px/1.4 var(--body); color: var(--ink); overflow-wrap: anywhere; }
+.sq-q-text { padding: 0; font: 700 15.5px/1.4 var(--body); color: var(--ink); overflow-wrap: anywhere; }
 .sq-q-tag { font-size: 12.5px; font-weight: 500; color: var(--tertiary); }
 .sq-fine { margin: 2px 0 0; font-size: 12.5px; color: var(--tertiary); }
 .sq-options { display: grid; gap: 2px; margin-top: 8px; }
@@ -27,6 +27,60 @@
 .sq-leave { min-height: 44px; font-size: 14px; font-weight: 500; color: var(--ink); }
 .sq-note { margin: 8px 0 0; font-size: 13px; color: var(--hot); }
 .sq-note.hidden { display: none; }
+/* 6.99.26: read like Claude Code's question in the terminal (Miles 11/07): the strip, numbered options, Other as the
+   last number, the answers to review, Submit. */
+.sq-steps { display: flex; flex-wrap: wrap; gap: 0 14px; margin: 8px 0 0; padding-bottom: 6px; border-bottom: 1px solid var(--row-border); }
+.sq-step { min-height: 36px; padding: 0; font: 500 13.5px/1.2 var(--mono); color: var(--sub); white-space: nowrap; }
+.sq-step:hover { color: var(--ink); text-decoration: underline; text-underline-offset: 3px; }
+.sq-num { flex: none; min-width: 1.6em; font: 500 14px/1.45 var(--mono); color: var(--sub); }
+.sq-option-other { align-items: center; cursor: text; }
+.sq-option-other .sq-other { flex: 1; width: auto; min-width: 0; margin-top: 0; }
+.sq-review { margin: 14px 0 0; padding: 10px 12px; border-radius: 10px; background: var(--qopen); }
+.sq-review-head { margin: 0 0 4px; font: 600 13px/1.3 var(--body); color: var(--sub); }
+.sq-review-list { margin: 0; padding-left: 1.4em; display: grid; gap: 4px; font-size: 14px; line-height: 1.4; }
+.sq-review-q { font-weight: 600; color: var(--ink); margin-right: 8px; }
+.sq-review-a { color: var(--ink); overflow-wrap: anywhere; }
+.sq-review-a.empty { color: var(--tertiary); }
+/* 6.99.27 (Miles's phone test): what each question needs, and a footer that keeps the progress and the answer button
+   on screen while the card is, at every Duo size. Questions clear the top bar and the footer when scrolled to. */
+.sq-need { margin: 2px 0 0; font-size: 13px; line-height: 1.4; }
+.sq-need[data-state="todo"] { color: var(--hot); font-weight: 600; }
+.sq-need[data-state="done"] { color: var(--tertiary); }
+.sq-q { scroll-margin-top: calc(var(--topbar-h, 48px) + var(--safe-top, 0px) + 12px); scroll-margin-bottom: 150px; }
+.ta-q .sq-q { scroll-margin-top: 8px; }
+.sq-review { scroll-margin-bottom: 150px; }
+.sq-foot { position: sticky; bottom: var(--safe-bottom, 0px); z-index: 2; margin: 12px -16px -12px; padding: 10px 16px 12px; background: var(--panel);
+  border-top: 1px solid var(--row-border); border-radius: 0 0 16px 16px; }
+.sq-foot .sq-acts { margin-top: 0; }
+/* QA 6.99.27: on the page, the footer rides above whatever covers the bottom (questions.js sets --sq-kb from app.js
+   viewportFit: a keyboard, its strip, a browser's bottom bar). In Today's sheet the layer is itself the visible part of
+   the page (today-actions.js applyFit), so the footer sits at the bottom of the sheet with no gap. */
+.sq-host .sq-foot { bottom: max(var(--safe-bottom, 0px), var(--sq-kb, 0px)); }
+.ta-q .sq-foot { bottom: 0; }
+/* 6.99.30 (canary): with a keyboard up on the page (questions.js sets sq-kb-up) the footer scrolls with the card, so
+   the options it would cover stay readable. */
+.sq-host.sq-kb-up .sq-foot { position: static; }
+/* The Mac not answering: Submit, Allow and Deny wait, and say why (questions.js offline). */
+.sq-offline { margin: 8px 0 0; font-size: 13px; color: var(--sub); }
+/* 6.99.30 (canary): folded, a waiting question is one line over the pane (it filled the first screen of every pane);
+   a tap opens the cards. From 600 px the cards show as before and the line does not. */
+.sq-banner { display: none; }
+@media (max-width: 599px) {
+  .sq-host .sq-banner { display: flex; align-items: center; gap: 10px; width: 100%; min-height: 44px; padding: 10px 14px; border-radius: 14px;
+    background: var(--panel); border: 1px solid color-mix(in srgb, var(--hot) 45%, var(--panel-border)); color: var(--ink); font: 600 15px/1.3 var(--body); text-align: left; }
+  .sq-host .sq-banner-text { flex: 1; min-width: 0; }
+  .sq-host .sq-banner-act { flex: none; color: var(--accent); }
+  .sq-host .sq-cards:not(.open) { display: none; }
+}
+.sq-cards { display: grid; gap: 12px; }
+.sq-progress { margin: 0 0 8px; font: 500 13.5px/1.35 var(--body); color: var(--sub); }
+.sq-progress[data-alert] { color: var(--hot); font-weight: 600; }
+.sq-keys { display: none; margin-top: 10px; }
+@media (hover: hover) and (pointer: fine) { .sq-keys { display: block; } }
+/* 6.99.26: a question the Mac's own prompt waits on. Read-only, so it does not take the waiting colour. */
+.sq-card.sq-mac { border-color: var(--panel-border); }
+.sq-mac-q { margin: 10px 0 0; }
+.sq-mac-line { margin: 10px 0 0; font-size: 13.5px; line-height: 1.4; color: var(--sub); }
 @media (max-width: 480px) {
   .sq-acts .cx-btn { flex: 1; justify-content: center; }
 }