v0.2.35 — Git conflict resolution UI, terminal polish, quieter error toasts

Release date: 2026-07-17
Previous version: v0.2.34

TL;DR

This release adds an in-app Git/SVN merge-conflict resolution flow (pick ours/theirs per file, then continue or abort), makes terminals noticeably more pleasant — focused layout, popout settings that stick, Korean IME self-recovery, crisp ASCII art — and overhauls error reporting so failure toasts show intended messages instead of raw internals.

Highlights

Git/SVN conflict resolution UI

• When a merge/update hits conflicts, you can now resolve them from the UI: adopt ours or theirs per file, then continue or abort the operation.
• Fixed conflict-continue breaking after simple-git 3.36 tightened its unsafe-env audit.

Terminal improvements

• Terminal layout was decluttered for focus, and the top header was slimmed down.
• Theme and font-size changes made in a popped-out terminal no longer reset when the session returns to the main window.
• Korean (IME) input that stopped registering on a dead terminal now self-recovers instead of swallowing keystrokes.
• Block-character ASCII art (CLI welcome banners) renders solid again — hairline gaps between glyphs are gone.

Quieter, safer error toasts

• Global error handling was unified; noisy failure toasts (including harmless xterm teardown errors on terminal start/stop/popout) were removed.
• Failure toasts now show only server-intended messages or a generic fallback — raw HTTP bodies and internal exception text stay in the console.

UI polish

• More consistent buttons and icons, improved color contrast and text readability.
• Workspace tags got new default colors, and dock chip dots now reflect the session's actual workspace color.

Misc fixes

• Document HTML preview zoom actually applies now.
• The "document fully hidden" notice no longer flickers on every reload.
• Calendar date labels follow the app language setting instead of the OS locale.

Install / Update

npm i -g [email protected]

Desktop app — pick the right asset:

• Windows (recommended): CLITrigger-Setup-0.2.35.exe — installer with Start Menu shortcut, uninstaller, and auto-update.
• Windows (portable): CLITrigger-0.2.35.exe — run directly, no install; no shortcuts and no auto-update (grab new versions manually).
• macOS: .dmg / Linux: .AppImage

Full commit list

• f3253b3 fix(client): 터미널 ASCII 아트 블록 사이 빈틈 재발 수정 — CanvasAddon 복원
• 471f065 fix(client): 실패 토스트에 raw 에러 본문 노출 차단
• b1f1d81 fix: 터미널 시작/종료/팝아웃 시 xterm teardown 오류 토스트 억제
• 8bfdaf5 실패 토스트 제거
• 88c2d83 버튼·아이콘 일관성 개선
• f600d62 터미널 레이아웃 집중도 개선을 적용
• b5cc09c 상단 헤더 축소
• c3f4cc6 색상 대비와 텍스트 가독성 개선
• 5361b0e 전역 오류 처리와 실패 토스트 통일
• 9018957 워크스페이스 태그 디폴트 색상변경
• 3257a86 fix(client): 독 칩 색 점이 세션의 실제 워크스페이스 색을 표시하도록 수정
• 177b839 fix(git): simple-git 3.36 unsafe-env 감사로 깨진 충돌 continue 수정
• 53aec2b feat(git/svn): 충돌 해결 UI 추가 — 파일별 ours/theirs 채택 + 계속/중단
• f8e9aae fix(client): 페이지 포커스가 죽은 터미널에서 한글 키가 증발하는 stranded-TSF 자가 복구
• 61bf0bb fix(client): 팝아웃에서 바꾼 터미널 테마·폰트 크기가 중앙 창 복귀 시 풀리는 문제 수정
• f6c45f8 fix(client): 문서 전체 숨김 안내 문구가 리로드마다 깜빡이는 문제 수정
• 00241f3 fix(client): 문서 HTML 미리보기 확대/축소가 실제로 적용되도록 수정
• dd4413d Merge branch 'main' of https://github.com/OSgoodYZ/CLITrigger
• 994c5fb fix(client): 달력 날짜 라벨을 OS 로케일 대신 앱 언어 설정으로 표시

Related docs

• Detailed changelog — per-date technical decision records

Full Changelog: https://github.com/HyperAITeam/CLITrigger/compare/v0.2.34...v0.2.35