@gotcos/glasses-server 7.0.7 → 7.0.27

package/server/web-control/panes/today-actions.js

@@ -267,6 +267,7 @@
     if (window.requestAnimationFrame) window.requestAnimationFrame(go); else go();
   }
   function fit() {
+    if (O.open) panCheck();
     if (KB.frame || !O.open) return;
     if (!window.requestAnimationFrame) return applyFit();   // every browser with visualViewport has frames
     KB.frame = window.requestAnimationFrame(applyFit);
@@ -321,6 +322,49 @@
   // opt.from: a session opened from the pet's list ({ scroll }), which gets Back to sessions and its own history entry,
   // so the phone's Back returns to the list too (Miles's iPhone, 11/07). opt.again: the list shown again from there,
   // its entry already current.
+  // Miles 11/10 20:16 (IMG_0570): with the panel open on his Duo, the panel and the page under it moved together. Two
+  // stories fit: the page scrolled behind the panel, or the visible area panned past the layout viewport (the page
+  // drawn at 0.85). These numbers tell them apart, so nothing is fixed on a guess (lead 20:26): while the panel is open,
+  // ONE layout report per open when window.scrollY, visualViewport.pageTop or visualViewport.offsetTop first changes,
+  // with the values at open and now, the panel's top and bottom, and whether a keyboard was up. layoutCrumb adds
+  // innerHeight (ih), the visible height (vvh) and scale (vvs) itself. Numbers only, inside layoutCrumb's caps.
+  var PAN = { at: null, sent: false, fn: null };
+  function panNum(v) { return typeof v === 'number' && isFinite(v) ? Math.round(v) : null; }
+  function panOffsets() {
+    var vv = window.visualViewport;
+    return { sy: panNum(window.scrollY), pt: vv ? panNum(vv.pageTop) : null, ot: vv ? panNum(vv.offsetTop) : null,
+      sx: panNum(window.scrollX), pl: vv ? panNum(vv.pageLeft) : null, ol: vv ? panNum(vv.offsetLeft) : null };
+  }
+  function panState() {
+    var r = layer && typeof layer.getBoundingClientRect === 'function' ? layer.getBoundingClientRect() : null, o = panOffsets();
+    var rail = document.querySelector ? document.querySelector('.rail') : null, rr = rail && rail.getBoundingClientRect ? rail.getBoundingClientRect() : null;
+    o.pTop = r ? panNum(r.top) : null; o.pBot = r ? panNum(r.bottom) : null; o.pL = r ? panNum(r.left) : null; o.pR = r ? panNum(r.right) : null;
+    o.railL = rr ? panNum(rr.left) : null; o.railR = rr ? panNum(rr.right) : null;
+    return o;
+  }
+  // Runs on the window's scroll and, through fit, on every visualViewport resize and scroll while the panel is open.
+  // The panel's box is read only once something has moved, and only once per open.
+  function panCheck() {
+    // PAN.at is set only between open and close (close stops the watch before it clears O.open).
+    if (PAN.sent || !PAN.at) return;
+    var moved = panOffsets(), was = PAN.at;
+    // Up and down (sy, pt, ot) and, like split-drag, sideways (sx, pl, ol: Q1 20:44, lead 20:4x).
+    if (moved.sy === was.sy && moved.pt === was.pt && moved.ot === was.ot && moved.sx === was.sx && moved.pl === was.pl && moved.ol === was.ol) return;
+    PAN.sent = true;
+    var now = panState();
+    if (W.layoutCrumb) W.layoutCrumb('ta-pan', { kind: O.open.kind, kb: !!KB.on, sy0: was.sy, pt0: was.pt, ot0: was.ot, sy: now.sy, pt: now.pt, ot: now.ot,
+      sx0: was.sx, pl0: was.pl, ol0: was.ol, sx: now.sx, pl: now.pl, ol: now.ol,
+      pTop: now.pTop, pBot: now.pBot, pL: now.pL, pR: now.pR, railL: now.railL, railR: now.railR });
+  }
+  function panWatch(on) {
+    if (on) {
+      PAN.at = panOffsets(); PAN.sent = false; PAN.fn = panCheck;
+      window.addEventListener('scroll', panCheck, { passive: true });
+    } else if (PAN.fn) {
+      if (window.removeEventListener) window.removeEventListener('scroll', panCheck, { passive: true });
+      PAN.fn = null; PAN.at = null;
+    }
+  }
   function open(kind, key, opener, opt) {
     opt = opt || {};
     build();
@@ -334,6 +378,7 @@
     document.documentElement.classList.add('ta-open');
     var shell = $('app-shell'); if (shell) shell.setAttribute('inert', '');
     listenViewport(true); applyFit();
+    panWatch(true);
     // The entry names what is open, so a reload can open it again and Back still closes it (restore below).
     var entry = { cosTodayOverlay: 1, kind: kind, key: O.open.key };
     if (O.back) entry.from = 'pet';
@@ -390,6 +435,7 @@
   function close(how) {
     if (!O.open) return;
     stopSession();
+    panWatch(false);
     O.open = null;
     if (layer) layer.hidden = true;
     unfit();
@@ -537,6 +583,8 @@
       return open(pk === 'wait' ? 'wait' : 'run', id, O.opener, { from: { scroll: lb ? lb.scrollTop || 0 : 0 } });
     }
     if (what === 'send') return sendReply();
+    if (what === 'turnend') return sendChoice(Number(id));
+    if (what === 'approve-phone' && K.approvePhone && O.r) return K.approvePhone(phoneApprovalOptions(O.r));
     if (what === 'att-remove' || what === 'att-retry') {
       var fb = filesBox(); if (!fb) return;
       O.note = { text: '', kind: '' }; paintNote();
@@ -772,7 +820,7 @@
     }, function (err) {
       row.undoing = false;
       if (err && err.status === 404) O.loop = false;
-      row.undoNote = err && err.status === 404 ? 'Undo needs a newer COS server. Change it in Work.' : (err && err.message) || 'Undo did not go through.';
+      row.undoNote = err && err.status === 404 ? 'Undo did not go through. Change it in Work.' : (err && err.message) || 'Undo did not go through.';
       if (row.state === 'dismissed') { row.until = Date.now() + UNDO_SECONDS * 1000; expireLater(); }
     }).then(paintIntake);
   }
