@gotcos/glasses-server 6.78.2 → 6.79.1

package/server/routes/live-cues.ts

@@ -6,6 +6,8 @@
 // GET  /live-cues/status               -> engine snapshot + capability
 // GET  /live-cues/v2/settings           -> { enabled, source: env|setting|default, capability }       (6.76.2)
 // POST /live-cues/v2/settings { enabled } -> same shape; 409 { error: 'env_forced' } when env forces v2 on
+// POST /live-cues/feedback { sessionId, cueId, verdict, note? } -> { ok, cueId, verdict, vote }                 (6.79.0)
+// GET  /live-cues/history?days=7&sessionId=a,b&unrated=1&limit=200 -> { v: 1, cues, counts, truncated, skipped, maxCuesPerMeeting, meetings? } (6.79.0)
 
 import { Router } from 'express'
 import { errMsg } from '../lib/utils.js'
@@ -16,7 +18,8 @@ import {
   LiveCuesArmError,
 } from '../lib/live-cues-engine.js'
 import { liveCuesCapability } from '../lib/live-cues-capability.js'
-import { LiveCuesV2ArmError, liveCuesV2, liveCuesV2Advertised, liveCuesV2Enabled, liveCuesV2SettingsView, peekLiveCuesV2, setLiveCuesV2Enabled } from '../lib/live-cues-v2.js'
+import { LIVE_CUES_V2_LIMITS, LiveCuesV2ArmError, liveCuesV2, liveCuesV2Advertised, liveCuesV2Enabled, liveCuesV2MeetingCounters, liveCuesV2SettingsView, peekLiveCuesV2, setLiveCuesV2Enabled } from '../lib/live-cues-v2.js'
+import { LIVE_CUE_VERDICTS_PROTOCOL, LIVE_CUE_VERDICT_LIMITS, VerdictsUnreadableError, isCueVerdict, liveCueVerdicts } from '../lib/live-cue-verdicts.js'
 
 const SESSION_ID = /^[A-Za-z0-9:_-]{3,96}$/
 const CUE_ID = /^[A-Za-z0-9-]{8,64}$/
@@ -80,6 +83,8 @@ liveCuesRouter.get('/live-cues/status', (req, res) => {
     capability: liveCuesCapability(),
     sessions: getLiveCuesStatus(),
     ...(liveCuesV2Advertised() ? { v2: liveCuesV2Advertised() } : {}),
+    // 6.79.0: always, so Control can rate past cues with v2 switched off.
+    verdicts: { protocol: LIVE_CUE_VERDICTS_PROTOCOL },
   })
 })
 
@@ -95,17 +100,87 @@ liveCuesRouter.post('/live-cues/pause', (req, res) => {
   return res.json(liveCuesV2().setPaused(sessionId, paused, seq as number | undefined))
 })
 
