@happy-nut/monacori 0.1.25 → 0.1.26

package/dist/app-main.js

@@ -9,13 +9,15 @@ import { readGitLog, readCommitDiff } from "./git-log.js";
 import { readUnifiedDiff } from "./diff.js";
 import { isGitRepository } from "./git.js";
 import { renderWelcomeHtml } from "./render.js";
+import { relaunchUpdatedApp } from "./self-update.js";
 import { createHash } from "node:crypto";
 import { spawn as spawnPty } from "node-pty";
 // `npm run dev` sets MONACORI_DEV=1 so a locally-built app announces itself — a window-title suffix
 // plus a boot log with its on-disk path — making it obvious whether `mo` launched THIS checkout or
 // the globally-installed package (their version numbers can be identical; the path is the tell).
 const DEV_BUILD = process.env.MONACORI_DEV === "1";
-const APP_TITLE = DEV_BUILD ? "monacori (dev)" : "monacori";
+const APP_NAME = "Monacori";
+const APP_TITLE = DEV_BUILD ? `${APP_NAME} (dev)` : APP_NAME;
 const FLOW_DIR = ".monacori";
 const REVIEW_FILE = "app-review.html";
 const WATCH_INTERVAL_MS = 1000;
@@ -46,12 +48,13 @@ function isLightTheme() {
         return false;
     }
 }
-app.setName("monacori");
+app.setName(APP_NAME);
 // Best-effort re-brand at startup. macOS shows the Dock / Cmd+Tab / menu-bar name from Electron.app's
-// CFBundleName + executable name, which app.setName() CANNOT change — only scripts/patch-electron-name.mjs
-// (run at postinstall) renames them. That postinstall step can be skipped (npm --ignore-scripts) or fail on
-// perms, leaving "Electron" everywhere. Re-run the patch here in a Node context (ELECTRON_RUN_AS_NODE) so a
-// fresh install self-heals; it's idempotent and takes effect on the NEXT launch.
+// bundle directory, LaunchServices id, CFBundleName, and executable name, which app.setName() CANNOT change.
+// scripts/patch-electron-name.mjs (run at postinstall) patches those on disk. That postinstall step can be
+// skipped (npm --ignore-scripts) or fail on perms, leaving "Electron" everywhere. Re-run the patch here in a
+// Node context (ELECTRON_RUN_AS_NODE) so a fresh install self-heals; it's idempotent and takes effect on the
+// NEXT launch.
 if (process.platform === "darwin") {
     try {
         const patchScript = join(dirname(fileURLToPath(import.meta.url)), "..", "scripts", "patch-electron-name.mjs");
@@ -208,32 +211,17 @@ ipcMain.handle("monacori:self-update", (event) => new Promise((resolve) => {
             return;
         }
         resolve({ ok: true });
-        // The global install replaced our on-disk dist, so THIS process is stale. Start the freshly-installed
-        // CLI as a NEW detached process, then exit. If `mo` isn't on the (GUI) app's PATH it errors or exits
-        // non-zero — fall back to app.relaunch() so the user is never left without a restart (the bug: a failed
-        // `mo` spawn under detached/unref went unnoticed and the app just exited without relaunching).
+        // The global install replaced our on-disk dist, so THIS process is stale. Use Electron's native relaunch
+        // path instead of shelling out to `mo`: GUI apps often have a thin PATH, and a detached shell can fail
+        // without a reliable event before our exit timer fires.
         setTimeout(() => {
-            let done = false;
-            const relaunch = () => { if (done)
-                return; done = true; try {
-                app.relaunch();
-            }
-            catch { /* nothing else to try */ } app.exit(0); };
             try {
-                const c = spawn("mo", [], { cwd, detached: true, stdio: "ignore", env: sanitizeTerminalEnv(process.env), shell: true });
-                c.on("error", relaunch);
-                c.on("exit", (exitCode) => { if (exitCode && exitCode !== 0)
-                    relaunch(); });
-                c.unref();
-                setTimeout(() => { if (!done) {
-                    done = true;
-                    app.exit(0);
-                } }, 800); // `mo` launched fine -> hand off and exit
+                relaunchUpdatedApp(app, process.argv, cwd);
             }
-            catch {
-                relaunch();
+            catch (error) {
+                console.error("monacori: update installed, but relaunch failed: " + (error instanceof Error ? error.message : String(error)));
             }
-        }, 600);
+        }, 250);
     });
 }));
 // Integrated terminal: own node-pty sessions in the main process (the sandboxed renderer can't spawn

package/dist/constants.d.ts

