dsh-ide-git 0.13.3 → 0.13.5

package/README.md

@@ -13,6 +13,7 @@ DSH 自带的 Git 面板覆盖「暂存 / 提交 / 还原 / 看历史」;`dsh-id
 - **分支管理没有树**:内置面板只有一个分支下拉。这里给出 `HEAD(当前分支) / 本地 / 远程 / 标签` 的分组树,每个分支带 ahead/behind 角标、上游、worktree 占用标记(`W`)。
 - **历史只是列表**:这里画出提交图谱(lane 拓扑 + 分支/标签 ref 徽章),支持加载更多与过滤(文本 / 哈希 / 作者)。
 - **想看某个提交改了什么**:点提交直接进详情——作者、日期、完整提交信息、变更文件(含 +/− 行数),点文件看逐行 diff(红绿 + 行号 + hunk 高亮)。
+- **想指给 AI 一段代码**:在 diff 窗里选中几行、右键,把「哪个文件哪几行」(附提交或工作区上下文)直接发进当前会话的输入框。
 - **想比较分支**:分支右键即可与当前分支比较,结果按文件与提交数汇报。
 - **操作要够全**:签出、从任意分支/提交新建分支、重命名、删除、合并到当前、变基当前到此、新建标签、cherry-pick、还原提交、重置(保留/丢弃)、fetch / pull --ff-only / push(确认后)。
 
@@ -56,6 +57,17 @@ DSH 自带的 Git 面板覆盖「暂存 / 提交 / 还原 / 看历史」;`dsh-id
 </tr>
 </table>
 
+## 右键发送到对话
+
+面板里的一切都能右键塞进**当前会话的输入框**——走 DSH 官方的 composer 插入通道(不动你已输入的文字,追加在末尾;发送中或服务不在时自动退化为复制到剪贴板并提示,绝不死点击):
+
+- **提交** → `git 提交 47ad017「提交标题」(仓库 xxx)`:短哈希 + 提交信息 + 仓库,一段话指名一个修订;
+- **分支** → `git 分支 main(仓库 xxx)`;
+- **文件**(变更列表与提交详情的文件行)→ 一个 `@路径` 文件引用 chip(DSH 原生 @ 语法,含空格的路径自动加引号),或者只发文件路径;
+- **diff 选中行**:在提交详情或工作区变更打开的 diff 窗里**选中一段文本再右键** → 「发送选中行到对话」:`@文件` chip + 行号说明——提交场景是「第 N–M 行(提交 47ad017「标题」@ 当前分支)」,工作区场景是「第 N–M 行(工作区已暂存 / 未提交)」。行号由选区所在的 diff 行按 hunk 头换算成**新文件行号**;选中的全是删除行时用旧号并标注「旧行号」。选区落不到可定位的 diff 行上时,菜单退化为「发送选中片段到对话」(原文截断 600 字符),不编造行号;菜单里同时有「复制选中引用」。没有选区时右键保持浏览器默认菜单。
+
+配套已经就位的几件事:变更文件行与详情文件行的行首图标按扩展名着色(DSH 自家 FileTypeIcon);diff 预览用 DSH 自家 DiffBlock 组件渲染(红绿底、复制 / 换行工具栏,视觉与宿主一致);diff 窗高度可拖拽调节并按位置记忆;整个面板还可以挂进**主对话区**——「对话 / 轨迹」旁的 Git 标签页,插件设置里可关。
+
 ## 挂在哪里:两个宿主,一个面板
 
 本插件只注册一次,落到哪个面上由**宿主**决定,两条通道互斥:
