@indigoai-us/hq-cloud 5.32.0 → 5.34.0

package/src/cli/sync.ts

@@ -17,10 +17,12 @@ import {
   hashFile,
   hashSymlinkTarget,
   updateEntry,
+  removeEntry,
   getEntry,
   normalizeEtag,
 } from "../journal.js";
 import { createIgnoreFilter } from "../ignore.js";
+import { isEphemeralPath } from "./share.js";
 import { resolveConflict } from "./conflict.js";
 import type { ConflictStrategy, ConflictResolution } from "./conflict.js";
 import {
@@ -240,6 +242,26 @@ export interface SyncResult {
   newFiles: Array<{ path: string; bytes: number }>;
   /** Convenience count: `newFiles.length`. */
   newFilesCount: number;
+  /**
+   * Count of remote keys refused at planning time because they matched
+   * `EPHEMERAL_PATH_PATTERN` (conflict-mirror files that must never round-
+   * trip through the bucket). Mirrors `ShareResult.filesExcludedByPolicy`
+   * so push and pull report the same shape. Pre-fix this count was always
+   * 0 on the pull side and legacy `.conflict-*` litter rode every sync —
+   * see Bug #2 in workspace/reports/hq-cloud-5.33.0-deep-test.md.
+   */
+  filesExcludedByPolicy: number;
+  /**
+   * Count of journal-known keys applied as local deletes during this pull
+   * because the remote LIST no longer contains them — the cross-machine
+   * delete-propagation signal that Bug #9 closes. The peer's push leg
+   * removed the object from S3 (`hq sync` push side verified-to-work in
+   * the deep-test addendum), but pre-fix the pull side never enumerated
+   * "what's missing-from-remote-that-was-there-before", so the file
+   * lingered locally forever. Always 0 when no journal-known keys have
+   * disappeared from the remote.
+   */
+  filesTombstoned: number;
 }
 
 /**
@@ -279,6 +301,7 @@ export async function sync(options: SyncOptions): Promise<SyncResult> {
   let bytesDownloaded = 0;
   let filesSkipped = 0;
   let conflicts = 0;
+  let filesTombstoned = 0;
   const conflictPaths: string[] = [];
 
   // List all remote files (IAM session policy filters at the AWS layer)
@@ -322,6 +345,13 @@ export async function sync(options: SyncOptions): Promise<SyncResult> {
       filesSkipped++;
       continue;
     }
+    if (item.action === "skip-excluded-policy") {
+      // Policy-excluded items count separately from `filesSkipped` so the
+      // pull result mirrors the push side's `filesExcludedByPolicy`
+      // counter — `filesSkipped` stays a measure of "unchanged on this
+      // run", not a catch-all for everything we didn't download.
+      continue;
+    }
 
     const { remoteFile, localPath } = item;
 
@@ -365,7 +395,7 @@ export async function sync(options: SyncOptions): Promise<SyncResult> {
       if (resolution !== "abort" && resolution !== "overwrite") {
         try {
           const detectedAt = new Date().toISOString();
-          const machineId = readShortMachineId();
+          const machineId = readShortMachineId(hqRoot);
           const originalRelative = path.relative(hqRoot, localPath);
           const conflictRelative = buildConflictPath(
             originalRelative,
@@ -407,6 +437,11 @@ export async function sync(options: SyncOptions): Promise<SyncResult> {
           aborted: true,
           newFiles: plan.newFiles,
           newFilesCount: plan.newFilesCount,
+          filesExcludedByPolicy: plan.filesExcludedByPolicy,
+          // Abort short-circuits before the tombstone loop runs; report
+          // 0 so the field shape stays stable for consumers that
+          // destructure it.
+          filesTombstoned: 0,
         };
       }
       if (resolution === "keep" || resolution === "skip") {
@@ -526,6 +561,108 @@ export async function sync(options: SyncOptions): Promise<SyncResult> {
   }
   emit({ type: "new-files", files: enrichedNewFiles });
 
+  // Codex P1 (PR #24 follow-up): scope-gate tombstone candidates with
+  // a per-object HEAD before unlinking. `listRemoteFiles` is STS-scoped
+  // (guest sessions with `allowedPrefixes`, role downgrade, custom
+  // sync-mode prefix sets — see the AccessDenied branch in the download
+  // loop above), so a journal entry's absence from LIST does not prove
+  // the object was deleted; it may simply be invisible to this session.
+  // HEAD each candidate:
+  //   - HEAD returns metadata → object exists → NOT in our LIST scope →
+  //     skip the tombstone (peer didn't delete it; we just can't see it).
+  //   - HEAD returns null (NotFound) → confirmed deleted → tombstone.
+  //   - HEAD throws AccessDenied → can't tell → defensive skip; journal
+  //     stays so next sync (with broader scope) can re-evaluate.
+  //   - HEAD throws transient → defensive skip + emit error.
+  // Bounded concurrency mirrors the new-files attribution pass above.
+  if (plan.tombstones.length > 0) {
+    const HEAD_VERIFY_CONCURRENCY = 5;
+    const verified: string[] = [];
+    for (let i = 0; i < plan.tombstones.length; i += HEAD_VERIFY_CONCURRENCY) {
+      const batch = plan.tombstones.slice(i, i + HEAD_VERIFY_CONCURRENCY);
+      const results = await Promise.all(
+        batch.map(async (key) => {
+          try {
+            const head = await headRemoteFile(ctx, key);
+            return head === null ? key : null;
+          } catch (err) {
+            if (isAccessDenied(err)) return null;
+            emit({
+              type: "error",
+              path: key,
+              message: `tombstone HEAD verify failed (deferring): ${
+                err instanceof Error ? err.message : String(err)
+              }`,
+            });
+            return null;
+          }
+        }),
+      );
+      for (const k of results) {
+        if (k !== null) verified.push(k);
+      }
+    }
+    plan.tombstones = verified;
+  }
+
+  // Bug #9 — apply cross-machine delete propagation. Each tombstone is a
+  // key the journal records as previously synced but the remote LIST no
+  // longer contains. We delete the local file (or symlink, or empty dir
+  // remnant) and drop the journal entry so the next sync's planner stays
+  // converged. Failures are reported but non-fatal — the entry stays in
+  // the journal and the next run retries.
+  for (const key of plan.tombstones) {
+    const localPath = path.join(companyRoot, key);
+    let removedSomething = false;
+    try {
+      const lstat = fs.lstatSync(localPath);
+      if (lstat.isSymbolicLink() || lstat.isFile()) {
+        fs.unlinkSync(localPath);
+        removedSomething = true;
+      } else if (lstat.isDirectory()) {
+        // A dir at a key — likely from a (local-dir, cloud-file) historic
+        // state. Don't recursively rm-rf the operator's dir; just drop
+        // the journal entry so we converge with reality.
+      }
+    } catch (err: unknown) {
+      const code =
+        err && typeof err === "object" && "code" in err
+          ? (err as { code?: string }).code
+          : undefined;
+      // ENOENT → local already gone; safe to drop the journal entry.
+      // Other errors (EACCES/EPERM/EBUSY/etc.) leave the local file in
+      // place — if we dropped the journal entry anyway, the pull side
+      // would forget the peer's delete and a later push could re-upload
+      // the still-present local file, silently undoing the peer's delete.
+      // Surface the error and KEEP the journal entry so the next sync
+      // retries the unlink after the operator fixes the permission.
+      if (code !== "ENOENT") {
+        emit({
+          type: "error",
+          path: key,
+          message: `tombstone unlink failed: ${
+            err instanceof Error ? err.message : String(err)
+          }`,
+        });
+        // Skip removeEntry / filesTombstoned / progress event — the
+        // tombstone hasn't actually been honored. Next sync retries.
+        continue;
+      }
+    }
+    removeEntry(journal, key);
+    filesTombstoned++;
+    emit({
+      type: "progress",
+      path: key,
+      bytes: 0,
+      deleted: true,
+      // Suffix differentiates a tombstone from a normal delete in the
+      // tty stream — matches the push-side `defaultConsoleLogger`
+      // tombstone surface in share.ts.
+      message: removedSomething ? "tombstone (cross-machine delete)" : "tombstone (already absent locally)",
+    });
+  }
+
   // Stamp lastSync on every successful run so the menubar's "Last sync · X ago"
   // ticks even when nothing transferred. updateEntry only fires on actual
   // downloads; without this, a no-op sync leaves lastSync at the time of the
@@ -542,6 +679,8 @@ export async function sync(options: SyncOptions): Promise<SyncResult> {
     aborted: false,
     newFiles: plan.newFiles,
     newFilesCount: plan.newFilesCount,
+    filesExcludedByPolicy: plan.filesExcludedByPolicy,
+    filesTombstoned,
   };
 }
 
@@ -590,6 +729,10 @@ type PullPlanItem =
   | { action: "skip-personal-mode"; remoteFile: RemoteFile; localPath: string }
   | { action: "skip-unchanged"; remoteFile: RemoteFile; localPath: string }
   | { action: "skip-local-only"; remoteFile: RemoteFile; localPath: string }
+  // Remote keys refused by ephemeral-mirror policy. The push walker has
+  // refused to upload these since 5.33.0; the pull walker now refuses to
+  // download them so legacy litter in cloud staging drains naturally.
+  | { action: "skip-excluded-policy"; remoteFile: RemoteFile; localPath: string }
   | {
       action: "conflict";
       remoteFile: RemoteFile;
@@ -622,6 +765,15 @@ interface PullPlan {
   /** Files classified as new (no local counterpart at classification time). */
   newFiles: Array<{ path: string; bytes: number }>;
   newFilesCount: number;
+  /** Count of remote keys refused by ephemeral-mirror policy. */
+  filesExcludedByPolicy: number;
+  /**
+   * Journal-known keys missing from the remote LIST. The executor will
+   * apply each as a local delete (file or symlink) + journal removal,
+   * propagating the peer's push-side delete cross-machine (Bug #9).
+   * Carried on the plan so the executor can iterate without re-walking.
+   */
+  tombstones: string[];
 }
 
 /**
@@ -649,6 +801,17 @@ function computePullPlan(
   for (const remoteFile of remoteFiles) {
     const localPath = path.join(companyRoot, remoteFile.key);
 
+    // Ephemeral-mirror filter — symmetric with the push-side walker. Bug #2
+    // in the 5.33.0 deep-test: the push side has refused to upload conflict
+    // mirrors since 5.33.0, but the pull side downloaded them freely from
+    // staging, so legacy `.conflict-*` litter rode every sync into clean
+    // trees. Refuse them here; the V2 verification test (direct S3 inject
+    // bypassing the push filter entirely) is the regression contract.
+    if (isEphemeralPath(remoteFile.key)) {
+      items.push({ action: "skip-excluded-policy", remoteFile, localPath });
+      continue;
+    }
+
     if (personalMode && remoteFile.key.startsWith("companies/")) {
       // Default: drop every `companies/...` key — the legacy contract
       // is that the personal bucket should never contain them.
@@ -705,21 +868,47 @@ function computePullPlan(
     //      dangling link on every run.
     //   3. A regular file: indistinguishable from current behaviour.
     let localLstat: fs.Stats | null = null;
+    let localPathBlockedByFileAncestor = false;
     try {
       localLstat = fs.lstatSync(localPath);
     } catch (err: unknown) {
-      // ENOENT means truly absent; other errors propagate.
-      if (
-        err &&
-        typeof err === "object" &&
-        "code" in err &&
-        (err as { code?: string }).code !== "ENOENT"
-      ) {
+      const code =
+        err && typeof err === "object" && "code" in err
+          ? (err as { code?: string }).code
+          : undefined;
+      // ENOENT  → truly absent → treated as "new file from cloud".
+      // ENOTDIR → an ancestor of localPath is a regular file (cloud has a
+      //           dir at that key, local has a file). Pre-fix this threw
+      //           and aborted the whole company sync (Bug #10 in the
+      //           5.33.0 deep-test verification — \`v4-dir-vs-file\` repro
+      //           wedged the personal company at \"errored\" status,
+      //           skipping every later file). Recover by classifying as
+      //           a structural collision the operator must resolve
+      //           manually, and let the rest of the company process.
+      if (code !== "ENOENT" && code !== "ENOTDIR") {
         throw err;
       }
+      if (code === "ENOTDIR") {
+        localPathBlockedByFileAncestor = true;
+      }
     }
     const localExists = localLstat !== null;
 
+    if (localPathBlockedByFileAncestor) {
+      // Symmetric counterpart to the (local-dir, cloud-file) warning below.
+      // Emit the same "manual reconciliation required" surface so the
+      // operator sees one consistent message for both topologies; record as
+      // skip-local-only so the file is not silently dropped from the
+      // count and the executor never tries to lstat/write it.
+      console.error(
+        `  Warning: an ancestor of ${remoteFile.key} exists locally as a regular file; ` +
+          `cloud has a deeper key under that path. Skipping; manual ` +
+          `reconciliation required (rm the conflicting local file to pull).`,
+      );
+      items.push({ action: "skip-local-only", remoteFile, localPath });
+      continue;
+    }
+
     if (localExists) {
       const isLocalSymlink = localLstat!.isSymbolicLink();
       // Kind-mismatch guard: a remote LIST entry is always a single
@@ -788,6 +977,7 @@ function computePullPlan(
   let bytesToDownload = 0;
   let filesToSkip = 0;
   let filesToConflict = 0;
+  let filesExcludedByPolicy = 0;
   const newFiles: Array<{ path: string; bytes: number }> = [];
   for (const item of items) {
     if (item.action === "download") {
@@ -798,11 +988,106 @@ function computePullPlan(
       }
     } else if (item.action === "conflict") {
       filesToConflict++;
+    } else if (item.action === "skip-excluded-policy") {
+      filesExcludedByPolicy++;
+      // Excluded-policy items don't roll into filesToSkip — they're a
+      // distinct class surfaced via filesExcludedByPolicy so consumers
+      // can render a "N refused by policy" line independently of the
+      // generic "N unchanged" tally.
     } else {
       filesToSkip++;
     }
   }
 
+  // Bug #9 — cross-machine delete propagation. The peer's push leg
+  // already removed the file from S3 (verified in the deep-test
+  // addendum: `aws s3 ls` showed the keys absent post-push). Pre-fix
+  // the pull side enumerated remote keys and downloaded anything
+  // missing locally, but never enumerated "what's missing-from-remote-
+  // that-was-there-before" — so the file stayed forever on every
+  // receiver and `filesTombstoned: 0` showed up on every pull.
+  //
+  // Closing the loop: walk the journal, find every entry whose key is
+  // NOT in the remote LIST set, AND whose path passes the current
+  // ignore filter (paths newly excluded by .hqignore must not trigger
+  // mass-delete), AND — in personalMode — survives the same companies/*
+  // gating the download branch applies. The executor will apply each
+  // as a local delete + journal removal. Symmetric to the push side's
+  // `propagateDeletes` plan in share.ts.
+  const remoteKeySet = new Set<string>();
+  for (const rf of remoteFiles) remoteKeySet.add(rf.key);
+  const tombstones: string[] = [];
+  for (const key of Object.keys(journal.files)) {
+    if (remoteKeySet.has(key)) continue;
+    // PersonalMode key gating — mirror the download branch.
+    if (personalMode && key.startsWith("companies/")) {
+      const slug = key.split("/")[1] ?? "";
+      const isTeamSyncedOrphan =
+        teamSyncedSlugs !== null && slug !== "" && teamSyncedSlugs.has(slug);
+      if (!includeLocalCompanies || isTeamSyncedOrphan) continue;
+    }
+    // Ephemeral keys are filtered both directions; never tombstone-
+    // propagate a conflict-mirror.
+    if (isEphemeralPath(key)) continue;
+    // Honor the current ignore filter — if a path was previously synced
+    // but is now ignored (operator edited .hqignore), do NOT delete
+    // the local copy. They're keeping it deliberately.
+    const localPath = path.join(companyRoot, key);
+    if (!shouldSync(localPath, false) && !shouldSync(localPath, true)) continue;
+    // Codex P1 (PR #24 round 3): detect local edits before tombstoning.
+    // Delete-vs-local-edit race: peer deleted the file remotely while
+    // this machine edited it locally before the next sync. Without
+    // this check, the tombstone executor would unlink the locally-
+    // edited file and drop the journal entry, silently destroying the
+    // user's unsynced work. Compare local hash against the journal
+    // baseline; if they diverge, defer the tombstone. The next pull
+    // run after the operator resolves (re-pushes / overwrites) the
+    // local state will re-evaluate.
+    try {
+      const lstat = fs.lstatSync(localPath);
+      if (lstat.isFile()) {
+        const localHash = hashFile(localPath);
+        const journalEntry = journal.files[key];
+        if (journalEntry?.hash && journalEntry.hash !== localHash) {
+          // Local has unsynced edits — defer this tombstone.
+          continue;
+        }
+      } else if (lstat.isSymbolicLink()) {
+        // Codex P1 (PR #24 round 4): symlinks have target strings
+        // that can be locally edited too. Pre-fix, `isFile()` was
+        // false for symlinks so the divergence guard skipped them,
+        // and a locally-edited symlink (`ln -sfn new-target old-link`
+        // before the peer's remote-delete) was unlinked silently —
+        // the exact race the guard is meant to prevent. Compare the
+        // readlink hash against the journal baseline; defer on
+        // divergence. readlink errors (race / EACCES) also defer.
+        try {
+          const localHash = hashSymlinkTarget(fs.readlinkSync(localPath));
+          const journalEntry = journal.files[key];
+          if (journalEntry?.hash && journalEntry.hash !== localHash) {
+            continue;
+          }
+        } catch {
+          continue;
+        }
+      }
+      // Directories: no hash comparison. The tombstone executor's
+      // dir branch doesn't recursively rm-rf — it just drops the
+      // journal entry, which is the safe-by-default behavior.
+    } catch (err) {
+      const code =
+        err && typeof err === "object" && "code" in err
+          ? (err as { code?: string }).code
+          : undefined;
+      // ENOENT → local already gone; safe to drop journal entry via
+      // the executor's tombstone path.
+      // Other lstat errors (EACCES on parent dir, etc.) → defer:
+      // we can't read local state, so we can't safely decide.
+      if (code !== "ENOENT") continue;
+    }
+    tombstones.push(key);
+  }
+
   return {
     items,
     filesToDownload,
@@ -811,6 +1096,8 @@ function computePullPlan(
     filesToConflict,
     newFiles,
     newFilesCount: newFiles.length,
+    filesExcludedByPolicy,
+    tombstones,
   };
 }
 

package/src/ignore.test.ts

@@ -83,7 +83,7 @@ describe("createIgnoreFilter", () => {
     expect(shouldSync(path.join(hqRoot, ".claude/settings.json"))).toBe(true);
   });
 
-  it("permissive mode: .hq-* internal state is ignored, .hqignore family + .hq/ still sync", () => {
+  it("permissive mode: .hq-* internal state is ignored, .hqignore family still sync", () => {
     const shouldSync = createIgnoreFilter(hqRoot);
     // Internal state files that must never round-trip through the bucket.
     expect(shouldSync(path.join(hqRoot, ".hq-sync.pid"))).toBe(false);
@@ -92,11 +92,28 @@ describe("createIgnoreFilter", () => {
     expect(shouldSync(path.join(hqRoot, ".hq-embeddings-pending.json"))).toBe(false);
     expect(shouldSync(path.join(hqRoot, "companies/indigo/.hq-foo.json"))).toBe(false);
     expect(shouldSync(path.join(hqRoot, ".hq-cache/blob.bin"))).toBe(false);
-    // Sync-config files and the .hq/ directory still sync.
+    // Sync-config files still sync (no hyphen, doesn't match `.hq-*`).
     expect(shouldSync(path.join(hqRoot, ".hqignore"))).toBe(true);
     expect(shouldSync(path.join(hqRoot, ".hqsyncignore"))).toBe(true);
     expect(shouldSync(path.join(hqRoot, ".hqinclude"))).toBe(true);
-    expect(shouldSync(path.join(hqRoot, "companies/indigo/.hq/config.json"))).toBe(true);
+  });
+
+  it("permissive mode: .hq/ directory is per-host state, never synced (Bug #1/#6/#8)", () => {
+    // Bug catalog: `.hq/install-manifest.json`, `.hq/machine-id`, and
+    // `.hq/machine.json` are per-host source-of-truth files. The original
+    // `DEFAULT_IGNORES` only covered the `.hq-*` wildcard (with hyphen) and
+    // explicitly left the `.hq/` directory unaffected — so the install
+    // manifest and machine-id round-tripped through S3 between hosts,
+    // breaking the per-machine identity contract that the 5.33.0
+    // machine-id fix relies on.
+    const shouldSync = createIgnoreFilter(hqRoot);
+    expect(shouldSync(path.join(hqRoot, ".hq/install-manifest.json"))).toBe(false);
+    expect(shouldSync(path.join(hqRoot, ".hq/machine-id"))).toBe(false);
+    expect(shouldSync(path.join(hqRoot, ".hq/machine.json"))).toBe(false);
+    expect(shouldSync(path.join(hqRoot, ".hq/config.json"))).toBe(false);
+    expect(shouldSync(path.join(hqRoot, ".hq"), true)).toBe(false);
+    // Nested .hq/ inside a company also stays local (per-host scoping).
+    expect(shouldSync(path.join(hqRoot, "companies/indigo/.hq/config.json"))).toBe(false);
   });
 
   it("allowlist mode: presence of .hqinclude switches to opt-in", () => {

package/src/ignore.ts

@@ -71,9 +71,15 @@ export const DEFAULT_IGNORES = [
   // covers `.hq-sync.pid`, `.hq-sync-journal.json`, `.hq-sync-state.json`,
   // `.hq-embeddings-pending.json`, and any future internal-state file. The
   // `.hqignore` / `.hqsyncignore` / `.hqinclude` config files don't match
-  // (no hyphen) and the `.hq/` directory is unaffected.
+  // (no hyphen). The `.hq/` directory holds per-host source-of-truth files
+  // (`install-manifest.json`, `machine-id`, `machine.json`, `config.json`)
+  // that MUST NEVER round-trip through the bucket — see Bug #1/#6/#8 in
+  // the 5.33.0 deep-test report. Leaking these between machines makes two
+  // hosts share an installer id / machine-id and breaks the contract the
+  // 5.33.0 machine-id fix relies on.
   "*.pid",
   ".hq-*",
+  ".hq/",
   "modules.lock",
   // hq-root identity marker — discovered locally per-machine, never synced.
   // Root-anchored: only the literal `core.yaml` at hq-root matches. Without

package/src/lib/conflict-file.ts

@@ -7,38 +7,18 @@
  * surface their own conflicts without name collisions, and lets the user
  * (or the `/resolve-conflicts` HQ skill) see local + cloud side-by-side
  * in their file browser.
+ *
+ * Machine-id provisioning lives in `./machine-id.ts` — hq-cloud owns the
+ * source-of-truth file `<hqRoot>/.hq/machine-id` so every sync host
+ * (including Linux outposts with no menubar app) gets a stable id. This
+ * module re-exports `readShortMachineId` for back-compat with existing
+ * callers; new callers should import directly from `./machine-id.js`.
  */
 
 import * as fs from "fs";
