@apilift/cli 1.4.28 → 1.4.29

package/dist/apilift-capture-server.js

@@ -21,7 +21,7 @@ function dataRoot(env) {
   const home = homedir();
   if (platform() === "darwin") return join(home, "Library", "Application Support", "apilift");
   if (platform() === "win32") return join(env.LOCALAPPDATA || join(home, "AppData", "Local"), "apilift");
-  return join(env.XDG_DATA_HOME || join(home, ".local", "share"), "apilift");
+  return join(env.XDG_DATA_HOME && isAbsolute(env.XDG_DATA_HOME) ? env.XDG_DATA_HOME : join(home, ".local", "share"), "apilift");
 }
 
 // src/capture-server/server.ts
@@ -19868,7 +19868,7 @@ var extensionPageMessageSchema = external_exports.discriminatedUnion("operation"
 
 // src/capture-server/store.ts
 import { randomUUID, createHash } from "node:crypto";
-import { mkdirSync, chmodSync } from "node:fs";
+import { mkdirSync, chmodSync, readFileSync as readFileSync2 } from "node:fs";
 import { join as join2 } from "node:path";
 import { execFileSync } from "node:child_process";
 import { DatabaseSync as DatabaseSync2 } from "node:sqlite";
@@ -19881,28 +19881,66 @@ var CaptureError = class extends Error {
 var json3 = (value) => JSON.stringify(value);
 var readJson = (value) => JSON.parse(String(value));
 var scopeTtl = { inspect: 3e4, execute: 12e4, capture: 72e5 };
-function ownerProcessAlive(pid, expectedStartedAt, probe = {}) {
-  if (!Number.isInteger(pid) || pid <= 0 || !Number.isFinite(expectedStartedAt)) return false;
-  const alive = probe.alive ?? ((candidate2) => {
-    try {
-      process.kill(candidate2, 0);
-      return true;
-    } catch {
+var pidAlive = (candidate2) => {
+  try {
+    process.kill(candidate2, 0);
+    return true;
+  } catch {
+    return false;
+  }
+};
+var inspectProcess = (command, args, timeout) => execFileSync(command, args, { encoding: "utf8", timeout, windowsHide: true, env: { ...process.env, LC_ALL: "C", TZ: "UTC" }, stdio: ["ignore", "pipe", "ignore"] }).trim();
+var linuxClockTicks;
+function createOwnerVerifier(probe = {}) {
+  const cached2 = /* @__PURE__ */ new Map();
+  const alive = probe.alive ?? pidAlive, now = probe.now ?? Date.now;
+  return (pid, startedAt, fresh = false) => {
+    if (!Number.isInteger(pid) || pid <= 0 || !Number.isFinite(startedAt) || !alive(pid)) {
+      cached2.delete(pid);
       return false;
     }
-  });
-  const inspect = probe.inspect ?? ((command, args, timeout) => execFileSync(command, args, { encoding: "utf8", timeout }).trim());
+    if ((probe.platform ?? process.platform) === "linux") return inspectOwner(pid, startedAt, probe);
+    const prior = cached2.get(pid), time3 = now();
+    if (!fresh && prior && prior.startedAt === startedAt && time3 >= prior.checkedAt && time3 - prior.checkedAt < 2e3) return true;
+    cached2.delete(pid);
+    if (!inspectOwner(pid, startedAt, probe)) return false;
+    if (cached2.size >= 256) cached2.delete(cached2.keys().next().value);
+    cached2.set(pid, { startedAt, checkedAt: now() });
+    return true;
+  };
+}
+var defaultOwnerVerifier = createOwnerVerifier();
+function ownerProcessAlive(pid, expectedStartedAt, probe) {
+  return typeof probe === "object" ? inspectOwner(pid, expectedStartedAt, probe) : defaultOwnerVerifier(pid, expectedStartedAt, probe);
+}
+function inspectOwner(pid, expectedStartedAt, probe) {
+  if (!Number.isInteger(pid) || pid <= 0 || !Number.isFinite(expectedStartedAt)) return false;
+  const alive = probe.alive ?? pidAlive;
+  const inspect = probe.inspect ?? inspectProcess;
   const platform2 = probe.platform ?? process.platform;
   const now = probe.now ?? Date.now;
   const started = now();
   const windows = platform2 === "win32";
+  if (platform2 === "linux") {
+    try {
+      const read = probe.read ?? ((path) => readFileSync2(path, "utf8"));
+      const stat = read(`/proc/${pid}/stat`), fields = stat.slice(stat.lastIndexOf(")") + 2).trim().split(/\s+/u);
+      if (["Z", "X"].includes(fields[0])) return false;
+      const ticks = Number(fields[19]), boot = Number(/^btime (\d+)$/mu.exec(read("/proc/stat"))?.[1]);
+      const hz = probe.inspect ? Number(inspect("getconf", ["CLK_TCK"], 2e3)) : linuxClockTicks ??= Number(inspect("getconf", ["CLK_TCK"], 2e3));
+      const observed = boot * 1e3 + ticks * 1e3 / hz;
+      return Number.isFinite(observed) && hz > 0 && Math.abs(observed - expectedStartedAt) <= 5e3;
+    } catch {
+      return false;
+    }
+  }
   for (let attempt = 0; attempt < (windows ? 2 : 1); attempt++) {
     if (!alive(pid)) return false;
     const remaining = windows ? 8e3 - (now() - started) : 2e3;
     if (remaining <= 0) return false;
     try {
-      const raw = windows ? inspect("powershell.exe", ["-NoProfile", "-Command", `(Get-Process -Id ${pid}).StartTime.ToUniversalTime().ToString('o')`], Math.min(4e3, remaining)) : inspect("ps", ["-o", "lstart=", "-p", String(pid)], 2e3);
-      const observed = Date.parse(raw.trim());
+      const raw = windows ? inspect("powershell.exe", ["-NoLogo", "-NoProfile", "-NonInteractive", "-Command", `(Get-Process -Id ${pid} -ErrorAction Stop).StartTime.ToUniversalTime().ToString('o')`], Math.min(4e3, remaining)) : inspect("ps", ["-o", "lstart=", "-p", String(pid)], 2e3);
+      const observed = Date.parse(windows ? raw.trim() : `${raw.trim()} UTC`);
       return Number.isFinite(observed) && Math.abs(observed - expectedStartedAt) <= 5e3;
     } catch (error62) {
       if (!windows || error62.code !== "ETIMEDOUT") return false;
@@ -19972,18 +20010,22 @@ var CaptureStore = class {
     const now = this.clock();
     const rows = this.db.prepare("SELECT id,owner_pid,owner_started_at,expires_at FROM scopes WHERE retained_at IS NULL").all();
     const stale = rows.filter((row) => row.expires_at <= now || !this.alive(row.owner_pid, row.owner_started_at));
-    for (const row of stale) {
-      const capture = this.db.prepare("SELECT kind,window_json FROM scopes WHERE id=?").get(row.id);
-      if (capture.kind === "capture" && !capture.window_json && this.db.prepare("SELECT 1 FROM capture_candidates WHERE scope_id=? LIMIT 1").get(row.id)) this.retainScope(row.id);
-      else this.db.prepare("DELETE FROM scopes WHERE id=?").run(row.id);
-    }
+    for (const row of stale) this.releaseStaleScope(row.id);
     this.db.prepare("DELETE FROM jobs WHERE status='delivered' AND delivered_at < ?").run(now - 6e5);
     this.db.prepare("DELETE FROM bridge_demands WHERE expires_at <= ?").run(now);
-    if (stale.length) this.emit();
   }
-  row(id2) {
-    this.prune();
-    const row = this.db.prepare("SELECT * FROM scopes WHERE id=?").get(id2);
+  releaseStaleScope(id2) {
+    const capture = this.db.prepare("SELECT kind,window_json FROM scopes WHERE id=?").get(id2);
+    if (capture?.kind === "capture" && !capture.window_json && this.db.prepare("SELECT 1 FROM capture_candidates WHERE scope_id=? LIMIT 1").get(id2)) this.retainScope(id2);
+    else this.db.prepare("DELETE FROM scopes WHERE id=?").run(id2);
+    this.emit();
+  }
+  row(id2, freshOwner = false) {
+    let row = this.db.prepare("SELECT * FROM scopes WHERE id=?").get(id2);
+    if (row && row.retained_at === null && (Number(row.expires_at) <= this.clock() || !(freshOwner ? this.alive(Number(row.owner_pid), Number(row.owner_started_at), true) : this.alive(Number(row.owner_pid), Number(row.owner_started_at))))) {
+      this.releaseStaleScope(id2);
+      row = this.db.prepare("SELECT * FROM scopes WHERE id=?").get(id2);
+    }
     if (!row) throw new CaptureError("scope-expired", "Browser scope is missing or its owner exited");
     return row;
   }
@@ -20013,7 +20055,7 @@ var CaptureStore = class {
         throw new CaptureError("invalid-scope", "Browser tab URL must belong to the page origin");
       }
     }
-    if (!this.alive(input2.ownerPid, input2.ownerStartedAt)) throw new CaptureError("owner-exited", "Scope owner process is no longer running");
+    if (!this.alive(input2.ownerPid, input2.ownerStartedAt, true)) throw new CaptureError("owner-exited", "Scope owner process is no longer running");
     this.prune();
     return this.transaction(() => {
       if (input2.kind !== "inspect") {
@@ -20067,7 +20109,7 @@ var CaptureStore = class {
     return row ? { seq: row.seq, entry: readJson(row.entry_json) } : null;
   }
   enqueueJob(scopeId, envelope) {
-    const scope2 = this.row(scopeId);
+    const scope2 = this.row(scopeId, true);
     if (scope2.retained_at !== null) throw new CaptureError("scope-released", "Browser ownership was released; retained evidence cannot run jobs");
     if (scope2.kind === "inspect") throw new CaptureError("inspect-only", "Inspect scopes cannot run browser jobs");
     const parsed = nativeJobSchema.safeParse(envelope.job);
@@ -20201,6 +20243,7 @@ var CaptureStore = class {
       case "jobs.poll": {
         const job = this.db.prepare("SELECT id,envelope_json FROM jobs WHERE scope_id=? AND status='queued' ORDER BY created_at LIMIT 1").get(scopeId);
         if (!job) return {};
+        this.row(scopeId, true);
         this.db.prepare("UPDATE jobs SET status='dispatched',dispatched_at=? WHERE id=?").run(now, job.id);
         return readJson(job.envelope_json);
       }
@@ -20371,7 +20414,7 @@ async function startCaptureServer(options) {
   });
   const address = server.address();
   if (!address || typeof address === "string") throw new Error("Capture server did not bind a TCP port");
-  const receipt = { pid: process.pid, port: address.port, token, version: options.version, startedAt: (/* @__PURE__ */ new Date()).toISOString() };
+  const receipt = { pid: process.pid, port: address.port, token, version: options.version, startedAt: new Date(Date.now() - process.uptime() * 1e3).toISOString() };
   const receiptPath = join3(root, "server.json");
   const temp = join3(root, `.server-${process.pid}-${randomBytes(4).toString("hex")}.json`);
   await writeFile(temp, JSON.stringify(receipt), { mode: 384 });

package/dist/apilift-collector.js

@@ -7182,7 +7182,7 @@ function dataRoot(env) {
   const home = homedir();
   if (platform() === "darwin") return join(home, "Library", "Application Support", "apilift");
   if (platform() === "win32") return join(env.LOCALAPPDATA || join(home, "AppData", "Local"), "apilift");
-  return join(env.XDG_DATA_HOME || join(home, ".local", "share"), "apilift");
+  return join(env.XDG_DATA_HOME && isAbsolute(env.XDG_DATA_HOME) ? env.XDG_DATA_HOME : join(home, ".local", "share"), "apilift");
 }
 var LocalState = class {
   db;
@@ -27558,27 +27558,38 @@ function readable(v2) {
 }
 function commandIdentity(command) {
   let source = command;
+  let shell = null;
   try {
     const args = obj(JSON.parse(command));
     source = text(args.cmd) || text(args.command) || command;
+    if (/(?:^|[\\/])(?:powershell|pwsh|cmd)(?:\.exe)?$/iu.test(text(args.shell))) shell = "windows";
+    else if (/(?:^|[\\/])(?:bash|zsh|sh)(?:\.exe)?$/iu.test(text(args.shell))) shell = "posix";
   } catch {
   }
   source = source.replace(/\s+2>&1\s*$/u, "");
+  const windows = shell ? shell === "windows" : process.platform === "win32" || /^\s*&\s+/u.test(source) || /^\s*(?:["']?(?:[A-Za-z]:\\|\\\\)|node\.exe\s+|node\s+["']?[A-Za-z]:\\|apilift\.(?:cmd|exe|ps1)\b)/iu.test(source);
+  if (windows) source = source.replace(/^\s*&\s+/u, "");
   const words = [];
   let word = "", quote = "", escaped = false, started = false;
-  for (const char of source) {
+  for (let offset = 0; offset < source.length; offset++) {
+    const char = source[offset];
     if (escaped) {
       word += char;
       escaped = false;
       continue;
     }
-    if (char === "\\" && quote !== "'") {
+    if (char === "\\" && quote !== "'" && !windows) {
       escaped = true;
       started = true;
       continue;
     }
     if (quote) {
-      if (quote === '"' && (char === "$" || char === "`")) return null;
+      if (windows && quote === "'" && char === "'" && source[offset + 1] === "'") {
+        word += "'";
+        offset++;
+        continue;
+      }
+      if (quote === '"' && (char === "$" || char === "`" || windows && (char === "%" || char === "!"))) return null;
       if (char === quote) quote = "";
       else word += char;
       continue;
@@ -27589,6 +27600,7 @@ function commandIdentity(command) {
       continue;
     }
     if (/[;&|`$()]/u.test(char)) return null;
+    if (windows && /[%!^<>]/u.test(char)) return null;
     if (/\s/u.test(char)) {
       if (started) {
         words.push(word);
@@ -27605,9 +27617,9 @@ function commandIdentity(command) {
   let index = 0;
   if (/(?:^|\/)env$/u.test(words[index] ?? "")) index++;
   while (/^[A-Za-z_][A-Za-z0-9_]*=/u.test(words[index] ?? "")) index++;
-  if (/(?:^|\/)node(?:\.exe)?$/u.test(words[index] ?? "")) index++;
+  if (/(?:^|[\\/])node(?:\.exe)?$/iu.test(words[index] ?? "")) index++;
   if (words[index] === "./dev" && words[index + 1] === "apilift") index++;
-  if (!/(?:^|\/)apilift(?:\.js)?$/u.test(words[index] ?? "")) return null;
+  if (!/(?:^|[\\/])apilift(?:\.(?:js|cmd|exe|ps1))?$/iu.test(words[index] ?? "")) return null;
   let argv = words.slice(index + 1);
   if (argv[0] === "--session") argv = argv.slice(2);
   if (!argv.length) return null;

package/dist/apilift-native-host.js

@@ -9185,7 +9185,7 @@ function dataRoot(env) {
   const home = homedir();
   if (platform() === "darwin") return join(home, "Library", "Application Support", "apilift");
   if (platform() === "win32") return join(env.LOCALAPPDATA || join(home, "AppData", "Local"), "apilift");
-  return join(env.XDG_DATA_HOME || join(home, ".local", "share"), "apilift");
+  return join(env.XDG_DATA_HOME && isAbsolute(env.XDG_DATA_HOME) ? env.XDG_DATA_HOME : join(home, ".local", "share"), "apilift");
 }
 var LocalState = class {
   db;
@@ -31740,12 +31740,13 @@ function probeState(root, now = Date.now()) {
 // src/native-host/registration.ts
 import { homedir as homedir2, platform as platform2 } from "node:os";
 import { dirname as dirname2, isAbsolute as isAbsolute2, join as join5, resolve as resolve2 } from "node:path";
-function manifestDirectory(env = process.env) {
+var absoluteEnv = (value) => value && isAbsolute2(value) ? value : void 0;
+function manifestDirectory(env = process.env, system = { platform: platform2(), home: homedir2() }) {
   if (env.APILIFT_NATIVE_MESSAGING_DIR) return resolve2(env.APILIFT_NATIVE_MESSAGING_DIR);
-  const home = homedir2();
-  if (platform2() === "darwin") return join5(home, "Library", "Application Support", "Google", "Chrome", "NativeMessagingHosts");
-  if (platform2() === "win32") throw new Error("Windows native-host registration needs a data-root manifest and HKCU registry entry");
-  return join5(home, ".config", "google-chrome", "NativeMessagingHosts");
+  const home = system.home;
+  if (system.platform === "darwin") return join5(home, "Library", "Application Support", "Google", "Chrome", "NativeMessagingHosts");
+  if (system.platform === "win32") throw new Error("Windows native-host registration needs a data-root manifest and HKCU registry entry");
+  return join5(absoluteEnv(env.CHROME_CONFIG_HOME) || absoluteEnv(env.XDG_CONFIG_HOME) || join5(home, ".config"), "google-chrome", "NativeMessagingHosts");
 }
 
 // src/bin/native-host.ts

package/dist/apilift-register-native-host.js

@@ -7,20 +7,84 @@ import { existsSync, readFileSync, realpathSync } from "node:fs";
 import { basename, dirname as dirname2, isAbsolute as isAbsolute2, join as join2, resolve as resolve2 } from "node:path";
 
 // src/native-host/registration.ts
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
+import { execFileSync } from "node:child_process";
+import { mkdirSync, writeFileSync } from "node:fs";
 import { homedir, platform } from "node:os";
 import { dirname, isAbsolute, join, resolve } from "node:path";
-import { chmod, mkdir, readFile, rename, writeFile, copyFile } from "node:fs/promises";
+import { chmod, mkdir, readFile, rename, writeFile, copyFile, rm, stat } from "node:fs/promises";
 var fingerprint = (bytes) => createHash("sha256").update(bytes).digest("hex");
 var hostNames = /* @__PURE__ */ new Set(["com.apilift.browser", "com.apilift.browser.dev"]);
 var validId = /^[a-p]{32}$/;
 var posixQuote = (value) => `'${value.replaceAll("'", "'\\''")}'`;
-function manifestDirectory(env = process.env) {
+var absoluteEnv = (value) => value && isAbsolute(value) ? value : void 0;
+function batchLiteral(value) {
+  if (/["\r\n\0]/u.test(value)) throw new Error("Native host launcher values contain unsupported control characters");
+  return value.replaceAll("%", "%%");
+}
+function nativeLauncher(values, windows) {
+  const environment = { APILIFT_HOME: values.root, APILIFT_NATIVE_HOST_NAME: values.hostName, APILIFT_NATIVE_MESSAGING_DIR: values.manifestRoot, ...values.site ? { APILIFT_URL: values.site } : {} };
+  if (windows) return `@echo off\r
+chcp 65001 >nul 2>&1\r
+setlocal DisableDelayedExpansion\r
+${Object.entries(environment).map(([key, value]) => `set "${key}=${batchLiteral(value)}"\r
+`).join("")}"${batchLiteral(values.nodePath)}" "${batchLiteral(values.hostScript)}" %*\r
+exit /b %errorlevel%\r
+`;
+  return `#!/bin/sh
+${Object.entries(environment).map(([key, value]) => `${key}=${posixQuote(value)}`).join(" ")} exec ${posixQuote(values.nodePath)} ${posixQuote(values.hostScript)} "$@"
+`;
+}
+function readWindowsHostValues(hostName, run = execFileSync) {
+  if (!/^[a-z0-9_]+(?:\.[a-z0-9_]+)*$/u.test(hostName)) throw new Error("Invalid native host name");
+  const script = `$ErrorActionPreference='Stop'; $results=@(); foreach($view in @('32','64')) {
+    $base=[Microsoft.Win32.RegistryKey]::OpenBaseKey([Microsoft.Win32.RegistryHive]::CurrentUser,[Microsoft.Win32.RegistryView]('Registry'+$view));
+    try {
+      $key=$base.OpenSubKey('Software\\Google\\Chrome\\NativeMessagingHosts\\${hostName}');
+      $kind=$null; $data=$null;
+      if($null -ne $key) { try {
+        $value=$key.GetValue('',$null,[Microsoft.Win32.RegistryValueOptions]::DoNotExpandEnvironmentNames);
+        if($null -ne $value) { $kind=$key.GetValueKind('').ToString(); $data=[Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes((ConvertTo-Json -InputObject $value -Compress))); }
+      } finally { $key.Dispose(); } }
+      $results+=@{view=$view;present=($null -ne $key);kind=$kind;data=$data};
+    } finally { $base.Dispose(); }
+  }; ConvertTo-Json -InputObject @($results) -Compress`;
+  try {
+    const output = run("powershell.exe", ["-NoLogo", "-NoProfile", "-NonInteractive", "-EncodedCommand", Buffer.from(script, "utf16le").toString("base64")], { encoding: "utf8", timeout: 1e4, windowsHide: true, stdio: ["ignore", "pipe", "pipe"] });
+    const values = JSON.parse(String(output));
+    if (!Array.isArray(values) || values.length !== 2) throw new Error("Invalid registry snapshot");
+    return ["32", "64"].map((view) => {
+      const items = values.filter((item2) => item2?.view === view);
+      const item = items[0];
+      if (items.length !== 1 || typeof item.present !== "boolean" || !(item.kind === null || typeof item.kind === "string") || !(item.data === null || typeof item.data === "string")) throw new Error("Invalid registry value");
+      return { view, present: item.present, kind: item.kind, value: item.data === null ? null : JSON.parse(Buffer.from(item.data, "base64").toString("utf8")) };
+    });
+  } catch {
+    throw new Error("Could not inspect the current user's Chrome native host registration");
+  }
+}
+function registerWindowsHost(hostName, manifest, owned, run = execFileSync, write = true, backup) {
+  const key = `HKCU\\Software\\Google\\Chrome\\NativeMessagingHosts\\${hostName}`;
+  const options2 = { encoding: "utf8", timeout: 1e4, windowsHide: true, stdio: ["ignore", "pipe", "pipe"] };
+  const present = /* @__PURE__ */ new Set();
+  for (const value of readWindowsHostValues(hostName, run)) {
+    if (!value.present) continue;
+    const { view } = value;
+    present.add(view);
+    const current = value.kind === "String" && typeof value.value === "string" ? value.value : null;
+    if (!owned || current?.toLowerCase() !== manifest.toLowerCase()) {
+      if (!backup) throw new Error(`Native host registration is not owned by Apilift: ${key}`);
+      backup(view, JSON.stringify(value));
+    }
+  }
+  if (write) for (const view of /* @__PURE__ */ new Set(["32", ...present])) run("reg.exe", ["add", key, "/ve", "/t", "REG_SZ", "/d", manifest, "/f", `/reg:${view}`], options2);
+}
+function manifestDirectory(env = process.env, system = { platform: platform(), home: homedir() }) {
   if (env.APILIFT_NATIVE_MESSAGING_DIR) return resolve(env.APILIFT_NATIVE_MESSAGING_DIR);
-  const home = homedir();
-  if (platform() === "darwin") return join(home, "Library", "Application Support", "Google", "Chrome", "NativeMessagingHosts");
-  if (platform() === "win32") throw new Error("Windows native-host registration needs a data-root manifest and HKCU registry entry");
-  return join(home, ".config", "google-chrome", "NativeMessagingHosts");
+  const home = system.home;
+  if (system.platform === "darwin") return join(home, "Library", "Application Support", "Google", "Chrome", "NativeMessagingHosts");
+  if (system.platform === "win32") throw new Error("Windows native-host registration needs a data-root manifest and HKCU registry entry");
+  return join(absoluteEnv(env.CHROME_CONFIG_HOME) || absoluteEnv(env.XDG_CONFIG_HOME) || join(home, ".config"), "google-chrome", "NativeMessagingHosts");
 }
 async function registerNativeHost(options2) {
   const env = options2.env ?? process.env;
@@ -35,7 +99,24 @@ async function registerNativeHost(options2) {
   const manifestRoot = env.APILIFT_NATIVE_MESSAGING_DIR ? resolve(env.APILIFT_NATIVE_MESSAGING_DIR) : platform() === "win32" ? nativeRoot : manifestDirectory(env);
   const launcher = join(nativeRoot, platform() === "win32" ? "launcher.cmd" : "launcher.sh");
   const manifest = join(manifestRoot, `${hostName}.json`);
+  const manifests = [manifest];
+  if (platform() === "linux" && !env.APILIFT_NATIVE_MESSAGING_DIR) {
+    for (const browser of ["google-chrome-beta", "google-chrome-unstable", "chromium"]) {
+      const profile = join(dirname(dirname(manifestRoot)), browser);
+      if (await stat(profile).then((value) => value.isDirectory()).catch(() => false)) manifests.push(join(profile, "NativeMessagingHosts", `${hostName}.json`));
+    }
+  }
   const receiptPath = join(nativeRoot, "registration.json");
+  const registryBackup = options2.allowReplaceUnowned ? (view, value) => {
+    const directory = join(nativeRoot, "backup");
+    mkdirSync(directory, { recursive: true, mode: 448 });
+    const path = join(directory, `${hostName}-registry-${view}-${fingerprint(value)}.json`);
+    try {
+      writeFileSync(path, JSON.stringify({ hostName, view, query: value }), { flag: "wx", mode: 384 });
+    } catch (error) {
+      if (error.code !== "EEXIST") throw error;
+    }
+  } : void 0;
   const previous = await readFile(receiptPath, "utf8").then((value) => JSON.parse(value)).catch(() => ({}));
   const guard = async (path) => {
     const bytes = await readFile(path).catch(() => null);
@@ -45,33 +126,33 @@ async function registerNativeHost(options2) {
     await copyFile(path, join(nativeRoot, "backup", `${fingerprint(bytes)}-${Date.now()}`));
   };
   await guard(launcher);
-  await guard(manifest);
+  for (const path of manifests) await guard(path);
+  if (platform() === "win32" && !env.APILIFT_NATIVE_MESSAGING_DIR) {
+    const bytes = await readFile(manifest).catch(() => null);
+    registerWindowsHost(hostName, manifest, Boolean(bytes && previous[manifest] === fingerprint(bytes)), execFileSync, false, registryBackup);
+  }
   await mkdir(nativeRoot, { recursive: true, mode: 448 });
   await mkdir(manifestRoot, { recursive: true, mode: 448 });
-  const launcherText = platform() === "win32" ? `@echo off\r
-set "APILIFT_HOME=${root}"\r
-set "APILIFT_NATIVE_HOST_NAME=${hostName}"\r
-${siteUrl ? `set "APILIFT_URL=${siteUrl.origin}"\r
-` : ""}${env.APILIFT_NATIVE_MESSAGING_DIR ? `set "APILIFT_NATIVE_MESSAGING_DIR=${manifestRoot}"\r
-` : ""}"${nodePath}" "${hostScript}" %*\r
-` : `#!/bin/sh
-APILIFT_HOME=${posixQuote(root)} APILIFT_NATIVE_HOST_NAME=${posixQuote(hostName)} ${siteUrl ? `APILIFT_URL=${posixQuote(siteUrl.origin)} ` : ""}${env.APILIFT_NATIVE_MESSAGING_DIR ? `APILIFT_NATIVE_MESSAGING_DIR=${posixQuote(manifestRoot)} ` : ""}exec ${posixQuote(nodePath)} ${posixQuote(hostScript)} "$@"
-`;
+  const launcherText = nativeLauncher({ root, hostName, nodePath, hostScript, manifestRoot, site: siteUrl?.origin }, platform() === "win32");
   const manifestText = JSON.stringify({ name: hostName, description: "Apilift browser bridge", path: launcher, type: "stdio", allowed_origins: [`chrome-extension://${options2.extensionId}/`] }, null, 2) + "\n";
   const atomicWrite = async (path, bytes, mode) => {
-    const temp = join(dirname(path), `.${hostName}-${process.pid}-${Date.now()}.tmp`);
-    await writeFile(temp, bytes, { mode });
-    await chmod(temp, mode);
-    await rename(temp, path);
+    const temp = join(dirname(path), `.${hostName}-${randomUUID()}.tmp`);
+    try {
+      await writeFile(temp, bytes, { mode, flag: "wx" });
+      await chmod(temp, mode);
+      await rename(temp, path);
+    } finally {
+      await rm(temp, { force: true });
+    }
   };
   await atomicWrite(launcher, launcherText, platform() === "win32" ? 384 : 448);
-  await atomicWrite(manifest, manifestText, 384);
-  const receipt = { ...previous, [launcher]: fingerprint(launcherText), [manifest]: fingerprint(manifestText) };
-  await atomicWrite(receiptPath, JSON.stringify(receipt, null, 2) + "\n", 384);
-  if (platform() === "win32" && !env.APILIFT_NATIVE_MESSAGING_DIR) {
-    const { execFileSync } = await import("node:child_process");
-    execFileSync("reg.exe", ["add", `HKCU\\Software\\Google\\Chrome\\NativeMessagingHosts\\${hostName}`, "/ve", "/t", "REG_SZ", "/d", manifest, "/f"], { stdio: "ignore" });
+  for (const path of manifests) {
+    await mkdir(dirname(path), { recursive: true, mode: 448 });
+    await atomicWrite(path, manifestText, 384);
   }
+  const receipt = { ...previous, [launcher]: fingerprint(launcherText), ...Object.fromEntries(manifests.map((path) => [path, fingerprint(manifestText)])) };
+  await atomicWrite(receiptPath, JSON.stringify(receipt, null, 2) + "\n", 384);
+  if (platform() === "win32" && !env.APILIFT_NATIVE_MESSAGING_DIR) registerWindowsHost(hostName, manifest, true, execFileSync, true, registryBackup);
   return { launcher, manifest, hostName };
 }
 

package/dist/apilift-session-audit.js

@@ -31861,7 +31861,7 @@ function dataRoot(env) {
   const home = homedir();
   if (platform() === "darwin") return join(home, "Library", "Application Support", "apilift");
   if (platform() === "win32") return join(env.LOCALAPPDATA || join(home, "AppData", "Local"), "apilift");
-  return join(env.XDG_DATA_HOME || join(home, ".local", "share"), "apilift");
+  return join(env.XDG_DATA_HOME && isAbsolute(env.XDG_DATA_HOME) ? env.XDG_DATA_HOME : join(home, ".local", "share"), "apilift");
 }
 
 // src/usage/measurement.ts
@@ -134465,27 +134465,38 @@ function readable(v2) {
 }
 function commandIdentity(command) {
   let source = command;
+  let shell = null;
   try {
     const args = obj(JSON.parse(command));
     source = text(args.cmd) || text(args.command) || command;
+    if (/(?:^|[\\/])(?:powershell|pwsh|cmd)(?:\.exe)?$/iu.test(text(args.shell))) shell = "windows";
+    else if (/(?:^|[\\/])(?:bash|zsh|sh)(?:\.exe)?$/iu.test(text(args.shell))) shell = "posix";
   } catch {
   }
   source = source.replace(/\s+2>&1\s*$/u, "");
+  const windows = shell ? shell === "windows" : process.platform === "win32" || /^\s*&\s+/u.test(source) || /^\s*(?:["']?(?:[A-Za-z]:\\|\\\\)|node\.exe\s+|node\s+["']?[A-Za-z]:\\|apilift\.(?:cmd|exe|ps1)\b)/iu.test(source);
+  if (windows) source = source.replace(/^\s*&\s+/u, "");
   const words = [];
   let word = "", quote = "", escaped = false, started = false;
-  for (const char of source) {
+  for (let offset = 0; offset < source.length; offset++) {
+    const char = source[offset];
     if (escaped) {
       word += char;
       escaped = false;
       continue;
     }
-    if (char === "\\" && quote !== "'") {
+    if (char === "\\" && quote !== "'" && !windows) {
       escaped = true;
       started = true;
       continue;
     }
     if (quote) {
-      if (quote === '"' && (char === "$" || char === "`")) return null;
+      if (windows && quote === "'" && char === "'" && source[offset + 1] === "'") {
+        word += "'";
+        offset++;
+        continue;
+      }
+      if (quote === '"' && (char === "$" || char === "`" || windows && (char === "%" || char === "!"))) return null;
       if (char === quote) quote = "";
       else word += char;
       continue;
@@ -134496,6 +134507,7 @@ function commandIdentity(command) {
       continue;
     }
     if (/[;&|`$()]/u.test(char)) return null;
+    if (windows && /[%!^<>]/u.test(char)) return null;
     if (/\s/u.test(char)) {
       if (started) {
         words.push(word);
@@ -134512,9 +134524,9 @@ function commandIdentity(command) {
   let index = 0;
   if (/(?:^|\/)env$/u.test(words[index] ?? "")) index++;
   while (/^[A-Za-z_][A-Za-z0-9_]*=/u.test(words[index] ?? "")) index++;
-  if (/(?:^|\/)node(?:\.exe)?$/u.test(words[index] ?? "")) index++;
+  if (/(?:^|[\\/])node(?:\.exe)?$/iu.test(words[index] ?? "")) index++;
   if (words[index] === "./dev" && words[index + 1] === "apilift") index++;
-  if (!/(?:^|\/)apilift(?:\.js)?$/u.test(words[index] ?? "")) return null;
+  if (!/(?:^|[\\/])apilift(?:\.(?:js|cmd|exe|ps1))?$/iu.test(words[index] ?? "")) return null;
   let argv = words.slice(index + 1);
   if (argv[0] === "--session") argv = argv.slice(2);
   if (!argv.length) return null;