Repository navigation
rescued stash: mva-3501-ci-failures: stash before branch switch #14085
Description
Child of #14078. The work is safe — it is now a branch on origin, not only a stash entry.
| Branch | rescued/stash-2026-06-05-1557e2b21 |
| Stash commit | 1557e2b213d62656c56a4d18284ab8a76a45f469 |
| Stashed | 2026-06-05 |
| Change | 7 files changed, 140 insertions(+), 34 deletions(-) |
| Applies to current base | CONFLICTED |
| Original context | mva-3501-ci-failures: stash before branch switch |
Files touched:
autobot-backend/agents/rag_agent.pyautobot-backend/api/agent_config.pyautobot-backend/services/transcript_export/docx_exporter.pyautobot-backend/services/transcript_export/pdf_exporter.pyautobot-backend/services/transcript_export/srt_exporter.pyautobot-backend/services/transcript_export/vtt_exporter.pyautobot-backend/transcriber/export/docx_export.py
Why this exists: the repo-wide stash stack held 113 entries spanning three months, unowned and
unlinked. This one's content is absent from Dev_new_gui — verified by git apply --check --3way
— so it is genuinely unfinished work, not a leftover of something that already landed.
Ask — a decision, not a deletion:
- Is this work still wanted? The original context above names where it came from.
- Wanted → rebase
rescued/stash-2026-06-05-1557e2b21ontoDev_new_gui, open a PR, land it. - Not wanted → say so here with the reason, then delete the branch. A recorded decision, never a
silent drop.
Note: this one does not apply cleanly to today's base — expect a real rebase, not a fast-forward.
Activity
mrveiss commentedon Aug 25, 2026
Disposition: LANDED in part, SUPERSEDED in part, OBSOLETE in part — nothing left to land
Seven files, checked one by one against
origin/Dev_new_gui:transcriber/export/docx_export.py(drop unusedPtimport)from docx.shared import RGBColor—Ptis goneservices/transcript_export/{docx,pdf,srt,vtt}_exporter.pye97e4882c3fix(transcriber): bind transcript export to real storage, retire mock duplicate (#9958) (#10229); the surviving implementation istranscriber/export/api/agent_config.py(+133/-28)DEFAULT_AGENT_CONFIGSdescriptions into parenthesised concatenations. Base still carries the original single-line form (agent_config.py:134), andpyproject.tomlsetsline-length = 120for black and isort — neither tool rewrites string literals, so nothing in the toolchain wants this changeagents/rag_agent.py(+2/-1)rag_agent.py:341); wrapping a prompt literal changes the prompt text sent to the model, so it is a behaviour change dressed as formattingDecision: the one substantive hunk (the unused import) is already in base; four files no longer
exist; the remaining two are cosmetic reflows that the repo's own formatters do not ask for and
that would alter a prompt string. Nothing to rebase.
rescued/stash-2026-06-05-1557e2b21is disposable; left in place — branch deletion is a separatedeliberate act.
mrveiss commentedon Aug 25, 2026
Disposition: LANDED in part, SUPERSEDED in part, OBSOLETE in part — nothing left to land
Seven files, checked one by one against
origin/Dev_new_gui:transcriber/export/docx_export.py(drop unusedPtimport)from docx.shared import RGBColor—Ptis goneservices/transcript_export/{docx,pdf,srt,vtt}_exporter.pye97e4882c3fix(transcriber): bind transcript export to real storage, retire mock duplicate (#9958) (#10229); the surviving implementation istranscriber/export/api/agent_config.py(+133/-28)DEFAULT_AGENT_CONFIGSdescriptions into parenthesised concatenations. Base still carries the original single-line form (agent_config.py:134), andpyproject.tomlsetsline-length = 120for black and isort — neither tool rewrites string literals, so nothing in the toolchain wants this changeagents/rag_agent.py(+2/-1)rag_agent.py:341); wrapping a prompt literal changes the prompt text sent to the model, so it is a behaviour change dressed as formattingDecision: the one substantive hunk (the unused import) is already in base; four files no longer
exist; the remaining two are cosmetic reflows that the repo's own formatters do not ask for and
that would alter a prompt string. Nothing to rebase.
rescued/stash-2026-06-05-1557e2b21is disposable; left in place — branch deletion is a separatedeliberate act.