@happy-nut/monacori 0.1.2 → 0.1.5

package/dist/i18n.js

@@ -0,0 +1,266 @@
+// UI message catalog for the live English / Korean switch.
+//
+// The viewer ships both languages and switches client-side with NO reload: every translatable
+// server-rendered element in render.ts carries data-i18n (textContent), data-i18n-ph (placeholder),
+// data-i18n-title (title) or data-i18n-aria (aria-label); applyI18n() in viewer.client.js rewrites
+// them, and t(key) feeds the dynamically-built UI. English is the first-paint default.
+//
+// Keys are stable + dot-namespaced. Excluded by design (NOT translated): diff/code content, file
+// paths, syntax-language names, the "monacori" brand, version strings, and literal <kbd> key names
+// (F7, Cmd/Ctrl+B, …). Korean is written for Korean developers — natural, with common technical
+// terms left readable (커밋, 탭, 인덱스 …) rather than force-translated.
+export const MESSAGES = {
+    en: {
+        // Tabs (sidebar)
+        "tab.changes": "Changes",
+        "tab.files": "Files",
+        // Sidebar footer / About
+        "sidebar.updateAvailable": "update available",
+        "about.title": "About monacori",
+        "terminal.title": "Terminal",
+        "terminal.toggle": "Toggle terminal (Ctrl+`)",
+        "terminal.close": "Close terminal",
+        // 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.indexed": "indexed",
+        "status.index.title": "Go-to-definition index",
+        "status.indexing": "indexing",
+        "status.watching": "watching",
+        "status.live.updated": "Live: updated",
+        "status.live.waiting": "Live: waiting for diff server",
+        // Diff view
+        "btn.viewed": "Viewed",
+        "btn.viewed.title": "Toggle viewed (<)",
+        "diff.noDiff": "No diff to review.",
+        // Source toolbar
+        "source.title": "Source",
+        "source.selectFile": "Select a file from the Files tab.",
+        "http.env.title": "HTTP Client environment",
+        "http.env.aria": "HTTP environment",
+        "btn.diff": "Diff",
+        "source.loading": "Loading source…",
+        "source.previewUnavailable": "Source preview unavailable.",
+        "source.viewRaw": "Raw",
+        "source.viewRendered": "Rendered",
+        "source.buildingTree": "Building file tree…",
+        // Quick open
+        "quickopen.aria": "Quick open",
+        "quickopen.searchFiles": "Search files",
+        "quickopen.recent": "Recent files",
+        "quickopen.findInFiles": "Find in Files",
+        "quickopen.noFiles": "No files found.",
+        // Usages
+        "usages.aria": "Usages",
+        "usages.title": "Usages",
+        // Settings — nav
+        "settings.aria": "Settings",
+        "settings.title": "Settings",
+        "settings.cat.general": "General",
+        "settings.cat.prompts": "Merge prompts",
+        // Settings — General
+        "settings.language": "Language",
+        "settings.checkingUpdates": "Checking for updates…",
+        "settings.updateRestart": "Update & Restart",
+        "settings.upToDate": "Up to date",
+        "settings.updateAvailable": "Update available",
+        "settings.updating": "Updating… installing latest, the app will restart",
+        "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.nav": "Navigation",
+        "settings.kbd.cat.review": "Review",
+        "settings.kbd.cat.terminal": "Terminal",
+        // Settings — keyboard-shortcut labels (descriptions only; <kbd> key names stay literal)
+        "kbd.nextChange": "Next change",
+        "kbd.prevChange": "Previous change",
+        "kbd.closeTab": "Close tab",
+        "kbd.prevNextTab": "Prev / next tab",
+        "kbd.cursorBackForward": "Cursor back / forward",
+        "kbd.findFile": "Find file",
+        "kbd.findInFiles": "Find in files",
+        "kbd.recentFiles": "Recent files",
+        "kbd.defUsages": "Definition / usages",
+        "kbd.goToDef": "Go to definition",
+        "kbd.filesChangesTab": "Files / Changes tab",
+        "kbd.sidebarContent": "Sidebar ↔ content",
+        "kbd.wordJump": "Word jump (vim w)",
+        "kbd.lineStartEnd": "Line start / end",
+        "kbd.extendSelection": "Extend selection",
+        "kbd.toggleViewed": "Toggle viewed",
+        "kbd.addQuestionChange": "Add question / change",
+        "kbd.allQuestionsChanges": "All questions / changes",
+        "kbd.ignoreWhitespace": "Ignore whitespace",
+        "kbd.saveComment": "Save comment",
+        "kbd.promptMemo": "Prompt memo",
+        "kbd.toggleTerminal": "Toggle terminal",
+        "kbd.splitPane": "Split pane",
+        "kbd.focusPane": "Focus prev / next pane",
+        "kbd.renamePane": "Rename pane",
+        "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.qHeading": "Questions heading",
+        "mergePrompts.cHeading": "Change-requests heading",
+        "mergePrompts.reset": "Reset to defaults",
+        "settings.saved": "Saved",
+        // Composer (per-line question / change-request)
+        "composer.question": "Ask a question about this line",
+        "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.delete": "Delete",
+        "comment.kind.q": "❓ Question",
+        "comment.kind.c": "✎ Change request",
+        "badge.questions": "question(s)",
+        "badge.changeRequests": "change request(s)",
+        // Merged comments modal
+        "merged.qTitle": "Question comments",
+        "merged.cTitle": "Change-request comments",
+        "merged.copyAll": "Copy all",
+        "merged.sendToTerminal": "Send to terminal",
+        "merged.copied": "Copied",
+        "merged.copyFailed": "Copy failed",
+        "merged.close": "Close",
+        "merged.qHeading": "# Questions",
+        "merged.cHeading": "# Change requests",
+        // Prompt memo (Cmd/Ctrl+Shift+N) — a single freeform Markdown scratchpad with a live split preview.
+        "memo.title": "Prompt memo",
+        "memo.placeholder": "Jot down what you're planning, in Markdown…",
+        "memo.previewEmpty": "Markdown preview shows up here as you type.",
+        // Merge-prompt default agent contracts (these follow the locale — a Korean user gets Korean defaults)
+        "mergePrompt.default.q": "The following are questions about code you just wrote. Answer each one — explain the intent, rationale, or context. Do not change any code; this clarifies understanding before any revisions.",
+        "mergePrompt.default.c": "The following are change requests for code you just wrote. For each, edit the code at the quoted location to satisfy the request. Keep changes minimal and focused; do not make unrelated edits.",
+    },
+    ko: {
+        // Tabs (sidebar)
+        "tab.changes": "변경사항",
+        "tab.files": "파일",
+        // Sidebar footer / About
+        "sidebar.updateAvailable": "업데이트 있음",
+        "about.title": "monacori 정보",
+        "terminal.title": "터미널",
+        "terminal.toggle": "터미널 토글 (Ctrl+`)",
+        "terminal.close": "터미널 닫기",
+        // Review status (toolbar)
+        "status.files": "개 파일",
+        "status.hunks": "개 변경 묶음",
+        "status.wsIgnored": "공백 무시",
+        "status.wsIgnored.title": "공백 무시 — Cmd/Ctrl+Shift+W",
+        "status.indexed": "개 인덱싱됨",
+        "status.index.title": "정의로 이동 인덱스",
+        "status.indexing": "인덱싱 중",
+        "status.watching": "감시 중",
+        "status.live.updated": "실시간: 업데이트됨",
+        "status.live.waiting": "실시간: diff 서버 대기 중",
+        // Diff view
+        "btn.viewed": "확인함",
+        "btn.viewed.title": "확인 표시 토글 (<)",
+        "diff.noDiff": "검토할 변경사항이 없습니다.",
+        // Source toolbar
+        "source.title": "소스",
+        "source.selectFile": "파일 탭에서 파일을 선택하세요.",
+        "http.env.title": "HTTP 클라이언트 환경",
+        "http.env.aria": "HTTP 환경",
+        "btn.diff": "Diff",
+        "source.loading": "소스 불러오는 중…",
+        "source.previewUnavailable": "소스 미리보기를 사용할 수 없습니다.",
+        "source.viewRaw": "원문",
+        "source.viewRendered": "렌더링",
+        "source.buildingTree": "파일 트리 만드는 중…",
+        // Quick open
+        "quickopen.aria": "빠른 열기",
+        "quickopen.searchFiles": "파일 검색",
+        "quickopen.recent": "최근 파일",
+        "quickopen.findInFiles": "파일 내용 검색",
+        "quickopen.noFiles": "파일을 찾을 수 없습니다.",
+        // Usages
+        "usages.aria": "사용처",
+        "usages.title": "사용처",
+        // Settings — nav
+        "settings.aria": "설정",
+        "settings.title": "설정",
+        "settings.cat.general": "일반",
+        "settings.cat.prompts": "병합 프롬프트",
+        // Settings — General
+        "settings.language": "언어",
+        "settings.checkingUpdates": "업데이트 확인 중…",
+        "settings.updateRestart": "업데이트 후 재시작",
+        "settings.upToDate": "최신 버전입니다",
+        "settings.updateAvailable": "업데이트 있음",
+        "settings.updating": "업데이트 중… 최신 버전을 설치하면 앱이 재시작됩니다",
+        "settings.updated": "업데이트 완료. 재시작 중…",
+        "settings.updateFailed": "업데이트 실패 — 다시 시도하거나 실행하세요: npm i -g @happy-nut/monacori",
+        "settings.kbd.title": "키보드 단축키",
+        "settings.kbd.cat.nav": "탐색",
+        "settings.kbd.cat.review": "리뷰",
+        "settings.kbd.cat.terminal": "터미널",
+        // Settings — keyboard-shortcut labels
+        "kbd.nextChange": "다음 변경",
+        "kbd.prevChange": "이전 변경",
+        "kbd.closeTab": "탭 닫기",
+        "kbd.prevNextTab": "이전 / 다음 탭",
+        "kbd.cursorBackForward": "커서 뒤로 / 앞으로",
+        "kbd.findFile": "파일 찾기",
+        "kbd.findInFiles": "파일 내용 찾기",
+        "kbd.recentFiles": "최근 파일",
+        "kbd.defUsages": "정의 / 사용처",
+        "kbd.goToDef": "정의로 이동",
+        "kbd.filesChangesTab": "파일 / 변경사항 탭",
+        "kbd.sidebarContent": "사이드바 ↔ 본문",
+        "kbd.wordJump": "단어 단위 이동 (vim w)",
+        "kbd.lineStartEnd": "줄 시작 / 끝",
+        "kbd.extendSelection": "선택 영역 확장",
+        "kbd.toggleViewed": "확인 표시 토글",
+        "kbd.addQuestionChange": "질문 / 변경요청 추가",
+        "kbd.allQuestionsChanges": "전체 질문 / 변경요청",
+        "kbd.ignoreWhitespace": "공백 무시",
+        "kbd.saveComment": "코멘트 저장",
+        "kbd.promptMemo": "프롬프트 메모",
+        "kbd.toggleTerminal": "터미널 토글",
+        "kbd.splitPane": "패널 분할",
+        "kbd.focusPane": "이전 / 다음 패널로 이동",
+        "kbd.renamePane": "패널 이름 변경",
+        "kbd.closeTerminal": "터미널 닫기 (포커스 시)",
+        // Settings — Merge prompts
+        "mergePrompts.title": "병합 프롬프트",
+        "mergePrompts.desc": "Cmd/Ctrl+Shift+/ (질문) 및 Cmd/Ctrl+Shift+. (변경요청)로 여는 병합 프롬프트 맨 앞에 붙는 머리말입니다. 비워 두면 기본값을 사용합니다.",
+        "mergePrompts.qHeading": "질문 머리말",
+        "mergePrompts.cHeading": "변경요청 머리말",
+        "mergePrompts.reset": "기본값으로 초기화",
+        "settings.saved": "저장됨",
+        // Composer
+        "composer.question": "이 줄에 대해 질문하기",
+        "composer.changeRequest": "이 줄에 대한 변경 요청하기",
+        "composer.save": "코멘트",
+        "composer.cancel": "취소",
+        "composer.hint": "Cmd/Ctrl+Enter로 저장, Esc로 취소",
+        "composer.delete": "삭제",
+        "comment.kind.q": "❓ 질문",
+        "comment.kind.c": "✎ 변경 요청",
+        "badge.questions": "개 질문",
+        "badge.changeRequests": "개 변경 요청",
+        // Merged comments modal
+        "merged.qTitle": "질문 코멘트",
+        "merged.cTitle": "변경 요청 코멘트",
+        "merged.copyAll": "전체 복사",
+        "merged.sendToTerminal": "터미널로 전송",
+        "merged.copied": "복사됨",
+        "merged.copyFailed": "복사 실패",
+        "merged.close": "닫기",
+        // Structural markers stay English in both locales (the preamble prose below follows the locale).
+        "merged.qHeading": "# Questions",
+        "merged.cHeading": "# Change requests",
+        // 프롬프트 메모 (Cmd/Ctrl+Shift+N) — 라이브 분할 미리보기가 있는 자유 형식 마크다운 메모 한 장.
+        "memo.title": "프롬프트 메모",
+        "memo.placeholder": "구상 중인 것을 마크다운으로 적어 보세요…",
+        "memo.previewEmpty": "입력하면 여기에 마크다운 미리보기가 나타납니다.",
+        // Merge-prompt default agent contracts (Korean default for Korean users)
+        "mergePrompt.default.q": "다음은 방금 작성한 코드에 대한 질문입니다. 각 질문에 답하면서 의도, 근거, 맥락을 설명하세요. 코드는 변경하지 마세요. 이 단계는 수정에 앞서 이해를 명확히 하기 위한 것입니다.",
+        "mergePrompt.default.c": "다음은 방금 작성한 코드에 대한 변경 요청입니다. 각 요청에 대해 인용된 위치의 코드를 수정하여 요구사항을 충족하세요. 변경은 최소한으로 집중해서 하고, 관련 없는 수정은 하지 마세요.",
+    },
+};

