cleargate 0.11.3 → 0.11.4

package/dist/cli.js

@@ -21,7 +21,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "cleargate",
-  version: "0.11.3",
+  version: "0.11.4",
   private: false,
   type: "module",
   description: "Planning framework for Claude Code agents \u2014 sprint/epic/story protocol, five-role agent team (architect/developer/qa/devops/reporter), Karpathy-style awareness wiki.",
@@ -2430,6 +2430,61 @@ function resolveScaffoldRoot(opts) {
   };
 }
 
+// src/lib/session-load-delta.ts
+function canonicalize(value) {
+  if (value === null || typeof value !== "object") {
+    return JSON.stringify(value);
+  }
+  if (Array.isArray(value)) {
+    return "[" + value.map(canonicalize).join(",") + "]";
+  }
+  const obj = value;
+  const sortedKeys = Object.keys(obj).sort();
+  const pairs = sortedKeys.map((k) => JSON.stringify(k) + ":" + canonicalize(obj[k]));
+  return "{" + pairs.join(",") + "}";
+}
+var HOOK_EVENTS = ["PreToolUse", "PostToolUse", "SessionStart", "SubagentStop"];
+function extractSettingsHooksBlock(settings) {
+  const hooks = settings["hooks"] ?? {};
+  const extracted = {};
+  for (const event of HOOK_EVENTS) {
+    if (Object.prototype.hasOwnProperty.call(hooks, event)) {
+      extracted[event] = hooks[event];
+    }
+  }
+  return extracted;
+}
+function extractMcpCleargateEntry(mcp2) {
+  const servers = mcp2["mcpServers"] ?? {};
+  return servers["cleargate"] ?? null;
+}
+function extractSessionLoadDelta(filePath, oldContent, newContent) {
+  const normalized = filePath.replace(/\\/g, "/");
+  if (normalized === ".claude/settings.json") {
+    try {
+      const oldSettings = JSON.parse(oldContent);
+      const newSettings = JSON.parse(newContent);
+      const oldHooks = extractSettingsHooksBlock(oldSettings);
+      const newHooks = extractSettingsHooksBlock(newSettings);
+      return canonicalize(oldHooks) !== canonicalize(newHooks);
+    } catch {
+      return true;
+    }
+  }
+  if (normalized === ".mcp.json") {
+    try {
+      const oldMcp = JSON.parse(oldContent);
+      const newMcp = JSON.parse(newContent);
+      const oldEntry = extractMcpCleargateEntry(oldMcp);
+      const newEntry = extractMcpCleargateEntry(newMcp);
+      return canonicalize(oldEntry) !== canonicalize(newEntry);
+    } catch {
+      return true;
+    }
+  }
+  return true;
+}
+
 // src/commands/init.ts
 var HOOK_ADDITION = {
   hooks: {
@@ -2605,10 +2660,17 @@ async function initHandler(opts = {}) {
     }
   }
   const mergedSettings = mergeSettings(existingSettings, HOOK_ADDITION);
+  const mergedSettingsContent = JSON.stringify(mergedSettings, null, 2) + "\n";
+  const existingSettingsContent = existingSettings !== null ? JSON.stringify(existingSettings, null, 2) + "\n" : "{}";
   fs15.mkdirSync(path15.dirname(settingsPath), { recursive: true });
-  writeAtomic(settingsPath, JSON.stringify(mergedSettings, null, 2) + "\n");
-  stdout(`[cleargate init] Updated .claude/settings.json: merged PostToolUse hook \u2014 restart Claude Code if already open.
+  writeAtomic(settingsPath, mergedSettingsContent);
+  if (extractSessionLoadDelta(".claude/settings.json", existingSettingsContent, mergedSettingsContent)) {
+    stdout(`[cleargate init] Updated .claude/settings.json: merged PostToolUse hook \u2014 restart Claude Code if already open.
+`);
+  } else {
+    stdout(`[cleargate init] .claude/settings.json unchanged (hooks block already current)
 `);
+  }
   const claudeMdPath = path15.join(cwd, "CLAUDE.md");
   const claudeMdSrcPath = path15.join(payloadDir, "CLAUDE.md");
   let claudeMdBlock;
@@ -7775,7 +7837,16 @@ function removeClearGateHooks(settings) {
 // src/lib/merge-ui.ts
 import { createPatch } from "diff";
 function renderInlineDiff(ours, theirs, filePath) {
-  return createPatch(filePath, ours, theirs, "installed", "upstream");
+  const patch = createPatch(filePath, ours, theirs, "installed", "upstream");
+  const hasHunkLines = patch.split("\n").filter((l) => l.startsWith("+") || l.startsWith("-")).filter((l) => !l.startsWith("+++") && !l.startsWith("---")).length > 0;
+  if (!hasHunkLines) {
+    const ourBytes = Buffer.byteLength(ours, "utf-8");
+    const theirBytes = Buffer.byteLength(theirs, "utf-8");
+    const byteNote = ourBytes !== theirBytes ? `${Math.abs(theirBytes - ourBytes)} bytes changed` : "same byte count";
+    return patch + `(whitespace/EOL-only differences \u2014 ${byteNote})
+`;
+  }
+  return patch;
 }
 async function promptMergeChoice(opts) {
   const { path: filePath, state: state2, ours, theirs } = opts;
@@ -8070,7 +8141,15 @@ async function upgradeHandler(flags, cli) {
     let count = 0;
     for (const item of workItems) {
       const state2 = classify(item.entry.sha256, item.installSha, item.currentSha, item.entry.tier);
-      stdout(`[dry-run] ${item.entry.path}  action=${item.action}  state=${state2}`);
+      const projectedPostSha = item.entry.sha256;
+      const projectedPostState = classify(
+        item.entry.sha256,
+        item.entry.sha256,
+        projectedPostSha,
+        item.entry.tier
+      );
+      const stateLabel = state2 !== projectedPostState ? `state=${state2} \u2192 ${projectedPostState}` : `state=${state2}`;
+      stdout(`[dry-run] ${item.entry.path}  action=${item.action}  ${stateLabel}`);
       count++;
     }
     stdout(`[dry-run] ${count} files planned. No changes made.`);
@@ -8082,6 +8161,15 @@ async function upgradeHandler(flags, cli) {
   const sessionRestartFiles = [];
   for (const item of workItems) {
     const { entry, currentSha, installSha, action } = item;
+    let preMutationContent = null;
+    if (SESSION_LOAD_PATHS.has(entry.path)) {
+      const targetPath = path36.join(cwd, entry.path);
+      try {
+        preMutationContent = await fsp.readFile(targetPath, "utf-8");
+      } catch {
+        preMutationContent = "";
+      }
+    }
     switch (action) {
       case "skip": {
         stdout(`[skip] ${entry.path}  policy=${entry.overwrite_policy}`);
@@ -8112,8 +8200,17 @@ async function upgradeHandler(flags, cli) {
       current_sha: postSha,
       package_sha: entry.sha256
     };
-    if (SESSION_LOAD_PATHS.has(entry.path) && postSha !== currentSha) {
-      sessionRestartFiles.push(entry.path);
+    if (SESSION_LOAD_PATHS.has(entry.path) && preMutationContent !== null) {
+      const targetPath = path36.join(cwd, entry.path);
+      let postMutationContent;
+      try {
+        postMutationContent = await fsp.readFile(targetPath, "utf-8");
+      } catch {
+        postMutationContent = "";
+      }
+      if (extractSessionLoadDelta(entry.path, preMutationContent, postMutationContent)) {
+        sessionRestartFiles.push(entry.path);
+      }
     }
   }
   await writeDriftState(cwd, driftMap, { lastRefreshed: now.toISOString() });