@@ -1,5 +1,6 @@
 export declare const FLOW_DIR = ".monacori";
 export declare const GITIGNORE_FILE = ".gitignore";
+export declare const PLAN_FILE = "plan.md";
 export declare const CONFIG_FILE = "config.json";
 export declare const STATE_FILE = "state.md";
 export declare const DECISIONS_FILE = "decisions.md";

package/dist/constants.js

@@ -1,5 +1,8 @@
 export const FLOW_DIR = ".monacori";
 export const GITIGNORE_FILE = ".gitignore";
+// The agent's implementation plan, written under FLOW_DIR. Force-surfaced as a source file so it renders
+// as Markdown, shows in Quick Open, and takes line comments — even though FLOW_DIR is gitignored.
+export const PLAN_FILE = "plan.md";
 export const CONFIG_FILE = "config.json";
 export const STATE_FILE = "state.md";
 export const DECISIONS_FILE = "decisions.md";

package/dist/diff.js

@@ -1,7 +1,7 @@
 import { spawnSync } from "node:child_process";
 import { existsSync, readFileSync, statSync } from "node:fs";
 import { basename, join } from "node:path";
-import { FLOW_DIR, IMAGE_MAX_BYTES, SOURCE_MAX_FILE_BYTES, SOURCE_MAX_FILES, SOURCE_MAX_TOTAL_BYTES } from "./constants.js";
+import { FLOW_DIR, IMAGE_MAX_BYTES, PLAN_FILE, SOURCE_MAX_FILE_BYTES, SOURCE_MAX_FILES, SOURCE_MAX_TOTAL_BYTES } from "./constants.js";
 import { formatBytes, hashText, isLikelyBinary, languageForPath, stripDiffPath } from "./util.js";
 import { git, repoRoot } from "./git.js";
 // File content + signature cache, keyed by path and validated on (mtime, size). Under `watch` the app
@@ -251,6 +251,14 @@ export function collectSourceFiles(diffFiles, rootArg) {
             paths.add(path);
         }
     }
+    // The agent's plan lives under the gitignored FLOW_DIR, so neither `git ls-files --exclude-standard` nor
+    // isSourceCandidate (which excludes FLOW_DIR) ever surfaces it. Force-include it when present so the plan
+    // shows up as a normal source file — rendered as Markdown, searchable in Quick Open, and commentable. The
+    // watch re-runs this every tick, so a plan written after launch appears on the next refresh.
+    const planRel = `${FLOW_DIR}/${PLAN_FILE}`;
+    if (existsSync(join(root, planRel))) {
+        paths.add(planRel);
+    }
     const sourceFiles = [];
     let embeddedFiles = 0;
     let embeddedBytes = 0;

package/dist/i18n.js

@@ -147,7 +147,8 @@ 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 ⌘⇧/ (questions) and ⌘⇧. (change requests). Leave blank to use the default.",
+        "mergePrompts.desc": "Headings prepended to the prompts you send to the agent. The plan contract is prepended to change requests (⌘⇧.) and to the prompt memo. Leave any field blank to use the default.",
+        "mergePrompts.planHeading": "Plan contract (change requests + memo)",
         "mergePrompts.qHeading": "Questions heading",
         "mergePrompts.cHeading": "Change-requests heading",
         "mergePrompts.reset": "Reset to defaults",