-import * as os from "os";
 import * as path from "path";
 
-/**
- * Path to `~/.hq/menubar.json`. Evaluated lazily at call time (not module
- * load) so that tests overriding `HOME` after import — and any future code
- * that changes the user's effective home dir at runtime — see the right
- * file. Going through `os.homedir()` rather than `process.env.HOME` keeps
- * the Windows USERPROFILE fallback intact.
- */
-function menubarJsonPath(): string {
-  return path.join(os.homedir(), ".hq", "menubar.json");
-}
-
-/**
- * Read the short machine ID (first 6 chars) from `~/.hq/menubar.json`.
- * Falls back to "unknown" if the file is missing/unreadable — conflict
- * files should still be written even when machine identity is unclear.
- */
-export function readShortMachineId(): string {
-  try {
-    const raw = fs.readFileSync(menubarJsonPath(), "utf-8");
-    const parsed = JSON.parse(raw);
-    const id = typeof parsed.machineId === "string" ? parsed.machineId : "";
-    return id.slice(0, 6) || "unknown";
-  } catch {
-    return "unknown";
-  }
-}
+export { readShortMachineId, getOrCreateMachineId } from "./machine-id.js";
 
 /**
  * Build the conflict file path for an original. ISO uses `-` instead of

package/src/lib/conflict.test.ts

@@ -1,7 +1,8 @@
 /**
- * Tests for the pure conflict primitives — path building, machine-id
- * fallback, atomic index writes, dedup. Kept in one file so the related
- * helpers stay co-located.
+ * Tests for the pure conflict primitives — path building, atomic index
+ * writes, dedup. The machine-id resolver moved to `./machine-id.ts` (see
+ * `./machine-id.test.ts`) when hq-cloud took ownership of the provisioning
+ * step from the menubar app.
  */
 
 import { describe, it, expect, beforeEach, afterEach } from "vitest";
