@gotcos/glasses-server 7.0.7 → 7.0.18

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

@@ -32,6 +32,8 @@
     cap: null,            // capabilities.sessionQuestions, once read
     capAt: 0,
     items: [],            // pending items, oldest first
+    waiting: [],          // X1 contract: the questions live sessions wait on (held, at_mac, answered)
+    webAnswer: null,      // X1 final contract: what an answer from this page must carry right now (only with a hold switch on)
     picks: {},            // id -> [{ labels: [], other: '' }] per question
     armed: {},            // id -> 'send' | 'allow' | 'deny'
     armedAt: {},          // id -> when it was armed (COSWeb.confirmReady)
@@ -59,7 +61,12 @@
   // A nudge (a session that just went to waiting, Today coming on screen) never reads more often than this.
   var NUDGE_GAP_MS = 1000;
   // Miles's words for a question at the Mac (11/07), one place: Today's Needs you reads them from here too.
-  var MAC_LINE = "Waiting on your Mac's prompt. Answer it on the Mac (or through Screens).";
+  // W1 A5 (Miles 11/09, "there is no ability to answer the question"): said once, and honest that this page cannot answer it.
+  // Q1 M3 (X1 canary A1; lib/thread-turn-queue.ts:451): a message sent to a session held on its prompt is queued for the
+  // end of the turn. It does not answer the question, and nothing promises a way to answer it here.
+  var MAC_LINE = "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.";
+  // A question that went straight to the Mac's prompt: no route carries its words (the hook keeps none), so say so.
+  var MAC_NO_WORDS = "COS cannot read this question's words from here. They show at the Mac's prompt.";
   var ANSWERED_LINE = 'Answered. The session carries on.';
   var ANSWERED_MS = 120000;
 
@@ -176,7 +183,7 @@
           // the sheets still hear that the failure is over.
           var was = Q.load;
           Q.load = 'ok';
-          take(Array.isArray(d.items) ? d.items : [], Array.isArray(d.settled) ? d.settled : []);
+          take(Array.isArray(d.items) ? d.items : [], Array.isArray(d.settled) ? d.settled : [], Array.isArray(d.waiting) ? d.waiting : null, d.webAnswer);
           if (was !== 'ok') tellMounts();
           var every = Number(d.pollIntervalMs) > 0 ? Number(d.pollIntervalMs) : DEFAULT_POLL_MS;
           schedule(nextWait(every));
@@ -207,7 +214,28 @@
   function stop() { clearTimeout(Q.timer); }
 
   // ── state from a poll ─────────────────────────────────
-  function take(items, settled) {
+  // ── X1 contract v1 (COORD 2026-11-09 21:35): `waiting[]`, every AskUserQuestion a live Claude session waits on that the
+  // server saw asked: state held (a COS surface can answer it now), at_mac (only the Mac's own prompt can) or answered
+  // (kept 120 s). Words only in memory, as on the server. Keyed by `<sessionId>:<toolUseId>`, never by session alone.
+  var WAITING_STATES = { held: 1, at_mac: 1, answered: 1 };
+  function waitingEntry(w) {
+    if (!w || typeof w.key !== 'string' || !WAITING_STATES[w.state] || typeof w.sessionId !== 'string') return null;
+    var qs = (Array.isArray(w.questions) ? w.questions : []).slice(0, 4).map(function (q) {
+      return { question: String((q && q.question) || ''), header: String((q && q.header) || ''), multiSelect: !!(q && q.multiSelect),
+        options: (q && Array.isArray(q.options) ? q.options : []).slice(0, 8).map(function (o) { return { label: String((o && o.label) || ''), description: String((o && o.description) || '') }; }) };
+    }).filter(function (q) { return q.question; });
+    return { key: w.key, sessionId: w.sessionId.toLowerCase(), provider: 'claude', toolUseId: typeof w.toolUseId === 'string' ? w.toolUseId : null, state: w.state,
+      answerable: w.answerable === true && w.state === 'held', heldId: typeof w.heldId === 'string' && /^pq_[a-f0-9]{24}$/.test(w.heldId) ? w.heldId : null,
+      questions: qs, askedAt: Date.parse(w.askedAt) || 0, answeredAt: Date.parse(w.answeredAt) || 0 };
+  }
+  function take(items, settled, waiting, webAnswer) {
+    // An older server sends no `waiting`: keep the last list only for a moment's read, never invent one.
+    Q.waiting = Array.isArray(waiting) ? waiting.map(waitingEntry).filter(Boolean) : [];
+    // X1 final contract (`webAnswer`, sent with `waiting` while a hold switch is on): { touchRequired, touchMaxMs,
+    // confirmApprovals }. Absent: the page learns any rule from a refusal, as before.
+    Q.webAnswer = webAnswer && typeof webAnswer === 'object'
+      ? { touchRequired: webAnswer.touchRequired === true, touchMaxMs: Number(webAnswer.touchMaxMs) > 0 ? Number(webAnswer.touchMaxMs) : 60000, confirmApprovals: webAnswer.confirmApprovals === true }
+      : null;
     var pending = items.filter(function (i) { return i && i.answerable !== false && (i.kind === 'question' || i.kind === 'approval'); });
     var atMac = (settled || []).filter(function (i) { return i && i.waitingAtMac === true && (i.kind === 'question' || i.kind === 'approval'); });
     var before = Q.items.map(function (i) { return i.id; }).join('|') + '/' + Q.atMac.map(function (i) { return i.id; }).join('|');
@@ -249,9 +277,11 @@
       return n > 0 && (q.multiSelect || n === 1);
     });
   }
