halfcycle 0.4.2 → 0.4.3

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "halfcycle",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Halfcycle Method bundle — resolution-stub slash commands, remote method-delivery registration, and governance-hook wiring for a Halfcycle engagement repo. It ships NO worker role files: a project's roles are authored from that project's own recorded decisions at orchestration kickoff (FX-2, W3-F-27).",
   "commands": [
     {

package/bin/bin.bundle.mjs

@@ -17517,11 +17517,16 @@ function deleteMarker(repoRoot, sessionId) {
     }
   }
 }
-var NO_REPO_NOTICE_SUFFIX = ".norepo";
-function firstNoRepoNoticeThisSession(folder, sessionId) {
+var SESSION_NOTICE_SUFFIX = {
+  "no-repository": ".norepo",
+  "credential-rejected": ".credential",
+  "credential-renewed-for-this-run": ".renewed"
+};
+function firstNoticeThisSession(notice, folder, sessionId) {
   if (!sessionId)
     return true;
-  const path = join6(markerDir(), `${MARKER_PREFIX}${repoHash(folder)}-${sessionId}${NO_REPO_NOTICE_SUFFIX}`);
+  const suffix = SESSION_NOTICE_SUFFIX[notice];
+  const path = join6(markerDir(), `${MARKER_PREFIX}${repoHash(folder)}-${sessionId}${suffix}`);
   try {
     writeFileSync3(path, "", { encoding: "utf-8", flag: "wx" });
     return true;
@@ -17529,6 +17534,15 @@ function firstNoRepoNoticeThisSession(folder, sessionId) {
     return err.code !== "EEXIST";
   }
 }
+function warnOnceThisSession(notice, folder, sessionId) {
+  return (message) => {
+    if (firstNoticeThisSession(notice, folder, sessionId))
+      process.stderr.write(message);
+  };
+}
+function firstNoRepoNoticeThisSession(folder, sessionId) {
+  return firstNoticeThisSession("no-repository", folder, sessionId);
+}
 function readDedupe(repoRoot, sessionId) {
   const path = dedupePath(repoRoot, sessionId);
   if (!existsSync4(path))
@@ -17805,7 +17819,8 @@ async function evaluateEdit(reply, readSeat) {
     guardServiceUrl,
     token: guardServiceToken,
     engagementId: guardEngagementId,
-    request: buildEvaluationRequest(guardEngagementId, changeSet, context, seatConfiguration)
+    request: buildEvaluationRequest(guardEngagementId, changeSet, context, seatConfiguration),
+    warn: warnOnceThisSession("credential-renewed-for-this-run", repoRoot, input.session_id)
   });
   const clientResult = evaluation.result;
   if (!clientResult.ok) {
@@ -17820,6 +17835,8 @@ async function evaluateEdit(reply, readSeat) {
       credentialRefused: failure.kind === "credential"
     });
     if (failure.kind === "credential") {
+      if (!firstNoticeThisSession("credential-rejected", repoRoot, input.session_id))
+        return;
       emitCredentialRejected(
         failure.statusCode,
         failure.message,
@@ -17981,7 +17998,8 @@ async function evaluateSession(input, kind, reply, readSeat) {
     guardServiceUrl,
     token: guardServiceToken,
     engagementId: guardEngagementId,
-    request: buildEvaluationRequest(guardEngagementId, changeSet, context, seatConfiguration)
+    request: buildEvaluationRequest(guardEngagementId, changeSet, context, seatConfiguration),
+    warn: warnOnceThisSession("credential-renewed-for-this-run", repoRoot, sessionId)
   });
   const clientResult = evaluation.result;
   if (!clientResult.ok) {
@@ -17997,6 +18015,8 @@ async function evaluateSession(input, kind, reply, readSeat) {
       credentialRefused: failure.kind === "credential"
     });
     if (failure.kind === "credential") {
+      if (!firstNoticeThisSession("credential-rejected", repoRoot, sessionId))
+        return;
       emitCredentialRejected(
         failure.statusCode,
         failure.message,
@@ -18411,7 +18431,7 @@ async function refreshCredentialToken(opts) {
   return { token: refreshed.token };
 }
 var CHECKED_SOURCES = /* @__PURE__ */ new Set(["startup", "resume"]);
-var CONNECTED_SENTENCE = `Halfcycle's sign-in works and its service answered. If Halfcycle's tools are missing, turn on ${MCP_SERVER_KEY} in /mcp; if /mcp does not list it, run "claude mcp reset-project-choices" in this folder and restart Claude Code.`;
+var CONNECTED_SENTENCE = `Halfcycle's sign-in works and its service answered. If its tools are missing, turn on ${MCP_SERVER_KEY} in /mcp; if it is not listed, run "claude mcp reset-project-choices" here and restart Claude Code.`;
 var INITIALIZE_BODY = JSON.stringify({ jsonrpc: "2.0", id: 1, method: "initialize", params: {} });
 function registeredMcpUrl(projectRoot) {
   let parsed;

package/dist/claude-version-probe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-version-probe.d.ts","sourceRoot":"","sources":["../src/claude-version-probe.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAMH;0DAC0D;AAC1D,MAAM,MAAM,iBAAiB,GAAG,CAC9B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE;IACP,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACtD,QAAQ,CAAC,wBAAwB,CAAC,EAAE,OAAO,CAAC;CAC7C,KACE,MAAM,CAAC;AAEZ,MAAM,WAAW,sBAAsB;IACrC,oFAAoF;IACpF,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IACpC,sFAAsF;IACtF,QAAQ,CAAC,IAAI,CAAC,EAAE,iBAAiB,CAAC;CACnC;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,GAAE,sBAA2B,GAAG,MAAM,GAAG,SAAS,CAqB/G;AAMD;kCACkC;AAClC,MAAM,MAAM,mBAAmB,GAAG,QAAQ,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEvE,eAAO,MAAM,wBAAwB,mCAAmC,CAAC;AAEzE,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAK1E,CAAC;AAaF,MAAM,WAAW,uBAAuB;IACtC,iCAAiC;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACjC,sCAAsC;IACtC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IACpC,iGAAiG;IACjG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IAC5C;sDACkD;IAClD,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CAC9C;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,GAAE,uBAA4B,GAAG,mBAAmB,GAAG,SAAS,CAwBhH"}
+{"version":3,"file":"claude-version-probe.d.ts","sourceRoot":"","sources":["../src/claude-version-probe.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAMH;0DAC0D;AAC1D,MAAM,MAAM,iBAAiB,GAAG,CAC9B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE;IACP,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACtD,QAAQ,CAAC,wBAAwB,CAAC,EAAE,OAAO,CAAC;CAC7C,KACE,MAAM,CAAC;AAEZ,MAAM,WAAW,sBAAsB;IACrC,oFAAoF;IACpF,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IACpC,sFAAsF;IACtF,QAAQ,CAAC,IAAI,CAAC,EAAE,iBAAiB,CAAC;CACnC;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,GAAE,sBAA2B,GAAG,MAAM,GAAG,SAAS,CAqB/G;AAMD;kCACkC;AAClC,MAAM,MAAM,mBAAmB,GAAG,QAAQ,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEvE,eAAO,MAAM,wBAAwB,mCAAmC,CAAC;AAEzE,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAK1E,CAAC;AAyBF,MAAM,WAAW,uBAAuB;IACtC,iCAAiC;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACjC,sCAAsC;IACtC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IACpC,iGAAiG;IACjG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IAC5C;sDACkD;IAClD,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CAC9C;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,GAAE,uBAA4B,GAAG,mBAAmB,GAAG,SAAS,CAwBhH"}

package/dist/cli.js

@@ -1942,8 +1942,20 @@ function projectPageUrl(engagementId) {
 }
 
 // dist/merge-settings.js
+function isHalfcycleCommand(hook, halfcycleCommands) {
+  if (typeof hook !== "object" || hook === null)
+    return false;
+  const command = hook.command;
+  return typeof command === "string" && halfcycleCommands.has(command);
+}
 function isHalfcycleEntry(entry, halfcycleCommands) {
-  return entry.hooks.some((h) => halfcycleCommands.has(h.command));
+  return entry.hooks.some((h) => isHalfcycleCommand(h, halfcycleCommands));
+}
+function withoutHalfcycleCommands(entry, halfcycleCommands) {
+  if (!isHalfcycleEntry(entry, halfcycleCommands))
+    return entry;
+  const remaining = entry.hooks.filter((h) => !isHalfcycleCommand(h, halfcycleCommands));
+  return remaining.length > 0 ? { ...entry, hooks: remaining } : null;
 }
 function mergeSettings(existing, generated) {
   const merged = { ...existing };
@@ -1962,7 +1974,7 @@ function mergeSettings(existing, generated) {
   const mergedHooks = {};
   const events = /* @__PURE__ */ new Set([...Object.keys(existingHooks), ...Object.keys(generatedHooks)]);
   for (const event of events) {
-    const developerEntries = (existingHooks[event] ?? []).filter((entry) => !isHalfcycleEntry(entry, halfcycleCommands));
+    const developerEntries = (existingHooks[event] ?? []).flatMap((entry) => withoutHalfcycleCommands(entry, halfcycleCommands) ?? []);
     const halfcycleEntries = generatedHooks[event] ?? [];
     mergedHooks[event] = [...developerEntries, ...halfcycleEntries];
   }
@@ -2130,6 +2142,7 @@ function closedWriteSet() {
     ownedDirs,
     hookCommands: new Set(HALFCYCLE_HOOK_COMMANDS),
     denyRuleSha256: new Set([...DENY_PATTERNS, ...RETIRED_DENY_PATTERNS].map((rule) => sha256Hex(rule))),
+    settingsSchema: SETTINGS_SCHEMA,
     gitignoreLines: /* @__PURE__ */ new Set([GITIGNORE_HEADER, ...REQUIRED_GITIGNORE_ENTRIES, LEGACY_ENV_LOCAL_REL]),
     gitattributesLines: /* @__PURE__ */ new Set([
       GITATTRIBUTES_HEADER,
@@ -2318,6 +2331,8 @@ function copyManifestCommands(manifest, targetRepo, report, draft, writeSet) {
     record(report, outcome, rel);
     if (replacedExisting)
       report.replacedPaths.push(rel);
+    if (outcome === "collided" && recorded !== void 0)
+      report.editedCollidedPaths.push(rel);
     noteFile(draft, targetRepo, rel, outcome);
   }
 }
@@ -2441,6 +2456,7 @@ function settingsParseRefusal(targetRepo, err) {
   }
   return `${file} could not be read as JSON${where} \u2014 fix it and run "npx halfcycle" again.`;
 }
+var SETTINGS_SCHEMA = "https://json.schemastore.org/claude-code-settings.json";
 function generateSettingsJson() {
   const hooks = {};
   for (const { event, matcher, timeout, command } of HALFCYCLE_HOOK_WIRING) {
@@ -2450,7 +2466,7 @@ function generateSettingsJson() {
     });
   }
   const settings = {
-    $schema: "https://json.schemastore.org/claude-code-settings.json",
+    $schema: SETTINGS_SCHEMA,
     permissions: {
       // deny ONLY. See DENY_PATTERNS — an allow list evaporates under bypass mode
       // and is the machine owner's grant to make, not ours.
@@ -2750,19 +2766,27 @@ function adoptBlockUnderHeader(before, header, claimable) {
   let underHeader = false;
   const lines = before.split("\n");
   for (const [i, line] of lines.entries()) {
-    if (line === header) {
-      if (i > 0 && lines[i - 1] === "")
-        claimed.push("");
+    const key = lineKey(line);
+    if (key === header) {
+      if (i > 0 && lineKey(lines[i - 1]) === "")
+        claimed.push(lines[i - 1]);
       claimed.push(line);
       underHeader = true;
-    } else if (line.trim() === "") {
+    } else if (key.trim() === "") {
       underHeader = false;
-    } else if (underHeader && claimable.has(line)) {
+    } else if (underHeader && claimable.has(key)) {
       claimed.push(line);
     }
   }
   return claimed.length > 0 ? claimed.join("\n") + "\n" : "";
 }
+function lineKey(line) {
+  return line.endsWith("\r") ? line.slice(0, -1) : line;
+}
+function lineEndingOf(text) {
+  const at = text.indexOf("\n");
+  return at > 0 && text[at - 1] === "\r" ? "\r\n" : "\n";
+}
 function gitignoreCovers(content) {
   const lines = new Set(content.split("\n").map((l) => l.trim()));
   return REQUIRED_GITIGNORE_ENTRIES.every((entry) => lines.has(entry));
@@ -2781,9 +2805,8 @@ function reconcileGitignore(targetRepo) {
       return "skipped";
     const existingLines = new Set(existing.split("\n").map((l) => l.trim()));
     const toAdd = REQUIRED_GITIGNORE_ENTRIES.filter((entry) => !existingLines.has(entry));
-    const suffix = (existing.endsWith("\n") ? "" : "\n") + `
-${header}
-` + toAdd.join("\n") + "\n";
+    const eol = lineEndingOf(existing);
+    const suffix = (existing.endsWith("\n") ? "" : eol) + eol + [header, ...toAdd].join(eol) + eol;
     writeFileSync5(gitignorePath, existing + suffix, "utf-8");
     return "written";
   } catch {
@@ -2818,8 +2841,9 @@ function reconcileGitattributes(targetRepo) {
     const toAdd = rules.filter((rule) => !present.has(rule));
     if (toAdd.length === 0)
       return "skipped";
-    const separator = existing === "" ? "" : existing.endsWith("\n") ? "\n" : "\n\n";
-    const suffix = separator + [GITATTRIBUTES_HEADER, ...toAdd].join("\n") + "\n";
+    const eol = lineEndingOf(existing);
+    const separator = existing === "" ? "" : existing.endsWith("\n") ? eol : eol + eol;
+    const suffix = separator + [GITATTRIBUTES_HEADER, ...toAdd].join(eol) + eol;
     writeAllowlisted(path, targetRepo, existing + suffix, routed);
     return "written";
   } catch {
@@ -2839,9 +2863,9 @@ function previousPinForEngagement(targetRepoRoot, engagementId) {
 function nonEmpty(value) {
   return typeof value === "string" && value.trim() !== "" ? value : void 0;
 }
-function writeBundlePin(targetRepoRoot, version, engagementId, engagementType, accountId, methodVersion, writtenPaths) {
+function writeBundlePin(targetRepoRoot, version, engagementId, engagementType, createdByAccountId, methodVersion, writtenPaths) {
   const previous = previousPinForEngagement(targetRepoRoot, engagementId);
-  const carried = nonEmpty(accountId) ?? nonEmpty(previous?.accountId);
+  const carried = pinCreatedByAccountId(previous) ?? nonEmpty(createdByAccountId);
   const carriedMethodVersion = nonEmpty(methodVersion) ?? nonEmpty(previous?.methodVersion);
   const installedAt = nonEmpty(previous?.installedAt) ?? (/* @__PURE__ */ new Date()).toISOString();
   const projectPage = projectPageUrl(engagementId);
@@ -2850,7 +2874,7 @@ function writeBundlePin(targetRepoRoot, version, engagementId, engagementType, a
     engagementId,
     engagementType,
     installedAt,
-    ...carried !== void 0 ? { accountId: carried } : {},
+    ...carried !== void 0 ? { createdByAccountId: carried } : {},
     ...carriedMethodVersion !== void 0 ? { methodVersion: carriedMethodVersion } : {},
     ...projectPage !== void 0 ? { projectPage } : {}
   };
@@ -2867,6 +2891,9 @@ function writeCrewRoster(targetRepoRoot, report) {
   const crewPath = join5(targetRepoRoot, CREW_ROSTER_REL);
   return recordOwned(report, crewPath, targetRepoRoot, rendered, CREW_ROSTER_REL);
 }
+function pinCreatedByAccountId(pin) {
+  return nonEmpty(pin?.createdByAccountId) ?? nonEmpty(pin?.accountId);
+}
 function readBundlePin(targetRepoRoot) {
   const pinPath = join5(targetRepoRoot, BUNDLE_PIN_REL);
   if (!existsSync3(pinPath))
@@ -3008,7 +3035,7 @@ function migrateLegacyEnvLocal(targetRepo, stored) {
   }
 }
 async function install(options) {
-  const { targetRepo, engagementId, engagementType, credential, home, accountId } = options;
+  const { targetRepo, engagementId, engagementType, credential, home, createdByAccountId } = options;
   assertEngagementId(engagementId);
   if (!existsSync3(targetRepo)) {
     throw new Error(`[halfcycle] Target repo does not exist: ${targetRepo}`);
@@ -3019,6 +3046,7 @@ async function install(options) {
     skippedPaths: [],
     mergedPaths: [],
     collidedPaths: [],
+    editedCollidedPaths: [],
     replacedPaths: []
   };
   const writeSet = closedWriteSet();
@@ -3146,7 +3174,7 @@ async function install(options) {
     case "absent":
       break;
   }
-  writeBundlePin(targetRepo, manifest.version, engagementId, engagementType, accountId, credential?.methodVersion, report.writtenPaths);
+  writeBundlePin(targetRepo, manifest.version, engagementId, engagementType, createdByAccountId, credential?.methodVersion, report.writtenPaths);
   noteFile(draft, targetRepo, BUNDLE_PIN_REL, "written");
   noteFile(draft, targetRepo, CREW_ROSTER_REL, writeCrewRoster(targetRepo, report));
   const scanResult = runBootstrapScan(targetRepo);
@@ -3166,6 +3194,7 @@ async function install(options) {
     skippedPaths: report.skippedPaths,
     mergedPaths: report.mergedPaths,
     collidedPaths: report.collidedPaths,
+    editedCollidedPaths: report.editedCollidedPaths,
     replacedPaths: report.replacedPaths,
     bootstrapScanRan: scanResult.ran,
     legacyCredentialKept: migration.outcome === "kept" ? { keys: migration.unbacked, missing: migration.missingForAdoption } : null,
@@ -3606,7 +3635,7 @@ async function signIn(serviceUrl, deps = {}) {
       const url = loopbackVerificationUrl(started.verificationUrl, bind.target);
       const attempt = await openBrowser(url, env);
       if (attempt.opened) {
-        write(`[halfcycle] Opened your browser to finish signing in. Code: ${started.userCode}. If a browser did not open, go to: ${url}. This terminal is waiting.
+        write(`[halfcycle] Opened your browser to finish signing in. Code: ${started.userCode}. If a browser did not open, go to: ${started.verificationUrl}. This terminal is waiting.
 `);
         const startedAt = now();
         const redirect = bind.waitForCallback({
@@ -4171,14 +4200,11 @@ async function askAccount(serviceUrl, credential, fetchImpl = fetch) {
 async function describeAccount(serviceUrl, credential, fetchImpl = fetch) {
   return (await askAccount(serviceUrl, credential, fetchImpl)).identity;
 }
-function accountLabel(identity, storedAccountId, verbose2 = false, confirmed = true) {
+function accountLabel(identity, storedAccountId, verbose2 = false) {
   const accountId = identity?.accountId ?? storedAccountId;
   if (identity?.email !== void 0 && identity.email.trim() !== "") {
     return verbose2 && accountId !== void 0 ? `${identity.email} (account ${accountId})` : identity.email;
   }
-  if (!confirmed) {
-    return "the account this project is already set up with \u2014 this run could not reach the Halfcycle service to confirm who that is";
-  }
   if (accountId !== void 0)
     return `account ${accountId} (no email on record for it)`;
   return "the account this credential belongs to, which this service did not name";
@@ -4231,7 +4257,7 @@ function armScript(credential, act, label, plainLabel, home) {
   switch (credential.source) {
     case "browser-handoff":
       return {
-        preamble: `[halfcycle] Signed in as ${label}. This install will ${actClause(act)}.
+        preamble: `[halfcycle] This install will ${actClause(act)}.
 `,
         asks: false,
         noTerminalNote: "",
@@ -4275,7 +4301,7 @@ function armScript(credential, act, label, plainLabel, home) {
         // this is printed in), and where to look for the answer once this output is gone.
         noTerminalNote: `[halfcycle] Nothing here to ask at (no terminal), so this is continuing as that account.
 [halfcycle] To run as a different one, set HALFCYCLE_TOKEN for that account, or remove ${accountStorePath(home)} and run this again with a terminal to sign in.
-[halfcycle] When this install finishes, which account it used is recorded in .halfcycle/bundle.json, so it can be checked after this output is gone.
+[halfcycle] .halfcycle/bundle.json records the account that created this project, so that can be checked after this output is gone.
 `,
         switchOpening: `[halfcycle] Forgetting this machine's saved sign-in and signing you in through your browser.
 `,
@@ -4320,7 +4346,7 @@ async function confirmActingIdentity(serviceUrl, credential, act, deps = {}) {
     write(script.switchOpening);
     const replacement = await switchAccount(serviceUrl, deps);
     const replacementIdentity = await describeAccount(serviceUrl, replacement.credential, deps.fetchImpl);
-    write(`[halfcycle] Signed in as ${ink("keyBold", accountLabel(replacementIdentity, replacement.accountId, deps.verbose === true), colour)}. This install will ${actClause(act)}.
+    write(`[halfcycle] Signed in. This install will ${actClause(act)}.
 `);
     if (script.afterSwitch !== "")
       write(script.afterSwitch);
@@ -4629,9 +4655,9 @@ var UPGRADE_COMMANDS = {
 };
 var INSTALL_METHOD_RULES = [
   { method: "winget", pattern: /[\\/]WinGet[\\/]/i },
-  { method: "npm", pattern: /node_modules[\\/]/i },
+  { method: "npm", pattern: /node_modules[\\/]|[\\/]npm[\\/]claude(\.cmd|\.exe)?$/i },
   { method: "brew", pattern: /[\\/](Cellar|Caskroom|linuxbrew|homebrew)[\\/]/i },
-  { method: "native", pattern: /[\\/]\.local[\\/]share[\\/]claude(-code)?[\\/]/i }
+  { method: "native", pattern: /[\\/]\.local[\\/](share[\\/]claude(-code)?|bin)[\\/]/i }
 ];
 function probeClaudeCodeInstallMethod(deps = {}) {
   const env = deps.env ?? process.env;
@@ -5836,9 +5862,6 @@ function ourHookEntries(value, commands) {
   }
   return found;
 }
-function isOurHook(hook, commands) {
-  return isPlainObject2(hook) && typeof hook["command"] === "string" && commands.has(hook["command"]);
-}
 function ourMcpServers(value) {
   const servers = value["mcpServers"];
   return isPlainObject2(servers) && MCP_SERVER_KEY in servers ? servers : null;
@@ -5867,9 +5890,9 @@ function unmergeSettings(value, rec, writeSet) {
           continue;
         }
         touched = true;
-        const remaining = entry.hooks.filter((h) => !isOurHook(h, commands));
-        if (remaining.length > 0)
-          next.push({ ...entry, hooks: remaining });
+        const remaining = withoutHalfcycleCommands(entry, commands);
+        if (remaining !== null)
+          next.push(remaining);
       }
       if (touched)
         changed = true;
@@ -5908,16 +5931,12 @@ function unmergeSettings(value, rec, writeSet) {
       changed = true;
     }
   }
-  if ("schemaBefore" in rec) {
-    if (rec.schemaBefore === null) {
-      if ("$schema" in value) {
-        delete value["$schema"];
-        changed = true;
-      }
-    } else if (value["$schema"] !== rec.schemaBefore) {
+  if ("schemaBefore" in rec && value["$schema"] === writeSet.settingsSchema) {
+    if (rec.schemaBefore === null)
+      delete value["$schema"];
+    else
       value["$schema"] = rec.schemaBefore;
-      changed = true;
-    }
+    changed = true;
   }
   return { changed, refused };
 }
@@ -5957,36 +5976,70 @@ function gitattributesRules(writeSet) {
 function trimAppendedBlocks(text, rec, rules) {
   const keptLines = [];
   const foreignLines = [];
+  const eol = lineEndingOf(text);
   let current = text;
   for (const block of [...rec.appended].reverse()) {
-    const lines = block.split("\n").filter((line) => line !== "");
+    const lines = block.split("\n").map(lineKey).filter((line) => line !== "");
     const foreign = lines.filter((line) => !rules.ourLines.has(line));
     foreignLines.push(...foreign);
     const ours = lines.filter((line) => rules.ourLines.has(line));
     const entries = ours.filter((line) => line !== rules.header);
     const kept = entries.filter((line) => rules.keepLine(line));
     keptLines.push(...kept);
-    if (kept.length === 0 && foreign.length === 0 && current.includes(block)) {
-      const at = current.lastIndexOf(block);
-      const head = current.slice(0, at);
-      const tail = current.slice(at + block.length);
-      current = head + (head !== "" && tail !== "" && !head.endsWith("\n") ? "\n" : "") + tail;
+    const found = kept.length === 0 && foreign.length === 0 ? lastOccurrence(current, block) : null;
+    if (found !== null) {
+      const head = current.slice(0, found.start);
+      const tail = current.slice(found.end);
+      current = head + (head !== "" && tail !== "" && !head.endsWith("\n") ? eol : "") + tail;
       continue;
     }
-    const separated = block.startsWith("\n") || block.includes("\n\n");
+    const flat = withoutLineEndCr(block).text;
+    const separated = flat.startsWith("\n") || flat.includes("\n\n");
     const removable = ours.filter((line) => line === rules.header ? kept.length === 0 && foreign.length === 0 : !kept.includes(line));
     for (const line of removable) {
       const fileLines = current.split("\n");
-      const at = fileLines.lastIndexOf(line);
+      const keys = fileLines.map(lineKey);
+      const at = keys.lastIndexOf(line);
       if (at < 0)
         continue;
-      const withSeparator = line === rules.header && separated && at > 0 && fileLines[at - 1] === "";
+      const withSeparator = line === rules.header && separated && at > 0 && keys[at - 1] === "";
       fileLines.splice(withSeparator ? at - 1 : at, withSeparator ? 2 : 1);
       current = fileLines.join("\n");
     }
   }
   return { text: current, keptLines, foreignLines };
 }
+function withoutLineEndCr(text) {
+  let out = "";
+  const at = [];
+  let offset = 0;
+  const lines = text.split("\n");
+  for (const [i, line] of lines.entries()) {
+    const key = lineKey(line);
+    for (let j = 0; j < key.length; j++)
+      at.push(offset + j);
+    out += key;
+    offset += line.length;
+    if (i < lines.length - 1) {
+      out += "\n";
+      at.push(offset);
+      offset += 1;
+    }
+  }
+  return { text: out, at };
+}
+function lastOccurrence(text, block) {
+  const needle = withoutLineEndCr(block).text;
+  if (needle === "")
+    return null;
+  const hay = withoutLineEndCr(text);
+  const found = hay.text.lastIndexOf(needle);
+  if (found < 0)
+    return null;
+  const first = hay.at[found];
+  const start = first > 0 && text[first] === "\n" && text[first - 1] === "\r" ? first - 1 : first;
+  return { start, end: hay.at[found + needle.length - 1] + 1 };
+}
 function coveredPathExists(targetRepo, line) {
   const path = line.trim().replace(/^\//, "").replace(/\/$/, "");
   return path !== "" && lexists(join10(targetRepo, path));
@@ -6555,6 +6608,14 @@ ${USAGE}`);
       process.exit(1);
       return;
     }
+    const onInstallSigint = () => {
+      const kept = readFolderId(targetRepo) !== void 0 ? `${KEPT_FOLDER_ID_LINE}
+` : "";
+      process.stderr.write(`halfcycle: interrupted.
+${kept}`);
+      process.exit(1);
+    };
+    process.once("SIGINT", onInstallSigint);
     try {
       const controlOrigin = resolveControlOrigin(process.env);
       const serviceUrl = controlOrigin.origin;
@@ -6575,13 +6636,14 @@ ${USAGE}`);
       let credential;
       let notThisAccountMessage;
       let actingAccountId;
+      let createdByAccountId;
       let actingIdentity;
       let foundLine = "";
       let reusedWithoutFreshAnswer = false;
       if (reusable !== void 0 && pinned !== null) {
         engagementId = pinned.engagementId;
         credential = reusable;
-        actingAccountId = readBundlePin(targetRepo)?.accountId;
+        actingAccountId = heldAnswer?.identity?.accountId;
         foundLine = `already set up here \u2014 reusing engagement ${shortId(pinned.engagementId)}`;
         reusedWithoutFreshAnswer = true;
         if (verbose) {
@@ -6631,6 +6693,7 @@ ${USAGE}`);
 `);
         }
       } else {
+        const hadUsableIdBeforeThisRun = readFolderId(targetRepo) !== void 0;
         const projectId = runPreCreateChecks(targetRepo);
         const created = await createOwnedEngagement(serviceUrl, targetRepo, projectId, { assumeYes, verbose });
         if (isProjectOwnedElsewhere(created)) {
@@ -6642,6 +6705,7 @@ ${PROJECT_RESET_LINE}
         }
         engagementId = created.engagementId;
         actingAccountId = created.actingAccountId;
+        createdByAccountId = created.actingAccountId;
         actingIdentity = created.actingIdentity;
         credential = {
           serviceUrl,
@@ -6661,7 +6725,7 @@ ${PROJECT_RESET_LINE}
           consoleUrl: created.consoleUrl,
           methodVersion: created.methodVersion
         };
-        foundLine = `no Halfcycle project here yet \u2014 creating one (${shortId(created.engagementId)})`;
+        foundLine = hadUsableIdBeforeThisRun ? `picking up this folder's project (${shortId(created.engagementId)})` : `no Halfcycle project here yet \u2014 creating one (${shortId(created.engagementId)})`;
         if (verbose) {
           process.stdout.write(`[halfcycle] Created engagement ${created.engagementId}
 `);
@@ -6672,7 +6736,7 @@ ${PROJECT_RESET_LINE}
         engagementId,
         engagementType: engagementTypeRaw,
         credential,
-        accountId: actingAccountId
+        createdByAccountId
       });
       if (verbose) {
         process.stdout.write(`[halfcycle] Installed v${result.version} into ${targetRepo}
@@ -6688,8 +6752,14 @@ ${PROJECT_RESET_LINE}
 `);
         }
       }
-      if (result.collidedPaths.length > 0) {
-        process.stdout.write(`[halfcycle] Collided (a name you already use \u2014 NOT overwritten): ${result.collidedPaths.join(", ")}
+      const edited = new Set(result.editedCollidedPaths);
+      const trueCollisions = result.collidedPaths.filter((path) => !edited.has(path));
+      if (result.editedCollidedPaths.length > 0) {
+        process.stdout.write(`[halfcycle] Kept (your edited copy of an older Halfcycle file \u2014 NOT overwritten): ${result.editedCollidedPaths.join(", ")}
+`);
+      }
+      if (trueCollisions.length > 0) {
+        process.stdout.write(`[halfcycle] Collided (a name you already use \u2014 NOT overwritten): ${trueCollisions.join(", ")}
 `);
       }
       if (result.replacedPaths.length > 0) {
@@ -6744,8 +6814,10 @@ ${PROJECT_RESET_LINE}
       const identity = actingIdentity ?? heldAnswer?.identity ?? (credential && heldAnswer === void 0 ? await describeAccount(credential.serviceUrl, credential.token) : void 0);
       const written = result.writtenPaths.length;
       const merged = result.mergedPaths.length;
-      process.stdout.write(`[halfcycle] Signed in as ${accountLabel(identity, actingAccountId, verbose, controlOriginConfirmed)}
+      if (identity !== void 0) {
+        process.stdout.write(`[halfcycle] Signed in as ${accountLabel(identity, actingAccountId, verbose)}
 `);
+      }
       process.stdout.write(`[halfcycle] Found: ${foundLine}
 `);
       process.stdout.write(`[halfcycle] Set up: ${written} file${written === 1 ? "" : "s"} written${merged > 0 ? ` (${merged} merged)` : ""}, ${credential ? "guards armed on every edit" : "not checked \u2014 this copy is not this account\u2019s project"}
@@ -6757,7 +6829,7 @@ ${PROJECT_RESET_LINE}
         process.stdout.write(`[halfcycle] Commit the files Halfcycle set up here, including ${BUNDLE_PIN_REL} and ${PROJECT_IDENTITY_REL}, so every copy of this project joins it and runs the same checks.
 `);
       } else if (credential) {
-        process.stdout.write(process.platform !== "win32" && !gitIsInstalled() ? `[halfcycle] Halfcycle needs Git, and it is not installed on this machine \u2014 get it from https://git-scm.com/downloads, then run "git init" here to get checks on every edit.
+        process.stdout.write(process.platform !== "win32" && !gitIsInstalled() ? `[halfcycle] Halfcycle needs Git, and it is not installed on this machine \u2014 get it from https://git-scm.com/downloads to get checks on every edit.
 ` : `[halfcycle] This folder is not a git repository. Halfcycle's checks compare against your git history, so run "git init" here to get checks on every edit.
 `);
       }