@@ -11,7 +12,6 @@ import * as path from "path";
 import {
   buildConflictPath,
   buildConflictId,
-  readShortMachineId,
 } from "./conflict-file.js";
 import {
   appendConflictEntry,
@@ -56,42 +56,6 @@ describe("buildConflictId", () => {
   });
 });
 
-describe("readShortMachineId", () => {
-  let originalHome: string | undefined;
-  let tmpHome: string;
-
-  beforeEach(() => {
-    originalHome = process.env.HOME;
-    tmpHome = fs.mkdtempSync(path.join(os.tmpdir(), "hq-machineid-"));
-    process.env.HOME = tmpHome;
-  });
-
-  afterEach(() => {
-    if (originalHome) process.env.HOME = originalHome;
-    else delete process.env.HOME;
-    fs.rmSync(tmpHome, { recursive: true, force: true });
-  });
-
-  it("returns the first 6 chars when menubar.json has a machineId", () => {
-    fs.mkdirSync(path.join(tmpHome, ".hq"), { recursive: true });
-    fs.writeFileSync(
-      path.join(tmpHome, ".hq", "menubar.json"),
-      JSON.stringify({ machineId: "deadbeefcafe1234567890" }),
-    );
-    expect(readShortMachineId()).toBe("deadbe");
-  });
-
-  it("falls back to 'unknown' when menubar.json is missing", () => {
-    expect(readShortMachineId()).toBe("unknown");
-  });
-
-  it("falls back to 'unknown' when menubar.json is malformed", () => {
-    fs.mkdirSync(path.join(tmpHome, ".hq"), { recursive: true });
-    fs.writeFileSync(path.join(tmpHome, ".hq", "menubar.json"), "{not-json");
-    expect(readShortMachineId()).toBe("unknown");
-  });
-});
-
 describe("conflict index", () => {
   let tmpHq: string;