@@ -829,7 +877,8 @@
       paintFiles();
       // The Mac's answer about files may not be in yet: ask once, then draw the clip.
       var kit = KIT(), r0 = O.r;
-      if (kit && !kit.turnFiles()) kit.ensureCaps().then(function () { if (O.r === r0) paintFiles(); }, function () {});
+      paintPhoneOffer(r0);
+      if (kit && !kit.turnFiles()) kit.ensureCaps().then(function () { if (O.r === r0) { paintFiles(); paintPhoneOffer(r0); } }, function () {});
       // Files of a send a reload cut off go again with the same words; say so, since their chips are gone.
       if (O.r.draft && O.r.draft.restored) {
         var nf = O.r.draft.ids.length;
@@ -911,6 +960,14 @@
       '<p class="status-line" id="ta-status" role="status" aria-live="polite"></p>';
   }
 
+  // The same exact packet picker and handoff as Sessions. This does not upgrade an ordinary Send.
+  function phoneApprovalOptions(r) {
+    return { r: r, prefix: 'ta', live: function () { return O.r === r && !!O.open; },
+      status: function (text, kind) { if (O.r === r) { O.note = { text: text, kind: kind || '' }; paintNote(); } },
+      files: function () { return filesState(filesBox(r)); } };
+  }
+  function paintPhoneOffer(r) { if (K.phoneOffer) K.phoneOffer(r, phoneApprovalOptions(r)); }
+
   // ── files with a reply or a note (the COS chat's attach kit) ──
   // One box per session, kept while this tab is open, so closing and reopening the sheet keeps what was attached.
   var FILES = {};
