halfcycle 0.4.1 → 0.4.3

package/dist/cli.js

@@ -1566,6 +1566,14 @@ function readRootCommit(targetRepoRoot) {
 function isGitWorkTree(targetRepoRoot) {
   return git(targetRepoRoot, ["rev-parse", "--is-inside-work-tree"]) === "true";
 }
+function gitIsInstalled() {
+  try {
+    execFileSync("git", ["--version"], { stdio: "ignore", env: gitEnvForNamedRepo() });
+    return true;
+  } catch {
+    return false;
+  }
+}
 function readRemote(targetRepoRoot) {
   return git(targetRepoRoot, ["remote", "get-url", "origin"]);
 }
@@ -1934,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 };
@@ -1954,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];
   }
@@ -2122,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,
@@ -2143,6 +2164,11 @@ function sha256OfWhatThisVersionWrites(commands) {
   fromFile(CAPTURED_INDEX_REL, capturedIndexScaffold());
   return out;
 }
+function bytesAreOurs(path, bytes, recorded, writeSet) {
+  const hash = sha256Hex(bytes);
+  const recordedHash = recorded !== void 0 && "sha256" in recorded ? recorded.sha256 : void 0;
+  return hash === recordedHash || hash === writeSet.generatedSha256.get(path);
+}
 function readPreviousManifest(targetRepo) {
   try {
     return parseManifest(readFileSync5(join5(targetRepo, INSTALL_MANIFEST_REL), "utf-8"));
@@ -2291,7 +2317,7 @@ function readPluginManifest() {
   const raw = readFileSync5(manifestPath, "utf-8");
   return JSON.parse(raw);
 }
-function copyManifestCommands(manifest, targetRepo, report, draft) {
+function copyManifestCommands(manifest, targetRepo, report, draft, writeSet) {
   for (const cmd of manifest.commands ?? []) {
     const srcFile = join5(BUNDLE_ROOT, ".claude-plugin", cmd.path);
     if (!existsSync3(srcFile)) {
@@ -2300,8 +2326,13 @@ function copyManifestCommands(manifest, targetRepo, report, draft) {
     const rel = commandStubRel(cmd.name);
     const destFile = join5(targetRepo, rel);
     const content = readFileSync5(srcFile, "utf-8");
-    const outcome = writeCollisionSafe(destFile, targetRepo, content);
+    const recorded = draft.files.get(rel);
+    const { outcome, replacedExisting } = writeCollisionSafe(destFile, targetRepo, content, (current) => bytesAreOurs(rel, current, recorded, 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);
   }
 }
@@ -2316,18 +2347,23 @@ function writeAllowlisted(targetAbsPath, targetRepoRoot, content, writtenPaths)
   writeFileSync5(targetAbsPath, content, "utf-8");
   writtenPaths.push(rel);
 }
-function writeCollisionSafe(targetAbsPath, targetRepoRoot, content) {
+function writeCollisionSafe(targetAbsPath, targetRepoRoot, content, isOurs) {
   const rel = relative(targetRepoRoot, targetAbsPath).replace(/\\/g, "/");
   if (!isAllowlisted(rel)) {
     throw new Error(`[halfcycle] Write-allowlist violation: attempted to write "${rel}". Only the method surface and scaffolding paths are writable.`);
   }
+  let replacedExisting = false;
   if (existsSync3(targetAbsPath)) {
-    const current = readFileSync5(targetAbsPath, "utf-8");
-    return current === content ? "skipped" : "collided";
+    const current = readFileSync5(targetAbsPath);
+    if (current.toString("utf-8") === content)
+      return { outcome: "skipped", replacedExisting: false };
+    if (!isOurs(current))
+      return { outcome: "collided", replacedExisting: false };
+    replacedExisting = true;
   }
   mkdirSync5(dirname3(targetAbsPath), { recursive: true });
   writeFileSync5(targetAbsPath, content, "utf-8");
-  return "written";
+  return { outcome: "written", replacedExisting };
 }
 var INSTALLER_OWNED_DIR = ".halfcycle/";
 function writeOwned(targetAbsPath, targetRepoRoot, content) {
@@ -2420,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) {
@@ -2429,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.
@@ -2729,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));
@@ -2760,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 {
@@ -2797,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 {
@@ -2818,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);
@@ -2829,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 } : {}
   };
@@ -2846,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))
@@ -2987,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}`);
@@ -2998,12 +3046,13 @@ async function install(options) {
     skippedPaths: [],
     mergedPaths: [],
     collidedPaths: [],
+    editedCollidedPaths: [],
     replacedPaths: []
   };
   const writeSet = closedWriteSet();
   const draft = startManifest(readPreviousManifest(targetRepo), (path) => writeSet.files.has(path), (path) => writeSet.dirs.has(path));
   const dirsBefore = new Set([...writeSet.dirs].filter((dir) => existsSync3(join5(targetRepo, dir))));
-  copyManifestCommands(manifest, targetRepo, report, draft);
+  copyManifestCommands(manifest, targetRepo, report, draft, writeSet);
   const vendoredBinSrc = resolveVendoredBinary();
   const vendoredBinDest = join5(targetRepo, ".halfcycle", "bin", "bin.bundle.mjs");
   const vendoredOutcome = recordOwned(report, vendoredBinDest, targetRepo, readFileSync5(vendoredBinSrc, "utf-8"), VENDORED_BIN_REL);
@@ -3125,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);
@@ -3145,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,
@@ -3329,8 +3379,8 @@ var SignInRefused = class extends Error {
   }
 };
 var SIGN_IN_TIMED_OUT = "timed-out";
-var SIGN_IN_TIMEOUT_MESSAGE = "Sign-in timed out: the Halfcycle service stopped answering while this terminal was waiting for the browser. Nothing was created. Check your connection and run the command again.";
-var SIGN_IN_NON_INTERACTIVE_MESSAGE = "Halfcycle needs a signed-in account and this looks like a non-interactive run (CI is set), so there is no browser to sign in with. Set HALFCYCLE_TOKEN in the environment to a Halfcycle credential and run this again. Nothing was created.";
+var SIGN_IN_TIMEOUT_MESSAGE = "Sign-in timed out: the Halfcycle service stopped answering while this terminal was waiting for the browser. Check your connection and run the command again.";
+var SIGN_IN_NON_INTERACTIVE_MESSAGE = "Halfcycle needs a signed-in account and this looks like a non-interactive run (CI is set), so there is no browser to sign in with. Set HALFCYCLE_TOKEN in the environment to a Halfcycle credential and run this again.";
 var DEADLINE_SLACK_INTERVALS = 1;
 var STILL_WAITING_MS = 15e3;
 var DEFAULT_SIGN_IN_REASON = "set up this project";
@@ -3425,6 +3475,9 @@ function isNonInteractive(env = process.env) {
   const ci = (env["CI"] ?? "").trim().toLowerCase();
   return ci !== "" && ci !== "0" && ci !== "false";
 }
+function isInteractiveRun(env = process.env) {
+  return process.stdin.isTTY === true && !isNonInteractive(env);
+}
 async function startDeviceAuth(serviceUrl) {
   const url = `${serviceUrl.replace(/\/+$/, "")}/auth/device/start`;
   let res;
@@ -3435,16 +3488,16 @@ async function startDeviceAuth(serviceUrl) {
       body: "{}"
     });
   } catch (err) {
-    throw new SignInRefused(SIGN_IN_TIMED_OUT, `Could not reach the Halfcycle service at ${url} to start a sign-in: ${err instanceof Error ? err.message : String(err)}. Nothing was created.`);
+    throw new SignInRefused(SIGN_IN_TIMED_OUT, `Could not reach the Halfcycle service at ${url} to start a sign-in: ${err instanceof Error ? err.message : String(err)}.`);
   }
   const body = await res.json().catch(() => null);
   if (res.status !== 201) {
     const refusal = tryRefusal(body);
-    throw new SignInRefused(refusal?.status ?? String(res.status), refusal?.message ?? `Sign-in could not be started: ${url} answered ${res.status}. Nothing was created.`);
+    throw new SignInRefused(refusal?.status ?? String(res.status), refusal?.message ?? `Sign-in could not be started: ${url} answered ${res.status}.`);
   }
   const parsed = deviceAuthStartResponseSchema.safeParse(body);
   if (!parsed.success) {
-    throw new SignInRefused(SIGN_IN_TIMED_OUT, `The Halfcycle service at ${url} answered a sign-in start this client cannot read. Either that service is older than this installer, or the address is not a Halfcycle service. Nothing was created.`);
+    throw new SignInRefused(SIGN_IN_TIMED_OUT, `The Halfcycle service at ${url} answered a sign-in start this client cannot read. Either that service is older than this installer, or the address is not a Halfcycle service.`);
   }
   return parsed.data;
 }
@@ -3582,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({
@@ -3709,7 +3762,7 @@ async function createEngagementForProject(baseUrl, projectId, credential, derive
   const body = { derivedName };
   return requestEngagementValues("PUT", `${baseUrl.replace(/\/+$/, "")}/engagements/by-project/${encodeURIComponent(projectId)}`, body, credential, {
     action: "Project setup",
-    nothingHappened: "This folder was not set up",
+    nothingHappened: "Halfcycle did not finish setting up this folder",
     route: "PUT /engagements/by-project/:projectId",
     // FALSE on this call, and only this one: the folder's id is already on
     // disk by the time this request is sent. See CallShape.alsoNothingWritten.
@@ -4147,21 +4200,15 @@ 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";
 }
-function isInteractiveRun(env = process.env) {
-  return process.stdin.isTTY === true && !isNonInteractive(env);
-}
 function onlyDate(iso) {
   if (iso === void 0)
     return void 0;
@@ -4210,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: "",
@@ -4232,7 +4279,7 @@ function armScript(credential, act, label, plainLabel, home) {
         noTerminalNote: "",
         switchOpening: `[halfcycle] Signing you in through your browser \u2014 this install will use that account instead.
 `,
-        stopRemedy: `Stopped before anything was created \u2014 nothing was created and nothing was written. HALFCYCLE_TOKEN in this environment is the credential for ${plainLabel}, and it takes precedence over any saved sign-in \u2014 so unset it, or set it to your own account's credential, before running this again.`,
+        stopRemedy: `Stopped before anything was set up. HALFCYCLE_TOKEN in this environment is the credential for ${plainLabel}, and it takes precedence over any saved sign-in \u2014 so unset it, or set it to your own account's credential, before running this again.`,
         // The switch is real for THIS run (the new credential is what gets used) and it
         // does not persist: `obtainCredential` reads the variable first, so the next run
         // is the same variable again. Said here rather than discovered tomorrow.
@@ -4254,11 +4301,11 @@ 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.
 `,
-        stopRemedy: `Stopped before anything was created \u2014 nothing was created and nothing was written. This machine's saved sign-in is for ${plainLabel}. Run this again and answer "s" to sign in as a different account, or remove ${accountStorePath(home)} to be asked for a sign-in next time.`,
+        stopRemedy: `Stopped before anything was set up. This machine's saved sign-in is for ${plainLabel}. Run this again and answer "s" to sign in as a different account, or remove ${accountStorePath(home)} to be asked for a sign-in next time.`,
         afterSwitch: ""
       };
     }
