@gotcos/glasses-server 6.99.33 → 7.0.7

package/server/index.ts

@@ -25,6 +25,8 @@ import { transcribeRouter } from './routes/transcribe.js'
 import { sessionIndexRouter } from './routes/session-index.js'
 import { agentSessionsRouter } from './routes/agent-sessions.js'
 import { agentSessionStreamRouter } from './routes/agent-session-stream.js'
+import { createLiveEventsRouter, liveEventsEnabled, realLiveSources } from './routes/live-events.js'
+import { LiveEventsHub } from './lib/live-events.js'
 import { createAttachedTurnStream } from './lib/session-stream-producer.js'
 import { claudeSessionsRouter } from './routes/claude-sessions.js'
 import { createSessionHooksRouter } from './routes/session-hooks.js'
@@ -187,6 +189,7 @@ import { createBridgeDropWriters } from './lib/drop-destinations.js'
 import { dropItEnabled } from './lib/drop-settings.js'
 import { serverTimezone } from './lib/morning-brief-config.js'
 import { createYourMoveCounter } from './lib/your-move-count.js'
+import { workSessionActivity } from './lib/work-session-activity.js'
 import { readWorkJournal } from './lib/work-activity.js'
 import { createDropP2Boot } from './lib/drop-p2-boot.js'
 import { createP2SettingsReader } from './lib/drop-p2-settings.js'
@@ -240,7 +243,7 @@ import {
 } from './lib/maintenance-lifecycle.js'
 
 const app = express()
-import { createThreadTurnQueueRouter, drainAllThreads, steerAvailabilityFor } from './routes/thread-turn-queue.js'
+import { createThreadTurnQueueRouter, drainAllThreads, midTurnAvailabilityFor, steerAvailabilityFor } from './routes/thread-turn-queue.js'
 import { createCursorStopFollowupRouter } from './routes/cursor-stop-followup.js'
 import { queuedThreadKeys, readQueue, readTranscriptTailLines, transcriptTurnVerdict, writeQueue } from './lib/thread-turn-queue-store.js'
 import { cursorDeskHaltReady, hookHaltReady, readHookToken } from './lib/claude-hooks-installer.js'
@@ -1029,6 +1032,7 @@ app.use('/api', createDropsRouter({
   yourMove: createYourMoveCounter({
     journal: () => readWorkJournal(),
     rows: () => workBoardReader.read(10_000, 3_000).catch(() => null),
+    sessionActivity: ids => workSessionActivity(ids),
   }),
 }))
 // 6.99.16: the COS thread (routes/cos-thread.ts): one size-capped conversation behind the COS chat's Ask, with a
@@ -1074,6 +1078,13 @@ app.use('/api', agentSessionsRouter)
 // router's `/attachability` below. READ-ONLY, and deliberately NOT behind
 // COS_THREAD_ATTACH_ENABLED -- see the header of the route for why.
 app.use('/api', agentSessionStreamRouter)
+// 7.0.1 live state: ONE change feed per open Control Web page (docs/live-events-contract.md). Ids, states, counts
+// and times only. COS_WEB_LIVE_EVENTS=0 registers no route (404), so the page polls exactly as before. The hub reads
+// nothing and ticks never while no stream is open; its reply counter is one Map increment per Stop.
+if (liveEventsEnabled()) {
+  const liveEventsHub = new LiveEventsHub({ sources: realLiveSources({ broker: () => permissionBroker }) })
+  app.use('/api', createLiveEventsRouter({ hub: liveEventsHub }))
+}
 // Presence view of Claude Code sessions on this Mac. Dark unless
 // COS_CLAUDE_SESSIONS_ENABLED=1 — it projects another product's 0700 state dir.
 app.use('/api', claudeSessionsRouter)
@@ -1132,6 +1143,13 @@ const steerDeps = {
     waitingOnPrompt: sessionHooksEnabled() ? (signalFor(threadId)?.waiting ?? null) !== null : false,
   }),
 }
