@gotcos/glasses-server 7.0.31 → 7.0.34

package/server/routes/permission-broker.ts

@@ -50,7 +50,10 @@
 
 import express, { Router, type NextFunction, type Request, type Response } from 'express'
 import { timingSafeTokenEqual } from '../lib/token-auth.js'
-import { turnEndAskStats } from '../lib/session-hooks-runtime.js'
+import { turnEndAskStats, turnEndAsksForQueue } from '../lib/session-hooks-runtime.js'
+import { buildQuestionQueue, type QuestionQueue } from '../lib/question-queue.js'
+import { sessionTitleFor } from '../lib/session-title-cache.js'
+import { waitingQuestionWordsEnabled } from '../lib/full-hold.js'
 import {
   ANSWERING_CLIENTS,
   CLIENT_LIVE_WINDOW_MS,
@@ -163,6 +166,9 @@ export interface SessionQuestionsRouterDeps {
    * rules: `isWebSessionAuthorized` in production). Absent: only the token opens the list, as before.
    */
   webSessionAuthorized?: (req: Request) => boolean
+  /** X1 (the one queue): the turn-end asks and the session titles the queue reads. Default to the runtime's and the list's. */
+  turnEndQueue?: () => ReturnType<typeof turnEndAsksForQueue>
+  titleFor?: (sessionId: string) => string | null
   /** 7.0.18 (X1): the turn-end ask counters (lib/turn-end-ask.ts), null while COS_TURN_END_ASKS is off. Defaults to the runtime's. */
   turnEndAskStats?: () => Record<string, number> | null
   /** Where a counted poll is recorded; `noteQuestionsPoll` in production. */
@@ -274,6 +280,26 @@ export function requestFromThisMac(
   return own.some(a => normalizeRemoteIp(String(a)).toLowerCase() === ip)
 }
 
+/**
+ * X1 (the one queue, Miles 11/12 17:31): `queue` and `queueCount`, always present (whatever the full-hold switches),
+ * appended after every existing key so a client that reads the 7.0.31 keys reads exactly what it read before. A
+ * failure to build it never costs the rest of the response: the keys are then an empty queue.
+ */
+export function questionQueueFields(deps: SessionQuestionsRouterDeps): QuestionQueue {
+  try {
+    const turnEnd = (deps.turnEndQueue ?? turnEndAsksForQueue)()
+    return buildQuestionQueue({
+      broker: deps.broker.queueSources(),
+      turnEnd: turnEnd.asks,
+      turnEndAnswered: turnEnd.answered,
+      titleFor: deps.titleFor ?? sessionTitleFor,
+      words: waitingQuestionWordsEnabled(process.env),
+    })
+  } catch {
+    return { queue: [], queueCount: 0 }
+  }
+}
+
 function turnEndAskCounters(deps: SessionQuestionsRouterDeps): { turnEndAsks?: Record<string, number> } {
   let counters: Record<string, number> | null = null
   try { counters = (deps.turnEndAskStats ?? turnEndAskStats)() } catch { counters = null }
@@ -341,6 +367,7 @@ export function createSessionQuestionsRouter(deps: SessionQuestionsRouterDeps):
       // 7.0.18 (X1), additive and only while COS_TURN_END_ASKS is on: how many turn-end asks armed, were shown,
       // were answered, were overtaken by a new turn, or aged out. Counts only, never words.
       ...turnEndAskCounters(deps),
+      ...questionQueueFields(deps),
     })
   })
   router.post('/session-questions/:id/answer', (req: Request, res: Response) => {
@@ -350,7 +377,9 @@ export function createSessionQuestionsRouter(deps: SessionQuestionsRouterDeps):
     let expected = ''
     try { expected = deps.apiToken() } catch { expected = '' }
     const by = timingSafeTokenEqual(req.headers['x-cos-token'], expected) ? 'app' : 'web'
-    const result = deps.broker.answer(String(req.params.id ?? ''), req.body, by)
+    // X1 (the one queue): the answering client may name itself (glasses, phone, mac_app) so others can say where.
+    const client = req.get('x-cos-client') ?? (typeof req.query.client === 'string' ? req.query.client : undefined)
+    const result = deps.broker.answer(String(req.params.id ?? ''), req.body, by, client)
     res.status(result.status).json(result.body)
   })
   // X1: the web door's confirm step for an approval (lib/permission-broker.ts `confirm`). The /api gate let the

package/server/routes/session-hooks.ts

@@ -12,6 +12,9 @@ import { refreshAfterInstall } from '../lib/provider-observe.js'
 import { Router } from 'express'
 import { installClaudeHooks, uninstallClaudeHooks } from '../lib/claude-hooks-installer.js'
 import { deskIdleSeconds, invalidateHookStatus, sessionHooksHealthFields, sessionSignalStore } from '../lib/session-hooks-runtime.js'
