@happy-nut/monacori 0.1.25 → 0.1.26

package/dist/viewer.css

@@ -503,8 +503,9 @@ td.d2h-del:not(.d2h-code-side-linenumber) { color: #d8e0e8; }
 .d2h-code-line-ctn del { background: var(--del-strong); }
 .d2h-code-side-linenumber.d2h-del, .d2h-code-linenumber.d2h-del { background: var(--del); }
 .d2h-code-side-linenumber.d2h-ins, .d2h-code-linenumber.d2h-ins { background: var(--add); }
-.d2h-diff-table tr.hunk, .d2h-diff-table tr.hunk-peer { scroll-margin-top: 76px; }
-.d2h-diff-table tr.hunk.active td, .d2h-diff-table tr.hunk-peer.active td {
+.d2h-diff-table tr.hunk, .d2h-diff-table tr.hunk-peer, .d2h-diff-table tr.history-hunk, .d2h-diff-table tr.history-hunk-peer { scroll-margin-top: 76px; }
+.d2h-diff-table tr.hunk.active td, .d2h-diff-table tr.hunk-peer.active td,
+.d2h-diff-table tr.history-hunk.active td, .d2h-diff-table tr.history-hunk-peer.active td {
   box-shadow: none;
 }
 .d2h-diff-table tr.diff-active-row td { background: rgba(74, 136, 199, 0.16) !important; }
@@ -903,7 +904,8 @@ h1 { margin: 0; font-size: 18px; }
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.28);
   overflow: hidden;
 }
-/* Question vs change-request is a small colored pill on the kind label — no heavy left bar. */
+/* Question vs change-request is a small monochrome pill: an icon (help-circle / pencil) carries the
+   distinction — no color, no heavy left bar. */
 .mc-card-head { display: flex; align-items: center; gap: 8px; padding: 8px 10px 6px; color: var(--muted); }
 .mc-target { margin-left: auto; font: 11px Monaco, ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; color: var(--muted); opacity: 0.9; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 62%; }
 /* While composing a comment, the textarea owns the only caret — hide the file's inline caret and the
@@ -920,12 +922,12 @@ body.mc-composing .source-row.cursor-line .num { color: inherit; }
 body:has(.dock-panel:focus-within) .code-cursor,
 body:has(#settings-modal:not(.hidden)) .code-cursor { display: none; }
 .mc-kind {
+  display: inline-flex; align-items: center; gap: 5px;
   font-weight: 700; font-size: 10px; letter-spacing: 0.05em; text-transform: uppercase;
   padding: 2px 8px; border-radius: 0;
   color: var(--muted); background: color-mix(in srgb, var(--muted) 16%, transparent);
 }
-.mc-card.mc-q .mc-kind { color: var(--token-number); background: color-mix(in srgb, var(--token-number) 18%, transparent); }
-.mc-card.mc-c .mc-kind { color: var(--token-tag); background: color-mix(in srgb, var(--token-tag) 18%, transparent); }
+.mc-kind-ic { flex: none; }
 .mc-del { margin-left: auto; background: transparent; border: 0; color: var(--muted); cursor: pointer; font-size: 15px; line-height: 1; padding: 1px 5px; border-radius: 0; }
 .mc-del:hover { color: var(--del-strong); background: color-mix(in srgb, var(--del-strong) 16%, transparent); }
 .mc-card-body { padding: 2px 12px 11px; color: var(--text); white-space: pre-wrap; overflow-wrap: anywhere; }
@@ -947,7 +949,7 @@ body:has(#settings-modal:not(.hidden)) .code-cursor { display: none; }
 .mc-btn:hover { filter: brightness(1.1); }
 .mc-btn.mc-ghost { background: transparent; border: 1px solid var(--border); color: var(--text); }
 
-/* ===== Git history view (Cmd+9): full-screen overlay, commit list (graph lanes) | commit detail+diff. ===== */
+/* ===== Git history view (Cmd+9): full-screen overlay, commit list (graph lanes) | changed files + single-file diff. ===== */
 .history-view { position: fixed; inset: 0; z-index: 75; display: flex; flex-direction: column; background: var(--bg); }
 .history-view.hidden { display: none; }
 .history-bar { flex: none; display: flex; align-items: center; gap: 12px; padding: 8px 12px; background: var(--sidebar); border-bottom: 1px solid var(--border); }
