@happy-nut/monacori 0.1.21 → 0.1.22

package/dist/app-main.js

@@ -2,9 +2,9 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { spawn } from "node:child_process";
 import { basename, dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { app, BrowserWindow, dialog, ipcMain, Menu, nativeImage } from "electron";
+import { app, BrowserWindow, dialog, ipcMain, Menu, nativeImage, Notification } from "electron";
 import { buildDiffReview, performHttpRequest } from "./cli.js";
-import { sanitizeTerminalEnv } from "./util.js";
+import { sanitizeTerminalEnv, ensureUtf8Locale } from "./util.js";
 import { readUnifiedDiff } from "./diff.js";
 import { isGitRepository } from "./git.js";
 import { renderWelcomeHtml } from "./render.js";
@@ -190,11 +190,13 @@ ipcMain.handle("monacori:pty-spawn", (event, size) => {
     const id = ++nextPtyId;
     const shell = process.env.SHELL || (process.platform === "win32" ? "powershell.exe" : "/bin/zsh");
     const t = spawnPty(shell, [], {
-        name: "xterm-color",
+        // 256-color terminfo + COLORTERM=truecolor so TUIs (e.g. Claude Code's coral logo) emit 24-bit color and
+        // xterm.js renders the exact hue. "xterm-color" is 8-color, which downgraded the orange logo to ANSI red.
+        name: "xterm-256color",
         cols: size?.cols ?? 80,
         rows: size?.rows ?? 24,
         cwd: state.options.root,
-        env: sanitizeTerminalEnv(process.env),
+        env: ensureUtf8Locale({ ...sanitizeTerminalEnv(process.env), TERM: "xterm-256color", COLORTERM: "truecolor" }),
     });
     state.terms.set(id, t);
     // Guard every relay with isDestroyed(): a pty can outlive its window (close races pty teardown), and
@@ -227,6 +229,35 @@ ipcMain.on("monacori:pty-kill", (event, msg) => {
         state.terms.delete(msg.id);
     }
 });
+// A TUI in the integrated terminal rang the bell (e.g. Claude Code finished a turn / needs input). Raise a
+// native notification when the window ISN'T focused — while you're watching, the bell itself is enough — plus
+// a dock bounce / taskbar flash. Clicking the notification brings the window forward.
+ipcMain.on("monacori:bell", (event, msg) => {
+    const win = BrowserWindow.fromWebContents(event.sender);
+    if (!win || win.isDestroyed() || win.isFocused())
+        return;
+    try {
+        if (Notification.isSupported()) {
+            const note = new Notification({ title: msg?.title || "monacori", body: msg?.body || "Terminal task finished" });
+            note.on("click", () => { if (!win.isDestroyed()) {
+                win.show();
+                win.focus();
+            } });
+            note.show();
+        }
+    }
+    catch { /* notifications are best-effort */ }
+    try {
+        win.flashFrame(true);
+    }
+    catch { /* taskbar flash — Windows/Linux */ }
+    if (process.platform === "darwin" && app.dock) {
+        try {
+            app.dock.bounce("informational");
+        }
+        catch { /* best-effort */ }
+    }
+});
 // Persisted global settings (locale, …) live in a JSON file under userData and reach the renderer
 // via preload + the two handlers below. The renderer's file:// localStorage is NOT reliably persisted
 // across app restarts, so settings that must survive a reopen round-trip through the main process.
@@ -306,6 +337,10 @@ app.on("window-all-closed", () => {
 });
 // Keep the Ignore-whitespace menu checkbox honest as focus moves between windows (it's per-window state).
 app.on("browser-window-focus", (_event, win) => {
+    try {
+        win.flashFrame(false);
+    }
+    catch { /* stop any terminal-bell taskbar flash once the user is back */ }
     const state = states.get(win.id);
     const item = Menu.getApplicationMenu()?.getMenuItemById("ignore-whitespace");
     if (item && state)

package/dist/assets.js

@@ -26,7 +26,14 @@ export function diffCss() {
     return readViewerAsset("viewer.css");
 }
 export function diffScript() {
-    return readViewerAsset("viewer.client.js");
+    // Prefer the minified bundle the build emits (smaller inlined <script>); fall back to the readable concat
+    // when minify was skipped (e.g. terser unavailable).
+    try {
+        return readViewerAsset("viewer.client.min.js");
+    }
+    catch {
+        return readViewerAsset("viewer.client.js");
+    }
 }
 // xterm.js (terminal renderer) for the integrated terminal panel. UMD bundles that expose
 // window.Terminal + window.FitAddon when inlined. Resolved from node_modules like diff2HtmlCss();

package/dist/build.js

@@ -1,6 +1,6 @@
 import { createHash } from "node:crypto";
 import { basename } from "node:path";
-import { isGitRepository } from "./git.js";
+import { isGitRepository, git } from "./git.js";
 import { collectHttpEnvironments, collectReviewFileStates, collectSourceFiles, parseUnifiedDiff, readUnifiedDiff } from "./diff.js";
 import { renderDiff2Html } from "./highlight.js";
 import { diffSubtitle, renderDiffHtml, renderDiffTree, renderNotGitRepoHtml, renderReviewStatus, renderSourceTree, shouldLazyRender, splitDiffForLazy } from "./render.js";
@@ -29,6 +29,8 @@ export function buildDiffReview(input) {
     const httpEnvironments = collectHttpEnvironments(root);
     const hunks = files.reduce((sum, file) => sum + file.hunks.length, 0);
     const generatedAt = new Date().toISOString();
+    // Current branch for the sidebar chip (empty on a detached HEAD); refreshed in the watch payload too.
+    const branch = git(root, ["branch", "--show-current"]);
     const diffHtml = renderDiff2Html(diffText);
     const totalLines = files.reduce((sum, file) => sum + file.hunks.reduce((t, h) => t + h.lines.length, 0), 0);
     // lazy-LOAD (Phase 2) serves each file body + source on demand instead of embedding them; it implies
@@ -61,6 +63,7 @@ export function buildDiffReview(input) {
         subtitle: diffSubtitle(input),
         projectName: basename(root),
         projectPath: root,
+        branch,
         watch: Boolean(input.watch),
         ignoreWhitespace: Boolean(input.ignoreWhitespace),
         app: Boolean(input.app),
@@ -72,6 +75,7 @@ export function buildDiffReview(input) {
     const update = {
         signature,
         generatedAt,
+        branch,
         diffContainer: diffSplit.container || '<div class="empty" data-i18n="diff.noDiff">No diff to review.</div>',
         changesPanel: renderDiffTree(files),
         filesTree: renderSourceTree(sourceFiles),

package/dist/i18n.js

@@ -14,19 +14,25 @@ export const MESSAGES = {
         // Tabs (sidebar)
         "tab.changes": "Changes",
         "tab.files": "Files",
+        "tab.changes.title": "Changes (⌘0)",
+        "tab.files.title": "Files (⌘1)",
+        "rail.questions": "Questions",
+        "rail.changeRequests": "Change requests",
+        "rail.branch": "Current branch",
         // Sidebar footer / About
         "sidebar.updateAvailable": "update available",
         "about.title": "About monacori",
+        "about.tip": "Settings (⌘,)",
         "terminal.title": "Terminal",
-        "terminal.toggle": "Toggle terminal (Ctrl+`)",
+        "terminal.toggle": "Toggle terminal (⌃`)",
         "terminal.close": "Close terminal",
-        "dock.maximize": "Maximize panel (Cmd/Ctrl+Shift+')",
-        "dock.restore": "Restore panel (Cmd/Ctrl+Shift+')",
+        "dock.maximize": "Maximize panel (⌘⇧')",
+        "dock.restore": "Restore panel (⌘⇧')",
         // Review status (toolbar) — units; the numeric count stays dynamic and is prepended at runtime.
         "status.files": "files",
         "status.hunks": "hunks",
         "status.wsIgnored": "ws ignored",
-        "status.wsIgnored.title": "Whitespace ignored — Cmd/Ctrl+Shift+W",
+        "status.wsIgnored.title": "Whitespace ignored — ⌘⇧W",
         "status.indexed": "indexed",
         "status.index.title": "Go-to-definition index",
         "status.indexing": "indexing",
@@ -44,6 +50,7 @@ export const MESSAGES = {
         "http.env.title": "HTTP Client environment",
         "http.env.aria": "HTTP environment",
         "btn.diff": "Diff",
+        "btn.diff.title": "Back to diff (F7)",
         "source.loading": "Loading source…",
         "source.previewUnavailable": "Source preview unavailable.",
         "source.viewRaw": "Raw",
@@ -55,6 +62,7 @@ export const MESSAGES = {
         "quickopen.recent": "Recent files",
         "quickopen.findInFiles": "Find in Files",
         "quickopen.noFiles": "No files found.",
+        "quickopen.typeToFilter": "type to filter",
         // Usages
         "usages.aria": "Usages",
         "usages.title": "Usages",
@@ -66,6 +74,8 @@ export const MESSAGES = {
         // Settings — General
         "settings.language": "Language",
         "settings.theme": "Theme",
+        "settings.bellNotify": "Notify when a terminal task finishes (bell)",
+        "notify.bellBody": "a task finished or needs your input",
         "theme.dark": "Dark",
         "theme.light": "Light",
         "settings.checkingUpdates": "Checking for updates…",
@@ -76,10 +86,21 @@ export const MESSAGES = {
         "settings.updated": "Updated. Restarting…",
         "settings.updateFailed": "Update failed — try again, or run: npm i -g @happy-nut/monacori",
         "settings.kbd.title": "Keyboard shortcuts",
+        "settings.kbd.cat.app": "App",
         "settings.kbd.cat.nav": "Navigation",
         "settings.kbd.cat.review": "Review",
         "settings.kbd.cat.terminal": "Terminal",
         // Settings — keyboard-shortcut labels (descriptions only; <kbd> key names stay literal)
+        "kbd.openFolder": "Open folder",
+        "kbd.openNewWindow": "Open in new window",
+        "kbd.openSettings": "Settings",
+        "kbd.closeDialog": "Close dialog / cancel",
+        "kbd.pageUpDown": "Page up / down",
+        "kbd.runHttp": "Run HTTP request (.http)",
+        "kbd.editComment": "Edit comment (when selected)",
+        "kbd.deleteComment": "Delete comment (when selected)",
+        "kbd.stepComments": "Step between comments (merged)",
+        "kbd.mergedSend": "Comment menu / send to pane (merged)",
         "kbd.nextChange": "Next change",
         "kbd.prevChange": "Previous change",
         "kbd.closeTab": "Close tab",
@@ -109,7 +130,7 @@ export const MESSAGES = {
         "kbd.closeTerminal": "Close terminal (when focused)",
         // Settings — Merge prompts
         "mergePrompts.title": "Merge prompts",
-        "mergePrompts.desc": "Heading prepended to the merged prompt opened with Cmd/Ctrl+Shift+/ (questions) and Cmd/Ctrl+Shift+. (change requests). Leave blank to use the default.",
+        "mergePrompts.desc": "Heading prepended to the merged prompt opened with ⌘⇧/ (questions) and ⌘⇧. (change requests). Leave blank to use the default.",
         "mergePrompts.qHeading": "Questions heading",
         "mergePrompts.cHeading": "Change-requests heading",
         "mergePrompts.reset": "Reset to defaults",
@@ -119,7 +140,7 @@ export const MESSAGES = {
         "composer.changeRequest": "Request a change for this line",
         "composer.save": "Comment",
         "composer.cancel": "Cancel",
-        "composer.hint": "Cmd/Ctrl+Enter to save, Esc to cancel",
+        "composer.hint": "⌘Enter to save, Esc to cancel",
         "composer.delete": "Delete",
         "comment.kind.q": "❓ Question",
         "comment.kind.c": "✎ Change request",
@@ -149,19 +170,25 @@ export const MESSAGES = {
         // Tabs (sidebar)
         "tab.changes": "변경사항",
         "tab.files": "파일",
+        "rail.questions": "질문",
+        "rail.changeRequests": "변경 요청",
+        "rail.branch": "현재 브랜치",
+        "tab.changes.title": "변경사항 (⌘0)",
+        "tab.files.title": "파일 (⌘1)",
         // Sidebar footer / About
         "sidebar.updateAvailable": "업데이트 있음",
         "about.title": "monacori 정보",
+        "about.tip": "설정 (⌘,)",
         "terminal.title": "터미널",
-        "terminal.toggle": "터미널 토글 (Ctrl+`)",
+        "terminal.toggle": "터미널 토글 (⌃`)",
         "terminal.close": "터미널 닫기",
-        "dock.maximize": "패널 최대화 (Cmd/Ctrl+Shift+')",
-        "dock.restore": "패널 복원 (Cmd/Ctrl+Shift+')",
+        "dock.maximize": "패널 최대화 (⌘⇧')",
+        "dock.restore": "패널 복원 (⌘⇧')",
         // Review status (toolbar)
         "status.files": "개 파일",
         "status.hunks": "개 변경 묶음",
         "status.wsIgnored": "공백 무시",
-        "status.wsIgnored.title": "공백 무시 — Cmd/Ctrl+Shift+W",
+        "status.wsIgnored.title": "공백 무시 — ⌘⇧W",
         "status.indexed": "개 인덱싱됨",
         "status.index.title": "정의로 이동 인덱스",
         "status.indexing": "인덱싱 중",
@@ -179,6 +206,7 @@ export const MESSAGES = {
         "http.env.title": "HTTP 클라이언트 환경",
         "http.env.aria": "HTTP 환경",
         "btn.diff": "Diff",
+        "btn.diff.title": "Diff로 돌아가기 (F7)",
         "source.loading": "소스 불러오는 중…",
         "source.previewUnavailable": "소스 미리보기를 사용할 수 없습니다.",
         "source.viewRaw": "원문",
@@ -190,6 +218,7 @@ export const MESSAGES = {
         "quickopen.recent": "최근 파일",
         "quickopen.findInFiles": "파일 내용 검색",
         "quickopen.noFiles": "파일을 찾을 수 없습니다.",
+        "quickopen.typeToFilter": "입력하여 필터",
         // Usages
         "usages.aria": "사용처",
         "usages.title": "사용처",
@@ -201,6 +230,8 @@ export const MESSAGES = {
         // Settings — General
         "settings.language": "언어",
         "settings.theme": "테마",
+        "settings.bellNotify": "터미널 작업이 끝나면 알림 (벨)",
+        "notify.bellBody": "작업이 끝났거나 입력이 필요합니다",
         "theme.dark": "다크",
         "theme.light": "라이트",
         "settings.checkingUpdates": "업데이트 확인 중…",
@@ -211,10 +242,21 @@ export const MESSAGES = {
         "settings.updated": "업데이트 완료. 재시작 중…",
         "settings.updateFailed": "업데이트 실패 — 다시 시도하거나 실행하세요: npm i -g @happy-nut/monacori",
         "settings.kbd.title": "키보드 단축키",
+        "settings.kbd.cat.app": "앱",
         "settings.kbd.cat.nav": "탐색",
         "settings.kbd.cat.review": "리뷰",
         "settings.kbd.cat.terminal": "터미널",
         // Settings — keyboard-shortcut labels
+        "kbd.openFolder": "폴더 열기",
+        "kbd.openNewWindow": "새 창에서 열기",
+        "kbd.openSettings": "설정",
+        "kbd.closeDialog": "대화상자 닫기 / 취소",
+        "kbd.pageUpDown": "페이지 위 / 아래",
+        "kbd.runHttp": "HTTP 요청 실행 (.http)",
+        "kbd.editComment": "코멘트 편집 (선택 시)",
+        "kbd.deleteComment": "코멘트 삭제 (선택 시)",
+        "kbd.stepComments": "코멘트 단위 이동 (합본)",
+        "kbd.mergedSend": "코멘트 메뉴 / 패널로 전송 (합본)",
         "kbd.nextChange": "다음 변경",
         "kbd.prevChange": "이전 변경",
         "kbd.closeTab": "탭 닫기",
@@ -244,7 +286,7 @@ export const MESSAGES = {
         "kbd.closeTerminal": "터미널 닫기 (포커스 시)",
         // Settings — Merge prompts
         "mergePrompts.title": "병합 프롬프트",
-        "mergePrompts.desc": "Cmd/Ctrl+Shift+/ (질문) 및 Cmd/Ctrl+Shift+. (변경요청)로 여는 병합 프롬프트 맨 앞에 붙는 머리말입니다. 비워 두면 기본값을 사용합니다.",
+        "mergePrompts.desc": "⌘⇧/ (질문) 및 ⌘⇧. (변경요청)로 여는 병합 프롬프트 맨 앞에 붙는 머리말입니다. 비워 두면 기본값을 사용합니다.",
         "mergePrompts.qHeading": "질문 머리말",
         "mergePrompts.cHeading": "변경요청 머리말",
         "mergePrompts.reset": "기본값으로 초기화",
@@ -254,7 +296,7 @@ export const MESSAGES = {
         "composer.changeRequest": "이 줄에 대한 변경 요청하기",
         "composer.save": "코멘트",
         "composer.cancel": "취소",
-        "composer.hint": "Cmd/Ctrl+Enter로 저장, Esc로 취소",
+        "composer.hint": "⌘Enter로 저장, Esc로 취소",
         "composer.delete": "삭제",
         "comment.kind.q": "❓ 질문",
         "comment.kind.c": "✎ 변경 요청",

package/dist/preload.cjs

@@ -67,6 +67,9 @@ electron_1.contextBridge.exposeInMainWorld("monacoriPty", {
     write: (msg) => electron_1.ipcRenderer.send("monacori:pty-write", msg),
     resize: (msg) => electron_1.ipcRenderer.send("monacori:pty-resize", msg),
     kill: (msg) => electron_1.ipcRenderer.send("monacori:pty-kill", msg),
+    // A TUI in the pane rang the terminal bell (e.g. Claude Code finished a turn / needs input). The renderer
+    // passes a pre-localized title+body; the main process decides whether to raise a native notification.
+    bell: (msg) => electron_1.ipcRenderer.send("monacori:bell", msg),
     onData: (cb) => {
         electron_1.ipcRenderer.on("monacori:pty-data", (_event, msg) => cb(msg));
     },
@@ -74,6 +77,11 @@ electron_1.contextBridge.exposeInMainWorld("monacoriPty", {
         electron_1.ipcRenderer.on("monacori:pty-exit", (_event, msg) => cb(msg));
     },
 });
+// Clipboard bridge — the integrated terminal copies its own selection on Cmd+C (xterm doesn't auto-copy, and
+// the sandboxed renderer's navigator.clipboard is unreliable on file://). Electron's clipboard always works here.
+electron_1.contextBridge.exposeInMainWorld("monacoriClipboard", {
+    write: (text) => electron_1.clipboard.writeText(typeof text === "string" ? text : String(text)),
+});
 // Global settings (locale, …) persisted by the main process under userData so they survive app
 // restarts — the renderer's file:// localStorage is not reliably persisted across reopens. `all` is
 // read synchronously at preload so the renderer can pick the locale before first paint; `set` writes

package/dist/render.d.ts

@@ -32,6 +32,7 @@ export declare function renderDiffHtml(input: {
     subtitle: string;
     projectName: string;
     projectPath: string;
+    branch?: string;
     watch?: boolean;
     ignoreWhitespace?: boolean;
     app?: boolean;

package/dist/render.js

@@ -181,6 +181,32 @@ export function renderDiffHtml(input) {
     const fileNav = renderDiffTree(input.files);
     const sourceNav = renderSourceTree(input.sourceFiles);
     const embeddedFiles = input.sourceFiles.filter((file) => file.embedded).length;
+    // IntelliJ-style activity rail: an icon per view; click navigates, hover shows a tooltip with the
+    // shortcut. data-view drives both the click handler and the active-state highlight (see syncRail).
+    const railButton = (view, labelKey, defaultLabel, kbd, svg) => `<button type="button" class="rail-btn" data-view="${view}" data-i18n-aria="${labelKey}" aria-label="${escapeAttr(defaultLabel)}">` +
+        `<svg viewBox="0 0 24 24" width="19" height="19" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">${svg}</svg>` +
+        `<span class="rail-tip"><span data-i18n="${labelKey}">${escapeHtml(defaultLabel)}</span><kbd>${escapeHtml(kbd)}</kbd></span>` +
+        "</button>";
+    const activityRail = [
+        '<nav class="activity-rail" aria-label="Views">',
+        '<div class="rail-group">',
+        railButton("changes", "tab.changes", "Changes", "⌘0", '<circle cx="12" cy="12" r="3.2"/><line x1="3.5" y1="12" x2="8.8" y2="12"/><line x1="15.2" y1="12" x2="20.5" y2="12"/>'),
+        railButton("files", "tab.files", "Files", "⌘1", '<path d="M4 7.5C4 6.7 4.7 6 5.5 6h3.2c.5 0 .9.2 1.2.6L11 8h7.3c.8 0 1.5.7 1.5 1.5v8c0 .8-.7 1.5-1.5 1.5h-13C4.7 19 4 18.3 4 17.5z"/>'),
+        railButton("q", "rail.questions", "Questions", "⌘⇧/", '<path d="M5.5 5.5h13c.8 0 1.5.7 1.5 1.5v6.4c0 .8-.7 1.5-1.5 1.5H12l-4.5 3.6V16.4H5.5c-.8 0-1.5-.7-1.5-1.5V7c0-.8.7-1.5 1.5-1.5z"/><text x="12" y="13" text-anchor="middle" font-size="9.5" font-weight="700" fill="currentColor" stroke="none">?</text>'),
+        railButton("c", "rail.changeRequests", "Change requests", "⌘⇧.", '<path d="M14.5 5.5l4 4"/><path d="M4.5 19.5l1-4 10-10 3 3-10 10z"/>'),
+        railButton("memo", "memo.title", "Prompt memo", "⌘⇧N", '<rect x="5.5" y="4" width="13" height="16" rx="1.5"/><line x1="8.5" y1="9" x2="15.5" y2="9"/><line x1="8.5" y1="12.5" x2="15.5" y2="12.5"/><line x1="8.5" y1="16" x2="12.5" y2="16"/>'),
+        "</div>",
+        '<div class="rail-group rail-bottom">',
+        // Terminal (Electron only; #terminal-toggle stays hidden until a pty exists). Same id → the existing
+        // toggle handler + is-active sync in dock-terminal.js bind to it unchanged.
+        input.app
+            ? '<button type="button" id="terminal-toggle" class="rail-btn terminal-toggle hidden" data-i18n-aria="terminal.title" aria-label="Terminal"><svg viewBox="0 0 24 24" width="19" height="19" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M5 7l4 5-4 5"/><path d="M13 17h6"/></svg><span class="rail-tip"><span data-i18n="terminal.title">Terminal</span><kbd>⌃`</kbd></span></button>'
+            : "",
+        // Settings gear (#app-info-btn) — existing click handler binds by id.
+        '<button type="button" id="app-info-btn" class="rail-btn" aria-haspopup="dialog" data-i18n-aria="settings.title" aria-label="Settings"><span class="rail-gear" aria-hidden="true">⚙</span><span class="rail-tip"><span data-i18n="settings.title">Settings</span><kbd>⌘,</kbd></span></button>',
+        "</div>",
+        "</nav>",
+    ].join("");
     return [
         "<!doctype html>",
         '<html lang="en">',
@@ -198,12 +224,13 @@ export function renderDiffHtml(input) {
         "<body>",
         // Boot overlay (removed by the renderer once bootstrap has painted) covers the blank gap after loadFile.
         '<div id="boot-overlay"><div class="boot-spinner"></div><div>monacori</div></div>',
+        activityRail,
         '<aside class="sidebar" aria-label="Review navigation">',
         '<div class="sidebar-scroll">',
-        `<div class="sidebar-brand" title="${escapeAttr(input.projectPath)}"><span class="brand-mark">monacori</span><span class="brand-project">${escapeHtml(input.projectName)}</span></div>`,
+        `<div class="sidebar-brand" title="${escapeAttr(input.projectPath)}"><span class="brand-mark">monacori</span><span class="brand-project">${escapeHtml(input.projectName)}</span><span class="brand-branch${input.branch ? "" : " hidden"}" data-i18n-title="rail.branch" title="Current branch"><svg class="brand-branch-icon" viewBox="0 0 24 24" width="12" height="12" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="6.5" cy="6" r="2.2"/><circle cx="6.5" cy="18" r="2.2"/><circle cx="17.5" cy="8.5" r="2.2"/><path d="M6.5 8.2v7.6"/><path d="M17.5 10.7c0 3.2-2.2 4.4-5.5 4.9"/></svg><span class="brand-branch-name" id="brand-branch-name">${escapeHtml(input.branch || "")}</span></span></div>`,
         input.lazy
-            ? '<div class="tabs"><button type="button" class="tab active" data-tab="changes" data-i18n="tab.changes">Changes</button><button type="button" class="tab" data-tab="files" data-i18n="tab.files">Files</button></div>'
-            : '<div class="tabs"><button type="button" class="tab" data-tab="changes" data-i18n="tab.changes">Changes</button><button type="button" class="tab active" data-tab="files" data-i18n="tab.files">Files</button></div>',
+            ? '<div class="tabs"><button type="button" class="tab active" data-tab="changes" data-i18n="tab.changes" data-i18n-title="tab.changes.title" title="Changes (⌘0)">Changes</button><button type="button" class="tab" data-tab="files" data-i18n="tab.files" data-i18n-title="tab.files.title" title="Files (⌘1)">Files</button></div>'
+            : '<div class="tabs"><button type="button" class="tab" data-tab="changes" data-i18n="tab.changes" data-i18n-title="tab.changes.title" title="Changes (⌘0)">Changes</button><button type="button" class="tab active" data-tab="files" data-i18n="tab.files" data-i18n-title="tab.files.title" title="Files (⌘1)">Files</button></div>',
         `<div class="tab-panel${input.lazy ? "" : " hidden"}" id="changes-panel">${fileNav}</div>`,
         // Big repos: defer the (potentially huge) source tree — ship it as an inert island, materialized on
         // the first Files-tab open, so it never builds/lays-out at startup. Small repos render it inline.
@@ -211,7 +238,7 @@ export function renderDiffHtml(input) {
             ? `<div class="tab-panel hidden" id="files-panel"></div><script type="text/html" id="files-tree-html">${sourceNav}</script>`
             : `<div class="tab-panel" id="files-panel">${sourceNav}</div>`,
         "</div>",
-        `<div class="sidebar-footer"><span class="app-version">monacori${packageVersion ? " v" + escapeHtml(packageVersion) : ""}</span><span id="app-update-flag" class="app-update-flag hidden" data-i18n="sidebar.updateAvailable" data-i18n-title="settings.updateAvailable" title="Update available">update available</span><button type="button" id="terminal-toggle" class="settings-btn terminal-toggle hidden" data-i18n-title="terminal.toggle" title="Toggle terminal (Ctrl+\`)" aria-label="Toggle terminal"><svg viewBox="0 0 24 24" width="13" height="13" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M5 7l4 5-4 5"/><path d="M13 17h6"/></svg></button><button type="button" id="app-info-btn" class="settings-btn" aria-haspopup="dialog" data-i18n-aria="about.title" data-i18n-title="about.title" aria-label="About monacori" title="About monacori">⚙</button></div>`,
+        `<div class="sidebar-footer"><span class="app-version">monacori${packageVersion ? " v" + escapeHtml(packageVersion) : ""}</span><span id="app-update-flag" class="app-update-flag hidden" data-i18n="sidebar.updateAvailable" data-i18n-title="settings.updateAvailable" title="Update available">update available</span></div>`,
         '<div id="footer-progress" class="footer-progress hidden" aria-hidden="true"><div class="footer-progress-bar"></div></div>',
         "</aside>",
         '<div class="sidebar-resizer" aria-hidden="true"></div>',
@@ -230,7 +257,7 @@ export function renderDiffHtml(input) {
         '<div class="source-file-meta"><span id="source-type-icon" class="source-type-icon" aria-hidden="true"></span><span id="source-title" data-i18n="source.title">Source</span><span id="source-meta" data-i18n="source.selectFile">Select a file from the Files tab.</span></div>',
         '<select id="http-env-select" class="http-env-select hidden" data-i18n-title="http.env.title" data-i18n-aria="http.env.aria" title="HTTP Client environment" aria-label="HTTP environment"></select>',
         '<button type="button" id="render-toggle" class="plain-button hidden" aria-pressed="false">Raw</button>',
-        '<button type="button" id="back-to-diff" class="plain-button" data-i18n="btn.diff">Diff</button>',
+        '<button type="button" id="back-to-diff" class="plain-button" data-i18n="btn.diff" data-i18n-title="btn.diff.title" title="Back to diff (F7)">Diff</button>',
         "</div>",
         '<div id="source-body" class="source-body empty" data-i18n="source.selectFile">Select a file from the Files tab.</div>',
         "</section>",
@@ -242,7 +269,7 @@ export function renderDiffHtml(input) {
             : "",
         '<div id="quick-open" class="quick-open hidden" role="dialog" aria-modal="true" data-i18n-aria="quickopen.aria" aria-label="Quick open">',
         '<div class="quick-open-panel">',
-        '<div class="quick-open-title"><span id="quick-open-mode" data-i18n="quickopen.searchFiles">Search files</span></div>',
+        '<div class="quick-open-title"><span id="quick-open-mode" data-i18n="quickopen.searchFiles">Search files</span><span id="quick-open-filter" class="quick-open-filter"></span></div>',
         '<input id="quick-open-input" type="search" autocomplete="off" spellcheck="false" data-i18n-ph="quickopen.searchFiles" placeholder="Search files">',
         '<div id="quick-open-results" class="quick-open-results"></div>',
         '<div id="quick-open-preview" class="quick-open-preview"></div>',
@@ -266,49 +293,63 @@ export function renderDiffHtml(input) {
         '<button type="button" id="settings-language" class="settings-select mc-select" data-i18n-aria="settings.language"></button>',
         '<label class="settings-label" for="settings-theme" data-i18n="settings.theme">Theme</label>',
         '<button type="button" id="settings-theme" class="settings-select mc-select" data-i18n-aria="settings.theme"></button>',
+        '<label class="settings-check"><input type="checkbox" id="set-bell-notify"><span data-i18n="settings.bellNotify">Notify when a terminal task finishes (bell)</span></label>',
         '<div class="app-info-keys">' +
             '<div class="app-info-keys-h" data-i18n="settings.kbd.title">Keyboard shortcuts</div>' +
+            '<div class="keys-cat" data-i18n="settings.kbd.cat.app">App</div>' +
+            '<div class="keys-grid">' +
+            '<kbd>⌘O</kbd><span data-i18n="kbd.openFolder">Open folder</span>' +
+            '<kbd>⌘⇧O</kbd><span data-i18n="kbd.openNewWindow">Open in new window</span>' +
+            '<kbd>⌘,</kbd><span data-i18n="kbd.openSettings">Settings</span>' +
+            '<kbd>Esc</kbd><span data-i18n="kbd.closeDialog">Close dialog / cancel</span>' +
+            '</div>' +
             '<div class="keys-cat" data-i18n="settings.kbd.cat.nav">Navigation</div>' +
             '<div class="keys-grid">' +
             '<kbd>F7</kbd><span data-i18n="kbd.nextChange">Next change</span>' +
-            '<kbd>Shift+F7</kbd><span data-i18n="kbd.prevChange">Previous change</span>' +
-            '<kbd>Cmd/Ctrl+1 / 0</kbd><span data-i18n="kbd.filesChangesTab">Files / Changes tab</span>' +
+            '<kbd>⇧F7</kbd><span data-i18n="kbd.prevChange">Previous change</span>' +
+            '<kbd>⌘1 / ⌘0</kbd><span data-i18n="kbd.filesChangesTab">Files / Changes tab</span>' +
             '<kbd>Tab</kbd><span data-i18n="kbd.sidebarContent">Sidebar &harr; content</span>' +
-            '<kbd>Shift Shift</kbd><span data-i18n="kbd.findFile">Find file</span>' +
-            '<kbd>Cmd/Ctrl+Shift+F</kbd><span data-i18n="kbd.findInFiles">Find in files</span>' +
-            '<kbd>Cmd/Ctrl+E</kbd><span data-i18n="kbd.recentFiles">Recent files</span>' +
-            '<kbd>Cmd/Ctrl+B</kbd><span data-i18n="kbd.defUsages">Definition / usages</span>' +
-            '<kbd>Cmd/Ctrl+&darr;</kbd><span data-i18n="kbd.goToDef">Go to definition</span>' +
-            '<kbd>Cmd/Ctrl+Shift+[ / ]</kbd><span data-i18n="kbd.prevNextTab">Prev / next tab</span>' +
-            '<kbd>Cmd/Ctrl+[ / ]</kbd><span data-i18n="kbd.cursorBackForward">Cursor back / forward</span>' +
-            '<kbd>Opt/Alt+&larr;/&rarr;</kbd><span data-i18n="kbd.wordJump">Word jump (vim w)</span>' +
-            '<kbd>Cmd/Ctrl+&larr;/&rarr;</kbd><span data-i18n="kbd.lineStartEnd">Line start / end</span>' +
-            '<kbd>Shift+arrows</kbd><span data-i18n="kbd.extendSelection">Extend selection</span>' +
-            '<kbd>Cmd/Ctrl+W</kbd><span data-i18n="kbd.closeTab">Close tab</span>' +
+            '<kbd>⇧ ⇧</kbd><span data-i18n="kbd.findFile">Find file</span>' +
+            '<kbd>⌘⇧F</kbd><span data-i18n="kbd.findInFiles">Find in files</span>' +
+            '<kbd>⌘E</kbd><span data-i18n="kbd.recentFiles">Recent files</span>' +
+            '<kbd>⌘B</kbd><span data-i18n="kbd.defUsages">Definition / usages</span>' +
+            '<kbd>⌘&darr;</kbd><span data-i18n="kbd.goToDef">Go to definition</span>' +
+            '<kbd>⌘⇧[ / ]</kbd><span data-i18n="kbd.prevNextTab">Prev / next tab</span>' +
+            '<kbd>⌘[ / ]</kbd><span data-i18n="kbd.cursorBackForward">Cursor back / forward</span>' +
+            '<kbd>⌥&larr;/&rarr;</kbd><span data-i18n="kbd.wordJump">Word jump (vim w)</span>' +
+            '<kbd>⌘&larr;/&rarr;</kbd><span data-i18n="kbd.lineStartEnd">Line start / end</span>' +
+            '<kbd>⇧&larr;&uarr;&darr;&rarr;</kbd><span data-i18n="kbd.extendSelection">Extend selection</span>' +
+            '<kbd>PageUp / PageDown</kbd><span data-i18n="kbd.pageUpDown">Page up / down</span>' +
+            '<kbd>⌘Enter / ⌥Enter</kbd><span data-i18n="kbd.runHttp">Run HTTP request (.http)</span>' +
+            '<kbd>⌘W</kbd><span data-i18n="kbd.closeTab">Close tab</span>' +
             '</div>' +
             '<div class="keys-cat" data-i18n="settings.kbd.cat.review">Review</div>' +
             '<div class="keys-grid">' +
             '<kbd>&lt;</kbd><span data-i18n="kbd.toggleViewed">Toggle viewed</span>' +
             '<kbd>? &nbsp;&gt;</kbd><span data-i18n="kbd.addQuestionChange">Add question / change</span>' +
-            '<kbd>Cmd/Ctrl+Shift+/ .</kbd><span data-i18n="kbd.allQuestionsChanges">All questions / changes</span>' +
-            '<kbd>Cmd/Ctrl+Shift+W</kbd><span data-i18n="kbd.ignoreWhitespace">Ignore whitespace</span>' +
-            '<kbd>Cmd/Ctrl+Enter</kbd><span data-i18n="kbd.saveComment">Save comment</span>' +
-            '<kbd>Cmd/Ctrl+Shift+N</kbd><span data-i18n="kbd.promptMemo">Prompt memo</span>' +
-            '<kbd>Cmd/Ctrl+Shift+&#39;</kbd><span data-i18n="kbd.maximizePanel">Maximize panel</span>' +
+            '<kbd>⌘⇧/ .</kbd><span data-i18n="kbd.allQuestionsChanges">All questions / changes</span>' +
+            '<kbd>⌘⇧W</kbd><span data-i18n="kbd.ignoreWhitespace">Ignore whitespace</span>' +
+            '<kbd>⌘Enter</kbd><span data-i18n="kbd.saveComment">Save comment</span>' +
+            '<kbd>e</kbd><span data-i18n="kbd.editComment">Edit comment (when selected)</span>' +
+            '<kbd>Backspace / Delete</kbd><span data-i18n="kbd.deleteComment">Delete comment (when selected)</span>' +
+            '<kbd>⌥&uarr;/&darr;</kbd><span data-i18n="kbd.stepComments">Step between comments (merged)</span>' +
+            '<kbd>⌥Enter</kbd><span data-i18n="kbd.mergedSend">Comment menu / send to pane (merged)</span>' +
+            '<kbd>⌘⇧N</kbd><span data-i18n="kbd.promptMemo">Prompt memo</span>' +
+            '<kbd>⌘⇧&#39;</kbd><span data-i18n="kbd.maximizePanel">Maximize panel</span>' +
             '</div>' +
             '<div class="keys-cat" data-i18n="settings.kbd.cat.terminal">Terminal</div>' +
             '<div class="keys-grid">' +
-            '<kbd>Ctrl+`</kbd><span data-i18n="kbd.toggleTerminal">Toggle terminal</span>' +
-            '<kbd>Cmd/Ctrl+D</kbd><span data-i18n="kbd.splitPane">Split pane</span>' +
-            '<kbd>Cmd/Ctrl+Alt+[ / ]</kbd><span data-i18n="kbd.focusPane">Focus prev / next pane</span>' +
-            '<kbd>Cmd/Ctrl+Alt+R</kbd><span data-i18n="kbd.renamePane">Rename pane</span>' +
-            '<kbd>Cmd/Ctrl+W</kbd><span data-i18n="kbd.closeTerminal">Close terminal (when focused)</span>' +
+            '<kbd>⌃` / ⌥F12</kbd><span data-i18n="kbd.toggleTerminal">Toggle terminal</span>' +
+            '<kbd>⌘D</kbd><span data-i18n="kbd.splitPane">Split pane</span>' +
+            '<kbd>⌘⌥[ / ]</kbd><span data-i18n="kbd.focusPane">Focus prev / next pane</span>' +
+            '<kbd>⌘⌥R</kbd><span data-i18n="kbd.renamePane">Rename pane</span>' +
+            '<kbd>⌘W</kbd><span data-i18n="kbd.closeTerminal">Close terminal (when focused)</span>' +
             '</div>' +
             '</div>',
         "</section>",
         '<section class="settings-section hidden" data-cat="prompts">',
         '<div class="settings-h" data-i18n="mergePrompts.title">Merge prompts</div>',
-        '<div class="settings-desc" data-i18n="mergePrompts.desc">Heading prepended to the merged prompt opened with Cmd/Ctrl+Shift+/ (questions) and Cmd/Ctrl+Shift+. (change requests). Leave blank to use the default.</div>',
+        '<div class="settings-desc" data-i18n="mergePrompts.desc">Heading prepended to the merged prompt opened with ⌘⇧/ (questions) and ⌘⇧. (change requests). Leave blank to use the default.</div>',
         '<label class="settings-label" for="settings-prompt-q" data-i18n="mergePrompts.qHeading">Questions heading</label>',
         '<textarea id="settings-prompt-q" class="settings-textarea" rows="4" spellcheck="false"></textarea>',
         '<label class="settings-label" for="settings-prompt-c" data-i18n="mergePrompts.cHeading">Change-requests heading</label>',

package/dist/util.d.ts

@@ -19,3 +19,8 @@ export declare function listRecentFiles(dir: string, limit: number): string[];
 export declare function sanitizeTerminalEnv(env: NodeJS.ProcessEnv): {
     [key: string]: string;
 };
+export declare function ensureUtf8Locale(env: {
+    [key: string]: string;
+}): {
+    [key: string]: string;
+};

package/dist/util.js

@@ -170,3 +170,24 @@ export function sanitizeTerminalEnv(env) {
     }
     return out;
 }
+// GUI launches (Finder double-click, Spotlight, the `mo` relauncher) often start with no LANG/LC_* at
+// all, so the pty's shell — and tools it runs, notably git's `less` pager — fall back to the C locale and
+// render UTF-8 text (e.g. Korean commit messages) as escaped bytes like "<EA><B5><AD>". Force a UTF-8
+// codeset unless the inherited locale already is one. Mutates and returns the given object.
+export function ensureUtf8Locale(env) {
+    const isUtf8 = (value) => !!value && /utf-?8/i.test(value);
+    // LC_ALL overrides LANG and every LC_* category; a non-UTF-8 LC_ALL (e.g. "C") would defeat the LANG we
+    // set below, so drop it and let LANG win.
+    if (env.LC_ALL && !isUtf8(env.LC_ALL))
+        delete env.LC_ALL;
+    if (isUtf8(env.LC_ALL) || isUtf8(env.LC_CTYPE) || isUtf8(env.LANG))
+        return env;
+    // Same reasoning for a stray non-UTF-8 LC_CTYPE — it overrides LANG for character handling.
+    if (env.LC_CTYPE && !isUtf8(env.LC_CTYPE))
+        delete env.LC_CTYPE;
+    // Preserve the user's region when LANG names a real locale (ko_KR -> ko_KR.UTF-8); otherwise (C/POSIX/
+    // empty) fall back to en_US.UTF-8, which always exists on macOS.
+    const base = env.LANG && /^[A-Za-z]{2}_[A-Za-z]{2}/.test(env.LANG) ? env.LANG.split(".")[0] : "en_US";
+    env.LANG = base + ".UTF-8";
+    return env;
+}