dsh-ide-git 0.19.12 → 0.20.0

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-ide-git",
-  "version": "0.19.12",
+  "version": "0.20.0",
   "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.19.12",
+  "version": "0.20.0",
   "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

@@ -164,6 +164,9 @@ window.__ModuleLoader__.load({
       'action.fullscreen': '全屏',
       'action.exitFullscreen': '退出全屏',
       'action.newBranchFrom': '从该分支新建分支...',
+      'action.setUpstream': '设置上游…',
+      'action.unsetUpstream': '取消上游',
+      'action.createLocalBranch': '创建本地分支…',
       'action.newBranchHere': '在此新建分支...',
       'action.rename': '重命名...',
       'action.delete': '删除',
@@ -235,6 +238,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': '从所有远程抓取',
       'more.deleteRemoteBranch': '删除远程分支...',
       'more.publish': '发布分支...',
+      'more.setUpstreamHead': '设置当前分支上游…',
+      'more.unsetUpstreamHead': '取消当前分支上游',
       'more.addRemote': '添加远程...',
       'more.removeRemote': '删除远程...',
       'more.stashTracked': '贮藏(仅已跟踪)',
@@ -392,6 +397,7 @@ window.__ModuleLoader__.load({
       'confirm.cancel': '取消',
       'confirm.ok': '确定',
       'prompt.newBranch': '新分支名(将创建并签出)',
+      'prompt.createTracking': '从远程分支创建本地分支',
       'prompt.renameBranch': '重命名分支',
       'prompt.newTag': '新标签名',
       'prompt.fromHead': '当前 HEAD',
@@ -494,6 +500,9 @@ window.__ModuleLoader__.load({
       'action.fullscreen': 'Full screen',
       'action.exitFullscreen': 'Exit full screen',
       'action.newBranchFrom': 'New branch from here...',
+      'action.setUpstream': 'Set Upstream…',
+      'action.unsetUpstream': 'Unset Upstream',
+      'action.createLocalBranch': 'Create Local Branch…',
       'action.newBranchHere': 'New branch here...',
       'action.rename': 'Rename...',
       'action.delete': 'Delete',
@@ -565,6 +574,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'Fetch from All Remotes',
       'more.deleteRemoteBranch': 'Delete Remote Branch...',
       'more.publish': 'Publish Branch...',
+      'more.setUpstreamHead': 'Set Upstream for Current Branch…',
+      'more.unsetUpstreamHead': 'Unset Upstream of Current Branch',
       'more.addRemote': 'Add Remote...',
       'more.removeRemote': 'Remove Remote...',
       'more.stashTracked': 'Stash (Tracked Only)',
@@ -722,6 +733,7 @@ window.__ModuleLoader__.load({
       'confirm.cancel': 'Cancel',
       'confirm.ok': 'OK',
       'prompt.newBranch': 'New branch name (created and checked out)',
+      'prompt.createTracking': 'Create a local branch from the remote one',
       'prompt.renameBranch': 'Rename branch',
       'prompt.newTag': 'New tag name',
       'prompt.fromHead': 'current HEAD',
@@ -832,6 +844,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': '全螢幕',
         'action.exitFullscreen': '結束全螢幕',
         'action.newBranchFrom': '由此新建分支...',
+        'action.setUpstream': '設定上游…',
+        'action.unsetUpstream': '取消上游',
+        'action.createLocalBranch': '建立本地分支…',
         'action.newBranchHere': '喺呢度新建分支...',
         'action.rename': '重新命名...',
         'action.delete': '刪除',
@@ -903,6 +918,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': '從所有遠端抓取',
       'more.deleteRemoteBranch': '刪除遠端分支...',
       'more.publish': '發布分支...',
+      'more.setUpstreamHead': '設定目前分支上游…',
+      'more.unsetUpstreamHead': '取消目前分支上游',
       'more.addRemote': '新增遠端...',
       'more.removeRemote': '刪除遠端...',
       'more.stashTracked': '儲存(僅已追蹤)',
@@ -1060,6 +1077,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': '取消',
         'confirm.ok': '確定',
         'prompt.newBranch': '新分支名(建立並簽出)',
+        'prompt.createTracking': '從遠端分支建立本地分支',
         'prompt.renameBranch': '重新命名分支',
         'prompt.newTag': '新標籤名',
         'prompt.fromHead': '當前 HEAD',
@@ -1162,6 +1180,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': '全螢幕',
         'action.exitFullscreen': '結束全螢幕',
         'action.newBranchFrom': '由此新建分支...',
+        'action.setUpstream': '設定上游…',
+        'action.unsetUpstream': '取消上游',
+        'action.createLocalBranch': '建立本地分支…',
         'action.newBranchHere': '在此新建分支...',
         'action.rename': '重新命名...',
         'action.delete': '刪除',
@@ -1233,6 +1254,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': '從所有遠端擷取',
       'more.deleteRemoteBranch': '刪除遠端分支...',
       'more.publish': '發佈分支...',
+      'more.setUpstreamHead': '設定目前分支上游…',
+      'more.unsetUpstreamHead': '取消目前分支上游',
       'more.addRemote': '新增遠端...',
       'more.removeRemote': '移除遠端...',
       'more.stashTracked': '擱置(僅已追蹤)',
@@ -1390,6 +1413,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': '取消',
         'confirm.ok': '確定',
         'prompt.newBranch': '新分支名稱(建立並簽出)',
+        'prompt.createTracking': '從遠端分支建立本地分支',
         'prompt.renameBranch': '重新命名分支',
         'prompt.newTag': '新標籤名稱',
         'prompt.fromHead': '目前 HEAD',
@@ -1492,6 +1516,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': '全螢幕',
         'action.exitFullscreen': '結束全螢幕',
         'action.newBranchFrom': '由此新建分支...',
+        'action.setUpstream': '設定上游…',
+        'action.unsetUpstream': '取消上游',
+        'action.createLocalBranch': '建立本地分支…',
         'action.newBranchHere': '喺呢度新建分支...',
         'action.rename': '重新命名...',
         'action.delete': '刪除',
@@ -1563,6 +1590,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': '從所有遠端抓取',
       'more.deleteRemoteBranch': '刪除遠端分支...',
       'more.publish': '發布分支...',
+      'more.setUpstreamHead': '設定目前分支上游…',
+      'more.unsetUpstreamHead': '取消目前分支上游',
       'more.addRemote': '新增遠端...',
       'more.removeRemote': '刪除遠端...',
       'more.stashTracked': '儲存(僅已追蹤)',
@@ -1720,6 +1749,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': '取消',
         'confirm.ok': '確定',
         'prompt.newBranch': '新分支名(建立並簽出)',
+        'prompt.createTracking': '從遠端分支建立本地分支',
         'prompt.renameBranch': '重新命名分支',
         'prompt.newTag': '新標籤名',
         'prompt.fromHead': '當前 HEAD',
@@ -1822,6 +1852,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': '全画面',
         'action.exitFullscreen': '全画面を終了',
         'action.newBranchFrom': 'ここから新しいブランチ...',
+        'action.setUpstream': '上流を設定…',
+        'action.unsetUpstream': '上流を解除',
+        'action.createLocalBranch': 'ローカルブランチを作成…',
         'action.newBranchHere': 'ここに新しいブランチ...',
         'action.rename': '名前を変更...',
         'action.delete': '削除',
@@ -1893,6 +1926,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': '全リモートからフェッチ',
       'more.deleteRemoteBranch': 'リモートブランチを削除...',
       'more.publish': 'ブランチを公開...',
+      'more.setUpstreamHead': '現在のブランチの上流を設定…',
+      'more.unsetUpstreamHead': '現在のブランチの上流を解除',
       'more.addRemote': 'リモートを追加...',
       'more.removeRemote': 'リモートを削除...',
       'more.stashTracked': 'スタッシュ(追跡済みのみ)',
@@ -2050,6 +2085,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'キャンセル',
         'confirm.ok': 'OK',
         'prompt.newBranch': '新しいブランチ名(作成してチェックアウト)',
+        'prompt.createTracking': 'リモートブランチからローカルブランチを作成',
         'prompt.renameBranch': 'ブランチ名を変更',
         'prompt.newTag': '新しいタグ名',
         'prompt.fromHead': '現在の HEAD',
@@ -2152,6 +2188,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': '전체 화면',
         'action.exitFullscreen': '전체 화면 종료',
         'action.newBranchFrom': '여기서 새 브랜치...',
+        'action.setUpstream': '업스트림 설정…',
+        'action.unsetUpstream': '업스트림 해제',
+        'action.createLocalBranch': '로컬 브랜치 만들기…',
         'action.newBranchHere': '여기에 새 브랜치...',
         'action.rename': '이름 바꾸기...',
         'action.delete': '삭제',
@@ -2223,6 +2262,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': '모든 원격에서 페치',
       'more.deleteRemoteBranch': '원격 브랜치 삭제...',
       'more.publish': '브랜치 게시...',
+      'more.setUpstreamHead': '현재 브랜치 업스트림 설정…',
+      'more.unsetUpstreamHead': '현재 브랜치 업스트림 해제',
       'more.addRemote': '원격 추가...',
       'more.removeRemote': '원격 제거...',
       'more.stashTracked': '스태시(추적된 파일만)',
@@ -2380,6 +2421,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': '취소',
         'confirm.ok': '확인',
         'prompt.newBranch': '새 브랜치 이름(생성 후 체크아웃)',
+        'prompt.createTracking': '원격 브랜치에서 로컬 브랜치 만들기',
         'prompt.renameBranch': '브랜치 이름 바꾸기',
         'prompt.newTag': '새 태그 이름',
         'prompt.fromHead': '현재 HEAD',
@@ -2482,6 +2524,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': 'Vollbild',
         'action.exitFullscreen': 'Vollbild beenden',
         'action.newBranchFrom': 'Neuer Branch von hier...',
+        'action.setUpstream': 'Upstream festlegen …',
+        'action.unsetUpstream': 'Upstream entfernen',
+        'action.createLocalBranch': 'Lokalen Branch erstellen …',
         'action.newBranchHere': 'Neuer Branch hier...',
         'action.rename': 'Umbenennen...',
         'action.delete': 'Löschen',
@@ -2553,6 +2598,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'Von allen Remotes holen',
       'more.deleteRemoteBranch': 'Remote-Branch löschen...',
       'more.publish': 'Branch veröffentlichen...',
+      'more.setUpstreamHead': 'Upstream des aktuellen Branch festlegen …',
+      'more.unsetUpstreamHead': 'Upstream des aktuellen Branch entfernen',
       'more.addRemote': 'Remote hinzufügen...',
       'more.removeRemote': 'Remote entfernen...',
       'more.stashTracked': 'Stash (nur getrackt)',
@@ -2710,6 +2757,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'Abbrechen',
         'confirm.ok': 'OK',
         'prompt.newBranch': 'Name des neuen Branch (wird erstellt und ausgecheckt)',
+        'prompt.createTracking': 'Lokalen Branch aus dem Remote-Branch erstellen',
         'prompt.renameBranch': 'Branch umbenennen',
         'prompt.newTag': 'Name des neuen Tags',
         'prompt.fromHead': 'aktuelles HEAD',
@@ -2812,6 +2860,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': 'Plein écran',
         'action.exitFullscreen': 'Quitter le plein écran',
         'action.newBranchFrom': 'Nouvelle branche depuis ici...',
+        'action.setUpstream': 'Définir l\'upstream…',
+        'action.unsetUpstream': 'Retirer l\'upstream',
+        'action.createLocalBranch': 'Créer une branche locale…',
         'action.newBranchHere': 'Nouvelle branche ici...',
         'action.rename': 'Renommer...',
         'action.delete': 'Supprimer',
@@ -2883,6 +2934,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'Récupérer de tous les distants',
       'more.deleteRemoteBranch': 'Supprimer la branche distante...',
       'more.publish': 'Publier la branche...',
+      'more.setUpstreamHead': 'Définir l\'upstream de la branche courante…',
+      'more.unsetUpstreamHead': 'Retirer l\'upstream de la branche courante',
       'more.addRemote': 'Ajouter un distant...',
       'more.removeRemote': 'Supprimer le distant...',
       'more.stashTracked': 'Remisage (suivis seulement)',
@@ -3040,6 +3093,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'Annuler',
         'confirm.ok': 'OK',
         'prompt.newBranch': 'Nom de la nouvelle branche (créée et extraite)',
+        'prompt.createTracking': 'Créer une branche locale depuis la branche distante',
         'prompt.renameBranch': 'Renommer la branche',
         'prompt.newTag': 'Nom de la nouvelle étiquette',
         'prompt.fromHead': 'HEAD courant',
@@ -3142,6 +3196,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': 'Полный экран',
         'action.exitFullscreen': 'Выйти из полного экрана',
         'action.newBranchFrom': 'Новая ветка отсюда...',
+        'action.setUpstream': 'Задать upstream…',
+        'action.unsetUpstream': 'Убрать upstream',
+        'action.createLocalBranch': 'Создать локальную ветку…',
         'action.newBranchHere': 'Новая ветка здесь...',
         'action.rename': 'Переименовать...',
         'action.delete': 'Удалить',
@@ -3213,6 +3270,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'Изъять со всех серверов',
       'more.deleteRemoteBranch': 'Удалить ветвь на сервере...',
       'more.publish': 'Опубликовать ветвь...',
+      'more.setUpstreamHead': 'Задать upstream текущей ветки…',
+      'more.unsetUpstreamHead': 'Убрать upstream текущей ветки',
       'more.addRemote': 'Добавить сервер...',
       'more.removeRemote': 'Удалить сервер...',
       'more.stashTracked': 'Отложить (только отслеживаемое)',
@@ -3370,6 +3429,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'Отмена',
         'confirm.ok': 'OK',
         'prompt.newBranch': 'Имя новой ветки (будет создана и выбрана)',
+        'prompt.createTracking': 'Создать локальную ветку из удалённой',
         'prompt.renameBranch': 'Переименовать ветку',
         'prompt.newTag': 'Имя нового тега',
         'prompt.fromHead': 'текущий HEAD',
@@ -3472,6 +3532,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': 'Tela cheia',
         'action.exitFullscreen': 'Sair da tela cheia',
         'action.newBranchFrom': 'Nova branch a partir daqui...',
+        'action.setUpstream': 'Definir upstream…',
+        'action.unsetUpstream': 'Remover upstream',
+        'action.createLocalBranch': 'Criar branch local…',
         'action.newBranchHere': 'Nova branch aqui...',
         'action.rename': 'Renomear...',
         'action.delete': 'Excluir',
@@ -3543,6 +3606,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'Fetch de todos os remotos',
       'more.deleteRemoteBranch': 'Eliminar ramo remoto...',
       'more.publish': 'Publicar ramificação...',
+      'more.setUpstreamHead': 'Definir upstream da branch atual…',
+      'more.unsetUpstreamHead': 'Remover upstream da branch atual',
       'more.addRemote': 'Adicionar remoto...',
       'more.removeRemote': 'Remover remoto...',
       'more.stashTracked': 'Stash (apenas rastreados)',
@@ -3700,6 +3765,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'Cancelar',
         'confirm.ok': 'OK',
         'prompt.newBranch': 'Nome da nova branch (criada e com checkout)',
+        'prompt.createTracking': 'Criar branch local a partir da remota',
         'prompt.renameBranch': 'Renomear branch',
         'prompt.newTag': 'Nome da nova tag',
         'prompt.fromHead': 'HEAD atual',
@@ -3802,6 +3868,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': 'Schermo intero',
         'action.exitFullscreen': 'Esci da schermo intero',
         'action.newBranchFrom': 'Nuovo branch da qui...',
+        'action.setUpstream': 'Imposta upstream…',
+        'action.unsetUpstream': 'Rimuovi upstream',
+        'action.createLocalBranch': 'Crea branch locale…',
         'action.newBranchHere': 'Nuovo branch qui...',
         'action.rename': 'Rinomina...',
         'action.delete': 'Elimina',
@@ -3873,6 +3942,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'Fetch da tutti i remoti',
       'more.deleteRemoteBranch': 'Elimina branch remoto...',
       'more.publish': 'Pubblica branch...',
+      'more.setUpstreamHead': 'Imposta upstream del branch corrente…',
+      'more.unsetUpstreamHead': 'Rimuovi upstream del branch corrente',
       'more.addRemote': 'Aggiungi remoto...',
       'more.removeRemote': 'Rimuovi remoto...',
       'more.stashTracked': 'Stash (solo tracciati)',
@@ -4030,6 +4101,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'Annulla',
         'confirm.ok': 'OK',
         'prompt.newBranch': 'Nome del nuovo branch (creato e messo in checkout)',
+        'prompt.createTracking': 'Crea un branch locale dal branch remoto',
         'prompt.renameBranch': 'Rinomina il branch',
         'prompt.newTag': 'Nome del nuovo tag',
         'prompt.fromHead': 'HEAD corrente',
@@ -4132,6 +4204,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': 'Volledig scherm',
         'action.exitFullscreen': 'Volledig scherm sluiten',
         'action.newBranchFrom': 'Nieuwe branch vanaf hier...',
+        'action.setUpstream': 'Upstream instellen…',
+        'action.unsetUpstream': 'Upstream verwijderen',
+        'action.createLocalBranch': 'Lokale branch maken…',
         'action.newBranchHere': 'Nieuwe branch hier...',
         'action.rename': 'Hernoemen...',
         'action.delete': 'Verwijderen',
@@ -4203,6 +4278,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'Van alle remotes halen',
       'more.deleteRemoteBranch': 'Remote branch verwijderen...',
       'more.publish': 'Branch publiceren...',
+      'more.setUpstreamHead': 'Upstream instellen voor huidige branch…',
+      'more.unsetUpstreamHead': 'Upstream van huidige branch verwijderen',
       'more.addRemote': 'Remote toevoegen...',
       'more.removeRemote': 'Remote verwijderen...',
       'more.stashTracked': 'Stash (alleen gevolgd)',
@@ -4360,6 +4437,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'Annuleren',
         'confirm.ok': 'OK',
         'prompt.newBranch': 'Naam van de nieuwe branch (wordt aangemaakt en uitgecheckt)',
+        'prompt.createTracking': 'Lokale branch maken vanaf de remote branch',
         'prompt.renameBranch': 'Branch hernoemen',
         'prompt.newTag': 'Naam van de nieuwe tag',
         'prompt.fromHead': 'huidige HEAD',
@@ -4462,6 +4540,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': 'Pełny ekran',
         'action.exitFullscreen': 'Wyjdź z pełnego ekranu',
         'action.newBranchFrom': 'Nowa gałąź stąd...',
+        'action.setUpstream': 'Ustaw upstream…',
+        'action.unsetUpstream': 'Usuń upstream',
+        'action.createLocalBranch': 'Utwórz gałąź lokalną…',
         'action.newBranchHere': 'Nowa gałąź tutaj...',
         'action.rename': 'Zmień nazwę...',
         'action.delete': 'Usuń',
@@ -4533,6 +4614,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'Pobierz ze wszystkich zdalnych',
       'more.deleteRemoteBranch': 'Usuń zdalną gałąź...',
       'more.publish': 'Opublikuj gałąź...',
+      'more.setUpstreamHead': 'Ustaw upstream bieżącej gałęzi…',
+      'more.unsetUpstreamHead': 'Usuń upstream bieżącej gałęzi',
       'more.addRemote': 'Dodaj zdalne...',
       'more.removeRemote': 'Usuń zdalne...',
       'more.stashTracked': 'Schowaj (tylko śledzone)',
@@ -4690,6 +4773,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'Anuluj',
         'confirm.ok': 'OK',
         'prompt.newBranch': 'Nazwa nowej gałęzi (zostanie utworzona i wybrana)',
+        'prompt.createTracking': 'Utwórz gałąź lokalną z gałęzi zdalnej',
         'prompt.renameBranch': 'Zmień nazwę gałęzi',
         'prompt.newTag': 'Nazwa nowego tagu',
         'prompt.fromHead': 'bieżący HEAD',
@@ -4792,6 +4876,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': 'Helskärm',
         'action.exitFullscreen': 'Avsluta helskärm',
         'action.newBranchFrom': 'Ny gren härifrån...',
+        'action.setUpstream': 'Ange upstream…',
+        'action.unsetUpstream': 'Ta bort upstream',
+        'action.createLocalBranch': 'Skapa lokal gren…',
         'action.newBranchHere': 'Ny gren här...',
         'action.rename': 'Byt namn...',
         'action.delete': 'Ta bort',
@@ -4863,6 +4950,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'Hämta från alla fjärrar',
       'more.deleteRemoteBranch': 'Ta bort fjärrgren...',
       'more.publish': 'Publicera gren...',
+      'more.setUpstreamHead': 'Ange upstream för aktuell gren…',
+      'more.unsetUpstreamHead': 'Ta bort upstream för aktuell gren',
       'more.addRemote': 'Lägg till fjärr...',
       'more.removeRemote': 'Ta bort fjärr...',
       'more.stashTracked': 'Stash (endast spårade)',
@@ -5020,6 +5109,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'Avbryt',
         'confirm.ok': 'OK',
         'prompt.newBranch': 'Namn på ny gren (skapas och checkas ut)',
+        'prompt.createTracking': 'Skapa lokal gren från fjärrgrenen',
         'prompt.renameBranch': 'Byt namn på grenen',
         'prompt.newTag': 'Namn på ny tagg',
         'prompt.fromHead': 'aktuell HEAD',
@@ -5122,6 +5212,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': 'Tam ekran',
         'action.exitFullscreen': 'Tam ekrandan çık',
         'action.newBranchFrom': 'Buradan yeni dal...',
+        'action.setUpstream': 'Upstream ayarla…',
+        'action.unsetUpstream': 'Upstream kaldır',
+        'action.createLocalBranch': 'Yerel dal oluştur…',
         'action.newBranchHere': 'Burada yeni dal...',
         'action.rename': 'Yeniden adlandır...',
         'action.delete': 'Sil',
@@ -5193,6 +5286,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'Tüm uzaklardan al',
       'more.deleteRemoteBranch': 'Uzak dalı sil...',
       'more.publish': 'Dalı yayınla...',
+      'more.setUpstreamHead': 'Geçerli dalın upstream\'ini ayarla…',
+      'more.unsetUpstreamHead': 'Geçerli dalın upstream\'ini kaldır',
       'more.addRemote': 'Uzak ekle...',
       'more.removeRemote': 'Uzağı kaldır...',
       'more.stashTracked': 'Stash (yalnızca izlenen)',
@@ -5350,6 +5445,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'İptal',
         'confirm.ok': 'Tamam',
         'prompt.newBranch': 'Yeni dal adı (oluşturulur ve çıkarılır)',
+        'prompt.createTracking': 'Uzak daldan yerel dal oluştur',
         'prompt.renameBranch': 'Dalı yeniden adlandır',
         'prompt.newTag': 'Yeni etiket adı',
         'prompt.fromHead': 'geçerli HEAD',
@@ -5452,6 +5548,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': 'Layar penuh',
         'action.exitFullscreen': 'Keluar dari layar penuh',
         'action.newBranchFrom': 'Branch baru dari sini...',
+        'action.setUpstream': 'Atur upstream…',
+        'action.unsetUpstream': 'Hapus upstream',
+        'action.createLocalBranch': 'Buat branch lokal…',
         'action.newBranchHere': 'Branch baru di sini...',
         'action.rename': 'Ganti nama...',
         'action.delete': 'Hapus',
@@ -5523,6 +5622,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'Fetch dari semua remote',
       'more.deleteRemoteBranch': 'Hapus cabang remote...',
       'more.publish': 'Publikasikan cabang...',
+      'more.setUpstreamHead': 'Atur upstream cabang saat ini…',
+      'more.unsetUpstreamHead': 'Hapus upstream cabang saat ini',
       'more.addRemote': 'Tambah remote...',
       'more.removeRemote': 'Hapus remote...',
       'more.stashTracked': 'Stash (hanya yang dilacak)',
@@ -5680,6 +5781,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'Batal',
         'confirm.ok': 'OK',
         'prompt.newBranch': 'Nama branch baru (dibuat dan di-checkout)',
+        'prompt.createTracking': 'Buat branch lokal dari branch remote',
         'prompt.renameBranch': 'Ganti nama branch',
         'prompt.newTag': 'Nama tag baru',
         'prompt.fromHead': 'HEAD saat ini',
@@ -5782,6 +5884,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': 'Toàn màn hình',
         'action.exitFullscreen': 'Thoát toàn màn hình',
         'action.newBranchFrom': 'Nhánh mới từ đây...',
+        'action.setUpstream': 'Đặt upstream…',
+        'action.unsetUpstream': 'Bỏ upstream',
+        'action.createLocalBranch': 'Tạo nhánh cục bộ…',
         'action.newBranchHere': 'Nhánh mới tại đây...',
         'action.rename': 'Đổi tên...',
         'action.delete': 'Xoá',
@@ -5853,6 +5958,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'Fetch từ mọi remote',
       'more.deleteRemoteBranch': 'Xóa nhánh remote...',
       'more.publish': 'Công bố nhánh...',
+      'more.setUpstreamHead': 'Đặt upstream cho nhánh hiện tại…',
+      'more.unsetUpstreamHead': 'Bỏ upstream của nhánh hiện tại',
       'more.addRemote': 'Thêm remote...',
       'more.removeRemote': 'Xóa remote...',
       'more.stashTracked': 'Stash (chỉ theo dõi)',
@@ -6010,6 +6117,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'Huỷ',
         'confirm.ok': 'OK',
         'prompt.newBranch': 'Tên nhánh mới (được tạo và checkout)',
+        'prompt.createTracking': 'Tạo nhánh cục bộ từ nhánh từ xa',
         'prompt.renameBranch': 'Đổi tên nhánh',
         'prompt.newTag': 'Tên thẻ mới',
         'prompt.fromHead': 'HEAD hiện tại',
@@ -6112,6 +6220,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': 'ملء الشاشة',
         'action.exitFullscreen': 'إنهاء ملء الشاشة',
         'action.newBranchFrom': 'فرع جديد من هنا...',
+        'action.setUpstream': 'تعيين upstream…',
+        'action.unsetUpstream': 'إزالة upstream',
+        'action.createLocalBranch': 'إنشاء فرع محلي…',
         'action.newBranchHere': 'فرع جديد هنا...',
         'action.rename': 'إعادة التسمية...',
         'action.delete': 'حذف',
@@ -6183,6 +6294,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'جلب من كل الأجهزة البعيدة',
       'more.deleteRemoteBranch': 'حذف فرع بعيد...',
       'more.publish': 'نشر الفرع...',
+      'more.setUpstreamHead': 'تعيين upstream للفرع الحالي…',
+      'more.unsetUpstreamHead': 'إزالة upstream للفرع الحالي',
       'more.addRemote': 'إضافة جهاز بعيد...',
       'more.removeRemote': 'إزالة جهاز بعيد...',
       'more.stashTracked': 'خبئ (المتتبع فقط)',
@@ -6340,6 +6453,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'إلغاء',
         'confirm.ok': 'موافق',
         'prompt.newBranch': 'اسم الفرع الجديد (يُنشأ ويُبدَّل إليه)',
+        'prompt.createTracking': 'إنشاء فرع محلي من الفرع البعيد',
         'prompt.renameBranch': 'إعادة تسمية الفرع',
         'prompt.newTag': 'اسم الوسم الجديد',
         'prompt.fromHead': 'HEAD الحالي',
@@ -6442,6 +6556,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': 'पूर्ण स्क्रीन',
         'action.exitFullscreen': 'पूर्ण स्क्रीन से बाहर',
         'action.newBranchFrom': 'यहाँ से नई शाखा...',
+        'action.setUpstream': 'अपस्ट्रीम सेट करें…',
+        'action.unsetUpstream': 'अपस्ट्रीम हटाएँ',
+        'action.createLocalBranch': 'लोकल शाखा बनाएँ…',
         'action.newBranchHere': 'यहाँ नई शाखा...',
         'action.rename': 'नाम बदलें...',
         'action.delete': 'हटाएँ',
@@ -6513,6 +6630,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'सभी रिमोट से फ़ेच',
       'more.deleteRemoteBranch': 'रिमोट ब्रांच हटाएँ...',
       'more.publish': 'ब्रांच प्रकाशित करें...',
+      'more.setUpstreamHead': 'वर्तमान शाखा के लिए अपस्ट्रीम सेट करें…',
+      'more.unsetUpstreamHead': 'वर्तमान शाखा का अपस्ट्रीम हटाएँ',
       'more.addRemote': 'रिमोट जोड़ें...',
       'more.removeRemote': 'रिमोट हटाएँ...',
       'more.stashTracked': 'स्टैश (केवल ट्रैक की गई)',
@@ -6670,6 +6789,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'रद्द करें',
         'confirm.ok': 'ठीक',
         'prompt.newBranch': 'नई शाखा का नाम (बनाई और चेकआउट की जाएगी)',
+        'prompt.createTracking': 'रिमोट शाखा से लोकल शाखा बनाएँ',
         'prompt.renameBranch': 'शाखा का नाम बदलें',
         'prompt.newTag': 'नए टैग का नाम',
         'prompt.fromHead': 'वर्तमान HEAD',
@@ -6772,6 +6892,9 @@ window.__ModuleLoader__.load({
         'action.fullscreen': 'เต็มหน้าจอ',
         'action.exitFullscreen': 'ออกจากเต็มหน้าจอ',
         'action.newBranchFrom': 'แบรนช์ใหม่จากที่นี่...',
+        'action.setUpstream': 'ตั้งค่า upstream…',
+        'action.unsetUpstream': 'ยกเลิก upstream',
+        'action.createLocalBranch': 'สร้างแบรนช์ในเครื่อง…',
         'action.newBranchHere': 'แบรนช์ใหม่ที่นี่...',
         'action.rename': 'เปลี่ยนชื่อ...',
         'action.delete': 'ลบ',
@@ -6843,6 +6966,8 @@ window.__ModuleLoader__.load({
       'more.fetchAll': 'ฟีตช์จากทุกรีโมต',
       'more.deleteRemoteBranch': 'ลบบรานช์รีโมต...',
       'more.publish': 'เผยแพร่บรานช์...',
+      'more.setUpstreamHead': 'ตั้งค่า upstream ของแบรนช์ปัจจุบัน…',
+      'more.unsetUpstreamHead': 'ยกเลิก upstream ของแบรนช์ปัจจุบัน',
       'more.addRemote': 'เพิ่มรีโมต...',
       'more.removeRemote': 'ลบรีโมต...',
       'more.stashTracked': 'สแตช(เฉพาะไฟล์ที่ติดตาม)',
@@ -7000,6 +7125,7 @@ window.__ModuleLoader__.load({
         'confirm.cancel': 'ยกเลิก',
         'confirm.ok': 'ตกลง',
         'prompt.newBranch': 'ชื่อแบรนช์ใหม่ (สร้างและเช็กเอาต์ให้)',
+        'prompt.createTracking': 'สร้างแบรนช์ในเครื่องจากแบรนช์รีโมต',
         'prompt.renameBranch': 'เปลี่ยนชื่อแบรนช์',
         'prompt.newTag': 'ชื่อแท็กใหม่',
         'prompt.fromHead': 'HEAD ปัจจุบัน',
@@ -10541,6 +10667,10 @@ window.__ModuleLoader__.load({
       },
         E('span', { className: 'dig-row-icon dig-tone-' + tone + (starred === true ? ' dig-star-filled' : '') }, E(Icon, { name: glyph, size: 12 })),
         E('span', { className: 'dig-row-label' }, props.label === undefined ? entry.name : props.label),
+        // Inline tracking target (issue #18): the title already said "name →
+        // upstream", but nobody hovers a tree to learn a binding. Local rows
+        // show it as muted small text; remote rows ARE the upstream.
+        kind !== 'remote' && kind !== 'tag' && entry.upstream !== null && entry.upstream !== undefined ? E('span', { className: 'dig-row-upstream' }, '→ ' + entry.upstream) : null,
         // A bare 'W' told nobody anything (reported right after the section counts):
         // it means this branch is checked out in ANOTHER working tree, which is why
         // git refuses to check it out here. An icon plus a spelled-out tooltip says so.
@@ -13184,7 +13314,25 @@ window.__ModuleLoader__.load({
           { id: 'copy', icon: 'tag', tone: 'secondary', label: t('action.copyName'), run: () => copyValues([entry.name]) },
           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 }) },
+          /* Upstream management (issue #18). The remote-picker submenu is
+             built INSIDE run() — branches.remote is read at click time, not
+             render time, so branchMenu's useCallback deps stay untouched
+             (remoteBranches is defined AFTER this callback; a render-time
+             reference would be the classic hooks TDZ trap). */
+          isLocal ? { id: 'setUpstream', icon: 'fetch', tone: 'cyan', label: t('action.setUpstream'), disabled: branches === null || branches.remote.length === 0, reason: reason, run: (event) => openMenuAt(event, branches.remote.map((remoteEntry) => ({
+            id: 'upstream:' + remoteEntry.name,
+            icon: 'fetch', tone: 'cyan',
+            label: remoteEntry.name,
+            active: entry.upstream === remoteEntry.name,
+            run: () => { void run('branch-upstream', { branch: entry.name, upstream: remoteEntry.name }) },
+          }))) } : null,
+          isLocal && entry.upstream !== null && entry.upstream !== undefined ? { id: 'unsetUpstream', icon: 'undo', tone: 'secondary', label: t('action.unsetUpstream'), run: () => { void run('branch-upstream', { branch: entry.name, unset: true }) } } : null,
+          /* Remote rows get the tracking form: the local branch is created
+             FROM the remote ref with --track in one step (issue #18 item 5),
+             replacing the plain "new branch from" which could not bind. */
+          entry.remote === true
+            ? { id: 'createTracking', icon: 'branchCreate', tone: 'success', label: t('action.createLocalBranch'), run: () => setDialog({ kind: 'createTracking', from: entry.name, name: entry.name.slice(entry.name.indexOf('/') + 1) }) }
+            : { id: 'newBranch', icon: 'plus', tone: 'success', label: t('action.newBranchFrom'), run: () => setDialog({ kind: 'newBranch', from: entry.name }) },
           isLocal ? { id: 'rename', icon: 'file', tone: 'primary', label: t('action.rename'), run: () => setDialog({ kind: 'renameBranch', from: entry.name }) } : null,
           isLocal ? { id: 'delete', icon: 'trash', tone: 'danger', label: t('action.delete'), danger: true, disabled: entry.head === true, reason: reason, run: () => setDialog({ kind: 'deleteBranch', name: entry.name }) } : null,
           entry.tag === true
@@ -13360,6 +13508,9 @@ window.__ModuleLoader__.load({
       const submitDialog = useCallback(async (state, value) => {
         setDialog(null)
         if (state.kind === 'newBranch') { await run('checkout', { branch: value, create: true, startPoint: state.from }); return }
+        /* From a remote ref (issue #18): --track binds the upstream in the
+           same checkout -b, so "create" and "set upstream" are one motion. */
+        if (state.kind === 'createTracking') { await run('checkout', { branch: value, create: true, startPoint: state.from, track: true }); return }
         if (state.kind === 'renameBranch') { await run('branchRename', { from: state.from, to: value }); return }
         if (state.kind === 'newTag') { await run('tagCreate', { name: value, hash: state.hash }); return }
         if (state.kind === 'deleteTag') { await run('tagDelete', { name: value }); return }
@@ -13784,6 +13935,17 @@ window.__ModuleLoader__.load({
             { id: 'br-delete-remote', label: t('more.deleteRemoteBranch'), danger: true, disabled: remoteBranches.length === 0 || blocked, reason, run: (ev) => pickRemoteBranchMenu(ev) },
             null,
             { id: 'br-publish', label: t('more.publish'), disabled: remoteReady !== true || tracked === true || blocked, reason, run: () => { void run('push', { setUpstream: true, confirm: true }) } },
+            /* Upstream management for the CURRENT branch (issue #18): same
+               verbs as the branch-row menu, reachable without selecting a
+               branch first. Submenu built inside run() like rm-remove. */
+            { id: 'br-upstream', label: t('more.setUpstreamHead'), icon: 'fetch', tone: 'cyan', disabled: headBranch === '' || remoteBranches.length === 0 || blocked, reason, run: (ev) => openMenuAt(ev, remoteBranches.map((remoteEntry) => ({
+              id: 'head-upstream:' + remoteEntry.name,
+              icon: 'fetch', tone: 'cyan',
+              label: remoteEntry.name,
+              active: summary.upstream === remoteEntry.name,
+              run: () => { void run('branch-upstream', { branch: headBranch, upstream: remoteEntry.name }) },
+            }))) },
+            { id: 'br-unset-upstream', label: t('more.unsetUpstreamHead'), icon: 'undo', tone: 'secondary', disabled: headBranch === '' || tracked !== true || blocked, reason, run: () => { void run('branch-upstream', { branch: headBranch, unset: true }) } },
           ] },
           /* —— SCM ▸ Remote ▸ —— */
           { id: 'sub-remote', icon: 'fetch', tone: 'violet', label: t('more.remoteGroup'), items: [
@@ -14175,13 +14337,13 @@ window.__ModuleLoader__.load({
           onClose: () => setRailSettings(false),
         }))
       }
-      if (dialog !== null && (dialog.kind === 'newBranch' || dialog.kind === 'renameBranch' || dialog.kind === 'newTag' || dialog.kind === 'deleteTag' || dialog.kind === 'commitMsg')) {
-        const titles = { newBranch: t('prompt.newBranch'), renameBranch: t('prompt.renameBranch'), newTag: t('prompt.newTag'), deleteTag: t('prompt.deleteTag'), commitMsg: t('prompt.commitMessage') }
+      if (dialog !== null && (dialog.kind === 'newBranch' || dialog.kind === 'createTracking' || dialog.kind === 'renameBranch' || dialog.kind === 'newTag' || dialog.kind === 'deleteTag' || dialog.kind === 'commitMsg')) {
+        const titles = { newBranch: t('prompt.newBranch'), createTracking: t('prompt.createTracking'), renameBranch: t('prompt.renameBranch'), newTag: t('prompt.newTag'), deleteTag: t('prompt.deleteTag'), commitMsg: t('prompt.commitMessage') }
         overlays.push(E(PromptDialog, {
           key: 'prompt',
           title: titles[dialog.kind],
           placeholder: dialog.from === undefined ? t('prompt.fromHead') : dialog.from,
-          initialValue: dialog.kind === 'renameBranch' ? dialog.from : '',
+          initialValue: dialog.kind === 'renameBranch' ? dialog.from : (dialog.kind === 'createTracking' ? dialog.name : ''),
           okLabel: t('confirm.ok'), cancelLabel: t('confirm.cancel'),
           onCancel: () => setDialog(null),
           onSubmit: (value) => { void submitDialog(dialog, value) },
@@ -14710,6 +14872,9 @@ window.__ModuleLoader__.load({
       '.dig-row-head .dig-row-label{font-weight:600}',
       '.dig-row-icon{display:inline-flex;flex:none;opacity:.9}',
       '.dig-row-label{overflow:hidden;text-overflow:ellipsis;flex:1;min-width:0;font-weight:600}',
+      // Inline tracking target (issue #18): flex:none so it never starves the
+      // label, capped and ellipsised so a long origin/… cannot push the badges.
+      '.dig-row-upstream{flex:none;max-width:180px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:11px;font-weight:400;color:var(--dsw-alias-label-tertiary,var(--dsw-alias-label-secondary))}',
       '.dig-row-sub{color:var(--dsw-alias-label-tertiary);font-size:11px;flex:none;max-width:45%;overflow:hidden;text-overflow:ellipsis}',
       '.dig-row-dir{margin-left:auto;opacity:.75}',
       '.dig-badge{font-size:10px;padding:0 5px;border-radius:999px;corner-shape:round;background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-secondary);flex:none}',
@@ -14991,7 +15156,12 @@ window.__ModuleLoader__.load({
       '.dig-cs-pill{display:inline-flex;align-items:center;gap:5px;height:28px;padding:0 8px;border:none;border-radius:var(--dsw-radius-sm,8px);background:transparent;color:var(--dsw-alias-label-secondary);font-family:inherit;font-size:var(--dsh-content-font-size-secondary,13px);line-height:20px;white-space:nowrap;cursor:pointer}',
       '.dig-cs-pill:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}',
       '.dig-cs-pill:disabled{cursor:default}',
-      '.dig-cs-name{overflow:hidden;text-overflow:ellipsis;max-width:150px}',
+      '.dig-cs-name{overflow:hidden;text-overflow:ellipsis;max-width:260px;white-space:nowrap;display:inline-block;vertical-align:bottom}',
+      '.dig-cs-mrun{display:inline-flex;text-overflow:clip;-webkit-mask-image:linear-gradient(90deg,#000 0,#000 calc(100% - 14px),transparent);mask-image:linear-gradient(90deg,#000 0,#000 calc(100% - 14px),transparent)}',
+      '.dig-cs-mrun .dig-cs-run{display:inline-flex;flex:none;will-change:transform}',
+      '.dig-cs-mrun .dig-cs-chunk{flex:none;white-space:nowrap;padding-right:28px}',
+      '.dig-cs-mrun:hover .dig-cs-run{animation:dig-cs-marquee var(--dig-cs-marquee-dur,10s) linear infinite}',
+      '@keyframes dig-cs-marquee{from{transform:translateX(0)}to{transform:translateX(-50%)}}',
       '.dig-cs-pill svg{flex:none}',
       '.dig-cs-badge{display:inline-flex;align-items:center;font-size:12px;line-height:20px;font-variant-numeric:tabular-nums;white-space:nowrap;padding:0 3px;font-weight:500}',
       '.dig-cs-changes{color:var(--dsw-alias-state-warn-primary)}',
@@ -15214,6 +15384,51 @@ window.__ModuleLoader__.load({
       return null
     }
 
+    /* Long repository/branch names: widen the label cap and, past it, run a
+       hover-only seamless marquee (the official sidebar rows scroll hovered
+       titles via useTitleMarquee, which this surface cannot require — this is
+       the CSS twin). The label is measured after paint; only overflowing text
+       switches to the duplicated-chunk structure, so short names keep the
+       plain ellipsis and never animate. Duration follows the text width so a
+       slightly-long name does not crawl. */
+    const COMPOSER_NAME_MAX_PX = 260
+    const MARQUEE_PX_PER_S = 28
+
+    function ComposerMarqueeName(props) {
+      const text = typeof props.text === 'string' ? props.text : ''
+      const boxRef = useRef(null)
+      const [run, setRun] = useState(false)
+      const [dur, setDur] = useState('')
+      useEffect(() => {
+        const box = boxRef.current
+        if (box === null) return undefined
+        const measure = () => {
+          if (boxRef.current !== box) return /* replaced or unmounted */
+          const overflow = box.scrollWidth > box.clientWidth + 1
+          setRun(overflow)
+          /* In the running structure scrollWidth covers BOTH chunks, so one
+             chunk is half of it; the plain structure measures the text alone. */
+          const unit = overflow === true && run === true ? box.scrollWidth / 2 : box.scrollWidth
+          setDur(overflow === true ? (unit / MARQUEE_PX_PER_S).toFixed(2) + 's' : '')
+        }
+        measure()
+        /* Webfonts land after paint and change text metrics — re-measure once. */
+        let frame = 0
+        const fonts = document.fonts
+        if (fonts !== undefined && fonts !== null && fonts.ready !== undefined && typeof fonts.ready.then === 'function') {
+          fonts.ready.then(() => { frame = requestAnimationFrame(measure) }, () => {})
+        }
+        return () => { if (frame !== 0) cancelAnimationFrame(frame) }
+      }, [text, run])
+      if (run !== true) {
+        return E('span', { ref: boxRef, className: 'dig-cs-name' }, text)
+      }
+      return E('span', { ref: boxRef, className: 'dig-cs-name dig-cs-mrun', style: dur !== '' ? { '--dig-cs-marquee-dur': dur } : undefined },
+        E('span', { className: 'dig-cs-run' },
+          E('span', { className: 'dig-cs-chunk' }, text),
+          E('span', { className: 'dig-cs-chunk', 'aria-hidden': 'true' }, text)))
+    }
+
     function ComposerGitStatus(props) {
       const ctx = props.ctx
       const t = props.t
@@ -15476,7 +15691,7 @@ window.__ModuleLoader__.load({
           onClick: singleRepo === true ? undefined : () => { setMenu(menu === 'repo' ? null : 'repo') },
         },
           E(Icon, { name: 'commit', size: 13 }),
-          E('span', { className: 'dig-cs-name' }, repoName),
+          E(ComposerMarqueeName, { text: repoName }),
           singleRepo === true ? null : E(Icon, { name: 'chevron', size: 10 })),
         branchName !== null ? E('button', {
           type: 'button',
@@ -15485,7 +15700,7 @@ window.__ModuleLoader__.load({
           onClick: () => { if (menu !== 'branch') void openBranchMenu(); else setMenu(null) },
         },
           E(Icon, { name: 'branch', size: 13 }),
-          E('span', { className: 'dig-cs-name' }, detached === true ? t('composer.detached') : branchName),
+          E(ComposerMarqueeName, { text: detached === true ? t('composer.detached') : branchName }),
           E(Icon, { name: 'chevron', size: 10 })) : null,
         changesCount !== null && changesCount > 0
           ? E('span', { className: 'dig-cs-badge dig-cs-changes', title: changesTitle }, '±' + String(changesCount),

package/src/index.js

@@ -470,7 +470,7 @@ function withRepoLock(key, work) {
 }
 
 const WRITE_METHODS = new Set([
-  'stage', 'unstage', 'discard', 'commit', 'checkout', 'branchCreate', 'branchRename',
+  'stage', 'unstage', 'discard', 'commit', 'checkout', 'branchCreate', 'branchRename', 'branch-upstream',
   'branchDelete', 'merge', 'rebase', 'cherryPick', 'revert', 'reset', 'fetch', 'pull',
   'push', 'stashPush', 'stashApply', 'stashDrop', 'stashClear', 'tagCreate', 'tagDelete', 'tagDeleteRemote', 'pushTags', 'clone', 'remoteAdd', 'remoteRemove', 'branchDeleteRemote', 'undoApply',
 ])
@@ -1003,6 +1003,9 @@ async function checkout(payload) {
     const name = requireRef(payload.branch, 'branch')
     const start = typeof payload.startPoint === 'string' && payload.startPoint.trim() !== '' ? requireRef(payload.startPoint, 'startPoint') : undefined
     const args = ['checkout', '-b', name]
+    /* track (issue #18): "create a local branch from a remote one" must bind
+       the upstream in the same breath — checkout -b alone never does. */
+    if (payload.track === true && start !== undefined) args.push('--track')
     if (start !== undefined) args.push(start)
     await git(root, args)
     return { branch: name, created: true }
@@ -1022,6 +1025,25 @@ async function branchCreate(payload) {
   return { branch: name }
 }
 
+/* Upstream management (issue #18): rebind or drop a branch's tracking remote.
+   git refuses --set-upstream-to with a ref it cannot resolve, so a typo dies
+   here instead of silently writing branch.<name>.merge. */
+async function branchUpstream(payload) {
+  const cwd = cwdOf(payload)
+  const root = await repoRootOf(cwd, payload)
+  const branch = requireRef(payload.branch, 'branch')
+  if (payload.unset === true) {
+    /* --unset-upstream errors on a branch that has none; the client only
+       offers the verb when the row shows an upstream, and git's own message
+       is the right one to surface if they raced. */
+    await git(root, ['branch', '--unset-upstream', branch])
+    return { branch, upstream: null }
+  }
+  const upstream = requireRef(payload.upstream, 'upstream')
+  await git(root, ['branch', '--set-upstream-to=' + upstream, branch])
+  return { branch, upstream }
+}
+
 async function branchRename(payload) {
   const cwd = cwdOf(payload)
   const root = await repoRootOf(cwd, payload)
@@ -1999,6 +2021,7 @@ const METHODS = {
   checkout,
   branchCreate,
   branchRename,
+  'branch-upstream': branchUpstream,
   branchDelete,
   merge,
   rebase,