rigscope 0.1.2 → 0.1.4

package/dist/collector.cjs

@@ -128,7 +128,6 @@ var ConfigError = class extends Error {
 var DEFAULT_COLLECTOR_ID = "mock-collector";
 var MOCK_HOSTNAME = "mock-machine";
 var CONNECT_PATH = "/api/collector/connect";
-var PREVIOUS_CONNECT_PATH = "/api/collector/v1/connect";
 var MAX_DESTINATIONS = 8;
 var DEFAULT_INTERVAL_MS = 1e3;
 var MIN_INTERVAL_MS = 100;
@@ -205,7 +204,6 @@ function validateHubUrl(raw, label, issues) {
     issues.push(`${label}: URL must include a host`);
     return null;
   }
-  if (parsed.pathname === PREVIOUS_CONNECT_PATH) parsed.pathname = CONNECT_PATH;
   if (parsed.pathname !== CONNECT_PATH) {
     issues.push(`${label}: path must be exactly ${CONNECT_PATH}`);
     return null;
@@ -520,18 +518,26 @@ function defaultStatePath() {
 function readState(path2) {
   const stat = (0, import_node_fs2.lstatSync)(path2);
   if (!stat.isFile() || stat.size > 64 * 1024 || (stat.mode & 63) !== 0) throw new Error("collector state must be a private regular file");
-  const raw = JSON.parse((0, import_node_fs2.readFileSync)(path2, "utf8"));
-  if (raw.version !== 1 || typeof raw.collectorId !== "string" || !/^[\x21-\x7e]{1,128}$/.test(raw.collectorId) || !Array.isArray(raw.destinations)) throw new Error("invalid collector state");
+  const parsed = JSON.parse((0, import_node_fs2.readFileSync)(path2, "utf8"));
+  if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) throw new Error("invalid collector state");
+  const raw = parsed;
+  if (Object.hasOwn(raw, "version") || Object.hasOwn(raw, "formatVersion")) {
+    throw new Error("collector state uses an older versioned shape; run rigscope install or upgrade to reset it");
+  }
+  if (typeof raw.collectorId !== "string" || !/^[\x21-\x7e]{1,128}$/.test(raw.collectorId) || !Array.isArray(raw.destinations)) throw new Error("invalid collector state");
   const destinations = raw.destinations.length === 0 ? [] : [...parseCollectorConfig({ COLLECTOR_HUBS: JSON.stringify(raw.destinations) }).destinations];
-  if (raw.pendingEnrollments !== void 0 && (!Array.isArray(raw.pendingEnrollments) || raw.pendingEnrollments.length > 8 || raw.pendingEnrollments.some((p) => !p || typeof p.url !== "string" || typeof p.requestId !== "string" || !/^[\x21-\x7e]{1,128}$/.test(p.requestId) || typeof p.recoverySecret !== "string" || !/^[A-Za-z0-9_-]{32,128}$/.test(p.recoverySecret)))) throw new Error("invalid pending enrollment recovery state");
-  const pendingEnrollments = raw.pendingEnrollments?.map((pending) => {
+  const pending = raw.pendingEnrollments;
+  if (pending !== void 0 && (!Array.isArray(pending) || pending.length > 8 || pending.some((p) => !p || typeof p !== "object" || typeof p.url !== "string" || typeof p.requestId !== "string" || !/^[\x21-\x7e]{1,128}$/.test(p.requestId) || typeof p.recoverySecret !== "string" || !/^[A-Za-z0-9_-]{32,128}$/.test(p.recoverySecret)))) {
+    throw new Error("invalid pending enrollment recovery state");
+  }
+  const pendingEnrollments = pending?.map((value) => {
+    const pendingEnrollment = value;
     const issues = [];
-    const url = validateHubUrl(pending.url, "pending enrollment", issues);
+    const url = validateHubUrl(pendingEnrollment.url, "pending enrollment", issues);
     if (!url || issues.length) throw new ConfigError(issues);
-    return { ...pending, url: url.href };
+    return { ...pendingEnrollment, url: url.href };
   });
   return {
-    version: 1,
     collectorId: raw.collectorId,
     destinations,
     ...pendingEnrollments === void 0 ? {} : { pendingEnrollments }
@@ -564,9 +570,14 @@ function updateInstallation(path2, change = (s) => s) {
       state = readState(path2);
     } catch (error) {
       if (error.code !== "ENOENT") throw error;
-      state = { version: 1, collectorId: (0, import_node_crypto2.randomUUID)(), destinations: [] };
+      state = { collectorId: (0, import_node_crypto2.randomUUID)(), destinations: [] };
     }
-    const next = change(state);
+    const changed = change(state);
+    const next = {
+      collectorId: changed.collectorId,
+      destinations: changed.destinations,
+      ...changed.pendingEnrollments === void 0 ? {} : { pendingEnrollments: changed.pendingEnrollments }
+    };
     temporary = `${path2}.${(0, import_node_crypto2.randomUUID)()}.tmp`;
     const out = (0, import_node_fs2.openSync)(temporary, "wx", 384);
     try {
@@ -687,154 +698,6 @@ var import_node_os2 = require("node:os");
 var import_node_fs5 = require("node:fs");
 var import_ws = require("ws");
 
-// src/contracts/telemetry.ts
-var MAX_MESSAGE_BYTES = 262144;
-var MAX_DETAIL_BYTES = 1048576;
-var MAX_BATCH_RECORDS = 32;
-var MAX_CORES = 1024;
-var MAX_GPUS = 16;
-var MAX_FILESYSTEMS = 64;
-var MAX_DISKS = 64;
-var MAX_INTERFACES = 64;
-var MAX_ADDRESSES_PER_INTERFACE = 32;
-var MAX_PROCESS_ROWS = 6e3;
-var MAX_COLLECTION_FAILURES = 32;
-var MIN_DETAIL_INTERVAL_MS = 1e3;
-var MAX_DETAIL_INTERVAL_MS = 6e4;
-var MIN_DETAIL_LEASE_MS = 5e3;
-var MAX_DETAIL_LEASE_MS = 12e4;
-var MAX_ID = 128;
-var MAX_TEXT = 256;
-var MIN_EPOCH = Date.parse("2000-01-01T00:00:00Z");
-var MAX_EPOCH = Date.parse("2200-01-01T00:00:00Z");
-var CAPABILITY_NAMES = ["metrics", "inventory", "processes"];
-var METRIC_EXTENSION_NAMES = ["bottleneck-v1"];
-var COLLECTOR_PROTOCOL_VERSION = "0.3.0";
-function parseHubMessage(value) {
-  const o = obj(value, "hub message");
-  switch (o.type) {
-    case "welcome": {
-      keys(o, ["type", "hubRunId", "machineId", "delivery", "maxInFlightBatches"], "welcome", ["metricExtensions"]);
-      if (o.delivery !== "durable") throw new Error(`invalid welcome: unexpected delivery ${desc(o.delivery)}`);
-      const welcome = { type: "welcome", hubRunId: id(o.hubRunId, "hubRunId"), machineId: id(o.machineId, "machineId"), delivery: "durable", maxInFlightBatches: int(o.maxInFlightBatches, "maxInFlightBatches", 1, 64) };
-      if (hasOwn(o, "metricExtensions")) {
-        const extensions = arr(o.metricExtensions, "welcome.metricExtensions", 1, METRIC_EXTENSION_NAMES.length).map((extension) => oneOf(extension, METRIC_EXTENSION_NAMES, "welcome.metricExtensions"));
-        if (new Set(extensions).size !== extensions.length) throw new Error("invalid welcome: metricExtensions must be unique");
-        welcome.metricExtensions = extensions;
-      }
-      return welcome;
-    }
-    case "ack": {
-      keys(o, ["type", "accepted", "rejected"], "ack", ["retryAfterMs"]);
-      const accepted = arr(o.accepted, "ack.accepted", 0, MAX_BATCH_RECORDS * 64).map((r) => parseRef(r, []));
-      const rejected = arr(o.rejected, "ack.rejected", 0, MAX_BATCH_RECORDS * 64).map((r) => {
-        const ref = parseRef(r, ["reason"]);
-        return { ...ref, reason: text(r.reason, "reason", 0, MAX_TEXT) };
-      });
-      const out = { type: "ack", accepted, rejected };
-      if (hasOwn(o, "retryAfterMs")) out.retryAfterMs = int(o.retryAfterMs, "retryAfterMs", 0, 6e5);
-      return out;
-    }
-    case "detail.subscribe":
-      keys(o, ["type", "subscriptionId", "kind", "intervalMs", "leaseMs"], "detail.subscribe");
-      if (o.kind !== "processes") throw new Error("invalid detail.subscribe: unsupported kind");
-      return {
-        type: "detail.subscribe",
-        subscriptionId: id(o.subscriptionId, "subscriptionId"),
-        kind: "processes",
-        intervalMs: int(o.intervalMs, "intervalMs", MIN_DETAIL_INTERVAL_MS, MAX_DETAIL_INTERVAL_MS),
-        leaseMs: int(o.leaseMs, "leaseMs", MIN_DETAIL_LEASE_MS, MAX_DETAIL_LEASE_MS)
-      };
-    case "detail.cancel":
-      keys(o, ["type", "subscriptionId"], "detail.cancel");
-      return { type: "detail.cancel", subscriptionId: id(o.subscriptionId, "subscriptionId") };
-    default:
-      throw new Error(`invalid hub message: unsupported type ${desc(o.type)}`);
-  }
-}
-function projectTelemetryRecordForWire(record, extensions) {
-  if (extensions.includes("bottleneck-v1") || record.kind !== "metrics") return record;
-  return { ...record, payload: projectMetricsPayloadToBaseWire(record.payload) };
-}
-function projectMetricsPayloadToBaseWire(payload) {
-  return {
-    cpu: projectCpuToBaseWire(payload.cpu),
-    memory: projectMemoryToBaseWire(payload.memory),
-    swap: payload.swap,
-    gpus: payload.gpus,
-    disks: projectDisksToBaseWire(payload.disks),
-    network: payload.network
-  };
-}
-function projectCpuToBaseWire(cpu) {
-  if (cpu.status !== "ok") return cpu;
-  return { status: "ok", usagePercent: cpu.usagePercent, perCore: [...cpu.perCore] };
-}
-function projectMemoryToBaseWire(memory) {
-  if (memory.status !== "ok") return memory;
-  return { status: "ok", usedBytes: memory.usedBytes, totalBytes: memory.totalBytes };
-}
-function projectDisksToBaseWire(disks) {
-  if (disks.status !== "ok") return disks;
-  return {
-    status: "ok",
-    filesystems: disks.filesystems.map((filesystem) => filesystem.status === "ok" ? { id: filesystem.id, status: "ok", usedBytes: filesystem.usedBytes, totalBytes: filesystem.totalBytes } : filesystem),
-    devices: disks.devices.map((device) => device.status === "ok" ? { id: device.id, status: "ok", readBytesPerSec: device.readBytesPerSec, writeBytesPerSec: device.writeBytesPerSec } : device)
-  };
-}
-function parseRef(value, extra) {
-  const o = obj(value, "record ref");
-  keys(o, ["runId", "sequence", ...extra], "record ref");
-  return { runId: id(o.runId, "runId"), sequence: int(o.sequence, "sequence", 0, Number.MAX_SAFE_INTEGER) };
-}
-function obj(value, what) {
-  if (value === null || typeof value !== "object" || Array.isArray(value)) throw new Error(`invalid ${what}: expected object, got ${desc(value)}`);
-  return value;
-}
-function keys(o, required, what, optional = []) {
-  const allowed = /* @__PURE__ */ new Set([...required, ...optional]);
-  for (const k of Object.keys(o)) if (!allowed.has(k)) throw new Error(`invalid ${what}: unexpected field "${k}"`);
-  for (const k of required) if (o[k] === void 0) throw new Error(`invalid ${what}: missing field "${k}"`);
-  for (const k of optional) if (hasOwn(o, k) && o[k] === void 0) throw new Error(`invalid ${what}: ${k} must not be undefined`);
-}
-function hasOwn(o, k) {
-  return Object.prototype.hasOwnProperty.call(o, k);
-}
-function arr(v, what, min, max) {
-  if (!Array.isArray(v)) throw new Error(`invalid ${what}: expected array`);
-  if (v.length < min || v.length > max) throw new Error(`invalid ${what}: length ${v.length} outside ${min}..${max}`);
-  return v;
-}
-function oneOf(v, options, what) {
-  if (typeof v !== "string" || !options.includes(v)) throw new Error(`invalid ${what}: unexpected value ${desc(v)}`);
-  return v;
-}
-function text(v, field, min, max) {
-  if (typeof v !== "string") throw new Error(`invalid ${field}: expected string, got ${desc(v)}`);
-  if (v.length < min || v.length > max) throw new Error(`invalid ${field}: length ${v.length} outside ${min}..${max}`);
-  return v;
-}
-function id(v, field) {
-  return text(v, field, 1, MAX_ID);
-}
-function int(v, field, min, max) {
-  if (typeof v !== "number" || !Number.isSafeInteger(v)) throw new Error(`invalid ${field}: expected safe integer, got ${desc(v)}`);
-  if (v < min || v > max) throw new Error(`invalid ${field}: ${v} outside ${min}..${max}`);
-  return v;
-}
-function desc(v) {
-  try {
-    const s = JSON.stringify(v);
-    if (typeof s === "string") return s.length <= 80 ? s : `${s.slice(0, 77)}...`;
-  } catch {
-  }
-  return String(v);
-}
-
-// src/contracts/index.ts
-var MIN_TIMESTAMP_EPOCH = Date.parse("2000-01-01T00:00:00Z");
-var MAX_TIMESTAMP_EPOCH = Date.parse("2200-01-01T00:00:00Z");
-
 // collector/destinations/budget.ts
 var DEFAULT_MAX_TOTAL_OUTBOX_BYTES = 256 * 1024 * 1024;
 var DEFAULT_MAX_TOTAL_OUTBOX_DISK_BYTES = 640 * 1024 * 1024;
@@ -959,9 +822,7 @@ function serializeRecord(record) {
   return { json, bytes: Buffer.byteLength(json, "utf8") };
 }
 function parseStoredRecord(json) {
-  const record = JSON.parse(json);
-  if (record.protocolVersion === 2) delete record.protocolVersion;
-  return record;
+  return JSON.parse(json);
 }
 function fileBytes(file) {
   try {
@@ -1025,10 +886,6 @@ var DestinationOutbox = class _DestinationOutbox {
   static open(opts) {
     const limits = { ...DEFAULT_OUTBOX_LIMITS, ...opts.limits };
     validateDiskLimit(limits.maxDiskBytes);
-    if (opts.previousDir && opts.previousDir !== opts.dir && !fs.existsSync(opts.dir) && fs.existsSync(path.join(opts.previousDir, "outbox.sqlite"))) {
-      fs.mkdirSync(path.dirname(opts.dir), { recursive: true, mode: 448 });
-      fs.renameSync(opts.previousDir, opts.dir);
-    }
     fs.mkdirSync(opts.dir, { recursive: true, mode: 448 });
     try {
       fs.chmodSync(opts.dir, 448);
@@ -1062,45 +919,15 @@ var DestinationOutbox = class _DestinationOutbox {
     db.exec(SCHEMA);
     const columns = db.prepare("PRAGMA table_info(outbox_records)").all();
     if (!columns.some((column) => column.name === "offered")) {
-      db.exec("ALTER TABLE outbox_records ADD COLUMN offered INTEGER NOT NULL DEFAULT 0");
-      db.exec("UPDATE outbox_records SET offered = 1 WHERE kind = 'gap'");
+      throw new Error("outbox must use the canonical schema; reset or reinstall the unfinished installation");
     }
     db.prepare("UPDATE outbox_records SET state = 'pending' WHERE state = 'inflight'").run();
     const outbox = new _DestinationOutbox(opts, db, limits);
     outbox.configurePhysicalLimit();
     outbox.totalBytes = outbox.readTotalBytes();
-    if (opts.previousDir && opts.previousDir !== opts.dir) outbox.importPrevious(opts.previousDir);
     opts.budget?.register(outbox);
     return outbox;
   }
-  /** A partially upgraded installation may already have both URL-based queues. */
-  importPrevious(dir) {
-    const file = path.join(dir, "outbox.sqlite");
-    if (!fs.existsSync(file)) return;
-    const previous = new import_node_sqlite.DatabaseSync(file, { readOnly: true, timeout: BUSY_TIMEOUT_MS });
-    try {
-      const columns = previous.prepare("PRAGMA table_info(outbox_records)").all();
-      const offered = columns.some((column) => column.name === "offered") ? "offered" : "CASE WHEN kind = 'gap' THEN 1 ELSE 0 END AS offered";
-      const rows = previous.prepare(`SELECT json, ${offered} FROM outbox_records ORDER BY id`);
-      const existing = this.db.prepare("SELECT id FROM outbox_records WHERE run_id = ? AND sequence = ?");
-      const markOffered = this.db.prepare("UPDATE outbox_records SET offered = 1 WHERE run_id = ? AND sequence = ?");
-      this.db.exec("BEGIN IMMEDIATE");
-      try {
-        for (const row of rows.iterate()) {
-          const record = parseStoredRecord(row.json);
-          if (!existing.get(record.runId, record.sequence)) this.insertRecord(record);
-          if (row.offered) markOffered.run(record.runId, record.sequence);
-        }
-        this.db.exec("COMMIT");
-      } catch (error) {
-        this.db.exec("ROLLBACK");
-        throw error;
-      }
-    } finally {
-      previous.close();
-    }
-    fs.rmSync(dir, { recursive: true });
-  }
   // -------------------------------------------------------------------------
   // Writes
   // -------------------------------------------------------------------------
@@ -1719,6 +1546,112 @@ var DestinationOutbox = class _DestinationOutbox {
   }
 };
 
+// src/contracts/telemetry.ts
+var MAX_MESSAGE_BYTES = 262144;
+var MAX_DETAIL_BYTES = 1048576;
+var MAX_BATCH_RECORDS = 32;
+var MAX_CORES = 1024;
+var MAX_GPUS = 16;
+var MAX_FILESYSTEMS = 64;
+var MAX_DISKS = 64;
+var MAX_INTERFACES = 64;
+var MAX_ADDRESSES_PER_INTERFACE = 32;
+var MAX_PROCESS_ROWS = 6e3;
+var MAX_COLLECTION_FAILURES = 32;
+var MIN_DETAIL_INTERVAL_MS = 1e3;
+var MAX_DETAIL_INTERVAL_MS = 6e4;
+var MIN_DETAIL_LEASE_MS = 5e3;
+var MAX_DETAIL_LEASE_MS = 12e4;
+var MAX_ID = 128;
+var MAX_TEXT = 256;
+var MIN_EPOCH = Date.parse("2000-01-01T00:00:00Z");
+var MAX_EPOCH = Date.parse("2200-01-01T00:00:00Z");
+var CAPABILITY_NAMES = ["metrics", "inventory", "processes"];
+function parseHubMessage(value) {
+  const o = obj(value, "hub message");
+  switch (o.type) {
+    case "welcome": {
+      keys(o, ["type", "hubRunId", "machineId", "delivery", "maxInFlightBatches"], "welcome");
+      if (o.delivery !== "durable") throw new Error(`invalid welcome: unexpected delivery ${desc(o.delivery)}`);
+      return { type: "welcome", hubRunId: id(o.hubRunId, "hubRunId"), machineId: id(o.machineId, "machineId"), delivery: "durable", maxInFlightBatches: int(o.maxInFlightBatches, "maxInFlightBatches", 1, 64) };
+    }
+    case "ack": {
+      keys(o, ["type", "accepted", "rejected"], "ack", ["retryAfterMs"]);
+      const accepted = arr(o.accepted, "ack.accepted", 0, MAX_BATCH_RECORDS * 64).map((r) => parseRef(r, []));
+      const rejected = arr(o.rejected, "ack.rejected", 0, MAX_BATCH_RECORDS * 64).map((r) => {
+        const ref = parseRef(r, ["reason"]);
+        return { ...ref, reason: text(r.reason, "reason", 0, MAX_TEXT) };
+      });
+      const out = { type: "ack", accepted, rejected };
+      if (hasOwn(o, "retryAfterMs")) out.retryAfterMs = int(o.retryAfterMs, "retryAfterMs", 0, 6e5);
+      return out;
+    }
+    case "detail.subscribe":
+      keys(o, ["type", "subscriptionId", "kind", "intervalMs", "leaseMs"], "detail.subscribe");
+      if (o.kind !== "processes") throw new Error("invalid detail.subscribe: unsupported kind");
+      return {
+        type: "detail.subscribe",
+        subscriptionId: id(o.subscriptionId, "subscriptionId"),
+        kind: "processes",
+        intervalMs: int(o.intervalMs, "intervalMs", MIN_DETAIL_INTERVAL_MS, MAX_DETAIL_INTERVAL_MS),
+        leaseMs: int(o.leaseMs, "leaseMs", MIN_DETAIL_LEASE_MS, MAX_DETAIL_LEASE_MS)
+      };
+    case "detail.cancel":
+      keys(o, ["type", "subscriptionId"], "detail.cancel");
+      return { type: "detail.cancel", subscriptionId: id(o.subscriptionId, "subscriptionId") };
+    default:
+      throw new Error(`invalid hub message: unsupported type ${desc(o.type)}`);
+  }
+}
+function parseRef(value, extra) {
+  const o = obj(value, "record ref");
+  keys(o, ["runId", "sequence", ...extra], "record ref");
+  return { runId: id(o.runId, "runId"), sequence: int(o.sequence, "sequence", 0, Number.MAX_SAFE_INTEGER) };
+}
+function obj(value, what) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) throw new Error(`invalid ${what}: expected object, got ${desc(value)}`);
+  return value;
+}
+function keys(o, required, what, optional = []) {
+  const allowed = /* @__PURE__ */ new Set([...required, ...optional]);
+  for (const k of Object.keys(o)) if (!allowed.has(k)) throw new Error(`invalid ${what}: unexpected field "${k}"`);
+  for (const k of required) if (o[k] === void 0) throw new Error(`invalid ${what}: missing field "${k}"`);
+  for (const k of optional) if (hasOwn(o, k) && o[k] === void 0) throw new Error(`invalid ${what}: ${k} must not be undefined`);
+}
+function hasOwn(o, k) {
+  return Object.prototype.hasOwnProperty.call(o, k);
+}
+function arr(v, what, min, max) {
+  if (!Array.isArray(v)) throw new Error(`invalid ${what}: expected array`);
+  if (v.length < min || v.length > max) throw new Error(`invalid ${what}: length ${v.length} outside ${min}..${max}`);
+  return v;
+}
+function text(v, field, min, max) {
+  if (typeof v !== "string") throw new Error(`invalid ${field}: expected string, got ${desc(v)}`);
+  if (v.length < min || v.length > max) throw new Error(`invalid ${field}: length ${v.length} outside ${min}..${max}`);
+  return v;
+}
+function id(v, field) {
+  return text(v, field, 1, MAX_ID);
+}
+function int(v, field, min, max) {
+  if (typeof v !== "number" || !Number.isSafeInteger(v)) throw new Error(`invalid ${field}: expected safe integer, got ${desc(v)}`);
+  if (v < min || v > max) throw new Error(`invalid ${field}: ${v} outside ${min}..${max}`);
+  return v;
+}
+function desc(v) {
+  try {
+    const s = JSON.stringify(v);
+    if (typeof s === "string") return s.length <= 80 ? s : `${s.slice(0, 77)}...`;
+  } catch {
+  }
+  return String(v);
+}
+
+// src/contracts/index.ts
+var MIN_TIMESTAMP_EPOCH = Date.parse("2000-01-01T00:00:00Z");
+var MAX_TIMESTAMP_EPOCH = Date.parse("2200-01-01T00:00:00Z");
+
 // collector/destinations/backoff.ts
 var DEFAULT_BASE_MS = 1e3;
 var DEFAULT_MAX_MS = 3e4;
@@ -1796,9 +1729,6 @@ var DestinationSession = class {
   outbox;
   expectedIntervalMs;
   capabilities;
-  collectorVersion;
-  /** Extensions negotiated for the current socket; empty means base wire shape. */
-  metricExtensions = [];
   socketFactory;
   welcomeTimeoutMs;
   idleTimeoutMs;
@@ -1841,9 +1771,6 @@ var DestinationSession = class {
   constructor(options) {
     assertExpectedIntervalMs(options.expectedIntervalMs);
     assertCapabilities(options.capabilities);
-    if (options.collectorVersion.length < 1 || options.collectorVersion.length > 64) {
-      throw new Error("collectorVersion must be 1..64 characters");
-    }
     const maxBatchBytes = options.maxBatchBytes ?? DEFAULT_MAX_BATCH_BYTES;
     if (!Number.isSafeInteger(maxBatchBytes) || maxBatchBytes < 1 || maxBatchBytes >= MAX_MESSAGE_BYTES) {
       throw new Error(`maxBatchBytes must be a safe integer below ${MAX_MESSAGE_BYTES}, got ${String(maxBatchBytes)}`);
@@ -1867,7 +1794,6 @@ var DestinationSession = class {
     this.outbox = options.outbox;
     this.expectedIntervalMs = options.expectedIntervalMs;
     this.capabilities = [...options.capabilities];
-    this.collectorVersion = options.collectorVersion;
     this.socketFactory = options.socketFactory;
     this.welcomeTimeoutMs = options.welcomeTimeoutMs ?? DEFAULT_WELCOME_TIMEOUT_MS;
     this.idleTimeoutMs = options.idleTimeoutMs ?? DEFAULT_IDLE_TIMEOUT_MS;
@@ -1996,7 +1922,6 @@ var DestinationSession = class {
   openSocket() {
     if (this.stopping) return;
     const epoch = ++this.epoch;
-    this.metricExtensions = [];
     this.failedEpoch = -1;
     this.status = "connecting";
     let socket;
@@ -2052,8 +1977,7 @@ var DestinationSession = class {
       bootId: this.identity.bootId,
       hostname: this.identity.hostname,
       capabilities: [...this.capabilities],
-      expectedIntervalMs: this.expectedIntervalMs,
-      collectorVersion: this.collectorVersion
+      expectedIntervalMs: this.expectedIntervalMs
     };
   }
   handleMessage(epoch, data) {
@@ -2129,7 +2053,6 @@ var DestinationSession = class {
     }
     this.status = "welcomed";
     this.welcomedAtMs = this.now();
-    this.metricExtensions = [...welcome.metricExtensions ?? []];
     this.inFlightWindow = Math.max(1, Math.min(welcome.maxInFlightBatches, this.maxLocalInFlightBatches));
     this.replayTokens = 1;
     this.lastTokenRefillMs = this.now();
@@ -2327,10 +2250,7 @@ var DestinationSession = class {
     return true;
   }
   buildSamplesMessage(mode, records) {
-    const wireRecords = records.map(
-      (record) => projectTelemetryRecordForWire(record, this.metricExtensions)
-    );
-    return JSON.stringify({ type: "samples", mode, records: wireRecords });
+    return JSON.stringify({ type: "samples", mode, records });
   }
   handleAckTimeout(batchId) {
     const batch = this.inFlight.get(batchId);
@@ -2447,7 +2367,6 @@ var HubConnection = class _HubConnection {
       outbox,
       expectedIntervalMs: effectiveIntervalMs(options.baseIntervalMs, options.endpoint.intervalMs),
       capabilities,
-      collectorVersion: options.collectorVersion,
       socketFactory: options.socketFactory,
       backoff: options.backoff,
       rand: options.rand,
@@ -2460,19 +2379,14 @@ var HubConnection = class _HubConnection {
     });
   }
   /**
-   * Opens this connection's durable outbox under its current endpoint URL,
-   * upgrades outboxes that predate the endpoint consolidation, and re-applies
-   * the privacy policy to recovered pending records so none of them can
-   * leave with forbidden fields. Sanitation never cadence-filters: retained
-   * samples were already cadence-selected when they were captured.
+   * Opens this connection's durable outbox under its canonical endpoint URL
+   * and re-applies the privacy policy to recovered pending records so none of
+   * them can leave with forbidden fields. Sanitation never cadence-filters:
+   * retained samples were already cadence-selected when they were captured.
    */
   static open(options) {
-    const dir = outboxDirFor(options.stateDir, options.endpoint.url);
-    const previousUrl = new URL(options.endpoint.url);
-    previousUrl.pathname = PREVIOUS_CONNECT_PATH;
     const outbox = DestinationOutbox.open({
-      dir,
-      previousDir: outboxDirFor(options.stateDir, previousUrl.href),
+      dir: outboxDirFor(options.stateDir, options.endpoint.url),
       budget: options.budget,
       allocateSequence: options.allocateSequence,
       identity: {
@@ -3020,7 +2934,7 @@ function readSysfsGpu(readers, address) {
     if (power !== null && values.powerWatts === null) values.powerWatts = power / 1e6;
   }
   if ([values.utilizationPercent, values.memoryTotalBytes, values.temperatureC, values.powerWatts].every((value) => value === null)) {
-    return { id: id2, status: "unavailable", reason: "driver exposes no readable GPU counters; check DRM driver and permissions" };
+    return { id: id2, status: "unavailable", reason: "GPU detected, but no readable DRM/sysfs counters; driver support or permissions may limit telemetry" };
   }
   return values;
 }
@@ -3286,9 +3200,8 @@ function capReason(value) {
 }
 function normalizePciBusId(value) {
   const lower = value.trim().toLowerCase();
-  const parts = lower.split(":");
-  if (parts.length >= 3) return `${parts[parts.length - 2]}:${parts[parts.length - 1]}`;
-  return lower;
+  const match = /^(?:([0-9a-f]{4,8}):)?([0-9a-f]{2}:[0-9a-f]{2}\.[0-7])$/.exec(lower);
+  return match ? `${(match[1] ?? "0").replace(/^0+/, "").padStart(4, "0")}:${match[2]}` : lower;
 }
 function vendorFor(raw) {
   switch (raw.trim().toLowerCase()) {
@@ -3332,7 +3245,18 @@ function fallbackGpuName(vendor, address) {
     intel: "Intel",
     other: "Display"
   };
-  return `${labels[vendor]} display adapter at ${address}`;
+  return `${labels[vendor]} display adapter`;
+}
+function pciDeviceName(database, vendorId, deviceId) {
+  let vendor = false;
+  for (const line of database.split("\n")) {
+    const heading = /^([0-9a-f]{4})\s+/i.exec(line);
+    if (heading) vendor = heading[1].toLowerCase() === vendorId.replace(/^0x/, "").toLowerCase();
+    if (!vendor) continue;
+    const device = /^\t([0-9a-f]{4})\s+(.+)$/i.exec(line);
+    if (device && device[1].toLowerCase() === deviceId.replace(/^0x/, "").toLowerCase()) return capText(device[2]);
+  }
+  return null;
 }
 function unsupportedGpuReason(vendor, gpu) {
   if (vendor === "aspeed") return "management adapter; no telemetry";
@@ -3351,6 +3275,7 @@ function buildGpus(read, readdir, gpu) {
       }
     }
   }
+  const pciNames = readTextOrNull(read, "/usr/share/hwdata/pci.ids") ?? readTextOrNull(read, "/usr/share/misc/pci.ids") ?? "";
   const result = [];
   const seenIds = /* @__PURE__ */ new Set();
   for (const device of pciDevices) {
@@ -3370,7 +3295,7 @@ function buildGpus(read, readdir, gpu) {
       const product = readTextOrNull(read, `/sys/bus/pci/devices/${device.address}/product_name`)?.trim();
       entry = {
         id: `pci:${device.address}`,
-        name: capText(product || fallbackGpuName(device.vendor, device.address)),
+        name: capText(product || pciDeviceName(pciNames, device.vendorId, readTextOrNull(read, `/sys/bus/pci/devices/${device.address}/device`)?.trim() ?? "") || fallbackGpuName(device.vendor, device.address)),
         vendor: device.vendor,
         pciBusId: device.address,
         telemetry: reading.status === "ok" ? "supported" : "unsupported",
@@ -5292,8 +5217,7 @@ function budget(value, fallback) {
 // package.json
 var package_default = {
   name: "rigscope",
-  version: "0.1.2",
-  rigscopeConfigVersion: 2,
+  version: "0.1.4",
   private: false,
   engines: {
     node: ">=26.0.0"
@@ -5520,7 +5444,6 @@ async function runDurableCollector(config, identity, statePath, mock) {
         budget: budget2,
         allocateSequence: () => sequence.next(),
         sampler,
-        collectorVersion: COLLECTOR_PROTOCOL_VERSION,
         socketFactory: (url, options) => new import_ws.WebSocket(url, {
           headers: options.headers,
           handshakeTimeout: options.handshakeTimeoutMs,

package/dist/hub.cjs

@@ -1741,8 +1741,7 @@ function describeError(error) {
 // package.json
 var package_default = {
   name: "rigscope",
-  version: "0.1.2",
-  rigscopeConfigVersion: 2,
+  version: "0.1.4",
   private: false,
   engines: {
     node: ">=26.0.0"
@@ -3109,18 +3108,12 @@ var MIN_EPOCH = Date.parse("2000-01-01T00:00:00Z");
 var MAX_EPOCH = Date.parse("2200-01-01T00:00:00Z");
 var CAPABILITY_NAMES = ["metrics", "inventory", "processes"];
 var METRIC_FAMILIES = ["cpu", "memory", "swap", "gpus", "disks", "network"];
-var METRIC_EXTENSION_NAMES = ["bottleneck-v1"];
-var COLLECTOR_PROTOCOL_VERSION = "0.3.0";
-var METRIC_EXTENSION_PROTOCOL_VERSIONS = [COLLECTOR_PROTOCOL_VERSION];
-function collectorSupportsMetricExtensions(collectorVersion) {
-  return METRIC_EXTENSION_PROTOCOL_VERSIONS.includes(collectorVersion);
-}
 var GAP_REASONS = ["outbox-age", "outbox-bytes", "disk-budget", "write-failure", "rejected"];
 function parseCollectorMessage(value) {
   const o = obj(value, "collector message");
   switch (o.type) {
     case "hello": {
-      keys(o, ["type", "collectorId", "runId", "bootId", "hostname", "capabilities", "expectedIntervalMs", "collectorVersion"], "hello");
+      keys(o, ["type", "collectorId", "runId", "bootId", "hostname", "capabilities", "expectedIntervalMs"], "hello");
       const caps = arr(o.capabilities, "hello.capabilities", 1, CAPABILITY_NAMES.length).map((c) => oneOf(c, CAPABILITY_NAMES, "hello.capabilities"));
       if (new Set(caps).size !== caps.length || !caps.includes("metrics")) throw new Error("invalid hello: capabilities must be unique and include metrics");
       return {
@@ -3130,8 +3123,7 @@ function parseCollectorMessage(value) {
         bootId: text(o.bootId, "bootId", 0, MAX_ID),
         hostname: text(o.hostname, "hostname", 0, MAX_HOSTNAME),
         capabilities: caps,
-        expectedIntervalMs: int(o.expectedIntervalMs, "expectedIntervalMs", MIN_EXPECTED_INTERVAL_MS, MAX_EXPECTED_INTERVAL_MS),
-        collectorVersion: text(o.collectorVersion, "collectorVersion", 1, 64)
+        expectedIntervalMs: int(o.expectedIntervalMs, "expectedIntervalMs", MIN_EXPECTED_INTERVAL_MS, MAX_EXPECTED_INTERVAL_MS)
       };
     }
     case "samples": {
@@ -6991,9 +6983,6 @@ ${reason}`
       delivery: "durable",
       maxInFlightBatches: MAX_IN_FLIGHT_SAMPLE_BATCHES
     };
-    if (collectorSupportsMetricExtensions(hello.collectorVersion)) {
-      welcome.metricExtensions = [...METRIC_EXTENSION_NAMES];
-    }
     this.send(connection, JSON.stringify(welcome));
   }
   onSessionMessage(connection, message) {
@@ -7286,7 +7275,6 @@ function filterSnapshot(snapshot, scope) {
 var import_node_crypto15 = require("node:crypto");
 var import_node_fs3 = require("node:fs");
 var import_node_path4 = require("node:path");
-var STATE_VERSION = 1;
 var MAX_COLLECTOR_ID_LENGTH2 = 128;
 var MAX_MACHINE_ID_LENGTH2 = 128;
 var MAX_TOKEN_LENGTH2 = 256;
@@ -7541,8 +7529,8 @@ var EnrollmentStore = class {
       throw new EnrollmentStoreError("invalid-state", "state file must be a JSON object");
     }
     const state = parsed;
-    if (state.version !== STATE_VERSION) {
-      throw new EnrollmentStoreError("invalid-state", "state file has an unsupported version");
+    if (Object.keys(state).some((key) => key !== "enrollments" && key !== "consumed")) {
+      throw new EnrollmentStoreError("invalid-state", "state file must use the canonical enrollment shape; reset or reinstall unfinished state");
     }
     if (!Array.isArray(state.enrollments) || !Array.isArray(state.consumed)) {
       throw new EnrollmentStoreError("invalid-state", "state file must contain enrollments and consumed arrays");
@@ -7601,7 +7589,6 @@ var EnrollmentStore = class {
   }
   persistState(next) {
     const state = {
-      version: STATE_VERSION,
       enrollments: next.enrollments,
       consumed: next.consumed
     };