@gotcos/glasses-server 6.94.2 → 6.94.4

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 6.94.4 - SubQ session find shows every session that fits
+
+2026-11-01. Pairs with COS Control 0.5.363. Only affects people who chose SubQ and said yes to find sessions by meaning. Jev and everything else are unchanged.
+
+- SubQ now scores each likely session on its own, as Jev does. Before, its scores across all sessions added up to one against a floor of 0.5, so usually one row could show and others that fit were hidden.
+- Measured through the real route on 26 of 27 queries: the right session was shown in 19 of 20 and first in 18. An answer 51 days old is now found. Of 6 no-answer queries, 5 say nothing close and 1 shows weak rows marked possible. Wrong rows can still score high below the right one.
+- A SubQ search now uses about 10,500 to 24,000 tokens against its 3M daily cap.
+
+## 6.94.3 - Search sessions by meaning, and accented speaker names
+
+2026-11-01. Pairs with COS Control 0.5.363. Control 0.5.361 and older keep working and never call the new route.
+
+**New, and off until you say yes in Control.**
+
+- `POST /api/agent-sessions/find` asks your decision model (Jev by default, SubQ if chosen) which recent sessions a few typed words refer to, and returns up to 5 rows in order of likelihood. It answers only for the provider you consented to in Control, and refuses before reading any session otherwise.
+- Each search sends the typed words, plus the title and first 150 characters of the first prompt from up to 254 recent sessions, then up to 508 if the first pass finds nothing strong. Emails, URLs, links to an IP address or localhost, home-folder paths (not every file path) and key-shaped text are removed first. Names and other details are not. SubQ keeps what it is sent. Archived, keyed and scheduled sessions are left out.
+- Its own daily caps (3M tokens per provider), breaker and `COS_SESSION_FIND=0` switch. `GET /api/decision-provider` adds `capabilities.sessionFind`.
+
+**Default-on, no setting.**
+
+- Accented speaker names now match in either Unicode form. "Yes, this is Brigitta Pólya" failed with "No chunk in this meeting is labelled" because Control's helper hands names over decomposed. Meeting and voice routes read names as NFC, compare both sides, and store new names as NFC. Merge, delete-person, calibration, the rename fan-out and the embeddings manager match a stored name in either form, and a meeting record id matches in either form too (a decomposed id from Control's helper opens the same record). Merge refuses if any stored copy of a name is below the similarity floor. Names already saved are not rewritten.
+
+No other route changes. The session list and search are unchanged.
+
 ## 6.94.2 - Scoped profile matches for saved Mac recordings
 
 2026-10-28. Compatible with COS Control 0.5.352; no Control or glasses package change required.

package/README.md