@@ -1020,12 +1077,14 @@
       // A session waiting on you: what it waits on, its question to answer here when the Mac holds one for this page;
       // when the Mac's own prompt has it, that, read-only; else (a reply is the answer) the reply box below. No live
       // peek and no Stop: it is not at work (W4-r2).
-      html += '<p class="ta-sub">' + T.badge(O.r ? O.r.provider : 'claude') + ' <span>' + esc(O.wait ? O.wait.why : 'Waiting for you') + '</span></p>';
       var where = waitWhere();
+      html += '<p class="ta-sub">' + T.badge(O.r ? O.r.provider : 'claude') + ' <span>' + esc(waitWhy(where)) + '</span></p>';
       // W13 (QA week of 11/01-11/08): the words Today's row showed for it (its `ask`) stay here, read-only, when no card
       // draws them: the Mac line and a failed read alike. Never twice: not when the line above already says them.
       var ask = waitAsk();
       if (ask && (where === 'mac' || where === 'failed') && !O.macCount) html += '<blockquote class="ta-quote ta-mac-ask">' + esc(ask) + '</blockquote>';
+      // W1 A5: no words anywhere (a question that went straight to the Mac): say that, rather than a card with nothing in it.
+      if (!ask && where === 'mac' && !O.macCount && !askInWhy()) html += '<p class="ta-sub ta-mac-nowords">' + esc(macNoWords()) + '</p>';
       // The Mac card says it itself when there is one; say it here only when there is none.
       if (where === 'mac' && !O.macCount) html += '<p class="ta-sub ta-mac-line">' + esc(macLine()) + '</p>';
       // W13: the questions could not be read, so whether one waits here is unknown. Say so, never "at the Mac", and read again.
@@ -1033,6 +1092,7 @@
         ' <button type="button" class="link-btn" data-ta="q-retry">Retry</button></p>';
       if (where === 'answered') html += '<p class="ta-sub ta-mac-line">' + esc((W.sessionQuestions && W.sessionQuestions.answeredLine) || 'Answered. The session carries on.') + '</p>';
       if (where === 'reply') html += '<p class="ta-sub">' + esc('Answer it in a reply below, or open the session.') + '</p>';
+      if (where === 'turnend') html += turnEndHtml();
     } else if (O.row || O.r) {
       // Once the live feed speaks, the line says what it says, so the header and the peek never disagree (qa2-user N3).
       html += '<p class="ta-sub">' + T.badge(O.r ? O.r.provider : O.row.provider) + ' <span id="ta-run-state">' + esc(runWords()) + '</span></p>';
@@ -1047,7 +1107,7 @@
     box.innerHTML = html;
     // The reply box shows only where a reply can be the answer; what was typed stays in it, hidden.
     var foot = $('ta-foot');
-    if (foot && O.open.kind === 'wait') { var w = waitWhere(); foot.hidden = w === 'failed' ? !!(O.r && O.r.provider === 'claude') : w !== 'reply'; }
+    if (foot && O.open.kind === 'wait') { var w = waitWhere(); foot.hidden = w === 'failed' ? !!(O.r && O.r.provider === 'claude') : w !== 'reply' && w !== 'turnend'; }
   }
   // Where a waiting session's question is answered: 'here' (its cards in this sheet), 'answered' (on some screen just
   // now), 'mac' (a Claude session's own prompt, or a held question that went back to the Mac), or 'reply' (a Codex or
