@happy-nut/monacori 0.1.19 → 0.1.21

package/dist/viewer.css

@@ -1,8 +1,8 @@
 
 :root {
   color-scheme: dark;
-  --bg: #161616;
-  --panel: #1b1b1b;
+  --bg: #1e1e1e;
+  --panel: #252526;
   --text: #a9b7c6;
   --muted: #808080;
   --border: #393b3d;
@@ -12,7 +12,7 @@
   --add-strong: #1f5b34;
   --del-strong: #6e2c2c;
   --active: #4a88c7;
-  --sidebar: #1c1c1c;
+  --sidebar: #2a2a2b;
   --token-comment: #808080;
   --token-keyword: #cc7832;
   --token-string: #6a8759;
@@ -294,6 +294,10 @@ body {
   border: 0;
   border-radius: 0;
   background: var(--panel);
+  /* #diff2html-container is a column flexbox; a flex item with overflow:hidden has min-height:0, so a single
+     shown file (showOnlyFile) shrinks to the viewport height and overflow:hidden clips the rest — the diff
+     can't scroll and the caret leaves the screen near the bottom of a big file. Pin to content height. */
+  flex-shrink: 0;
 }
 /* The per-file header is merged into the sticky toolbar (path + status + Viewed) to save vertical space. */
 .d2h-file-header { display: none; }
@@ -370,6 +374,7 @@ body {
   background: transparent;
   border: 0;
 }
+.d2h-code-line-ctn { position: relative; } /* anchors the absolutely-positioned empty-line caret (so blank rows need no inline position) */
 .d2h-code-side-line, .d2h-code-line {
   /* left pad must exceed the 58px absolutely-positioned line-number, else the +/- prefix renders behind it and looks clipped */
   padding: 0 0.6em 0 64px;
@@ -519,8 +524,11 @@ td.d2h-del:not(.d2h-code-side-linenumber) { color: #d8e0e8; }
 .tree-dir[open] > summary .fi-closed { display: none; }
 .tree-dir[open] > summary .fi-open { display: block; }
 .file-link.tree-file { padding-left: calc(8px + (var(--depth) * 14px)); }
-.tree-focus { box-shadow: inset 0 0 0 1px var(--active); border-radius: 6px; }
-summary.tree-focus { background: var(--bg); }
+/* Arrow-key focus in the tree (changes/files) matches the active-file highlight — a tinted fill + accent
+   border — so navigating the file tree reads the same as the diff-side selection (not a faint 1px outline). */
+.tree-focus { background: color-mix(in srgb, var(--active) 20%, transparent); border-radius: 6px; }
+.file-link.tree-focus { border-color: var(--active); }
+summary.tree-focus { background: color-mix(in srgb, var(--active) 20%, transparent); }
 .file-link {
   display: grid;
   grid-template-columns: auto minmax(0, 1fr) auto;
@@ -538,7 +546,10 @@ summary.tree-focus { background: var(--bg); }
   font: inherit;
   cursor: pointer;
 }
-.file-link:hover, .file-link.active { background: var(--bg); border-color: var(--border); }
+.file-link:hover { background: color-mix(in srgb, var(--text) 7%, transparent); border-color: var(--border); }
+/* The file being viewed stands out clearly: a tinted fill + accent border, not just a faint outline. */
+.file-link.active { background: color-mix(in srgb, var(--active) 26%, transparent); border-color: var(--active); }
+.file-link.active:hover { background: color-mix(in srgb, var(--active) 32%, transparent); }
 .file-link.viewed { opacity: 0.58; }
 .file-link.viewed:hover, .file-link.viewed.active { opacity: 1; }
 .path { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 12px; }
@@ -689,11 +700,6 @@ h1 { margin: 0; font-size: 18px; }
    key scrolls the view CONTINUOUSLY instead of leaving it still until the caret reaches the viewport edge
    (the "stutter every ~viewport" the user reported). Applies to the source body, the diff, and the sidebar. */
 .source-body, #diff2html-container, .sidebar-scroll { scroll-padding-block: 35vh; }
-/* revealAt() sets scrollTop directly, and scroll-padding only affects scrollIntoView — so near EOF the
-   caret can't reach the 42% line and pins to the viewport bottom, where the footer progress bar overlaps
-   and HIDES it ("the caret leaves the screen at the end of a file"). Real trailing space lets the last
-   lines scroll up to the middle. The diff caret showed this worst (95% vs source's 81%); both get it. */
-.source-body, #diff2html-container { padding-bottom: 45vh; }
 .source-body {
   border: 1px solid var(--border);
   overflow: auto;
@@ -750,8 +756,11 @@ h1 { margin: 0; font-size: 18px; }
 }
 /* perf: let the browser skip layout/paint for off-screen rows in large files/diffs.
    DOM is unchanged (nav, search, comment anchoring still query every row); degrades
-   gracefully where unsupported. contain-intrinsic-size keeps the scrollbar stable. */
-.source-row { content-visibility: auto; contain-intrinsic-size: auto 19px; }
+   gracefully where unsupported. contain-intrinsic-size keeps the scrollbar stable.
+   (Removing this from .source-row made the caret stutter WORSE — the full DOM forces a bigger reflow on
+   every scroll. The stutter is fixed instead by computing the source scroll from lineIndex*rowHeight,
+   which skips getBoundingClientRect's forced reflow entirely; see scheduleSourceReveal.) */
+.source-row { content-visibility: auto; contain-intrinsic-size: auto 21px; }
 .d2h-diff-table tr { content-visibility: auto; contain-intrinsic-size: auto 18px; }
 /* Comment/composer rows are tall and interactive (a textarea lives here). Skip-rendering them
    with a tiny 18px placeholder made the browser re-evaluate their render state on every
@@ -834,6 +843,12 @@ body.mc-composing .mc-diff-cursor-row .d2h-code-side-line { box-shadow: none; }
 body.mc-composing .source-row.cursor-line .md-cell,
 body.mc-composing .source-row.csv-row.cursor-line .csv-cell { background: transparent; }
 body.mc-composing .source-row.cursor-line .num { color: inherit; }
+/* Same single-caret rule for a floating overlay (merged comments / prompt memo / settings): it owns the only
+   caret while open, so hide the file's blinking caret behind it — never two carets across visible panels. */
+/* A focused merged/memo dock owns the only caret: hide the file caret behind it while it has focus
+   (single-caret rule). Focus elsewhere with the dock still open -> the file caret returns. */
+body:has(.dock-panel:focus-within) .code-cursor,
+body:has(#settings-modal:not(.hidden)) .code-cursor { display: none; }
 .mc-kind {
   font-weight: 700; font-size: 10px; letter-spacing: 0.05em; text-transform: uppercase;
   padding: 2px 8px; border-radius: 999px;
@@ -848,6 +863,10 @@ body.mc-composing .source-row.cursor-line .num { color: inherit; }
   display: block; box-sizing: border-box; resize: vertical;
   margin: 0 10px 10px; width: calc(100% - 20px); min-height: 60px;
   background: var(--bg); color: var(--text);
+  /* The composer is injected INSIDE #diff2html-container, which sets caret-color: transparent (the file
+     view uses a fake .code-cursor). caret-color inherits, so restore it here — a focused textarea must show
+     its real caret. The single-caret rule hides the FILE caret while composing, not the textarea's own. */
+  caret-color: var(--text);
   border: 1px solid var(--border); border-radius: 7px; padding: 9px 11px;
   font: 12px/1.55 Monaco, ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
   transition: border-color 120ms ease, box-shadow 120ms ease;
@@ -882,6 +901,38 @@ body.mc-composing .source-row.cursor-line .num { color: inherit; }
 .mc-memo-preview { height: 100%; overflow: auto; padding: 12px 16px; background: var(--panel); color: var(--text); }
 .mc-memo-preview > :first-child { margin-top: 0; }
 .mc-memo-empty { color: var(--muted); font-size: 12px; font-style: italic; }
+
+/* ===== Merged-prompt & memo: a large FLOATING overlay (~90% of the window), sharing ONE slot with the
+   terminal (opening one closes the others). Cmd/Ctrl+Shift+' maximizes the active panel to full screen. =====
+   (These used to dock below the editor; they now float so a big writing surface doesn't shrink the diff.) */
+.dock-panel {
+  position: fixed; inset: 5vh 5vw; z-index: 60; min-height: 0;     /* ~90vw x 90vh, centered */
+  display: flex; flex-direction: column; background: var(--panel);
+  border: 1px solid var(--border); border-radius: 12px;
+  box-shadow: 0 24px 80px rgba(0, 0, 0, 0.55);
+  overflow: hidden;
+}
+/* Dim the editor behind the floating panel; clicking it closes (handler wired in mountDock). */
+.dock-backdrop { position: fixed; inset: 0; z-index: 59; background: color-mix(in srgb, #000 40%, transparent); }
+.dock-resizer { display: none; } /* a centered ~90% floating panel has no bottom edge to drag */
+.dock-bar {
+  flex: none; display: flex; align-items: center; gap: 8px; padding: 6px 10px;
+  background: var(--sidebar); border-bottom: 1px solid var(--border);
+  color: var(--text); font-weight: 650; font-size: 12px;
+}
+.dock-title { margin-right: auto; letter-spacing: 0.02em; }
+.dock-btn { border: 0; background: transparent; color: var(--muted); cursor: pointer; padding: 2px 7px; border-radius: 5px; font: inherit; font-weight: 500; }
+.dock-btn:hover { color: var(--text); background: color-mix(in srgb, var(--muted) 22%, transparent); }
+.dock-max { font-size: 14px; line-height: 1; }
+.dock-body { flex: 1 1 auto; min-height: 0; display: flex; flex-direction: column; }
+.dock-body > .mc-modal-text { flex: 1 1 auto; height: auto; }
+.dock-body > .mc-memo-body { flex: 1 1 auto; height: auto; }
+/* Maximize. The floating merged/memo panel fills the whole viewport. The terminal is still a grid dock, so
+   its maximize hides the editor area (next rule) — but the floating panels do NOT hide content (their overlay
+   already covers it, and hiding the diff would force an expensive reflow on every maximize toggle). */
+body.dock-maximized .dock-panel { inset: 0; border-radius: 0; }
+body.dock-maximized:not(.floating-dock) .content { display: none; }
+body.dock-maximized .terminal-panel:not(.hidden) { grid-row: 1 / 3; height: auto; }
 .tok-comment { color: var(--token-comment); font-style: italic; }
 .tok-keyword { color: var(--token-keyword); font-weight: 650; }
 .tok-string { color: var(--token-string); }
@@ -996,6 +1047,7 @@ body.mc-composing .source-row.cursor-line .num { color: inherit; }
   .sidebar { grid-row: 1; grid-column: 1; height: auto; border-right: 0; border-bottom: 1px solid var(--border); }
   .content { grid-row: 2; grid-column: 1; padding: 16px; }
   .terminal-panel { grid-column: 1; grid-row: 3; }
+  .dock-panel { grid-column: 1; grid-row: 3; }
   .toolbar { margin: -16px -16px 16px; padding: 12px 16px; }
   .d2h-files-diff { grid-template-columns: 1fr; }
   .d2h-file-side-diff:first-child { border-right: 0; border-bottom: 1px solid var(--border); }

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@happy-nut/monacori",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "Validation control plane for AI-generated code changes.",
   "type": "module",
+  "main": "dist/app-main.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/happy-nut/monacori.git"
@@ -35,7 +36,9 @@
     "prepare": "npm run build",
     "smoke": "npm run build && node dist/cli.js --help",
     "pretest": "npm run build",
-    "test": "node --test test/*.test.mjs"
+    "test": "node --test test/*.test.mjs",
+    "dist:mac": "npm run build && electron-packager . Monacori --platform=darwin --arch=arm64 --icon=assets/icon.icns --app-bundle-id=dev.happynut.monacori --app-category-type=public.app-category.developer-tools --out=release --overwrite --no-asar --ignore=/src/ --ignore=/test/ --ignore=/release --ignore=/.git --ignore=/.github --ignore=/.omc --ignore=/openspec --ignore=/node_modules/electron/ --ignore=/node_modules/@electron --ignore=/node_modules/typescript --ignore=/node_modules/jsdom",
+    "dist:mac:dmg": "npm run dist:mac && create-dmg --overwrite --no-code-sign --dmg-title=Monacori 'release/Monacori-darwin-arm64/Monacori.app' release/ || true"
   },
   "keywords": [
     "ai",
@@ -47,6 +50,7 @@
   "author": "happy-nut <happynut.dev@gmail.com>",
   "license": "MIT",
   "devDependencies": {
+    "@electron/packager": "^20.0.1",
     "@types/node": "^22.15.21",
     "jsdom": "^29.1.1",
     "typescript": "^5.8.3"
@@ -62,5 +66,8 @@
     "electron": "^42.4.1",
     "highlight.js": "^11.11.1",
     "node-pty": "^1.1.0"
+  },
+  "optionalDependencies": {
+    "create-dmg": "^8.1.0"
   }
 }

package/scripts/patch-electron-name.mjs

@@ -29,36 +29,45 @@ function main() {
   const oldExe = join(macosDir, "Electron");
   const newExe = join(macosDir, APP_NAME);
   const pathTxt = join(root, "path.txt");
-  if (!existsSync(plistPath)) return;
+  if (!existsSync(plistPath)) {
+    console.warn('monacori: Electron.app not found at ' + appDir + ' — skipping rebrand (Dock/menu may show "Electron")');
+    return;
+  }
 
   try {
+    let changed = false;
     // 1. Bundle metadata: name, display name, AND executable -> 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");
-    if (after !== before) writeFileSync(plistPath, after);
+    if (after !== before) { writeFileSync(plistPath, after); changed = true; }
 
     // 2. Rename the executable so the directly-spawned process is "monacori" (idempotent).
-    if (existsSync(oldExe) && !existsSync(newExe)) renameSync(oldExe, newExe);
+    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.
     if (existsSync(pathTxt)) {
       const pt = readFileSync(pathTxt, "utf8");
       const fixed = pt.replace("MacOS/Electron", "MacOS/" + APP_NAME);
-      if (fixed !== pt) writeFileSync(pathTxt, fixed);
+      if (fixed !== pt) { writeFileSync(pathTxt, fixed); changed = true; }
     }
-    // Refresh LaunchServices so the Dock / Cmd+Tab show "monacori" instead of a cached "Electron".
-    // Without this, macOS keeps the previously-registered bundle name even after the plist is patched.
-    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 + '"');
-  } catch {
-    // read-only / permission-denied environments — harmless, this is a convenience step
+
+    // 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 + '"');
+    }
+  } 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));
   }
 }