-// POST /live-cues/feedback { sessionId, cueId, vote: 'up'|'down', reason? } -> { ok, knownCue }
+// POST /live-cues/feedback { sessionId, cueId, vote: 'up'|'down', reason? } -> { ok, knownCue }   (the lens; unchanged)
+// POST /live-cues/feedback { sessionId, cueId, verdict, note? } -> { ok, cueId, verdict, vote }    (COS Control, 6.79.0)
 liveCuesRouter.post('/live-cues/feedback', (req, res) => {
-  const body = (req.body ?? {}) as { cueId?: unknown; vote?: unknown; reason?: unknown }
+  const body = (req.body ?? {}) as { cueId?: unknown; vote?: unknown; reason?: unknown; verdict?: unknown; note?: unknown }
   const sessionId = bodySessionId(req.body)
   const cueId = typeof body.cueId === 'string' ? body.cueId.trim() : ''
+  if (body.verdict !== undefined) {
+    // Exactly one of vote and verdict: a body carrying both is ambiguous, so neither is applied.
+    if (body.vote !== undefined || !SESSION_ID.test(sessionId) || !CUE_ID.test(cueId)
+        || !(isCueVerdict(body.verdict) || body.verdict === 'clear') || (body.note !== undefined && typeof body.note !== 'string')) {
+      return res.status(400).json({ error: 'sessionId, cueId and verdict (useful|late|repeat|wrong|obvious|clear) required, without vote', reason: 'invalid_request' })
+    }
+    // Before the v2 gate: last week's cues are rated from the log. peek, never liveCuesV2(): a v2-off server must not build
+    // the engine (it constructs the Jev and SubQ clients) just to answer a rating.
+    try {
+      const result = liveCueVerdicts().rate({ sessionId, cueId, verdict: body.verdict, note: body.note as string | undefined }, liveCueOwner(cueId))
+      if (!result.ok && result.error === 'unknown_cue') return res.status(404).json({ error: 'unknown cue', reason: result.error })
+      if (!result.ok) return res.status(409).json({ error: 'this cue belongs to another meeting', reason: result.error })
+      return res.json(result.response)
+    } catch (error) {
+      if (error instanceof VerdictsUnreadableError) return res.status(503).json({ error: 'the verdicts file is unreadable', reason: error.code })
+      return res.status(500).json({ error: 'verdict_write_failed' })
+    }
+  }
   if (!SESSION_ID.test(sessionId) || !CUE_ID.test(cueId) || (body.vote !== 'up' && body.vote !== 'down')
       || (body.reason !== undefined && typeof body.reason !== 'string')) {
     return res.status(400).json({ error: 'sessionId, cueId and vote (up|down) required', reason: 'invalid_request' })
   }
   if (!liveCuesV2Enabled()) return res.status(404).json({ error: 'live cues v2 is off', reason: 'v2_disabled' })
-  return res.json(liveCuesV2().recordFeedback({ sessionId, cueId, vote: body.vote, reason: body.reason as string | undefined }))
+  const result = liveCuesV2().recordFeedback({ sessionId, cueId, vote: body.vote, reason: body.reason as string | undefined })
+  // Kept beside any verdict, never over it, for a cue known under this meeting. Best effort: the lens answer is the same.
+  try { liveCueVerdicts().vote(sessionId, cueId, body.vote, liveCueOwner(cueId)) } catch (error) { console.warn(`[live-cues] lens vote not stored: ${errMsg(error)}`) }
+  return res.json(result)
+})
+
+/** The meeting the running engine holds this cue for, if an engine exists. Never creates one. */
+function liveCueOwner(cueId: string): string | null {
+  return peekLiveCuesV2()?.findCue(cueId)?.sessionId ?? null
+}
+
+// GET /live-cues/history?days=7&sessionId=a,b&unrated=1&limit=200 (6.79.0). Oldest first, the newest `limit` rows; counts
+// cover the window after the sessionId filter. Not gated on the v2 switch, and no maintenance lease (a 15 s poll must
+// never hold up an update drain). `meetings` (only with sessionId) are the durable counters, so Control never derives them.
+function intParam(raw: unknown, fallback: number, min: number, max: number): number | null {
+  if (raw === undefined) return fallback
+  if (typeof raw !== 'string' || !/^\d{1,4}$/.test(raw)) return null
+  const n = Number(raw)
+  return n >= min && n <= max ? n : null
+}
+/** Absent or empty: no filter ([]). Else up to 5 comma-separated ids (a saved meeting can hold several captures). */
+function sessionIdsParam(raw: unknown): string[] | null {
+  if (raw === undefined) return []
+  if (typeof raw !== 'string') return null
+  if (!raw.trim()) return []
+  const ids = [...new Set(raw.split(',').map(x => x.trim()))]
+  return ids.length <= LIVE_CUE_VERDICT_LIMITS.maxSessionIds && ids.every(id => SESSION_ID.test(id)) ? ids : null
+}
+liveCuesRouter.get('/live-cues/history', (req, res) => {
+  res.set('Cache-Control', 'private, no-store')
+  const L = LIVE_CUE_VERDICT_LIMITS
+  const days = intParam(req.query.days, L.defaultDays, 1, L.maxDays)
+  const limit = intParam(req.query.limit, L.defaultLimit, 1, L.maxLimit)
+  const sessionIds = sessionIdsParam(req.query.sessionId)
+  const unrated = req.query.unrated
+  if (days === null || limit === null || sessionIds === null || (unrated !== undefined && unrated !== '1' && unrated !== '0')) {
+    return res.status(400).json({ error: 'days 1..30, limit 1..1000, unrated 0|1 and up to 5 valid sessionIds', reason: 'invalid_request' })
+  }
+  try {
+    const verdicts = liveCueVerdicts()
+    const history = verdicts.history({ days, limit, unrated: unrated === '1', ...(sessionIds.length ? { sessionIds } : {}) })
+    const C = LIVE_CUES_V2_LIMITS
+    const meetings = sessionIds.length ? Object.fromEntries(sessionIds.map(id => {
+      // The engine's counters expire 24 h after a meeting; past that the log's count stands in and writerCalls is unknown.
+      const counters = liveCuesV2MeetingCounters(id)
+      return [id, { cues: counters?.cues ?? verdicts.loggedCues(id), cap: C.maxCuesPerMeeting, writerCalls: counters?.writerCalls ?? null, writerCap: C.maxWriterCallsPerMeeting }]
+    })) : undefined
+    return res.json({ ...history, maxCuesPerMeeting: C.maxCuesPerMeeting, ...(meetings ? { meetings } : {}) })
+  } catch (error) {
+    if (error instanceof VerdictsUnreadableError) return res.status(503).json({ error: 'the verdicts file is unreadable', reason: error.code })
+    return res.status(500).json({ error: 'history_unavailable' })
+  }
 })
 
 // COS Control's live cues v2 toggle (6.76.2). Token-authenticated like every /api route. The setting lives in this server's