+/** The attempt journal (the binding registry): Sessions steer, steer mid-turn and the drain stamp. */
+const queueAttemptJournal = {
+  begin: (provider: string, threadId: string, clientTurnId: string, mode: 'turn' | 'steer', now: number) =>
+    agentSessionBindingRegistry.beginAttempt(provider, threadId, clientTurnId, mode, now),
+  settle: (provider: string, threadId: string, clientTurnId: string, exit: 'sent' | 'not_sent' | 'unknown', now: number) =>
+    agentSessionBindingRegistry.settleAttempt(provider, threadId, clientTurnId, exit, now),
+}
 /** The bounded transcript tail the reconcile and the receipts read evidence from. */
 const QUEUE_EVIDENCE_TAIL_BYTES = 4 * 1024 * 1024
 const queueEvidenceLines = (provider: string, threadId: string): readonly string[] | null =>
@@ -1157,6 +1175,10 @@ const queueTurnEvidence = makeQueueTurnEvidence({
   now: () => Date.now(),
 })
 
+// Steer mid-turn (COS_STEER_MIDTURN): the park route asks for a drain pass at once. The kick is
+// made below, after the deps it drains with; until then (and with attach off) this does nothing.
+let kickQueueDrain: ((threadId: string) => void) | null = null
+
 if (threadAttachEnabled()) {
   const queueDeps = {
     // TWO GATES, ONE ANSWER. `threadOccupancy` sees FOREIGN holders -- another app on
@@ -1235,16 +1257,12 @@ if (threadAttachEnabled()) {
         .filter((text): text is string => typeof text === 'string'),
     }),
     ...steerDeps,
-    attempts: {
-      begin: (provider: string, threadId: string, clientTurnId: string, mode: 'turn' | 'steer', now: number) =>
-        agentSessionBindingRegistry.beginAttempt(provider, threadId, clientTurnId, mode, now),
-      settle: (provider: string, threadId: string, clientTurnId: string, exit: 'sent' | 'not_sent' | 'unknown', now: number) =>
-        agentSessionBindingRegistry.settleAttempt(provider, threadId, clientTurnId, exit, now),
-    },
+    attempts: queueAttemptJournal,
     // 6.53.0: parked turns hold for two minutes after a cancel on their thread.
     cancelHoldUntil: (provider: string, threadId: string) => cancelHoldUntilFor(provider, threadId),
     // 6.62.0 (W14): a busy Agent CLI chat's parked turn drains here (no Stop hook fires for `-p`).
     cursorCliChat: (threadId: string) => continueFactsDeps.cursorChatDir(threadId) !== null,
+    kickDrain: (threadId: string) => { kickQueueDrain?.(threadId) },
     now: () => Date.now(),
   }
   app.use('/api', createThreadTurnQueueRouter(queueDeps))
@@ -1266,6 +1284,8 @@ if (threadAttachEnabled()) {
     queuedThreadIds: () => queuedThreadKeys().map(k => k.threadId),
   })
   registerDrainKickStats(() => drainKick.stats())
+  // The same in-flight guard as the timer and the Stop hooks: a park never starts a second pass.
+  kickQueueDrain = threadId => { drainKick.kick(threadId) }
   const queueDrainTimer = setInterval(() => { void drainKick.sweep() }, 20_000)
   queueDrainTimer.unref()
   if (sessionHooksEnabled()) {
@@ -1375,6 +1395,8 @@ app.use('/api', createAgentSessionBindingsRouter({
     bootId: serverMetrics.bootId,
   }),
   sessionSteer: (provider, threadId, gateReason) => (sessionSteerEnabled() ? steerAvailabilityFor(steerDeps, provider, threadId, gateReason) : null),
+  // Steer mid-turn: the attachability answer's `midTurn` (null, and absent, with COS_STEER_MIDTURN off).
+  sessionMidTurn: (provider, threadId, gateReason) => midTurnAvailabilityFor({ ...steerDeps, attempts: queueAttemptJournal }, provider, threadId, gateReason),
   // 6.53.0: cancel a session run from the lens. The route's own in-flight map answers for
   // a COS turn; these answer for a run at the desk. Read per request, so Install hooks in
   // Control flips `hooks_outdated` to `desk_run` within the status cache's five seconds.