@@ -4299,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);
@@ -4415,6 +4462,7 @@ async function joinPinnedEngagement(serviceUrl, engagementId, targetRepo, deps =
 import { spawnSync } from "node:child_process";
 import { existsSync as existsSync4, readFileSync as readFileSync6, realpathSync } from "node:fs";
 import { delimiter, dirname as dirname4, join as join6 } from "node:path";
+var KEPT_FOLDER_ID_LINE = 'Nothing on the Halfcycle service needs undoing, and this folder keeps its project id, so running "npx halfcycle" again picks up where it left off.';
 var PreCreateRefused = class extends Error {
   constructor(message) {
     super(message);
@@ -4497,18 +4545,22 @@ function claimFolderId(targetRepo) {
   } catch {
     throw new PreCreateRefused(`cannot write to ${targetRepo} \u2014 run "npx halfcycle" in a folder you can write to.`);
   }
-  const file = join6(targetRepo, PROJECT_IDENTITY_REL);
+  const folderId = readFolderId(targetRepo);
+  if (folderId === void 0) {
+    throw new PreCreateRefused(`${join6(targetRepo, PROJECT_IDENTITY_REL)} could not be read as a Halfcycle project file \u2014 delete the .halfcycle folder in ${targetRepo} and run "npx halfcycle" again to start a new project here.`);
+  }
+  return folderId;
+}
+function readFolderId(targetRepo) {
   let folderId;
   try {
-    folderId = JSON.parse(readFileSync6(file, "utf-8"))?.projectId;
+    const text = readFileSync6(join6(targetRepo, PROJECT_IDENTITY_REL), "utf-8");
+    folderId = JSON.parse(text)?.projectId;
   } catch {
-    folderId = void 0;
+    return void 0;
   }
   const parsed = projectIdSchema.safeParse(folderId);
-  if (!parsed.success) {
-    throw new PreCreateRefused(`${file} could not be read as a Halfcycle project file \u2014 delete the .halfcycle folder in ${targetRepo} and run "npx halfcycle" again to start a new project here.`);
-  }
-  return parsed.data;
+  return parsed.success ? parsed.data : void 0;
 }
 function checkSettingsParse(targetRepo) {
   try {
@@ -4603,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;
@@ -5810,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;
@@ -5841,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;
@@ -5882,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 };
 }
@@ -5931,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));
@@ -6111,16 +6190,15 @@ function removeInstalledFile(targetRepo, path, entry, writeSet, lists, name) {
     return;
   }
   if (!writeSet.ownedDirs.has(path.slice(0, path.lastIndexOf("/")))) {
-    let hash;
+    let bytes;
     try {
-      hash = sha256Hex(readFileSync9(abs));
+      bytes = readFileSync9(abs);
     } catch {
       name(lists.failed, path, path);
       return;
     }
-    const recordedHash = entry !== void 0 && "sha256" in entry ? entry.sha256 : void 0;
-    if (hash !== recordedHash && hash !== writeSet.generatedSha256.get(path)) {
-      name(recordedHash !== void 0 ? lists.kept : lists.leftAlone, path, path);
+    if (!bytesAreOurs(path, bytes, entry, writeSet)) {
+      name(entry !== void 0 && "sha256" in entry ? lists.kept : lists.leftAlone, path, path);
       return;
     }
   }
@@ -6530,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;
@@ -6550,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) {
@@ -6606,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)) {
@@ -6617,6 +6705,7 @@ ${PROJECT_RESET_LINE}
         }
         engagementId = created.engagementId;
         actingAccountId = created.actingAccountId;