@@ -159,8 +160,8 @@ export const MESSAGES = {
         "composer.cancel": "Cancel",
         "composer.hint": "⌘Enter to save, Esc to cancel",
         "composer.delete": "Delete",
-        "comment.kind.q": "❓ Question",
-        "comment.kind.c": "✎ Change request",
+        "comment.kind.q": "Question",
+        "comment.kind.c": "Change request",
         "badge.questions": "question(s)",
         "badge.changeRequests": "change request(s)",
         // Merged comments modal
@@ -182,6 +183,8 @@ export const MESSAGES = {
         // 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.",
+        // Plan contract — prepended to change requests and the prompt memo so every task starts with a small, verifiable plan written to a file.
+        "plan.contract": "Before changing any code, write a short implementation PLAN to `.monacori/plan.md` as Markdown. Break the work into small, independently verifiable steps — each with a one-line check for how you'll confirm it works. Get the plan right first, then implement one step at a time, keeping each step small enough to review on its own.",
     },
     ko: {
         // Tabs (sidebar)
@@ -320,7 +323,8 @@ export const MESSAGES = {
         "kbd.closeTerminal": "터미널 닫기 (포커스 시)",
         // Settings — Merge prompts
         "mergePrompts.title": "병합 프롬프트",
-        "mergePrompts.desc": "⌘⇧/ (질문) 및 ⌘⇧. (변경요청)로 여는 병합 프롬프트 맨 앞에 붙는 머리말입니다. 비워 두면 기본값을 사용합니다.",
+        "mergePrompts.desc": "에이전트에게 보내는 프롬프트 맨 앞에 붙는 머리말입니다. 플랜 계약문은 변경요청(⌘⇧.)과 프롬프트 메모 앞에 붙습니다. 각 칸을 비워 두면 기본값을 사용합니다.",
+        "mergePrompts.planHeading": "플랜 계약문 (변경요청 + 메모)",
         "mergePrompts.qHeading": "질문 머리말",
         "mergePrompts.cHeading": "변경요청 머리말",
         "mergePrompts.reset": "기본값으로 초기화",
@@ -332,8 +336,8 @@ export const MESSAGES = {
         "composer.cancel": "취소",
         "composer.hint": "⌘Enter로 저장, Esc로 취소",
         "composer.delete": "삭제",
-        "comment.kind.q": "❓ 질문",
-        "comment.kind.c": "✎ 변경 요청",
+        "comment.kind.q": "질문",
+        "comment.kind.c": "변경 요청",
         "badge.questions": "개 질문",
         "badge.changeRequests": "개 변경 요청",
         // Merged comments modal
@@ -356,5 +360,7 @@ export const MESSAGES = {
         // Merge-prompt default agent contracts (Korean default for Korean users)
         "mergePrompt.default.q": "다음은 방금 작성한 코드에 대한 질문입니다. 각 질문에 답하면서 의도, 근거, 맥락을 설명하세요. 코드는 변경하지 마세요. 이 단계는 수정에 앞서 이해를 명확히 하기 위한 것입니다.",
         "mergePrompt.default.c": "다음은 방금 작성한 코드에 대한 변경 요청입니다. 각 요청에 대해 인용된 위치의 코드를 수정하여 요구사항을 충족하세요. 변경은 최소한으로 집중해서 하고, 관련 없는 수정은 하지 마세요.",
+        // 플랜 계약문 — 모든 작업이 파일로 작성된 작고 검증 가능한 플랜에서 시작하도록 변경요청과 프롬프트 메모 앞에 붙는다.
+        "plan.contract": "코드를 변경하기 전에, 먼저 `.monacori/plan.md`에 마크다운으로 짧은 구현 플랜을 작성하세요. 작업을 독립적으로 검증 가능한 작은 단계로 쪼개고, 각 단계마다 어떻게 확인할지 한 줄짜리 검증 기준을 적으세요. 플랜이 맞는지 먼저 확정한 뒤 한 번에 한 단계씩 구현하고, 각 단계는 따로 리뷰할 수 있을 만큼 작게 유지하세요.",
     },
 };

package/dist/render.js

@@ -356,7 +356,9 @@ export function renderDiffHtml(input) {
         "</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 ⌘⇧/ (questions) and ⌘⇧. (change requests). Leave blank to use the default.</div>',
+        '<div class="settings-desc" data-i18n="mergePrompts.desc">Headings prepended to the prompts you send to the agent. The plan contract is prepended to change requests (⌘⇧.) and to the prompt memo. Leave any field blank to use the default.</div>',
+        '<label class="settings-label" for="settings-prompt-plan" data-i18n="mergePrompts.planHeading">Plan contract (change requests + memo)</label>',
+        '<textarea id="settings-prompt-plan" class="settings-textarea" rows="5" spellcheck="false"></textarea>',
         '<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/self-update.d.ts

@@ -0,0 +1,8 @@
+export type RelaunchTarget = {
+    relaunch(options?: {
+        args?: string[];
+    }): void;
+    exit(exitCode?: number): void;
+};
+export declare function relaunchArgsForCwd(argv: string[], cwd: string): string[];
+export declare function relaunchUpdatedApp(app: RelaunchTarget, argv: string[], cwd: string): void;

package/dist/self-update.js

@@ -0,0 +1,18 @@
+export function relaunchArgsForCwd(argv, cwd) {
+    const args = argv.slice(1);
+    const cwdIndex = args.indexOf("--cwd");
+    if (cwdIndex >= 0) {
+        if (cwdIndex === args.length - 1)
+            args.push(cwd);
+        else
+            args[cwdIndex + 1] = cwd;
+    }
+    else {
+        args.push("--cwd", cwd);
+    }
+    return args;
+}
+export function relaunchUpdatedApp(app, argv, cwd) {
+    app.relaunch({ args: relaunchArgsForCwd(argv, cwd) });
+    app.exit(0);
+}