+  // X1 contract: a question held for the whole wait (fullHold) is on the Mac's screen too. Both answers count; the first wins.
+  var FULL_HOLD_LINE = 'Answer here or at your Mac. The first answer counts.';
   function noteHtml(item) {
     var text = Q.notes[item.id] || '';
-    return '<p class="sq-note' + (text ? '' : ' hidden') + '" data-sq-note="' + esc(item.id) + '" role="status">' + esc(text) + '</p>';
+    return (item.fullHold === true ? '<p class="sq-fullhold">' + esc(FULL_HOLD_LINE) + '</p>' : '') + '<p class="sq-note' + (text ? '' : ' hidden') + '" data-sq-note="' + esc(item.id) + '" role="status">' + esc(text) + '</p>';
   }
   // The card reads like Claude Code's own question in the terminal (Miles 11/07): a strip naming each question, ☒ once
   // it has an answer, then ✓ Submit; each question in bold, numbered options with their descriptions under them, Other
@@ -357,11 +387,22 @@
   // A question or an approval the Mac's own prompt waits on: what it asks when this page saw it held, and where to answer.
   // No buttons: nothing here can deliver an answer to that prompt.
   function macCard(item) {
+    if (item.fromWaiting) {
+      var body0 = (item.questions || []).map(function (q) {
+        return '<p class="sq-q-text sq-mac-q">' + esc(q.question) + '</p>' + (q.options.length ? '<ul class="sq-mac-opts">' + q.options.map(function (o) {
+          return '<li>' + esc(o.label) + (o.description ? '<span class="sq-mac-desc"> ' + esc(o.description) + '</span>' : '') + '</li>';
+        }).join('') + '</ul>' : '');
+      }).join('') || '<p class="sq-mac-nowords">' + esc(MAC_NO_WORDS) + '</p>';
+      return '<article class="sq-card sq-mac" data-sq-mac="' + esc(item.id) + '" data-kind="question">' +
+        '<header class="sq-head"><h2 class="sq-title">' + esc(engine(item)) + ' has a question</h2></header>' + body0 +
+        '<p class="sq-mac-line">' + esc(MAC_LINE) + '</p></article>';
+    }
     var words = Q.seen[item.id] || { questions: [], summary: '' };
     var title = item.kind === 'approval' ? engine(item) + ' wants to use ' + (item.tool || 'a tool') : engine(item) + ' has a question';
     var body = item.kind === 'approval'
       ? (words.summary ? '<pre class="sq-command">' + esc(words.summary) + '</pre>' : '')
       : words.questions.map(function (q) { return '<p class="sq-q-text sq-mac-q">' + esc(q) + '</p>'; }).join('');
+    if (!body) body = '<p class="sq-mac-nowords">' + esc(MAC_NO_WORDS) + '</p>';
     return '<article class="sq-card sq-mac" data-sq-mac="' + esc(item.id) + '" data-kind="' + esc(item.kind) + '">' +
       '<header class="sq-head"><h2 class="sq-title">' + esc(title) + '</h2></header>' + body +
       '<p class="sq-mac-line">' + esc(MAC_LINE) + '</p></article>';
@@ -370,7 +411,24 @@
     // Every item names its session (the broker validates it), so no session asked for matches none: the top of every
     // pane never draws a Mac card.
     var want = String(sessionId || '').toLowerCase();
-    return Q.atMac.filter(function (i) { return String(i.sessionId || '').toLowerCase() === want; });
+    // X1 contract: a question at the Mac's own prompt that this server saw asked has its words in `waiting`. One card per
+    // question, matched by tool_use_id: a held item that went back to the Mac and the waiting entry are the same question.
+    var waits = Q.waiting.filter(function (w) { return w.sessionId === want && w.state === 'at_mac'; });
+    var cards = waits.map(function (w) {
+      return { id: 'w:' + w.key, kind: 'question', sessionId: w.sessionId, provider: 'claude', toolUseId: w.toolUseId, fromWaiting: true, questions: w.questions };
+    });
+    var ids = {}; waits.forEach(function (w) { if (w.toolUseId) ids[w.toolUseId] = 1; });
+    var settled = Q.atMac.filter(function (i) {
+      if (String(i.sessionId || '').toLowerCase() !== want) return false;
+      if (i.toolUseId) return !ids[i.toolUseId];
+      // An older server gives a settled item no tool_use_id: show it only when no waiting entry speaks for the session.
+      return !waits.length;
+    });
+    return settled.concat(cards);
+  }
+  function waitingFor(sessionId) {
+    var want = String(sessionId || '').toLowerCase();
+    return Q.waiting.filter(function (w) { return w.sessionId === want; });
   }
   // True when this session's newest event here is an answer (from this page or any other screen) of the last two
   // minutes, with nothing held for it now and nothing at the Mac since.
