@gotcos/glasses-server 6.99.25 → 6.99.29

package/server/web-control/index.html

@@ -40,6 +40,7 @@
     <symbol id="i-photo" viewBox="0 0 24 24"><rect x="3.5" y="5" width="17" height="14" rx="2.5"/><circle cx="9" cy="10" r="1.6"/><path d="m4 17 5-4.5 3.5 3 3-2.5 4.5 4"/></symbol>
     <symbol id="i-video" viewBox="0 0 24 24"><rect x="3.5" y="6" width="12.5" height="12" rx="2.5"/><path d="m16 10.5 4.5-2.5v8L16 13.5"/></symbol>
     <symbol id="i-doc" viewBox="0 0 24 24"><path d="M7 3.5h6.5L18 8v12a.5.5 0 0 1-.5.5h-10.5A.5.5 0 0 1 6.5 20V4a.5.5 0 0 1 .5-.5z"/><path d="M13.5 3.5V8H18M9 12.5h6M9 15.5h6"/></symbol>
+    <symbol id="i-camera" viewBox="0 0 24 24"><path d="M4.5 8h3l1.6-2.2h5.8L16.5 8h3a1.5 1.5 0 0 1 1.5 1.5v8A1.5 1.5 0 0 1 19.5 19h-15A1.5 1.5 0 0 1 3 17.5v-8A1.5 1.5 0 0 1 4.5 8z"/><circle cx="12" cy="13.2" r="3.4"/></symbol>
     <symbol id="i-clip" viewBox="0 0 24 24"><path d="m15.5 7.5-6.8 6.8a1.8 1.8 0 0 0 2.5 2.5l7.3-7.3a3.5 3.5 0 0 0-5-5l-7.6 7.6a5.2 5.2 0 0 0 7.4 7.4l5.7-5.7"/></symbol>
     <symbol id="i-messages" viewBox="0 0 24 24"><path d="M4 7a2.5 2.5 0 0 1 2.5-2.5h11A2.5 2.5 0 0 1 20 7v7a2.5 2.5 0 0 1-2.5 2.5H10L5.5 20v-3.6A2.5 2.5 0 0 1 4 14z"/></symbol>
     <symbol id="i-usage" viewBox="0 0 24 24"><path d="M4 20h16M7 16v-4M12 16V7M17 16v-7"/></symbol>
@@ -253,8 +254,10 @@
       <div class="sheet-grip"></div>
       <form class="sheet-head" id="ask-form">
         <input id="ask-q" class="field" type="search" placeholder="Ask COS or find a session" autocomplete="off" enterkeyhint="go">
+        <span id="ask-clip" class="ask-clip"></span>
         <button type="button" class="link-btn" id="ask-close">Cancel</button>
       </form>
+      <div id="ask-files" class="cc-chips ask-files hidden" aria-live="polite"></div>
       <div id="ask-results"></div>
     </div>
   </div>
@@ -276,7 +279,8 @@
     "dictation": "/control/panes/dictation.js",
     "settings": "/control/panes/settings.js",
     "memories": "/control/panes/memories.js",