+import { API_AUTH_BY_LOCAL } from '../lib/api-auth.js'
+import { questionHoldMode } from '../lib/full-hold.js'
+import { writeQuestionHoldSetting } from '../lib/question-hold-setting.js'
 import { workspaceFromCwd } from '../lib/claude-session-registry.js'
 
 /** The registry entrypoints a person sits at; everything else (`sdk-cli`, unknown) may be a job. */
@@ -69,6 +72,26 @@ export function createSessionHooksRouter(options: { port: number; codex?: Sessio
     res.json({ ok: true, ...sessionHooksHealthFields() })
   })
 
+  // X1, 7.0.34: the question hold's server-side setting, for Control's Settings row (Control 0.5.394). Body
+  // `{"mode":"on"|"off"|"default"}`; `default` removes the setting. The Mac app only: a browser session is refused
+  // (Control Web shows the state read-only). `COS_QUESTION_FULL_HOLD` in the environment wins over the setting, so
+  // while it is set nothing is written and the answer says so (409 `set_by_env`). Turning the hold on or off here
+  // changes what Reinstall hooks writes; the status's `state` then says whether a Reinstall is due.
+  router.put('/session-hooks/question-hold', (req, res) => {
+    res.set('Cache-Control', 'private, no-store')
+    if (res.locals[API_AUTH_BY_LOCAL] !== 'token') { res.status(403).json({ ok: false, reason: 'web_read_only' }); return }
+    const mode = req.body && typeof req.body === 'object' ? (req.body as { mode?: unknown }).mode : undefined
+    if (mode !== 'on' && mode !== 'off' && mode !== 'default') { res.status(400).json({ ok: false, reason: 'bad_mode' }); return }
+    if (questionHoldMode(process.env).source === 'env') {
+      res.status(409).json({ ok: false, reason: 'set_by_env', questionWait: sessionHooksHealthFields().sessionHooks.questionWait ?? null })
+      return
+    }
+    try { writeQuestionHoldSetting(mode) } catch { res.status(500).json({ ok: false, reason: 'write_failed' }); return }
+    invalidateHookStatus()
+    const hooks = sessionHooksHealthFields().sessionHooks
+    res.json({ ok: true, questionWait: hooks.questionWait ?? null, state: hooks.state })
+  })
+
   router.post('/session-hooks/install', (req, res) => {
     const dryRun = req.query.dryRun === '1' || (req.body && typeof req.body === 'object' && (req.body as { dryRun?: unknown }).dryRun === true)
     const result = installClaudeHooks({ port: options.port, deskIdleSeconds: deskIdleSeconds(), dryRun })

package/server/routes/sessions.ts

@@ -309,6 +309,7 @@ sessionsRouter.get('/sessions/today/all-messages', async (req, res) => {
     query: string
     text: string
     timestamp: number
+    queryTimestamp?: number
     chatIndex: number
     sessionId: string
     source: 'live'
@@ -341,6 +342,8 @@ sessionsRouter.get('/sessions/today/all-messages', async (req, res) => {
             query: ex.content,
             text: next.content,
             timestamp: next.timestamp,
+            // 7.0.33 A2: when the question was asked, beside when COS answered (timestamp), for a time under each.
+            ...(Number.isFinite(ex.timestamp) ? { queryTimestamp: ex.timestamp } : {}),
             chatIndex: -1,
             sessionId: session.id,
             source: 'live',

package/server/web-control/.manifest.json

@@ -2,14 +2,14 @@
   "v": 1,
   "algorithm": "sha256",
   "files": {
-    "/app.css": "bc5e29be841629261889aebfd439a3b126a50041c4e079c9866eac93a3552fe1",
-    "/app.js": "50ac6ccfcd483496a411ae6569217e5cf9574305642b628ec703aa4a6ee8b797",
+    "/app.css": "f2d9c657580959c8a49ce5dd947c027aded0f4e69e4367b8247f092c0ccb0c8f",
+    "/app.js": "c5740309a27ba9b1513be466e687ec483311045c2f0088ffb3d5507afb208db2",
     "/apple-touch-icon.png": "04ec7eca0bf6f53d89900d146ac32d4826759d6258bcdbd1ccdcc517f26f532c",
-    "/control.css": "f5b7a2e0f800cc07072581b7e817fcd2b54bdb1d91f4662a3cdc9d80a7bc32ff",
+    "/control.css": "6943c7a0573ae85e1fbdbda36e1765ea4ee5d5fd9205690253570f89b49d7fd3",
     "/fonts/DMSans.ttf": "8cd08d97e89c24d0aa92edd2f0f4c8ee6195eee9b7c9f154865a58b02f0c1c0d",
     "/fonts/Fraunces.ttf": "177ff6c0f14e5550a3c624247cd1189611d4eb65d000b14944c63d967958abbb",
     "/fonts/JetBrainsMono.ttf": "48715a42ec242c21e9f02692891e147d022299a52e48d5e413e1a942193ffeda",
-    "/index.html": "c3a88479e5b9efa323129c5a425dada70dc7f0f27a0c787c1bc225c661f20a7b",
+    "/index.html": "d9d1cede8b6ef2a3680f5b62e24fffcbf65e2eff3c33de31a69263f53d78520c",
     "/mark.svg": "8e380d33d393027df192eb1afa08f15a380c2070c72d68f27311b49d9e94ca18",
     "/memories/d3.min.js": "f2094bbf6141b359722c4fe454eb6c4b0f0e42cc10cc7af921fc158fceb86539",
     "/memories/graph-explorer.css": "ec128de59811f45c71b6bededd737989309205e903951eb8211ade7664f87486",
@@ -22,14 +22,14 @@
     "/panes/meetings.css": "635470e4d5f5665b046eab7382734c9772df569069c9b1eb10cfde6151014bfa",
     "/panes/meetings.js": "e057f4dae697138111a4c07e8ec6c2a0502b5d93023cf491460bc7bf20172c85",
     "/panes/memories.css": "36731d6fd21ad1516dfeccf34fe5b2d3d267d21e40b47704055a0685334b579e",
-    "/panes/memories.js": "66341dd5126c40275979d1c40f8db72e1f8229ac9634a4bb72b70140db277f2a",
-    "/panes/messages.js": "7262ad82b6337a610b11ffff0677663e9317d1fe537f9e4161ae3af1ddef35ef",
+    "/panes/memories.js": "47b9a06b329c3ec7c21902e6d8ec2fc7fe9013fffcfe936b54037be162c82958",
+    "/panes/messages.js": "5c43d171cb026ff98cc316821f631992288909570ec6abbd9bcc4dc1dc046bca",
     "/panes/preview.js": "79f1aecb27f48d584ed4cf37c7f4f423f0f9b45dd6c2fb24a9d88c72625d8680",
     "/panes/questions.css": "5c5a9b32ce32386b508ce326b17d40ecacbb0f2e049df7f4fe2a0009bd3b7908",
-    "/panes/questions.js": "228e8cd0a9651a290cbb380db487af677a2fc7e93a64b1e33c9411cd8b013478",
+    "/panes/questions.js": "60115b6f5d5380d6dac1ceb50e6a56bd6d10f8d49fb64429fbe73d6890270111",
     "/panes/reader-media.js": "4cf892a855aa2d0dce6978e69296cd49b8036d8fc62f12773b3fcadc210b2ef0",
     "/panes/sessions.css": "654e0509ab2b699b9ea92b6d9e2f7522146df1f0b6355915bef03caaf63addc4",
-    "/panes/settings.js": "315458c5911f31592853800418dde6d87e9e61bbe96f90c77450c94f87d01951",
+    "/panes/settings.js": "cc2ec51f397383be0b6f5078e6632c35dab8bf12ed3555df20c7cf2ec8ae8f63",
     "/panes/speakers.css": "49e70dae4266151b14b0057f2e43de169de225b8f3ac30343c81cf532735a487",
     "/panes/speakers.js": "e4fbcc147c44f8bf798e0694e0c8b152d5cde82dc46823641c8e8d37714b8fba",
     "/panes/threads.js": "45fd7b56480be53225e91193cfa4c41a4ee7167890f10560e439bc7d2461747f",
@@ -37,7 +37,7 @@
     "/panes/today-actions.js": "c767b62b21a9f1debffd6e4ff4558891222b573535de1d78849b602030bb09bd",
     "/panes/work.css": "da50355dac690f712d1f6331f70ee5eadbf5982d37508648ae7786afc99ac7b1",
     "/panes/work.js": "913c56084a6df463cc83358ce360da30d529466f1c583683fd3a4fd5eafe2d30",
-    "/shell.js": "cc7d0d771712607d4ba49eb1cfc83c50c7fcae2203f1c386778fee43d1803a81",
+    "/shell.js": "9bef169c42d8130cbca8c012c3667a9b92cacaa8673b4cef47d6fc7cfc0096ef",
     "/theme.js": "e3e6422eaac43979d03149da114f5b83757b7361dd7b309cdf76be36a596044b",
     "/vendor/qrcode-encoder.js": "61d87cc7445cc66b862cff913de4571634746ea62bcd50d0f592be14f6d1ce46"
   }

package/server/web-control/app.css

@@ -225,6 +225,26 @@ select.field {
 .pet-caption { color: var(--sub); font-size: 14px; }
 /* A still pet (gallery pick, Cloud Puff, single image). Small pixel art scales without blur. */
 .pet-still { height: 140px; width: auto; max-width: 220px; object-fit: contain; }
+/* 7.0.33 A13, Anand's mock (slide 9): in a phone's top bar, the pet in a small round button left of Ask, keeping its own
+   animation; a tap opens a card under it with the pet, its line, Change pet and Hide. The card floats, so it has the
+   mock's soft shadow and no border. */
+.topbar .today-pet.in-bar { position: relative; min-height: 0; margin: 0 6px 0 auto; flex-direction: row; }
+.today-pet.in-bar > .pet-btn { width: 36px; height: 36px; border-radius: 50%; justify-content: center; overflow: hidden;
+  background: color-mix(in srgb, var(--accent) 16%, var(--page)); border: 1px solid color-mix(in srgb, var(--accent) 26%, transparent); }
+.today-pet.in-bar > .pet-btn .pet-still { height: 30px; max-width: 30px; }
+.today-pet.in-bar > .pet-btn .pet-sprite { zoom: 0.21; }
+.today-pet.in-bar > .pet-btn .pet-caption, .today-pet.in-bar > .pet-change { display: none; }
+.pet-card { position: absolute; top: calc(100% + 8px); right: -40px; width: min(250px, calc(100vw - 32px)); padding: 14px; text-align: left;
+  background: var(--panel); border-radius: 16px; box-shadow: 0 8px 28px rgba(40, 30, 15, 0.16); z-index: 30; }
+.pet-card-head { display: flex; align-items: center; gap: 12px; width: 100%; background: none; border: 0; padding: 0; color: inherit; font: inherit; text-align: left; cursor: pointer; }
+.pet-card-head[aria-disabled="true"] { cursor: default; }
+.pet-card-pet { flex: none; width: 44px; display: grid; place-items: center; }
+.pet-card-pet .pet-still { height: 48px; max-width: 44px; }
+.pet-card-pet .pet-sprite { zoom: 0.34; }
+.pet-card-text { display: flex; flex-direction: column; gap: 2px; min-width: 0; }
+.pet-card-title { color: var(--ink); font-weight: 600; font-size: 16px; }
+.pet-card-sub { color: var(--sub); font-size: 14px; line-height: 1.35; }
+.pet-card-acts { display: flex; gap: 8px; margin-top: 12px; }
 .pet-still.pixel { image-rendering: pixelated; }
 .pet-change { background: none; border: 0; padding: 6px 10px; margin-top: 2px; color: var(--sub); font: inherit; font-size: 13px; cursor: pointer; text-decoration: underline; text-underline-offset: 3px; }
 .pet-change:focus-visible { outline: 2px solid var(--sub); outline-offset: 2px; border-radius: 6px; }
@@ -492,6 +512,9 @@ select.field {
   .pane-head.with-ask { display: flex; align-items: flex-end; justify-content: space-between; gap: 20px; }
   .pane-head.with-ask .ask-bar { max-width: 400px; margin-top: 0; }
   .ask-bar .kbd { display: inline-block; }
+  /* 7.0.33 A9 (Anand round 2, slide 29): ⌘K is a keyboard's shortcut. A touch screen with no mouse (the open Duo, an
+     iPad held alone) does not show it. */
+  @media (hover: none) and (pointer: coarse) { .ask-bar .kbd { display: none; } }
   .pane-title { font-size: 44px; }
   .story { font-size: 26px; }
   .run-row { grid-template-columns: 118px minmax(0, 1fr); gap: 2px 14px; align-items: start; }
@@ -704,8 +727,8 @@ html { touch-action: manipulation; }
   /* The focus ring sits inside the button: the rail clips anything past its edge. */
   html.short-screen .rail :focus-visible { outline: 2px solid var(--accent); outline-offset: -4px; border-radius: 12px; }
   /* One way to switch panes on a screen: the rail. On a list the top bar keeps the pane's name, without the caret and
-     its menu (app.js makes the button inert); on a reader its Back moves to the rail and the left of the top bar is
-     empty. */
-  html.short-screen .section-btn .caret, html.short-screen #topbar-back { display: none !important; }
+     its menu (app.js makes the button inert). On a reader (7.0.33 A12) the top bar shows Back with the name of where it
+     goes, and stays put while you read; the rail's foot keeps its own Back within the thumb's reach. */
+  html.short-screen .section-btn .caret { display: none !important; }
   html.short-screen .section-btn { cursor: default; }
 }