package/server/routes/prompt-drafts.ts

@@ -2,8 +2,7 @@ import { isDictationCleanModel, type DictationCleanModel } from '../lib/dictatio
 import { Router } from 'express'
 import { createHash } from 'node:crypto'
 import type { Response } from 'express'
-import { existsSync, mkdirSync, readFileSync } from 'node:fs'
-import { resolve, dirname } from 'node:path'
+import { resolve } from 'node:path'
 import {
   createPromptDraft,
   loadPromptDraftMeta,
@@ -43,11 +42,11 @@ import { transcribeWhisperPreview } from '../lib/whisper-preview.js'
 import { currentDictationPlan, runParakeetDictation } from '../lib/dictation-stt.js'
 import { dictationSlotForMode, legacyDictationKey, type DictationPlan } from '../lib/stt-settings.js'
 import { autoCleanDictation, AUTOCLEAN_MAX_CHARS } from '../lib/dictation-clean.js'
+import { fillerPassEnabled, stripDisfluencies } from '../lib/dictation-fillers.js'
+import { polishBudgetExhausted, recordPolishCall, type PolishBucket } from '../lib/dictation-polish-budget.js'
 import { getVocabulary } from '../lib/profile.js'
 import { createBreaker } from '../lib/claude-circuit.js'
 import { logTokenAudit } from '../lib/token-audit.js'
-import { atomicWriteFileSync } from '../lib/atomic-fs.js'
-import { dataPath } from '../lib/data-dir.js'
 import { emitDisplay } from '../lib/display-bus.js'
 import {
   acquireMaintenanceWork,
@@ -83,26 +82,10 @@ const autoCleanBreakers = {
   'luna-5.6-fast': createBreaker({ label: 'dictation-autoclean-luna' }),
   haiku: createBreaker({ label: 'dictation-autoclean-haiku' }),
 }
-const autoCleanCountFile = () => process.env.COS_DICTATION_AUTOCLEAN_COUNT_FILE || dataPath('.dictation_autoclean_count.json')
 const autoCleanDefaultEnabled = () => ['1', 'true', 'on'].includes((process.env.COS_DICTATION_AUTOCLEAN ?? '').toLowerCase())
-const autoCleanDailyCap = () => {
-  const value = Number.parseInt(process.env.COS_DICTATION_AUTOCLEAN_MAX_PER_DAY || '200', 10)
-  return Number.isFinite(value) && value > 0 ? value : 200
-}
-function autoCleanCountToday(): number {
-  try {
-    const raw = JSON.parse(readFileSync(autoCleanCountFile(), 'utf-8'))
-    if (raw?.date === new Date().toISOString().slice(0, 10) && Number.isFinite(raw?.count)) return raw.count
-  } catch {}
-  return 0
-}
-function recordAutoCleanCall(): void {
-  try {
-    const file = autoCleanCountFile()
-    if (!existsSync(dirname(file))) mkdirSync(dirname(file), { recursive: true })
-    atomicWriteFileSync(file, JSON.stringify({ date: new Date().toISOString().slice(0, 10), count: autoCleanCountToday() + 1 }), { mode: 0o600 })
-  } catch {}
-}
+
+/** 6.79.1, additive on finalize answers: why the polish model did not run (or did not finish). */
+export type PolishSkipped = 'disabled' | 'too_long' | 'breaker_open' | 'daily_cap' | 'failed'
 
 interface AutoCleanRequest { enabled?: boolean; model?: DictationCleanModel }
 function routeAutoClean(req: { body?: any; query?: any }): AutoCleanRequest {
@@ -114,7 +97,10 @@ function routeAutoClean(req: { body?: any; query?: any }): AutoCleanRequest {
   return { enabled, model: isDictationCleanModel(rawModel) ? rawModel : undefined }
 }
 
-async function cleanOutboundDictation(text: string, opts: AutoCleanRequest & { signal?: AbortSignal }): Promise<string> {
+async function cleanOutboundDictation(
+  text: string,
+  opts: AutoCleanRequest & { bucket: PolishBucket; signal?: AbortSignal },
+): Promise<{ text: string; polishSkipped?: PolishSkipped }> {
   let cleaned = applyNegativeRules(applyCorrections(text)).replace(/\s+/g, ' ').trim() || text
   // applyCorrections above is an EXACT string map, so it only fixes misspellings someone
   // already hand-authored. A novel miss ("Rileyy" for Riley, "Exampel" for Example) sails
@@ -137,24 +123,28 @@ async function cleanOutboundDictation(text: string, opts: AutoCleanRequest & { s
   } catch (fuzzyErr: any) {
     console.warn(`[prompt-draft] Fuzzy correction failed (non-fatal): ${fuzzyErr?.message ?? fuzzyErr}`)
   }
-  if (!(opts.enabled ?? autoCleanDefaultEnabled())) return cleaned
+  // 6.79.1: um/uh never survive a skipped polish. Meeting lines stay faithful.
+  if (opts.bucket !== 'meeting' && fillerPassEnabled()) cleaned = stripDisfluencies(cleaned)
+  if (!(opts.enabled ?? autoCleanDefaultEnabled())) return { text: cleaned, polishSkipped: 'disabled' }
   const model = opts.model ?? 'haiku'
   const autoCleanBreaker = autoCleanBreakers[model]
-  if (cleaned.length > AUTOCLEAN_MAX_CHARS || autoCleanBreaker.isOpen() || autoCleanCountToday() >= autoCleanDailyCap()) return cleaned
+  if (cleaned.length > AUTOCLEAN_MAX_CHARS) return { text: cleaned, polishSkipped: 'too_long' }
+  if (autoCleanBreaker.isOpen()) return { text: cleaned, polishSkipped: 'breaker_open' }
+  if (polishBudgetExhausted(opts.bucket)) return { text: cleaned, polishSkipped: 'daily_cap' }
   const startedAt = Date.now()
-  recordAutoCleanCall()
+  recordPolishCall(opts.bucket)
   try {
     const polished = (await autoCleanDictation(cleaned, getVocabulary(), { model, signal: opts.signal })).trim()
     autoCleanBreaker.recordSuccess()
     logTokenAudit({
       source: 'g2-dictation-autoclean', model, inputChars: cleaned.length, outputChars: polished.length,
-      durationMs: Date.now() - startedAt, caller: 'dictation_autoclean',
+      durationMs: Date.now() - startedAt, caller: `dictation_autoclean_${opts.bucket}`,
     })
-    return polished || cleaned
+    return { text: polished || cleaned }
   } catch (err: any) {
     autoCleanBreaker.recordFailure()
     console.warn(`[prompt-draft] auto-clean failed (glossary-only): ${err?.message ?? err}`)
-    return cleaned
+    return { text: cleaned, polishSkipped: 'failed' }
   }
 }
 
@@ -178,12 +168,14 @@ promptDraftsRouter.post('/dictation/finalize', async (req, res) => {
 
   const abort = new AbortController()
   res.on('close', () => { if (!res.writableEnded) abort.abort() })
-  const finalText = await cleanOutboundDictation(text, {
+  const { text: finalText, polishSkipped } = await cleanOutboundDictation(text, {
     enabled: true,
     model,
+    bucket: surface,
     signal: abort.signal,
   })
-  res.json({ text: finalText, surface, polished: finalText !== text })
+  // 6.79.1: polishSkipped only when the model did not polish, so a polished answer is unchanged.
+  res.json({ text: finalText, surface, polished: finalText !== text, ...(polishSkipped ? { polishSkipped } : {}) })
 })
 
 async function readRawBody(req: AsyncIterable<Buffer | Uint8Array | string>): Promise<Buffer> {
@@ -446,7 +438,7 @@ async function finalizeDraft(draftId: string, mode: 'hq' | 'fast', autoClean: Au
     await markPromptDraftError(draftId, 'No speech detected')
     throw new NoSpeechDetectedError()
   }
-  const finalText = await cleanOutboundDictation(text, { ...autoClean, signal })
+  const { text: finalText, polishSkipped } = await cleanOutboundDictation(text, { ...autoClean, bucket: 'prompt_draft', signal })
   const finalized = await markPromptDraftFinalized(draftId, finalText)
   const qualities = transcriptRecords.map(record => record.actualQuality)
   const actualQuality: 'hq' | 'fast' | 'cloud' = qualities.includes('cloud')
@@ -474,6 +466,8 @@ async function finalizeDraft(draftId: string, mode: 'hq' | 'fast', autoClean: Au
     // 6.73.0, additive.
     engine: engines.length === 1 ? engines[0] : engines.length === 0 ? plan.engine : 'mixed',
     ...(engineReason ? { engineReason } : {}),
+    // 6.79.1, additive.
+    ...(polishSkipped ? { polishSkipped } : {}),
   }
 }