@@ -84,14 +96,15 @@ DSH 自带的 Git 面板覆盖「暂存 / 提交 / 还原 / 看历史」;`dsh-id
 | 动作条 | IDEA 式左侧竖排(底部工作台)/ 顶栏下一行横排(右侧栏):刷新、新建分支、签出、删除、比较、显示差异、贮藏、新建标签、收藏、抓取、拉取、推送。**按可用空间自动决定放几个**,放不下的收进 `⋯ 更多`;末尾 `⚙ 设置` 可拖动排序、逐项显隐(存 `dsh-ide-git.rail.v1`)。每个按钮按当前状态点亮/置灰(没有其他分支就不能删除/签出/比较,没有远程就不能抓取/推送,没有上游就不能拉取,没有变更就没有差异可看) |
 | 状态行 | 当前分支、上游、`↑ahead ↓behind`、stash 数量、忙碌指示 |
 | 分支树 | `HEAD / 本地 / 远程 / 标签` 分组(可折叠)、过滤框、星标当前分支、ahead/behind 角标、worktree 占用标记;本地蓝 / 远程紫 / 标签黄 / HEAD 绿 |
-| 分支右键 | 签出、将当前分支变基到此、合并到当前分支、与当前分支比较、从该分支新建分支、重命名、删除(当前分支禁用)、更新(Fetch)、推送 |
+| 分支右键 | 签出、将当前分支变基到此、合并到当前分支、与当前分支比较、从该分支新建分支、重命名、删除(当前分支禁用)、更新(Fetch)、推送、发送到对话(分支名 + 仓库) |
 | 历史筛选 | 文本或哈希、分支或标签、提交人、日期(今天 / 近 7 天 / 近 30 天 / 今年),外加排序方向(新→旧 / 旧→新)与一键清除;路径筛选回车后由 git 服务端过滤(`git log -- <path>`) |
 | 提交列表 | 列序对齐 IDEA:**日期 → 提交人 → 图谱 → 分支标签 → 提交信息**;lane 拓扑图整格连线(相邻行像素对齐)、HEAD 空心点、refs 徽章(HEAD 绿 / 本地蓝 / 远程紫 / 标签黄,最多 3 个 + `+n`)、加载更多(每页 120) |
-| 提交右键 | 提交详情、复制修订号、签出该修订(确认)、在此新建分支、新建标签、cherry-pick、还原提交、重置到此(保留 / 丢弃更改) |
+| 提交右键 | 提交详情、复制修订号、签出该修订(确认)、在此新建分支、新建标签、cherry-pick、还原提交、重置到此(保留 / 丢弃更改)、发送到对话(短哈希 + 提交信息 + 仓库) |
 | 提交详情 | 完整提交信息、作者/日期、变更文件列表(+/−),点文件看逐行 diff |
+| diff 窗 | DSH 自家 DiffBlock 渲染(红绿底 + 复制/换行工具栏)、高度可拖拽调节并按位置记忆;**选中 diff 行右键**把行级引用发进对话——`@文件` + 第 N–M 行 + 提交(短哈希/标题/当前分支)或工作区(已暂存/未提交)上下文,删除行标注旧行号,选区定位不到行时发选中片段(截断 600 字符),另有「复制选中引用」 |
 | 变更列表 | 冲突 / 已暂存 / 更改 / 未跟踪 四组,行内 暂存 / 取消暂存 / 丢弃,分组级「全部暂存 / 全部取消暂存」,点击行看 diff |
 | 提交框 | 多行提交信息、`Ctrl+Enter`(macOS `Cmd+Enter`)提交、修补上次提交(`--amend`) |
-| 文件右键 | 显示差异、暂存/取消暂存、丢弃更改、复制路径 |
+| 文件右键 | 显示差异、暂存/取消暂存、丢弃更改、复制路径、发送到对话(`@文件` 引用 chip 或文件路径) |
 | 安全与撤回 | 删除分支 / 删除贮藏后右下角弹提示条,点「撤回」即可恢复(真删除 + 按删除前记下的对象 id 重建,一次性、30 分钟内有效),顶栏的撤回图标里也能找到最近删除;`main`/`master`/`trunk` 的删除要求输入分支名确认,所有破坏性确认框焦点默认在「取消」;同一仓库的写操作在宿主串行执行;仓库里还有未结束的 merge / rebase / cherry-pick / revert / bisect 时,相关动作全部置灰并说明原因 |
 
 ## 安装

package/README_EN.md

@@ -48,6 +48,17 @@ DSH's built-in Git panel covers stage / commit / revert / history. `dsh-ide-git`
 </tr>
 </table>
 
+## Send to chat
+
+Everything in the panel can be right-clicked into the **current session's composer** — through DSH's official insertion channel (it appends at the tail without touching what you already typed; while sending, or when the service is absent, it falls back to copying the payload with a toast, never a dead click):
+
+- **Commit** → `git commit 47ad017 "Subject" (repo xxx)`: short hash + message + repository, one sentence naming a revision;
+- **Branch** → `git branch main (repo xxx)`;
+- **File** (change rows and commit-detail file rows) → a `@path` file reference chip (DSH's native @ grammar, quoted paths included) or just the raw path;
+- **Selected diff lines**: select some text in a diff window (opened from a commit detail or the working tree), right-click → **Send selected lines to chat**: an `@file` chip plus a line note — `lines N–M (commit 47ad017 "Subject" @ branch)` for a commit, `lines N–M (worktree, staged / uncommitted)` for the working tree. Numbers are reconstructed from the diff rows under the selection against the patch's hunk headers, in **new-file numbering**; a purely deleted span reports OLD numbers and says so. If the selection cannot be pinned to diff rows the menu degrades to **Send selected snippet to chat** (text truncated at 600 characters) instead of inventing numbers, and a **Copy the selection reference** item is always there. With no selection the browser's own menu stays.
+
+Also in place: change-row and detail-file-row icons are tinted by extension (DSH's own FileTypeIcon); diff previews render through DSH's own DiffBlock (red/green rows, copy / wrap toolbar, host-consistent visuals); the diff window's height is draggable and remembered per placement; and the whole panel can live in the **main conversation area** — the Git tab next to Dialogue / Trace, switchable in the plugin settings.
+
 ## Where it mounts: two hosts, one panel
 
 The plugin registers once; which surface it lands on is the **host's** decision, and the two doors are exclusive:
@@ -74,13 +85,15 @@ The panel never guesses: it measures itself with a `ResizeObserver` (width ≥ 6
 - Action rail: the JetBrains-style vertical strip in the bottom workbench (and one horizontal row under the header in the right sidebar) with refresh, new branch, checkout, delete, compare, show diff, stash, new tag, favorite, fetch, pull and push. **It shows as many buttons as fit**, folds the rest into a `⋯ more` menu, and pins a `⚙ settings` button that lets you reorder actions and toggle each of them (stored in `dsh-ide-git.rail.v1`). Every action lights up or greys out with the current state (no other branch → delete / checkout / compare off, no remote → fetch / push off, no upstream → pull off, no changes → diff off).
 - Status line: branch, upstream, ahead/behind, stash count, busy indicator.
 - Branch tree: HEAD / Local / Remote / Tags groups, filter box, ahead/behind badges, worktree marker; local blue / remote violet / tag amber / HEAD green.
-- Branch context menu: checkout, rebase current onto this, merge into current, compare with current, new branch from here, rename, delete, fetch, push.
+- Branch context menu: checkout, rebase current onto this, merge into current, compare with current, new branch from here, rename, delete, fetch, push, send to chat (branch + repo).
 - History filters: text or hash, branch or tag, author, date (today / 7 days / 30 days / this year), an order toggle (newest / oldest first) and one-click clear; the path filter runs server-side (`git log -- <path>`) on Enter.
 - Commit list: IDEA column order — **date → author → graph → refs → subject**; a lane graph whose segments span whole rows (pixel-aligned across rows), a hollow dot for HEAD, refs badges (HEAD green / local blue / remote violet / tag amber, at most three plus `+n`), load more (120 per page).
-- Commit context menu: details, copy revision, checkout revision, new branch here, new tag, cherry-pick, revert, reset here (keep / discard changes).
+- Commit context menu: details, copy revision, checkout revision, new branch here, new tag, cherry-pick, revert, reset here (keep / discard changes), send to chat (short hash + message + repo).
 - Commit details: full message, author/date, changed files with +/− and per-file line diff.
+- Diff pane: rendered with DSH's own DiffBlock (red/green rows plus a copy / wrap toolbar), draggable height remembered per placement; **select diff rows and right-click** to send a line-level reference into the conversation — an `@file` chip plus the line range with commit (hash / subject / current branch) or worktree (staged / uncommitted) context; deleted rows are labelled as old-numbered, selections that cannot be pinned to rows degrade to the raw snippet (truncated at 600 characters), and a copy-reference item is always available.
 - Changes: conflicts / staged / changes / untracked groups, inline stage / unstage / discard, group-level actions, click for diff.
 - Commit box: multi-line message, Ctrl+Enter (Cmd+Enter) to commit, amend.
+- File context menu: show diff, stage / unstage, discard changes, copy path, send to chat (an `@file` reference chip or the raw path).
 - **Safety and undo**: deleting a branch or a stash pops a toast in the corner with an **Undo** action — the delete is real, and undo recreates the ref from the object id recorded just before it (one-shot, valid for 30 minutes). Deleting `main` / `master` / `trunk` requires typing the branch name, destructive dialogs focus Cancel instead of the red button, writes are serialised per repository on the host, and while a merge / rebase / cherry-pick / revert / bisect is still open the affected actions are greyed out with the reason.
 
 ## Install

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-ide-git",
-  "version": "0.13.3",
+  "version": "0.13.5",
   "main": "./src/index.js",
   "description": "IDE 级 Git 操作面板:分支树 + 提交图谱 + 变更/暂存/提交 + 提交详情。装了 dsh-better-sidebar 时挂成它的原生 tab(右侧栏 + 底部工作台);没装时直接挂 DSH 原生右侧栏,单独安装即可用。JetBrains 风格 Git 工具窗口 for DeepSeek Harness.",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ide-git",
-  "version": "0.13.3",
+  "version": "0.13.5",
   "description": "DSH plugin: an IDE-grade Git tool window as a native dsh-better-sidebar tab — branch tree, commit graph, changes, commit details, JetBrains-style actions, in the right sidebar and the bottom panel. | DSH 插件:IDE 级 Git 工具窗口,以 dsh-better-sidebar 原生 Tab 挂载——分支树 / 提交图谱 / 变更与提交详情 / JetBrains 风格操作,右侧栏与底部面板双布局自适应。",
   "type": "module",
   "repository": {

package/src/client.js

@@ -154,6 +154,17 @@ window.__ModuleLoader__.load({
       'action.details': '提交详情',
       'menu.sendToChat': '发送到对话',
       'menu.sendFilePathToChat': '发送文件路径到对话',
+      'send.commitText': 'git 提交 {hash}「{subject}」(仓库 {repo})',
+      'send.branchText': 'git 分支 {name}(仓库 {repo})',
+      'menu.sendDiffLinesToChat': '发送选中行到对话',
+      'menu.sendDiffSnippetToChat': '发送选中片段到对话',
+      'menu.copyDiffRef': '复制选中引用',
+      'send.diffLinesCommit': '{lines}(提交 {hash}「{subject}」@ {branch})',
+      'send.diffLinesWorktree': '{lines}(工作区{state})',
+      'send.diffStaged': '已暂存',
+      'send.diffUnstaged': '未提交',
+      'send.diffNewLines': '第 {lines} 行',
+      'send.diffOldLines': '第 {lines} 行(旧行号)',
       'history.empty': '这个仓库还没有提交',
       'history.loadMore': '加载更多',
       'history.filter': '文本或哈希',
@@ -354,6 +365,17 @@ window.__ModuleLoader__.load({
       'action.details': 'Commit details',
       'menu.sendToChat': 'Send to chat',
       'menu.sendFilePathToChat': 'Send file path to chat',
+      'send.commitText': 'git commit {hash} "{subject}" (repo {repo})',
+      'send.branchText': 'git branch {name} (repo {repo})',
+      'menu.sendDiffLinesToChat': 'Send selected lines to chat',
+      'menu.sendDiffSnippetToChat': 'Send selected snippet to chat',
+      'menu.copyDiffRef': 'Copy the selection reference',
+      'send.diffLinesCommit': '{lines} (commit {hash} "{subject}" @ {branch})',
+      'send.diffLinesWorktree': '{lines} (worktree, {state})',
+      'send.diffStaged': 'staged',
+      'send.diffUnstaged': 'uncommitted',
+      'send.diffNewLines': 'lines {lines}',
+      'send.diffOldLines': 'lines {lines} (old numbering)',
       'history.empty': 'This repository has no commits yet',
       'history.loadMore': 'Load more',
       'history.filter': 'Text or hash',
@@ -562,6 +584,17 @@ window.__ModuleLoader__.load({
         'action.details': '提交詳情',
         'menu.sendToChat': '傳送到對話',
         'menu.sendFilePathToChat': '傳送檔案路徑至對話',
+        'send.commitText': 'git 提交 {hash}「{subject}」(存放庫 {repo})',
+        'send.branchText': 'git 分支 {name}(存放庫 {repo})',
+        'menu.sendDiffLinesToChat': '傳送選中行到對話',
+        'menu.sendDiffSnippetToChat': '傳送選中片段到對話',
+        'menu.copyDiffRef': '複製選中引用',
+        'send.diffLinesCommit': '{lines}(提交 {hash}「{subject}」@ {branch})',
+        'send.diffLinesWorktree': '{lines}(工作區{state})',
+        'send.diffStaged': '已暫存',
+        'send.diffUnstaged': '未提交',
+        'send.diffNewLines': '第 {lines} 行',
+        'send.diffOldLines': '第 {lines} 行(舊行號)',
         'history.empty': '呢個存放庫仲未有提交',
         'history.loadMore': '載入更多',
         'history.filter': '文字或雜湊',
@@ -762,6 +795,17 @@ window.__ModuleLoader__.load({
         'action.details': '提交詳情',
         'menu.sendToChat': '傳送至對話',
         'menu.sendFilePathToChat': '傳送檔案路徑至對話',
+        'send.commitText': 'git 提交 {hash}「{subject}」(版本庫 {repo})',
+        'send.branchText': 'git 分支 {name}(版本庫 {repo})',
+        'menu.sendDiffLinesToChat': '傳送選取行至對話',
+        'menu.sendDiffSnippetToChat': '傳送選取片段至對話',
+        'menu.copyDiffRef': '複製選取的引用',
+        'send.diffLinesCommit': '{lines}(提交 {hash}「{subject}」@ {branch})',
+        'send.diffLinesWorktree': '{lines}(工作區{state})',
+        'send.diffStaged': '已暫存',
+        'send.diffUnstaged': '未提交',
+        'send.diffNewLines': '第 {lines} 行',
+        'send.diffOldLines': '第 {lines} 行(舊行號)',
         'history.empty': '這個版本庫還沒有提交',
         'history.loadMore': '載入更多',
         'history.filter': '文字或雜湊',
@@ -962,6 +1006,17 @@ window.__ModuleLoader__.load({
         'action.details': '提交詳情',
         'menu.sendToChat': '傳送至對話',
         'menu.sendFilePathToChat': '傳送檔案路徑至對話',
+        'send.commitText': 'git 提交 {hash}「{subject}」(存放庫 {repo})',
+        'send.branchText': 'git 分支 {name}(存放庫 {repo})',
+        'menu.sendDiffLinesToChat': '傳送選中行至對話',
+        'menu.sendDiffSnippetToChat': '傳送選中片段至對話',
+        'menu.copyDiffRef': '複製選中引用',
+        'send.diffLinesCommit': '{lines}(提交 {hash}「{subject}」@ {branch})',
+        'send.diffLinesWorktree': '{lines}(工作區{state})',
+        'send.diffStaged': '已暫存',
+        'send.diffUnstaged': '未提交',
+        'send.diffNewLines': '第 {lines} 行',
+        'send.diffOldLines': '第 {lines} 行(舊行號)',
         'history.empty': '呢個存放庫仲未有提交',
         'history.loadMore': '載入更多',
         'history.filter': '文字或雜湊',
@@ -1162,6 +1217,17 @@ window.__ModuleLoader__.load({
         'action.details': 'コミットの詳細',
         'menu.sendToChat': 'チャットへ送る',
         'menu.sendFilePathToChat': 'ファイルパスをチャットへ送る',
+        'send.commitText': 'git コミット {hash}「{subject}」(リポジトリ {repo})',
+        'send.branchText': 'git ブランチ {name}(リポジトリ {repo})',
+        'menu.sendDiffLinesToChat': '選択した行をチャットへ送る',
+        'menu.sendDiffSnippetToChat': '選択した範囲をチャットへ送る',
+        'menu.copyDiffRef': '選択範囲の参照をコピー',
+        'send.diffLinesCommit': '{lines}(コミット {hash}「{subject}」@ {branch})',
+        'send.diffLinesWorktree': '{lines}(作業ツリー、{state})',
+        'send.diffStaged': 'ステージ済み',
+        'send.diffUnstaged': '未コミット',
+        'send.diffNewLines': '{lines} 行目',
+        'send.diffOldLines': '{lines} 行目(旧番号)',
         'history.empty': 'このリポジトリにはまだコミットがありません',
         'history.loadMore': 'さらに読み込む',
         'history.filter': 'テキストまたはハッシュ',
@@ -1362,6 +1428,17 @@ window.__ModuleLoader__.load({
         'action.details': '커밋 상세',
         'menu.sendToChat': '대화로 보내기',
         'menu.sendFilePathToChat': '파일 경로를 대화로 보내기',
+        'send.commitText': 'git 커밋 {hash} "{subject}" (저장소 {repo})',
+        'send.branchText': 'git 브랜치 {name} (저장소 {repo})',
+        'menu.sendDiffLinesToChat': '선택한 줄 대화로 보내기',
+        'menu.sendDiffSnippetToChat': '선택한 조각 대화로 보내기',
+        'menu.copyDiffRef': '선택 범위 참조 복사',
+        'send.diffLinesCommit': '{lines}(커밋 {hash} "{subject}" @ {branch})',
+        'send.diffLinesWorktree': '{lines}(작업 트리, {state})',
+        'send.diffStaged': '스테이징됨',
+        'send.diffUnstaged': '커밋되지 않음',
+        'send.diffNewLines': '{lines}행',
+        'send.diffOldLines': '{lines}행(이전 번호)',
         'history.empty': '이 저장소에는 아직 커밋이 없습니다',
         'history.loadMore': '더 불러오기',
         'history.filter': '텍스트 또는 해시',
@@ -1562,6 +1639,17 @@ window.__ModuleLoader__.load({
         'action.details': 'Commit-Details',
         'menu.sendToChat': 'Im Chat senden',
         'menu.sendFilePathToChat': 'Dateipfad im Chat senden',
+        'send.commitText': 'git-Commit {hash} "{subject}" (Repository {repo})',
+        'send.branchText': 'git-Branch {name} (Repository {repo})',
+        'menu.sendDiffLinesToChat': 'Ausgewählte Zeilen in den Chat senden',
+        'menu.sendDiffSnippetToChat': 'Ausgewählten Ausschnitt in den Chat senden',
+        'menu.copyDiffRef': 'Auswahlbezug kopieren',
+        'send.diffLinesCommit': '{lines} (Commit {hash} "{subject}" @ {branch})',
+        'send.diffLinesWorktree': '{lines} (Arbeitsbaum, {state})',
+        'send.diffStaged': 'staged',
+        'send.diffUnstaged': 'nicht committet',
+        'send.diffNewLines': 'Zeilen {lines}',
+        'send.diffOldLines': 'Zeilen {lines} (alte Nummerierung)',
         'history.empty': 'Dieses Repository hat noch keine Commits',
         'history.loadMore': 'Mehr laden',
         'history.filter': 'Text oder Hash',
@@ -1762,6 +1850,17 @@ window.__ModuleLoader__.load({
         'action.details': 'Détails du commit',
         'menu.sendToChat': 'Envoyer dans la conversation',
         'menu.sendFilePathToChat': 'Envoyer le chemin du fichier dans la conversation',
+        'send.commitText': 'commit git {hash} « {subject} » (dépôt {repo})',
+        'send.branchText': 'branche git {name} (dépôt {repo})',
+        'menu.sendDiffLinesToChat': 'Envoyer les lignes sélectionnées dans la conversation',
+        'menu.sendDiffSnippetToChat': 'Envoyer l\'extrait sélectionné dans la conversation',
+        'menu.copyDiffRef': 'Copier la référence de la sélection',
+        'send.diffLinesCommit': '{lines} (commit {hash} « {subject} » @ {branch})',
+        'send.diffLinesWorktree': '{lines} (arbre de travail, {state})',
+        'send.diffStaged': 'indexé',
+        'send.diffUnstaged': 'non commité',
+        'send.diffNewLines': 'lignes {lines}',
+        'send.diffOldLines': 'lignes {lines} (ancienne numérotation)',
         'history.empty': 'Ce dépôt n\'a pas encore de commit',
         'history.loadMore': 'Charger plus',
         'history.filter': 'Texte ou empreinte',
@@ -1962,6 +2061,17 @@ window.__ModuleLoader__.load({
         'action.details': 'Сведения о коммите',
         'menu.sendToChat': 'Отправить в чат',
         'menu.sendFilePathToChat': 'Отправить путь к файлу в чат',
+        'send.commitText': 'git-коммит {hash} «{subject}» (репозиторий {repo})',
+        'send.branchText': 'git-ветка {name} (репозиторий {repo})',
+        'menu.sendDiffLinesToChat': 'Отправить выбранные строки в чат',
+        'menu.sendDiffSnippetToChat': 'Отправить выбранный фрагмент в чат',
+        'menu.copyDiffRef': 'Скопировать ссылку на выделение',
+        'send.diffLinesCommit': '{lines} (коммит {hash} «{subject}» @ {branch})',
+        'send.diffLinesWorktree': '{lines} (рабочее дерево, {state})',
+        'send.diffStaged': 'в индексе',
+        'send.diffUnstaged': 'не закоммичено',
+        'send.diffNewLines': 'строки {lines}',
+        'send.diffOldLines': 'строки {lines} (старая нумерация)',
         'history.empty': 'В этом репозитории ещё нет коммитов',
         'history.loadMore': 'Загрузить ещё',
         'history.filter': 'Текст или хеш',
@@ -2162,6 +2272,17 @@ window.__ModuleLoader__.load({
         'action.details': 'Detalhes do commit',
         'menu.sendToChat': 'Enviar para a conversa',
         'menu.sendFilePathToChat': 'Enviar caminho do arquivo para a conversa',
+        'send.commitText': 'commit git {hash} "{subject}" (repositório {repo})',
+        'send.branchText': 'branch git {name} (repositório {repo})',
+        'menu.sendDiffLinesToChat': 'Enviar linhas selecionadas para a conversa',
+        'menu.sendDiffSnippetToChat': 'Enviar trecho selecionado para a conversa',
+        'menu.copyDiffRef': 'Copiar a referência da seleção',
+        'send.diffLinesCommit': '{lines} (commit {hash} "{subject}" @ {branch})',
+        'send.diffLinesWorktree': '{lines} (árvore de trabalho, {state})',
+        'send.diffStaged': 'preparado',
+        'send.diffUnstaged': 'não commitado',
+        'send.diffNewLines': 'linhas {lines}',
+        'send.diffOldLines': 'linhas {lines} (numeração antiga)',
         'history.empty': 'Este repositório ainda não tem commits',
         'history.loadMore': 'Carregar mais',
         'history.filter': 'Texto ou hash',
@@ -2362,6 +2483,17 @@ window.__ModuleLoader__.load({
         'action.details': 'Dettagli del commit',
         'menu.sendToChat': 'Invia alla conversazione',
         'menu.sendFilePathToChat': 'Invia il percorso del file alla conversazione',
+        'send.commitText': 'commit git {hash} "{subject}" (repository {repo})',
+        'send.branchText': 'branch git {name} (repository {repo})',
+        'menu.sendDiffLinesToChat': 'Invia le righe selezionate alla conversazione',
+        'menu.sendDiffSnippetToChat': 'Invia il frammento selezionato alla conversazione',
+        'menu.copyDiffRef': 'Copia il riferimento alla selezione',
+        'send.diffLinesCommit': '{lines} (commit {hash} "{subject}" @ {branch})',
+        'send.diffLinesWorktree': '{lines} (albero di lavoro, {state})',
+        'send.diffStaged': 'in stage',
+        'send.diffUnstaged': 'senza commit',
+        'send.diffNewLines': 'righe {lines}',
+        'send.diffOldLines': 'righe {lines} (numerazione precedente)',
         'history.empty': 'Questo repository non ha ancora commit',
         'history.loadMore': 'Carica altro',
         'history.filter': 'Testo o hash',
@@ -2562,6 +2694,17 @@ window.__ModuleLoader__.load({
         'action.details': 'Commit-details',
         'menu.sendToChat': 'Naar het gesprek verzenden',
         'menu.sendFilePathToChat': 'Bestandspad naar het gesprek verzenden',
+        'send.commitText': 'git-commit {hash} "{subject}" (repository {repo})',
+        'send.branchText': 'git-branch {name} (repository {repo})',
+        'menu.sendDiffLinesToChat': 'Geselecteerde regels naar het gesprek verzenden',
+        'menu.sendDiffSnippetToChat': 'Geselecteerd fragment naar het gesprek verzenden',
+        'menu.copyDiffRef': 'Selectiereferentie kopiëren',
+        'send.diffLinesCommit': '{lines} (commit {hash} "{subject}" @ {branch})',
+        'send.diffLinesWorktree': '{lines} (werkboom, {state})',
+        'send.diffStaged': 'staged',
+        'send.diffUnstaged': 'niet vastgelegd',
+        'send.diffNewLines': 'regels {lines}',
+        'send.diffOldLines': 'regels {lines} (oude nummering)',
         'history.empty': 'Deze repository heeft nog geen commits',
         'history.loadMore': 'Meer laden',
         'history.filter': 'Tekst of hash',
@@ -2762,6 +2905,17 @@ window.__ModuleLoader__.load({
         'action.details': 'Szczegóły commita',
         'menu.sendToChat': 'Wyślij do rozmowy',
         'menu.sendFilePathToChat': 'Wyślij ścieżkę pliku do rozmowy',
+        'send.commitText': 'commit git {hash} „{subject}" (repozytorium {repo})',
+        'send.branchText': 'gałąź git {name} (repozytorium {repo})',
+        'menu.sendDiffLinesToChat': 'Wyślij zaznaczone wiersze do rozmowy',
+        'menu.sendDiffSnippetToChat': 'Wyślij zaznaczony fragment do rozmowy',
+        'menu.copyDiffRef': 'Skopiuj odwołanie do zaznaczenia',
+        'send.diffLinesCommit': '{lines} (commit {hash} „{subject}" @ {branch})',
+        'send.diffLinesWorktree': '{lines} (drzewo robocze, {state})',
+        'send.diffStaged': 'przygotowane',
+        'send.diffUnstaged': 'niezacommitowane',
+        'send.diffNewLines': 'wiersze {lines}',
+        'send.diffOldLines': 'wiersze {lines} (stara numeracja)',
         'history.empty': 'To repozytorium nie ma jeszcze commitów',
         'history.loadMore': 'Wczytaj więcej',
         'history.filter': 'Tekst lub hash',
@@ -2962,6 +3116,17 @@ window.__ModuleLoader__.load({
         'action.details': 'Commit-detaljer',
         'menu.sendToChat': 'Skicka till samtalet',
         'menu.sendFilePathToChat': 'Skicka filsökvägen till samtalet',
+        'send.commitText': 'git-commit {hash} ”{subject}” (arkiv {repo})',
+        'send.branchText': 'git-gren {name} (arkiv {repo})',
+        'menu.sendDiffLinesToChat': 'Skicka markerade rader till samtalet',
+        'menu.sendDiffSnippetToChat': 'Skicka markerat utdrag till samtalet',
+        'menu.copyDiffRef': 'Kopiera markeringens referens',
+        'send.diffLinesCommit': '{lines} (incheckning {hash} ”{subject}” @ {branch})',
+        'send.diffLinesWorktree': '{lines} (arbetskopia, {state})',
+        'send.diffStaged': 'staged',
+        'send.diffUnstaged': 'ej incheckad',
+        'send.diffNewLines': 'rader {lines}',
+        'send.diffOldLines': 'rader {lines} (gammal numrering)',
         'history.empty': 'Det här arkivet har inga commits ännu',
         'history.loadMore': 'Ladda mer',
         'history.filter': 'Text eller hash',
@@ -3162,6 +3327,17 @@ window.__ModuleLoader__.load({
         'action.details': 'Commit ayrıntıları',
         'menu.sendToChat': 'Sohbete gönder',
         'menu.sendFilePathToChat': 'Dosya yolunu sohbete gönder',
+        'send.commitText': 'git commit {hash} "{subject}" (depo {repo})',
+        'send.branchText': 'git dalı {name} (depo {repo})',
+        'menu.sendDiffLinesToChat': 'Seçili satırları sohbete gönder',
+        'menu.sendDiffSnippetToChat': 'Seçili parçayı sohbete gönder',
+        'menu.copyDiffRef': 'Seçim referansını kopyala',
+        'send.diffLinesCommit': '{lines} (işleme {hash} "{subject}" @ {branch})',
+        'send.diffLinesWorktree': '{lines} (çalışma ağacı, {state})',
+        'send.diffStaged': 'hazırlanmış',
+        'send.diffUnstaged': 'işlenmemiş',
+        'send.diffNewLines': 'satırlar {lines}',
+        'send.diffOldLines': 'satırlar {lines} (eski numaralandırma)',
         'history.empty': 'Bu depoda henüz commit yok',
         'history.loadMore': 'Daha fazla yükle',
         'history.filter': 'Metin veya hash',
@@ -3362,6 +3538,17 @@ window.__ModuleLoader__.load({
         'action.details': 'Detail commit',
         'menu.sendToChat': 'Kirim ke obrolan',
         'menu.sendFilePathToChat': 'Kirim jalur berkas ke obrolan',
+        'send.commitText': 'commit git {hash} "{subject}" (repositori {repo})',
+        'send.branchText': 'cabang git {name} (repositori {repo})',
+        'menu.sendDiffLinesToChat': 'Kirim baris terpilih ke obrolan',
+        'menu.sendDiffSnippetToChat': 'Kirim cuplikan terpilih ke obrolan',
+        'menu.copyDiffRef': 'Salin referensi pilihan',
+        'send.diffLinesCommit': '{lines} (commit {hash} "{subject}" @ {branch})',
+        'send.diffLinesWorktree': '{lines} (pohon kerja, {state})',
+        'send.diffStaged': 'di-stage',
+        'send.diffUnstaged': 'belum di-commit',
+        'send.diffNewLines': 'baris {lines}',
+        'send.diffOldLines': 'baris {lines} (penomoran lama)',
         'history.empty': 'Repositori ini belum punya commit',
         'history.loadMore': 'Muat lebih banyak',
         'history.filter': 'Teks atau hash',
@@ -3562,6 +3749,17 @@ window.__ModuleLoader__.load({
         'action.details': 'Chi tiết commit',
         'menu.sendToChat': 'Gửi vào hội thoại',
         'menu.sendFilePathToChat': 'Gửi đường dẫn tệp vào hội thoại',
+        'send.commitText': 'git commit {hash} "{subject}" (kho {repo})',
+        'send.branchText': 'nhánh git {name} (kho {repo})',
+        'menu.sendDiffLinesToChat': 'Gửi các dòng đã chọn vào hội thoại',
+        'menu.sendDiffSnippetToChat': 'Gửi đoạn đã chọn vào hội thoại',
+        'menu.copyDiffRef': 'Sao chép tham chiếu vùng chọn',
+        'send.diffLinesCommit': '{lines} (commit {hash} "{subject}" @ {branch})',
+        'send.diffLinesWorktree': '{lines} (cây làm việc, {state})',
+        'send.diffStaged': 'đã staged',
+        'send.diffUnstaged': 'chưa commit',
+        'send.diffNewLines': 'dòng {lines}',
+        'send.diffOldLines': 'dòng {lines} (đánh số cũ)',
         'history.empty': 'Kho này chưa có commit nào',
         'history.loadMore': 'Tải thêm',
         'history.filter': 'Văn bản hoặc hash',
@@ -3762,6 +3960,17 @@ window.__ModuleLoader__.load({
         'action.details': 'تفاصيل الالتزام',
         'menu.sendToChat': 'إرسال إلى المحادثة',
         'menu.sendFilePathToChat': 'إرسال مسار الملف إلى المحادثة',
+        'send.commitText': 'التزام git {hash} "{subject}" (المستودع {repo})',
+        'send.branchText': 'فرع git {name} (المستودع {repo})',
+        'menu.sendDiffLinesToChat': 'إرسال الأسطر المحددة إلى المحادثة',
+        'menu.sendDiffSnippetToChat': 'إرسال المقتطف المحدد إلى المحادثة',
+        'menu.copyDiffRef': 'نسخ مرجع التحديد',
+        'send.diffLinesCommit': '{lines} (التزام {hash} "{subject}" @ {branch})',
+        'send.diffLinesWorktree': '{lines} (شجرة العمل، {state})',
+        'send.diffStaged': 'مُرحَّل',
+        'send.diffUnstaged': 'غير مُلتزم',
+        'send.diffNewLines': 'الأسطر {lines}',
+        'send.diffOldLines': 'الأسطر {lines} (ترقيم قديم)',
         'history.empty': 'لا توجد التزامات في هذا المستودع بعد',
         'history.loadMore': 'تحميل المزيد',
         'history.filter': 'نص أو تجزئة',
@@ -3962,6 +4171,17 @@ window.__ModuleLoader__.load({
         'action.details': 'कमिट विवरण',
         'menu.sendToChat': 'बातचीत में भेजें',
         'menu.sendFilePathToChat': 'फ़ाइल पथ बातचीत में भेजें',
+        'send.commitText': 'git कमिट {hash} "{subject}" (रिपॉज़िटरी {repo})',
+        'send.branchText': 'git ब्रांच {name} (रिपॉज़िटरी {repo})',
+        'menu.sendDiffLinesToChat': 'चयनित पंक्तियाँ बातचीत में भेजें',
+        'menu.sendDiffSnippetToChat': 'चयनित अंश बातचीत में भेजें',
+        'menu.copyDiffRef': 'चयन का संदर्भ कॉपी करें',
+        'send.diffLinesCommit': '{lines} (कमिट {hash} "{subject}" @ {branch})',
+        'send.diffLinesWorktree': '{lines} (वर्कट्री, {state})',
+        'send.diffStaged': 'स्टेज्ड',
+        'send.diffUnstaged': 'अनकमिटेड',
+        'send.diffNewLines': 'पंक्तियाँ {lines}',
+        'send.diffOldLines': 'पंक्तियाँ {lines} (पुरानी क्रमांक)',
         'history.empty': 'इस रिपॉज़िटरी में अभी कोई कमिट नहीं है',
         'history.loadMore': 'और लोड करें',
         'history.filter': 'टेक्स्ट या हैश',
@@ -4162,6 +4382,17 @@ window.__ModuleLoader__.load({
         'action.details': 'รายละเอียดคอมมิต',
         'menu.sendToChat': 'ส่งไปยังบทสนทนา',
         'menu.sendFilePathToChat': 'ส่งพาธไฟล์ไปยังบทสนทนา',
+        'send.commitText': 'git คอมมิต {hash} "{subject}" (รีโพซิทอรี {repo})',
+        'send.branchText': 'git บรานช์ {name} (รีโพซิทอรี {repo})',
+        'menu.sendDiffLinesToChat': 'ส่งบรรทัดที่เลือกไปยังบทสนทนา',
+        'menu.sendDiffSnippetToChat': 'ส่งข้อความที่เลือกไปยังบทสนทนา',
+        'menu.copyDiffRef': 'คัดลอกการอ้างอิงที่เลือก',
+        'send.diffLinesCommit': '{lines} (คอมมิต {hash} "{subject}" @ {branch})',
+        'send.diffLinesWorktree': '{lines} (แผนผังงาน, {state})',
+        'send.diffStaged': 'สเตจแล้ว',
+        'send.diffUnstaged': 'ยังไม่คอมมิต',
+        'send.diffNewLines': 'บรรทัด {lines}',
+        'send.diffOldLines': 'บรรทัด {lines} (เลขบรรทัดเดิม)',
         'history.empty': 'รีโพซิทอรีนี้ยังไม่มีคอมมิต',
         'history.loadMore': 'โหลดเพิ่ม',
         'history.filter': 'ข้อความหรือแฮช',
@@ -5453,20 +5684,47 @@ window.__ModuleLoader__.load({
       } catch (error) { void error; return null }
     }
 
+    /* The composer carries TWO text projections (ui-conversation projection.ts):
+       detectText feeds TokenSpan coordinates — every chip counts as ONE U+FFFC
+       there — while the published InputState.draft is the clipboard projection,
+       where a chip expands to its full `@path`. The insert verbs take DETECT
+       spans, and selectSpan rejects `end > detectLength` outright (span-map.ts),
+       so a tail span built from draft.length is correct only while the draft has
+       NO chips. With one in the draft it points past the document end and the
+       edit silently fails — exactly the "chip landed, the line-range sentence
+       never did" real-machine report against v0.13.5 (and any plain-text send
+       into a draft that already holds a chip). Convert instead: subtract every
+       occurrence's (clipboard length - 1). */
+    function detectTailSpanOf(state) {
+      if (state === undefined || state === null || typeof state.draft !== 'string' || typeof state.draftRev !== 'number') return null
+      let at = state.draft.length
+      const occurrences = Array.isArray(state.occurrences) ? state.occurrences : []
+      for (const occ of occurrences) {
+        if (occ === null || typeof occ !== 'object') continue
+        const width = typeof occ.length === 'number' && occ.length >= 0
+          ? occ.length
+          : (typeof occ.clipboardText === 'string' ? occ.clipboardText.length : 1)
+        at -= Math.max(0, width - 1)
+      }
+      if (at < 0) return null
+      return { start: at, end: at, draftRev: state.draftRev }
+    }
+
     /* apply(actx, input, span) → boolean. The span is an EMPTY span at the draft
-       tail in detect coordinates (state.draft is exactly the projection the CAS
-       compares). A false answer is the user typing between our read and write —
-       re-read once and retry (the brief's advice: one retry, no spinning). The
-       busy phases (adjudicating/submitting) also answer false; that lands on the
-       same clipboard fallback, which is the honest outcome. */
+       tail in DETECT coordinates (the coordinates the CAS and selectSpan
+       compare — see detectTailSpanOf). A false answer is the user typing
+       between our read and write — re-read once and retry (the brief's advice:
+       one retry, no spinning). The busy phases (adjudicating/submitting) also
+       answer false; that lands on the same clipboard fallback, which is the
+       honest outcome. */
     function insertIntoComposer(ctx, sessionId, apply) {
       const target = composerTargetOf(ctx, sessionId)
       if (target === null) return false
       for (let attempt = 0; attempt < 2; attempt += 1) {
         let state
         try { state = target.input.state.getSnapshot() } catch (error) { void error; return false }
-        if (state === undefined || state === null || typeof state.draft !== 'string' || typeof state.draftRev !== 'number') return false
-        const span = { start: state.draft.length, end: state.draft.length, draftRev: state.draftRev }
+        const span = detectTailSpanOf(state)
+        if (span === null) return false
         let applied = false
         try { applied = apply(target.actx, target.input, span) === true } catch (error) { void error; applied = false }
         if (applied === true) {
@@ -5534,7 +5792,11 @@ window.__ModuleLoader__.load({
         } else if (line.indexOf('@@') === 0) {
           kind = 'hunk'
           const match = /^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/.exec(line)
-          if (match !== null) { oldLine = Number.parseInt(match[1], 10); newLine = Number.parseInt(match[2], 10) }
+          // The @@ header names the FIRST content line (git semantics), but the
+          // counters below are PRE-INCREMENTED before they land in a row — so
+          // seed one less. Off by one otherwise: v0.13.3's hand-drawn gutter
+          // numbered every line one too high (surfaced by the selection core).
+          if (match !== null) { oldLine = Number.parseInt(match[1], 10) - 1; newLine = Number.parseInt(match[2], 10) - 1 }
         } else if (line.indexOf('+') === 0) { kind = 'add'; newLine += 1 }
         else if (line.indexOf('-') === 0) { kind = 'del'; oldLine += 1 }
         else if (line.indexOf('\\') === 0) { kind = 'meta' }
@@ -5548,6 +5810,250 @@ window.__ModuleLoader__.load({
       return out
     }
 
+    /* ---- diff selection core
+       Pure line-number plumbing for the diff-pane context menu (v0.13.5).
+       The host DiffBlock draws rows WITHOUT line-number attributes — a row is
+       `<div class={line + kindClass}>{row.text}</div>` (DiffBlock.tsx:204) and
+       the `+`/`-`/two-space prefixes live in CSS `::before` content — so the
+       menu reconstructs numbers by replaying the ROW KINDS in document order
+       from the patch's first hunk header. The hand-drawn rows already carry
+       parsed numbers (diffLines above). Kept DOM-free between the markers so
+       tests/smoke.mjs can slice the block and drive the real implementation. */
+
+    const DIFF_SNIPPET_MAX = 600
+
+    /* First hunk header of a single-file patch → the absolute numbers the
+       replay starts from (`@@ -a,b +c,d @@`: a/c are the sides' first lines).
+       A patch without any header (binary, mode-only) has no coordinates. */
+    function hunkStartOf(patch) {
+      const headers = hunkHeadersOf(patch)
+      return headers === null ? null : headers[0]
+    }
+
+    /* Every hunk header in patch order: a multi-hunk diff restarts BOTH
+       counters at each `@@` line, so the replay needs one seed per hunk. */
+    function hunkHeadersOf(patch) {
+      const text = typeof patch === 'string' ? patch : ''
+      if (text.indexOf('@@') < 0) return null
+      const headers = []
+      const pattern = /^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/gm
+      let match = pattern.exec(text)
+      while (match !== null) {
+        headers.push({ oldLine: Number.parseInt(match[1], 10), newLine: Number.parseInt(match[2], 10) })
+        match = pattern.exec(text)
+      }
+      return headers.length === 0 ? null : headers
+    }
+
+    /* getComputedStyle(el, '::before').content → the row kind DiffBlock
+       paints: `- ` del, `+ ` add, two spaces context, nothing for path/gap
+       chrome. Browsers quote the value ("+ "); strip quotes before comparing. */
+    function beforeContentKind(content) {
+      if (typeof content !== 'string') return null
+      const value = content.length >= 2 && content.charAt(0) === '"' && content.charAt(content.length - 1) === '"'
+        ? content.slice(1, -1)
+        : content
+      if (value === '- ') return 'del'
+      if (value === '+ ') return 'add'
+      if (value === '  ') return 'ctx'
+      return null
+    }
+
+    /* Replay kinds[0..to] (document order), collecting the span covered by
+       kinds[from..to]. Each hunk restarts BOTH counters from its own header:
+       a chrome row (path/gap, kind null) marks the boundary, and the next
+       content row consumes the NEXT header in patch order — the path row at
+       the top then the gap rows between hunks. New-side numbers win; a purely
+       deleted span reports the OLD numbers with old: true — deleted rows
+       exist on that side only. */
+    function lineSpanFromKinds(kinds, from, to, headers) {
+      if (Array.isArray(kinds) === false || Array.isArray(headers) === false || headers.length === 0) return null
+      if (!(from >= 0 && to >= from && to < kinds.length)) return null
+      let headerIndex = 0
+      let oldLine = 0
+      let newLine = 0
+      let started = false
+      let newFrom = null
+      let newTo = null
+      let oldFrom = null
+      let oldTo = null
+      for (let index = 0; index <= to; index += 1) {
+        const kind = kinds[index]
+        if (kind !== 'del' && kind !== 'add' && kind !== 'ctx') {
+          started = false // chrome row: the next content row starts a new hunk
+          continue
+        }
+        if (started === false) {
+          if (headerIndex >= headers.length) break // more hunks than headers: stop, don't guess
+          const header = headers[headerIndex]
+          headerIndex += 1
+          oldLine = header.oldLine
+          newLine = header.newLine
+          started = true
+        }
+        let oldHit = null
+        let newHit = null
+        if (kind === 'del') { oldHit = oldLine; oldLine += 1 }
+        else if (kind === 'add') { newHit = newLine; newLine += 1 }
+        else { oldHit = oldLine; newHit = newLine; oldLine += 1; newLine += 1 }
+        if (index >= from) {
+          if (oldHit !== null) { oldFrom = oldFrom === null ? oldHit : oldFrom; oldTo = oldHit }
+          if (newHit !== null) { newFrom = newFrom === null ? newHit : newFrom; newTo = newHit }
+        }
+      }
+      if (newFrom !== null) return { start: newFrom, end: newTo === null ? newFrom : newTo, old: false }
+      if (oldFrom !== null) return { start: oldFrom, end: oldTo === null ? oldFrom : oldTo, old: true }
+      return null
+    }
+
+    /* The hand-drawn rows already carry parsed numbers: reduce the selected
+       row range exactly like lineSpanFromKinds reduces replayed kinds. */
+    function rowSpanOfRows(rows, from, to) {
+      if (Array.isArray(rows) === false) return null
+      if (!(from >= 0 && to >= from && to < rows.length)) return null
+      let newFrom = null
+      let newTo = null
+      let oldFrom = null
+      let oldTo = null
+      for (let index = from; index <= to; index += 1) {
+        const row = rows[index]
+        if (row === undefined || row === null) continue
+        const newHit = typeof row.newLine === 'number' ? row.newLine : null
+        const oldHit = typeof row.oldLine === 'number' ? row.oldLine : null
+        if (newHit !== null) { newFrom = newFrom === null ? newHit : newFrom; newTo = newHit }
+        if (oldHit !== null) { oldFrom = oldFrom === null ? oldHit : oldFrom; oldTo = oldHit }
+      }
+      if (newFrom !== null) return { start: newFrom, end: newTo === null ? newFrom : newTo, old: false }
+      if (oldFrom !== null) return { start: oldFrom, end: oldTo === null ? oldFrom : oldTo, old: true }
+      return null
+    }
+
+    /* '7' or '7–9' — the {lines} value the payload templates receive. */
+    function linesLabelOf(start, end) {
+      return start === end ? String(start) : String(start) + '–' + String(end)
+    }
+
+    /* The localized line-span fragment the payload templates embed: new-side
+       numbers read plain, old-side numbers say so instead of pretending. */
+    function lineSpanLabelOf(t, span) {
+      const lines = linesLabelOf(span.start, span.end)
+      return fill(t(span.old === true ? 'send.diffOldLines' : 'send.diffNewLines'), { lines: lines })
+    }
+
+    /* The self-describing line reference text for one resolved span.
+       Commit context carries hash + subject (truncated like the commit send)
+       and the HEAD branch; the worktree pane says staged or uncommitted. */
+    function diffSpanTextOf(t, context, span, branchName) {
+      const lines = lineSpanLabelOf(t, span)
+      if (context === null || context === undefined || context.kind !== 'commit') {
+        return fill(t('send.diffLinesWorktree'), {
+          lines: lines,
+          state: t(context !== null && context !== undefined && context.staged === true ? 'send.diffStaged' : 'send.diffUnstaged'),
+        })
+      }
+      const subject = typeof context.subject === 'string' ? context.subject.trim().slice(0, 60) : ''
+      return fill(t('send.diffLinesCommit'), {
+        lines: lines,
+        hash: typeof context.hash === 'string' && context.hash !== '' ? context.hash.slice(0, 7) : '—',
+        subject: subject === '' ? '—' : subject,
+        branch: typeof branchName === 'string' && branchName !== '' ? branchName : '—',
+      })
+    }
+
+    /* ---- end diff selection core */
+
+    /* ---------- DOM side of the diff-pane context menu (browser only) ----------
+       SSR never calls these: they run inside the pane's onContextMenu, after
+       the selection has been captured. The row element under a selection
+       endpoint is either a hand-drawn `.dig-diff-line`, or a DiffBlock row —
+       a div child of the body whose OWN parent carries the `data-diff`
+       marker. `data-diff` is a component attribute (DiffBlock.tsx:199), not a
+       hashed CSS-module class, so the lookup does not bet on build-time class
+       renaming; the row KIND comes from the `::before` content the kinds are
+       painted with, for the same reason. */
+
+    function savedSelectionOf() {
+      try {
+        const selection = window.getSelection()
+        if (selection === null || selection.rangeCount === 0) return null
+        const text = String(selection)
+        if (text === '') return null
+        return { text: text, range: selection.getRangeAt(0).cloneRange() }
+      } catch (error) { void error; return null }
+    }
+
+    function selectionRowOf(node) {
+      let element = node === null || node === undefined ? null
+        : node.nodeType === 3 ? (node.parentElement === null ? null : node.parentElement)
+        : node.nodeType === 1 ? node
+        : null
+      for (let hop = 0; element !== null && element !== undefined && hop < 8; hop += 1) {
+        if (element.classList !== undefined && element.classList.contains('dig-diff-line') === true) {
+          return { kind: 'drawn', row: element, body: element.parentElement }
+        }
+        const parent = element.parentElement
+        if (parent !== null && parent.getAttribute !== undefined && parent.hasAttribute('data-diff') === false) {
+          const root = parent.parentElement
+          if (root !== null && root.getAttribute !== undefined && root.hasAttribute('data-diff') === true) {
+            return { kind: 'host', row: element, body: parent }
+          }
+        }
+        element = parent
+      }
+      return null
+    }
+
+    /* The rendered rows of a DiffBlock body, with the kind each one paints.
+       The (never-rendered at this panel's maxLines) fold toggle is a button,
+       not a div — skipped so it cannot shift the row indexes. */
+    function hostRowKinds(body) {
+      const children = body === null || body === undefined ? [] : body.children
+      const rows = []
+      const kinds = []
+      for (let index = 0; index < children.length; index += 1) {
+        const child = children[index]
+        if (child === null || child === undefined || child.tagName === 'BUTTON') continue
+        rows.push(child)
+        let kind = null
+        try { kind = beforeContentKind(window.getComputedStyle(child, '::before').content) } catch (error) { void error; kind = null }
+        kinds.push(kind)
+      }
+      return { rows: rows, kinds: kinds }
+    }
+
+    /* { kind: 'lines', span } for a selection inside ONE diff body, or
+       { kind: 'snippet' } when the rows are there but the numbers cannot be
+       reconstructed. null (rows missing entirely) means "not a diff
+       selection": the menu keeps its old behaviour. */
+    function resolveDiffSelection(patch, saved) {
+      if (saved === null || saved === undefined || saved.text === '' || saved.range === null || saved.range === undefined) return null
+      const from = selectionRowOf(saved.range.startContainer)
+      const to = selectionRowOf(saved.range.endContainer)
+      if (from === null || to === null) return null
+      if (from.kind !== to.kind || from.body !== to.body) return { kind: 'snippet', text: saved.text }
+      let span = null
+      if (from.kind === 'drawn') {
+        const rows = diffLines(patch)
+        const all = from.body === null || from.body === undefined ? [] : Array.prototype.slice.call(from.body.querySelectorAll('.dig-diff-line'))
+        const fromIndex = all.indexOf(from.row)
+        const toIndex = all.indexOf(to.row)
+        if (fromIndex >= 0 && toIndex >= 0) span = rowSpanOfRows(rows, Math.min(fromIndex, toIndex), Math.max(fromIndex, toIndex))
+      } else {
+        const headers = hunkHeadersOf(patch)
+        if (headers !== null) {
+          const collected = hostRowKinds(from.body)
+          const fromIndex = collected.rows.indexOf(from.row)
+          const toIndex = collected.rows.indexOf(to.row)
+          if (fromIndex >= 0 && toIndex >= 0) {
+            span = lineSpanFromKinds(collected.kinds, Math.min(fromIndex, toIndex), Math.max(fromIndex, toIndex), headers)
+          }
+        }
+      }
+      if (span === null) return { kind: 'snippet', text: saved.text }
+      return { kind: 'lines', span: span, text: saved.text }
+    }
+
+
     /* DiffBlock's own 16-line cap would REPLACE scrolling with a fold button;
        this panel keeps the old contract (render everything, scroll inside the
        .dig-diff-pane max-height), so the cap is pushed out of reach and the
@@ -7115,6 +7621,11 @@ window.__ModuleLoader__.load({
       const [selectedPath, setSelectedPath] = useState(null)
       const [patch, setPatch] = useState('')
       const [patchLoading, setPatchLoading] = useState(false)
+      /* What the open diff pane shows (v0.13.5): the pane is shared by the
+         commit detail (hash + subject) and the working tree (staged or not),
+         and the selection menu's payload must say which. Cleared everywhere
+         the patch is cleared. */
+      const [diffContext, setDiffContext] = useState(null)
       const [menu, setMenu] = useState(null)
       const [dialog, setDialog] = useState(null)
       const [tick, setTick] = useState(0)
@@ -7481,6 +7992,7 @@ window.__ModuleLoader__.load({
         setDetail(null)
         setSelectedHash(null)
         setPatch('')
+        setDiffContext(null)
         setView('history')
         setPathFilter('')
       }, [sessionId])
@@ -7502,6 +8014,7 @@ window.__ModuleLoader__.load({
         setSelectedHash(commit.hash)
         setSelectedPath(null)
         setPatch('')
+        setDiffContext(null)
         setView('detail')
         setDetail(null)
         try {
@@ -7578,6 +8091,41 @@ window.__ModuleLoader__.load({
          and a toast says so. */
       const sendToComposer = useCallback((payload) => {
         const applied = insertIntoComposer(props.ctx, sessionId, (actx, input, span) => {
+          if (payload.mention !== undefined && payload.text !== undefined) {
+            // Chip + trailing sentence (v0.13.5 diff line refs): the @file chip
+            // first, then the line-range text at the NEW draft tail (the chip
+            // changed both the draft and its rev). The facade appends a
+            // separating space after a chip when none follows, so the text leg
+            // goes in verbatim. If the text leg loses its CAS race twice the
+            // chip still stands — the reference made it, that reads as sent.
+            let chipApplied = false
+            try {
+              chipApplied = input.insertReference({
+                source: 'reference',
+                ref: payload.mention,
+                label: payload.label,
+                appearance: payload.appearance,
+                clipboardText: payload.mention,
+              }, span) === true
+            } catch (error) { void error; chipApplied = false }
+            if (chipApplied === false) return false
+            try {
+              let state = input.state.getSnapshot()
+              for (let attempt = 0; attempt < 2; attempt += 1) {
+                // The chip changed BOTH projections; the tail must be rebuilt
+                // in detect coordinates (see detectTailSpanOf), or selectSpan
+                // rejects it and the sentence silently vanishes.
+                const tail = detectTailSpanOf(state)
+                if (tail !== null) {
+                  let textApplied = false
+                  try { textApplied = actx.bail(actx, 'slash/input-insert-text', { text: payload.text, span: tail }) === true } catch (error) { void error; textApplied = false }
+                  if (textApplied === true) return true
+                }
+                try { state = input.state.getSnapshot() } catch (error) { void error; return true }
+              }
+            } catch (error) { void error }
+            return true
+          }
           if (payload.appearance !== undefined) {
             return input.insertReference({
               source: 'reference',
@@ -7610,6 +8158,21 @@ window.__ModuleLoader__.load({
         })
       }, [sendToComposer])
 
+      /* Self-describing text payloads for the commit/branch sends (v0.13.3 user
+         feedback): a bare short hash or branch name is noise out of context —
+         the text must say WHAT it is and WHERE from. The wording rides the
+         fill() templates send.commitText / send.branchText; `repo` is the repo
+         root's basename. An unknown root degrades to a neutral dash — fill()
+         leaves unknown keys verbatim, so the callers must never let an
+         undefined repo reach the template. The file @-chip is already
+         self-describing and stays untouched. */
+      const repoLabel = repoRoot === null ? '' : baseName(repoRoot)
+      const sendGitSummaryToChat = useCallback((key, values) => {
+        const repo = values.repo === undefined || values.repo === '' ? '—' : values.repo
+        const text = fill(t(key), Object.assign({}, values, { repo: repo }))
+        sendToComposer({ text: text, fallback: text })
+      }, [t, sendToComposer])
+
       const branchMenu = useCallback((event, entry) => {
         const current = branches === null ? '' : branches.branch
         const isLocal = entry.remote !== true && entry.tag !== true
@@ -7619,7 +8182,7 @@ window.__ModuleLoader__.load({
           isLocal ? { id: 'rebase', icon: 'compare', tone: 'violet', label: t('action.rebaseCurrentOnto'), disabled: entry.head === true || blocked, reason: blocked ? t('operation.hint') : reason, run: () => { void run('rebase', { onto: entry.name }) } } : null,
           isLocal ? { id: 'merge', icon: 'compare', tone: 'accent', label: t('action.mergeIntoCurrent'), disabled: entry.head === true || blocked, reason: blocked ? t('operation.hint') : reason, run: () => { void run('merge', { branch: entry.name }) } } : null,
           { id: 'compare', icon: 'filter', tone: 'violet', label: t('action.compare'), disabled: entry.head === true || current === '', reason: reason, run: () => { void compareWith(current, entry.name) } },
-          { id: 'send', icon: 'send', tone: 'accent', label: t('menu.sendToChat'), run: () => sendToComposer({ text: entry.name, fallback: entry.name }) },
+          { id: 'send', icon: 'send', tone: 'accent', label: t('menu.sendToChat'), run: () => sendGitSummaryToChat('send.branchText', { name: entry.name, repo: repoLabel }) },
           null,
           { id: 'favorite', icon: 'star', tone: 'warn', label: t('action.favorite'), active: favorites.indexOf(entry.name) >= 0, run: () => toggleFavoriteBranch(entry.name) },
           { id: 'newBranch', icon: 'plus', tone: 'success', label: t('action.newBranchFrom'), run: () => setDialog({ kind: 'newBranch', from: entry.name }) },
@@ -7630,14 +8193,20 @@ window.__ModuleLoader__.load({
           { id: 'push', icon: 'push', tone: 'success', label: t('action.push'), disabled: blocked, reason: t('operation.hint'), run: () => setDialog({ kind: 'push' }) },
         ].filter((item) => item !== null)
         openMenuAt(event, items)
-      }, [branches, checkout, run, t, compareWith, toggleFavoriteBranch, openMenuAt, favorites, blocked, sendToComposer])
+      }, [branches, checkout, run, t, compareWith, toggleFavoriteBranch, openMenuAt, favorites, blocked, sendGitSummaryToChat, repoLabel])
 
       const commitMenu = useCallback((event, commit) => {
         const shortHash = commit.hash.slice(0, 7)
         const items = [
           { id: 'details', icon: 'file', tone: 'primary', label: t('action.details'), run: () => { void selectCommit(commit) } },
           { id: 'copy', icon: 'tag', tone: 'secondary', label: t('action.copyHash'), run: () => { copyText(commit.hash) } },
-          { id: 'send', icon: 'send', tone: 'accent', label: t('menu.sendToChat'), run: () => sendToComposer({ text: shortHash, fallback: shortHash }) },
+          { id: 'send', icon: 'send', tone: 'accent', label: t('menu.sendToChat'), run: () => {
+            // A commit whose subject is empty (git tolerates empty messages)
+            // degrades to the old bare-hash payload instead of faking one.
+            const subject = typeof commit.subject === 'string' ? commit.subject.trim() : ''
+            if (subject === '') { sendToComposer({ text: shortHash, fallback: shortHash }); return }
+            sendGitSummaryToChat('send.commitText', { hash: shortHash, subject: subject, repo: repoLabel })
+          } },
           null,
           { id: 'checkout', icon: 'checkout', tone: 'accent', label: t('action.checkout'), run: () => setDialog({ kind: 'checkoutCommit', hash: commit.hash }) },
           { id: 'branch', icon: 'plus', tone: 'success', label: t('action.newBranchHere'), run: () => setDialog({ kind: 'newBranch', from: commit.hash }) },
@@ -7650,11 +8219,11 @@ window.__ModuleLoader__.load({
           { id: 'resetHard', icon: 'trash', tone: 'danger', label: t('action.resetHard'), danger: true, disabled: blocked, reason: t('operation.hint'), run: () => setDialog({ kind: 'reset', hash: commit.hash, mode: 'hard' }) },
         ]
         openMenuAt(event, items)
-      }, [run, selectCommit, t, openMenuAt, blocked, sendToComposer])
+      }, [run, selectCommit, t, openMenuAt, blocked, sendToComposer, sendGitSummaryToChat, repoLabel])
 
       const changeMenu = useCallback((event, item, group) => {
         const items = [
-          { id: 'diff', icon: 'file', tone: 'primary', label: t('action.showDiff'), run: () => { void openDiff({ path: item.path, staged: group === 'staged' }) } },
+          { id: 'diff', icon: 'file', tone: 'primary', label: t('action.showDiff'), run: () => { setDiffContext({ kind: 'worktree', staged: group === 'staged' }); void openDiff({ path: item.path, staged: group === 'staged' }) } },
           { id: 'sendRef', icon: 'send', tone: 'accent', label: t('menu.sendToChat'), run: () => sendFileReferenceToChat(item.path) },
           { id: 'sendPath', icon: 'file', tone: 'secondary', label: t('menu.sendFilePathToChat'), run: () => sendToComposer({ text: item.path, fallback: item.path }) },
           null,
@@ -7672,7 +8241,11 @@ window.__ModuleLoader__.load({
          staging verbs: a committed file's diff replays against its commit. */
       const detailFileMenu = useCallback((event, file) => {
         openMenuAt(event, [
-          { id: 'diff', icon: 'file', tone: 'primary', label: t('action.showDiff'), run: () => { setSelectedPath(file.path); void openDiff({ hash: detail === null ? undefined : detail.hash, path: file.path }) } },
+          { id: 'diff', icon: 'file', tone: 'primary', label: t('action.showDiff'), run: () => {
+            setSelectedPath(file.path)
+            setDiffContext({ kind: 'commit', hash: detail === null || detail === undefined ? undefined : detail.hash, subject: detail === null || detail === undefined ? '' : detail.subject })
+            void openDiff({ hash: detail === null ? undefined : detail.hash, path: file.path })
+          } },
           null,
           { id: 'sendRef', icon: 'send', tone: 'accent', label: t('menu.sendToChat'), run: () => sendFileReferenceToChat(file.path) },
           { id: 'sendPath', icon: 'file', tone: 'secondary', label: t('menu.sendFilePathToChat'), run: () => sendToComposer({ text: file.path, fallback: file.path }) },
@@ -7681,6 +8254,66 @@ window.__ModuleLoader__.load({
         ])
       }, [detail, openDiff, openMenuAt, sendFileReferenceToChat, sendToComposer, t])
 
+      /* The diff pane's own context menu (v0.13.5): select text in the diff,
+         right-click, send a self-describing line reference to the composer.
+         The window selection is read BEFORE the menu opens — some platforms
+         clear it the moment a context menu shows — and the whole payload is
+         computed right here, so the menu items run from captured values and
+         never depend on a selection that may no longer exist. A selection
+         outside the diff rows keeps the browser's own menu: preventDefault is
+         skipped and no item appears (the old behaviour).
+
+         LAST-RESORT SEMANTICS (v0.13.5 forward compat): the rows under this
+         pane may be HOST-rendered (ui-primitives DiffBlock), and a future DSH
+         is free to add its own context-menu surface to that component. React
+         dispatches synthetic contextmenu handlers in bubble order — innermost
+         first — so an inner handler that claimed the event (opened its menu
+         or called preventDefault) has already set defaultPrevented by the
+         time this container handler runs. That check is the FIRST statement:
+         if the host handled it we return and the host menu stands alone —
+         never two menus at once, never an override. An unusable selection
+         also returns without preventDefault (browser menu preserved). Only a
+         valid diff selection that NOTHING else handled reaches our menu.
+         UPGRADE MEMO (diff-右键向前兼容): DiffBlock today exposes NO menu
+         surface and NO extension prop — DiffBlockProps is exactly
+         { diffs, labels, maxLines, className } (ui-primitives DiffBlock.tsx);
+         its only stable hook is the `data-diff` marker on the root div, which
+         this pane already keys on. When upstream ships a menu surface (most
+         likely an onRowContextMenu / items prop mounted on the row div or the
+         body container), MIGRATE to that prop — feed it our line-reference
+         items and RETIRE this container-level handler — the absorption
+         pattern dsh-better-workspace uses (host menu surface + host
+         dictionary, own entries appended last), not an event race. Until
+         then this handler stays deliberately last-resort. */
+      const onDiffPaneContextMenu = useCallback((event) => {
+        if (event.defaultPrevented === true) return // an inner (host DiffBlock) handler already owns this event
+        const saved = savedSelectionOf()
+        const resolved = saved === null ? null : resolveDiffSelection(patch, saved)
+        if (saved === null || resolved === null) return
+        event.preventDefault()
+        const path = selectedPath
+        const hasFile = typeof path === 'string' && path !== ''
+        const branchName = branches === null ? '' : branches.branch
+        const mention = hasFile === true ? fileMentionOf(path) : null
+        const snippet = resolved.text.length > DIFF_SNIPPET_MAX ? resolved.text.slice(0, DIFF_SNIPPET_MAX) : resolved.text
+        const text = resolved.kind === 'lines' && hasFile === true
+          ? diffSpanTextOf(t, diffContext, resolved.span, branchName)
+          : snippet
+        const plain = (mention === null ? (hasFile === true ? path : '') : mention) + ' ' + text
+        const sendChip = () => {
+          if (mention === null || hasFile === false) { sendToComposer({ text: text, fallback: text }); return }
+          sendToComposer({ mention: mention, label: baseName(path), appearance: 'file', text: text, fallback: plain })
+        }
+        const items = [
+          hasFile === true && resolved.kind === 'lines'
+            ? { id: 'sendDiffLines', icon: 'send', tone: 'accent', label: t('menu.sendDiffLinesToChat'), run: sendChip }
+            : { id: 'sendDiffSnippet', icon: 'send', tone: 'accent', label: t(resolved.kind === 'lines' ? 'menu.sendDiffLinesToChat' : 'menu.sendDiffSnippetToChat'), run: sendChip },
+          null,
+          { id: 'copyDiffRef', icon: 'tag', tone: 'secondary', label: t('menu.copyDiffRef'), run: () => { copyText(plain) } },
+        ]
+        openMenuAt(event, items)
+      }, [patch, selectedPath, diffContext, branches, openMenuAt, sendToComposer, t])
+
       const submitDialog = useCallback(async (state, value) => {
         setDialog(null)
         if (state.kind === 'newBranch') { await run('checkout', { branch: value, create: true, startPoint: state.from }); return }
@@ -7852,16 +8485,17 @@ window.__ModuleLoader__.load({
         onStageAll: (entries) => { void run('stage', { paths: entries.map((entry) => entry.path) }) },
         onUnstageAll: () => { void run('unstage', { paths: (summary === null ? [] : summary.changes.staged).map((entry) => entry.path) }) },
         onDiscard: (item, group) => setDialog({ kind: 'discard', item: item, group: group }),
-        onDiff: (item, group) => { void openDiff({ path: item.path, staged: group === 'staged' }) },
+        onDiff: (item, group) => { setDiffContext({ kind: 'worktree', staged: group === 'staged' }); void openDiff({ path: item.path, staged: group === 'staged' }) },
         onChangeMenu: changeMenu,
       })
 
       const historyPane = view === 'detail'
         ? E(CommitDetail, {
             t: t, detail: detail, selectedPath: selectedPath,
-            onBack: () => { setView('history'); setSelectedPath(null); setPatch('') },
+            onBack: () => { setView('history'); setSelectedPath(null); setPatch(''); setDiffContext(null) },
             onSelectFile: (file) => {
               setSelectedPath(file.path)
+              setDiffContext({ kind: 'commit', hash: detail === null || detail === undefined ? undefined : detail.hash, subject: detail === null || detail === undefined ? '' : detail.subject })
               void openDiff({ hash: detail === null ? undefined : detail.hash, path: file.path })
             },
             onFileMenu: detailFileMenu,
@@ -7875,10 +8509,10 @@ window.__ModuleLoader__.load({
             onLoadMore: () => { void guard(() => loadCommits(commits.length)) },
           })
 
-      const diffPane = patch === '' && patchLoading === false ? null : E('div', { className: 'dig-diff-pane', 'data-pane': 'diff', style: paneStyle('diff') },
+      const diffPane = patch === '' && patchLoading === false ? null : E('div', { className: 'dig-diff-pane', 'data-pane': 'diff', style: paneStyle('diff'), onContextMenu: onDiffPaneContextMenu },
         E('div', { className: 'dig-diff-head' },
           E('span', { className: 'dig-mono dig-diff-path' }, selectedPath === null ? '' : selectedPath),
-          E('button', { type: 'button', className: 'dig-icon-btn', onClick: () => { setPatch(''); setSelectedPath(null) } }, E(Icon, { name: 'close', size: 12 }))),
+          E('button', { type: 'button', className: 'dig-icon-btn', onClick: () => { setPatch(''); setSelectedPath(null); setDiffContext(null) } }, E(Icon, { name: 'close', size: 12 }))),
         E(DiffBody, { patch: patch, loading: patchLoading, t: t }))
 
       /* ---------- rail (IDE-style left action strip) ---------- */
@@ -8117,7 +8751,7 @@ window.__ModuleLoader__.load({
           E('div', { className: 'dig-compact-bar' },
             E(Segmented, {
               value: view === 'detail' ? 'history' : view,
-              onChange: (next) => { setView(next); setPatch('') },
+              onChange: (next) => { setView(next); setPatch(''); setDiffContext(null) },
               items: [
                 { id: 'changes', label: fill(t('seg.changes'), { n: dirty }) },
                 { id: 'history', label: t('seg.history') },
@@ -8695,30 +9329,48 @@ window.__ModuleLoader__.load({
            with the panel seat pinned to the visible height the scrollHeight
            stays clientHeight + that flow space — the wheel could still scroll
            the whole window by exactly that leftover (user report: the layout
-           fits, yet the page keeps scrolling). The overflow only exists AFTER
-           the new height has been applied, so measure() sets the visible-height
-           target and then, one frame later, CONVERGES: it reads the real
-           overflow and shrinks the seat by that amount. Guard rails keep it
-           stable: shrink only while overflow > 0 (measure() itself recomputes
-           the base on every pass, so the correction never compounds), clamp at
-           the same 240 floor, and the correction is remembered so the next
-           measure() starts from the already-corrected target. */
+           fits, yet the page keeps scrolling). v0.13.3 report: content mounts
+           or changes AFTER the first pass (the composer, the hero, a diff), and
+           a single feedback convergence is not enough. measure() therefore
+           recomputes the UNCORRECTED base (base.current) and hands off to the
+           CONTROLLED CONVERGER below, which is re-run by every trigger: the
+           initial mount, rAF/timeout follow-ups, the scrollport's own resize
+           (ResizeObserver) and window resizes, and — new — the scrollport's
+           content mutations (MutationObserver, debounced), because content
+           growing later re-opens the overflow without resizing the scrollport
+           itself. */
         const leftover = { current: 0 }
+        const base = { current: 0 }
+        /* The converger: up to FOUR rAF-spaced rounds. Each round reads
+           scroll.scrollHeight - scroll.clientHeight; anything over 1px shrinks
+           the seat by exactly that amount and OVERWRITES the leftover record
+           (never adds — every corrected height derives from the fresh base, so
+           repeated rounds cannot compound), clamped at the same 240 floor.
+           Shrink-only: nothing here grows the seat back. A host without the
+           conversation scrollport never reaches this code — measure() skips it
+           all, silently, and never throws. */
+        const converge = (scroll) => {
+          let rounds = 0
+          const step = () => {
+            rounds += 1
+            if (el.isConnected !== true) return
+            const overflow = scroll.scrollHeight - scroll.clientHeight
+            if (overflow <= 1) return
+            leftover.current = overflow
+            setSeatHeight(Math.max(240, base.current - overflow))
+            if (rounds < 4) requestAnimationFrame(step)
+          }
+          requestAnimationFrame(step)
+        }
         const measure = () => {
           let scroll = null
           try { scroll = el.closest('[data-conversation-scroll]') } catch (error) { void error }
           if (scroll === null || scroll === undefined) return
           const offset = Math.max(0, el.getBoundingClientRect().top - scroll.getBoundingClientRect().top)
-          const available = Math.round(scroll.clientHeight - offset - 8) - leftover.current
-          if (available >= 240) setSeatHeight(available)
-          requestAnimationFrame(() => {
-            if (el.isConnected !== true) return
-            const overflow = scroll.scrollHeight - scroll.clientHeight
-            if (overflow > 0) {
-              leftover.current = overflow
-              setSeatHeight(Math.max(240, available - overflow))
-            }
-          })
+          base.current = Math.round(scroll.clientHeight - offset - 8)
+          const corrected = base.current - leftover.current
+          if (corrected >= 240) setSeatHeight(corrected)
+          converge(scroll)
         }
         measure()
         const raf = requestAnimationFrame(() => { measure() })
@@ -8731,10 +9383,28 @@ window.__ModuleLoader__.load({
             observer.observe(scroll)
           }
         } catch (error) { void error }
+        /* Content that mounts or changes later does not resize the scrollport,
+           so the ResizeObserver stays silent while the overflow re-opens; the
+           mutation watcher re-measures for it. Debounced ~120ms so a mount
+           burst converges once instead of once per node. */
+        let mutationObserver
+        let mutationTimer = null
+        try {
+          const scroll = el.closest('[data-conversation-scroll]')
+          if (scroll !== null && scroll !== undefined && typeof MutationObserver === 'function') {
+            mutationObserver = new MutationObserver(() => {
+              if (mutationTimer !== null) clearTimeout(mutationTimer)
+              mutationTimer = setTimeout(() => { mutationTimer = null; measure() }, 120)
+            })
+            mutationObserver.observe(scroll, { childList: true, subtree: true })
+          }
+        } catch (error) { void error }
         window.addEventListener('resize', measure)
         return () => {
           cancelAnimationFrame(raf)
           clearTimeout(late)
+          if (mutationTimer !== null) clearTimeout(mutationTimer)
+          if (mutationObserver !== undefined) mutationObserver.disconnect()
           if (observer !== undefined) observer.disconnect()
           window.removeEventListener('resize', measure)
         }