@@ -956,8 +958,8 @@ body:has(#settings-modal:not(.hidden)) .code-cursor { display: none; }
 .history-search:focus { border-color: var(--active); }
 .history-bar .dock-btn { margin-left: auto; font-size: 16px; }
 .history-body { flex: 1 1 auto; min-height: 0; display: flex; }
-.history-list { flex: 1.3 1 0; min-width: 0; overflow: auto; padding: 4px 0; border-right: 1px solid var(--border); }
-.history-detail { flex: 1 1 0; min-width: 0; overflow: auto; }
+.history-list { flex: 0 0 min(46vw, 760px); min-width: 320px; overflow: auto; padding: 4px 0; border-right: 1px solid var(--border); }
+.history-detail { flex: 1 1 auto; min-width: 0; overflow: hidden; display: flex; flex-direction: column; }
 /* Rows are a fixed 24px so the per-row graph SVG (also 24px) tiles seamlessly and the lanes connect. */
 .hrow { display: grid; grid-template-columns: var(--hgraph-w, 60px) minmax(0, 1fr) auto auto; align-items: center; gap: 10px; width: 100%; height: 24px; padding: 0 12px 0 0; border: 0; background: transparent; color: var(--text); text-align: left; cursor: pointer; font-size: 12.5px; }
 .hrow:hover { background: color-mix(in srgb, var(--active) 8%, transparent); }
@@ -975,10 +977,15 @@ body:has(#settings-modal:not(.hidden)) .code-cursor { display: none; }
 .href-branch { color: #7faf6b; border-color: #7faf6b; }
 .href-remote { color: var(--muted); }
 .href-tag { color: #d4a857; border-color: #d4a857; }
-.history-detail-head { padding: 12px 14px; border-bottom: 1px solid var(--border); }
+.history-detail-head { flex: none; padding: 12px 14px; border-bottom: 1px solid var(--border); }
 .hd-msg { font-size: 13px; line-height: 1.55; white-space: pre-wrap; word-break: break-word; margin-bottom: 8px; }
 .hd-meta { display: flex; flex-wrap: wrap; align-items: center; gap: 10px; font-size: 12px; color: var(--muted); }
 .hd-hash { font-family: Monaco, ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; }
+.history-workspace { flex: 1 1 auto; min-height: 0; display: grid; grid-template-columns: minmax(190px, 260px) minmax(0, 1fr); }
+.history-files { min-width: 0; overflow: auto; padding: 6px; border-right: 1px solid var(--border); background: var(--sidebar); }
+.history-file { width: 100%; }
+.history-diff { min-width: 0; min-height: 0; overflow: auto; display: flex; flex-direction: column; }
+.history-diff:focus { outline: none; }
 
 /* Go-to-line (Cmd/Ctrl+L): a small numeric prompt near the top, like a command palette. */
 .goto-line {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@happy-nut/monacori",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "Validation control plane for AI-generated code changes.",
   "type": "module",
   "main": "dist/app-main.js",

package/scripts/patch-electron-name.mjs

@@ -1,16 +1,22 @@
-import { existsSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, readdirSync, renameSync, writeFileSync } from "node:fs";
 import { spawnSync } from "node:child_process";
 import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
 
-const APP_NAME = "monacori";
+const APP_DISPLAY_NAME = "Monacori";
+const APP_EXECUTABLE_NAME = "monacori";
+const APP_BUNDLE_ID = "dev.happynut.monacori";
+const OLD_APP_NAME = "Electron";
+const APP_BUNDLE = APP_DISPLAY_NAME + ".app";
+const LEGACY_APP_BUNDLES = [OLD_APP_NAME + ".app", APP_EXECUTABLE_NAME + ".app"];
 
 // Electron ships Electron.app with bundle name + executable "Electron", which is what macOS shows in
 // the Dock / Cmd+Tab. The npm `mo` model spawns node_modules/electron's executable directly (not a
 // packaged .app), and a directly-spawned GUI process takes its switcher/Dock name from the *executable*
-// name — CFBundleName and app.setName() only affect the menu items, not the switcher. So we rename the
-// executable to "monacori" (and repoint electron's path.txt) in addition to patching bundle metadata.
+// name and LaunchServices cache identity. So we rename Electron.app + its executable, patch the bundle
+// id/name metadata, and repoint electron's path.txt at the branded binary.
 function electronRoot() {
+  if (process.env.MONACORI_ELECTRON_ROOT) return process.env.MONACORI_ELECTRON_ROOT;
   if (process.platform !== "darwin") return null;
   const require = createRequire(import.meta.url);
   try {
@@ -20,54 +26,98 @@ function electronRoot() {
   }
 }
 
+function setPlistString(plist, key, value) {
+  const pattern = new RegExp("(<key>" + key + "</key>\\s*<string>)[^<]*(</string>)");
+  if (pattern.test(plist)) {
+    return plist.replace(pattern, (_match, prefix, suffix) => prefix + value + suffix);
+  }
+  return plist.replace("</dict>", "\t<key>" + key + "</key>\n\t<string>" + value + "</string>\n</dict>");
+}
+
+function registerBundle(appDir) {
+  if (process.env.MONACORI_SKIP_LSREGISTER === "1") return;
+  spawnSync(
+    "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister",
+    ["-f", appDir],
+    { stdio: "ignore" },
+  );
+}
+
+function findAppBundleEntry(distDir) {
+  try {
+    const entries = readdirSync(distDir);
+    return [APP_BUNDLE, ...LEGACY_APP_BUNDLES].find((bundle) => entries.includes(bundle)) ?? null;
+  } catch {
+    return null;
+  }
+}
+
 function main() {
   const root = electronRoot();
   if (!root) return; // not macOS, or electron missing — nothing to do
-  const appDir = join(root, "dist", "Electron.app");
-  const plistPath = join(appDir, "Contents", "Info.plist");
-  const macosDir = join(appDir, "Contents", "MacOS");
-  const oldExe = join(macosDir, "Electron");
-  const newExe = join(macosDir, APP_NAME);
+  const distDir = join(root, "dist");
+  const newAppDir = join(root, "dist", APP_BUNDLE);
+  const appBundleEntry = findAppBundleEntry(distDir);
   const pathTxt = join(root, "path.txt");
-  if (!existsSync(plistPath)) {
-    console.warn('monacori: Electron.app not found at ' + appDir + ' — skipping rebrand (Dock/menu may show "Electron")');
+  if (!appBundleEntry) {
+    console.warn('monacori: Electron.app not found under ' + distDir + ' — skipping rebrand (Dock/menu may show "Electron")');
     return;
   }
 
   try {
     let changed = false;
-    // 1. Bundle metadata: name, display name, AND executable -> monacori.
+    let appDir = join(distDir, appBundleEntry);
+
+    // 1. Rename the app bundle directory itself. Leaving Electron.app on disk can keep LaunchServices keyed
+    // to Electron even after CFBundleName is patched. The temp hop makes case-only renames reliable on
+    // macOS's common case-insensitive volumes (monacori.app -> Monacori.app).
+    if (appBundleEntry !== APP_BUNDLE) {
+      const tmpAppDir = join(distDir, ".monacori-app-rename-" + process.pid + "-" + Date.now());
+      renameSync(appDir, tmpAppDir);
+      renameSync(tmpAppDir, newAppDir);
+      appDir = newAppDir;
+      changed = true;
+    }
+
+    const plistPath = join(appDir, "Contents", "Info.plist");
+    const macosDir = join(appDir, "Contents", "MacOS");
+    const oldExe = join(macosDir, OLD_APP_NAME);
+    const newExe = join(macosDir, APP_EXECUTABLE_NAME);
+    if (!existsSync(plistPath)) {
+      console.warn('monacori: Info.plist not found at ' + plistPath + ' — skipping rebrand (Dock/menu may show "Electron")');
+      return;
+    }
+
+    // 2. Bundle metadata: display name -> Monacori, executable -> monacori, bundle id -> monacori.
     const before = readFileSync(plistPath, "utf8");
-    const after = before
-      .replace(/(<key>CFBundleName<\/key>\s*<string>)[^<]*(<\/string>)/, "$1" + APP_NAME + "$2")
-      .replace(/(<key>CFBundleDisplayName<\/key>\s*<string>)[^<]*(<\/string>)/, "$1" + APP_NAME + "$2")
-      .replace(/(<key>CFBundleExecutable<\/key>\s*<string>)[^<]*(<\/string>)/, "$1" + APP_NAME + "$2");
+    const after = [
+      ["CFBundleName", APP_DISPLAY_NAME],
+      ["CFBundleDisplayName", APP_DISPLAY_NAME],
+      ["CFBundleExecutable", APP_EXECUTABLE_NAME],
+      ["CFBundleIdentifier", APP_BUNDLE_ID],
+    ].reduce((plist, [key, value]) => setPlistString(plist, key, value), before);
     if (after !== before) { writeFileSync(plistPath, after); changed = true; }
 
-    // 2. Rename the executable so the directly-spawned process is "monacori" (idempotent).
+    // 3. Rename the executable so the directly-spawned process is "monacori" (idempotent).
     if (existsSync(oldExe) && !existsSync(newExe)) { renameSync(oldExe, newExe); changed = true; }
 
-    // 3. Repoint electron's path.txt at the renamed binary so require("electron") resolves it.
+    // 4. Repoint electron's path.txt at the renamed binary so require("electron") resolves it.
     if (existsSync(pathTxt)) {
       const pt = readFileSync(pathTxt, "utf8");
-      const fixed = pt.replace("MacOS/Electron", "MacOS/" + APP_NAME);
+      const fixed = APP_BUNDLE + "/Contents/MacOS/" + APP_EXECUTABLE_NAME;
       if (fixed !== pt) { writeFileSync(pathTxt, fixed); changed = true; }
     }
 
     // Only when something actually changed: refresh LaunchServices so the Dock / Cmd+Tab show "monacori"
     // instead of a cached "Electron". Skipping it when already-branded keeps the startup re-run cheap.
     if (changed) {
-      spawnSync(
-        "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister",
-        ["-f", appDir],
-        { stdio: "ignore" },
-      );
-      console.log('monacori: branded Electron app + executable as "' + APP_NAME + '"');
+      registerBundle(appDir);
+      console.log('monacori: branded Electron app as "' + APP_DISPLAY_NAME + '"');
     }
   } catch (e) {
     // Surface the reason (perms / read-only) instead of failing SILENTLY — otherwise the Dock/Cmd+Tab/menu
     // keep showing "Electron" with no hint why. Non-fatal: app-main.ts re-runs this at startup.
-    console.warn('monacori: could not rebrand the Electron app to "' + APP_NAME + '". Dock/Cmd+Tab/menu may stay "Electron". Reason: ' + (e && e.message ? e.message : e));
+    console.warn('monacori: could not rebrand the Electron app to "' + APP_DISPLAY_NAME + '". Dock/Cmd+Tab/menu may stay "Electron". Reason: ' + (e && e.message ? e.message : e));
   }
 }