fix(cli): stabilize machine identity

saltbo · saltbo · commit 45f9616b0371 · 2026-05-03T23:18:00.000-04:00
diff --git a/packages/cli/src/daemon/index.ts b/packages/cli/src/daemon/index.ts
@@ -1,11 +1,12 @@
 import { execSync } from "node:child_process";
 import { mkdirSync, unlinkSync } from "node:fs";
-import { arch, hostname, platform, release } from "node:os";
+import { arch, platform, release } from "node:os";
 import type { MachineRuntime } from "@agent-kanban/shared";
 import { MachineClient } from "../client/index.js";
 import { getCredentials } from "../config.js";
 import { generateDeviceId } from "../device.js";
 import { createLogger } from "../logger.js";
+import { resolveMachineName } from "../machineName.js";
 import { PID_FILE, STATE_DIR } from "../paths.js";
 import { getAvailableProviders, getProvider } from "../providers/registry.js";
 import type { AgentProvider, HistoryEvent } from "../providers/types.js";
@@ -168,7 +169,7 @@ function removePidFile(): void {
 async function getMachineInfo(providers: AgentProvider[], rateLimiter: RateLimiter) {
   const os = `${platform()} ${arch()} ${release()}`;
   const runtimes = await buildRuntimeStates(providers, rateLimiter);
-  return { name: hostname(), os, version: getVersion(), runtimes };
+  return { name: resolveMachineName(), os, version: getVersion(), runtimes };
 }
 
 async function buildRuntimeStates(providers: AgentProvider[], rateLimiter: RateLimiter): Promise<MachineRuntime[]> {
diff --git a/packages/cli/src/device.ts b/packages/cli/src/device.ts
@@ -1,7 +1,30 @@
 import { createHash } from "node:crypto";
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { hostname, networkInterfaces } from "node:os";
+import { dirname } from "node:path";
+import { MACHINE_ID_FILE } from "./paths.js";
 
-export function generateDeviceId(): string {
+export function generateDeviceId(machineIdFile = MACHINE_ID_FILE): string {
+  const stored = readMachineId(machineIdFile);
+  if (stored) return stored;
+
+  const id = legacyDeviceId();
+  mkdirSync(dirname(machineIdFile), { recursive: true });
+  writeFileSync(machineIdFile, `${id}\n`);
+  return id;
+}
+
+function readMachineId(machineIdFile: string): string | null {
+  try {
+    const id = readFileSync(machineIdFile, "utf-8").trim();
+    return id || null;
+  } catch (err: any) {
+    if (err?.code === "ENOENT") return null;
+    throw err;
+  }
+}
+
+function legacyDeviceId(): string {
   const host = hostname();
   const nets = networkInterfaces();
   let mac = "";
diff --git a/packages/cli/src/machineName.ts b/packages/cli/src/machineName.ts
@@ -0,0 +1,9 @@
+import { execFileSync } from "node:child_process";
+import { hostname, platform } from "node:os";
+
+export function resolveMachineName(): string {
+  if (platform() !== "darwin") return hostname();
+
+  const localHostName = execFileSync("scutil", ["--get", "LocalHostName"], { encoding: "utf-8" }).trim();
+  return `${localHostName}.local`;
+}
diff --git a/packages/cli/src/paths.ts b/packages/cli/src/paths.ts
@@ -16,6 +16,7 @@ export const LOGS_DIR = join(STATE_DIR, "logs");
 export const CONFIG_FILE = join(CONFIG_DIR, "config.json");
 export const PID_FILE = join(STATE_DIR, "daemon.pid");
 export const DAEMON_STATE_FILE = join(STATE_DIR, "daemon-state.json");
+export const MACHINE_ID_FILE = join(STATE_DIR, "machine-id");
 export const REPOS_DIR = join(DATA_DIR, "repos");
 export const WORKTREES_DIR = join(DATA_DIR, "worktrees");
 export const SESSIONS_DIR = join(STATE_DIR, "sessions");
diff --git a/packages/cli/tests/daemon-heartbeat.test.ts b/packages/cli/tests/daemon-heartbeat.test.ts
@@ -13,6 +13,7 @@ const mocks = vi.hoisted(() => ({
 }));
 
 vi.mock("node:child_process", () => ({
+  execFileSync: vi.fn().mockReturnValue("test-machine\n"),
   execSync: vi.fn(),
 }));
 
diff --git a/tests/device-id.test.ts b/tests/device-id.test.ts
@@ -0,0 +1,37 @@
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, describe, expect, it } from "vitest";
+import { generateDeviceId } from "../packages/cli/src/device";
+
+const dirs: string[] = [];
+
+function tempMachineIdFile(): string {
+  const dir = mkdtempSync(join(tmpdir(), "ak-device-id-"));
+  dirs.push(dir);
+  return join(dir, "machine-id");
+}
+
+afterEach(() => {
+  for (const dir of dirs.splice(0)) {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+describe("generateDeviceId", () => {
+  it("reuses the persisted machine id", () => {
+    const file = tempMachineIdFile();
+    writeFileSync(file, "stable-machine-id\n");
+
+    expect(generateDeviceId(file)).toBe("stable-machine-id");
+  });
+
+  it("persists the initial machine id", () => {
+    const file = tempMachineIdFile();
+
+    const id = generateDeviceId(file);
+
+    expect(readFileSync(file, "utf-8").trim()).toBe(id);
+    expect(generateDeviceId(file)).toBe(id);
+  });
+});
diff --git a/tests/machine-name.test.ts b/tests/machine-name.test.ts
@@ -0,0 +1,40 @@
+import { describe, expect, it, vi } from "vitest";
+
+const mocks = vi.hoisted(() => ({
+  execFileSync: vi.fn(),
+  hostname: vi.fn(),
+  platform: vi.fn(),
+}));
+
+vi.mock("node:child_process", () => ({
+  default: { execFileSync: mocks.execFileSync },
+  execFileSync: mocks.execFileSync,
+}));
+
+vi.mock("node:os", () => ({
+  default: { hostname: mocks.hostname, platform: mocks.platform },
+  hostname: mocks.hostname,
+  platform: mocks.platform,
+}));
+
+describe("resolveMachineName", () => {
+  it("uses macOS LocalHostName as the display name", async () => {
+    mocks.platform.mockReturnValue("darwin");
+    mocks.execFileSync.mockReturnValue("Jaspers-MacBook-Air\n");
+
+    const { resolveMachineName } = await import("../packages/cli/src/machineName");
+
+    expect(resolveMachineName()).toBe("Jaspers-MacBook-Air.local");
+    expect(mocks.execFileSync).toHaveBeenCalledWith("scutil", ["--get", "LocalHostName"], { encoding: "utf-8" });
+  });
+
+  it("uses os hostname outside macOS", async () => {
+    vi.resetModules();
+    mocks.platform.mockReturnValue("linux");
+    mocks.hostname.mockReturnValue("runner");
+
+    const { resolveMachineName } = await import("../packages/cli/src/machineName");
+
+    expect(resolveMachineName()).toBe("runner");
+  });
+});
