@gotcos/glasses-server 6.79.2 → 6.81.0

package/server/routes/transcribe-stream.ts

@@ -1,5 +1,6 @@
 import { MacParakeetUnavailableError, transcribeMacParakeet } from '../lib/mac-recording-asr.js'
 import { getMeetingStore } from '../lib/meeting-store.js'
+import { appendAutonomousSaveLog, getStopIntentStore, savedChunkReplay, type StopIntent } from '../lib/meeting-stop-intents.js'
 import { MAC_AUDIO, MAC_CAPTURE_ID, persistMacChunkReceipt, macError, registerMacRecording, requireMacRecording, readMacRecording, validateMacWav } from '../lib/mac-recording.js'
 import { AUTO_ENROLL_THRESHOLD } from '../lib/voiceprint-floor.js'
 import { readSpeakerPolicy, policyLabel, type SpeakerMode } from '../lib/meeting-speaker-policy.js'
@@ -2164,6 +2165,47 @@ interface StreamCandidateInput {
   mode?: string
 }
 
+/**
+ * 6.81.0: the phone re-sends a chunk after the server saved its meeting on its own.
+ *
+ * WHY. The server saves a stopped meeting itself only once it holds every chunk, so any chunk
+ * the phone still lists as unconfirmed is one whose upload reached the Mac and whose answer
+ * was lost while the phone was off screen. Before 6.81.0 such a replay was refused 410 and the
+ * phone, holding a closed meeting with "unconfirmed" audio, called it a collision and kept the
+ * audio forever. The saved meeting already holds that chunk, so it answers with the saved
+ * text, exactly as a live session answers a replayed index, and the phone adopts the receipt.
+ *
+ * ONLY for meetings the SERVER saved after a Stop: every other closed session answers 410 as
+ * before. A chunk the saved meeting never held is still refused, and is logged loudly, because
+ * the finalizer's rule (never save an incomplete capture) says it cannot happen.
+ */
+function replayAfterAutonomousSave(sessionId: string, chunkIndex: number): StreamChunkCompletionResponse | null {
+  let intent: StopIntent | null
+  try { intent = getStopIntentStore().get(sessionId) } catch { return null }
+  if (!intent || intent.state !== 'saved' || intent.savedBy !== 'server' || !intent.sidecarPath) return null
+  const closed = closedSessionRecords.get(sessionId)
+  const replay = savedChunkReplay(intent.sidecarPath, chunkIndex, closed?.asrCompletedIndices ?? [])
+  const store = getStopIntentStore()
+  if (!replay) {
+    store.update(sessionId, { lateRefused: (intent.lateRefused ?? 0) + 1 })
+    const fields = { sessionId, chunkIndex, finalChunkIndex: intent.finalChunkIndex, lateRefused: (intent.lateRefused ?? 0) + 1 }
+    console.warn(`[meeting/auto-save] late_chunk_refused ${sessionId} ${JSON.stringify(fields)}`)
+    appendAutonomousSaveLog('late_chunk_refused', fields)
+    return null
+  }
+  const at = Date.now()
+  store.update(sessionId, {
+    lateReplays: (intent.lateReplays ?? 0) + 1,
+    ...(intent.phoneConfirmedAt ? {} : { phoneConfirmedAt: at, phoneConfirmedBy: 'chunk_replay' }),
+  })
+  const fields = { sessionId, chunkIndex, kind: replay.kind, lateReplays: (intent.lateReplays ?? 0) + 1, sinceSaveMs: at - (intent.savedAt ?? at) }
+  console.log(`[meeting/auto-save] late_replay ${sessionId} ${JSON.stringify(fields)}`)
+  appendAutonomousSaveLog('late_replay', fields)
+  if (!intent.phoneConfirmedAt) appendAutonomousSaveLog('phone_confirmed', { sessionId, via: 'chunk_replay', sinceSaveMs: at - (intent.savedAt ?? at) })
+  if (replay.kind === 'canonical') return canonicalChunkResponse(replay.chunk as unknown as TranscriptChunk, sessionId, chunkIndex)
+  return emptyChunkResponse({ text: '', speaker: 'Ext', elapsed: 0, canonical: false }, sessionId, chunkIndex)
+}
+
 async function processStreamChunk(opts: {
   sessionId: string
   chunkIndex: number
@@ -2182,7 +2224,12 @@ async function processStreamChunk(opts: {
   const tReq = performance.now()
   validateSessionId(sessionId)
   validateChunkIndex(chunkIndex)
-  if (isSessionDeleted(sessionId)) throw makeHttpError(410, 'session is closed', 'session_closed')
+  if (isSessionDeleted(sessionId)) {
+    // 6.81.0: a meeting the server saved on its own answers a chunk it already holds.
+    const replay = replayAfterAutonomousSave(sessionId, chunkIndex)
+    if (replay) return replay
+    throw makeHttpError(410, 'session is closed', 'session_closed')
+  }
   if (audioBuffer.length < 100) throw makeHttpError(400, 'audio too short', 'audio_too_short')
 
   const audioSha256 = sha256Hex(audioBuffer)

package/shared/key-preference.ts

@@ -0,0 +1,57 @@
+// Key lanes (K1, plan v4 section 5.1): the ONE parser that may read a key profile out of a model
+// preference. `isModelPreference` and `normalizeModelPreference` (model-preference.ts) stay
+// closed and unchanged, so every site that does not call parsePreference keeps refusing a
+// profile exactly as 6.79.0 does. Call this only at the sites plan 5.2 marks Accept.
+//
+// Encoding: a profile-bound preference is `profile:<id>`. The prefix keeps a profile id from ever
+// colliding with a model slot name (`opus` is a valid id shape). On `/v1` a profile is offered as
+// `cos-key-<id>` (plan 9.4), handled before `resolveModel` and only for profiles that opt in.
+import { normalizeModelPreference, type ModelPreference } from './model-preference.js'
+
+export const KEY_PROFILE_ID_RE = /^[a-z0-9][a-z0-9-]{0,31}$/
+export const KEY_PROFILE_PREFERENCE_PREFIX = 'profile:'
+export const V1_KEY_MODEL_PREFIX = 'cos-key-'
+
+export type ParsedPreference =
+  | { kind: 'model'; value: ModelPreference }
+  | { kind: 'profile'; id: string }
+
+export function isKeyProfileId(value: unknown): value is string {
+  return typeof value === 'string' && KEY_PROFILE_ID_RE.test(value)
+}
+
+/** `profile:<id>`, or throws on a malformed id (a caller bug, never user input). */
+export function profilePreference(id: string): string {
+  if (!isKeyProfileId(id)) throw new Error('invalid key profile id')
+  return KEY_PROFILE_PREFERENCE_PREFIX + id
+}
+
+/**
+ * A model slot (normalized exactly as normalizeModelPreference does, so `codex-high` still
+ * migrates), a `profile:<id>`, or undefined for anything else. Never throws.
+ */
+export function parsePreference(value: unknown): ParsedPreference | undefined {
+  const model = normalizeModelPreference(value)
+  if (model) return { kind: 'model', value: model }
+  if (typeof value !== 'string' || !value.startsWith(KEY_PROFILE_PREFERENCE_PREFIX)) return undefined
+  const id = value.slice(KEY_PROFILE_PREFERENCE_PREFIX.length)
+  return isKeyProfileId(id) ? { kind: 'profile', id } : undefined
+}
+
+/** True only for a well-formed `profile:<id>`. A model slot is false. */
+export function isProfilePreference(value: unknown): boolean {
+  return parsePreference(value)?.kind === 'profile'
+}
+
+/** `/v1` model name for a profile (plan 9.4). */
+export function v1KeyModelName(id: string): string {
+  if (!isKeyProfileId(id)) throw new Error('invalid key profile id')
+  return V1_KEY_MODEL_PREFIX + id
+}
+
+/** The profile id in a `cos-key-<id>` `/v1` model name, or undefined. */
+export function parseV1KeyModelName(value: unknown): string | undefined {
+  if (typeof value !== 'string' || !value.startsWith(V1_KEY_MODEL_PREFIX)) return undefined
+  const id = value.slice(V1_KEY_MODEL_PREFIX.length)
+  return isKeyProfileId(id) ? id : undefined
+}

package/shared/model-preference.ts

@@ -208,7 +208,23 @@ export function resetRuntimeCursorModelLabels(): void {
   delete runtimeCursorLabels[CURSOR_COMPOSER_MODEL]
 }
 
-export function modelLabel(model: ModelPreference): string {
+/**
+ * Key lanes K1 (plan 5.2 labels): a caller that renders a key-profile turn passes the profile
+ * record, and its label wins. With no profile passed every label below is the 6.79.0 one,
+ * including the `'Opus'` default. `isModelPreference` stays closed: a profile is never a slot.
+ */
+export interface ModelLabelProfile {
+  label: string
+}
+
+function profileLabel(profile: ModelLabelProfile | undefined, max: number): string | undefined {
+  const label = typeof profile?.label === 'string' ? profile.label.trim() : ''
+  return label ? Array.from(label).slice(0, max).join('') : undefined
+}
+
+export function modelLabel(model: ModelPreference, profile?: ModelLabelProfile): string {
+  const fromProfile = profileLabel(profile, 40)
+  if (fromProfile) return fromProfile
   switch (model) {
     case 'fable': return 'Fable'
     case 'sonnet': return 'Sonnet'
@@ -224,7 +240,9 @@ export function modelLabel(model: ModelPreference): string {
   }
 }
 
-export function modelShortLabel(model: ModelPreference): string {
+export function modelShortLabel(model: ModelPreference, profile?: ModelLabelProfile): string {
+  const fromProfile = profileLabel(profile, 12)
+  if (fromProfile) return fromProfile
   switch (model) {
     case 'fable': return 'Fable'
     case 'sonnet': return 'Sonnet'