@gotcos/glasses-server 6.99.25 → 6.99.29

package/server/lib/agent-session-store.ts

@@ -12,6 +12,7 @@ import { join } from 'node:path'
 import { createInterface } from 'node:readline'
 import { promisify } from 'node:util'
 import { codexUserAsk, unwrapPeerMessage } from './session-stream-events.js'
+import { withoutTurnFooter } from './turn-footer.js'
 import { profileCodexHomeSubdirs } from './codex-homes.js'
 
 const execFileAsync = promisify(execFile)
@@ -1831,7 +1832,8 @@ export async function parseAgentSession(
         // frame. It IS the user's prompt (dictated on the glasses), so it is the
         // turn's query and never an injected row; the frame is stripped.
         const peer = (obj.origin as { kind?: unknown } | undefined)?.kind === 'peer' ? unwrapPeerMessage(text) : null
-        const query = peer ?? text
+        // 6.99.29: the verify footer of a glasses, phone or web turn is never the turn's query or title.
+        const query = withoutTurnFooter(peer ?? text)
         collectTurn(query, tail, peer === null && (obj.isMeta === true || obj.isCompactSummary === true))
         if (!firstPrompt) firstPrompt = firstLineTitle(query)
         if (!title) title = firstLineTitle(query)

package/server/lib/agent-session-turns.ts

@@ -33,15 +33,21 @@ import {
   payloadText,
   type AgentProvider,
 } from './agent-session-store.js'
+import type { SessionOutputImage } from './agent-session-output-images.js'
 import { unwrapPeerMessage } from './session-stream-events.js'
+import { withoutTurnFooter } from './turn-footer.js'
 
 export interface SessionTurn {
   role: 'user' | 'assistant'
   text: string
   /** The record's ISO timestamp, when the provider writes one (Cursor does not). */
   at?: string
+  /** Opt-in native-session output previews. No local paths or COS message identities. */
+  outputImages?: SessionOutputImage[]
 }
 
+export type SessionTurnProjection = (provider: AgentProvider, record: Record<string, unknown>, turn: SessionTurn | null) => SessionTurn | null
+
 /** What a client may ask for in one read. Forty messages is ~10 lens pages of words. */
 export const SESSION_TURNS_MAX = 40
 
@@ -103,10 +109,12 @@ export function sessionTurnFromRecord(provider: AgentProvider, obj: Record<strin
     // (a teammate's report, an idle notification, another session's SendMessage),
     // written as a plain user row with no origin. QA found 20 of those in one session
     // rendering as "YOU".
-    const peer = unwrapPeerMessage(text)
+    // 6.99.29: the verify footer a glasses, phone or web turn carries is for the agent, not the reader.
+    const wrapped = unwrapPeerMessage(text)
+    const peer = wrapped === null ? null : withoutTurnFooter(wrapped)
     if (peer !== null) return (obj.origin as { kind?: unknown } | undefined)?.kind === 'peer' ? shaped('user', peer, at) : null
     if (obj.isMeta === true || obj.isCompactSummary === true) return null
-    return shaped('user', text, at)
+    return shaped('user', withoutTurnFooter(text), at)
   }
   if (provider === 'codex') {
     if (obj.type !== 'response_item' || !obj.payload || typeof obj.payload !== 'object') return null
@@ -117,22 +125,24 @@ export function sessionTurnFromRecord(provider: AgentProvider, obj: Record<strin
     // and an attached-file message reads as the request that was typed.
     const text = payload.role === 'user' ? codexUserText(payload) : payloadText(payload)
     if (!text) return null
-    return shaped(payload.role, text, iso(obj.timestamp))
+    return shaped(payload.role, payload.role === 'user' ? withoutTurnFooter(text) : text, iso(obj.timestamp))
   }
   if (obj.role !== 'user' && obj.role !== 'assistant') return null
   const message = obj.message && typeof obj.message === 'object' ? obj.message as Record<string, unknown> : null
   const text = message ? payloadText(message) : null
   if (!text) return null
-  return shaped(obj.role, obj.role === 'user' ? cursorQuery(text) : text, iso(obj.timestamp))
+  // QA 6.99.29: a Cursor user row carries the verify footer inside its <user_query> block, like any other turn.
+  return shaped(obj.role, obj.role === 'user' ? withoutTurnFooter(cursorQuery(text)) : text, iso(obj.timestamp))
 }
 
 /** The newest `limit` messages among these lines (file order in, file order out). */
-export function recentSessionTurns(provider: AgentProvider, lines: readonly string[], limit: number): SessionTurn[] {
+export function recentSessionTurns(provider: AgentProvider, lines: readonly string[], limit: number, project?: SessionTurnProjection): SessionTurn[] {
   const out: SessionTurn[] = []
   for (const line of lines) {
     const obj = parseJsonLine(line)
     if (!obj) continue
-    const turn = sessionTurnFromRecord(provider, obj)
+    const parsed = sessionTurnFromRecord(provider, obj)
+    const turn = project ? project(provider, obj, parsed) : parsed
     if (turn) out.push(turn)
   }
   return limit > 0 ? out.slice(-limit) : []
@@ -155,6 +165,7 @@ export async function readRecentSessionTurns(
   path: string,
   limit: number,
   windows: readonly number[] = SESSION_TURNS_WINDOWS,
+  project?: SessionTurnProjection,
 ): Promise<RecentTurnsRead> {
   const want = Math.max(0, Math.min(SESSION_TURNS_MAX, Math.floor(limit)))
   const { size } = await stat(path)
@@ -177,7 +188,7 @@ export async function readRecentSessionTurns(
       const lines = buffer.toString('utf-8').split('\n')
       if (start > 0) lines.shift()
       // One more than wanted, so `more` can be answered from what was read.
-      found = recentSessionTurns(provider, lines, want + 1)
+      found = recentSessionTurns(provider, lines, want + 1, project)
       if (found.length > want || start === 0) break
     }
     const more = found.length > want || start > 0

package/server/lib/client-liveness.ts

@@ -44,6 +44,14 @@
 //     while the Mac sleeps, so on its own it would read a pre-sleep presence as younger
 //     than it is; the wall clock does advance. A wall clock stepped forward reads older
 //     (no hold), never younger.
+//
+// 6.99.26 (Miles 11/07, "Away rule, like phone"): COS Control Web's presence, kept apart from every
+// stamp above. A browser poll `?client=web&hold=1&presenceAgeMs=<int>` (the ms since a touch or a
+// key while the page was in front) records it, and the broker reads it for the away hold ONLY: it
+// never moves the newest poll (/api/health), the 6.59.0 liveness, the `hold=1` poll stamp (which
+// makes a stamped question's client connected without presence), or the wearer presence above. So
+// an open tab nobody touches holds nothing, and at the desk the Mac's own pop-up still shows at once
+// (6.99.13). Same contract and both clocks, forward-only, as the wearer presence.
 
 /** 6.60.0: the most a client may report as `presenceAgeMs`. Anything else is no presence. */
 export const PRESENCE_AGE_MAX_MS = 86_400_000
@@ -53,6 +61,8 @@ let lastLegacyPollAt: number | null = null
 let lastHoldPollAt: number | null = null
 let lastPresenceMono: number | null = null
 let lastPresenceWall: number | null = null
+let lastWebPresenceMono: number | null = null
+let lastWebPresenceWall: number | null = null
 
 /** 6.60.0: the monotonic clock. Milliseconds since this process started; paused while the Mac sleeps. */
 export function monotonicNowMs(): number {
@@ -109,12 +119,35 @@ export function noteQuestionsPoll(at: number, poll: QuestionsPollFacts = {}, mon
  * and the wall-clock age, so a Mac that slept never makes it read younger.
  */
 export function presenceAgeMs(mono: number = monotonicNowMs(), wall: number = Date.now()): number | null {
-  if (lastPresenceMono === null || !Number.isFinite(mono)) return null
-  const monoAge = Math.max(0, mono - lastPresenceMono)
-  const wallAge = lastPresenceWall !== null && Number.isFinite(wall) ? wall - lastPresenceWall : 0
+  return ageOn(lastPresenceMono, lastPresenceWall, mono, wall)
+}
+
+/** The age of a presence stamped on both clocks: the larger of the two, so a Mac that slept never reads younger. */
+function ageOn(stampMono: number | null, stampWall: number | null, mono: number, wall: number): number | null {
+  if (stampMono === null || !Number.isFinite(mono)) return null
+  const monoAge = Math.max(0, mono - stampMono)
+  const wallAge = stampWall !== null && Number.isFinite(wall) ? wall - stampWall : 0
   return Math.max(monoAge, wallAge)
 }
 
+/**
+ * 6.99.26: a COS Control Web poll answered at `at` (server clock) that reported `presenceAgeMs`, the ms
+ * since a touch or a key while the page was in front. Anything outside the contract is no presence and
+ * records nothing. Forward-only on each clock, like the wearer presence.
+ */
+export function noteWebPresence(at: number, presenceAgeMs: number, mono: number = monotonicNowMs()): void {
+  if (!Number.isFinite(at) || !validPresenceAgeMs(presenceAgeMs) || !Number.isFinite(mono)) return
+  const presenceMono = mono - presenceAgeMs
+  const presenceWall = at - presenceAgeMs
+  if (lastWebPresenceMono === null || presenceMono > lastWebPresenceMono) lastWebPresenceMono = presenceMono
+  if (lastWebPresenceWall === null || presenceWall > lastWebPresenceWall) lastWebPresenceWall = presenceWall
+}
+
+/** 6.99.26: how long ago COS Control Web's newest touch or key was, or null when none since this process started. */
+export function webPresenceAgeMs(mono: number = monotonicNowMs(), wall: number = Date.now()): number | null {
+  return ageOn(lastWebPresenceMono, lastWebPresenceWall, mono, wall)
+}
+
 /** When the newest authenticated questions poll of any kind arrived, or null since boot (/api/health). */
 export function lastQuestionsPollAt(): number | null {
   return lastPollAt
@@ -136,4 +169,6 @@ export function __resetClientLivenessForTests(): void {
   lastHoldPollAt = null
   lastPresenceMono = null
   lastPresenceWall = null
+  lastWebPresenceMono = null
+  lastWebPresenceWall = null
 }

package/server/lib/codex-subagent-activity.ts

@@ -139,3 +139,39 @@ export async function readCodexSubagents(
   }
   return out
 }
+
+/**
+ * 6.99.26 candidate (the Today summary, lib/session-subagents.ts): each parent's direct children by name, most recently
+ * updated first, at most `perParent`. The same read-only snapshot and child lifecycle reader as readCodexSubagents.
+ * Name is the child's nickname, else its role; the task is its thread title. Text only goes to the summary's prompt,
+ * cleaned there; ids and paths never leave this function. A failed read is an empty map, never a made-up zero.
+ */
+export interface CodexSubagentDetail { name: string; task: string; state: ChildState; at: number }
+export async function readCodexSubagentDetails(
+  parents: readonly string[], sessionsRoot: string, now = Date.now(), perParent = 6,
+): Promise<Map<string, CodexSubagentDetail[]>> {
+  const ids = [...new Set(parents.filter(id => UUID.test(id)).map(id => id.toLowerCase()))].slice(0, 12)
+  const out = new Map<string, CodexSubagentDetail[]>()
+  if (!ids.length) return out
+  try {
+    const home = dirname(sessionsRoot)
+    const files = (await readdir(home)).filter(n => /^state_\d+\.sqlite$/.test(n)).sort((a,b) => Number(b.match(/\d+/)![0])-Number(a.match(/\d+/)![0]))
+    if (!files.length) return out
+    // UUID validation above is the SQL parameter boundary.
+    const values = ids.map(id => `'${id}'`).join(',')
+    const query = `SELECT e.parent_thread_id AS root, t.rollout_path, t.archived, t.agent_nickname AS nick, t.agent_role AS role, t.title, t.updated_at_ms AS at
+      FROM thread_spawn_edges e LEFT JOIN threads t ON t.id=e.child_thread_id
+      WHERE e.status='open' AND e.parent_thread_id IN (${values}) ORDER BY t.updated_at_ms DESC LIMIT ${ids.length * perParent * 4}`
+    const { stdout } = await exec('/usr/bin/sqlite3', ['-readonly', '-json', join(home,files[0]), query], { timeout: 2000, maxBuffer: 2*1024*1024 })
+    const rows = JSON.parse(stdout || '[]') as Array<{root:string;rollout_path?:string;archived?:number;nick?:string;role?:string;title?:string;at?:number}>
+    const budget = { bytes: MAX_SNAPSHOT_BYTES }
+    for (const row of rows) {
+      const list = out.get(row.root) ?? []
+      if (list.length >= perParent) continue
+      const state: ChildState = row.archived === 1 ? 'completed' : typeof row.rollout_path === 'string' ? await childState(row.rollout_path, sessionsRoot, now, budget) : 'unknown'
+      list.push({ name: String(row.nick || row.role || 'agent').slice(0, 60), task: String(row.title || '').slice(0, 160), state, at: Number(row.at) || 0 })
+      out.set(row.root, list)
+    }
+  } catch { return new Map() }
+  return out
+}