package/dist/preload.cjs

@@ -13,6 +13,33 @@ electron_1.contextBridge.exposeInMainWorld("monacoriMenu", {
     onMergedView: (cb) => {
         electron_1.ipcRenderer.on("monacori:merged-view", (_event, kind) => cb(kind));
     },
+    // Review menu's Cmd/Ctrl+Shift+N -> open/close the prompt memo in the renderer.
+    onOpenMemo: (cb) => {
+        electron_1.ipcRenderer.on("monacori:open-memo", () => cb());
+    },
+    // Electron watch: main pushes the rebuilt review HTML so the renderer refreshes the diff in place
+    // (no window reload), keeping the integrated terminal's pty sessions alive.
+    onDiffUpdate: (cb) => {
+        electron_1.ipcRenderer.on("monacori:diff-update", (_event, html) => cb(html));
+    },
+    // Cmd/Ctrl+W from the Window menu -> close the active Files-mode tab in the renderer.
+    onCloseTab: (cb) => {
+        electron_1.ipcRenderer.on("monacori:close-tab", () => cb());
+    },
+    // Terminal menu accelerators (Ctrl+`/Alt+F12 toggle, Cmd+D split) — routed via the menu because
+    // Chromium swallows Cmd+D before it reaches the renderer's keydown handler.
+    onTerminalToggle: (cb) => {
+        electron_1.ipcRenderer.on("monacori:terminal-toggle", () => cb());
+    },
+    onTerminalSplit: (cb) => {
+        electron_1.ipcRenderer.on("monacori:terminal-split", () => cb());
+    },
+    onTerminalPaneFocus: (cb) => {
+        electron_1.ipcRenderer.on("monacori:terminal-pane-focus", (_event, delta) => cb(delta));
+    },
+    onTerminalPaneRename: (cb) => {
+        electron_1.ipcRenderer.on("monacori:terminal-pane-rename", () => cb());
+    },
 });
 // Phase 2 lazy-LOAD: fetch a single file's diff body from the main process on demand, so the initial
 // HTML can omit the embedded diff bodies (tens of MB on big repos) and stay small.