@@ -380,6 +438,12 @@
     var at = 0, macAt = 0;
     Object.keys(Q.answered).forEach(function (id) { var a = Q.answered[id]; if (a.sessionId === want && Date.now() - a.at <= ANSWERED_MS) at = Math.max(at, a.at); });
     atMacFor(want).forEach(function (i) { macAt = Math.max(macAt, Date.parse(i.settledAt) || Date.parse(i.createdAt) || 0); });
+    // X1 contract: answered anywhere (the Mac's prompt or a COS surface) in the last 120 s, newer than any question still open.
+    Q.waiting.forEach(function (w) {
+      if (w.sessionId !== want) return;
+      if (w.state === 'answered' && Date.now() - w.answeredAt <= ANSWERED_MS) at = Math.max(at, w.answeredAt);
+      else if (w.state !== 'answered') macAt = Math.max(macAt, w.askedAt || Date.now());
+    });
     return at > 0 && at >= macAt;
   }
   function wordsOf(id) { var w = Q.seen[id]; return w ? { questions: w.questions.slice(), summary: w.summary } : null; }
@@ -458,10 +522,32 @@
 
   // ── answering ─────────────────────────────────────────
   var REFUSED = {
-    already_answered: 'Already answered, on the glasses or the Mac.', expired: 'Too late: the Mac took this back.',
-    handed_to_desk: 'The Mac has this one now. Answer it there.', hook_gone: 'The session stopped waiting for this answer.',
-    not_found: 'This question is gone.', invalid_answer: 'That answer was not accepted. Check each question has a choice.'
+    // Q1 (D4 card review M2, same server): already_answered is another COS device (a lens, the phone, Control or a browser);
+    // an answer at the Mac comes back as handed_to_desk with reason retracted (RETRACTED_LINE).
+    already_answered: 'Already answered on another device.', expired: 'This question timed out here. Answer it at the Mac.',
+    handed_to_desk: 'Left for the Mac. Answer it there.', hook_gone: 'This question is no longer waiting.',
+    not_found: 'This question is gone.', invalid_answer: 'That answer was not accepted. Check each question has a choice.',
+    // X1 contract, web door with a full-hold flag on: none of these settle the card; the person taps again.
+    web_touch_required: 'Not sent: tap anywhere on this page, then answer again.',
+    // X1 final contract (Q1 O1): held, but not on your devices yet (the Mac has not been idle long enough). Not settled.
+    not_shown: 'Not sent: this question is not on your devices yet. Answer it at the Mac, or try again in a minute.',
+    confirm_required: 'Not sent: tap again to confirm.', confirm_invalid: 'Not sent: that confirmation ran out. Tap again to confirm.'
   };