@@ -1056,6 +1116,8 @@
   // reply box stays a Codex or Cursor one.
   function waitWhere() {
     if (O.qCount) return 'here';
+    // 7.0.18: a turn that ended asking him is answered by a reply (a choice or his own words), so the reply box shows.
+    if (O.wait && O.wait.where === 'turnend') return 'turnend';
     if (O.r && W.sessionQuestions && W.sessionQuestions.answeredFor && W.sessionQuestions.answeredFor(O.r.id)) return 'answered';
     if (!O.macCount && W.sessionQuestions && W.sessionQuestions.loadState && W.sessionQuestions.loadState() === 'failed') return 'failed';
     if (O.macCount || (O.r && O.r.provider === 'claude') || (O.wait && O.wait.where === 'mac')) return 'mac';
@@ -1066,7 +1128,57 @@
     var a = O.wait && O.wait.ask ? String(O.wait.ask).trim() : '';
     return a && !(O.wait.why && String(O.wait.why).trim() === a) ? a : '';
   }
-  function macLine() { return (W.sessionQuestions && W.sessionQuestions.macLine) || "Waiting on your Mac's prompt. Answer it on the Mac (or through Screens)."; }
+  // 7.0.18: a turn that ended asking him (X1 contract v1). The question as the row has it, a button per choice, and the
+  // required honest line. A tap sends the contract's exact text through the reader's Continue (K.send); his own words
+  // in the box below are sent the same way.
+  var TURN_END_LINE = 'A choice or a reply here reaches the session as a message from COS, not typed in the session, and the session may ask you to confirm.';
+  var TURN_END_PREFIX = 'Answer sent from COS Control Web through COS, not typed in this session: ';
+  function turnEndAnswer(text) { var t = String(text || '').trim(); return TURN_END_PREFIX + (t.indexOf(TURN_END_PREFIX) === 0 ? t.slice(TURN_END_PREFIX.length).trim() : t); }
+  function turnEndHtml() {
+    var w = O.wait || {}, choices = Array.isArray(w.choices) ? w.choices : [], busy = !!(O.r && O.r.sending);
+    return (w.ask ? '<blockquote class="ta-quote ta-te-ask">' + esc(w.ask) + '</blockquote>' : '') +
+      (choices.length ? '<div class="ta-te-choices">' + choices.map(function (c, i) {
+        return '<button type="button" class="cx-btn' + (i === 0 ? ' primary' : '') + '" data-ta="turnend" data-id="' + i + '"' + (busy ? ' disabled' : '') + '>' + esc(c) + '</button>';
+      }).join('') + '</div>' : '') +
+      '<p class="ta-sub ta-te-line">' + esc(TURN_END_LINE) + '</p>';
+  }
+  /** Still waiting on this answer? The latest session list decides; a reply from anywhere clears it on the server. */
+  function turnEndStill() {
+    var nm = T.needs ? T.needs() : null, key = O.wait && O.wait.key;
+    return !!(nm && key && nm.rows.some(function (x) { return x.kind === 'session' && x.key === key && x.where === 'turnend'; }));
+  }
+  function sendChoice(i) {
+    var r = O.r, w = O.wait; if (!r || !w || r.sending) return;
+    var label = (Array.isArray(w.choices) ? w.choices : [])[i];
+    if (!label) return;
+    if (!turnEndStill()) { O.note = { text: 'Already answered on another screen, or the session moved on. Nothing was sent.', kind: '' }; paintNote(); return; }
+    r.sending = true; setSending(true); paintMeta();
+    var done = function () { r.sending = false; if (O.r === r) { setSending(false); paintMeta(); } };
+    return K.send(r, turnEndAnswer(label), {}).then(function (how) {
+      done();
+      if (O.r !== r) return;
+      if (how === 'sent') O.note = { text: 'Sent \u201c' + label + '\u201d. It reaches the session as a message from COS; it may ask you to confirm.', kind: '' };
+      else if (how === 'changed') { r.refusal = null; r.sendAnyway = null; paintVerdict(); O.note = { text: 'The session moved on before this reached it. \u201c' + label + '\u201d was not sent.', kind: 'error' }; }
+      else if (how === 'refused') O.note = { text: 'The session did not take \u201c' + label + '\u201d. Try again, or answer it on your Mac.', kind: 'error' };
+      paintNote();
+    }, function (err) {
+      done();
+      if (O.r !== r) return;
+      O.note = { text: 'Not sent: ' + (err && err.name === 'AbortError' ? 'no answer from your Mac yet. It may still land; tapping again is safe, it will not post twice.' : (err && err.message) || 'could not reach your Mac.'), kind: 'error' };
+      paintNote();
+    });
+  }
+  function macLine() { return (W.sessionQuestions && W.sessionQuestions.macLine) || "Answer this at your Mac's prompt. A message sent from here does not answer it; it waits until the question is answered at the Mac."; }
+  function macNoWords() { return (W.sessionQuestions && W.sessionQuestions.macNoWords) || "COS cannot read this question's words from here. They show at the Mac's prompt."; }
+  // W1 A5: the head line says the state once. At the Mac's prompt the line below says where; the head does not repeat it.
+  var GENERIC_WAIT = /^Waiting for (you|your answer)(\. Paused until you answer\.)?$/;
+  function waitWhy(where) {
+    var why = O.wait ? String(O.wait.why || '') : '';
+    if (!why) return 'Waiting for you';
+    return where === 'mac' && GENERIC_WAIT.test(why) ? 'Waiting for your answer' : why;
+  }
+  // The head line already carries the question's words (the server named them in the waiting line).
+  function askInWhy() { return !!(O.wait && O.wait.why && !GENERIC_WAIT.test(String(O.wait.why))); }
 
   // ═════════════ The pet's sessions ═════════════
   // The same sessions the pet's caption counts (app.js petPlay): waiting on you, running, then done today. Each row
