arcane-cli 1.5.0 → 1.5.1

package/dist/index.js

@@ -262,7 +262,16 @@ async function resolveSecretsScanExcludePrefixes(targetDir) {
 }
 async function writeManifest(targetDir, manifest) {
   const filePath = manifestPath(targetDir);
-  await writeFile2(filePath, JSON.stringify(manifest, null, 2), "utf-8");
+  let existing = "";
+  try {
+    existing = await readFile2(filePath, "utf-8");
+  } catch {
+    existing = "";
+  }
+  const eol = existing.includes("\r\n") ? "\r\n" : "\n";
+  const trailingNewline = /\r?\n$/.test(existing) ? eol : "";
+  const body = JSON.stringify(manifest, null, 2).replaceAll("\n", eol);
+  await writeFile2(filePath, body + trailingNewline, "utf-8");
 }
 function addComponent(manifest, component) {
   return {
@@ -4353,6 +4362,9 @@ function defaultScopePatch(options, manifest) {
 function migrateLegacyComponents(components) {
   const out = [];
   const seen = /* @__PURE__ */ new Set();
+  const inheritedFiles = [];
+  const inheritedHashes = {};
+  let carrier = null;
   for (const entry of components) {
     const replacements = LEGACY_COMPONENT_MIGRATIONS[entry.name];
     if (!replacements) {
@@ -4361,13 +4373,24 @@ function migrateLegacyComponents(components) {
       out.push(entry);
       continue;
     }
+    for (const file of entry.files) {
+      if (!inheritedFiles.includes(file)) inheritedFiles.push(file);
+      const hash = entry.fileHashes?.[file];
+      if (hash !== void 0 && inheritedHashes[file] === void 0) {
+        inheritedHashes[file] = hash;
+      }
+    }
     for (const name of replacements) {
+      carrier ??= name;
       if (seen.has(name)) continue;
       seen.add(name);
       out.push({ name, files: [], installedVersion: entry.installedVersion });
     }
   }
-  return out;
+  return {
+    components: out,
+    inherited: { files: inheritedFiles, fileHashes: inheritedHashes, carrier }
+  };
 }
 async function resolveOrphan(targetDir, file, recordedHash, prune) {
   try {
@@ -4392,6 +4415,19 @@ async function resolveOrphan(targetDir, file, recordedHash, prune) {
   console.log(`  Pruned orphaned file: ${file}`);
   return "pruned";
 }
+async function retainReportedOrphan(targetDir, file, recordedHash, into) {
+  try {
+    validateTargetPath(targetDir, file);
+  } catch {
+    return;
+  }
+  if (!await fileExists(join9(targetDir, file))) return;
+  if (!into.files.includes(file)) into.files.push(file);
+  if (recordedHash !== void 0) {
+    into.fileHashes ??= {};
+    into.fileHashes[file] = recordedHash;
+  }
+}
 function findReadoptedSpellComponents(components, scope = "repo", spellScope = "repo") {
   if (scope !== "repo" || spellScope !== "repo") return /* @__PURE__ */ new Set();
   return new Set(
@@ -4539,7 +4575,17 @@ async function runUpdate(options, targetDir, assetsDir, packageVersion) {
   const conflictedFiles = [];
   const customizedShims = [];
   const orphanReport = [];
-  const componentsToUpdate = migrateLegacyComponents(manifest.components);
+  const orphanCandidates = [];
+  const { components: componentsToUpdate, inherited } = migrateLegacyComponents(manifest.components);
+  if (inherited.carrier !== null) {
+    for (const file of inherited.files) {
+      orphanCandidates.push({
+        owner: inherited.carrier,
+        file,
+        recordedHash: inherited.fileHashes[file]
+      });
+    }
+  }
   for (const installed of componentsToUpdate) {
     let component;
     try {
@@ -4658,24 +4704,11 @@ async function runUpdate(options, targetDir, assetsDir, packageVersion) {
     }
     for (const file of installed.files) {
       if (updatedFiles.includes(file)) continue;
-      const recordedHash = installed.fileHashes?.[file];
-      const status = await resolveOrphan(
-        targetDir,
+      orphanCandidates.push({
+        owner: installed.name,
         file,
-        recordedHash,
-        Boolean(options.prune) && !options.dryRun
-      );
-      orphanReport.push({ file, status });
-      if (status === "reported") {
-        try {
-          validateTargetPath(targetDir, file);
-          if (await fileExists(join9(targetDir, file))) {
-            updatedFiles.push(file);
-            if (recordedHash !== void 0) fileHashes[file] = recordedHash;
-          }
-        } catch {
-        }
-      }
+        recordedHash: installed.fileHashes?.[file]
+      });
     }
     updatedComponents.push({
       ...installed,
@@ -4684,6 +4717,26 @@ async function runUpdate(options, targetDir, assetsDir, packageVersion) {
       fileHashes
     });
   }
+  const claimed = new Set(updatedComponents.flatMap((c) => c.files));
+  const resolvedOrphans = /* @__PURE__ */ new Set();
+  for (const { owner, file, recordedHash } of orphanCandidates) {
+    if (claimed.has(file) || resolvedOrphans.has(file)) continue;
+    resolvedOrphans.add(file);
+    const status = await resolveOrphan(
+      targetDir,
+      file,
+      recordedHash,
+      Boolean(options.prune) && !options.dryRun
+    );
+    orphanReport.push({ file, status });
+    if (status !== "reported") continue;
+    let into = updatedComponents.find((c) => c.name === owner);
+    if (!into) {
+      into = { name: owner, files: [], installedVersion: packageVersion, fileHashes: {} };
+      updatedComponents.push(into);
+    }
+    await retainReportedOrphan(targetDir, file, recordedHash, into);
+  }
   const orphansToReport = orphanReport.filter((o) => o.status !== "not-found");
   if (orphansToReport.length > 0) {
     const verb = options.dryRun ? "[dry-run] Found" : "Found";
@@ -5189,8 +5242,6 @@ async function uninstallUserTier(options, storeRoot, manifest) {
 // src/commands/doctor.ts
 import { access as access4, readdir as readdir8, readFile as readFile10, mkdir as mkdir7, copyFile as fsCopyFile } from "fs/promises";
 import { join as join13, dirname as dirname9 } from "path";
-import { execFile as execFile3 } from "child_process";
-import { promisify as promisify2 } from "util";
 
 // src/config/incidents.ts
 var INCIDENT_QUEUE = [
@@ -5331,10 +5382,33 @@ async function scanRepository(repoRoot, rules, extensions, excludePrefixes = [])
   return findings;
 }
 
-// src/modules/platform-policy.ts
+// src/modules/exec.ts
 import { execFile as execFile2 } from "child_process";
-import { promisify } from "util";
-var execFileAsync = promisify(execFile2);
+var EXTERNAL_CLI_TIMEOUT_MS = 1e4;
+function execFileWithTimeout(file, args, timeoutMs) {
+  return new Promise((resolve5, reject) => {
+    const child = execFile2(
+      file,
+      args,
+      {
+        timeout: timeoutMs,
+        killSignal: "SIGTERM",
+        windowsHide: true,
+        encoding: "utf8"
+      },
+      (error, stdout, stderr) => {
+        if (error) {
+          reject(error);
+          return;
+        }
+        resolve5({ stdout, stderr });
+      }
+    );
+    child.stdin?.end();
+  });
+}
+
+// src/modules/platform-policy.ts
 var SANCTIONED_MERGE_METHODS = ["merge", "rebase"];
 function compareToLadder(effective, declaredButBlocked, interactionNote) {
   const disallowedButPermitted = effective.filter(
@@ -5401,17 +5475,19 @@ function evaluateGitHubMergePolicy(rulesets) {
 }
 async function fetchGitHubRulesets(owner, repo) {
   try {
-    const { stdout: listOut } = await execFileAsync("gh", [
-      "api",
-      `repos/${owner}/${repo}/rulesets`
-    ]);
+    const { stdout: listOut } = await execFileWithTimeout(
+      "gh",
+      ["api", `repos/${owner}/${repo}/rulesets`],
+      EXTERNAL_CLI_TIMEOUT_MS
+    );
     const summaries = JSON.parse(listOut);
     const detailed = await Promise.all(
       summaries.map(async (s) => {
-        const { stdout } = await execFileAsync("gh", [
-          "api",
-          `repos/${owner}/${repo}/rulesets/${s.id}`
-        ]);
+        const { stdout } = await execFileWithTimeout(
+          "gh",
+          ["api", `repos/${owner}/${repo}/rulesets/${s.id}`],
+          EXTERNAL_CLI_TIMEOUT_MS
+        );
         return JSON.parse(stdout);
       })
     );
@@ -5443,7 +5519,7 @@ function evaluateAdoMergePolicy(policies) {
 async function fetchAdoMergeTypePolicies(org, project, repoName, branch) {
   try {
     const orgUrl = `https://dev.azure.com/${org}`;
-    const { stdout: repoOut } = await execFileAsync("az", [
+    const { stdout: repoOut } = await execFileWithTimeout("az", [
       "repos",
       "show",
       "--repository",
@@ -5456,10 +5532,10 @@ async function fetchAdoMergeTypePolicies(org, project, repoName, branch) {
       "id",
       "--output",
       "tsv"
-    ]);
+    ], EXTERNAL_CLI_TIMEOUT_MS);
     const repositoryId = repoOut.trim();
     if (!repositoryId) return null;
-    const { stdout } = await execFileAsync("az", [
+    const { stdout } = await execFileWithTimeout("az", [
       "repos",
       "policy",
       "list",
@@ -5473,7 +5549,7 @@ async function fetchAdoMergeTypePolicies(org, project, repoName, branch) {
       project,
       "--output",
       "json"
-    ]);
+    ], EXTERNAL_CLI_TIMEOUT_MS);
     return JSON.parse(stdout);
   } catch {
     return null;
@@ -5501,7 +5577,6 @@ function parseAdoRemote(url) {
 }
 
 // src/commands/doctor.ts
-var execFileAsync2 = promisify2(execFile3);
 function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -5518,40 +5593,33 @@ async function checkNodeVersion() {
     message: `${raw} \u2014 Node.js 18 or later is required`
   };
 }
-async function checkVSCodeExtension(id, label) {
+async function checkVSCodeExtension(id, label, homeDir = resolveHomeDir()) {
   const name = `VS Code extension: ${label}`;
-  const home = process.env["HOME"] ?? "";
-  const extDirs = [
-    join13(home, ".vscode", "extensions"),
-    join13(home, ".vscode-insiders", "extensions")
+  const flavours = [
+    { dir: join13(homeDir, ".vscode", "extensions"), bin: "code" },
+    { dir: join13(homeDir, ".vscode-insiders", "extensions"), bin: "code-insiders" }
   ];
-  for (const dir of extDirs) {
+  let installBin = null;
+  for (const flavour of flavours) {
+    let entries;
     try {
-      const { readdir: readdir11 } = await import("fs/promises");
-      const entries = await readdir11(dir);
-      const prefix = id.toLowerCase() + "-";
-      const found = entries.some(
-        (e) => e.toLowerCase() === id.toLowerCase() || e.toLowerCase().startsWith(prefix)
-      );
-      if (found) {
-        return { name, passed: true, message: `${id} is installed` };
-      }
+      entries = await readdir8(flavour.dir);
     } catch {
+      continue;
     }
-  }
-  let installBin = "code";
-  for (const bin of ["code", "code-insiders"]) {
-    try {
-      await execFileAsync2(bin, ["--version"]);
-      installBin = bin;
-      break;
-    } catch {
+    installBin ??= flavour.bin;
+    const prefix = id.toLowerCase() + "-";
+    const found = entries.some(
+      (e) => e.toLowerCase() === id.toLowerCase() || e.toLowerCase().startsWith(prefix)
+    );
+    if (found) {
+      return { name, passed: true, message: `${id} is installed` };
     }
   }
   return {
     name,
     passed: false,
-    message: `${id} not found. Install via: ${installBin} --install-extension ${id}`,
+    message: `${id} not found. Install via: ${installBin ?? "code"} --install-extension ${id}`,
     blocking: false
   };
 }
@@ -6037,7 +6105,7 @@ async function runDoctor(targetDir, options = {}, assetsDir) {
   }
   const results = await Promise.all([
     checkNodeVersion(),
-    checkVSCodeExtension("GitHub.copilot-chat", "GitHub Copilot (Chat)"),
+    checkVSCodeExtension("GitHub.copilot-chat", "GitHub Copilot (Chat)", resolveHomeDir()),
     checkArcaneManifest(targetDir),
     Promise.resolve(checkIncidentReleaseGate()),
     checkPullRebase(targetDir),
@@ -6067,26 +6135,24 @@ async function runDoctor(targetDir, options = {}, assetsDir) {
     console.log("  All checks passed. Your environment is ready.\n");
   } else {
     console.log("  One or more checks failed. Fix the issues above before proceeding.\n");
-    const hasMissingSession = sessionResults.some((r) => !r.passed);
-    if (options.fix && hasMissingSession && assetsDir) {
-      console.log("  \u{1F527} Fixing missing session continuity files...\n");
-      const created = await fixSessionContinuity(targetDir, assetsDir);
-      if (created.length > 0) {
-        for (const file of created) {
-          console.log(`    \u2713 Created: ${file}`);
-        }
-        console.log(`
+    process.exitCode = 1;
+  }
+  const hasMissingSession = sessionResults.some((r) => !r.passed);
+  if (options.fix && hasMissingSession && assetsDir) {
+    console.log("  \u{1F527} Fixing missing session continuity files...\n");
+    const created = await fixSessionContinuity(targetDir, assetsDir);
+    if (created.length > 0) {
+      for (const file of created) {
+        console.log(`    \u2713 Created: ${file}`);
+      }
+      console.log(`
   ${created.length} file(s) created. Repo is now close-session-ready.
 `);
-      } else {
-        console.log("    No files needed creation (all present).\n");
-      }
-    } else if (hasMissingSession && !options.fix) {
-      console.log("  \u{1F4A1} Run `spell doctor --fix` to create missing session files.\n");
-    }
-    if (!allPassed) {
-      process.exitCode = 1;
+    } else {
+      console.log("    No files needed creation (all present).\n");
     }
+  } else if (hasMissingSession && !options.fix) {
+    console.log("  \u{1F4A1} Run `spell doctor --fix` to create missing session files.\n");
   }
 }