@hasna/uptime 0.1.8 → 0.1.10

package/dist/cli/index.js

@@ -3426,7 +3426,7 @@ var REQUIRED_TABLES = [
 ];
 var PROBE_TABLES = new Set(["probe_identities", "probe_check_jobs", "probe_submissions"]);
 var REPORT_AUDIT_TABLES = new Set(["report_schedules", "report_runs", "audit_events"]);
-var CURRENT_SCHEMA_VERSION = "3";
+var CURRENT_SCHEMA_VERSION = "4";
 
 class StaleCheckResultError extends Error {
   constructor(message) {
@@ -3487,7 +3487,8 @@ class UptimeStore {
     this.db.run(`
       CREATE TABLE IF NOT EXISTS monitors (
         id TEXT PRIMARY KEY,
-        name TEXT NOT NULL UNIQUE,
+        workspace_id TEXT NOT NULL DEFAULT 'local',
+        name TEXT NOT NULL,
         kind TEXT NOT NULL CHECK (kind IN ('http', 'tcp', 'browser_page')),
         url TEXT,
         host TEXT,
@@ -3502,9 +3503,11 @@ class UptimeStore {
         last_checked_at TEXT,
         revision INTEGER NOT NULL DEFAULT 1,
         created_at TEXT NOT NULL,
-        updated_at TEXT NOT NULL
+        updated_at TEXT NOT NULL,
+        UNIQUE (workspace_id, name)
       )
     `);
+    this.ensureColumn("monitors", "workspace_id", "TEXT NOT NULL DEFAULT 'local'");
     this.ensureColumn("monitors", "revision", "INTEGER NOT NULL DEFAULT 1");
     this.ensureMonitorKindAllowsBrowserPage();
     this.db.run(`
@@ -3654,6 +3657,7 @@ class UptimeStore {
     `);
     this.db.query("INSERT OR REPLACE INTO schema_migrations (key, value, updated_at) VALUES ('schema_version', ?, ?)").run(CURRENT_SCHEMA_VERSION, new Date().toISOString());
     this.db.run("CREATE INDEX IF NOT EXISTS idx_results_monitor_time ON check_results(monitor_id, checked_at DESC)");
+    this.db.run("CREATE INDEX IF NOT EXISTS idx_monitors_workspace_enabled_name ON monitors(workspace_id, enabled, name)");
     this.db.run("CREATE INDEX IF NOT EXISTS idx_incidents_monitor_status ON incidents(monitor_id, status)");
     this.db.run("CREATE INDEX IF NOT EXISTS idx_check_leases_until ON check_leases(leased_until)");
     this.db.run("CREATE INDEX IF NOT EXISTS idx_monitor_provenance_monitor ON monitor_provenance(monitor_id)");
@@ -3715,8 +3719,10 @@ class UptimeStore {
     if (this.mode === "hosted")
       assertHostedTargetAllowed(normalized);
     const now = new Date().toISOString();
+    const workspaceId = normalizeWorkspaceId(options.workspaceId ?? input.workspaceId ?? "local");
     const monitor = {
       id: newId("mon"),
+      workspaceId,
       name: normalized.name,
       kind: normalized.kind,
       url: normalized.url ?? null,
@@ -3735,22 +3741,33 @@ class UptimeStore {
       updatedAt: now
     };
     this.db.query(`INSERT INTO monitors (
-          id, name, kind, url, host, port, method, expected_status,
+          id, workspace_id, name, kind, url, host, port, method, expected_status,
           interval_seconds, timeout_ms, retry_count, enabled, status,
           last_checked_at, revision, created_at, updated_at
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(monitor.id, monitor.name, monitor.kind, monitor.url, monitor.host, monitor.port, monitor.method, monitor.expectedStatus, monitor.intervalSeconds, monitor.timeoutMs, monitor.retryCount, monitor.enabled ? 1 : 0, monitor.status, monitor.lastCheckedAt, monitor.revision, monitor.createdAt, monitor.updatedAt);
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(monitor.id, monitor.workspaceId, monitor.name, monitor.kind, monitor.url, monitor.host, monitor.port, monitor.method, monitor.expectedStatus, monitor.intervalSeconds, monitor.timeoutMs, monitor.retryCount, monitor.enabled ? 1 : 0, monitor.status, monitor.lastCheckedAt, monitor.revision, monitor.createdAt, monitor.updatedAt);
     return monitor;
   }
   listMonitors(options = {}) {
-    const rows = options.includeDisabled ? this.db.query("SELECT * FROM monitors ORDER BY name ASC").all() : this.db.query("SELECT * FROM monitors WHERE enabled = 1 ORDER BY name ASC").all();
+    const workspaceId = options.workspaceId ? normalizeWorkspaceId(options.workspaceId) : undefined;
+    const clauses = [];
+    const args = [];
+    if (workspaceId) {
+      clauses.push("workspace_id = ?");
+      args.push(workspaceId);
+    }
+    if (!options.includeDisabled)
+      clauses.push("enabled = 1");
+    const where = clauses.length ? `WHERE ${clauses.join(" AND ")}` : "";
+    const rows = this.db.query(`SELECT * FROM monitors ${where} ORDER BY name ASC`).all(...args);
     return rows.map(monitorFromRow);
   }
-  getMonitor(idOrName) {
-    const row = this.db.query("SELECT * FROM monitors WHERE id = ? OR name = ?").get(idOrName, idOrName);
+  getMonitor(idOrName, options = {}) {
+    const workspaceId = options.workspaceId ? normalizeWorkspaceId(options.workspaceId) : undefined;
+    const row = this.db.query(`SELECT * FROM monitors WHERE (id = ? OR name = ?)${workspaceId ? " AND workspace_id = ?" : ""}`).get(...workspaceId ? [idOrName, idOrName, workspaceId] : [idOrName, idOrName]);
     return row ? monitorFromRow(row) : null;
   }
   updateMonitor(idOrName, input, options = {}) {
-    const current = this.getMonitor(idOrName);
+    const current = this.getMonitor(idOrName, { workspaceId: options.workspaceId });
     if (!current)
       throw new Error(`Monitor not found: ${idOrName}`);
     if (this.mode === "hosted") {
@@ -3774,10 +3791,10 @@ class UptimeStore {
     if (definitionChanged(current, next)) {
       this.closeOpenIncident(current.id, updatedAt);
     }
-    return this.getMonitor(current.id);
+    return this.getMonitor(current.id, { workspaceId: options.workspaceId });
   }
-  deleteMonitor(idOrName) {
-    const current = this.getMonitor(idOrName);
+  deleteMonitor(idOrName, options = {}) {
+    const current = this.getMonitor(idOrName, { workspaceId: options.workspaceId });
     if (!current)
       return false;
     this.db.query("DELETE FROM monitors WHERE id = ?").run(current.id);
@@ -4154,7 +4171,20 @@ class UptimeStore {
   }
   listResults(options = {}) {
     const limit = clampLimit(options.limit ?? 50);
-    const rows = options.monitorId ? this.db.query("SELECT * FROM check_results WHERE monitor_id = ? ORDER BY checked_at DESC LIMIT ?").all(options.monitorId, limit) : this.db.query("SELECT * FROM check_results ORDER BY checked_at DESC LIMIT ?").all(limit);
+    const workspaceId = options.workspaceId ? normalizeWorkspaceId(options.workspaceId) : undefined;
+    const clauses = [];
+    const args = [];
+    if (options.monitorId) {
+      clauses.push("check_results.monitor_id = ?");
+      args.push(options.monitorId);
+    }
+    if (workspaceId) {
+      clauses.push("monitors.workspace_id = ?");
+      args.push(workspaceId);
+    }
+    const where = clauses.length ? `WHERE ${clauses.join(" AND ")}` : "";
+    args.push(limit);
+    const rows = this.db.query(`SELECT check_results.* FROM check_results JOIN monitors ON monitors.id = check_results.monitor_id ${where} ORDER BY checked_at DESC LIMIT ?`).all(...args);
     return rows.map(checkResultFromRow);
   }
   getProvenance(source, sourceId) {
@@ -4197,24 +4227,28 @@ class UptimeStore {
     const clauses = [];
     const args = [];
     if (options.status) {
-      clauses.push("status = ?");
+      clauses.push("incidents.status = ?");
       args.push(options.status);
     }
     if (options.monitorId) {
-      clauses.push("monitor_id = ?");
+      clauses.push("incidents.monitor_id = ?");
       args.push(options.monitorId);
     }
+    if (options.workspaceId) {
+      clauses.push("monitors.workspace_id = ?");
+      args.push(normalizeWorkspaceId(options.workspaceId));
+    }
     const where = clauses.length ? `WHERE ${clauses.join(" AND ")}` : "";
     args.push(clampLimit(options.limit ?? 50));
-    const rows = this.db.query(`SELECT * FROM incidents ${where} ORDER BY opened_at DESC LIMIT ?`).all(...args);
+    const rows = this.db.query(`SELECT incidents.* FROM incidents JOIN monitors ON monitors.id = incidents.monitor_id ${where} ORDER BY opened_at DESC LIMIT ?`).all(...args);
     return rows.map(incidentFromRow);
   }
   getOpenIncident(monitorId) {
     const row = this.db.query("SELECT * FROM incidents WHERE monitor_id = ? AND status = 'open' ORDER BY opened_at DESC LIMIT 1").get(monitorId);
     return row ? incidentFromRow(row) : null;
   }
-  summary() {
-    const monitors = this.listMonitors({ includeDisabled: true });
+  summary(options = {}) {
+    const monitors = this.listMonitors({ includeDisabled: true, workspaceId: options.workspaceId });
     const summaries = monitors.map((monitor) => this.monitorSummary(monitor));
     return {
       generatedAt: new Date().toISOString(),
@@ -4226,11 +4260,15 @@ class UptimeStore {
         down: monitors.filter((m) => m.status === "down").length,
         paused: monitors.filter((m) => !m.enabled || m.status === "paused").length,
         unknown: monitors.filter((m) => m.status === "unknown").length,
-        openIncidents: this.countOpenIncidents()
+        openIncidents: this.countOpenIncidents(options.workspaceId)
       }
     };
   }
-  countOpenIncidents() {
+  countOpenIncidents(workspaceId) {
+    if (workspaceId) {
+      const row2 = this.db.query("SELECT COUNT(*) AS count FROM incidents JOIN monitors ON monitors.id = incidents.monitor_id WHERE incidents.status = 'open' AND monitors.workspace_id = ?").get(normalizeWorkspaceId(workspaceId));
+      return Number(row2?.count ?? 0);
+    }
     const row = this.db.query("SELECT COUNT(*) AS count FROM incidents WHERE status = 'open'").get();
     return Number(row?.count ?? 0);
   }
@@ -4294,7 +4332,9 @@ class UptimeStore {
   }
   ensureMonitorKindAllowsBrowserPage() {
     const row = this.db.query("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = 'monitors'").get();
-    if (!row?.sql || row.sql.includes("browser_page"))
+    const needsBrowserPage = !row?.sql?.includes("browser_page");
+    const needsWorkspaceUnique = Boolean(row?.sql?.includes("name TEXT NOT NULL UNIQUE"));
+    if (!row?.sql || !needsBrowserPage && !needsWorkspaceUnique)
       return;
     this.db.run("PRAGMA foreign_keys = OFF");
     this.db.run("PRAGMA legacy_alter_table = ON");
@@ -4304,7 +4344,8 @@ class UptimeStore {
         this.db.run(`
           CREATE TABLE monitors (
             id TEXT PRIMARY KEY,
-            name TEXT NOT NULL UNIQUE,
+            workspace_id TEXT NOT NULL DEFAULT 'local',
+            name TEXT NOT NULL,
             kind TEXT NOT NULL CHECK (kind IN ('http', 'tcp', 'browser_page')),
             url TEXT,
             host TEXT,
@@ -4319,17 +4360,18 @@ class UptimeStore {
             last_checked_at TEXT,
             revision INTEGER NOT NULL DEFAULT 1,
             created_at TEXT NOT NULL,
-            updated_at TEXT NOT NULL
+            updated_at TEXT NOT NULL,
+            UNIQUE (workspace_id, name)
           )
         `);
         this.db.run(`
           INSERT INTO monitors (
-            id, name, kind, url, host, port, method, expected_status,
+            id, workspace_id, name, kind, url, host, port, method, expected_status,
             interval_seconds, timeout_ms, retry_count, enabled, status,
             last_checked_at, revision, created_at, updated_at
           )
           SELECT
-            id, name, kind, url, host, port, method, expected_status,
+            id, workspace_id, name, kind, url, host, port, method, expected_status,
             interval_seconds, timeout_ms, retry_count, enabled, status,
             last_checked_at, revision, created_at, updated_at
           FROM monitors_old_kind
@@ -4529,6 +4571,16 @@ function rejectControlCharacters2(value, label) {
     throw new Error(`${label} must not contain control characters`);
   }
 }
+function normalizeWorkspaceId(value) {
+  const normalized = value.trim();
+  if (!normalized)
+    throw new Error("Workspace id is required");
+  rejectControlCharacters2(normalized, "Workspace id");
+  if (!/^[A-Za-z0-9][A-Za-z0-9_.:-]{0,127}$/.test(normalized)) {
+    throw new Error("Workspace id contains unsupported characters");
+  }
+  return normalized;
+}
 function normalizeScheduleSlot(value) {
   const slot = value.trim();
   if (!slot)
@@ -4715,6 +4767,7 @@ function assertIsoTimestamp(value, label) {
 function monitorFromRow(row) {
   return {
     id: row.id,
+    workspaceId: row.workspace_id ?? "local",
     name: row.name,
     kind: row.kind,
     url: row.url,
@@ -5195,20 +5248,20 @@ class UptimeService {
   close() {
     this.store.close();
   }
-  createMonitor(input) {
-    return this.store.createMonitor(input);
+  createMonitor(input, options = {}) {
+    return this.store.createMonitor(input, options);
   }
-  updateMonitor(idOrName, input) {
-    return this.store.updateMonitor(idOrName, input);
+  updateMonitor(idOrName, input, options = {}) {
+    return this.store.updateMonitor(idOrName, input, options);
   }
-  deleteMonitor(idOrName) {
-    return this.store.deleteMonitor(idOrName);
+  deleteMonitor(idOrName, options = {}) {
+    return this.store.deleteMonitor(idOrName, options);
   }
   listMonitors(options = {}) {
     return this.store.listMonitors(options);
   }
-  getMonitor(idOrName) {
-    return this.store.getMonitor(idOrName);
+  getMonitor(idOrName, options = {}) {
+    return this.store.getMonitor(idOrName, options);
   }
   listResults(options = {}) {
     return this.store.listResults(options);
@@ -5216,8 +5269,8 @@ class UptimeService {
   listIncidents(options = {}) {
     return this.store.listIncidents(options);
   }
-  summary() {
-    return this.store.summary();
+  summary(options = {}) {
+    return this.store.summary(options);
   }
   createProbe(input) {
     const store = this.probeStore();
@@ -5273,7 +5326,8 @@ class UptimeService {
     return this.store.verifyBackup(backupPath);
   }
   buildReport(options = {}) {
-    return buildUptimeReport(this.summary(), options);
+    const { workspaceId, ...reportOptions } = options;
+    return buildUptimeReport(this.summary({ workspaceId }), reportOptions);
   }
   async sendReport(options = {}) {
     if (this.store.mode === "hosted" && (options.email || options.sms || options.logs)) {
@@ -5597,6 +5651,7 @@ class UptimeService {
       throw new Error("Probe job fencing token is invalid");
     if (!job.leaseExpiresAt || job.leaseExpiresAt <= new Date().toISOString())
       throw new Error("Probe job lease expired");
+    const evidence = input.evidence ? normalizeBrowserEvidence(monitor.url ?? monitor.host ?? "https://example.invalid", input.evidence) : null;
     const result = this.store.recordCheckResult({
       monitorId: monitor.id,
       checkedAt: input.checkedAt,
@@ -5604,7 +5659,7 @@ class UptimeService {
       latencyMs: input.latencyMs,
       statusCode: input.statusCode ?? null,
       error: input.error ?? null,
-      evidence: input.evidence ?? null,
+      evidence,
       attemptCount: input.attemptCount ?? 1,
       expectedMonitorRevision: input.monitorRevision
     });
@@ -6165,11 +6220,11 @@ async function handleHostedRequest(service, request, url, options) {
   }
   const apiPath = `/api${url.pathname.slice("/api/v1".length)}`;
   const scope = hostedScopeFor(request.method, apiPath);
-  requireHostedActor(request, url, options, scope);
+  const actor = requireHostedActor(request, url, options, scope);
   if (["POST", "PATCH", "DELETE"].includes(request.method)) {
     validateHostedMutationOrigin(request, url, options);
   }
-  return handleApiRoute(service, request, url, apiPath, options, true);
+  return handleApiRoute(service, request, url, apiPath, options, true, actor);
 }
 function validateHostedMutationOrigin(request, url, options) {
   const rawOrigin = request.headers.get("origin");
@@ -6184,12 +6239,12 @@ function validateHostedMutationOrigin(request, url, options) {
     throw new ApiError("cross-origin mutation rejected", 403);
   }
 }
-async function handleApiRoute(service, request, url, apiPath, options, hosted) {
+async function handleApiRoute(service, request, url, apiPath, options, hosted, actor) {
   if (request.method === "GET" && apiPath === "/api/summary") {
-    return json(service.summary());
+    return json(service.summary({ workspaceId: actor?.workspaceId }));
   }
   if (request.method === "GET" && apiPath === "/api/report") {
-    return json(service.buildReport());
+    return json(service.buildReport({ workspaceId: actor?.workspaceId }));
   }
   if (request.method === "POST" && apiPath === "/api/report") {
     if (hosted)
@@ -6246,22 +6301,24 @@ async function handleApiRoute(service, request, url, apiPath, options, hosted) {
     }));
   }
   if (request.method === "GET" && apiPath === "/api/monitors") {
-    return json(service.listMonitors({ includeDisabled: url.searchParams.get("includeDisabled") === "true" }));
+    return json(service.listMonitors({ includeDisabled: url.searchParams.get("includeDisabled") === "true", workspaceId: actor?.workspaceId }));
   }
   if (request.method === "POST" && apiPath === "/api/monitors") {
-    return json(service.createMonitor(await jsonBody(request)), 201);
+    return json(service.createMonitor(await jsonBody(request), { workspaceId: actor?.workspaceId }), 201);
   }
   if (request.method === "GET" && apiPath === "/api/incidents") {
     const status = url.searchParams.get("status");
     return json(service.listIncidents({
       status: status === "open" || status === "closed" ? status : undefined,
       monitorId: url.searchParams.get("monitorId") ?? undefined,
+      workspaceId: actor?.workspaceId,
       limit: numericParam(url, "limit", 50)
     }));
   }
   if (request.method === "GET" && apiPath === "/api/results") {
     return json(service.listResults({
       monitorId: url.searchParams.get("monitorId") ?? undefined,
+      workspaceId: actor?.workspaceId,
       limit: numericParam(url, "limit", 50)
     }));
   }
@@ -6320,14 +6377,14 @@ async function handleApiRoute(service, request, url, apiPath, options, hosted) {
   if (monitorMatch) {
     const id = decodeURIComponent(monitorMatch[1]);
     if (request.method === "GET" && !monitorMatch[2]) {
-      const monitor = service.getMonitor(id);
+      const monitor = service.getMonitor(id, { workspaceId: actor?.workspaceId });
       return monitor ? json(monitor) : json({ error: "not found" }, 404);
     }
     if (request.method === "PATCH" && !monitorMatch[2]) {
-      return json(service.updateMonitor(id, await jsonBody(request)));
+      return json(service.updateMonitor(id, await jsonBody(request), { workspaceId: actor?.workspaceId }));
     }
     if (request.method === "DELETE" && !monitorMatch[2]) {
-      return json({ deleted: service.deleteMonitor(id) });
+      return json({ deleted: service.deleteMonitor(id, { workspaceId: actor?.workspaceId }) });
     }
     if (request.method === "POST" && monitorMatch[2] === "check") {
       if (hosted)
@@ -6478,7 +6535,7 @@ function buildAwsDeploymentPlan(options = {}) {
   const image = clean(options.image, `${imageRepositoryUri}@sha256:<image-digest>`);
   const evidenceBucket = clean(options.evidenceBucket, `hasna-${stage}-${prefix}-evidence`);
   const hostedSqliteDbPath = clean(options.hostedSqliteDbPath, DEFAULT_HOSTED_SQLITE_DB);
-  const runtimePackageVersion = clean(options.runtimePackageVersion, "0.1.8");
+  const runtimePackageVersion = clean(options.runtimePackageVersion, "0.1.10");
   const protectedAccessMode = options.protectedAccessMode ?? DEFAULT_PROTECTED_ACCESS_MODE;
   const protectedAccessUrl = protectedAccessMode === "cloudfront_default_domain" ? "https://<cloudfront-domain>" : `https://${hostname}`;
   const cluster = `${prefix}-${stage}`;
@@ -6610,9 +6667,9 @@ function buildAwsDeploymentPlan(options = {}) {
         "Disable scheduler/reporter services before data rollback.",
         "Restore EFS backup recovery point only after explicit operator approval and audit record."
       ],
-      spark01: [
+      privateProbe: [
         "Create a private probe identity with a caller-managed public key.",
-        "Install @hasna/uptime on Spark01 and write the generated env file with mode 0600.",
+        "Install @hasna/uptime on the private probe operator machine and write the generated env file with mode 0600.",
         "Run the private probe against the hosted /api/v1 probe endpoint once it exists."
       ]
     },
@@ -6621,7 +6678,7 @@ function buildAwsDeploymentPlan(options = {}) {
       "The EFS SQLite bridge is single-writer only: web target desired count is 1 and scheduler/public-probe/reporter targets remain 0 until Postgres and cloud leases exist.",
       "Hosted production auth/RBAC must replace broad static hosted-token operation before exposure.",
       "Public probe execution still needs DNS, redirect, and rebinding SSRF enforcement plus cloud check-job leases.",
-      "Spark01 hosted probe enrollment, claim, submit, heartbeat, revocation, and rotation are not cloud-backed yet."
+      "Private probe enrollment, claim, submit, heartbeat, revocation, and rotation are not cloud-backed yet."
     ],
     requiredEvidence: [
       "Infrastructure PR/synth/plan from the approved infra repository.",
@@ -6631,7 +6688,7 @@ function buildAwsDeploymentPlan(options = {}) {
       "Single-writer ECS evidence: one web task maximum and no scheduler/public-probe/reporter EFS mounts.",
       "EFS encryption, access point, mount-target, AWS Backup, and restore-drill evidence.",
       "S3 bucket KMS, versioning, lifecycle, and public-access-block evidence.",
-      "Spark01 private-probe registration, key-file mode, heartbeat, and revocation evidence."
+      "Private-probe registration, key-file mode, heartbeat, and revocation evidence."
     ],
     safety: {
       liveAwsMutation: false,
@@ -6649,16 +6706,16 @@ function buildAwsDeploymentPlan(options = {}) {
     }
   };
 }
-function buildSpark01CloudConfig(options = {}) {
+function buildPrivateProbeCloudConfig(options = {}) {
   const apiUrl = clean(options.apiUrl, `https://${DEFAULT_HOSTNAME}/api/v1`);
   const workspaceId = clean(options.workspaceId, DEFAULT_WORKSPACE_ID);
-  const machineId = clean(options.machineId, "spark01");
-  const privateKeyFile = clean(options.probePrivateKeyFile, "~/.hasna/uptime/probes/spark01.key.pem");
+  const machineId = clean(options.machineId, "private-probe-01");
+  const privateKeyFile = clean(options.probePrivateKeyFile, "~/.hasna/uptime/probes/private-probe-01.key.pem");
   const probeId = options.probeId?.trim();
   const blockers = [
     ...probeId ? [] : ["Cloud-registered private probe id is required before writing a sourceable env file."],
     "Hosted probe claim and submit routes still fail closed until cloud check_jobs and workspace stores are implemented.",
-    "Spark01 enrollment, heartbeat, revocation, rotation, and bounded offline lease handling are not implemented yet."
+    "Private probe enrollment, heartbeat, revocation, rotation, and bounded offline lease handling are not implemented yet."
   ];
   const env3 = {
     HASNA_UPTIME_MODE: "hosted",
@@ -6672,7 +6729,7 @@ function buildSpark01CloudConfig(options = {}) {
   if (probeId)
     env3.HASNA_UPTIME_PRIVATE_PROBE_ID = probeId;
   return {
-    kind: "open-uptime.spark01-cloud-config",
+    kind: "open-uptime.private-probe-cloud-config",
     version: 1,
     generatedAt: new Date().toISOString(),
     status: "blocked",
@@ -6684,7 +6741,7 @@ function buildSpark01CloudConfig(options = {}) {
       {
         path: privateKeyFile,
         mode: "0600",
-        purpose: "Ed25519 private key generated on Spark01; never paste into cloud config."
+        purpose: "Ed25519 private key generated on the private probe machine; never paste into cloud config."
       },
       {
         path: "~/.hasna/uptime/cloud.env",
@@ -6694,7 +6751,7 @@ function buildSpark01CloudConfig(options = {}) {
     ],
     commands: [
       "bun install -g @hasna/uptime@latest",
-      "Generate the Spark01 private key locally and register only its public key with the hosted control plane once registration exists.",
+      "Generate the private probe key locally and register only its public key with the hosted control plane once registration exists.",
       "Write ~/.hasna/uptime/cloud.env from this plan, then source it for the private probe service.",
       "Start the private probe worker only after hosted /api/v1 probe claim/submit routes are backed by cloud jobs."
     ],
@@ -6703,18 +6760,18 @@ function buildSpark01CloudConfig(options = {}) {
       privateKeyInline: false,
       tokenInline: false,
       notes: [
-        "This config is hosted-targeted preflight: Spark01 must not start until cloud probe routes are backed by hosted state.",
+        "This config is hosted-targeted preflight: the private probe must not start until cloud probe routes are backed by hosted state.",
         "The private key file path is referenced, not embedded.",
         "Hosted token or probe auth material must come from the machine secret store, not this generated config."
       ]
     }
   };
 }
-function renderSpark01Env(config) {
+function renderPrivateProbeEnv(config) {
   const required = ["HASNA_UPTIME_PRIVATE_PROBE_ID"];
   const missing = required.filter((key) => !config.env[key]);
   if (missing.length > 0) {
-    throw new Error(`Spark01 env output requires ${missing.join(", ")}`);
+    throw new Error(`private probe env output requires ${missing.join(", ")}`);
   }
   return Object.entries(config.env).map(([key, value]) => `${key}=${shellEscape(value)}`).join(`
 `);
@@ -7054,7 +7111,7 @@ program2.command("audit").description("List local audit events").option("--resou
     fail(error);
   }
 });
-var cloud = program2.command("cloud").description("Generate dry-run cloud deployment and Spark01 configuration artifacts");
+var cloud = program2.command("cloud").description("Generate dry-run cloud deployment and private-probe configuration artifacts");
 cloud.command("plan").description("Generate a dry-run AWS deployment plan").option("--account <name>", "AWS account/profile label", "aws-profile").option("--region <region>", "AWS region", "us-east-1").option("--stage <stage>", "deployment stage", "prod").option("--hostname <hostname>", "hosted Open Uptime hostname", "uptime.example.com").option("--workspace-id <id>", "workspace id", "workspace-id").option("--vpc-id <id>", "target VPC id").option("--hosted-sqlite-db <path>", "hosted SQLite path on the EFS mount").option("--rds-instance-id <id>", "deprecated; ignored until the hosted Postgres adapter exists").option("--database-secret-name <name>", "deprecated; ignored until the hosted Postgres adapter exists").option("--ecr-repository <name>", "ECR repository name").option("--image <uri>", "container image URI").option("--runtime-package-version <version>", "published @hasna/uptime version for the AWS image builder").addOption(new Option("--protected-access-mode <mode>", "protected web access mode").choices(["cloudfront_default_domain", "alb_https_cert"]).default("cloudfront_default_domain")).option("--evidence-bucket <name>", "S3 evidence bucket name").option("-j, --json", "print JSON").action((opts) => {
   try {
     const plan = buildAwsDeploymentPlan({
@@ -7078,9 +7135,9 @@ cloud.command("plan").description("Generate a dry-run AWS deployment plan").opti
     fail(error);
   }
 });
-cloud.command("spark01-config").description("Generate Spark01 hosted-targeted private probe preflight configuration").option("--api-url <url>", "hosted Open Uptime API URL", "https://uptime.example.com/api/v1").option("--workspace-id <id>", "workspace id", "workspace-id").option("--probe-id <id>", "cloud registered private probe id").option("--private-key-file <path>", "Spark01 private probe key file", "~/.hasna/uptime/probes/spark01.key.pem").option("--machine-id <id>", "machine id", "spark01").option("--log-level <level>", "probe log level", "info").option("--env", "print shell env file instead of summary text").option("-j, --json", "print JSON").action((opts) => {
+cloud.command("private-probe-config").description("Generate hosted-targeted private probe preflight configuration").option("--api-url <url>", "hosted Open Uptime API URL", "https://uptime.example.com/api/v1").option("--workspace-id <id>", "workspace id", "workspace-id").option("--probe-id <id>", "cloud registered private probe id").option("--private-key-file <path>", "private probe key file", "~/.hasna/uptime/probes/private-probe-01.key.pem").option("--machine-id <id>", "machine id", "private-probe-01").option("--log-level <level>", "probe log level", "info").option("--env", "print shell env file instead of summary text").option("-j, --json", "print JSON").action((opts) => {
   try {
-    const config = buildSpark01CloudConfig({
+    const config = buildPrivateProbeCloudConfig({
       apiUrl: opts.apiUrl,
       workspaceId: opts.workspaceId,
       probeId: opts.probeId,
@@ -7089,10 +7146,10 @@ cloud.command("spark01-config").description("Generate Spark01 hosted-targeted pr
       logLevel: opts.logLevel
     });
     if (opts.env && !wantsJson(opts)) {
-      console.log(renderSpark01Env(config));
+      console.log(renderPrivateProbeEnv(config));
       return;
     }
-    print(config, renderSpark01Config(config), opts);
+    print(config, renderPrivateProbeConfig(config), opts);
   } catch (error) {
     fail(error);
   }
@@ -7472,7 +7529,7 @@ function renderCloudPlan(plan) {
   ].join(`
 `);
 }
-function renderSpark01Config(config) {
+function renderPrivateProbeConfig(config) {
   return [
     `${config.machineId} ${config.mode} config`,
     `status: ${config.status}`,

package/dist/cloud-plan.d.ts

@@ -75,7 +75,7 @@ export interface AwsDeploymentPlan {
         provision: string[];
         deploy: string[];
         rollback: string[];
-        spark01: string[];
+        privateProbe: string[];
     };
     blockers: string[];
     requiredEvidence: string[];
@@ -98,7 +98,7 @@ export interface AwsServicePlan {
     environment: Record<string, string>;
     secrets: Record<string, string>;
 }
-export interface Spark01CloudConfigOptions {
+export interface PrivateProbeCloudConfigOptions {
     apiUrl?: string;
     workspaceId?: string;
     probeId?: string;
@@ -106,8 +106,8 @@ export interface Spark01CloudConfigOptions {
     machineId?: string;
     logLevel?: string;
 }
-export interface Spark01CloudConfig {
-    kind: "open-uptime.spark01-cloud-config";
+export interface PrivateProbeCloudConfig {
+    kind: "open-uptime.private-probe-cloud-config";
     version: 1;
     generatedAt: string;
     status: "blocked";
@@ -129,6 +129,6 @@ export interface Spark01CloudConfig {
     };
 }
 export declare function buildAwsDeploymentPlan(options?: AwsDeploymentPlanOptions): AwsDeploymentPlan;
-export declare function buildSpark01CloudConfig(options?: Spark01CloudConfigOptions): Spark01CloudConfig;
-export declare function renderSpark01Env(config: Spark01CloudConfig): string;
+export declare function buildPrivateProbeCloudConfig(options?: PrivateProbeCloudConfigOptions): PrivateProbeCloudConfig;
+export declare function renderPrivateProbeEnv(config: PrivateProbeCloudConfig): string;
 //# sourceMappingURL=cloud-plan.d.ts.map

package/dist/cloud-plan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cloud-plan.d.ts","sourceRoot":"","sources":["../src/cloud-plan.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cloud-plan.d.ts","sourceRoot":"","sources":["../src/cloud-plan.ts"],"names":[],"mappings":"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"}