fix(transcriber): resolve parallel-development merge conflicts (MVA-3745) #9664

Activity

1. mrveiss

   added

   bugSomething isn't workingSomething isn't working

   priority: medium

   backend

   on Jun 5, 2026
2. github-actions

   added

   frontend

   infrastructure

   testing

   on Jun 5, 2026
3. mrveiss

   self-assigned this

   on Jun 5, 2026
4. mrveiss commented on Jun 8, 2026

   

   mrveiss

   on Jun 8, 2026

   OwnerAuthor

   More actions

   Triage — escalating (not suitable for autonomous batch)

   Reviewed during the bug-batch sweep. This is not a self-contained fix; it is a feature-branch integration that needs human/architectural judgment:

   • The source branch issue-MVA-2783 (23 commits) still exists on origin (21559fa03) and has diverged from Dev_new_gui's transcriber, which has since received substantial independent work — e.g. a509c7c5b (api/transcriber router), fd2c2a1dd (transcript route models), 6036d57ca (editing API), 02585efb0 (export formats DOCX/PDF/SRT/VTT), 58318397a (deleted obsolete api/transcriber.py).
   • The task requires a feature-comparison matrix to decide, per conflicting file, which implementation wins — that is an architecture decision, not a mechanical merge (Core Rule Dev new gui #4: confirm architecture before coding).
   • Parent umbrella GH#9612 is open and owns this integration.

   Recommendation: handle under #9612 as a dedicated, reviewed effort (feature matrix → cherry-pick unique features onto a fresh branch off current Dev_new_gui → per-integration tests). Leaving #9664 open and assigned there. No autonomous changes made.
5. mrveiss commented on Jun 10, 2026

   

   mrveiss

   on Jun 10, 2026

   OwnerAuthor

   More actions

   Bug sweep 2026-06-10 → TOO-BIG. A 33-file cross-branch transcriber merge-conflict resolution requiring a feature-comparison matrix and per-feature cherry-picks (issue-MVA-2783 vs Dev_new_gui) — design/merge judgment across many files, not a localized bug fix.
6. mrveiss

   added

   needs-human-decisionBlocked on a product/architecture decision a human must makeBlocked on a product/architecture decision a human must make

   on Jun 11, 2026
7. mrveiss commented on Jun 11, 2026

   

   mrveiss

   on Jun 11, 2026

   OwnerAuthor

   More actions

   Feature-comparison matrix (Task 1 of this issue) — completed 2026-06-11

   A full read-only comparison of origin/issue-MVA-2783 (23 commits, head 21559fa03) against current Dev_new_gui was performed (git log/diff/show across all transcriber and transcript surfaces, backend + frontend + tests).

   Bottom line

   issue-MVA-2783 contains zero unique features. Every capability on the branch (project/recording CRUD, transcript editing API, speaker merge, notes, SRT/VTT/DOCX/PDF export, KB push + status, streaming AI analysis, the full transcriber Vue component set, the SQLite sidecar DB) is already present in Dev_new_gui — most of it byte-identical or refined.

   Dev_new_gui additionally carries five things the branch never had:

   1. Orchestrator pipeline (transcriber/orchestrator.py) — async FFmpeg → language detect → diarization → transcription → persist
   2. Upload security hardening (transcriber/upload_security.py, security(transcriber): fix arbitrary file read vulnerability in RecordingCreate API #9214) — path-traversal/SSRF defense
   3. Central transcripts API (api/transcripts.py, wiring: api/transcripts.py router is unmounted — mount or delete (from #9851) #9863/feat(backend): mount transcripts router with real storage backing (#9863) #9955) — WS streaming analysis + per-segment KB push over real storage
   4. Extracted composables (useKbStatus enhancement(transcriber/frontend): replace KbPushButton manual polling with useKbStatus() composable #9206, useSseProgress enhancement(transcriber): expand composable test coverage for useSseProgress and useTranscriberApi #9209, useFileDownload enhancement(transcriber/frontend): extract file download blob pattern into useFileDownload() composable #9204)
   5. Far larger test coverage (recordings/projects/extension/pipeline/WS-analysis suites)

   Verdict per the issue's own acceptance criteria

   • "Feature comparison documented" — this comment.
   • "Identify unique features in issue-MVA-2783 not in Dev_new_gui" — none exist.
   • "Cherry-pick unique features" / "Test each integration" / "PR merged" — vacuously satisfied; there is nothing to integrate.

   Recommendation

   Close this issue as superseded: the parallel-development conflict resolved itself through the subsequent Dev_new_gui transcriber work (#9044 → #9955). The issue-MVA-2783 remote branch can be deleted (or archived via tag) — flagging that as the one remaining human call since it discards branch history. Umbrella #9612 should be updated accordingly.
8. mrveiss commented on Jun 12, 2026

   

   mrveiss

   on Jun 12, 2026

   OwnerAuthor

   More actions

   Closed — superseded (no integration needed)

   The feature-comparison matrix (Task 1, comment above, 2026-06-11) found zero unique features in issue-MVA-2783 — every capability already exists in Dev_new_gui, which additionally carries the orchestrator pipeline, upload security hardening (#9214), the central transcripts API (#9863/#9955), extracted composables, and larger test coverage.

   The remaining human call (branch disposition) was resolved by the 2026-06-09 branch-estate sweep: origin/issue-MVA-2783 was deleted after per-deliverable verification, with full history archived at tag backup/rebase-2026-06-09/issue-MVA-2783 = 21559fa03 (verified identical to the matrix's analyzed head).

   Acceptance criteria: feature comparison documented ✅ · unique features identified (none) ✅ · cherry-pick/test/PR — vacuously satisfied (nothing to integrate) ✅
9. mrveiss

   closed this as completedon Jun 12, 2026
10. mrveiss

    added a parent issue on Sep 1, 2026

    • Umbrella: transcriber — land feature branch + security trio + code-quality #9925