@apilift/cli 1.4.35 → 1.4.37

package/dist/apilift-collector.js

@@ -140,10 +140,51 @@ var init_state = __esm({
 });
 
 // src/usage/ownership.ts
-import { mkdirSync as mkdirSync2, chmodSync as chmodSync2, existsSync, readFileSync, writeFileSync, renameSync, unlinkSync } from "node:fs";
-import { randomUUID } from "node:crypto";
-import { join as join2 } from "node:path";
+import { mkdirSync as mkdirSync2, chmodSync as chmodSync2, existsSync, readFileSync, writeFileSync, renameSync, unlinkSync, statSync } from "node:fs";
+import { createHash, randomUUID } from "node:crypto";
+import { join as join2, dirname, isAbsolute as isAbsolute2 } from "node:path";
 import { DatabaseSync as DatabaseSync2 } from "node:sqlite";
+function requestCollectorTarget(root2, entry, env) {
+  const owner = readOwner(root2);
+  if (!owner) return;
+  const pending = join2(root2, "usage", `.collector-target-${randomUUID()}`);
+  try {
+    const target = { owner: owner.id, entry, interpreter: process.execPath, fingerprint: sourceFingerprint(entry), env: Object.fromEntries(runtimeKeys.map((key) => [key, env[key] ?? null])) };
+    writeFileSync(pending, JSON.stringify(target), { mode: 384 });
+    renameSync(pending, targetFile(root2));
+  } finally {
+    try {
+      unlinkSync(pending);
+    } catch {
+    }
+  }
+}
+function collectorTarget(root2, owner, loadedFingerprint) {
+  try {
+    const target = JSON.parse(readFileSync(targetFile(root2), "utf8"));
+    if (target.owner !== owner || target.fingerprint === loadedFingerprint || !isAbsolute2(target.entry) || !isAbsolute2(target.interpreter) || !target.entry.endsWith("apilift-collector.js")) return null;
+    const pkg = JSON.parse(readFileSync(join2(dirname(target.entry), "..", "package.json"), "utf8"));
+    if (pkg.name !== "@apilift/cli" || sourceFingerprint(target.entry) !== target.fingerprint) return null;
+    if (!target.env || Object.entries(target.env).some(([key, value]) => !runtimeKeys.includes(key) || value !== null && typeof value !== "string")) return null;
+    return target;
+  } catch {
+    return null;
+  }
+}
+function watchCollectorSource(entry) {
+  const loaded = sourceFingerprint(entry);
+  let last = statSync(entry);
+  return { fingerprint: loaded, changed: () => {
+    try {
+      const current = statSync(entry);
+      if (current.ino === last.ino && current.size === last.size && current.mtimeMs === last.mtimeMs) return false;
+      last = current;
+      return sourceFingerprint(entry) !== loaded;
+    } catch {
+      return false;
+    }
+  } };
+}
 function readOwner(root2) {
   try {
     const value = JSON.parse(readFileSync(ownerFile(root2), "utf8"));
@@ -180,7 +221,7 @@ function collectorLock(root2) {
     }
   };
   refresh();
-  return { exec: (sql) => db.exec(sql), refresh, close: () => {
+  return { id, exec: (sql) => db.exec(sql), refresh, close: () => {
     if (closed) return;
     closed = true;
     try {
@@ -193,11 +234,38 @@ function collectorLock(root2) {
     }
   } };
 }
-var ownerLifetimeMs, ownerFile;
+function collectorActive(root2) {
+  const owner = readOwner(root2), now = Date.now();
+  if (owner && owner.expiresAt > now && owner.expiresAt <= now + ownerLifetimeMs) {
+    try {
+      process.kill(owner.pid, 0);
+      return true;
+    } catch {
+    }
+  }
+  const file2 = join2(root2, "usage", "collector-lock.sqlite");
+  if (!existsSync(file2)) return false;
+  try {
+    const db = new DatabaseSync2(file2, { readOnly: true });
+    try {
+      db.exec("PRAGMA busy_timeout=0");
+      db.prepare("PRAGMA schema_version").get();
+      return false;
+    } finally {
+      db.close();
+    }
+  } catch {
+    return true;
+  }
+}
+var ownerLifetimeMs, targetFile, sourceFingerprint, runtimeKeys, ownerFile;
 var init_ownership = __esm({
   "src/usage/ownership.ts"() {
     "use strict";
     ownerLifetimeMs = 6e4;
+    targetFile = (root2) => join2(root2, "usage", "collector-target.json");
+    sourceFingerprint = (entry) => createHash("sha256").update(readFileSync(entry)).digest("hex");
+    runtimeKeys = ["APILIFT_URL", "CODEX_HOME", "CLAUDE_CONFIG_DIR", "APILIFT_BIN", "APILIFT_DEV_PLUGIN_ROOT"];
     ownerFile = (root2) => join2(root2, "usage", "collector-owner.json");
   }
 });
@@ -28441,8 +28509,8 @@ var init_baselines = __esm({
 });
 
 // src/usage/transcript.ts
-import { createHash } from "node:crypto";
-import { closeSync, openSync, readSync, readdirSync, statSync } from "node:fs";
+import { createHash as createHash2 } from "node:crypto";
+import { closeSync, openSync, readSync, readdirSync, statSync as statSync2 } from "node:fs";
 import { homedir as homedir2, platform as platform2 } from "node:os";
 import { basename, join as join5 } from "node:path";
 import { DatabaseSync as DatabaseSync4 } from "node:sqlite";
@@ -28528,7 +28596,7 @@ function commandIdentity(command) {
   let argv = words.slice(index + 1);
   if (argv[0] === "--session") argv = argv.slice(2);
   if (!argv.length) return null;
-  return { key: argv.slice(0, 3).join(" "), argumentHash: createHash("sha256").update(JSON.stringify(argv)).digest("hex") };
+  return { key: argv.slice(0, 3).join(" "), argumentHash: createHash2("sha256").update(JSON.stringify(argv)).digest("hex") };
 }
 function commandKey(command) {
   return commandIdentity(command)?.key ?? null;
@@ -28591,7 +28659,7 @@ function transcriptPaths(agent2, nativeId, env, limit = 64) {
   for (const root2 of roots) walk(root2, token, limit, found);
   return [...new Set(found)].slice(0, limit).filter((path2) => {
     try {
-      return statSync(path2).isFile();
+      return statSync2(path2).isFile();
     } catch {
       return false;
     }
@@ -28627,7 +28695,7 @@ var init_transcript = __esm({
       provider = null;
       thread = null;
       lastAt = null;
-      hash = createHash("sha256");
+      hash = createHash2("sha256");
       head = Buffer.alloc(0);
       tail = Buffer.alloc(0);
       bytes(bytes) {
@@ -28791,7 +28859,7 @@ var init_transcript = __esm({
             const command = Array.isArray(item.command) ? item.command.map(text) : [];
             const args = command.some((arg) => /^-[a-z]*c$/u.test(arg)) ? command.at(-1) : command.length ? command.join(" ") : text(item.command);
             const start = num(payload.started_at_ms) ?? at, stop = num(payload.completed_at_ms) ?? at;
-            const parents = [...this.tools.values()].filter((t) => !t.structured && t.name === "exec" && t.returnedAt === null && (t.calledAt ?? Infinity) <= (start ?? -Infinity));
+            const parents = [...this.tools.values()].filter((t) => !t.structured && t.name === "exec" && (t.calledAt ?? Infinity) <= (start ?? -Infinity) && (t.returnedAt === null || start !== null && start <= t.returnedAt));
             const parent = parents.length === 1 ? parents[0] : null;
             const req = parent ? this.facts.requests[parent.request] : this.current ?? this.request(start);
             const tool = this.call(id, "exec_command", args, start, req, true, parent?.id ?? null);
@@ -28860,8 +28928,8 @@ var init_transcript = __esm({
         }
         this.facts.records.sort((a, b2) => (a.startedAt ?? Infinity) - (b2.startedAt ?? Infinity));
         this.facts.sourceHash = this.hash.digest("hex");
-        this.facts.headHash = createHash("sha256").update(this.head).digest("hex");
-        this.facts.tailHash = createHash("sha256").update(this.tail).digest("hex");
+        this.facts.headHash = createHash2("sha256").update(this.head).digest("hex");
+        this.facts.tailHash = createHash2("sha256").update(this.tail).digest("hex");
         return this.facts;
       }
     };
@@ -163473,7 +163541,7 @@ var init_pricing = __esm({
 });
 
 // src/usage/measurement.ts
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash3 } from "node:crypto";
 import { readFileSync as readFileSync3 } from "node:fs";
 function largestRemainder(total, weights) {
   const positive = weights.map((v2) => Math.max(0, Math.floor(v2))), sum = positive.reduce((a, b2) => a + b2, 0);
@@ -163539,11 +163607,13 @@ function matchesCommand(row, tool) {
     return false;
   }
   const expected = argv[0] === "--session" ? argv.slice(2) : argv;
-  return tool.category === "apilift" && tool.argumentHash === createHash2("sha256").update(JSON.stringify(expected)).digest("hex");
+  return tool.category === "apilift" && tool.argumentHash === createHash3("sha256").update(JSON.stringify(expected)).digest("hex");
 }
 function invocationMatches(row, facts) {
   if (row.agent !== facts.runtime || row.session_id && !row.session_id.includes(":label:") && facts.sessionId && row.session_id !== `${facts.runtime}:${facts.sessionId}`) return [];
-  return facts.requests.flatMap((request) => request.tools.filter((t) => t.accounting && t.receipts.includes(row.id) && (!facts.sessionId || !t.thread || t.thread === facts.sessionId)).map((tool) => ({ request, tool })));
+  const matches = facts.requests.flatMap((request) => request.tools.filter((t) => t.accounting && t.receipts.includes(row.id) && (!facts.sessionId || !t.thread || t.thread === facts.sessionId)).map((tool) => ({ request, tool })));
+  const originating = matches.filter(({ tool }) => tool.structured && matchesCommand(row, tool));
+  return originating.length ? originating : matches;
 }
 function sessionMatches(sessionId, facts, rows) {
   if (facts.sessionId && sessionId === `${facts.runtime}:${facts.sessionId}`) return true;
@@ -163750,13 +163820,33 @@ __export(collector_exports, {
   collectorLock: () => collectorLock,
   countPending: () => countPending,
   deliverPending: () => deliverPending,
+  hasPendingUsage: () => hasPendingUsage,
   largestRemainder: () => largestRemainder,
   reconcile: () => reconcile,
   reconcileBaselines: () => reconcileBaselines,
-  reconcilePending: () => reconcilePending
+  reconcilePending: () => reconcilePending,
+  upgradeMeasurementAdapter: () => upgradeMeasurementAdapter
 });
-import { rmSync as rmSync2, statSync as statSync2 } from "node:fs";
-import { createHash as createHash3 } from "node:crypto";
+import { rmSync as rmSync2, statSync as statSync3 } from "node:fs";
+import { createHash as createHash4 } from "node:crypto";
+function upgradeMeasurementAdapter(ledger) {
+  const previous = ledger.db.prepare("SELECT value FROM usage_meta WHERE key='measurement_adapter_revision'").get();
+  if (previous && Number(previous.value) >= ADAPTER_REVISION) return;
+  ledger.db.exec("BEGIN IMMEDIATE");
+  try {
+    ledger.db.prepare("UPDATE invocation SET revision=revision+1,measurement_json=NULL,status='pending',attempts=0,next_attempt_at=0 WHERE execution_id IS NOT NULL AND finished_at>=? AND measurement_json IS NOT NULL AND (session_id LIKE '%:label:%' OR json_extract(measurement_json,'$.coverage')='unavailable' OR json_extract(measurement_json,'$.timeCoverage')='unavailable' OR json_extract(measurement_json,'$.provider') IS NULL OR json_extract(measurement_json,'$.model') IS NULL)").run(new Date(Date.now() - 7 * 864e5).toISOString());
+    ledger.db.prepare("INSERT INTO usage_meta(key,value) VALUES ('measurement_adapter_revision',?) ON CONFLICT(key) DO UPDATE SET value=excluded.value").run(String(ADAPTER_REVISION));
+    ledger.db.exec("COMMIT");
+  } catch (error62) {
+    ledger.db.exec("ROLLBACK");
+    throw error62;
+  }
+}
+function hasPendingUsage(ledger) {
+  if (ledger.db.prepare("SELECT count(*) AS n FROM invocation WHERE output_path IS NOT NULL OR (execution_id IS NOT NULL AND status='pending')").get().n) return true;
+  if (!ledger.db.prepare("SELECT 1 FROM sqlite_master WHERE type='table' AND name='baseline_candidate'").get()) return false;
+  return new BaselineStore(ledger).rows().some((row) => row.status === "pending" && baselineEligible(row));
+}
 function countPending(ledger) {
   for (const row of ledger.pendingOutput()) {
     if (!row.output_path) continue;
@@ -163793,7 +163883,8 @@ function reconcilePending(ledger, env, now = Date.now(), scan = new TranscriptSc
     if (!facts && (scan.deferred || now - Date.parse(row.finished_at) < THIRTY_MINUTES)) continue;
     const actual = reconcile(row, facts);
     const purpose = row.command_key === "run" && row.session_id ? "productive" : row.purpose;
-    const payload = { id: row.id, executionId: row.execution_id, revision: row.revision, purpose, session: ledger.pseudonym(row.agent, row.session_id), worker: ledger.pseudonym(row.agent, row.session_id), durationMs: actual.durationMs, tokens: actual.input !== null && actual.output !== null ? { input: actual.input, output: actual.output } : null, coverage: actual.coverage, timeCoverage: actual.timeCoverage, provider: actual.provider, model: actual.model };
+    const identity = actual.linked && facts?.sessionId ? `${row.agent}:${facts.sessionId}` : row.session_id;
+    const payload = { id: row.id, executionId: row.execution_id, revision: row.revision, purpose, session: ledger.pseudonym(row.agent, identity), worker: ledger.pseudonym(row.agent, identity), durationMs: actual.durationMs, tokens: actual.input !== null && actual.output !== null ? { input: actual.input, output: actual.output } : null, coverage: actual.coverage, timeCoverage: actual.timeCoverage, provider: actual.provider, model: actual.model };
     const checked = executionMeasurementSchema.safeParse(payload);
     if (checked.success) ledger.db.prepare("UPDATE invocation SET measurement_json=?,status='pending' WHERE id=?").run(JSON.stringify(checked.data), row.id);
     else ledger.db.prepare("UPDATE invocation SET status='rejected' WHERE id=?").run(row.id);
@@ -163878,6 +163969,7 @@ async function collectOnce(dataRoot2, env, fetcher = fetch) {
     if (!installation) return;
     await flushExecutionReports(createCliApi(new URL(env.APILIFT_URL || "https://apilift.dev").origin, fetcher, installation.token), state);
     ledger.clearForAccountChange(installation.accountId);
+    upgradeMeasurementAdapter(ledger);
     countPending(ledger);
     const scan = new TranscriptScan(ledger);
     reconcilePending(ledger, env, Date.now(), scan);
@@ -163889,7 +163981,7 @@ async function collectOnce(dataRoot2, env, fetcher = fetch) {
     state.close();
   }
 }
-var THIRTY_MINUTES, scans, TranscriptScan;
+var THIRTY_MINUTES, ADAPTER_REVISION, scans, TranscriptScan;
 var init_collector = __esm({
   "src/usage/collector.ts"() {
     "use strict";
@@ -163904,6 +163996,7 @@ var init_collector = __esm({
     init_measurement();
     init_ownership();
     THIRTY_MINUTES = 30 * 6e4;
+    ADAPTER_REVISION = 2;
     scans = /* @__PURE__ */ new Map();
     TranscriptScan = class {
       constructor(ledger) {
@@ -163916,7 +164009,7 @@ var init_collector = __esm({
         if (this.cache.has(path2)) return this.cache.get(path2);
         let stat;
         try {
-          stat = statSync2(path2);
+          stat = statSync3(path2);
         } catch {
           return null;
         }
@@ -163953,7 +164046,7 @@ var init_collector = __esm({
           entry.mtime = stat.mtimeMs;
         }
         const facts = entry.facts;
-        const pathHash = createHash3("sha256").update(path2).digest("hex");
+        const pathHash = createHash4("sha256").update(path2).digest("hex");
         const previous = this.ledger.db.prepare("SELECT source_hash,head_hash,bytes,gap FROM source_observation WHERE path_hash=?").get(pathHash);
         if (previous) {
           const replaced = facts.bytes < previous.bytes || facts.bytes === previous.bytes && facts.sourceHash !== previous.source_hash || previous.head_hash !== null && previous.bytes >= 4096 && facts.headHash !== previous.head_hash;
@@ -163973,9 +164066,51 @@ var init_collector = __esm({
 // src/bin/collector.ts
 init_state();
 init_ownership();
-init_ledger();
 import { enableCompileCache } from "node:module";
 
+// src/usage/process.ts
+init_ownership();
+init_state();
+
+// src/process.ts
+import { spawn } from "node:child_process";
+function backgroundOptions(env) {
+  return { detached: true, windowsHide: true, stdio: "ignore", env };
+}
+function startBackground(script, env, onError) {
+  const child = spawn(process.execPath, [script], backgroundOptions(env));
+  child.once("error", onError);
+  child.unref();
+  return child;
+}
+
+// src/usage/process.ts
+import { existsSync as existsSync2 } from "node:fs";
+import { fileURLToPath } from "node:url";
+function startCollector(env) {
+  if (process.env.VITEST || env.VITEST || env.APILIFT_COLLECTOR_DISABLED === "1") return;
+  const entry = fileURLToPath(new URL("./apilift-collector.js", import.meta.url));
+  if (!existsSync2(entry)) return;
+  const root2 = dataRoot(env);
+  if (collectorActive(root2)) {
+    try {
+      requestCollectorTarget(root2, entry, env);
+    } catch {
+    }
+    return;
+  }
+  try {
+    startBackground(entry, env, () => {
+    });
+  } catch {
+  }
+}
+
+// src/bin/collector.ts
+import { spawn as spawn2 } from "node:child_process";
+init_ledger();
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+
 // src/analytics.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
 
@@ -164157,10 +164292,22 @@ enableCompileCache();
 var root = dataRoot(process.env);
 var held = collectorLock(root);
 if (held) {
+  let restart = false;
+  let target = null;
   let lastActivity = Date.now();
   try {
-    const { collectOnce: collectOnce2 } = await Promise.resolve().then(() => (init_collector(), collector_exports));
+    const source = watchCollectorSource(fileURLToPath2(import.meta.url));
+    const { collectOnce: collectOnce2, hasPendingUsage: hasPendingUsage2 } = await Promise.resolve().then(() => (init_collector(), collector_exports));
     for (; ; ) {
+      target = collectorTarget(root, held.id, source.fingerprint);
+      if (target) {
+        restart = true;
+        break;
+      }
+      if (source.changed()) {
+        restart = true;
+        break;
+      }
       held.refresh();
       await collectOnce2(root, process.env);
       const state = new LocalState(root), ledger = new UsageLedger(root);
@@ -164173,8 +164320,7 @@ if (held) {
         }
         if (refresh === "unauthorized") break;
         await analytics.flush();
-        const waiting = ledger.db.prepare("SELECT count(*) AS n FROM invocation WHERE output_path IS NOT NULL OR (execution_id IS NOT NULL AND measurement_json IS NULL) OR status='pending'").get().n;
-        if (waiting) lastActivity = Date.now();
+        if (hasPendingUsage2(ledger)) lastActivity = Date.now();
       } finally {
         ledger.close();
         state.close();
@@ -164187,4 +164333,18 @@ if (held) {
     held.exec("ROLLBACK");
     held.close();
   }
+  if (restart && target) {
+    const env = { ...process.env, APILIFT_HOME: root };
+    for (const [key, value] of Object.entries(target.env)) {
+      if (value === null) delete env[key];
+      else env[key] = value;
+    }
+    try {
+      const next = spawn2(target.interpreter, [target.entry], backgroundOptions(env));
+      next.once("error", () => {
+      });
+      next.unref();
+    } catch {
+    }
+  } else if (restart) startCollector(process.env);
 }

package/dist/apilift-session-audit.js

@@ -134731,7 +134731,7 @@ var TranscriptParser = class {
         const command = Array.isArray(item.command) ? item.command.map(text) : [];
         const args = command.some((arg) => /^-[a-z]*c$/u.test(arg)) ? command.at(-1) : command.length ? command.join(" ") : text(item.command);
         const start = num(payload.started_at_ms) ?? at, stop = num(payload.completed_at_ms) ?? at;
-        const parents = [...this.tools.values()].filter((t) => !t.structured && t.name === "exec" && t.returnedAt === null && (t.calledAt ?? Infinity) <= (start ?? -Infinity));
+        const parents = [...this.tools.values()].filter((t) => !t.structured && t.name === "exec" && (t.calledAt ?? Infinity) <= (start ?? -Infinity) && (t.returnedAt === null || start !== null && start <= t.returnedAt));
         const parent = parents.length === 1 ? parents[0] : null;
         const req = parent ? this.facts.requests[parent.request] : this.current ?? this.request(start);
         const tool = this.call(id, "exec_command", args, start, req, true, parent?.id ?? null);
@@ -134978,7 +134978,9 @@ function matchesCommand(row, tool) {
 }
 function invocationMatches(row, facts) {
   if (row.agent !== facts.runtime || row.session_id && !row.session_id.includes(":label:") && facts.sessionId && row.session_id !== `${facts.runtime}:${facts.sessionId}`) return [];
-  return facts.requests.flatMap((request) => request.tools.filter((t) => t.accounting && t.receipts.includes(row.id) && (!facts.sessionId || !t.thread || t.thread === facts.sessionId)).map((tool) => ({ request, tool })));
+  const matches = facts.requests.flatMap((request) => request.tools.filter((t) => t.accounting && t.receipts.includes(row.id) && (!facts.sessionId || !t.thread || t.thread === facts.sessionId)).map((tool) => ({ request, tool })));
+  const originating = matches.filter(({ tool }) => tool.structured && matchesCommand(row, tool));
+  return originating.length ? originating : matches;
 }
 function sessionMatches(sessionId, facts, rows) {
   if (facts.sessionId && sessionId === `${facts.runtime}:${facts.sessionId}`) return true;

package/dist/apilift.js

@@ -35949,9 +35949,25 @@ var init_analytics2 = __esm({
 });
 
 // src/usage/ownership.ts
-import { mkdirSync as mkdirSync11, chmodSync as chmodSync7, existsSync as existsSync6, readFileSync as readFileSync10, writeFileSync as writeFileSync10, renameSync as renameSync4, unlinkSync as unlinkSync4 } from "node:fs";
-import { join as join15 } from "node:path";
+import { mkdirSync as mkdirSync11, chmodSync as chmodSync7, existsSync as existsSync6, readFileSync as readFileSync10, writeFileSync as writeFileSync10, renameSync as renameSync4, unlinkSync as unlinkSync4, statSync as statSync3 } from "node:fs";
+import { createHash as createHash6, randomUUID as randomUUID12 } from "node:crypto";
+import { join as join15, dirname as dirname9, isAbsolute as isAbsolute2 } from "node:path";
 import { DatabaseSync as DatabaseSync6 } from "node:sqlite";
+function requestCollectorTarget(root, entry2, env) {
+  const owner = readOwner(root);
+  if (!owner) return;
+  const pending = join15(root, "usage", `.collector-target-${randomUUID12()}`);
+  try {
+    const target = { owner: owner.id, entry: entry2, interpreter: process.execPath, fingerprint: sourceFingerprint(entry2), env: Object.fromEntries(runtimeKeys.map((key) => [key, env[key] ?? null])) };
+    writeFileSync10(pending, JSON.stringify(target), { mode: 384 });
+    renameSync4(pending, targetFile(root));
+  } finally {
+    try {
+      unlinkSync4(pending);
+    } catch {
+    }
+  }
+}
 function readOwner(root) {
   try {
     const value = JSON.parse(readFileSync10(ownerFile(root), "utf8"));
@@ -35984,11 +36000,14 @@ function collectorActive(root) {
     return true;
   }
 }
-var ownerLifetimeMs, ownerFile;
+var ownerLifetimeMs, targetFile, sourceFingerprint, runtimeKeys, ownerFile;
 var init_ownership = __esm({
   "src/usage/ownership.ts"() {
     "use strict";
     ownerLifetimeMs = 6e4;
+    targetFile = (root) => join15(root, "usage", "collector-target.json");
+    sourceFingerprint = (entry2) => createHash6("sha256").update(readFileSync10(entry2)).digest("hex");
+    runtimeKeys = ["APILIFT_URL", "CODEX_HOME", "CLAUDE_CONFIG_DIR", "APILIFT_BIN", "APILIFT_DEV_PLUGIN_ROOT"];
     ownerFile = (root) => join15(root, "usage", "collector-owner.json");
   }
 });
@@ -35999,7 +36018,15 @@ import { fileURLToPath as fileURLToPath3 } from "node:url";
 function startCollector(env) {
   if (process.env.VITEST || env.VITEST || env.APILIFT_COLLECTOR_DISABLED === "1") return;
   const entry2 = fileURLToPath3(new URL("./apilift-collector.js", import.meta.url));
-  if (!existsSync7(entry2) || collectorActive(dataRoot(env))) return;
+  if (!existsSync7(entry2)) return;
+  const root = dataRoot(env);
+  if (collectorActive(root)) {
+    try {
+      requestCollectorTarget(root, entry2, env);
+    } catch {
+    }
+    return;
+  }
   try {
     startBackground(entry2, env, () => {
     });
@@ -38050,11 +38077,11 @@ var init_compat2 = __esm({
 });
 
 // src/native-host/registration.ts
-import { createHash as createHash6, randomUUID as randomUUID12 } from "node:crypto";
+import { createHash as createHash7, randomUUID as randomUUID13 } from "node:crypto";
 import { execFileSync as execFileSync2 } from "node:child_process";
 import { mkdirSync as mkdirSync12, writeFileSync as writeFileSync11 } from "node:fs";
 import { homedir as homedir3, platform as platform2 } from "node:os";
-import { dirname as dirname9, isAbsolute as isAbsolute2, join as join16, resolve as resolve8 } from "node:path";
+import { dirname as dirname10, isAbsolute as isAbsolute3, join as join16, resolve as resolve8 } from "node:path";
 import { chmod as chmod2, mkdir, readFile, rename as rename2, writeFile, copyFile, rm, stat } from "node:fs/promises";
 function batchLiteral(value) {
   if (/["\r\n\0]/u.test(value)) throw new Error("Native host launcher values contain unsupported control characters");
@@ -38129,7 +38156,7 @@ async function registerNativeHost(options2) {
   const hostName = options2.hostName ?? "com.apilift.browser";
   if (!hostNames.has(hostName)) throw new Error("Unknown Apilift native host name");
   if (!validId.test(options2.extensionId)) throw new Error("Extension id must be 32 a\u2013p characters");
-  if (![options2.root, options2.hostScript, options2.nodePath ?? process.execPath].every(isAbsolute2)) throw new Error("Native host paths must be absolute");
+  if (![options2.root, options2.hostScript, options2.nodePath ?? process.execPath].every(isAbsolute3)) throw new Error("Native host paths must be absolute");
   const siteUrl2 = options2.siteUrl ? new URL(options2.siteUrl) : null;
   if (siteUrl2 && (!["http:", "https:"].includes(siteUrl2.protocol) || siteUrl2.origin !== options2.siteUrl)) throw new Error("Native host site URL must be an http(s) origin");
   const root = resolve8(options2.root), hostScript = resolve8(options2.hostScript), nodePath = resolve8(options2.nodePath ?? process.execPath);
@@ -38140,7 +38167,7 @@ async function registerNativeHost(options2) {
   const manifests = [manifest];
   if (platform2() === "linux" && !env.APILIFT_NATIVE_MESSAGING_DIR) {
     for (const browser of ["google-chrome-beta", "google-chrome-unstable", "chromium"]) {
-      const profile = join16(dirname9(dirname9(manifestRoot)), browser);
+      const profile = join16(dirname10(dirname10(manifestRoot)), browser);
       if (await stat(profile).then((value) => value.isDirectory()).catch(() => false)) manifests.push(join16(profile, "NativeMessagingHosts", `${hostName}.json`));
     }
   }
@@ -38174,7 +38201,7 @@ async function registerNativeHost(options2) {
   const launcherText = nativeLauncher({ root, hostName, nodePath, hostScript, manifestRoot, site: siteUrl2?.origin }, platform2() === "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 (path2, bytes, mode) => {
-    const temp = join16(dirname9(path2), `.${hostName}-${randomUUID12()}.tmp`);
+    const temp = join16(dirname10(path2), `.${hostName}-${randomUUID13()}.tmp`);
     try {
       await writeFile(temp, bytes, { mode, flag: "wx" });
       await chmod2(temp, mode);
@@ -38185,7 +38212,7 @@ async function registerNativeHost(options2) {
   };
   await atomicWrite(launcher, launcherText, platform2() === "win32" ? 384 : 448);
   for (const path2 of manifests) {
-    await mkdir(dirname9(path2), { recursive: true, mode: 448 });
+    await mkdir(dirname10(path2), { recursive: true, mode: 448 });
     await atomicWrite(path2, manifestText, 384);
   }
   const receipt = { ...previous, [launcher]: fingerprint(launcherText), ...Object.fromEntries(manifests.map((path2) => [path2, fingerprint(manifestText)])) };
@@ -38197,17 +38224,17 @@ var fingerprint, hostNames, validId, posixQuote, absoluteEnv;
 var init_registration = __esm({
   "src/native-host/registration.ts"() {
     "use strict";
-    fingerprint = (bytes) => createHash6("sha256").update(bytes).digest("hex");
+    fingerprint = (bytes) => createHash7("sha256").update(bytes).digest("hex");
     hostNames = /* @__PURE__ */ new Set(["com.apilift.browser", "com.apilift.browser.dev"]);
     validId = /^[a-p]{32}$/;
     posixQuote = (value) => `'${value.replaceAll("'", "'\\''")}'`;
-    absoluteEnv = (value) => value && isAbsolute2(value) ? value : void 0;
+    absoluteEnv = (value) => value && isAbsolute3(value) ? value : void 0;
   }
 });
 
 // src/update.ts
 import { fileURLToPath as fileURLToPath4 } from "node:url";
-import { dirname as dirname10, join as join17, resolve as resolve9, sep, isAbsolute as isAbsolute3 } from "node:path";
+import { dirname as dirname11, join as join17, resolve as resolve9, sep, isAbsolute as isAbsolute4 } from "node:path";
 import { mkdirSync as mkdirSync13, realpathSync as realpathSync2, writeFileSync as writeFileSync12, readFileSync as readFileSync11 } from "node:fs";
 import { DatabaseSync as DatabaseSync7 } from "node:sqlite";
 function globalPackage(script2, prefix) {
@@ -38230,7 +38257,7 @@ async function pnpmInstallations(runner, env) {
     if (!Array.isArray(groups)) return [];
     return groups.flatMap((group) => {
       const pkg = group?.dependencies?.["@apilift/cli"];
-      return pkg && typeof pkg.path === "string" && isAbsolute3(pkg.path) && typeof pkg.version === "string" ? [{ entrypoint: join17(pkg.path, "dist", "apilift.js"), version: pkg.version }] : [];
+      return pkg && typeof pkg.path === "string" && isAbsolute4(pkg.path) && typeof pkg.version === "string" ? [{ entrypoint: join17(pkg.path, "dist", "apilift.js"), version: pkg.version }] : [];
     });
   } catch {
     return [];
@@ -38324,10 +38351,10 @@ async function updateCli(options2, onInstalled) {
         const candidates = (await pnpmInstallations(runner, options2.env)).filter((candidate2) => candidate2.version === latest);
         if (candidates.length !== 1) throw new Error("Updated pnpm installation is ambiguous or unavailable");
         entrypoint = candidates[0].entrypoint;
-        const pkg = JSON.parse(readFileSync11(join17(dirname10(entrypoint), "..", "package.json"), "utf8"));
+        const pkg = JSON.parse(readFileSync11(join17(dirname11(entrypoint), "..", "package.json"), "utf8"));
         if (pkg.name !== "@apilift/cli" || pkg.version !== latest) throw new Error("Updated pnpm package could not be verified");
       }
-      await registerNativeHost({ root: options2.root, hostScript: join17(dirname10(entrypoint), "apilift-native-host.js"), extensionId: options2.env.APILIFT_DEV_EXTENSION_ID || STORE_EXTENSION_ID, hostName: options2.env.APILIFT_NATIVE_HOST_NAME, siteUrl: options2.site, env: options2.env });
+      await registerNativeHost({ root: options2.root, hostScript: join17(dirname11(entrypoint), "apilift-native-host.js"), extensionId: options2.env.APILIFT_DEV_EXTENSION_ID || STORE_EXTENSION_ID, hostName: options2.env.APILIFT_NATIVE_HOST_NAME, siteUrl: options2.site, env: options2.env });
       for (const agent2 of linkedAgents) {
         if (!ensureAgentPlugin(agent2, options2.env).ready) throw new Error("Updated agent plugin activation is unverified");
       }
@@ -38368,9 +38395,9 @@ var init_update = __esm({
 });
 
 // src/setup-check.ts
-import { createHash as createHash7, randomUUID as randomUUID13 } from "node:crypto";
+import { createHash as createHash8, randomUUID as randomUUID14 } from "node:crypto";
 import { existsSync as existsSync8, readFileSync as readFileSync12, realpathSync as realpathSync3, writeFileSync as writeFileSync13 } from "node:fs";
-import { dirname as dirname11, join as join18 } from "node:path";
+import { dirname as dirname12, join as join18 } from "node:path";
 async function setupCheckBody(client, scopeId, value) {
   if (typeof value.body === "string") return Buffer.byteLength(value.body, "utf8") <= maxCheckBodyBytes ? value.body : null;
   if (value.body != null) return null;
@@ -38378,7 +38405,7 @@ async function setupCheckBody(client, scopeId, value) {
   if (!artifact || typeof artifact.sha256 !== "string" || !/^[0-9a-f]{64}$/.test(artifact.sha256) || !Number.isInteger(artifact.bytes) || Number(artifact.bytes) < 1 || Number(artifact.bytes) > maxCheckBodyBytes || artifact.encoding !== "utf-8") return null;
   try {
     const bytes = await client.blob(scopeId, artifact.sha256);
-    if (!bytes || bytes.length !== artifact.bytes || createHash7("sha256").update(bytes).digest("hex") !== artifact.sha256) return null;
+    if (!bytes || bytes.length !== artifact.bytes || createHash8("sha256").update(bytes).digest("hex") !== artifact.sha256) return null;
     return new TextDecoder("utf-8", { fatal: true }).decode(bytes);
   } catch {
     return null;
@@ -38386,7 +38413,7 @@ async function setupCheckBody(client, scopeId, value) {
 }
 async function registerSetupHost(root, site, env) {
   const script2 = realpathSync3(process.argv[1]);
-  const hostScript = join18(dirname11(script2), "apilift-native-host.js");
+  const hostScript = join18(dirname12(script2), "apilift-native-host.js");
   if (!existsSync8(hostScript)) throw new Error("The native host binary is missing beside the Apilift CLI");
   await registerNativeHost({ root, hostScript, extensionId: env.APILIFT_DEV_EXTENSION_ID || storeExtensionId, hostName: env.APILIFT_NATIVE_HOST_NAME, siteUrl: site, env });
 }
@@ -38400,13 +38427,13 @@ function setupChallenge(root, agent2, site) {
     if (new URL(saved.url).origin === site && Number.isFinite(saved.createdAt) && Date.now() - saved.createdAt < 10 * 6e4) return saved;
   } catch {
   }
-  const challenge = { url: `${site}/setup-check?challenge=${randomUUID13()}`, createdAt: Date.now() };
+  const challenge = { url: `${site}/setup-check?challenge=${randomUUID14()}`, createdAt: Date.now() };
   writeFileSync13(file2, JSON.stringify(challenge), { mode: 384 });
   return challenge;
 }
 async function setupBridge(root) {
   const startedAt = Date.now();
-  const script2 = join18(dirname11(realpathSync3(process.argv[1])), "apilift-capture-server.js");
+  const script2 = join18(dirname12(realpathSync3(process.argv[1])), "apilift-capture-server.js");
   const client = await ensureCaptureServer({ root, script: script2, version: cliVersion });
   if (!client.legacyBridge) await waitForBridge(root, cliVersion, Math.max(0, 9e4 - (Date.now() - startedAt)), () => client.bridgeDemand(), client.receipt.version);
   return client;
@@ -38446,7 +38473,7 @@ async function verifySetupCheck(root, challenge) {
   }
   if (candidates.length !== 1) return { ok: false, reason: candidates.length ? "More than one exact check tab matched" : "The extension did not report the exact check tab within 10 seconds" };
   const execute = await client.openScope({ kind: "execute", tabSelector: candidates[0].selector, ...scopeInput });
-  const id2 = randomUUID13();
+  const id2 = randomUUID14();
   try {
     await client.enqueueJob(execute.id, { job: { id: id2, kind: "replay", effect: "read", method: "GET", url: challenge.url, headers: {}, pageOrigin, allowedRequestOrigin: pageOrigin, timeoutMs: 2e4 } });
     const deadline = Date.now() + 3e4;

package/dist/plugin/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "apilift",
-  "version": "1.4.35",
+  "version": "1.4.37",
   "description": "Use logged-in apps and discover missing actions with Apilift.",
   "author": {
     "name": "Apilift"

package/dist/plugin/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "apilift",
-  "version": "1.4.35",
+  "version": "1.4.37",
   "description": "Use logged-in apps and discover missing actions with Apilift.",
   "author": {
     "name": "Apilift"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apilift/cli",
-  "version": "1.4.35",
+  "version": "1.4.37",
   "private": false,
   "type": "module",
   "bin": {
@@ -36,7 +36,7 @@
   "engines": {
     "node": ">=24.16.0 <27"
   },
-  "gitHead": "6cc5ff47bf97a681f4b379d006679203bb88d293",
+  "gitHead": "e08008c496f41cb177195b7f8afca5e6f0373c82",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/egor-sergeev/apilift.git",