@kortix/agent-tunnel 0.13.42 → 0.13.44

package/README.md

@@ -23,6 +23,10 @@ of, in your private sessions. `--project-id` only offers "Also share with
 <project>" on the approval page; without it the computer is still yours
 everywhere.
 
+Connecting the same computer again reuses its entry. The agent sends a SHA-256
+hash of the hardware ID (IOPlatformUUID, `/etc/machine-id`, or `MachineGuid`);
+the raw ID never leaves the computer.
+
 After approval, the interactive flow asks whether it should install a persistent background service. The default answer is yes.
 
 ## Run in the background

package/dist/agent-cli.js

@@ -2971,7 +2971,7 @@ if (typeof globalThis.WebSocket === "undefined") {
 }
 
 // src/agent/cli.ts
-import { existsSync as existsSync7, readFileSync as readFileSync9, rmSync as rmSync5, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync7, readFileSync as readFileSync10, rmSync as rmSync5, writeFileSync as writeFileSync7 } from "fs";
 import { hostname as hostname4 } from "os";
 import { join as join12 } from "path";
 
@@ -3672,6 +3672,8 @@ function keepAwakeCommand(platform, pid) {
 
 // src/agent/device-auth.ts
 import { execFileSync, spawn as spawn2 } from "child_process";
+import { createHash as createHash2 } from "crypto";
+import { readFileSync as readFileSync4 } from "fs";
 import { hostname, platform } from "os";
 var UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 var TUNNEL_ID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
@@ -3792,12 +3794,29 @@ function machineDisplayName({
     return fallback;
   }
 }
+function machineId({
+  os = platform(),
+  run = (command, args) => execFileSync(command, args, { encoding: "utf8", timeout: 2000, stdio: ["ignore", "pipe", "ignore"] }),
+  read = (path) => readFileSync4(path, "utf8")
+} = {}) {
+  const attempt = (source) => {
+    try {
+      return source()?.trim() || null;
+    } catch {
+      return null;
+    }
+  };
+  const raw = os === "darwin" ? attempt(() => /"IOPlatformUUID" = "([^"]+)"/.exec(run("ioreg", ["-rd1", "-c", "IOPlatformExpertDevice"]))?.[1]) : os === "win32" ? attempt(() => /MachineGuid\s+REG_SZ\s+(\S+)/.exec(run("reg", ["query", "HKLM\\SOFTWARE\\Microsoft\\Cryptography", "/v", "MachineGuid"]))?.[1]) : attempt(() => read("/etc/machine-id")) ?? attempt(() => read("/var/lib/dbus/machine-id"));
+  return raw ? createHash2("sha256").update(`kortix-machine:${raw.toLowerCase()}`).digest("hex") : null;
+}
 async function requestDeviceAuthorization(apiUrl, options = {}) {
+  const id = machineId();
   const response = await fetch(`${apiUrl}/device-auth`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({
       machineHostname: machineDisplayName(),
+      ...id ? { machine_id: id } : {},
       ...options.projectId ? { project_id: options.projectId } : {}
     })
   });
@@ -3852,7 +3871,7 @@ function openBrowser(url) {
 }
 
 // src/agent/version.ts
-import { readFileSync as readFileSync4 } from "fs";
+import { readFileSync as readFileSync5 } from "fs";
 import { dirname as dirname2, join as join4 } from "path";
 import { fileURLToPath } from "url";
 var PACKAGE_NAME = "@kortix/agent-tunnel";