+  var RETRACTED_LINE = 'Already answered at the Mac, or the session moved on.';
+  // The page's api() reads a body's `reason` before its `error` (other panes rely on that), so a refusal such as
+  // {error: 'handed_to_desk', reason: 'retracted'} or {error: 'invalid_answer', reason: 'client_answer_id'} arrives with the
+  // reason as its code and the error word as its message. Put the server's error word back as the code, the reason beside it.
+  function refusal(err) {
+    if (!err || err.status == null) return err;
+    var word = typeof err.message === 'string' ? err.message : '';
+    if (!REFUSED[err.code] && REFUSED[word]) { err.reason = err.code; err.code = word; }
+    return err;
+  }
+  function refusedLine(err) {
+    if (err && err.code === 'handed_to_desk' && err.reason === 'retracted') return RETRACTED_LINE;
+    return err ? REFUSED[err.code] : '';
+  }
+  var KEEPS_CARD = { invalid_answer: 1, web_touch_required: 1, confirm_required: 1, confirm_invalid: 1, not_shown: 1 };
   // QA round 1: an answer that never reached the server (no HTTP status: offline, a dropped link, a timeout) says so in
   // plain words, with the button to tap; the retry goes under the same clientAnswerId, so the server replays it.
   function unreachable(item, what) {
@@ -477,10 +563,37 @@
     changed();
     if (W.today && W.today.refresh) { try { W.today.refresh(); } catch (_e) {} }
   }