@@ -20,3 +47,46 @@ electron_1.contextBridge.exposeInMainWorld("monacoriFile", {
     get: (index, kind) => electron_1.ipcRenderer.invoke("monacori:get-file", { index, kind }),
     getSourceData: () => electron_1.ipcRenderer.invoke("monacori:get-source-data"),
 });
+// Self-update: ask the main process to install the latest version globally and relaunch. Only present
+// in the Electron app (not browser/watch mode), so the renderer hides the in-app update button there.
+electron_1.contextBridge.exposeInMainWorld("monacoriUpdate", {
+    run: () => electron_1.ipcRenderer.invoke("monacori:self-update"),
+});
+// Integrated terminal: bridge the renderer's xterm view to a node-pty owned by the main process (the
+// sandboxed renderer can't spawn a pty). Only present in the Electron app; browser/serve mode lacks it,
+// so the renderer keeps the terminal panel hidden there.
+electron_1.contextBridge.exposeInMainWorld("monacoriPty", {
+    spawn: (size) => electron_1.ipcRenderer.invoke("monacori:pty-spawn", size),
+    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),
+    onData: (cb) => {
+        electron_1.ipcRenderer.on("monacori:pty-data", (_event, msg) => cb(msg));
+    },
+    onExit: (cb) => {
+        electron_1.ipcRenderer.on("monacori:pty-exit", (_event, msg) => cb(msg));
+    },
+});
+// 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
+// asynchronously. Only present in the Electron app; browser/serve mode falls back to localStorage.
+const persistedSettings = (() => {
+    try {
+        return electron_1.ipcRenderer.sendSync("monacori:get-settings") || {};
+    }
+    catch {
+        return {};
+    }
+})();
+electron_1.contextBridge.exposeInMainWorld("monacoriSettings", {
+    all: persistedSettings,
+    set: (key, value) => {
+        try {
+            electron_1.ipcRenderer.send("monacori:set-setting", { key, value });
+        }
+        catch {
+            /* noop */
+        }
+    },
+});