@@ -3871,7 +3890,7 @@ function agentTunnelVersion() {
   let directory = moduleDirectory();
   for (let depth = 0;depth < MAX_LOOKUP_DEPTH; depth++) {
     try {
-      const manifest = JSON.parse(readFileSync4(join4(directory, "package.json"), "utf8"));
+      const manifest = JSON.parse(readFileSync5(join4(directory, "package.json"), "utf8"));
       if (manifest?.name === PACKAGE_NAME && typeof manifest.version === "string") {
         const version = manifest.version;
         cached = version;
@@ -3979,7 +3998,7 @@ class PermissionGuard {
 }
 
 // src/shared/crypto.ts
-import { createHash as createHash2, createHmac, timingSafeEqual, randomInt } from "crypto";
+import { createHash as createHash3, createHmac, timingSafeEqual, randomInt } from "crypto";
 function signMessage(signingKey, payload, nonce) {
   return createHmac("sha256", signingKey).update(`${nonce}:${payload}`).digest("hex");
 }
@@ -4069,6 +4088,7 @@ class TunnelAgent {
   status = null;
   uptime = 0;
   displayName;
+  hardwareId = machineId();
   uptimeInterval = null;
   signingKey = null;
   lastNonce = 0;
@@ -4397,6 +4417,7 @@ class TunnelAgent {
         machineInfo: {
           hostname: hostname2(),
           displayName: this.displayName ??= machineDisplayName(),
+          ...this.hardwareId ? { machineId: this.hardwareId } : {},
           platform: platform2(),
           arch: arch(),
           osVersion: release(),
@@ -5005,7 +5026,7 @@ function createDesktopCapability() {
 
 // src/agent/capabilities/filesystem.ts
 import { open, writeFile, readdir, stat, unlink, mkdir } from "fs/promises";
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 
 // src/shared/filesystem-validation.ts
 function validateFilesystemParams(method, params) {
@@ -5192,7 +5213,7 @@ function createFilesystemCapability(config) {
       throw new Error(`Content exceeds max size (${contentBytes} > ${maxFileSize})`);
     }
     const bytes = Buffer.from(content, encoding);
-    const expectedHash = createHash3("sha256").update(bytes).digest("hex");
+    const expectedHash = createHash4("sha256").update(bytes).digest("hex");
     if (params.sha256 !== undefined && params.sha256.toLowerCase() !== expectedHash) {
       throw new Error("SHA-256 mismatch: content differs from the source; destination was not modified");
     }
@@ -5203,7 +5224,7 @@ function createFilesystemCapability(config) {
     const handle = await open(path, "r");
     try {
       const stats = await handle.stat();
-      const persistedHash = createHash3("sha256").update(await handle.readFile()).digest("hex");
+      const persistedHash = createHash4("sha256").update(await handle.readFile()).digest("hex");
       if (persistedHash !== expectedHash)
         throw new Error("SHA-256 mismatch after write; destination verification failed");
       return {
@@ -5416,14 +5437,14 @@ function createEnabledCapabilityRegistry(config, findDesktopDriver = findCuaDriv
 }
 
 // src/agent/credential-store.ts
-import { chmodSync as chmodSync3, existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync5, renameSync as renameSync2, rmSync as rmSync2, writeFileSync as writeFileSync3 } from "fs";
+import { chmodSync as chmodSync3, existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync6, renameSync as renameSync2, rmSync as rmSync2, writeFileSync as writeFileSync3 } from "fs";
 import { join as join8 } from "path";
 var CONFIG_DIR2 = agentTunnelHome();
 var CONFIG_FILE2 = join8(CONFIG_DIR2, "config.json");
 var PAIRING_FIELDS = ["token", "tunnelId", "enabledCapabilities"];
 function readConfigFile() {
   try {
-    const parsed = JSON.parse(readFileSync5(CONFIG_FILE2, "utf-8"));
+    const parsed = JSON.parse(readFileSync6(CONFIG_FILE2, "utf-8"));
     return parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
   } catch {
     return {};
@@ -5458,7 +5479,7 @@ function clearSavedCredentials() {
     return false;
   let existing;
   try {
-    existing = JSON.parse(readFileSync5(CONFIG_FILE2, "utf-8"));
+    existing = JSON.parse(readFileSync6(CONFIG_FILE2, "utf-8"));
   } catch {
     rmSync2(CONFIG_FILE2, { force: true });
     return true;
@@ -5578,13 +5599,13 @@ async function promptYesNo(question, defaultValue) {
 }
 
 // src/agent/service.ts
-import { chmodSync as chmodSync4, copyFileSync, existsSync as existsSync6, mkdirSync as mkdirSync4, readFileSync as readFileSync7, realpathSync as realpathSync3, rmSync as rmSync4, writeFileSync as writeFileSync5 } from "fs";
+import { chmodSync as chmodSync4, copyFileSync, existsSync as existsSync6, mkdirSync as mkdirSync4, readFileSync as readFileSync8, realpathSync as realpathSync3, rmSync as rmSync4, writeFileSync as writeFileSync5 } from "fs";
 import { platform as platform6 } from "os";
 import { join as join10 } from "path";
 
 // src/agent/service-drivers.ts
 import { spawnSync } from "child_process";
-import { existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync6, rmSync as rmSync3, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync7, rmSync as rmSync3, writeFileSync as writeFileSync4 } from "fs";
 import { homedir as homedir4, platform as platform5, userInfo } from "os";
 import { dirname as dirname5, join as join9 } from "path";
 
@@ -5764,7 +5785,7 @@ var launchd = {
     return {
       active: status.ok,
       enabled,
-      detail: status.detail || (installed ? readFileSync6(paths.launchdPlist, "utf8") : undefined)
+      detail: status.detail || (installed ? readFileSync7(paths.launchdPlist, "utf8") : undefined)
     };
   }
 };
@@ -5895,7 +5916,7 @@ var scheduledTask = {
     return {
       active: state === "Running",
       enabled: state !== "Disabled",
-      detail: state || (installed ? readFileSync6(paths.windowsScript, "utf8") : undefined)
+      detail: state || (installed ? readFileSync7(paths.windowsScript, "utf8") : undefined)
     };
   }
 };
@@ -6016,7 +6037,7 @@ function getServiceStatus() {
   return withDriver((driver, paths, installed) => {
     let upToDate = false;
     try {
-      upToDate = installed && readFileSync7(driver.unitPath(paths), "utf8") === driver.render(paths, currentRunnerParts(plannedRunner));
+      upToDate = installed && readFileSync8(driver.unitPath(paths), "utf8") === driver.render(paths, currentRunnerParts(plannedRunner));
     } catch {}
     return { ...driver.status(paths, installed), upToDate };
   }, { installed: false, active: null });
@@ -6065,7 +6086,7 @@ function renderServiceAction(action, status) {
 }
 
 // src/agent/state-file.ts
-import { chmodSync as chmodSync5, mkdirSync as mkdirSync5, readFileSync as readFileSync8, renameSync as renameSync3, writeFileSync as writeFileSync6 } from "fs";
+import { chmodSync as chmodSync5, mkdirSync as mkdirSync5, readFileSync as readFileSync9, renameSync as renameSync3, writeFileSync as writeFileSync6 } from "fs";
 import { join as join11 } from "path";
 function stateFilePath(home = agentTunnelHome()) {
   return join11(home, "state.json");
@@ -6092,7 +6113,7 @@ function writeAgentState(status, tunnel, home = agentTunnelHome()) {
 }
 function readAgentState(home = agentTunnelHome()) {
   try {
-    const parsed = JSON.parse(readFileSync8(stateFilePath(home), "utf8"));
+    const parsed = JSON.parse(readFileSync9(stateFilePath(home), "utf8"));
     return parsed && typeof parsed === "object" && typeof parsed.status === "string" ? parsed : null;
   } catch {
     return null;
@@ -6372,7 +6393,7 @@ function commandRun(flags) {
 }
 function lastServiceActivity() {
   try {
-    const lines = readFileSync9(join12(getServicePaths().logDir, "agent-tunnel.out.log"), "utf8").split(/\r?\n/).map((line) => stripAnsi(line).trim()).filter((line) => line.length > 0);
+    const lines = readFileSync10(join12(getServicePaths().logDir, "agent-tunnel.out.log"), "utf8").split(/\r?\n/).map((line) => stripAnsi(line).trim()).filter((line) => line.length > 0);
     return lines.at(-1) ?? null;
   } catch {
     return null;
@@ -6494,7 +6515,7 @@ function commandLogs(flags) {
       console.log(`  ${c.dim}not created yet${c.reset}`);
       continue;
     }
-    const kept = readFileSync9(file, "utf8").split(/\r?\n/).map((line) => line.trimEnd()).filter((line) => line.trim().length > 0).filter((line) => showAll || !isShellStartupNoise(line));
+    const kept = readFileSync10(file, "utf8").split(/\r?\n/).map((line) => line.trimEnd()).filter((line) => line.trim().length > 0).filter((line) => showAll || !isShellStartupNoise(line));
     const lines = collapseRepeatedLines(kept).slice(-limit);
     if (lines.length === 0) {
       console.log(`  ${c.dim}empty${c.reset}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kortix/agent-tunnel",
-  "version": "0.13.42",
+  "version": "0.13.44",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/kortix-ai/suna.git",

package/src/agent/agent.ts

@@ -12,7 +12,7 @@ import {
   writeAccessRequest,
 } from './access';
 import { agentTunnelHome } from './service-paths';
-import { machineDisplayName } from './device-auth';
+import { machineDisplayName, machineId } from './device-auth';
 import { capabilityForMethod } from '../shared/permissions';
 import { TunnelErrorCode } from '../shared/types';
 import { agentTunnelVersion } from './version';
@@ -174,6 +174,8 @@ export class TunnelAgent {
   private uptime = 0;
   /** Read once: on macOS it runs `scutil`, and the pong repeats every 30 s. */
   private displayName?: string;
+  /** Hashed hardware id, read once (null when unreadable). */
+  private readonly hardwareId = machineId();
   private uptimeInterval: ReturnType<typeof setInterval> | null = null;
 
   // HMAC signature verification
@@ -576,6 +578,9 @@ export class TunnelAgent {
         machineInfo: {
           hostname: hostname(),
           displayName: (this.displayName ??= machineDisplayName()),
+          // Registers this machine's identity on its row, so re-pairing it
+          // later reuses the registration instead of adding a second one.
+          ...(this.hardwareId ? { machineId: this.hardwareId } : {}),
           platform: platform(),
           arch: arch(),
           osVersion: release(),

package/src/agent/device-auth.test.ts

@@ -3,6 +3,7 @@ import {
   InvalidDeviceAuthResponseError,
   awaitDeviceAuthorization,
   machineDisplayName,
+  machineId,
   parseDeviceAuthChallenge,
   parseDeviceAuthStatus,
   requestDeviceAuthorization,
@@ -187,3 +188,64 @@ describe('machine display name', () => {
     expect(body.machineHostname).toBe(machineDisplayName());
   });
 });
+
+describe('machine id', () => {
+  const HEX = /^[a-f0-9]{64}$/;
+  const fails = () => {
+    throw new Error('not available');
+  };
+  const UUID = '8B1F2C3D-4E5F-4A6B-9C7D-0E1F2A3B4C5D';
+
+  test('macOS hashes the IOPlatformUUID; the raw id never leaves the machine', () => {
+    const id = machineId({
+      os: 'darwin',
+      run: (command, args) => {
+        expect([command, ...args]).toEqual(['ioreg', '-rd1', '-c', 'IOPlatformExpertDevice']);
+        return `+-o J316sAP  <class IOPlatformExpertDevice>\n    "IOPlatformUUID" = "${UUID}"\n`;
+      },
+      read: fails,
+    });
+    expect(id).toMatch(HEX);
+    expect(id).not.toContain(UUID.toLowerCase().replace(/-/g, ''));
+  });
+
+  test('the same hardware gives the same id on every platform source, and other hardware a different one', () => {
+    const mac = (uuid: string) => machineId({ os: 'darwin', run: () => `"IOPlatformUUID" = "${uuid}"`, read: fails });
+    expect(mac(UUID)).toBe(mac(UUID));
+    expect(mac(UUID)).not.toBe(mac(UUID.replace('8B1F', '9B1F')));
+    const win = machineId({
+      os: 'win32',
+      run: () => `\r\nHKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography\r\n    MachineGuid    REG_SZ    ${UUID}\r\n`,
+      read: fails,
+    });
+    expect(win).toBe(mac(UUID));
+  });
+
+  test('Linux reads /etc/machine-id, then the dbus copy', () => {
+    const first = machineId({ os: 'linux', run: fails, read: (path) => (path === '/etc/machine-id' ? 'abc123\n' : fails()) });
+    const dbus = machineId({ os: 'linux', run: fails, read: (path) => (path === '/etc/machine-id' ? fails() : 'abc123') });
+    expect(first).toMatch(HEX);
+    expect(dbus).toBe(first);
+  });
+
+  test('an unreadable or empty id is null, never a random one', () => {
+    expect(machineId({ os: 'darwin', run: fails, read: fails })).toBeNull();
+    expect(machineId({ os: 'darwin', run: () => 'no uuid here', read: fails })).toBeNull();
+    expect(machineId({ os: 'linux', run: fails, read: () => '  \n' })).toBeNull();
+  });
+
+  test('pairing sends the machine id', async () => {
+    const original = globalThis.fetch;
+    let body: Record<string, unknown> = {};
+    globalThis.fetch = (async (_url: string, init: RequestInit) => {
+      body = JSON.parse(String(init.body));
+      return new Response(JSON.stringify(challenge()), { status: 200 });
+    }) as unknown as typeof fetch;
+    try {
+      await requestDeviceAuthorization('https://api.kortix.com/v1/tunnel');
+    } finally {
+      globalThis.fetch = original;
+    }
+    expect(body.machine_id).toBe(machineId() ?? undefined);
+  });
+});

package/src/agent/device-auth.ts

@@ -1,4 +1,6 @@
 import { execFileSync, spawn } from 'child_process';
+import { createHash } from 'crypto';
+import { readFileSync } from 'fs';
 import { hostname, platform } from 'os';
 import { isTunnelCapability } from '../shared/permissions';
 import type { TunnelCapability } from '../shared/types';
@@ -168,6 +170,44 @@ export function machineDisplayName({
   }
 }
 
+/**
+ * This machine's identity: sha256 of its hardware id (macOS IOPlatformUUID,
+ * Linux /etc/machine-id, Windows MachineGuid), so the raw id never leaves the
+ * machine. It survives reinstalls, renames, and network changes; the relay
+ * reuses the owner's existing registration of it instead of pairing a new
+ * one. Null when the id cannot be read.
+ */
+export function machineId({
+  os = platform(),
+  run = (command: string, args: string[]) =>
+    execFileSync(command, args, { encoding: 'utf8', timeout: 2_000, stdio: ['ignore', 'pipe', 'ignore'] }),
+  read = (path: string) => readFileSync(path, 'utf8'),
+}: {
+  os?: string;
+  run?: (command: string, args: string[]) => string;
+  read?: (path: string) => string;
+} = {}): string | null {
+  const attempt = (source: () => string | undefined) => {
+    try {
+      return source()?.trim() || null;
+    } catch {
+      return null;
+    }
+  };
+  const raw =
+    os === 'darwin'
+      ? attempt(() => /"IOPlatformUUID" = "([^"]+)"/.exec(run('ioreg', ['-rd1', '-c', 'IOPlatformExpertDevice']))?.[1])
+      : os === 'win32'
+        ? attempt(
+            () =>
+              /MachineGuid\s+REG_SZ\s+(\S+)/.exec(
+                run('reg', ['query', 'HKLM\\SOFTWARE\\Microsoft\\Cryptography', '/v', 'MachineGuid']),
+              )?.[1],
+          )
+        : (attempt(() => read('/etc/machine-id')) ?? attempt(() => read('/var/lib/dbus/machine-id')));
+  return raw ? createHash('sha256').update(`kortix-machine:${raw.toLowerCase()}`).digest('hex') : null;
+}
+
 /**
  * Starts pairing. `projectId` names the project the machine is being connected
  * to, so the approval page can skip its project picker. A relay that predates
@@ -177,12 +217,15 @@ export async function requestDeviceAuthorization(
   apiUrl: string,
   options: { projectId?: string } = {},
 ): Promise<DeviceAuthChallenge> {
+  const id = machineId();
   const response = await fetch(`${apiUrl}/device-auth`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({
       // The default machine name on the approval page.
       machineHostname: machineDisplayName(),
+      // One registration per machine: re-pairing reuses it.
+      ...(id ? { machine_id: id } : {}),
       ...(options.projectId ? { project_id: options.projectId } : {}),
     }),
   });