overlord-cli 0.2606081356.0 → 0.2606090710.0

package/bin/_cli/device-identity.d.mts

@@ -0,0 +1,12 @@
+export const CANONICAL_DEVICE_FILE: string;
+
+export function getLegacyDesktopDeviceFilePath(userDataPath: string): string;
+
+export function readOrCreateCanonicalDeviceFingerprintSync(input?: {
+  explicitFingerprint?: string | null | undefined;
+  legacyDesktopUserDataPath?: string | null | undefined;
+}): string;
+
+export function readOrCreateCanonicalDeviceFingerprint(input?: {
+  legacyDesktopUserDataPath?: string | null | undefined;
+}): Promise<string>;

package/bin/_cli/device-identity.mjs

@@ -0,0 +1,92 @@
+import { randomUUID } from 'node:crypto';
+import fs from 'node:fs';
+import fsp from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+
+export const CANONICAL_DEVICE_FILE = path.join(os.homedir(), '.ovld', 'device.json');
+
+export function getLegacyDesktopDeviceFilePath(userDataPath) {
+  return path.join(userDataPath, 'overlord-device.json');
+}
+
+function parseDeviceFingerprint(raw) {
+  const parsed = JSON.parse(raw);
+  return typeof parsed.deviceFingerprint === 'string' ? parsed.deviceFingerprint.trim() : '';
+}
+
+function serializeDeviceFingerprint(deviceFingerprint) {
+  return `${JSON.stringify({ deviceFingerprint }, null, 2)}\n`;
+}
+
+function readDeviceFingerprintSync(filePath) {
+  try {
+    const fingerprint = parseDeviceFingerprint(fs.readFileSync(filePath, 'utf8'));
+    return fingerprint || null;
+  } catch {
+    return null;
+  }
+}
+
+async function readDeviceFingerprint(filePath) {
+  try {
+    const fingerprint = parseDeviceFingerprint(await fsp.readFile(filePath, 'utf8'));
+    return fingerprint || null;
+  } catch {
+    return null;
+  }
+}
+
+function writeCanonicalDeviceFingerprintSync(deviceFingerprint) {
+  fs.mkdirSync(path.dirname(CANONICAL_DEVICE_FILE), { recursive: true });
+  fs.writeFileSync(CANONICAL_DEVICE_FILE, serializeDeviceFingerprint(deviceFingerprint), 'utf8');
+}
+
+async function writeCanonicalDeviceFingerprint(deviceFingerprint) {
+  await fsp.mkdir(path.dirname(CANONICAL_DEVICE_FILE), { recursive: true });
+  await fsp.writeFile(CANONICAL_DEVICE_FILE, serializeDeviceFingerprint(deviceFingerprint), 'utf8');
+}
+
+export function readOrCreateCanonicalDeviceFingerprintSync({
+  explicitFingerprint,
+  legacyDesktopUserDataPath
+} = {}) {
+  const explicit = typeof explicitFingerprint === 'string' ? explicitFingerprint.trim() : '';
+  if (explicit) return explicit;
+
+  const canonical = readDeviceFingerprintSync(CANONICAL_DEVICE_FILE);
+  if (canonical) return canonical;
+
+  if (legacyDesktopUserDataPath) {
+    const legacy = readDeviceFingerprintSync(getLegacyDesktopDeviceFilePath(legacyDesktopUserDataPath));
+    if (legacy) {
+      writeCanonicalDeviceFingerprintSync(legacy);
+      return legacy;
+    }
+  }
+
+  const deviceFingerprint = randomUUID();
+  writeCanonicalDeviceFingerprintSync(deviceFingerprint);
+  return deviceFingerprint;
+}
+
+export async function readOrCreateCanonicalDeviceFingerprint({
+  legacyDesktopUserDataPath
+} = {}) {
+  const canonical = await readDeviceFingerprint(CANONICAL_DEVICE_FILE);
+  if (canonical) return canonical;
+
+  if (legacyDesktopUserDataPath) {
+    const legacy = await readDeviceFingerprint(
+      getLegacyDesktopDeviceFilePath(legacyDesktopUserDataPath)
+    );
+    if (legacy) {
+      await writeCanonicalDeviceFingerprint(legacy);
+      return legacy;
+    }
+  }
+
+  const deviceFingerprint = randomUUID();
+  await writeCanonicalDeviceFingerprint(deviceFingerprint);
+  return deviceFingerprint;
+}

package/bin/_cli/runner.mjs

@@ -1,13 +1,11 @@
 #!/usr/bin/env node
 
 import { execFileSync, spawn } from 'node:child_process';
-import crypto from 'node:crypto';
-import fs from 'node:fs';
 import os from 'node:os';
-import path from 'node:path';
+
+import { readOrCreateCanonicalDeviceFingerprintSync } from './device-identity.mjs';
 
 const OVLD_ENTRY = process.argv[1];
-const DEVICE_FILE = path.join(os.homedir(), '.ovld', 'device.json');
 const DEFAULT_TMUX_COMMAND = 'tmux new-session bash {script}';
 
 /** @internal Test-only overrides for protocol/launch subprocess calls. */
@@ -65,22 +63,7 @@ export function readOrCreateDeviceFingerprint(flags) {
     typeof flags['device-fingerprint'] === 'string'
       ? flags['device-fingerprint'].trim()
       : process.env.OVERLORD_DEVICE_FINGERPRINT?.trim();
-  if (explicit) return explicit;
-
-  try {
-    const raw = fs.readFileSync(DEVICE_FILE, 'utf8');
-    const parsed = JSON.parse(raw);
-    if (typeof parsed.deviceFingerprint === 'string' && parsed.deviceFingerprint.trim()) {
-      return parsed.deviceFingerprint.trim();
-    }
-  } catch {
-    // Create below.
-  }
-
-  const deviceFingerprint = crypto.randomUUID();
-  fs.mkdirSync(path.dirname(DEVICE_FILE), { recursive: true });
-  fs.writeFileSync(DEVICE_FILE, `${JSON.stringify({ deviceFingerprint }, null, 2)}\n`, 'utf8');
-  return deviceFingerprint;
+  return readOrCreateCanonicalDeviceFingerprintSync({ explicitFingerprint: explicit });
 }
 
 function runOvld(args, env = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "overlord-cli",
-  "version": "0.2606081356.0",
+  "version": "0.2606090710.0",
   "description": "Overlord CLI — launch AI agents on tickets from anywhere",
   "homepage": "https://www.ovld.ai/docs/",
   "type": "module",