-    "todayActions": "/control/panes/today-actions.js"
+    "todayActions": "/control/panes/today-actions.js",
+    "readerMedia": "/control/panes/reader-media.js"
   }</script>
   <!-- The Knowledge graph explorer, loaded by panes/memories.js when the graph first opens. -->
   <script type="application/json" id="memories-graph-assets">{

package/server/web-control/panes/cos-chat.css

@@ -198,3 +198,21 @@
 .cc-prep.dragging .cc-prep-panel { outline: 2px dashed var(--accent); outline-offset: 4px; }
 .cc-prep { scroll-margin-top: calc(64px + var(--safe-top, 0px)); }
 @media (min-width: 860px) { .msg-right .cc-prep { padding: 10px 16px 0; max-height: 55%; overflow-y: auto; flex: none; } }
+
+/* The Ask sheet's files (11/07, app.js askFiles): the attach kit's chips and clip beside the Ask box. */
+.sheet-head .cc-attach { flex: none; height: 44px; border-radius: 12px; }
+.ask-clip:empty { display: none; }
+.ask-files { margin-top: 10px; }
+.ask-files .ask-files-note { flex-basis: 100%; margin: 0 2px; font-size: 13px; line-height: 1.35; color: var(--sub); }
+#ask-sheet .sheet.dragging { outline: 2px dashed var(--accent); outline-offset: -6px; }
+
+/* 6.99.27: a session's reply box with files (app.js paintReaderFiles, panes/today-actions.js): the kit's chips on a row of
+   their own above the words, Take photo and the clip beside Fork and Send, and the limits in plain words under the chips. */
+.att-composer { flex-wrap: wrap; }
+.att-composer .att-files { flex: 1 1 100%; padding: 2px 0 4px; }
+.att-composer .att-files.hidden { display: none; }
+.att-clip, .ta-clip { display: inline-flex; gap: 6px; }
+.att-clip:empty { display: none; }
+.att-clip .cc-attach { height: 38px; width: 42px; border-radius: var(--radius-sm); }
+.att-composer.dragging { outline: 2px dashed var(--accent); outline-offset: 4px; }
+.cc-chips .att-limit { flex-basis: 100%; margin: 0 2px; font-size: 12.5px; line-height: 1.35; color: var(--sub); }

package/server/web-control/panes/cos-chat.js

@@ -107,7 +107,12 @@
       steer: !!(C.caps && C.caps.steer),
       thread: !!(drop && drop.enabled === true && drop.thread && drop.thread.protocol === 1),
       // 6.99.19: Prep (capabilities.prep, protocol 1). Absent on an older server: "Prep me" stays a plain Ask.
-      prep: prepCapsOf(caps.prep)
+      prep: prepCapsOf(caps.prep),
+      // 11/07: how many files a session turn takes (threadTurnAttachments). 0 (an older server): words only, and Today's
+      // reply box shows no clip, so a file can never be dropped from a turn in silence.
+      turnFiles: h && Number.isInteger(h.threadTurnAttachments) && h.threadTurnAttachments > 0 ? Math.min(h.threadTurnAttachments, MAX_ATTS) : 0,
+      // 6.99.27: any file for a session turn, up to this many bytes (threadTurnFileBytes). 0: the chat's list only.
+      turnFileBytes: h && Number.isInteger(h.threadTurnFileBytes) && h.threadTurnFileBytes > 0 ? Math.min(h.threadTurnFileBytes, MAX_DOC) : 0
     };
     if (next.prep && next.prep.serverInstanceId) PREP_INST = next.prep.serverInstanceId;
     var changed = !C.caps || C.caps.dropIt !== next.dropIt || C.caps.jobs !== next.jobs || C.caps.thread !== next.thread;
@@ -276,8 +281,7 @@
       '<div class="cc-chips hidden" data-cos-chips></div>' +
       '<textarea class="field cc-input" id="' + esc(k.inputId) + '" rows="1" maxlength="2000" placeholder="' + esc(o.placeholder) + '" aria-label="' + esc(o.label) + '"></textarea>' +
       '<div class="cc-buttons">' +
-        '<label class="cx-btn cc-attach" title="Attach photos or files"><svg class="icon" aria-hidden="true"><use href="#i-clip"/></svg><span class="sr-only">Attach photos or files</span>' +
-          '<input type="file" class="cc-file" multiple accept="' + ACCEPT + '" data-cos-file aria-label="Attach photos or files"></label>' +
+        cameraHtml('data-cos-file') + clipHtml('data-cos-file') +
         '<button type="button" class="cx-btn primary cc-ask" data-cos="ask">Ask</button>' +
         (drop ? '<button type="button" class="cx-btn cc-drop" data-cos="drop">Drop</button>' : '') + '</div>' +
       '<div class="cc-foot"><span class="cc-menus" data-cos-model-slot>' + (C.models ? modelMenuHtml() : '') + '</span>' +
@@ -549,11 +553,19 @@
     var ua = (window.navigator && window.navigator.userAgent) || '';
     return /safari/i.test(ua) && !/chrome|chromium|crios|fxios|edg|android|opr/i.test(ua);
   }
