@botcord/daemon 0.2.62 → 0.2.63

package/dist/diagnostics.d.ts

@@ -5,6 +5,7 @@ export interface CreateDiagnosticBundleOptions {
     logFile?: string;
     configFile?: string;
     snapshotFile?: string;
+    sessionsFile?: string;
     doctor?: {
         text: string;
         json: unknown;

package/dist/diagnostics.js

@@ -2,9 +2,11 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir, hostname, platform, release, arch } from "node:os";
 import path from "node:path";
 import { Buffer } from "node:buffer";
+import { createRequire } from "node:module";
+import { fileURLToPath } from "node:url";
 import { deflateRawSync } from "node:zlib";
 import { AUTH_EXPIRED_FLAG_PATH, USER_AUTH_PATH, } from "./user-auth.js";
-import { CONFIG_FILE_PATH, PID_PATH, SNAPSHOT_PATH, loadConfig, saveConfig, } from "./config.js";
+import { CONFIG_FILE_PATH, PID_PATH, SESSIONS_PATH, SNAPSHOT_PATH, loadConfig, saveConfig, } from "./config.js";
 import { listDaemonLogFiles, LOG_FILE_PATH } from "./log.js";
 import { listAcpTraceLogFiles, listRuntimeLogFiles } from "./acp-logs.js";
 import { channelsFromDaemonConfig, defaultHttpFetcher, renderDoctor, runDoctor, } from "./doctor.js";
@@ -14,6 +16,24 @@ import { discoverLocalOpenclawGateways, mergeOpenclawGateways, openclawDiscovery
 const DIAGNOSTICS_DIR = path.join(homedir(), ".botcord", "diagnostics");
 const MAX_UPLOAD_BYTES = 50 * 1024 * 1024;
 const DEFAULT_ROTATED_LOGS_IN_BUNDLE = 5;
+const require = createRequire(import.meta.url);
+const MODULE_PATH = fileURLToPath(import.meta.url);
+const ENV_ALLOWLIST = new Set([
+    "NODE_ENV",
+    "PATH",
+    "BOTCORD_HUB",
+    "BOTCORD_DAEMON_HOME",
+    "BOTCORD_DAEMON_CONFIG",
+    "BOTCORD_DAEMON_LOG",
+    "BOTCORD_DAEMON_SNAPSHOT_INTERVAL_MS",
+    "BOTCORD_HERMES_AGENT_BIN",
+    "BOTCORD_CLAUDE_CODE_BIN",
+    "BOTCORD_CODEX_BIN",
+    "BOTCORD_GEMINI_BIN",
+    "BOTCORD_DEEPSEEK_TUI_BIN",
+    "BOTCORD_KIMI_CLI_BIN",
+    "OPENCLAW_ACP_URL",
+]);
 const SECRET_PATTERNS = [
     [/(Authorization:\s*Bearer\s+)[^\s"']+/gi, "$1[REDACTED]"],
     [/("?(?:accessToken|access_token|refreshToken|refresh_token|token|privateKey|private_key|secret)"?\s*:\s*")[^"]+(")/gi, "$1[REDACTED]$2"],
@@ -38,6 +58,82 @@ function safeReadText(file) {
         return `read failed: ${err instanceof Error ? err.message : String(err)}\n`;
     }
 }
+function readJsonFile(file) {
+    try {
+        const parsed = JSON.parse(readFileSync(file, "utf8"));
+        return parsed && typeof parsed === "object" && !Array.isArray(parsed)
+            ? parsed
+            : null;
+    }
+    catch {
+        return null;
+    }
+}
+function findDaemonPackageJson(startFile) {
+    let dir = path.dirname(startFile);
+    for (let i = 0; i < 6; i += 1) {
+        const candidate = path.join(dir, "package.json");
+        const parsed = readJsonFile(candidate);
+        if (parsed?.name === "@botcord/daemon")
+            return parsed;
+        const next = path.dirname(dir);
+        if (next === dir)
+            break;
+        dir = next;
+    }
+    return null;
+}
+function readInstalledPackageVersion(packageJsonSpecifier) {
+    try {
+        const pkgPath = require.resolve(packageJsonSpecifier);
+        const parsed = readJsonFile(pkgPath);
+        return typeof parsed?.version === "string" ? parsed.version : null;
+    }
+    catch {
+        return null;
+    }
+}
+function daemonRuntimeSummary() {
+    const pkg = findDaemonPackageJson(MODULE_PATH);
+    const version = typeof pkg?.version === "string" ? pkg.version : null;
+    const startedAtMs = Date.now() - Math.round(process.uptime() * 1000);
+    return {
+        packageName: typeof pkg?.name === "string" ? pkg.name : "@botcord/daemon",
+        version,
+        modulePath: MODULE_PATH,
+        entrypoint: process.argv[1] ?? null,
+        execPath: process.execPath,
+        argv: process.argv.map((arg) => redact(arg)),
+        execArgv: process.execArgv.map((arg) => redact(arg)),
+        cwd: process.cwd(),
+        pid: process.pid,
+        ppid: process.ppid,
+        uptimeSec: Math.round(process.uptime()),
+        startedAt: new Date(startedAtMs).toISOString(),
+        versions: {
+            node: process.version,
+            v8: process.versions.v8,
+            uv: process.versions.uv,
+            openssl: process.versions.openssl,
+        },
+        packages: {
+            "@botcord/daemon": version,
+            "@botcord/cli": readInstalledPackageVersion("@botcord/cli/package.json"),
+            "@botcord/protocol-core": readInstalledPackageVersion("@botcord/protocol-core/package.json"),
+        },
+    };
+}
+function safeEnvironmentSummary() {
+    const out = {};
+    for (const [key, value] of Object.entries(process.env)) {
+        if (!value)
+            continue;
+        if (!ENV_ALLOWLIST.has(key) && !key.startsWith("BOTCORD_DAEMON_"))
+            continue;
+        out[key] = redact(value);
+    }
+    return out;
+}
 function readUserAuthSummary() {
     const raw = safeReadText(USER_AUTH_PATH);
     if (!raw)
@@ -260,6 +356,7 @@ export async function createDiagnosticBundle(opts = {}) {
     const logFile = opts.logFile ?? LOG_FILE_PATH;
     const configFile = opts.configFile ?? CONFIG_FILE_PATH;
     const snapshotFile = opts.snapshotFile ?? SNAPSHOT_PATH;
+    const sessionsFile = opts.sessionsFile ?? SESSIONS_PATH;
     const includeAllLogs = opts.includeAllLogs === true;
     const logs = bundledLogs(logFile, includeAllLogs);
     const acpLogs = listAcpTraceLogFiles(includeAllLogs);
@@ -273,9 +370,12 @@ export async function createDiagnosticBundle(opts = {}) {
         release: release(),
         arch: arch(),
         node: process.version,
+        daemon: daemonRuntimeSummary(),
+        environment: safeEnvironmentSummary(),
         pidPath: PID_PATH,
         pid: process.pid,
         configPath: configFile,
+        sessionsPath: sessionsFile,
         snapshotPath: snapshotFile,
         logPath: logFile,
         logsBundled: logs.map((entry) => ({
@@ -343,6 +443,11 @@ export async function createDiagnosticBundle(opts = {}) {
         name: "snapshot.json",
         data: snapshot ?? `no snapshot file at ${snapshotFile}\n`,
     });
+    const sessions = safeReadText(sessionsFile);
+    entries.push({
+        name: "sessions.json.redacted",
+        data: sessions ?? `no sessions file at ${sessionsFile}\n`,
+    });
     const zip = createZip(entries);
     const out = path.join(diagnosticsDir, filename);
     writeFileSync(out, zip, { mode: 0o600 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botcord/daemon",
-  "version": "0.2.62",
+  "version": "0.2.63",
   "description": "BotCord local daemon — bridges Hub inbox push to local Claude Code / Codex / Gemini CLIs",
   "type": "module",
   "bin": {

package/src/__tests__/diagnostics.test.ts

@@ -11,16 +11,22 @@ describe("diagnostics bundle", () => {
     const logFile = path.join(tmp, "daemon.log");
     const configFile = path.join(tmp, "config.json");
     const snapshotFile = path.join(tmp, "snapshot.json");
+    const sessionsFile = path.join(tmp, "sessions.json");
     const diagnosticsDir = path.join(tmp, "diagnostics");
     writeFileSync(logFile, 'Authorization: Bearer secret-token\n{"refreshToken":"drt_secret"}\n');
     writeFileSync(configFile, '{"token":"agent-secret","ok":true}\n');
     writeFileSync(snapshotFile, '{"version":1}\n');
+    writeFileSync(
+      sessionsFile,
+      '{"version":1,"entries":{"k":{"runtimeSessionId":"sess_1","token":"session-secret"}}}\n',
+    );
 
     const bundle = await createDiagnosticBundle({
       diagnosticsDir,
       logFile,
       configFile,
       snapshotFile,
+      sessionsFile,
       doctor: { text: "doctor ok", json: { ok: true } },
     });
     expect(bundle.filename).toMatch(/^botcord-daemon-diagnostics-.*\.zip$/);
@@ -42,12 +48,29 @@ describe("diagnostics bundle", () => {
     expect(listing).toContain("doctor.json");
     expect(listing).toContain("status.json");
     expect(listing).toContain("config.json.redacted");
+    expect(listing).toContain("sessions.json.redacted");
 
     const log = execFileSync("unzip", ["-p", bundle.path, "daemon.log"], {
       encoding: "utf8",
     });
     expect(log).toContain("Authorization: Bearer [REDACTED]");
     expect(log).toContain('"refreshToken":"[REDACTED]"');
+
+    const status = JSON.parse(execFileSync("unzip", ["-p", bundle.path, "status.json"], {
+      encoding: "utf8",
+    }));
+    expect(status.daemon.packageName).toBe("@botcord/daemon");
+    expect(status.daemon.version).toMatch(/^\d+\.\d+\.\d+/);
+    expect(status.daemon.entrypoint).toBeTruthy();
+    expect(status.daemon.packages["@botcord/daemon"]).toBe(status.daemon.version);
+    expect(status.environment.PATH).toBeTruthy();
+    expect(status.sessionsPath).toBe(sessionsFile);
+
+    const sessions = execFileSync("unzip", ["-p", bundle.path, "sessions.json.redacted"], {
+      encoding: "utf8",
+    });
+    expect(sessions).toContain('"runtimeSessionId":"sess_1"');
+    expect(sessions).toContain('"token":"[REDACTED]"');
   }, 20_000);
 
   it("bundles active log plus latest 5 rotated logs by default, or all with includeAllLogs", async () => {

package/src/diagnostics.ts

@@ -2,6 +2,8 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir, hostname, platform, release, arch } from "node:os";
 import path from "node:path";
 import { Buffer } from "node:buffer";
+import { createRequire } from "node:module";
+import { fileURLToPath } from "node:url";
 import { deflateRawSync } from "node:zlib";
 import {
   AUTH_EXPIRED_FLAG_PATH,
@@ -12,6 +14,7 @@ import {
 import {
   CONFIG_FILE_PATH,
   PID_PATH,
+  SESSIONS_PATH,
   SNAPSHOT_PATH,
   loadConfig,
   saveConfig,
@@ -38,12 +41,31 @@ import {
 const DIAGNOSTICS_DIR = path.join(homedir(), ".botcord", "diagnostics");
 const MAX_UPLOAD_BYTES = 50 * 1024 * 1024;
 const DEFAULT_ROTATED_LOGS_IN_BUNDLE = 5;
+const require = createRequire(import.meta.url);
+const MODULE_PATH = fileURLToPath(import.meta.url);
+const ENV_ALLOWLIST = new Set([
+  "NODE_ENV",
+  "PATH",
+  "BOTCORD_HUB",
+  "BOTCORD_DAEMON_HOME",
+  "BOTCORD_DAEMON_CONFIG",
+  "BOTCORD_DAEMON_LOG",
+  "BOTCORD_DAEMON_SNAPSHOT_INTERVAL_MS",
+  "BOTCORD_HERMES_AGENT_BIN",
+  "BOTCORD_CLAUDE_CODE_BIN",
+  "BOTCORD_CODEX_BIN",
+  "BOTCORD_GEMINI_BIN",
+  "BOTCORD_DEEPSEEK_TUI_BIN",
+  "BOTCORD_KIMI_CLI_BIN",
+  "OPENCLAW_ACP_URL",
+]);
 
 export interface CreateDiagnosticBundleOptions {
   diagnosticsDir?: string;
   logFile?: string;
   configFile?: string;
   snapshotFile?: string;
+  sessionsFile?: string;
   doctor?: { text: string; json: unknown };
   includeAllLogs?: boolean;
 }
@@ -89,6 +111,81 @@ function safeReadText(file: string): string | null {
   }
 }
 
+function readJsonFile(file: string): Record<string, unknown> | null {
+  try {
+    const parsed = JSON.parse(readFileSync(file, "utf8")) as unknown;
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed)
+      ? parsed as Record<string, unknown>
+      : null;
+  } catch {
+    return null;
+  }
+}
+
+function findDaemonPackageJson(startFile: string): Record<string, unknown> | null {
+  let dir = path.dirname(startFile);
+  for (let i = 0; i < 6; i += 1) {
+    const candidate = path.join(dir, "package.json");
+    const parsed = readJsonFile(candidate);
+    if (parsed?.name === "@botcord/daemon") return parsed;
+    const next = path.dirname(dir);
+    if (next === dir) break;
+    dir = next;
+  }
+  return null;
+}
+
+function readInstalledPackageVersion(packageJsonSpecifier: string): string | null {
+  try {
+    const pkgPath = require.resolve(packageJsonSpecifier);
+    const parsed = readJsonFile(pkgPath);
+    return typeof parsed?.version === "string" ? parsed.version : null;
+  } catch {
+    return null;
+  }
+}
+
+function daemonRuntimeSummary(): Record<string, unknown> {
+  const pkg = findDaemonPackageJson(MODULE_PATH);
+  const version = typeof pkg?.version === "string" ? pkg.version : null;
+  const startedAtMs = Date.now() - Math.round(process.uptime() * 1000);
+  return {
+    packageName: typeof pkg?.name === "string" ? pkg.name : "@botcord/daemon",
+    version,
+    modulePath: MODULE_PATH,
+    entrypoint: process.argv[1] ?? null,
+    execPath: process.execPath,
+    argv: process.argv.map((arg) => redact(arg)),
+    execArgv: process.execArgv.map((arg) => redact(arg)),
+    cwd: process.cwd(),
+    pid: process.pid,
+    ppid: process.ppid,
+    uptimeSec: Math.round(process.uptime()),
+    startedAt: new Date(startedAtMs).toISOString(),
+    versions: {
+      node: process.version,
+      v8: process.versions.v8,
+      uv: process.versions.uv,
+      openssl: process.versions.openssl,
+    },
+    packages: {
+      "@botcord/daemon": version,
+      "@botcord/cli": readInstalledPackageVersion("@botcord/cli/package.json"),
+      "@botcord/protocol-core": readInstalledPackageVersion("@botcord/protocol-core/package.json"),
+    },
+  };
+}
+
+function safeEnvironmentSummary(): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(process.env)) {
+    if (!value) continue;
+    if (!ENV_ALLOWLIST.has(key) && !key.startsWith("BOTCORD_DAEMON_")) continue;
+    out[key] = redact(value);
+  }
+  return out;
+}
+
 function readUserAuthSummary(): Record<string, unknown> | null {
   const raw = safeReadText(USER_AUTH_PATH);
   if (!raw) return null;
@@ -329,6 +426,7 @@ export async function createDiagnosticBundle(
   const logFile = opts.logFile ?? LOG_FILE_PATH;
   const configFile = opts.configFile ?? CONFIG_FILE_PATH;
   const snapshotFile = opts.snapshotFile ?? SNAPSHOT_PATH;
+  const sessionsFile = opts.sessionsFile ?? SESSIONS_PATH;
   const includeAllLogs = opts.includeAllLogs === true;
   const logs = bundledLogs(logFile, includeAllLogs);
   const acpLogs = listAcpTraceLogFiles(includeAllLogs);
@@ -343,9 +441,12 @@ export async function createDiagnosticBundle(
     release: release(),
     arch: arch(),
     node: process.version,
+    daemon: daemonRuntimeSummary(),
+    environment: safeEnvironmentSummary(),
     pidPath: PID_PATH,
     pid: process.pid,
     configPath: configFile,
+    sessionsPath: sessionsFile,
     snapshotPath: snapshotFile,
     logPath: logFile,
     logsBundled: logs.map((entry) => ({
@@ -413,6 +514,11 @@ export async function createDiagnosticBundle(
     name: "snapshot.json",
     data: snapshot ?? `no snapshot file at ${snapshotFile}\n`,
   });
+  const sessions = safeReadText(sessionsFile);
+  entries.push({
+    name: "sessions.json.redacted",
+    data: sessions ?? `no sessions file at ${sessionsFile}\n`,
+  });
 
   const zip = createZip(entries);
   const out = path.join(diagnosticsDir, filename);