@glassmkr/crucible 0.6.6 → 0.7.1

package/dist/lib/types.d.ts

@@ -27,6 +27,8 @@ export interface Snapshot {
     systemd?: SystemdData;
     ntp?: NtpData;
     file_descriptors?: FileDescriptorData;
+    expected_reboot?: boolean;
+    expected_reboot_reason?: string;
 }
 export interface ConntrackData {
     available: boolean;
@@ -98,6 +100,12 @@ export interface SystemInfo {
     hostname: string;
     ip: string;
     os: string;
+    /** `ID=` from /etc/os-release, lowercased. e.g. "ubuntu", "debian", "rocky", "arch", "alpine". */
+    os_id?: string;
+    /** `ID_LIKE=` from /etc/os-release, lowercased, space-separated. Used by Forge
+     *  to pick distro-family-specific fix command variants. e.g. on Rocky this
+     *  is "rhel centos fedora"; on Ubuntu it is "debian". */
+    os_id_like?: string;
     kernel: string;
     uptime_seconds: number;
 }

package/dist/lib/version-check.js

@@ -1,4 +1,4 @@
-const CURRENT_VERSION = "0.1.0";
+import { CRUCIBLE_VERSION as CURRENT_VERSION } from "./version.js";
 let lastCheckTime = 0;
 let lastResult = null;
 const CHECK_INTERVAL = 6 * 60 * 60 * 1000; // check every 6 hours

package/dist/lib/version-check.js.map

@@ -1 +1 @@
-{"version":3,"file":"version-check.js","sourceRoot":"","sources":["../../src/lib/version-check.ts"],"names":[],"mappings":"AAAA,MAAM,eAAe,GAAG,OAAO,CAAC;AAChC,IAAI,aAAa,GAAG,CAAC,CAAC;AACtB,IAAI,UAAU,GAA2E,IAAI,CAAC;AAC9F,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,sBAAsB;AAEjE,MAAM,UAAU,iBAAiB;IAC/B,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,QAAiB;IACrD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,IAAI,GAAG,GAAG,aAAa,GAAG,cAAc;QAAE,OAAO;IACjD,aAAa,GAAG,GAAG,CAAC;IAEpB,MAAM,GAAG,GAAG,QAAQ,IAAI,4BAA4B,CAAC;IACrD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,GAAG,iBAAiB,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxF,IAAI,CAAC,GAAG,CAAC,EAAE;YAAE,OAAO;QACpB,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAwF,CAAC;QACpH,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC;QACrC,IAAI,CAAC,MAAM;YAAE,OAAO;QAEpB,IAAI,MAAM,KAAK,eAAe,EAAE,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,4CAA4C,MAAM,cAAc,eAAe,GAAG,CAAC,CAAC;YAChG,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,CAAC,QAAQ,EAAE,aAAa,IAAI,+CAA+C,EAAE,CAAC,CAAC;YACtH,OAAO,CAAC,GAAG,CAAC,4FAA4F,CAAC,CAAC;YAC1G,UAAU,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,aAAa,IAAI,EAAE,EAAE,CAAC;QAChG,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;QACjE,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,+CAA+C;IACjD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,UAAU,CAAC;AACpB,CAAC"}
+{"version":3,"file":"version-check.js","sourceRoot":"","sources":["../../src/lib/version-check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,IAAI,eAAe,EAAE,MAAM,cAAc,CAAC;AAEnE,IAAI,aAAa,GAAG,CAAC,CAAC;AACtB,IAAI,UAAU,GAA2E,IAAI,CAAC;AAC9F,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,sBAAsB;AAEjE,MAAM,UAAU,iBAAiB;IAC/B,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,QAAiB;IACrD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,IAAI,GAAG,GAAG,aAAa,GAAG,cAAc;QAAE,OAAO;IACjD,aAAa,GAAG,GAAG,CAAC;IAEpB,MAAM,GAAG,GAAG,QAAQ,IAAI,4BAA4B,CAAC;IACrD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,GAAG,iBAAiB,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxF,IAAI,CAAC,GAAG,CAAC,EAAE;YAAE,OAAO;QACpB,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAwF,CAAC;QACpH,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC;QACrC,IAAI,CAAC,MAAM;YAAE,OAAO;QAEpB,IAAI,MAAM,KAAK,eAAe,EAAE,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,4CAA4C,MAAM,cAAc,eAAe,GAAG,CAAC,CAAC;YAChG,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,CAAC,QAAQ,EAAE,aAAa,IAAI,+CAA+C,EAAE,CAAC,CAAC;YACtH,OAAO,CAAC,GAAG,CAAC,4FAA4F,CAAC,CAAC;YAC1G,UAAU,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,aAAa,IAAI,EAAE,EAAE,CAAC;QAChG,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;QACjE,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,+CAA+C;IACjD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/dist/lib/version.d.ts

@@ -0,0 +1 @@
+export declare const CRUCIBLE_VERSION: string;

package/dist/lib/version.js

@@ -0,0 +1,32 @@
+// Single source of truth for the Crucible version string at runtime.
+// Read from package.json so a release bump propagates everywhere
+// (notification footers, version-check log lines, --version flag, the
+// `collector_version` field on every snapshot) without anyone having to
+// remember to update a hardcoded constant.
+//
+// Returns "0.0.0" on read failure rather than throwing; the agent has to
+// keep running even if its package.json is somehow missing.
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { dirname, join } from "node:path";
+const __dirname = dirname(fileURLToPath(import.meta.url));
+function readPkgVersion() {
+    // src/lib/version.ts -> ../../package.json under src layout, but at
+    // runtime (compiled to dist/lib/version.js) it's still ../../package.json.
+    // Both paths resolve correctly because package.json sits one level above
+    // dist/ AND one level above src/.
+    for (const candidate of [
+        join(__dirname, "..", "..", "package.json"),
+        join(__dirname, "..", "package.json"),
+    ]) {
+        try {
+            const pkg = JSON.parse(readFileSync(candidate, "utf8"));
+            if (pkg && typeof pkg.version === "string")
+                return pkg.version;
+        }
+        catch { /* try next */ }
+    }
+    return "0.0.0";
+}
+export const CRUCIBLE_VERSION = readPkgVersion();
+//# sourceMappingURL=version.js.map

package/dist/lib/version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/lib/version.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,iEAAiE;AACjE,sEAAsE;AACtE,wEAAwE;AACxE,2CAA2C;AAC3C,EAAE;AACF,yEAAyE;AACzE,4DAA4D;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D,SAAS,cAAc;IACrB,oEAAoE;IACpE,2EAA2E;IAC3E,yEAAyE;IACzE,kCAAkC;IAClC,KAAK,MAAM,SAAS,IAAI;QACtB,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC;QAC3C,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,cAAc,CAAC;KACtC,EAAE,CAAC;QACF,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;YACxD,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ;gBAAE,OAAO,GAAG,CAAC,OAAO,CAAC;QACjE,CAAC;QAAC,MAAM,CAAC,CAAC,cAAc,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,cAAc,EAAE,CAAC"}

package/dist/notify/email.js

@@ -1,5 +1,6 @@
 import { execFile } from "child_process";
 import { promisify } from "util";
+import { CRUCIBLE_VERSION } from "../lib/version.js";
 const execFileAsync = promisify(execFile);
 export async function sendEmail(config, newAlerts, resolvedAlerts, serverName) {
     if (!config.to)
@@ -49,7 +50,7 @@ function buildBody(newAlerts, resolvedAlerts, serverName) {
         lines.push("");
     }
     lines.push("---");
-    lines.push("Glassmkr Collector v0.1.0");
+    lines.push(`Glassmkr Crucible v${CRUCIBLE_VERSION}`);
     return lines.join("\n");
 }
 //# sourceMappingURL=email.js.map

package/dist/notify/email.js.map

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

package/dist/notify/slack.js

@@ -1,3 +1,4 @@
+import { CRUCIBLE_VERSION } from "../lib/version.js";
 export async function sendSlack(webhookUrl, newAlerts, resolvedAlerts, serverName) {
     const blocks = [];
     if (newAlerts.length > 0) {
@@ -20,7 +21,7 @@ export async function sendSlack(webhookUrl, newAlerts, resolvedAlerts, serverNam
     if (blocks.length === 0)
         return true;
     blocks.push({ type: "divider" });
-    blocks.push({ type: "context", elements: [{ type: "mrkdwn", text: "Glassmkr Collector v0.1.0" }] });
+    blocks.push({ type: "context", elements: [{ type: "mrkdwn", text: `Glassmkr Crucible v${CRUCIBLE_VERSION}` }] });
     try {
         const res = await fetch(webhookUrl, {
             method: "POST",

package/dist/notify/slack.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glassmkr/crucible",
-  "version": "0.6.6",
+  "version": "0.7.1",
   "description": "Lightweight bare metal server monitoring. IPMI, SMART, OS, network. Opinionated alerts.",
   "type": "module",
   "main": "./dist/index.js",

package/src/__tests__/reboot-marker.test.ts

@@ -0,0 +1,122 @@
+import { describe, it, expect, beforeEach, afterEach } from "vitest";
+import { mkdtempSync, existsSync, writeFileSync, statSync, rmSync, chmodSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import {
+  consumeRebootMarker,
+  writeRebootMarker,
+  parseDuration,
+} from "../lib/reboot-marker.js";
+import { parseCliArgs } from "../cli.js";
+
+let tmpDir: string;
+let path: string;
+
+beforeEach(() => {
+  tmpDir = mkdtempSync(join(tmpdir(), "crucible-test-"));
+  path = join(tmpDir, "reboot-expected");
+});
+afterEach(() => {
+  try { rmSync(tmpDir, { recursive: true, force: true }); } catch {}
+});
+
+describe("consumeRebootMarker", () => {
+  it("7. marker present, not expired: returns flag, deletes file", () => {
+    const future = new Date(Date.now() + 5 * 60_000).toISOString();
+    writeFileSync(path, JSON.stringify({ expires_at: future, reason: "kernel update" }));
+    const out = consumeRebootMarker(path);
+    expect(out).toEqual({ expected: true, reason: "kernel update" });
+    expect(existsSync(path)).toBe(false);
+  });
+
+  it("8. marker present, expired: returns null, deletes file", () => {
+    const past = new Date(Date.now() - 60_000).toISOString();
+    writeFileSync(path, JSON.stringify({ expires_at: past, reason: "stale" }));
+    expect(consumeRebootMarker(path)).toBeNull();
+    expect(existsSync(path)).toBe(false);
+  });
+
+  it("9. marker absent: returns null, no throw", () => {
+    expect(consumeRebootMarker(path)).toBeNull();
+  });
+
+  it("15. malformed JSON: returns null, file deleted, no crash", () => {
+    writeFileSync(path, "{not json at all");
+    expect(consumeRebootMarker(path)).toBeNull();
+    expect(existsSync(path)).toBe(false);
+  });
+
+  it("invalid expires_at (missing): returns null, file deleted", () => {
+    writeFileSync(path, JSON.stringify({ reason: "oops" }));
+    expect(consumeRebootMarker(path)).toBeNull();
+    expect(existsSync(path)).toBe(false);
+  });
+
+  it("consumed marker cannot be re-read (single-use)", () => {
+    const future = new Date(Date.now() + 60_000).toISOString();
+    writeFileSync(path, JSON.stringify({ expires_at: future }));
+    expect(consumeRebootMarker(path)).not.toBeNull();
+    expect(consumeRebootMarker(path)).toBeNull();
+  });
+});
+
+describe("writeRebootMarker", () => {
+  it("13. writes file at given path with correct TTL and reason, 0600 mode", () => {
+    const now = new Date("2026-04-21T22:00:00Z");
+    const res = writeRebootMarker({ path, reason: "kernel update", ttlMs: 10 * 60_000, now });
+    expect(res.path).toBe(path);
+    expect(res.expires_at).toBe("2026-04-21T22:10:00.000Z");
+    expect(existsSync(path)).toBe(true);
+    const mode = statSync(path).mode & 0o777;
+    expect(mode).toBe(0o600);
+    const round = consumeRebootMarker(path, new Date("2026-04-21T22:05:00Z"));
+    expect(round).toEqual({ expected: true, reason: "kernel update" });
+  });
+
+  it("default TTL is 10 minutes", () => {
+    const now = new Date("2026-04-21T22:00:00Z");
+    const res = writeRebootMarker({ path, now });
+    expect(res.expires_at).toBe("2026-04-21T22:10:00.000Z");
+  });
+});
+
+describe("parseDuration", () => {
+  it.each([
+    ["10m", 600_000],
+    ["2h", 7_200_000],
+    ["600s", 600_000],
+    ["500ms", 500],
+    ["30", 30_000], // bare number -> seconds
+  ])("%s -> %d ms", (input, ms) => {
+    expect(parseDuration(input)).toBe(ms);
+  });
+  it("rejects garbage", () => {
+    expect(parseDuration("forever")).toBeNull();
+    expect(parseDuration("-5m")).toBeNull();
+    expect(parseDuration("")).toBeNull();
+  });
+});
+
+describe("CLI parseCliArgs subcommands", () => {
+  it("14. `reboot` subcommand captured with flags", () => {
+    const { result } = parseCliArgs(["reboot", "--reason", "kernel update"], "1.0.0");
+    expect(result.mode).toBe("reboot");
+    expect(result.reason).toBe("kernel update");
+  });
+  it("`mark-reboot` with --ttl parsed through", () => {
+    const { result } = parseCliArgs(["mark-reboot", "--ttl=5m", "--reason=test"], "1.0.0");
+    expect(result.mode).toBe("mark-reboot");
+    expect(result.ttl).toBe("5m");
+    expect(result.reason).toBe("test");
+  });
+  it("`mark-reboot --help` returns help output without running", () => {
+    const { result, output } = parseCliArgs(["mark-reboot", "--help"], "1.0.0");
+    expect(result.mode).toBe("help");
+    expect(output).toContain("mark-reboot");
+  });
+  it("top-level help lists the new subcommands", () => {
+    const { output } = parseCliArgs(["--help"], "1.0.0");
+    expect(output).toMatch(/mark-reboot/);
+    expect(output).toMatch(/reboot/);
+  });
+});

package/src/cli.ts

@@ -2,9 +2,13 @@
 // or collector initialization so --version and --help exit cleanly even when
 // the config file is missing or the host lacks the tools the collectors need.
 
+export type CliMode = "version" | "help" | "run" | "mark-reboot" | "reboot";
+
 export interface CliArgs {
-  mode: "version" | "help" | "run";
+  mode: CliMode;
   configPath: string;
+  reason?: string;
+  ttl?: string; // raw duration string, parsed by caller
 }
 
 export const DEFAULT_CONFIG_PATH = "/etc/glassmkr/collector.yaml";
@@ -13,6 +17,25 @@ export function parseCliArgs(argv: string[], version: string): { result: CliArgs
   // argv is typically process.argv.slice(2)
   let configPath = DEFAULT_CONFIG_PATH;
 
+  // Subcommand dispatch: `mark-reboot` and `reboot` take their own flags
+  // (--reason, --ttl) but re-use --help.
+  if (argv[0] === "mark-reboot" || argv[0] === "reboot") {
+    const mode: "mark-reboot" | "reboot" = argv[0];
+    let reason: string | undefined;
+    let ttl: string | undefined;
+    for (let i = 1; i < argv.length; i++) {
+      const a = argv[i];
+      if (a === "--help" || a === "-h") {
+        return { result: { mode: "help", configPath: "" }, output: subcommandHelp(mode, version) };
+      }
+      if (a === "--reason") { reason = argv[++i]; continue; }
+      if (a.startsWith("--reason=")) { reason = a.slice("--reason=".length); continue; }
+      if (a === "--ttl") { ttl = argv[++i]; continue; }
+      if (a.startsWith("--ttl=")) { ttl = a.slice("--ttl=".length); continue; }
+    }
+    return { result: { mode, configPath: "", reason, ttl }, output: null };
+  }
+
   for (let i = 0; i < argv.length; i++) {
     const arg = argv[i];
     if (arg === "--version" || arg === "-v") {
@@ -50,13 +73,40 @@ export function helpText(version: string): string {
     "",
     "Usage:",
     "  glassmkr-crucible [options]",
+    "  glassmkr-crucible mark-reboot [--reason TEXT] [--ttl DURATION]",
+    "  glassmkr-crucible reboot      [--reason TEXT] [--ttl DURATION]",
     "",
     "Options:",
     "  -v, --version    Print version and exit",
     "  -h, --help       Print this help and exit",
     `  -c, --config     Path to config file (default: ${DEFAULT_CONFIG_PATH})`,
     "",
+    "Subcommands:",
+    "  mark-reboot      Write a planned-reboot marker so the next boot",
+    "                   does not fire `server_rebooted_unexpectedly`.",
+    "                   You run the reboot yourself afterwards.",
+    "  reboot           Write the marker, then invoke `systemctl reboot`.",
+    "",
     "Without options, starts the collector daemon using the config file.",
     "Docs: https://github.com/glassmkr/crucible",
   ].join("\n");
 }
+
+function subcommandHelp(mode: "mark-reboot" | "reboot", version: string): string {
+  const action = mode === "reboot"
+    ? "Write a planned-reboot marker and invoke `systemctl reboot`."
+    : "Write a planned-reboot marker; operator triggers the reboot.";
+  return [
+    `glassmkr-crucible ${mode} - ${action}`,
+    "",
+    "Usage:",
+    `  glassmkr-crucible ${mode} [--reason TEXT] [--ttl DURATION]`,
+    "",
+    "Options:",
+    '  --reason TEXT    Free-text reason (e.g. "kernel update")',
+    "  --ttl DURATION   Expiry window; e.g. 5m, 10m, 1h (default 10m)",
+    "",
+    `Marker path: /var/lib/crucible/reboot-expected (requires root).`,
+    `v${version}`,
+  ].join("\n");
+}

package/src/collect/__tests__/system.test.ts

@@ -0,0 +1,29 @@
+import { describe, it, expect } from "vitest";
+import { readOsReleaseField } from "../system.js";
+
+describe("readOsReleaseField", () => {
+  it("parses unquoted Ubuntu values", () => {
+    const s = 'NAME="Ubuntu"\nID=ubuntu\nID_LIKE=debian\nVERSION_ID="24.04"';
+    expect(readOsReleaseField(s, "ID")).toBe("ubuntu");
+    expect(readOsReleaseField(s, "ID_LIKE")).toBe("debian");
+  });
+
+  it("parses quoted RHEL-family values", () => {
+    const s = 'NAME="Rocky Linux"\nID="rocky"\nID_LIKE="rhel centos fedora"';
+    expect(readOsReleaseField(s, "ID")).toBe("rocky");
+    expect(readOsReleaseField(s, "ID_LIKE")).toBe("rhel centos fedora");
+  });
+
+  it("lowercases the result (some distros uppercase their ID)", () => {
+    expect(readOsReleaseField("ID=Alpine", "ID")).toBe("alpine");
+  });
+
+  it("returns undefined for a missing key", () => {
+    expect(readOsReleaseField("ID=arch", "ID_LIKE")).toBeUndefined();
+  });
+
+  it("does not confuse ID with VERSION_ID", () => {
+    const s = 'VERSION_ID="24.04"\nID=ubuntu';
+    expect(readOsReleaseField(s, "ID")).toBe("ubuntu");
+  });
+});

package/src/collect/system.ts

@@ -3,9 +3,18 @@ import { readProcFile } from "../lib/parse.js";
 import { run } from "../lib/exec.js";
 import type { SystemInfo } from "../lib/types.js";
 
+// Matches KEY=value with optional surrounding double quotes. Handles both
+// `ID=ubuntu` and `ID="rocky"` styles found in the wild.
+export function readOsReleaseField(osRelease: string, key: string): string | undefined {
+  const m = osRelease.match(new RegExp(`^${key}=("?)(.+?)\\1$`, "m"));
+  return m ? m[2].toLowerCase() : undefined;
+}
+
 export async function collectSystem(): Promise<SystemInfo> {
   const osRelease = readProcFile("/etc/os-release") || "";
   const osName = osRelease.match(/PRETTY_NAME="(.+?)"/)?.[1] || "Unknown";
+  const os_id = readOsReleaseField(osRelease, "ID");
+  const os_id_like = readOsReleaseField(osRelease, "ID_LIKE");
   const kernel = (await run("uname", ["-r"]))?.trim() || "unknown";
   const uptimeRaw = readProcFile("/proc/uptime") || "0";
   const uptimeSeconds = Math.floor(parseFloat(uptimeRaw.split(" ")[0]));
@@ -15,6 +24,8 @@ export async function collectSystem(): Promise<SystemInfo> {
     hostname: hostname(),
     ip,
     os: osName,
+    ...(os_id ? { os_id } : {}),
+    ...(os_id_like ? { os_id_like } : {}),
     kernel,
     uptime_seconds: uptimeSeconds,
   };

package/src/index.ts

@@ -1,28 +1,46 @@
 #!/usr/bin/env node
 
-import { readFileSync } from "node:fs";
-import { fileURLToPath } from "node:url";
-import { dirname, join } from "node:path";
 import { parseCliArgs } from "./cli.js";
+import { CRUCIBLE_VERSION as PKG_VERSION } from "./lib/version.js";
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const PKG_VERSION = (() => {
-  try {
-    const pkg = JSON.parse(readFileSync(join(__dirname, "..", "package.json"), "utf8"));
-    return pkg.version || "0.0.0";
-  } catch {
-    return "0.0.0";
-  }
-})();
-
-// Handle --version and --help before importing collectors, loading config, or
-// starting the Prometheus server. This keeps the CLI responsive even on hosts
-// missing the config file or external tools.
+// Handle --version, --help, and planned-reboot subcommands before
+// importing collectors, loading config, or starting the Prometheus
+// server. Keeps the CLI responsive even on hosts missing the config
+// file or external tools.
 const { result: cliArgs, output: cliOutput } = parseCliArgs(process.argv.slice(2), PKG_VERSION);
-if (cliArgs.mode !== "run") {
+if (cliArgs.mode === "version" || cliArgs.mode === "help") {
   console.log(cliOutput);
   process.exit(0);
 }
+if (cliArgs.mode === "mark-reboot" || cliArgs.mode === "reboot") {
+  const { writeRebootMarker, parseDuration, DEFAULT_TTL_MS } = await import("./lib/reboot-marker.js");
+  const ttlMs = cliArgs.ttl ? parseDuration(cliArgs.ttl) : DEFAULT_TTL_MS;
+  if (ttlMs === null) {
+    console.error(`[mark-reboot] invalid --ttl value: ${cliArgs.ttl}. Use e.g. 10m, 2h, 600s.`);
+    process.exit(2);
+  }
+  try {
+    const { path, expires_at } = writeRebootMarker({
+      reason: cliArgs.reason, ttlMs,
+    });
+    console.log(`[${cliArgs.mode}] marker written: ${path} (expires ${expires_at}${cliArgs.reason ? `, reason: ${cliArgs.reason}` : ""})`);
+  } catch (err: any) {
+    console.error(`[${cliArgs.mode}] failed to write marker: ${err?.message || err}`);
+    console.error(`  Most likely cause: need root privileges to write under /var/lib/crucible/.`);
+    process.exit(1);
+  }
+  if (cliArgs.mode === "reboot") {
+    const { execFileSync } = await import("node:child_process");
+    console.log("[reboot] invoking systemctl reboot");
+    try {
+      execFileSync("systemctl", ["reboot"], { stdio: "inherit" });
+    } catch (err: any) {
+      console.error(`[reboot] systemctl reboot failed: ${err?.message || err}`);
+      process.exit(1);
+    }
+  }
+  process.exit(0);
+}
 
 import { loadConfig } from "./config.js";
 import { checkForUpdates } from "./lib/version-check.js";
@@ -51,6 +69,17 @@ import { collectSystemd } from "./collect/systemd.js";
 import { collectNtp } from "./collect/ntp.js";
 import { collectFileDescriptors } from "./collect/fd.js";
 import type { Snapshot, IpmiInfo } from "./lib/types.js";
+import { consumeRebootMarker, type PlannedReboot } from "./lib/reboot-marker.js";
+
+// Consume the planned-reboot marker once at startup. If the operator ran
+// `crucible-agent mark-reboot` / `reboot` before this boot, the marker
+// exists, we flag it on the first snapshot, and we delete the file (so
+// subsequent snapshots don't keep claiming the reboot was planned).
+const plannedRebootFlag: PlannedReboot | null = consumeRebootMarker();
+if (plannedRebootFlag) {
+  console.log(`[collector] Planned reboot acknowledged${plannedRebootFlag.reason ? `: ${plannedRebootFlag.reason}` : ""}`);
+}
+let plannedRebootConsumed = false;
 
 const config = loadConfig(cliArgs.configPath);
 
@@ -106,6 +135,14 @@ async function collect() {
     security: cachedSecurity,
   };
 
+  // Single-shot: the very first snapshot after a marked reboot carries
+  // the flag, subsequent snapshots do not.
+  if (plannedRebootFlag && !plannedRebootConsumed) {
+    (snapshot as any).expected_reboot = true;
+    if (plannedRebootFlag.reason) (snapshot as any).expected_reboot_reason = plannedRebootFlag.reason;
+    plannedRebootConsumed = true;
+  }
+
   // ZFS and I/O errors: collect every cycle (lightweight checks)
   try { snapshot.zfs = await collectZfs() ?? undefined; } catch { /* skip if ZFS not available */ }
   try { snapshot.io_errors = await collectIoErrors() ?? undefined; } catch { /* skip on error */ }

package/src/lib/reboot-marker.ts

@@ -0,0 +1,88 @@
+// Planned-reboot marker handling.
+//
+// An operator signals "the next reboot is expected, don't page me"
+// by writing a short-lived JSON file to disk BEFORE rebooting. The
+// collector reads and deletes it on agent startup; the first
+// post-boot snapshot then carries `expected_reboot: true` so Forge's
+// unexpected_reboot rule stays quiet.
+//
+// Single-use (deleted on read regardless of validity) and TTL-guarded
+// (default 10 min) so a forgotten marker cannot silence a genuine
+// crash reboot weeks later.
+
+import { existsSync, readFileSync, unlinkSync, writeFileSync, mkdirSync, chmodSync } from "node:fs";
+import { dirname } from "node:path";
+
+export const DEFAULT_MARKER_PATH = "/var/lib/crucible/reboot-expected";
+export const DEFAULT_TTL_MS = 10 * 60 * 1000;
+
+export interface PlannedReboot {
+  expected: true;
+  reason?: string;
+}
+
+export interface RebootMarker {
+  expires_at: string; // ISO timestamp
+  reason?: string;
+}
+
+/**
+ * Read and delete the marker at `path`. Returns the resolved reboot flag
+ * if the file existed, was parseable JSON, and hasn't expired; otherwise
+ * returns null. The file is unlinked in every branch where it existed,
+ * so a malformed or stale marker is one-shot (can't linger).
+ */
+export function consumeRebootMarker(
+  path: string = DEFAULT_MARKER_PATH,
+  now: Date = new Date(),
+): PlannedReboot | null {
+  if (!existsSync(path)) return null;
+  let raw: string;
+  try { raw = readFileSync(path, "utf-8"); } catch { try { unlinkSync(path); } catch {} return null; }
+  // Always delete after read, regardless of validity.
+  try { unlinkSync(path); } catch {}
+
+  let parsed: RebootMarker;
+  try { parsed = JSON.parse(raw); } catch { return null; }
+  if (!parsed || typeof parsed !== "object" || typeof parsed.expires_at !== "string") return null;
+  const expiresAt = new Date(parsed.expires_at);
+  if (isNaN(expiresAt.getTime())) return null;
+  if (expiresAt.getTime() <= now.getTime()) return null; // stale
+  return { expected: true, reason: parsed.reason };
+}
+
+/**
+ * Write a planned-reboot marker. Used by the `mark-reboot` and `reboot`
+ * CLI subcommands. `ttlMs` defaults to 10 minutes. Creates the parent
+ * directory if needed. Chmod 600 so other users on the host can't read
+ * or modify it.
+ */
+export function writeRebootMarker(opts: {
+  reason?: string;
+  ttlMs?: number;
+  path?: string;
+  now?: Date;
+}): { path: string; expires_at: string } {
+  const path = opts.path ?? DEFAULT_MARKER_PATH;
+  const now = opts.now ?? new Date();
+  const ttlMs = opts.ttlMs ?? DEFAULT_TTL_MS;
+  const expiresAt = new Date(now.getTime() + ttlMs);
+  const body: RebootMarker = { expires_at: expiresAt.toISOString() };
+  if (opts.reason) body.reason = opts.reason;
+  try { mkdirSync(dirname(path), { recursive: true, mode: 0o700 }); } catch {}
+  writeFileSync(path, JSON.stringify(body), { mode: 0o600 });
+  try { chmodSync(path, 0o600); } catch {}
+  return { path, expires_at: body.expires_at };
+}
+
+/** Parse a duration like "10m", "2h", "600s" into milliseconds. Used by
+ *  the CLI for the `--ttl` flag. */
+export function parseDuration(s: string): number | null {
+  const m = /^(\d+)\s*(ms|s|m|h)?$/.exec(s.trim());
+  if (!m) return null;
+  const n = parseInt(m[1], 10);
+  if (!Number.isFinite(n) || n < 0) return null;
+  const unit = m[2] ?? "s";
+  const mult = unit === "ms" ? 1 : unit === "s" ? 1000 : unit === "m" ? 60_000 : 3_600_000;
+  return n * mult;
+}

package/src/lib/types.ts

@@ -18,6 +18,12 @@ export interface Snapshot {
   systemd?: SystemdData;
   ntp?: NtpData;
   file_descriptors?: FileDescriptorData;
+  // Planned-reboot flag: set only on the first snapshot after a reboot
+  // that was marked with `crucible-agent mark-reboot` / `reboot`. Forge
+  // reads this to suppress the `unexpected_reboot` rule. Single-use:
+  // subsequent snapshots don't carry it.
+  expected_reboot?: boolean;
+  expected_reboot_reason?: string;
 }
 
 export interface ConntrackData {
@@ -73,6 +79,12 @@ export interface SystemInfo {
   hostname: string;
   ip: string;
   os: string;
+  /** `ID=` from /etc/os-release, lowercased. e.g. "ubuntu", "debian", "rocky", "arch", "alpine". */
+  os_id?: string;
+  /** `ID_LIKE=` from /etc/os-release, lowercased, space-separated. Used by Forge
+   *  to pick distro-family-specific fix command variants. e.g. on Rocky this
+   *  is "rhel centos fedora"; on Ubuntu it is "debian". */
+  os_id_like?: string;
   kernel: string;
   uptime_seconds: number;
 }

package/src/lib/version-check.ts

@@ -1,4 +1,5 @@
-const CURRENT_VERSION = "0.1.0";
+import { CRUCIBLE_VERSION as CURRENT_VERSION } from "./version.js";
+
 let lastCheckTime = 0;
 let lastResult: { updateAvailable: boolean; latest: string; changelog: string } | null = null;
 const CHECK_INTERVAL = 6 * 60 * 60 * 1000; // check every 6 hours