+  // QA 6.99.27 (User 3): every browser on an iPhone or iPad is WebKit and decodes HEIC, including the Home Screen web
+  // app, whose user agent has no "Safari" in it. iPadOS asks for the desktop site by default, so it reads as a Mac
+  // with a touch screen.
+  function appleMobile() {
+    var nav = window.navigator || {}, ua = nav.userAgent || '';
+    return /iPhone|iPad|iPod/.test(ua) || (/Macintosh/.test(ua) && Number(nav.maxTouchPoints) > 1);
+  }
+  function heicReadable() { return isSafari() || appleMobile(); }
   /** What a file is to COS: 'photo', 'doc' or 'video', with a refusal sentence when it cannot be attached. */
   function classify(file) {
     var type = String(file.type || '').toLowerCase(), ext = extOf(file.name);
     var heic = /^image\/hei[cf]/.test(type) || ext === 'heic' || ext === 'heif';
-    if (heic && !isSafari()) return { refuse: file.name + ' is a HEIC photo, which only Safari can read here. Attach it from Safari, or save it as a JPEG first.' };
+    if (heic && !heicReadable()) return { refuse: file.name + ' is a HEIC photo, which only Safari can read here. Attach it from Safari, or save it as a JPEG first.' };
     if (/^image\//.test(type) || PHOTO_EXT[ext]) return { kind: 'photo' };
     if (/^video\//.test(type) || VIDEO_EXT[ext]) {
       if (!VIDEO_EXT[ext] && type !== 'video/mp4' && type !== 'video/quicktime') return { refuse: file.name + ' is a video COS cannot read. Use MP4 or MOV.' };
@@ -566,19 +578,80 @@
     }
     return { refuse: file.name + ' cannot be attached. COS takes photos, PDF, TXT, MD, CSV, JSON, XLSX, MP4 and MOV.' };
   }
-  function addFiles(k, files) {
+  // ── the attach kit (11/07: "attach files and images from the dashboard view as well") ──
+  // The clip, the chips, the limits and the upload above, for any place that sends files with words: the chat's own
+  // composers, Today's reply and note boxes (panes/today-actions.js) and the Ask sheet (app.js). One copy, used by all.
+  // A box is { atts: [], signedOut: false, ui } (W.cosChat.attach.box): ui.changed(box) repaints after any change, ui.removed(box) runs after a
+  // Remove, ui.signedOut(box) says the browser was signed out mid-upload. Progress moves only the chip's own bar
+  // (paintProgress, by the chip's id). Nothing here sends: each caller sends the ready ids its own way, and only once
+  // pending() and failed() are both false.
+  // opts.any (a session turn): no accept list, so any file, and the label says the limits.
+  function clipHtml(fileAttr, opts) {
+    var any = !!(opts && opts.any);
+    var label = any ? 'Attach photos or files, up to 5, ' + mb(opts.any) + ' each' : 'Attach photos or files';
+    return '<label class="cx-btn cc-attach" title="' + esc(label) + '"><svg class="icon" aria-hidden="true"><use href="#i-clip"/></svg><span class="sr-only">' + esc(label) + '</span>' +
+      // No capture attribute: iOS then offers Photo Library, Take Photo and Choose File.
+      '<input type="file" class="cc-file" multiple' + (any ? '' : ' accept="' + ACCEPT + '"') + ' ' + fileAttr + ' aria-label="' + esc(label) + '"></label>';
+  }
+  // 6.99.27 (Miles: "take picture"): the camera itself, one tap. On a phone or tablet only: a desktop browser ignores
+  // `capture` and would open a second file picker labelled Take photo.
+  function cameraOn() { return !!(window.matchMedia && window.matchMedia('(pointer: coarse)').matches); }
+  function cameraHtml(fileAttr) {
+    if (!cameraOn()) return '';
+    return '<label class="cx-btn cc-attach cc-camera" title="Take photo"><svg class="icon" aria-hidden="true"><use href="#i-camera"/></svg><span class="sr-only">Take photo</span>' +
+      '<input type="file" class="cc-file" accept="image/*" capture="environment" ' + fileAttr + ' aria-label="Take photo"></label>';
+  }
+  // The limits in plain words, under the chips of a session turn.
+  function limitLine(box) {
+    return box && box.anyBytes ? 'Up to 5 files, ' + mb(box.anyBytes) + ' each (videos up to ' + mb(MAX_VIDEO) + '). The session gets where each one is on your Mac.' : 'Up to 5 photos or files.';
+  }
+  // A composer here has no ui of its own (it is made before COMPOSER_UI below exists): it is the chat's.
+  function uiOf(box) { return box.ui || COMPOSER_UI; }
+  function boxChanged(box) { var ui = uiOf(box); if (ui.changed) ui.changed(box); }
+  /**
+   * 6.99.27: what a SESSION turn takes, which is more than the chat does. The agent gets each file's place on the Mac and
+   * opens it with its own tools, so any type goes, up to `maxBytes` (the Mac's threadTurnFileBytes, 64 MB) and up to
+   * 100 MB for an MP4 or MOV (the media store's video cap). Photos go as taken: kind 'photo' only for the chip.
+   * QA 6.99.27 (Skeptic W3): the 100 MB is only for a file whose type is video/mp4 or video/quicktime (or, with no type,
+   * whose name says so). Any other video (WebM, MKV) is a turn file on the Mac, whose cap is 64 MB, so it is refused
+   * here before the upload rather than after it.
+   */
+  function classifyForSession(file, maxBytes) {
+    var type = String(file.type || '').toLowerCase(), ext = extOf(file.name);
+    var kindOf = type || VIDEO_EXT[ext] || '';
+    var video = kindOf === 'video/mp4' || kindOf === 'video/quicktime';
+    var cap = video ? MAX_VIDEO : maxBytes;
+    if (file.size > cap) return { refuse: file.name + ' is ' + mb(file.size) + '. A session takes ' + (video ? 'a video' : 'a file') + ' up to ' + mb(cap) + '.' };
+    if (!file.size) return { refuse: file.name + ' is empty.' };
+    if (/^image\//.test(type) || PHOTO_EXT[ext]) {
+      var heic = /^image\/hei[cf]/.test(type) || ext === 'heic' || ext === 'heif';
+      return { kind: 'photo', mime: type || 'application/octet-stream', showable: !heic || heicReadable() };
+    }
+    if (video) return { kind: 'video', mime: kindOf };
+    return { kind: DOC_EXT[ext] ? 'doc' : 'file', mime: type && type !== 'application/octet-stream' ? type : DOC_EXT[ext] || 'application/octet-stream' };
+  }
+  function dropThumb(t) { if (t.raw && /^blob:/.test(t.thumb || '')) { try { URL.revokeObjectURL(t.thumb); } catch (_e) {} } }
+  function objectUrl(file) { try { return URL.createObjectURL(file); } catch (_e) { return ''; } }
+  function boxAdd(box, files) {
     var list = Array.prototype.slice.call(files || []);
-    if (!list.length) return;
     var refusals = [];
     list.forEach(function (file) {
-      if (k.atts.length >= MAX_ATTS) { refusals.push('Up to 5 attachments per message. ' + file.name + ' was not added.'); return; }
-      var c = classify(file);
+      if (box.atts.length >= MAX_ATTS) { refusals.push('Up to 5 attachments per message. ' + file.name + ' was not added.'); return; }
+      var c = box.anyBytes ? classifyForSession(file, box.anyBytes) : classify(file);
       if (c.refuse) { refusals.push(c.refuse); return; }
       var t = { id: uuid(), file: file, name: file.name || (c.kind === 'photo' ? 'Photo' : 'File'), size: file.size, kind: c.kind, mime: c.mime || '', state: 'reading', progress: 0, mediaId: '', thumb: '', error: '' };
-      k.atts.push(t);
-      startUpload(k, t);
+      // 6.99.27, a session turn: the file as it is, never resized or converted (the agent reads the original), and the
+      // upload says so, so the Mac keeps a format the media store does not read (lib/turn-file-store.ts).
+      if (box.anyBytes) { t.raw = true; t.purpose = 'session-turn'; if (c.kind === 'photo' && c.showable) t.thumb = objectUrl(file); }
+      box.atts.push(t);
+      startUpload(box, t);
     });
-    k.signedOut = false;
+    if (list.length) box.signedOut = false;
+    return refusals;
+  }
+  function addFiles(k, files) {
+    if (!files || !files.length) return;
+    var refusals = boxAdd(k, files);
     setNote(k, refusals.join(' '));
     paintChips(k); paintButtons(k);
   }
@@ -588,18 +661,21 @@
     if (t.state === 'failed') return t.error || 'Did not upload';
     return sizeLabel(t.size);
   }
-  function chipHtml(t) {
+  // attr: the click attribute the box's own handler reads ('data-cos' here, 'data-ta' on Today, 'data-action' in the
+  // Ask sheet), so a chip's Remove never reaches another box's handler.
+  function chipHtml(t, attr) {
+    attr = attr || 'data-cos';
     var icon = t.thumb ? '<img src="' + esc(t.thumb) + '" alt="">' : '<svg class="icon" aria-hidden="true"><use href="#i-' + (t.kind === 'video' ? 'video' : t.kind === 'photo' ? 'photo' : 'doc') + '"/></svg>';
     return '<div class="cc-chip ' + t.state + '" data-chip="' + t.id + '"><span class="cc-chip-thumb">' + icon + '</span>' +
       '<span class="cc-chip-text"><span class="cc-chip-name">' + esc(t.name) + '</span><span class="cc-chip-meta" data-chip-meta>' + esc(chipMeta(t)) + '</span></span>' +
-      (t.state === 'failed' ? '<button type="button" class="link-btn cc-chip-retry" data-cos="att-retry" data-att="' + t.id + '">Retry</button>' : '') +
-      '<button type="button" class="cc-chip-x" data-cos="att-remove" data-att="' + t.id + '" aria-label="Remove ' + esc(t.name) + '"><span aria-hidden="true">×</span></button>' +
+      (t.state === 'failed' ? '<button type="button" class="link-btn cc-chip-retry" ' + attr + '="att-retry" data-att="' + t.id + '">Retry</button>' : '') +
+      '<button type="button" class="cc-chip-x" ' + attr + '="att-remove" data-att="' + t.id + '" aria-label="Remove ' + esc(t.name) + '"><span aria-hidden="true">×</span></button>' +
       (t.state === 'uploading' || t.state === 'reading' ? '<span class="cc-chip-bar" data-chip-bar style="width:' + Math.round(t.progress * 100) + '%"></span>' : '') + '</div>';
   }
   function paintChips(k) {
     var form = formOf(k), box = form && form.querySelector('[data-cos-chips]');
     if (!box) return;
-    box.innerHTML = k.atts.map(chipHtml).join('');
+    box.innerHTML = k.atts.map(function (t) { return chipHtml(t); }).join('');
     box.classList.toggle('hidden', !k.atts.length);
   }
   // Progress moves the bar and the words only, never the chip row (a tap on Remove must not miss).
@@ -610,11 +686,60 @@
     var bar = chip.querySelector('[data-chip-bar]'); if (bar) bar.style.width = Math.round(t.progress * 100) + '%';
   }
   function findAtt(k, id) { for (var i = 0; i < k.atts.length; i++) if (k.atts[i].id === id) return k.atts[i]; return null; }
-  function removeAtt(k, id) {
-    k.atts = k.atts.filter(function (t) { if (t.id === id && t.xhr) { try { t.xhr.abort(); } catch (_e) {} } return t.id !== id; });
-    if (!uploadsFailed(k) && /did not upload/i.test(k.note)) setNote(k, '');
-    paintChips(k); paintButtons(k);
+  function boxRemove(box, id) {
+    box.atts = box.atts.filter(function (t) { if (t.id === id) { if (t.xhr) { try { t.xhr.abort(); } catch (_e) {} } dropThumb(t); } return t.id !== id; });
+    var ui = uiOf(box); if (ui.removed) ui.removed(box);
+    boxChanged(box);
+  }
+  function removeAtt(k, id) { boxRemove(k, id); }
+  function boxRetry(box, id) {
+    var t = findAtt(box, id);
+    if (!t) return false;
+    box.signedOut = false;
+    startUpload(box, t);
+    boxChanged(box);
+    return true;
   }
+  // QA 6.99.27: the files that went with a message leave the box. That is not a Remove, so ui.removed is not told (the
+  // reader's clears the status line, which may be telling the person about the message that just took them). Answers
+  // what left, enough to put each back as a kept chip (boxRestore) if the message does not go after all.
+  function boxTake(box, ids) {
+    var went = [];
+    box.atts = box.atts.filter(function (t) {
+      if (!t.mediaId || ids.indexOf(t.mediaId) < 0) return true;
+      went.push({ mediaId: t.mediaId, name: t.name, size: t.size, kind: t.kind, mime: t.mime, keptAt: t.keptAt || 0 });
+      dropThumb(t);
+      return false;
+    });
+    if (went.length) boxChanged(box);
+    return went;
+  }
+  // Files the Mac already keeps, back on the box as ready chips (no upload), at most five in all. Answers how many are
+  // on the box afterwards out of those asked for.
+  function boxRestore(box, files) {
+    var back = 0;
+    (files || []).forEach(function (f) {
+      if (!f || !f.mediaId) return;
+      if (box.atts.some(function (t) { return t.mediaId === f.mediaId; })) { back++; return; }
+      if (box.atts.length >= MAX_ATTS) return;
+      box.atts.push({ id: uuid(), file: null, name: f.name || 'File', size: f.size || 0, kind: f.kind || 'file', mime: f.mime || '', state: 'ready', progress: 1, mediaId: f.mediaId, thumb: '', error: '', keptAt: f.keptAt || 0 });
+      back++;
+    });
+    if (back) boxChanged(box);
+    return back;
+  }
+  // Everything goes, an upload still running included (its request is stopped, and its late answer finds no record).
+  function boxClear(box) {
+    box.atts.forEach(function (t) { if (t.xhr) { try { t.xhr.abort(); } catch (_e) {} } dropThumb(t); });
+    box.atts = [];
+    boxChanged(box);
+  }
+  // The chat's composers, as boxes.
+  var COMPOSER_UI = {
+    changed: function (k) { paintChips(k); paintButtons(k); },
+    removed: function (k) { if (!uploadsFailed(k) && /did not upload/i.test(k.note)) setNote(k, ''); },
+    signedOut: function (k) { setNote(k, 'This browser was signed out. Your message and files are kept. Sign in, then tap Retry on each file.'); }
+  };
   /** A photo, drawn into a canvas at most 1024 px on its longest edge, as a JPEG at quality 0.85. */
   function resizePhoto(file) {
     return new Promise(function (resolve, reject) {
@@ -640,46 +765,82 @@
    * with credentials 'same-origin' (the cookie goes with any same-origin XHR) plus X-COS-Web: 1, which a cookie write
    * needs. A 401 here never opens the sign-in screen: the chip says so and the message stays (see uploadError).
    */
-  function uploadRequest(path, body, headers, onProgress, t) {
+  // extra: more headers (6.99.27: X-COS-Purpose for a session turn's file).
+  // QA 6.99.27 (User 8): an upload that makes no progress for a minute stops and says so, and one that stopped while
+  // the page was hidden (the phone locked, the browser in the background) says that, never that the Mac did not answer.
+  var UPLOAD_STALL_MS = 60000;
+  function uploadRequest(path, body, headers, onProgress, t, extra) {
     return new Promise(function (resolve, reject) {
       var xhr = new XMLHttpRequest();
       t.xhr = xhr;
+      var stall = null, stalled = false, wasHidden = !!document.hidden;
+      var onVisibility = function () { if (document.hidden) wasHidden = true; };
+      var watch = function () { clearTimeout(stall); stall = setTimeout(function () { stalled = true; try { xhr.abort(); } catch (_e) {} }, UPLOAD_STALL_MS); };
+      var settle = function () {
+        clearTimeout(stall); stall = null; t.xhr = null;
+        if (document.removeEventListener) document.removeEventListener('visibilitychange', onVisibility);
+      };
+      // The bytes are all sent: the Mac is reading the file, which is not a stall.
+      var sent = function () { clearTimeout(stall); stall = null; };
+      var stopped = function () {
+        var err = wasHidden || document.hidden ? new Error('The upload stopped while the phone was locked. Retry it.') : new Error('The upload stopped. Nothing moved for a minute. Retry it.');
+        err.code = wasHidden || document.hidden ? 'upload_locked' : 'upload_stalled';
+        return err;
+      };
+      if (document.addEventListener) document.addEventListener('visibilitychange', onVisibility);
       xhr.open('POST', path, true);
       xhr.setRequestHeader('X-COS-Web', '1');
       Object.keys(headers).forEach(function (h) { xhr.setRequestHeader(h, headers[h]); });
-      if (xhr.upload) xhr.upload.onprogress = function (e) { if (e.lengthComputable && e.total) onProgress(e.loaded / e.total); };
+      if (extra) Object.keys(extra).forEach(function (h) { xhr.setRequestHeader(h, extra[h]); });
+      if (xhr.upload) {
+        xhr.upload.onprogress = function (e) {
+          if (e.lengthComputable && e.total) { onProgress(e.loaded / e.total); if (e.loaded >= e.total) { sent(); return; } }
+          watch();
+        };
+        xhr.upload.onload = sent;
+      }
       xhr.onload = function () {
-        t.xhr = null;
+        settle();
         var data = {}; try { data = JSON.parse(xhr.responseText || '{}'); } catch (_e) { data = {}; }
         if (xhr.status >= 200 && xhr.status < 300) return resolve(data);
         var err = new Error('The Mac answered ' + xhr.status + '.'); err.status = xhr.status;
         err.code = data && (typeof data.error === 'string' ? data.error : data.error && data.error.code) || '';
         reject(err);
       };
-      xhr.onerror = function () { t.xhr = null; var err = new Error('The Mac did not answer.'); err.code = 'network'; reject(err); };
-      xhr.onabort = function () { t.xhr = null; var err = new Error('Removed.'); err.code = 'aborted'; reject(err); };
+      xhr.onerror = function () {
+        settle();
+        if (wasHidden || document.hidden) return reject(stopped());
+        var err = new Error('The Mac did not answer.'); err.code = 'network'; reject(err);
+      };
+      xhr.onabort = function () {
+        settle();
+        if (stalled) return reject(stopped());
+        var err = new Error('Removed.'); err.code = 'aborted'; reject(err);
+      };
       xhr.send(body);
+      watch();
     });
   }
   var UPLOAD_COPY = {
     batch_too_large: 'Too large for one upload.', too_many_images: 'Up to 5 attachments per message.',
     media_processing_unavailable: 'The Mac cannot read photos right now.', unsupported_kind: 'COS cannot read this kind of file.',
     unsupported_media_type: 'COS cannot read this kind of file.', file_too_large: 'Too large for COS.', attachment_too_large: 'Too large for COS.',
-    server_maintenance: 'The Mac is updating. Retry in a minute.', network: 'The Mac did not answer. Retry when it is awake.'
+    server_maintenance: 'The Mac is updating. Retry in a minute.', network: 'The Mac did not answer. Retry when it is awake.',
+    upload_locked: 'The upload stopped while the phone was locked. Retry it.', upload_stalled: 'The upload stopped. Nothing moved for a minute. Retry it.'
   };
-  function uploadError(k, t, err) {
+  function uploadError(box, t, err) {
     if (err && err.code === 'aborted') return;
     t.state = 'failed';
     if (err && err.status === 401) {
       // Signed out mid-message (the browser session expired or every browser was signed out). Nothing is thrown away:
       // the words and the files stay, and Sign in again opens the sign-in screen on purpose, not by surprise.
       t.error = 'Signed out';
-      k.signedOut = true;
-      setNote(k, 'This browser was signed out. Your message and files are kept. Sign in, then tap Retry on each file.');
+      box.signedOut = true;
+      var ui = uiOf(box); if (ui.signedOut) ui.signedOut(box);
     } else {
       t.error = uploadErrorText(err);
     }
-    paintChips(k); paintButtons(k);
+    boxChanged(box);
   }
   /**
    * One file to the media store, the way every web upload goes: a photo resized to a 1024 px JPEG and posted to /api/media,
@@ -689,7 +850,7 @@
    */
   function uploadMedia(t, hooks) {
     var at = new Date(t.file.lastModified || Date.now()).toISOString();
-    if (t.kind === 'photo') {
+    if (t.kind === 'photo' && !t.raw) {
       return resizePhoto(t.file).then(function (dataUrl) {
         var data = dataUrl.slice(dataUrl.indexOf(',') + 1);
         var bytes = Math.floor(data.length * 3 / 4);
@@ -704,7 +865,7 @@
       'Content-Type': t.mime || 'application/octet-stream',
       'X-COS-Filename': encodeURIComponent(t.name),
       'X-COS-Captured-At': at
-    }, function (p) { hooks.progress(p); }, t).then(function (d) { return d && d.attachment; });
+    }, function (p) { hooks.progress(p); }, t, t.purpose ? { 'X-COS-Purpose': t.purpose } : null).then(function (d) { return d && d.attachment; });
   }
   /** The chip's words for a failed upload (never the sign-in case, which each caller says its own way). */
   function uploadErrorText(err) {
@@ -712,22 +873,22 @@
     if (err && !err.status && !err.code) return err.message || 'Did not upload';
     return UPLOAD_COPY[err && err.code] || (err && err.status === 413 ? 'Too large for COS.' : 'Did not upload');
   }
-  function startUpload(k, t) {
-    t.state = 'reading'; t.progress = 0; t.error = '';
+  function startUpload(box, t) {
+    t.state = 'reading'; t.progress = 0; t.error = ''; t.mediaId = '';
     var step = uploadMedia(t, {
-      uploading: function () { t.state = 'uploading'; paintChips(k); paintButtons(k); },
-      progress: function (p) { t.progress = p; paintProgress(k, t); }
+      uploading: function () { t.state = 'uploading'; boxChanged(box); },
+      progress: function (p) { t.progress = p; paintProgress(box, t); }
     });
     step.then(function (ref) {
-      if (!findAtt(k, t.id)) return;
+      if (!findAtt(box, t.id)) return;
       if (!ref || !ref.id) { var e = new Error('The Mac did not keep the file.'); e.code = ''; throw e; }
-      t.mediaId = ref.id; t.state = 'ready'; t.progress = 1;
-      paintChips(k); paintButtons(k);
+      t.mediaId = ref.id; t.state = 'ready'; t.progress = 1; t.keptAt = Date.now();
+      boxChanged(box);
     }).catch(function (err) {
-      if (!findAtt(k, t.id)) return;
-      if (err && err.code === 'photo_too_large') { t.state = 'failed'; t.error = uploadErrorText(err); paintChips(k); paintButtons(k); return; }
-      if (err && !err.status && !err.code) { t.state = 'failed'; t.error = uploadErrorText(err); paintChips(k); paintButtons(k); return; }
-      uploadError(k, t, err);
+      if (!findAtt(box, t.id)) return;
+      if (err && err.code === 'photo_too_large') { t.state = 'failed'; t.error = uploadErrorText(err); boxChanged(box); return; }
+      if (err && !err.status && !err.code) { t.state = 'failed'; t.error = uploadErrorText(err); boxChanged(box); return; }
+      uploadError(box, t, err);
     });
   }
   function readyAtts(k) { return k.atts.filter(function (t) { return t.state === 'ready' && t.mediaId; }); }
@@ -945,8 +1106,13 @@
     return ensureCaps().then(function (caps) {
       if (!caps || !caps.jobs) { var off = new Error('Ask needs the durable query jobs switch on your Mac.'); off.code = 'durable_query_jobs_disabled'; throw off; }
       return new Promise(function (resolve, reject) {
+        // 11/07: files attached in the Ask sheet go with the question, as from the chat's own clip (ready ids only:
+        // the sheet never asks while one is uploading or failed).
+        var o = {};
+        if (extra && extra.context) o.context = extra.context;
+        if (extra && Array.isArray(extra.attachmentIds) && extra.attachmentIds.length) { o.attachmentIds = extra.attachmentIds.slice(0, MAX_ATTS); o.atts = Array.isArray(extra.atts) ? extra.atts.slice(0, MAX_ATTS) : []; }
         submitAsk(String(text || '').trim(), null, function (ok) { if (ok) resolve(['cos']); else reject(new Error('Not sent. The question is in Ask COS; try again there.')); },
-          extra && extra.context ? { context: extra.context } : undefined);
+          o.context || o.attachmentIds ? o : undefined);
       });
     });
   }
@@ -1647,8 +1813,8 @@
     if (what === 'cancel') return cancel(t.getAttribute('data-cid'));
     if (what === 'att-remove') return removeAtt(kOf(t), t.getAttribute('data-att'));
     if (what === 'att-retry') {
-      var k = kOf(t), att = findAtt(k, t.getAttribute('data-att'));
-      if (att) { k.signedOut = false; setNote(k, ''); startUpload(k, att); paintChips(k); paintButtons(k); }
+      var k = kOf(t);
+      if (findAtt(k, t.getAttribute('data-att'))) { setNote(k, ''); boxRetry(k, t.getAttribute('data-att')); }
       return;
     }
     if (what === 'sign-in') { if (W.showAuth) W.showAuth('Sign in again. Your message and files are kept; tap Retry on each file after.'); return; }
@@ -1730,6 +1896,34 @@
     setOnChange: function (fn) { C.onChange = fn; }, setOnAnswered: function (fn) { C.onAnswered = fn; },
     // Test and render hooks: what the chat holds right now.
     classify: classify, uploadMedia: uploadMedia, uploadErrorText: uploadErrorText, uuid: uuid,
+    // 11/07: the attach kit, for Today's reply and note boxes and the Ask sheet (see "the attach kit" above).
+    attach: {
+      max: MAX_ATTS, accept: ACCEPT,
+      // opts.anyBytes (a session turn): any file up to that size, sent as it is (classifyForSession).
+      box: function (ui, opts) { return { atts: [], signedOut: false, ui: ui || {}, anyBytes: opts && opts.anyBytes > 0 ? opts.anyBytes : 0 }; },
+      add: boxAdd, remove: boxRemove, retry: boxRetry, clear: boxClear,
+      take: boxTake, restore: boxRestore,
+      pending: uploadsPending, failed: uploadsFailed,
+      ids: function (box) { return readyAtts(box).slice(0, MAX_ATTS).map(function (t) { return t.mediaId; }); },
+      sent: function (box) { return readyAtts(box).slice(0, MAX_ATTS).map(function (t) { return { name: t.name, kind: t.kind, thumb: t.thumb }; }); },
+      chipsHtml: function (box, attr) { return box.atts.map(function (t) { return chipHtml(t, attr); }).join(''); },
+      clipHtml: clipHtml, cameraHtml: cameraHtml, limitLine: limitLine,
+      // Files on the clipboard (a pasted screenshot), or none.
+      pasted: function (e) { var f = e && e.clipboardData && e.clipboardData.files; return f && f.length ? f : null; },
+      // Files dragged over `zone`: marks it while they hover, and answers the files on the drop. Null for anything else.
+      dragged: function (e, zone) {
+        var types = e && e.dataTransfer && e.dataTransfer.types;
+        if (!types || Array.prototype.indexOf.call(types, 'Files') < 0) return null;
+        e.preventDefault();
+        if (e.type === 'dragover' || e.type === 'dragenter') { zone.classList.add('dragging'); return null; }
+        zone.classList.remove('dragging');
+        return e.type === 'drop' ? e.dataTransfer.files : null;
+      },
+      // How many files a session turn takes on this Mac (threadTurnAttachments); 0 means words only.
+      turnFiles: function () { return C.caps && C.caps.turnFiles > 0 ? C.caps.turnFiles : 0; },
+      turnFileBytes: function () { return C.caps && C.caps.turnFiles > 0 && C.caps.turnFileBytes > 0 ? C.caps.turnFileBytes : 0; },
+      askOn: askOn, ensureCaps: ensureCaps
+    },
     // 6.99.19: Prep. meetings.js reads the capability from here (one /api/health read for the page).
     prepCaps: prepCaps,
     // Today's Next up (app.js prepNext): Prep me for that meeting, as the chat's own Prep me does. With Prep on the Mac

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

@@ -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.