+  // X1 contract: the web door sends how long ago this page was last touched (the tap that sent it counts). An older server
+  // or a flags-off server ignores the field.
+  function withTouch(body) {
+    var age = presenceAge();
+    if (age !== null) body.presenceAgeMs = age;
+    return body;
+  }
+  function confirmThen(id, body, doneLine) {
+    Q.sending[id] = 1; render();
+    var c = withTouch({ decision: body.decision });
+    api('/api/session-questions/' + encodeURIComponent(id) + '/confirm', { method: 'POST', body: c, timeoutMs: 20000 }).then(function (d) {
+      if (!d || typeof d.confirmId !== 'string' || !/^pc_[a-f0-9]{24}$/.test(d.confirmId)) throw Object.assign(new Error('confirm'), { status: 403, code: 'confirm_invalid' });
+      body.confirmId = d.confirmId;
+      post(id, body, doneLine);
+    }, function (err) {
+      delete Q.sending[id];
+      err = refusal(err);
+      var settles = err && REFUSED[err.code] && !KEEPS_CARD[err.code];
+      if (settles) { Q.items = Q.items.filter(function (i) { return i.id !== id; }); render(); changed(); W.toast(refusedLine(err)); schedule(500); return; }
+      Q.notes[id] = refusedLine(err) || (err && err.status == null ? unreachable(itemOf(id), body.decision) : 'Not sent: ' + ((err && err.message) || 'the Mac did not answer') + ' Tap again to retry.');
+      render();
+    });
+  }
   function post(id, body, doneLine) {
+    // X1 final contract: when the server says approvals need a confirm, get it first rather than learn it from a refused
+    // answer. It still follows the person's second tap; a 403 confirm_required below stays the fallback.
+    if (body.decision && !body.confirmId && Q.webAnswer && Q.webAnswer.confirmApprovals) return confirmThen(id, body, doneLine);
     Q.sending[id] = 1; Q.armed[id] = ''; Q.notes[id] = '';
     if (!Q.answerIds[id]) Q.answerIds[id] = answerId();
     body.clientAnswerId = Q.answerIds[id];
+    withTouch(body);
     render();
     var asked = itemOf(id);
     api('/api/session-questions/' + encodeURIComponent(id) + '/answer', { method: 'POST', body: body, timeoutMs: 20000 }).then(function () {
@@ -492,16 +605,22 @@
       schedule(500);
     }, function (err) {
       delete Q.sending[id];
-      var settled = err && REFUSED[err.code] && err.code !== 'invalid_answer';
+      err = refusal(err);
+      // X1 contract: an approval the server wants confirmed gets its confirm (bound to this item and decision, 60 s, single
+      // use) and goes once more. The person already tapped twice; nothing is sent without a second tap.
+      if (err && err.status === 403 && err.code === 'confirm_required' && body.decision && !body.confirmId) {
+        return confirmThen(id, body, doneLine);
+      }
+      var settled = err && REFUSED[err.code] && !KEEPS_CARD[err.code];
       if (settled) {
         if (err.code === 'already_answered') noteAnswered(asked, id);
         Q.items = Q.items.filter(function (i) { return i.id !== id; });
         render();
         if (err.code === 'already_answered') answeredTold(); else changed();
-        W.toast(REFUSED[err.code]); schedule(500); return;
+        W.toast(refusedLine(err)); schedule(500); return;
       }
       // A timeout or a lost answer: the same clientAnswerId goes again on the next tap and the server replays it.
-      Q.notes[id] = REFUSED[err && err.code] || (err && err.status == null ? unreachable(asked, body.decision || 'send')
+      Q.notes[id] = refusedLine(err) || (err && err.status == null ? unreachable(asked, body.decision || 'send')
         : 'Not sent: ' + ((err && err.message) || 'the Mac did not answer') + ' Tap again to retry.');
       render();
     });
@@ -566,11 +685,13 @@
       Q.armed[id] = '';
       if (!Q.answerIds[id]) Q.answerIds[id] = answerId();
       Q.sending[id] = 1; render();
-      api('/api/session-questions/' + encodeURIComponent(id) + '/answer', { method: 'POST', body: { clientAnswerId: Q.answerIds[id], handBack: true }, timeoutMs: 20000 }).then(function () {
+      api('/api/session-questions/' + encodeURIComponent(id) + '/answer', { method: 'POST', body: withTouch({ clientAnswerId: Q.answerIds[id], handBack: true }), timeoutMs: 20000 }).then(function () {
         delete Q.sending[id]; Q.items = Q.items.filter(function (i) { return i.id !== id; }); render(); W.toast('Left for the Mac.'); schedule(500);
       }, function (err) {
         delete Q.sending[id];
-        if (err && REFUSED[err.code] && err.code !== 'invalid_answer') { Q.items = Q.items.filter(function (i) { return i.id !== id; }); render(); changed(); W.toast(REFUSED[err.code]); return; }
+        err = refusal(err);
+        if (err && REFUSED[err.code] && !KEEPS_CARD[err.code]) { Q.items = Q.items.filter(function (i) { return i.id !== id; }); render(); changed(); W.toast(refusedLine(err)); return; }
+        if (err && KEEPS_CARD[err.code]) { Q.notes[id] = refusedLine(err); render(); return; }
         Q.notes[id] = err && err.status == null ? unreachable(item, 'leave') : 'Not sent: ' + ((err && err.message) || 'the Mac did not answer'); render();
       });
       return;
@@ -726,6 +847,6 @@
   if (W.onRoute) W.onRoute(function (r) { if (r && r.pane === 'today') nudge(); });
 
   W.sessionQuestions = { _state: Q, _take: take, _render: render, _presenceAge: presenceAge, _pollUrl: pollUrl, _key: onKey, _advanceMs: ADVANCE_MS, _todayPollMs: TODAY_POLL_MS, _fitKeyboard: fitKeyboard, poll: poll, nudge: nudge, mount: mount,
-    itemsFor: itemsFor, atMacFor: atMacFor, answeredFor: answeredFor, wordsOf: wordsOf, macLine: MAC_LINE, answeredLine: ANSWERED_LINE,
+    itemsFor: itemsFor, atMacFor: atMacFor, waitingFor: waitingFor, answeredFor: answeredFor, wordsOf: wordsOf, fullHoldLine: FULL_HOLD_LINE, macLine: MAC_LINE, macNoWords: MAC_NO_WORDS, answeredLine: ANSWERED_LINE,
     loadState: function () { return Q.load; }, retry: function () { nudge(); } };
 })();

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

@@ -16,7 +16,7 @@
   var CATEGORIES = [
     { id: 'general', title: 'General', summary: 'How COS Control opens, its shortcut, Today and the setup guide.', mac: ['App', 'Activity home', 'Setup guide'] },
     { id: 'ai', title: 'AI and accounts', summary: 'The AI apps COS works through, your keys and the models behind Work.', mac: ['Your AI apps', 'Local model', 'Your own key', 'Search'] },
-    { id: 'glasses', title: 'Glasses and iPhone', summary: 'Pair your glasses and phone, and how videos reach this Mac.', mac: ['Devices', 'Video uploads'] },
+    { id: 'glasses', title: 'Glasses, phone and web', summary: 'Pair your glasses and phone, and how videos reach this Mac.', mac: ['Devices', 'Video uploads'] },
     { id: 'meetings', title: 'Meetings', summary: 'Recording, the meeting assistant, live cues and your meeting library.', mac: ['Recording', 'Meeting assistant', 'Library and sync'] },
     { id: 'dictation', title: 'Dictation', summary: 'Type by voice into any Mac app: shortcuts, sounds, text and AI polish.', mac: ['Dictation', 'Microphone', 'Shortcuts', 'Sounds and audio', 'Text', 'AI polish', 'History'] },
     { id: 'voice', title: 'Transcription and voice', summary: 'The engines and models that turn speech into text on this Mac.', mac: ['Voice setup', 'Models', 'Performance'] },

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

@@ -162,6 +162,41 @@ html.ta-open #sq-host { display: none; }
 .next-actions { display: flex; flex-wrap: wrap; align-items: center; gap: 4px 18px; padding: 0 16px 14px; }
 .next-actions:empty { display: none; }
 .next-actions .btn.small { min-height: 44px; }
+/* Prep on every Next up row (Miles 11/09, app.js paintCalendarLater and nextPrepPanelHtml): a quiet Prep at the end of
+   each later row, and one small panel under the row it opens (the COS chat's field and buttons, laid flat in the card).
+   Spacing (Miles 14:15, from the 382 px render): every later row is one height, with or without Prep (the hold row
+   too), and its padding is inside that height, so the Prep link never makes a row taller. The open row and its panel
+   read as ONE block: no rules, the panel attached under its row, and the space under the block equals the space
+   between rows. The gap after Prep me, and the gap above "+N more today", are the same as between rows. One pitch per
+   width: --np-row is the row height, --np-gap the space the rows' own height leaves above and below a line of text,
+   --np-after the space under a button row (a button's box is 2 px taller than its line), measured equal to the row gap. */
+#next-card { --np-row: 36px; --np-gap: 8px; --np-after: calc(var(--np-gap) + 2px); }
+#next-card:has(.next-later:not(.hidden)) .next-actions { padding-bottom: var(--np-after); }
+.next-later .later-row { align-items: center; min-height: var(--np-row); padding: 0; }
+.next-later .later-what { flex: 1; min-width: 0; }
+.next-later .later-prep { flex: none; min-height: var(--np-row); font-size: 14px; font-weight: 500; padding: 0 2px; }
+.next-later .later-more { margin-top: 0; padding: 0; min-height: var(--np-row); }
+.next-first-prep { padding: 0 16px var(--np-after); }
+.next-first-prep.hidden { display: none; }
+.next-prep { display: grid; gap: 8px; margin: 0 0 var(--np-after); padding: 2px 0 0; }
+.next-first-prep .next-prep { margin: 0; padding: 0; }
+.next-prep .field { width: 100%; min-height: 64px; max-height: 140px; font-size: 15px; resize: none; }
+.next-prep-files { list-style: none; margin: 0; padding: 0; display: grid; gap: 2px; }
+.next-prep-files li { display: flex; align-items: center; gap: 10px; min-width: 0; font-size: 14px; }
+.next-prep-file { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--sub); }
+.next-prep-files .link-btn { min-height: 32px; font-size: 14px; font-weight: 500; }
+.next-prep-acts { display: flex; align-items: center; gap: 8px 14px; flex-wrap: wrap; }
+.next-prep-gap { flex: 1; }
+.next-prep-add { position: relative; cursor: pointer; }
+.next-prep-add:focus-within { outline: 2px solid var(--accent); outline-offset: 2px; }
+.next-prep-acts .cx-btn { height: 40px; }
+.next-prep-acts .link-btn { min-height: 40px; font-size: 14px; }
+/* Phones and short touch screens: 44 px touch rows, on the same query as app.css's 44 px floor for .cx-btn and .field,
+   so the panel's buttons and the rows change height together. */
+@media (max-width: 599px), (pointer: coarse) and (max-height: 720px) {
+  #next-card { --np-row: 44px; --np-gap: 12px; }
+  .next-prep-files .link-btn, .next-prep-acts .link-btn { min-height: 44px; }
+}
 /* The Ask sheet's File to Work inbox result, on its own row (app.js fileNoteHtml). */
 .nav-row .note.file-error { color: var(--hot); white-space: normal; }
 /* Running card when the session list could not be read (app.js renderRunning). */

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

@@ -537,6 +537,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 +774,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 +831,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 +914,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 +1031,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 +1046,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 +1061,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 +1070,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 +1082,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 +1332,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 +1409,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; }