+        createdByAccountId = created.actingAccountId;
         actingIdentity = created.actingIdentity;
         credential = {
           serviceUrl,
@@ -6636,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}
 `);
@@ -6647,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}
@@ -6663,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) {
@@ -6719,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"}
@@ -6732,7 +6829,8 @@ ${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(`[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.
+        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.
 `);
       }
       if (credential) {
@@ -6759,22 +6857,23 @@ ${PROJECT_RESET_LINE}
 `);
       process.exit(0);
     } catch (err) {
-      if (err instanceof SignInRefused || err instanceof PreCreateRefused || err instanceof SettingsParseRefused) {
-        process.stderr.write(`halfcycle: ${err.message}
-`);
+      const stop = (message) => {
+        const kept = readFolderId(targetRepo) !== void 0 ? `${KEPT_FOLDER_ID_LINE}
+` : "";
+        process.stderr.write(`${message}
+${kept}`);
         process.exit(1);
+      };
+      if (err instanceof SignInRefused || err instanceof PreCreateRefused || err instanceof SettingsParseRefused) {
+        stop(`halfcycle: ${err.message}`);
         return;
       }
       const fsCode = typeof err === "object" && err !== null && "code" in err ? String(err.code) : void 0;
       if (fsCode !== void 0) {
-        process.stderr.write(`halfcycle: could not write to ${targetRepo} \u2014 check that you can write to this folder and run "npx halfcycle" again.
-`);
-        process.exit(1);
+        stop(`halfcycle: could not write to ${targetRepo} \u2014 check that you can write to this folder and run "npx halfcycle" again.`);
         return;
       }
-      process.stderr.write(`halfcycle install failed: ${err instanceof Error ? err.message : String(err)}
-`);
-      process.exit(1);
+      stop(`halfcycle install failed: ${err instanceof Error ? err.message : String(err)}`);
     }
     return;
   }