@@ -699,6 +699,10 @@ flag a Mac rename is text only. `GET /api/health` reports `capabilities.macLiveV
 The saved meeting is relabeled by the whole-meeting pass. Live numbers are kept;
 voices the live path did not prove are numbered above them at save.
 
+### Session find by meaning (6.94.3)
+
+`POST /api/agent-sessions/find` backs ⌘K in COS Control 0.5.363. It is off until the person says yes for one provider in Control. See `docs/decision-providers.md` for what leaves the Mac, the caps and `COS_SESSION_FIND=0`.
+
 ### Saved Mac profile reconciliation (6.94.2)
 
 After transcription and diarization, eligible Mac recordings receive a bounded

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gotcos/glasses-server",
-  "version": "6.94.2",
+  "version": "6.94.4",
   "description": "COS Glasses: self-hosted AI heads-up-display server for Even G2 smart glasses, powered by Claude Code, Codex, Cursor Agent CLI, or local Ollama",
   "type": "module",
   "bin": {
@@ -52,6 +52,7 @@
     "!server/scripts/work-intake-mutation-gate.mjs",
     "!server/scripts/work-progress-mutation-gate.mjs",
     "!server/scripts/work-search-mutation-gate.mjs",
+    "!server/scripts/session-find-redact-mutation-gate.mjs",
     "!server/scripts/fact-check-mutation-gate.mjs",
     "!server/scripts/stale-session-mutation-gate.mjs",
     "!server/scripts/autonomous-save-mutation-gate.mjs",

package/server/index.ts

@@ -159,6 +159,8 @@ import { createWorkHandoffRequestsRouter } from './routes/work-handoff-requests.
 import { createSubqKeyRouter } from './routes/subq-key.js'
 import { createDecisionProviderRouter } from './routes/decision-provider.js'
 import { createJevRouter } from './routes/jev.js'
+import { createSessionFindRouter } from './routes/session-find.js'
+import { isSessionFindPost } from './lib/session-find.js'
 import { createWorkChatRouter } from './routes/work-chat.js'
 import { createWorkOrchestratorRouter } from './routes/work-orchestrator.js'
 import { createWorkLensRoundsRouter } from './routes/work-lens-rounds.js'
@@ -394,6 +396,8 @@ app.use('/api', (req, res, next) => {
   // 6.65.0: a POST that only reads (Work search: a board read and one Jev question) is not a mutation. See
   // lib/work-search.ts isReadOnlyApiPost for why holding the lease would hurt and why skipping it is safe.
   if (isReadOnlyApiPost(req.method, req.path)) return next()
+  // Session find (Control 0.5.363) reads the session store and asks a model; it writes only its own token ledger. See lib/session-find.ts.
+  if (isSessionFindPost(req.method, req.path)) return next()
   // V2 video original chunks are bounded to the advertised session size (1 MiB
   // on new sessions, 256 KiB on leftover drafts) and commit through the upload
   // registry's own generation lock. Holding the global mutation lease while
@@ -856,6 +860,8 @@ app.use('/api', createJevRouter(workReviewRuntime ? { review: async id => workRe
 app.use('/api', createDecisionProviderRouter())
 app.use('/api', createSubqKeyRouter())
 app.use('/api', createWorkSearchRouter())
+// Find a session by meaning (Control 0.5.363): consent per provider, its own ledgers and breakers (lib/session-find.ts).
+app.use('/api', createSessionFindRouter())
 app.use('/api', createWorkChatRouter())
 // 6.83.0 Work orchestrator: Control's Work snapshot, the planner input and plan usage (docs/work-orchestrator.md).
 app.use('/api', createWorkOrchestratorRouter())

package/server/lib/decision-provider.ts

@@ -154,11 +154,13 @@ export function resetSubqDecisionClients(): void { configuredSubqClients.forEach
 /** A SubQ client built outside createDecisionClient (live cues, 6.76.2) still starts clean when a new key is saved. */
 export function trackSubqDecisionClient(client: SubqDecisionClient): SubqDecisionClient { configuredSubqClients.add(client); return client }
 /** Snapshot selection per workflow request. Separate clients and cache identities prevent stale cross-provider answers. */
-export function createDecisionClient(useCase: DecisionUseCase, jev: Pick<JevClient, 'ask'> = new JevClient(), env: NodeJS.ProcessEnv = process.env): DecisionClient {
+export function createDecisionClient(useCase: DecisionUseCase, jev: Pick<JevClient, 'ask'> = new JevClient(), env: NodeJS.ProcessEnv = process.env,
+  /** Optional: a SubQ ledger file and daily cap of this feature's own. Without it SubQ uses `subq-<useCase>-usage.json` and COS_SUBQ_DAILY_TOKENS. */
+  subq: { usageFile?: string; cap?: () => number } = {}): DecisionClient {
   const clients: Partial<Record<DecisionProvider, DecisionClient>> = {}
   const snapshot = (): DecisionClient => {
     const selected = selectedDecisionProvider(useCase, env)
-    if (!clients[selected]) clients[selected] = selected === 'subq' ? new SubqDecisionClient(fetch, () => new Date(), dataPath(`subq-${useCase}-usage.json`)) : {
+    if (!clients[selected]) clients[selected] = selected === 'subq' ? new SubqDecisionClient(fetch, () => new Date(), subq.usageFile ?? dataPath(`subq-${useCase}-usage.json`), undefined, subq.cap) : {
       provider: 'jev', async ask(state, questions, estimate, options) {
         if (options?.images?.length) throw new DecisionProviderError('decision_images_unsupported')
         return { ...await jev.ask(state, questions, estimate, options), provider: 'jev' }

package/server/lib/held-naming-batches.ts

@@ -1,4 +1,5 @@
 /** Durable held naming: server-stored preview, per-copy receipts, explicit recovery. */
+import { nfc, sameSpeakerName } from './speaker-name-nfc.js'
 import { createHash, randomUUID } from 'node:crypto'
 import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync, unlinkSync } from 'node:fs'
 import { dirname, join, resolve } from 'node:path'
@@ -27,12 +28,12 @@ export function resolveStoredName(name: string): {name:string;owner:boolean} {
   if (stored.length > 1) throw new HeldGroupError(400,'ambiguous_name','Multiple stored voices have that spelling. Rename the duplicate profiles first.',{names:stored.map(p=>p.name)})
   const owner = getOwnerSpeakerLabel()
   const isOwner = foldName(owner) === foldName(name.trim()) || (stored[0] && foldName(stored[0].name) === foldName(owner))
-  return {name:isOwner ? owner : stored[0]?.name ?? name.trim(),owner:!!isOwner}
+  return {name:isOwner ? owner : stored[0]?.name ?? nfc(name.trim()),owner:!!isOwner}
 }
 function voiceVersion(name: string) {
   const path = dataPath('voice-profiles.json')
   const profiles = readVoiceProfiles().profiles
-  return {storeMtime:existsSync(path)?statSync(path).mtimeMs:0,profileCount:profiles.length,targetSamples:profiles.find(p=>p.name===name)?.embeddings.length ?? 0}
+  return {storeMtime:existsSync(path)?statSync(path).mtimeMs:0,profileCount:profiles.length,targetSamples:profiles.find(p=>sameSpeakerName(p.name,name))?.embeddings.length ?? 0}
 }
 function evidenceVersion(refs:HeldSampleRef[]) {
   return hash([...new Set(refs.map(r=>r.sessionId))].sort().map(sessionId=>({sessionId,rows:readChunkEmbeddings(sessionId).rows.map(r=>({i:r.i,embedding:Array.from(r.embedding)})),cache:existsSync(dataPath('held-voice-embeddings',`${sessionId}.json`))?readFileSync(dataPath('held-voice-embeddings',`${sessionId}.json`),'utf8'):''})))
@@ -472,7 +473,7 @@ export async function undoHeldNaming(batchId:string,confirm:boolean){
  * enrolment/audio deletion off. Dry run neither records a preview nor writes a ledger. */
 export async function renameMeetingSpeaker(sessionId:string,from:string,to:string,options:{apply?:boolean;operationsDir?:string;expectedSidecarPath?:string}={}) : Promise<{copies:Array<{sidecarPath:string;meetingPath:string;labels:number;transcript:number;attendees:number;unresolvedTurns:number}>;batchId?:string;error?:string}> {
   if(options.operationsDir && resolveCosOperationsDir()!==realpathSync(options.operationsDir)) throw new Error('Operations root differs from the requested fan-out root')
-  if(from===to||!from.trim()||!to.trim())return{copies:[]}
+  if(sameSpeakerName(from,to)||!from.trim()||!to.trim())return{copies:[]}
   if(options.apply&&mutationBusy)throw new Error('Another naming is running; retry')
   let lock:Awaited<ReturnType<typeof acquireMeetingSyncLock>>|undefined
   let batch:BatchRecord|undefined
@@ -486,22 +487,22 @@ export async function renameMeetingSpeaker(sessionId:string,from:string,to:strin
     if(options.expectedSidecarPath && (!operations || realpathSync(operations.sidecarPath)!==realpathSync(options.expectedSidecarPath)))throw new Error('Session resolves to a different sidecar; duplicate or archived copy')
     const maps=copies.map(c=>validatedRawMap(c.doc))
     if(maps.some(map=>hash(map)!==hash(maps[0])))throw new Error('Meeting copies disagree on raw mapping')
-    const positions:number[]=copies[0].doc.chunks.flatMap((c:any,i:number)=>c.speaker===from?[i]:[])
+    const positions:number[]=copies[0].doc.chunks.flatMap((c:any,i:number)=>sameSpeakerName(c.speaker,from)?[i]:[])
     // Repair historical chunks-only renames too: HQ words still carry `from`
     // even when the compacted chunk already says `to` (the 6.27.10 trap).
     for(const c of copies)for(const segment of c.doc.batchSegments??[])for(const word of segment.speakerWords??[]){
-      if(word.speaker!==from)continue
+      if(!sameSpeakerName(word.speaker,from))continue
       const absolute=Number(segment.startElapsed??0)+Number(word.start)*1000
       let position=-1,distance=Infinity
       const raw=validatedRawMap(c.doc)
       raw.forEach((index,i)=>{if(index<segment.startChunkIdx||index>segment.endChunkIdx)return;const d=Math.abs(Number(c.doc.chunks[i].elapsed)-absolute);if(d<distance){distance=d;position=i}})
       if(distance>3500||position<0)throw new Error('Old HQ speaker has no safe raw chunk mapping')
-      if(![from,to].includes(c.doc.chunks[position].speaker))throw new Error('HQ speaker conflicts with an unrelated named chunk')
+      if(![from,to].some(n=>sameSpeakerName(n,c.doc.chunks[position].speaker)))throw new Error('HQ speaker conflicts with an unrelated named chunk')
       if(!positions.includes(position))positions.push(position)
     }
     positions.sort((a,b)=>a-b)
     if(!positions.length)return{copies:[]}
-    if(copies.some(c=>positions.some((i:number)=>![from,to].includes(c.doc.chunks[i]?.speaker))))throw new Error('Meeting copies disagree on prior speaker labels')
+    if(copies.some(c=>positions.some((i:number)=>![from,to].some(n=>sameSpeakerName(n,c.doc.chunks[i]?.speaker)))))throw new Error('Meeting copies disagree on prior speaker labels')
     const batchId=randomUUID()
     const edits=copies.map(c=>relabelSpeakerPositions(c.doc,c.blended?'':c.markdown,positions,to,batchId))
     const results=copies.map((c,i)=>({sidecarPath:c.sidecarPath,meetingPath:c.meetingPath,labels:positions.length,transcript:edits[i].transcript,attendees:edits[i].attendees,unresolvedTurns:edits[i].unresolvedTurns}))

package/server/lib/held-voice-groups.ts

@@ -62,6 +62,7 @@ import {
   greedyDiversitySelect,
   pairwiseSimilarityMatrix,
 } from './voice-enrolment-selection.js'
+import { sameSpeakerName } from './speaker-name-nfc.js'
 
 /** Where decoded-on-demand vectors are kept. One JSON file per held session. */
 export const HELD_EMBEDDING_CACHE_DIR = 'held-voice-embeddings'
@@ -432,12 +433,12 @@ export function suggestProfile(embedding: Float32Array, profiles: VoiceProfile[]
     if (!best || candidate.score > best.score) best = candidate
   }
   if (!best || best.anchor === null) return null
-  const winner = profiles.find(p => p.name === best!.name)!
+  const winner = profiles.find(p => sameSpeakerName(p.name, best!.name))!
   // Near-duplicate profile pairs represent an existing identity ambiguity, not
   // independent competing acoustic evidence. Do not let that pair erase the
   // margin against genuinely different voices. Never merge or rename here.
   const runnerUp = candidates.filter(c => c.name !== best!.name).filter(c => {
-    const other = profiles.find(p => p.name === c.name)!
+    const other = profiles.find(p => sameSpeakerName(p.name, c.name))!
     return profileSimilarity(winner, other) < HELD_NEAR_PROFILE_SIMILARITY
   }).reduce((score, c) => Math.max(score, c.score), 0)
   const margin = best.score - runnerUp
@@ -754,7 +755,7 @@ export function enrollHeldGroup(name: string, refs: HeldSampleRef[], opts: { dry
   const core = expand(coreReps)
   const leftBehind = expand(reps.filter(i => !coreSet.has(i))).map(s => ({ sessionId: s.sessionId, chunkIndex: s.chunkIndex })).sort(compareRefs)
 
-  const existing = readVoiceProfiles().profiles.find(p => p.name === name)
+  const existing = readVoiceProfiles().profiles.find(p => sameSpeakerName(p.name, name))
   // A primitive snapshot, taken BEFORE the loop: the store hands back its live
   // `embeddings` array by reference, and enrolment appends to that same array
   // until the first write invalidates the cache. Reading `.length` afterwards
@@ -826,7 +827,7 @@ export function projectHeldEnrollment(name: string, refs: HeldSampleRef[]): {
   const profiles = readVoiceProfiles().profiles.map(profile => ({
     ...profile, embeddings: profile.embeddings.map(row => [...row]), sources: [...(profile.sources ?? [])],
   }))
-  let target = profiles.find(profile => profile.name === name)
+  let target = profiles.find(profile => sameSpeakerName(profile.name, name))
   if (!target) { target = { name, embeddings: [], sources: [] }; profiles.push(target) }
   const selectedMembers: HeldSampleRef[] = []
   for (const embedding of selected) {

package/server/lib/keyed-sessions.ts

@@ -10,7 +10,7 @@
 // every check below is one failed stat. Reading never creates. Remove all keys (plan 12) keeps
 // this file on purpose: a keyed transcript stays refused after the keys are gone. A manual
 // `claude --resume` in a terminal is documented, not blocked.
-import { statSync } from 'node:fs'
+import { existsSync, lstatSync, readFileSync, statSync } from 'node:fs'
 import { dataPath } from './data-dir.js'
 import { readPrivateJsonFile, writePrivateJsonFile } from './key-store.js'
 import { registerKeyLanesStatusProvider } from './key-lanes.js'
@@ -83,6 +83,26 @@ export function listKeyedSessions(): KeyedSessionRecord[] {
   return [...byId.values()]
 }
 
+/**
+ * The same records, read so that a damaged file cannot pass for an empty one. listKeyedSessions reads a corrupt or unreadable
+ * file as "none", which is right for the places that refuse a keyed session (they fail open on a file nobody can read) and wrong for
+ * a place that must NOT send keyed text anywhere: a corrupt file sent keyed session text to a model in a probe. A missing file is
+ * none; a file that exists and is not the store's shape throws. Session find uses this; nothing else does.
+ */
+export function listKeyedSessionsStrict(): KeyedSessionRecord[] {
+  const byId = new Map<string, KeyedSessionRecord>()
+  const file = keyedSessionsPath()
+  if (existsSync(file)) {
+    const st = lstatSync(file)
+    if (st.isSymbolicLink() || !st.isFile()) throw new Error('keyed sessions file is not a plain file')
+    const parsed = JSON.parse(readFileSync(file, 'utf8')) as Partial<KeyedSessionsFile> | null
+    if (!parsed || typeof parsed !== 'object' || !Array.isArray(parsed.sessions) || !parsed.sessions.every(isRecord)) throw new Error('keyed sessions file is not readable')
+    for (const r of parsed.sessions) byId.set(r.id, r)
+  }
+  for (const r of memory.values()) if (!byId.has(r.id)) byId.set(r.id, r)
+  return [...byId.values()]
+}
+
 /** True once anything was ever recorded. The cheap short-circuit every refusing site starts with. */
 export function anyKeyedSessions(): boolean {
   return memory.size > 0 || fileRecords().length > 0

package/server/lib/mac-voice-assignment.ts

@@ -77,6 +77,7 @@ import {
   greedyDiversitySelect,
 } from './voice-enrolment-selection.js'
 import { VOICEPRINT_MIN_AUDIO_SEC } from './voiceprint-floor.js'
+import { sameSpeakerName } from './speaker-name-nfc.js'
 
 /** A turn shorter than this is not sliced out of a mixed chunk. */
 export const MAC_ASSIGN_MIN_SLICE_SEC = 3.0
@@ -239,7 +240,7 @@ export async function planMacVoiceAssignment(input: MacAssignInput): Promise<Mac
   if (isPlaceholderLabel(to)) return none('unknown_profile')
   if (input.ownerLabel && sameName(to, input.ownerLabel)) return none('owner_profile')
   let profile: { name: string; embeddings: number[][]; sources?: string[] } | undefined
-  try { profile = readVoiceProfiles().profiles.find(p => p.name === to) } catch { return none('store_unavailable') }
+  try { profile = readVoiceProfiles().profiles.find(p => sameSpeakerName(p.name, to)) } catch { return none('store_unavailable') }
   if (!profile) return none('unknown_profile')
   if (!chunkEmbeddingsEnabled()) return none('disabled')
   if (!isEmbeddingAvailable()) return none('store_unavailable')

package/server/lib/meeting-corrections.ts

@@ -27,6 +27,7 @@
 import { appendFileSync, existsSync, mkdirSync, readFileSync, readdirSync, statSync } from 'node:fs'
 import { join, resolve } from 'node:path'
 import { dataPath } from './data-dir.js'
+import { sameSpeakerName } from './speaker-name-nfc.js'
 
 export const CORRECTIONS_DIR = 'meeting-corrections'
 
@@ -268,7 +269,7 @@ export function currentLabelFor(sessionId: string, originalLabel: string): strin
   for (let hop = 0; hop < applied.length; hop++) {
     // Latest applied correction FROM the current label wins: a later human
     // decision supersedes an earlier one.
-    const next = [...applied].reverse().find(r => r.from === label)
+    const next = [...applied].reverse().find(r => sameSpeakerName(r.from, label))
     if (!next || seen.has(next.to)) break
     label = next.to
     seen.add(label)

package/server/lib/meeting-relabel-enrolment.ts

@@ -37,6 +37,7 @@
 // every future meeting. A wrong write is permanent and silent. So every step below
 // fails CLOSED: no mapping means no enrolment, never a fall back to positions.
 
+import { sameSpeakerName } from './speaker-name-nfc.js'
 import {
   chunkEmbeddingTtlMs,
   chunkEmbeddingsEnabled,
@@ -163,7 +164,7 @@ function missingReason(sidecar: Record<string, unknown>): EnrolmentSkipReason {
  *  append as a creation. */
 function profileExists(name: string): boolean {
   try {
-    return readVoiceProfiles().profiles.some(p => p.name === name)
+    return readVoiceProfiles().profiles.some(p => sameSpeakerName(p.name, name))
   } catch {
     // Unknowable is not "new". Claiming creation is the lie that matters here.
     return true

package/server/lib/meeting-relabel.ts

@@ -27,6 +27,7 @@
 // somebody else. Reported as `proseStale` instead.
 
 import { isVoiceLabel } from './mac-voice-labels.js'
+import { nameForms, nfc, sameSpeakerName } from './speaker-name-nfc.js'
 
 /** A label that would corrupt the file formats it gets written into. */
 export function invalidLabelReason(label: string): string | null {
@@ -75,6 +76,10 @@ export function relabelSidecarJson(
   to: string,
   chunks: number[] = [],
 ): RelabelOutcome<SidecarRelabelResult> {
+  // Names are NFC here whatever arrived (a decomposed spelling must never be written), and matched NFC on both sides, so a chunk
+  // already stored decomposed still counts as carrying `from`.
+  from = nfc(from)
+  to = nfc(to)
   if (from === to) return { ok: false, error: 'from and to are the same label' }
   for (const [which, label] of [['from', from], ['to', to]] as const) {
     const bad = invalidLabelReason(label)
@@ -100,7 +105,7 @@ export function relabelSidecarJson(
   if (restrict) {
     const mismatched = chunks.filter(i => {
       const row = rows[i]
-      return !row || typeof row !== 'object' || (row as Record<string, unknown>).speaker !== from
+      return !row || typeof row !== 'object' || !sameSpeakerName((row as Record<string, unknown>).speaker, from)
     })
     if (mismatched.length > 0) {
       return { ok: false, error: `chunks do not carry "${from}": ${mismatched.slice(0, 8).join(', ')}` }
@@ -111,11 +116,11 @@ export function relabelSidecarJson(
   let remainingWithFrom = 0
   rows.forEach((row, i) => {
     // The `typeof` half guards the cast below rather than any behaviour — a
-    // truthy non-object can never satisfy `.speaker === from`, so it is
+    // truthy non-object can never satisfy the NFC name match below, so it is
     // deliberately not claimed as tested.
     if (!row || typeof row !== 'object') return
     const r = row as Record<string, unknown>
-    if (r.speaker !== from) return
+    if (!sameSpeakerName(r.speaker, from)) return
     if (restrict && !restrict.has(i)) { remainingWithFrom++; return }
     r.speaker = to
     changed.push(i)
@@ -131,18 +136,18 @@ export function relabelSidecarJson(
   if (isVoiceLabel(to)) {
     // 6.90.0: a Mac `Voice N` placeholder never enters `speakers` (the store
     // keeps it out too), so merging into one adds nothing. Retire `from` only.
-    const at = speakers.indexOf(from)
+    const at = speakers.findIndex(x => sameSpeakerName(x, from))
     if (at >= 0 && remainingWithFrom === 0) speakers.splice(at, 1)
-  } else if (!speakers.includes(to)) {
+  } else if (!speakers.some(x => sameSpeakerName(x, to))) {
     // Replace in place when `from` is being fully retired, so the list keeps its
     // original ordering rather than moving the person to the end.
-    const at = speakers.indexOf(from)
+    const at = speakers.findIndex(x => sameSpeakerName(x, from))
     if (at >= 0 && remainingWithFrom === 0) speakers[at] = to
     else speakers.push(to)
   } else if (remainingWithFrom === 0) {
     // `to` already listed and `from` fully retired — merging a split identity.
     // Drop the old entry rather than leaving a name nothing is attributed to.
-    const at = speakers.indexOf(from)
+    const at = speakers.findIndex(x => sameSpeakerName(x, from))
     if (at >= 0) speakers.splice(at, 1)
   }
   doc.speakers = speakers
@@ -198,6 +203,8 @@ export function relabelMeetingMarkdown(
   to: string,
   options: { removeAttendee?: boolean } = {},
 ): RelabelOutcome<MarkdownRelabelResult> {
+  from = nfc(from)
+  to = nfc(to)
   if (from === to) return { ok: false, error: 'from and to are the same label' }
   for (const [which, label] of [['from', from], ['to', to]] as const) {
     const bad = invalidLabelReason(label)
@@ -215,7 +222,7 @@ export function relabelMeetingMarkdown(
     // Anchored at BOTH ends, and `[ \t]` rather than `\s` so a pattern can never
     // run past its own line. Without the end anchor, `- Theo M` matches the
     // PREFIX of `- Theo Marsh` and deleting it leaves the fragment `enry`.
-    const line = (label: string) => `^-[ \t]+${escapeRegExp(label)}[ \t]*$`
+    const line = (label: string) => `^-[ \t]+${nameForms(label, escapeRegExp)}[ \t]*$`
     // A de-attribution must DELETE the attendee bullet, never rename it. Renaming
     // writes `- Unidentified 2` into the attendee list as though it were a
     // person, and the COS pipeline that BUILDS attendees deliberately excludes
@@ -241,7 +248,7 @@ export function relabelMeetingMarkdown(
   if (tr) {
     const body = out.slice(tr.start, tr.end)
     const rewritten = body.replace(
-      new RegExp(`^\\[${escapeRegExp(from)}\\]:`, 'gm'),
+      new RegExp(`^\\[${nameForms(from, escapeRegExp)}\\]:`, 'gm'),
       () => { transcript++; return `[${to}]:` },
     )
     out = out.slice(0, tr.start) + rewritten + out.slice(tr.end)
@@ -276,7 +283,7 @@ export function detectProseReferences(md: string, label: string): string[] {
   prose += md.slice(cursor)
 
   const hits: string[] = []
-  const full = new RegExp(`\\b${escapeRegExp(label)}\\b`)
+  const full = new RegExp(`\\b${nameForms(label, escapeRegExp)}\\b`)
   if (full.test(prose)) hits.push(label)
   const first = label.split(/\s+/)[0]
   // Only a multi-word label has a distinct bare-first-name form. 'MU' or 'Ext'

package/server/lib/meeting-speaker-review.ts

@@ -24,6 +24,7 @@
 
 import type { QualifiedMachinePosition } from './mac-speaker-machine-evidence.js'
 import { isVoiceLabel } from './mac-voice-labels.js'
+import { nfc, sameSpeakerName } from './speaker-name-nfc.js'
 
 /** One transcript chunk as stored in the `.g2-chunks.json` sidecar. */
 export interface ReviewChunk {
@@ -605,10 +606,10 @@ export function reviewMeetingSpeakers(
   } = {},
 ): MeetingSpeakerReview {
   const owner = options.owner ?? 'Me'
-  const confirmed = new Set(options.confirmed ?? [])
+  const confirmed = new Set([...(options.confirmed ?? [])].map(nfc))
   for (const label of new Set(chunks.map(c => c.speaker ?? ''))) {
     const positions = chunks.flatMap((c, i) => c.speaker === label ? [i] : [])
-    if (positions.length > 0 && positions.every(i => options.confirmedChunks?.get(i) === label)) confirmed.add(label)
+    if (positions.length > 0 && positions.every(i => sameSpeakerName(options.confirmedChunks?.get(i), label))) confirmed.add(nfc(label))
   }
   const limit = options.phrasesPerVoice ?? 3
   const sequence = chunks.map(c => c.speaker ?? '')
@@ -668,14 +669,14 @@ export function reviewMeetingSpeakers(
       if (c.speaker !== label) return n
       const proof = options.machineQualifiedPositions?.get(i)
       const machine = proof?.label === label && (c.chunkIndex === undefined || c.chunkIndex === proof.rawChunkIndex) && proof.independentWindows >= 2 && proof.minimumSimilarity >= .88 && proof.minimumMargin >= .05
-      const human = confirmed.has(label) || options.confirmedChunks?.get(i) === label
+      const human = confirmed.has(nfc(label)) || sameSpeakerName(options.confirmedChunks?.get(i), label)
       const capture = typeof c.similarity === 'number' && Number.isFinite(c.similarity) && c.similarity >= ASSERT_MIN_SIMILARITY
       return n + Number(!machine && !human && !capture)
     }, 0) : 0
     const runs = speakerRuns(sequence, label)
     const unattributed = isUnattributed(label)
-    const confirmedSegments = unattributed ? 0 : confirmed.has(label) ? own.length
-      : chunks.reduce((n, c, i) => n + Number(c.speaker === label && options.confirmedChunks?.get(i) === label), 0)
+    const confirmedSegments = unattributed ? 0 : confirmed.has(nfc(label)) ? own.length
+      : chunks.reduce((n, c, i) => n + Number(c.speaker === label && sameSpeakerName(options.confirmedChunks?.get(i), label)), 0)
 
     const thrashesWith: ThrashPair[] = []
     if (!unattributed) {
@@ -708,7 +709,7 @@ export function reviewMeetingSpeakers(
     const assertionBlockers: string[] = []
     if (unattributed) {
       assertionBlockers.push('no name was ever assigned to this voice')
-    } else if (confirmed.has(label)) {
+    } else if (confirmed.has(nfc(label))) {
       // A human said this is them. Blockers stay OFF the list rather than being
       // listed-then-overridden, because a reviewer reading "similarity 0.56
       // below 0.65" under a name they personally confirmed would reasonably
@@ -753,10 +754,10 @@ export function reviewMeetingSpeakers(
       longestRun: runs.length ? Math.max(...runs) : 0,
       isOwner: label === owner,
       /** True when a human vouched for this label in this meeting. */
-      confirmedByHuman: confirmed.has(label),
+      confirmedByHuman: confirmed.has(nfc(label)),
       machineQualified: !unattributed && machineQualified,
       machineQualifiedSegments: unattributed ? 0 : machineQualifiedSegments,
-      assertionSource: assertionBlockers.length ? null : confirmed.has(label) ? 'human' : label === owner ? 'owner' : machineQualified ? 'qualified-profile' : machineQualifiedSegments > 0 ? 'capture-and-qualified-profile' : 'capture-match',
+      assertionSource: assertionBlockers.length ? null : confirmed.has(nfc(label)) ? 'human' : label === owner ? 'owner' : machineQualified ? 'qualified-profile' : machineQualifiedSegments > 0 ? 'capture-and-qualified-profile' : 'capture-match',
       reliability,
       nameAsserted: assertionBlockers.length === 0,
       assertionBlockers,