@@ -1266,7 +1378,8 @@
       var fb = sent.length ? filesBox(r) : null, kit = KIT();
       if (fb && kit) fb.atts.filter(function (t) { return sent.indexOf(t.mediaId) >= 0; }).forEach(function (t) { kit.remove(fb, t.id); });
       var box = r === O.r ? $('ta-input') : null;
-      var left = box ? (box.value.trim() === String(text).trim() ? '' : box.value) : '';
+      // 7.0.18: his answer to a turn-end ask went with the attribution in front; the box holds his words without it.
+      var left = box ? (box.value.trim() === String(text).trim() || (box.value.trim() && turnEndAnswer(box.value) === String(text).trim()) ? '' : box.value) : '';
       if (box && !left) { box.value = ''; W.autoGrow(box); }
       keepDraft(r, left, null);
     },
@@ -1342,6 +1455,8 @@
     if (r.refusal || O.cautionAsk) { r.refusal = null; O.cautionAsk = false; paintVerdict(); }
     r.sending = true; setSending(true);
     var done = function () { r.sending = false; if (O.r === r) setSending(false); };
+    // 7.0.18: his own words in answer to a turn-end ask carry the same attribution as a choice ('Other' in the contract).
+    if (O.open && O.open.kind === 'wait' && waitWhere() === 'turnend' && turnEndStill()) text = turnEndAnswer(text);
     var sending = K.send(r, text, opts || {});
     // continueSession picks the key at once (draftFor): keep it until the Mac takes the words.
     if (r.draft) keepDraft(r, text, r.draft);

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

@@ -323,3 +323,6 @@
   .wk-detail.split-side > .split-handle { display: flex; }
 }
 @media (min-width: 1300px) { .wk-detail.split-side { grid-template-columns: minmax(0, 1fr) 22px 452px; } }
+
+/* W1 (0.5.386 parity): the empty card's one-tap New session button wraps on a folded phone instead of running off the card. */
+.wk-start-new { white-space: normal; max-width: 100%; height: auto; min-height: 40px; text-align: center; line-height: 1.3; padding-top: 8px; padding-bottom: 8px; }