@gotcos/glasses-server 6.16.0 → 6.16.2

package/server/routes/health.ts

@@ -19,6 +19,12 @@ import {
   getCodexModelCatalog,
   getCodexModelCatalogSnapshot,
 } from '../lib/codex-model-catalog.js'
+import {
+  getCursorModelCatalog,
+  getCursorModelCatalogSnapshot,
+  isCursorProviderReady,
+  resolveAgentBinary,
+} from '../lib/cursor-model-catalog.js'
 import { isMediaProcessingReady } from '../lib/image-safety.js'
 import { G2_LENS_VARIANT_CAPABILITY } from '../lib/media-store.js'
 import { durableQueryJobsCapability } from '../lib/query-job-feature.js'
@@ -70,6 +76,7 @@ healthRouter.get('/health', async (_req, res) => {
     python: 'unknown',
     claude: 'unknown',
     codex: 'unknown',
+    cursor: 'unknown',
     uptime_seconds: Math.floor((Date.now() - serverMetrics.startedAt) / 1000),
     request_count: serverMetrics.requestCount,
   }
@@ -77,6 +84,7 @@ healthRouter.get('/health', async (_req, res) => {
   // Feature detection flags
   let claudeAvailable = false
   let codexAvailable = false
+  let cursorAvailable = false
 
   // Check Python venv (COS mode only)
   if (PYTHON_BIN) {
@@ -126,6 +134,36 @@ healthRouter.get('/health', async (_req, res) => {
     checks.codex = 'error'
   }
 
+  // Cursor Agent CLI — probe via `agent about` only (≤5s). Never use
+  // `agent status` (can hang on login UX while logged out).
+  try {
+    const agentBinary = resolveAgentBinary()
+    if (!agentBinary) {
+      checks.cursor = 'error'
+    } else {
+      await new Promise<void>((resolveCheck, reject) => {
+        execFile(agentBinary, ['about'], { timeout: 5000 }, (err, stdout, stderr) => {
+          if (err) return reject(err)
+          const combined = `${stdout}\n${stderr}`.trim()
+          const versionLine = combined.split('\n').map(line => line.trim()).find(line =>
+            /CLI Version|cursor|agent/i.test(line),
+          )
+          checks.cursor = versionLine ?? combined.split('\n')[0] ?? 'available'
+          resolveCheck()
+        })
+      })
+      await getCursorModelCatalog()
+      cursorAvailable = isCursorProviderReady()
+      if (!cursorAvailable) {
+        checks.cursor = typeof checks.cursor === 'string' && checks.cursor !== 'error'
+          ? `${checks.cursor} (models unresolved)`
+          : 'error'
+      }
+    }
+  } catch {
+    checks.cursor = 'error'
+  }
+
   // Check session cache freshness (COS mode only)
   if (COS_SCRIPTS_DIR) {
     try {
@@ -161,6 +199,7 @@ healthRouter.get('/health', async (_req, res) => {
   const features = {
     claude: claudeAvailable,
     codex: codexAvailable,
+    cursor: cursorAvailable,
     voice: keyStatus.hasKey || tts_local.ready,
     cos_pipeline: COS_MODE,
     whisper: isWhisperLocalAvailable(),
@@ -204,6 +243,10 @@ healthRouter.get('/health', async (_req, res) => {
   }
   const openai_whisper_budget = getOpenAIWhisperBudgetState()
   const codex_models = getCodexModelCatalogSnapshot()
+  // Unauthenticated /api/health publishes Cursor slot capability only; concrete
+  // agent binary paths stay on the authenticated /api/models surface.
+  const cursorSnapshot = getCursorModelCatalogSnapshot()
+  const { agentBinary: _cursorAgentBinary, ...cursor_models } = cursorSnapshot
   res.json({
     ...checks,
     server_version: managedServerVersion(),
@@ -217,6 +260,7 @@ healthRouter.get('/health', async (_req, res) => {
     openai_whisper_budget,
     tts_local,
     codex_models,
+    cursor_models,
     capabilities: {
       transcription: { ...transcription, hq: transcriptionHq },
       recovery,
@@ -240,16 +284,25 @@ healthRouter.get('/health', async (_req, res) => {
   })
 })
 
-// Stable app slots backed by Codex's live model/list catalog. This route is
-// authenticated by the global /api middleware; ?refresh=1 forces discovery.
+// Stable app slots backed by Codex + Cursor live catalogs. Authenticated by
+// global /api middleware; ?refresh=1 forces discovery.
 healthRouter.get('/models', async (req, res) => {
-  const catalog = await getCodexModelCatalog(req.query.refresh === '1')
+  const forceRefresh = req.query.refresh === '1'
+  const catalog = await getCodexModelCatalog(forceRefresh)
+  const cursorCatalog = await getCursorModelCatalog(forceRefresh)
   const durableJobs = durableQueryJobStatus()
   const localFirstMeetings = localFirstMeetingsCapability(getServerInstanceId())
   const transcription = getTranscriptionPolicySnapshot()
   const transcriptionHq = getHighQualityTranscriptionCapability()
+  const cursorOptions = cursorCatalog.options.filter(option => !!option.id)
   res.json({
     ...catalog,
+    options: [
+      ...(catalog.options ?? []),
+      ...cursorOptions,
+    ],
+    cursor: cursorCatalog,
+    cursorReady: isCursorProviderReady(),
     serverInstanceId: getServerInstanceId(),
     capabilities: {
       durableQueryJobs: {
@@ -263,7 +316,6 @@ healthRouter.get('/models', async (req, res) => {
     },
   })
 })
-
 // GET /api/cli-session — returns current CLI session ID for cross-device resume
 healthRouter.get('/cli-session', (req, res) => {
   const cosSessionId = req.query.sid as string | undefined

package/server/routes/meetings.ts

@@ -1,8 +1,13 @@
-// Standalone meeting archive backed only by the public server's private data
-// directory. No COS operations paths, classifiers, or user-specific stores.
+// Meeting archive: COS operations tree when configured, else standalone recordings.
 
 import { Router } from 'express'
 import { getMeetingStore, MeetingStore, MeetingStoreError } from '../lib/meeting-store.js'
+import {
+  cosOperationsMeetingsConfigured,
+  getCosOperationsMeetingDetail,
+  listCosOperationsMeetings,
+  resolveCosOperationsDir,
+} from '../lib/cos-operations-meetings.js'
 
 export function createMeetingsRouter(store: MeetingStore = getMeetingStore()): Router {
   const router = Router()
@@ -14,7 +19,18 @@ export function createMeetingsRouter(store: MeetingStore = getMeetingStore()): R
       const limit = Number.isFinite(rawLimit) ? rawLimit : 20
       const domain = typeof req.query.domain === 'string' ? req.query.domain : 'all'
       res.set('Cache-Control', 'private, no-store')
-      res.json({ meetings: store.list({ limit, domain }) })
+
+      if (cosOperationsMeetingsConfigured()) {
+        const meetings = listCosOperationsMeetings({ limit, domain })
+        res.json({
+          meetings,
+          source: 'cos_operations',
+          operationsDir: resolveCosOperationsDir(),
+        })
+        return
+      }
+
+      res.json({ meetings: store.list({ limit, domain }), source: 'standalone_recordings' })
     } catch (error) {
       sendMeetingStoreError(res, error)
     }
@@ -32,6 +48,17 @@ export function createMeetingsRouter(store: MeetingStore = getMeetingStore()): R
         return
       }
       res.set('Cache-Control', 'private, no-store')
+
+      if (cosOperationsMeetingsConfigured()) {
+        const detail = getCosOperationsMeetingDetail(domain, month, filename)
+        if (detail) {
+          res.json(detail)
+          return
+        }
+        // Fall through to standalone store for G2-local recordings that share
+        // the same API shape when ops lookup misses.
+      }
+
       res.json(store.detail(domain, month, filename))
     } catch (error) {
       sendMeetingStoreError(res, error)
@@ -43,6 +70,19 @@ export function createMeetingsRouter(store: MeetingStore = getMeetingStore()): R
   router.get('/meetings/:domain/:month/:filename', (req, res) => {
     try {
       res.set('Cache-Control', 'private, no-store')
+
+      if (cosOperationsMeetingsConfigured()) {
+        const detail = getCosOperationsMeetingDetail(
+          req.params.domain,
+          req.params.month,
+          req.params.filename,
+        )
+        if (detail) {
+          res.json(detail)
+          return
+        }
+      }
+
       res.json(store.detail(req.params.domain, req.params.month, req.params.filename))
     } catch (error) {
       sendMeetingStoreError(res, error)

package/server/routes/openai-compat.ts

@@ -11,7 +11,9 @@ import {
   getCodexModelCatalog,
   resolveCodexPreferenceForModelId,
 } from '../lib/codex-model-catalog.js'
+import { resolveCursorPreferenceForModelId } from '../lib/cursor-model-catalog.js'
 import { tryInstantResponse } from '../lib/response-cache.js'
+
 import crypto from 'node:crypto'
 import { timingSafeTokenEqual } from '../lib/token-auth.js'
 import {
@@ -80,14 +82,31 @@ function validateAuth(req: any, res: any): boolean {
   return true
 }
 
+/**
+ * Pick the model id an OpenAI-compatible request asked for. A `?model=` on the
+ * completion URL wins over the request body, so an Even "Add Agent" endpoint
+ * can pin a slot even though the client hardcodes a generic body model.
+ */
+export function selectOpenAICompatibleModel(
+  bodyModel?: string,
+  urlModel?: string,
+): string | undefined {
+  const fromUrl = urlModel?.trim()
+  if (fromUrl) return fromUrl
+  const fromBody = bodyModel?.trim()
+  return fromBody || undefined
+}
+
 // Resolve model from OpenAI-compatible ids, stable app slots, or concrete ids
-// currently advertised by the live Codex catalog.
-function resolveModel(model?: string, _query?: string): ModelPreference {
+// currently advertised by the live Codex / Cursor catalogs.
+export function resolveModel(model?: string, _query?: string): ModelPreference {
   const normalized = normalizeModelPreference(model)
   if (normalized) return normalized
   if (model) {
     const catalogPreference = resolveCodexPreferenceForModelId(model)
     if (catalogPreference) return catalogPreference
+    const cursorPreference = resolveCursorPreferenceForModelId(model)
+    if (cursorPreference) return cursorPreference
   }
   if (model === 'cos-opus') return 'opus'
   if (model === 'cos-fable') return 'fable'
@@ -105,8 +124,9 @@ const MODEL_NAMES: Record<ModelPreference, string> = {
   haiku: 'cos-haiku',
   'codex-frontier': 'cos-gpt-frontier',
   'codex-balanced': 'cos-gpt-balanced',
+  'cursor-grok': 'cursor-grok',
+  'cursor-composer': 'cursor-composer',
 }
-
 // Extract the user's latest message from the OpenAI messages array
 function extractUserQuery(messages: Array<{ role: string; content: string }>): string {
   // Find the last user message
@@ -162,7 +182,11 @@ openaiCompatRouter.post('/v1/chat/completions', async (req, res) => {
   console.log(`[g2] Request: stream=${!!stream}, query="${query.slice(0, 50)}"`)
 
   const requestReceivedAt = Date.now()
-  const resolvedModel = resolveModel(model, query)
+  const selectedModel = selectOpenAICompatibleModel(
+    model,
+    typeof req.query.model === 'string' ? req.query.model : undefined,
+  )
+  const resolvedModel = resolveModel(selectedModel, query)
   const completionId = `chatcmpl-${crypto.randomUUID().slice(0, 12)}`
   const timestamp = Math.floor(Date.now() / 1000)
   const responseModel = MODEL_NAMES[resolvedModel]

package/shared/model-preference.ts

@@ -3,7 +3,19 @@ export type ClaudeModelPreference = 'opus' | 'fable' | 'sonnet' | 'haiku'
 // Stable app-level slots. Concrete GPT model ids resolve at runtime from the
 // local Codex CLI catalog, so a shipped glasses app keeps tracking new releases.
 export type CodexModelPreference = 'codex-frontier' | 'codex-balanced'
-export type ModelPreference = ClaudeModelPreference | CodexModelPreference
+// Cursor Agent CLI slots. Concrete ids (composer-2.5 / cursor-grok-4.5-high)
+// resolve from `agent models` at runtime. Slots stay recognized in normalize
+// even when features.cursor is false so version skew fail-closes instead of
+// silently remapping to Claude.
+export type CursorModelPreference = 'cursor-grok' | 'cursor-composer'
+/** Cursor Agent CLI execution posture for glasses queries. */
+export type CursorExecutionMode = 'ask' | 'agent'
+export type ModelPreference = ClaudeModelPreference | CodexModelPreference | CursorModelPreference
+
+/** Invalid/omitted → ask (safe for old clients that don't send a mode). */
+export function normalizeCursorExecutionMode(value: unknown): CursorExecutionMode {
+  return value === 'agent' ? 'agent' : 'ask'
+}
 
 // Preserve the public server's established fast, broadly available default.
 export const DEFAULT_MODEL = 'sonnet' as const
@@ -11,6 +23,8 @@ export const CODEX_FRONTIER_MODEL: CodexModelPreference = 'codex-frontier'
 export const CODEX_BALANCED_MODEL: CodexModelPreference = 'codex-balanced'
 // Backward-compatible export for callers that predate the two-slot catalog.
 export const CODEX_HIGH_MODEL: CodexModelPreference = CODEX_FRONTIER_MODEL
+export const CURSOR_GROK_MODEL: CursorModelPreference = 'cursor-grok'
+export const CURSOR_COMPOSER_MODEL: CursorModelPreference = 'cursor-composer'
 // Existing 6.1–6.3 installs may pin the legacy codex-high slot. Frontier is its
 // migration target; Balanced remains auto-catalog even when this override is set.
 export const CODEX_MODEL_ID = process.env.COS_CODEX_MODEL?.trim() ?? ''
@@ -33,6 +47,8 @@ export const MODEL_OPTIONS: ModelPreference[] = [
   'sonnet',
   CODEX_FRONTIER_MODEL,
   CODEX_BALANCED_MODEL,
+  CURSOR_GROK_MODEL,
+  CURSOR_COMPOSER_MODEL,
 ]
 
 const MODEL_SET = new Set<ModelPreference>([
@@ -42,6 +58,8 @@ const MODEL_SET = new Set<ModelPreference>([
   'haiku',
   CODEX_FRONTIER_MODEL,
   CODEX_BALANCED_MODEL,
+  CURSOR_GROK_MODEL,
+  CURSOR_COMPOSER_MODEL,
 ])
 
 // Bare Claude tier aliases resolve to the newest model in that tier at spawn.
@@ -127,12 +145,22 @@ export function isCodexModel(model: ModelPreference): model is CodexModelPrefere
   return model === CODEX_FRONTIER_MODEL || model === CODEX_BALANCED_MODEL
 }
 
+export function isCursorModel(model: ModelPreference): model is CursorModelPreference {
+  return model === CURSOR_GROK_MODEL || model === CURSOR_COMPOSER_MODEL
+}
+
 export interface RuntimeCodexModelLabel {
   preference: CodexModelPreference
   displayName: string
 }
 
+export interface RuntimeCursorModelLabel {
+  preference: CursorModelPreference
+  displayName: string
+}
+
 const runtimeCodexLabels: Partial<Record<CodexModelPreference, string>> = {}
+const runtimeCursorLabels: Partial<Record<CursorModelPreference, string>> = {}
 
 export function setRuntimeCodexModelLabels(options: RuntimeCodexModelLabel[]): void {
   for (const option of options) {
@@ -147,6 +175,19 @@ export function resetRuntimeCodexModelLabels(): void {
   delete runtimeCodexLabels[CODEX_BALANCED_MODEL]
 }
 
+export function setRuntimeCursorModelLabels(options: RuntimeCursorModelLabel[]): void {
+  for (const option of options) {
+    if (!isCursorModel(option.preference)) continue
+    const label = typeof option.displayName === 'string' ? option.displayName.trim() : ''
+    if (label) runtimeCursorLabels[option.preference] = label
+  }
+}
+
+export function resetRuntimeCursorModelLabels(): void {
+  delete runtimeCursorLabels[CURSOR_GROK_MODEL]
+  delete runtimeCursorLabels[CURSOR_COMPOSER_MODEL]
+}
+
 export function modelLabel(model: ModelPreference): string {
   switch (model) {
     case 'fable': return 'Fable'
@@ -154,6 +195,8 @@ export function modelLabel(model: ModelPreference): string {
     case 'haiku': return 'Haiku'
     case 'codex-frontier': return runtimeCodexLabels[model] ?? 'GPT Frontier'
     case 'codex-balanced': return runtimeCodexLabels[model] ?? 'GPT Balanced'
+    case 'cursor-grok': return runtimeCursorLabels[model] ?? 'Grok 4.5 Fast'
+    case 'cursor-composer': return runtimeCursorLabels[model] ?? 'Composer 2.5 Fast'
     case 'opus':
     default:
       return 'Opus'
@@ -167,6 +210,8 @@ export function modelShortLabel(model: ModelPreference): string {
     case 'haiku': return 'Haiku'
     case 'codex-frontier': return 'GPT Max'
     case 'codex-balanced': return 'GPT Bal'
+    case 'cursor-grok': return 'Grok'
+    case 'cursor-composer': return 'Composer'
     case 'opus':
     default:
       return 'Opus'
@@ -180,6 +225,8 @@ export function modelButtonLabel(model: ModelPreference): string {
     case 'haiku': return 'HAIKU'
     case 'codex-frontier': return 'GPT MAX'
     case 'codex-balanced': return 'GPT BAL'
+    case 'cursor-grok': return 'GROK'
+    case 'cursor-composer': return 'CMP'
     case 'opus':
     default:
       return 'OPUS'
@@ -193,12 +240,13 @@ export function modelTag(model: ModelPreference): string {
     case 'haiku': return 'H'
     case 'codex-frontier': return 'GF'
     case 'codex-balanced': return 'GB'
+    case 'cursor-grok': return 'GK'
+    case 'cursor-composer': return 'C2'
     case 'opus':
     default:
       return 'O'
   }
 }
-
 export function modelBracketTag(model: ModelPreference): string {
   return ` [${modelTag(model)}]`
 }