package/dist/render.d.ts

@@ -6,6 +6,15 @@ export declare function splitDiffForLazy(diffHtml: string, files: DiffFile[]): {
     islands: string;
     bodies: string[];
 };
+export declare function renderReviewStatus(input: {
+    files: number;
+    hunks: number;
+    embeddedFiles: number;
+    sourceFileCount: number;
+    ignoreWhitespace?: boolean;
+    watch?: boolean;
+    generatedAt?: string;
+}): string;
 export declare function renderDiffHtml(input: {
     files: DiffFile[];
     diffHtml: string;
@@ -21,9 +30,12 @@ export declare function renderDiffHtml(input: {
     projectPath: string;
     watch?: boolean;
     ignoreWhitespace?: boolean;
+    app?: boolean;
     signature?: string;
     generatedAt?: string;
 }): string;
+export declare function renderDiffTree(files: DiffFile[]): string;
+export declare function renderSourceTree(files: SourceFile[]): string;
 export declare function diffSubtitle(options: {
     base?: string;
     staged: boolean;

package/dist/render.js

@@ -1,6 +1,7 @@
 import { createRequire } from "node:module";
 import { escapeAttr, escapeHtml, jsonForScript } from "./util.js";
-import { diff2HtmlCss, diffCss, diffScript } from "./assets.js";
+import { diff2HtmlCss, diffCss, diffScript, xtermCss, xtermScript } from "./assets.js";
+import { MESSAGES } from "./i18n.js";
 const nodeRequire = createRequire(import.meta.url);
 const packageVersion = (() => {
     try {
@@ -81,6 +82,11 @@ export function splitDiffForLazy(diffHtml, files) {
     });
     return { container: shells.join("\n"), islands: islands.join("\n"), bodies };
 }
+// The toolbar's review-status row (file/hunk counts, index + live status). Extracted so the in-place
+// update path can re-render just this strip; renderDiffHtml wraps it in <div class="review-status">.
+export function renderReviewStatus(input) {
+    return `<span>${input.files} <span data-i18n="status.files">files</span></span><span>${input.hunks} <span data-i18n="status.hunks">hunks</span></span>${input.ignoreWhitespace ? '<span class="ws-ignored" data-i18n="status.wsIgnored" data-i18n-title="status.wsIgnored.title" title="Whitespace ignored — Cmd/Ctrl+Shift+W">ws ignored</span>' : ""}<span class="index-status" id="index-status" data-i18n-title="status.index.title" title="Go-to-definition index">${input.embeddedFiles}/${input.sourceFileCount} indexed</span><span class="index-progress hidden" id="index-progress" aria-hidden="true"><span class="index-progress-bar"></span></span><span class="live-status ${input.watch ? "watching" : ""}" id="live-status"${input.watch ? ' data-i18n="status.watching"' : ""}>${input.watch ? "watching" : escapeHtml(input.generatedAt ?? new Date().toISOString())}</span>`;
+}
 export function renderDiffHtml(input) {
     const totalHunks = input.files.reduce((sum, file) => sum + file.hunks.length, 0);
     const fileNav = renderDiffTree(input.files);
@@ -97,15 +103,18 @@ export function renderDiffHtml(input) {
         "<style>",
         diff2HtmlCss(),
         diffCss(),
+        input.app ? xtermCss() : "",
         "</style>",
         "</head>",
         "<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>',
         '<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>`,
         input.lazy
-            ? '<div class="tabs"><button type="button" class="tab active" data-tab="changes">Changes</button><button type="button" class="tab" data-tab="files">Files</button></div>'
-            : '<div class="tabs"><button type="button" class="tab" data-tab="changes">Changes</button><button type="button" class="tab active" data-tab="files">Files</button></div>',
+            ? '<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="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.
@@ -113,48 +122,119 @@ 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" title="Update available">update available</span><button type="button" id="app-info-btn" class="settings-btn" aria-haspopup="dialog" 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><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>`,
         "</aside>",
         '<div class="sidebar-resizer" aria-hidden="true"></div>',
         '<main class="content">',
         '<section id="diff-view" class="hidden">',
         '<div class="toolbar">',
         '<div class="breadcrumb" id="diff-breadcrumb"></div>',
-        `<div class="review-status"><span>${input.files.length} files</span><span>${totalHunks} hunks</span>${input.ignoreWhitespace ? '<span class="ws-ignored" title="Whitespace ignored — Cmd/Ctrl+Shift+W">ws ignored</span>' : ""}<span class="index-status" id="index-status" title="Go-to-definition index">${embeddedFiles}/${input.sourceFiles.length} indexed</span><span class="index-progress hidden" id="index-progress" aria-hidden="true"><span class="index-progress-bar"></span></span><span class="live-status ${input.watch ? "watching" : ""}" id="live-status">${input.watch ? "watching" : escapeHtml(input.generatedAt ?? new Date().toISOString())}</span></div>`,
-        '<button type="button" id="diff-viewed-toggle" class="diff-viewed-toggle" aria-pressed="false" title="Toggle viewed (<)" hidden>Viewed</button>',
+        `<div class="review-status">${renderReviewStatus({ files: input.files.length, hunks: totalHunks, embeddedFiles, sourceFileCount: input.sourceFiles.length, ignoreWhitespace: input.ignoreWhitespace, watch: input.watch, generatedAt: input.generatedAt })}</div>`,
+        '<button type="button" id="diff-viewed-toggle" class="diff-viewed-toggle" aria-pressed="false" data-i18n="btn.viewed" data-i18n-title="btn.viewed.title" title="Toggle viewed (<)" hidden>Viewed</button>',
         "</div>",
-        `<div id="diff2html-container" class="diff2html-container">${input.diffHtml || '<div class="empty">No diff to review.</div>'}</div>`,
+        `<div id="diff2html-container" class="diff2html-container">${input.diffHtml || '<div class="empty" data-i18n="diff.noDiff">No diff to review.</div>'}</div>`,
         "</section>",
         '<section id="source-viewer" class="source-viewer">',
+        '<div id="source-tabs" class="source-tabs hidden" role="tablist"></div>',
         '<div class="toolbar source-toolbar">',
-        '<div class="source-file-meta"><span id="source-type-icon" class="source-type-icon" aria-hidden="true"></span><span id="source-title">Source</span><span id="source-meta">Select a file from the Files tab.</span></div>',
-        '<select id="http-env-select" class="http-env-select hidden" title="HTTP Client environment" aria-label="HTTP environment"></select>',
-        '<button type="button" id="back-to-diff" class="plain-button">Diff</button>',
+        '<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>',
         "</div>",
-        '<div id="source-body" class="source-body empty">Select a file from the Files tab.</div>',
+        '<div id="source-body" class="source-body empty" data-i18n="source.selectFile">Select a file from the Files tab.</div>',
         "</section>",
         "</main>",
-        `<div id="app-info" class="app-info hidden" role="dialog" aria-modal="false" aria-label="About monacori"><div class="app-info-head">monacori <span class="app-info-ver">${packageVersion ? "v" + escapeHtml(packageVersion) : ""}</span></div><div id="app-info-status" class="app-info-status">Checking for updates…</div><div class="app-info-cmd"><code>npm i -g @happy-nut/monacori</code><button type="button" id="app-info-copy" class="plain-button">Copy</button></div><div class="app-info-keys"><div class="app-info-keys-h">Keyboard shortcuts</div><div class="keys-grid"><kbd>F7</kbd><span>Next change</span><kbd>Shift+F7</kbd><span>Previous change</span><kbd>Cmd/Ctrl+[ / ]</kbd><span>Cursor back / forward</span><kbd>Shift Shift</kbd><span>Find file</span><kbd>Cmd/Ctrl+Shift+F</kbd><span>Find in files</span><kbd>Cmd/Ctrl+E</kbd><span>Recent files</span><kbd>Cmd/Ctrl+B</kbd><span>Definition / usages</span><kbd>Cmd/Ctrl+&darr;</kbd><span>Go to definition</span><kbd>Cmd/Ctrl+1 / 0</kbd><span>Files / Changes tab</span><kbd>Tab</kbd><span>Sidebar &harr; content</span><kbd>Opt/Alt+&larr;/&rarr;</kbd><span>Word jump (vim w)</span><kbd>Cmd/Ctrl+&larr;/&rarr;</kbd><span>Line start / end</span><kbd>Shift+arrows</kbd><span>Extend selection</span><kbd>&lt;</kbd><span>Toggle viewed</span><kbd>? &nbsp;&gt;</kbd><span>Add question / change</span><kbd>Cmd/Ctrl+Shift+/ .</kbd><span>All questions / changes</span><kbd>Cmd/Ctrl+Shift+W</kbd><span>Ignore whitespace</span><kbd>Cmd/Ctrl+Enter</kbd><span>Save comment</span></div></div></div>`,
-        '<div id="quick-open" class="quick-open hidden" role="dialog" aria-modal="true" aria-label="Quick open">',
+        // Integrated terminal panel (Electron only — shown when window.monacoriPty exists). Fixed to the
+        // content column's bottom; a top resizer drags its height. The merged prompt is sent here.
+        input.app
+            ? '<div id="terminal-panel" class="terminal-panel hidden"><div class="terminal-resizer" aria-hidden="true"></div><div class="terminal-bar"><span class="terminal-title" data-i18n="terminal.title">Terminal</span><button type="button" id="terminal-close" class="terminal-x" data-i18n-title="terminal.close" title="Close terminal" aria-label="Close terminal">&times;</button></div><div id="terminal-host" class="terminal-host"></div></div>'
+            : "",
+        '<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">Search files</span></div>',
-        '<input id="quick-open-input" type="search" autocomplete="off" spellcheck="false" placeholder="Search files">',
+        '<div class="quick-open-title"><span id="quick-open-mode" data-i18n="quickopen.searchFiles">Search files</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>',
         "</div>",
         "</div>",
-        '<div id="usages" class="quick-open hidden" role="dialog" aria-modal="true" aria-label="Usages">',
+        '<div id="usages" class="quick-open hidden" role="dialog" aria-modal="true" data-i18n-aria="usages.aria" aria-label="Usages">',
         '<div class="quick-open-panel">',
-        '<div class="quick-open-title"><span id="usages-title">Usages</span></div>',
+        '<div class="quick-open-title"><span id="usages-title" data-i18n="usages.title">Usages</span></div>',
         '<div id="usages-results" class="quick-open-results"></div>',
         "</div>",
         "</div>",
+        '<div id="settings-modal" class="settings-modal hidden" role="dialog" aria-modal="true" data-i18n-aria="settings.aria" aria-label="Settings">',
+        '<div class="settings-panel">',
+        '<aside class="settings-nav"><div class="settings-nav-title" data-i18n="settings.title">Settings</div><button type="button" class="settings-cat active" data-cat="general" data-i18n="settings.cat.general">General</button><button type="button" class="settings-cat" data-cat="prompts" data-i18n="settings.cat.prompts">Merge prompts</button></aside>',
+        '<div class="settings-body">',
+        '<section class="settings-section" data-cat="general">',
+        `<div class="settings-h">monacori <span class="settings-ver">${packageVersion ? "v" + escapeHtml(packageVersion) : ""}</span></div>`,
+        '<div id="app-info-status" class="app-info-status" data-i18n="settings.checkingUpdates">Checking for updates…</div>',
+        '<button type="button" id="app-info-update" class="plain-button app-info-update hidden" data-i18n="settings.updateRestart">Update &amp; Restart</button>',
+        '<label class="settings-label" for="settings-language" data-i18n="settings.language">Language</label>',
+        '<select id="settings-language" class="settings-select"><option value="en">English</option><option value="ko">한국어</option></select>',
+        '<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.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>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>' +
+            '</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>' +
+            '</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>' +
+            '</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>',
+        '<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>',
+        '<textarea id="settings-prompt-c" class="settings-textarea" rows="4" spellcheck="false"></textarea>',
+        '<div class="settings-actions"><button type="button" id="settings-reset" class="plain-button" data-i18n="mergePrompts.reset">Reset to defaults</button><span id="settings-saved" class="settings-saved"></span></div>',
+        "</section>",
+        "</div>",
+        "</div>",
+        "</div>",
         input.diffIslands || "",
         `<script type="application/json" id="review-meta" data-watch="${input.watch ? "true" : "false"}" data-signature="${escapeAttr(input.signature ?? "")}" data-generated-at="${escapeAttr(input.generatedAt ?? "")}" data-lazy="${input.lazy ? "true" : "false"}" data-lazy-load="${input.lazyLoad ? "true" : "false"}">{}</script>`,
+        `<script type="application/json" id="i18n-data">${jsonForScript(MESSAGES)}</script>`,
         `<script type="application/json" id="source-files-data">${jsonForScript(input.lazyLoad ? input.sourceFiles.map((f) => ({ ...f, content: "", image: "" })) : input.sourceFiles)}</script>`,
         `<script type="application/json" id="file-state-data">${jsonForScript(input.fileStates)}</script>`,
         `<script type="application/json" id="http-env-data">${jsonForScript(input.httpEnvironments)}</script>`,
         `<script>window.__MONACORI_VERSION__=${JSON.stringify(packageVersion)};</script>`,
+        // xterm ships as an inert island (type=text/html, not parsed/compiled at startup) and is injected on
+        // the first terminal open — ~490KB the renderer would otherwise parse on every launch even unused.
+        input.app ? `<script type="text/html" id="xterm-code">${xtermScript()}</script>` : "",
         "<script>",
         diffScript(),
         "</script>",
@@ -162,7 +242,7 @@ export function renderDiffHtml(input) {
         "</html>",
     ].join("\n");
 }
-function renderDiffTree(files) {
+export function renderDiffTree(files) {
     if (files.length === 0) {
         return '<div class="empty-nav">No changed files</div>';
     }
@@ -184,7 +264,7 @@ function renderDiffTree(files) {
         const name = slash >= 0 ? file.displayPath.slice(slash + 1) : file.displayPath;
         const dir = slash > 0 ? file.displayPath.slice(0, slash) : "";
         return [
-            `<a class="file-link change-row" href="#file-${fileIndex}" data-hunk="${firstHunk}" data-file="${escapeAttr(file.displayPath)}" title="${escapeAttr(file.displayPath + " — " + file.status)}">`,
+            `<a class="file-link change-row${file.vcs ? " vcs-" + file.vcs : ""}" href="#file-${fileIndex}" data-hunk="${firstHunk}" data-file="${escapeAttr(file.displayPath)}" title="${escapeAttr(file.displayPath + " — " + file.status)}">`,
             fileTypeIcon(file.displayPath),
             `<span class="status status-${escapeAttr(file.status)}">${escapeHtml(file.status)}</span>`,
             `<span class="change-name"><span class="path" title="${escapeAttr(file.displayPath)}">${escapeHtml(name)}</span>${dir ? `<span class="change-dir">${escapeHtml(dir)}</span>` : ""}</span>`,
@@ -194,7 +274,7 @@ function renderDiffTree(files) {
     });
     return `<nav class="tree changes-flat">${rows.join("")}</nav>`;
 }
-function renderSourceTree(files) {
+export function renderSourceTree(files) {
     if (files.length === 0) {
         return '<div class="empty-nav">No source files indexed</div>';
     }
@@ -302,7 +382,7 @@ function fileTypeIcon(path) {
 function renderSourceNode(node, depth) {
     if (node.file) {
         const file = node.file;
-        const classes = ["file-link", "source-link", "tree-file", file.embedded ? "" : "not-embedded"].filter(Boolean).join(" ");
+        const classes = ["file-link", "source-link", "tree-file", file.embedded ? "" : "not-embedded", file.vcs ? "vcs-" + file.vcs : ""].filter(Boolean).join(" ");
         const tip = file.path + (file.embedded ? "" : " — not embedded");
         return [
             `<button type="button" class="${classes}" data-source-file="${escapeAttr(file.path)}" style="--depth:${depth}" title="${escapeAttr(tip)}">`,
@@ -322,7 +402,7 @@ function renderSourceNode(node, depth) {
     }
     return [
         `<details class="tree-dir source-dir" data-dir="${escapeAttr(labelNode.path)}" style="--depth:${depth}">`,
-        `<summary><span class="folder-icon">v</span><span class="path">${escapeHtml(names.join("/"))}</span></summary>`,
+        `<summary><span class="folder-icon"><svg class="folder-ic fi-closed" viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 20a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-7.9a2 2 0 0 1-1.69-.9L9.6 3.9A2 2 0 0 0 7.93 3H4a2 2 0 0 0-2 2v13a2 2 0 0 0 2 2Z"/></svg><svg class="folder-ic fi-open" viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m6 14 1.45-2.9A2 2 0 0 1 9.24 10H21a2 2 0 0 1 1.94 2.5l-1.55 6a2 2 0 0 1-1.94 1.5H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4.9a2 2 0 0 1 1.69.9l.81 1.2a2 2 0 0 0 1.67.9H18a2 2 0 0 1 2 2v2"/></svg></span><span class="path">${escapeHtml(names.join("/"))}</span></summary>`,
         renderSourceChildren(labelNode, depth + 1),
         "</details>",
     ].join("\n");