@gotcos/glasses-server 6.48.0 → 6.48.1

package/server/routes/session-hooks.ts

@@ -11,6 +11,11 @@ import { installClaudeHooks, uninstallClaudeHooks } from '../lib/claude-hooks-in
 import { deskIdleSeconds, invalidateHookStatus, sessionHooksHealthFields, sessionSignalStore } from '../lib/session-hooks-runtime.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. */
+export function isInteractiveEntrypoint(entrypoint: string | null): boolean {
+  return entrypoint === 'claude-desktop' || entrypoint === 'cli'
+}
+
 export function createSessionHooksRouter(options: { port: number }): Router {
   const router = Router()
 
@@ -47,11 +52,16 @@ export function createSessionHooksRouter(options: { port: number }): Router {
     res.set('Cache-Control', 'private, no-store')
     const since = Number(req.query.since)
     const sinceMs = Number.isFinite(since) && since > 0 ? since : Date.now() - 24 * 60 * 60_000
+    // A Desktop tab or a terminal session is not a run (6.48.1): the ledger wants the
+    // `claude -p` jobs (`sdk-cli`). `?all=1` lists every session the hooks saw.
+    const all = req.query.all === '1'
     const runs: Array<Record<string, unknown>> = []
     for (const signal of sessionSignalStore.snapshot()) {
       if (signal.firstSeenAt < sinceMs && !(signal.ended && signal.ended.at >= sinceMs)) continue
+      if (!all && isInteractiveEntrypoint(signal.entrypoint)) continue
       runs.push({
         session_id: signal.sessionId,
+        entrypoint: signal.entrypoint,
         started_at: new Date(signal.firstSeenAt).toISOString(),
         ended_at: signal.ended ? new Date(signal.ended.at).toISOString() : null,
         end_reason: signal.ended?.reason ?? null,

package/server/routes/thread-turn-queue.ts

@@ -16,6 +16,7 @@
 // EVERY DEPENDENCY IS INJECTED so the whole path is testable without a live server.
 
 import { Router, type Request, type Response } from 'express'
+import { COS_SESSION_ID_RE } from './agent-session-bindings.js'
 import {
   admitToQueue, drainDecision, queueableRefusal, queuePosition,
   MAX_DELIVERY_ATTEMPTS, type DrainObservation, type QueuedThreadTurn,
@@ -27,6 +28,8 @@ export interface ThreadTurnQueueDeps {
   occupancy: (provider: string, threadId: string) => { attachable: boolean; reason: string | null }
   /** Did the holder's last transcript record end a turn? */
   turnEnded: (provider: string, threadId: string) => boolean
+  /** 6.48.1, optional: is the holder's turn positively OPEN right now (see DrainObservation.turnOpen)? */
+  turnOpen?: (provider: string, threadId: string) => boolean
   /** The 30s transcript clock, as a backstop. */
   activity: (provider: string, threadId: string) => 'working' | 'idle' | 'unknown'
   /**
@@ -77,6 +80,11 @@ function publicRow(turn: QueuedThreadTurn, position: number): Record<string, unk
  * return false and spend an attempt. A new refusal added upstream is therefore bounded
  * by default rather than silently retried forever.
  */
+/** A throwing turnOpen probe is not evidence either way. */
+function safeTurnOpen(deps: ThreadTurnQueueDeps, provider: string, threadId: string): boolean | undefined {
+  try { return deps.turnOpen!(provider, threadId) } catch { return undefined }
+}
+
 function isRetryableDelivery(outcome: { reason?: string; serverRetryable?: boolean }): boolean {
   // The turn route publishes its own verdict; it outranks our inference either way.
   if (outcome.serverRetryable === false) return false
@@ -116,6 +124,7 @@ export async function drainThread(
     const seen: DrainObservation = {
       attachable: gate.attachable,
       turnEnded: deps.turnEnded(provider, threadId),
+      turnOpen: deps.turnOpen ? safeTurnOpen(deps, provider, threadId) : undefined,
       activity: deps.activity(provider, threadId),
       reason: gate.reason,
     }
@@ -212,6 +221,12 @@ export function createThreadTurnQueueRouter(deps: ThreadTurnQueueDeps): Router {
     if (!clientTurnId || !cosSessionId || !prompt.trim()) {
       return res.status(400).json({ error: 'invalid_request' })
     }
+    // 6.48.1: the attach route refuses an id outside COS_SESSION_ID_RE as invalid_request,
+    // which the drainer treats as retryable, so a bad id used to sit in the queue for the
+    // whole TTL. Refuse it here, where the client can still fix it.
+    if (!COS_SESSION_ID_RE.test(cosSessionId)) {
+      return res.status(400).json({ error: 'invalid_request', reason: 'invalid_cos_session_id' })
+    }
 
     if (provider === 'cursor') {
       return res.status(423).json({ error: 'unsupported_provider', queueable: false })