@coworker-jp/aidr 0.0.5 → 0.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coworker-jp/aidr",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "AIDR setup CLI - installs ai-scanner hooks for 19+ AI coding agents",
   "type": "module",
   "bin": {

package/src/cli.mjs

@@ -520,6 +520,35 @@ async function cmdUninstall(opts) {
   } catch (e) {
     console.error(`scheduled uninstall warning: ${e.message}`);
   }
+
+  // Sentinel daemon (LaunchDaemon / systemd service) — same auto-sudo
+  // pattern. Independent try-block so a scheduled-uninstall hiccup doesn't
+  // skip sentinel cleanup (and vice-versa).
+  try {
+    const { uninstallSentinel, isSentinelInstalled } = await import("./sentinel.mjs");
+    if (await isSentinelInstalled()) {
+      const isRoot = process.env.AI_SCANNER_FAKE_ROOT === "1"
+        || (process.getuid && process.getuid() === 0);
+      if (!isRoot) {
+        const interactive = process.stdin.isTTY && process.stdout.isTTY && process.platform !== "win32";
+        if (interactive) {
+          console.error("Sentinel daemon detected. Re-running via sudo to remove (you may be prompted for your password)...");
+          const result = spawnSync(
+            "sudo",
+            ["-E", process.execPath, ...process.argv.slice(1)],
+            { stdio: "inherit" }
+          );
+          process.exit(result.status ?? 0);
+        }
+        console.error("Note: sentinel daemon detected but uninstall needs root. Re-run:");
+        console.error(`  sudo -E npx @coworker-jp/aidr uninstall`);
+      } else {
+        await uninstallSentinel({ dryRun: opts.dryRun });
+      }
+    }
+  } catch (e) {
+    console.error(`sentinel uninstall warning: ${e.message}`);
+  }
 }
 
 async function cmdDoctor() {
@@ -560,7 +589,7 @@ export async function run(argv) {
   program
     .name("aidr")
     .description("AIDR setup CLI — installs ai-scanner hooks for AI coding agents")
-    .version("0.0.5");
+    .version("0.0.6");
 
   program
     .command("install")

package/src/scheduled.mjs

@@ -33,6 +33,17 @@ export const LAUNCHD_WRAPPER  = path.join(SYSTEM_BIN_DIR, "aidr-scheduled-wrappe
 // Linux cron fallback (system cron, runs as root)
 export const CRON_FILE        = ROOT_PREFIX + "/etc/cron.d/aidr-scheduled";
 
+// Shared world-readable system log directory. Both aidr-scheduled and
+// coworker-sentinel daemons write here so non-root users can `tail` errors
+// without sudo (memory: feedback_server_failures_never_burden_client.md).
+// Mode 0755 root:root, files mode 0644. systemd's `StandardOutput=append:`
+// (systemd 240+) and launchd's `StandardOutPath` redirect daemon stderr/stdout
+// here; for cron, the entry uses a literal `>> ... 2>&1` redirect.
+export const SYSTEM_LOG_DIR     = ROOT_PREFIX + "/var/log/coworker";
+export const SCHEDULED_LOG_FILE = path.join(SYSTEM_LOG_DIR, "scheduled.log");
+export const SENTINEL_LOG_FILE  = path.join(SYSTEM_LOG_DIR, "sentinel.log");
+export const LOGROTATE_FILE     = ROOT_PREFIX + "/etc/logrotate.d/coworker";
+
 function isRoot() {
   if (process.env.AI_SCANNER_FAKE_ROOT === "1") return true;
   return Boolean(process.getuid && process.getuid() === 0);
@@ -42,6 +53,85 @@ async function exists(p) {
   try { await fs.access(p); return true; } catch { return false; }
 }
 
+/**
+ * Create SYSTEM_LOG_DIR (mode 0755 root:root) and touch the given daemon's
+ * log file (mode 0644) if it doesn't already exist. Idempotent — both
+ * installScheduled and installSentinel call this so the daemon's first run
+ * has a writable target even before any line is logged.
+ */
+export async function ensureSystemLogDir(logFile, { dryRun = false } = {}) {
+  if (dryRun) {
+    console.log("[dry-run] Would create:", SYSTEM_LOG_DIR, "(mode 0755) and touch", logFile, "(mode 0644)");
+    return;
+  }
+  await fs.mkdir(SYSTEM_LOG_DIR, { recursive: true, mode: 0o755 });
+  if (!(await exists(logFile))) {
+    const fd = await fs.open(logFile, "w", 0o644);
+    await fd.close();
+  }
+}
+
+/**
+ * Drop /etc/logrotate.d/coworker covering both daemons. Idempotent: same
+ * content overwritten on every install. The logrotate command itself may
+ * not be present on minimal containers; the config file is harmless when
+ * no logrotate is installed (it simply isn't read). Operators on systems
+ * without logrotate should configure their own rotation.
+ */
+export async function writeLogrotateConfig({ dryRun = false } = {}) {
+  const body = `# Generated by aidr install. Covers both aidr-scheduled (weekly) and
+# coworker-sentinel (daily, more chatty under load).
+/var/log/coworker/scheduled.log {
+    weekly
+    rotate 4
+    compress
+    missingok
+    notifempty
+    create 0644 root root
+}
+
+/var/log/coworker/sentinel.log {
+    daily
+    rotate 7
+    compress
+    missingok
+    notifempty
+    create 0644 root root
+}
+`;
+  if (dryRun) {
+    console.log("[dry-run] Would create:", LOGROTATE_FILE, "(mode 0644)");
+    return;
+  }
+  await fs.mkdir(path.dirname(LOGROTATE_FILE), { recursive: true });
+  await fs.writeFile(LOGROTATE_FILE, body, { mode: 0o644 });
+}
+
+/**
+ * Remove the given daemon's log file. If both daemon log files are gone
+ * afterwards, also rmdir SYSTEM_LOG_DIR and remove the logrotate config.
+ * Used by uninstallScheduled and uninstallSentinel; the order doesn't
+ * matter (whichever daemon uninstalls last wins the cleanup).
+ */
+export async function removeSystemLog(logFile, { dryRun = false } = {}) {
+  if (await exists(logFile)) {
+    if (dryRun) {
+      console.log("[dry-run] Would remove:", logFile);
+    } else {
+      try { await fs.unlink(logFile); } catch { /* ignore */ }
+    }
+  }
+  // dryRun does not modify state, so don't gate cleanup on the live FS.
+  if (dryRun) return;
+  const stillUsed = (await exists(SCHEDULED_LOG_FILE))
+                 || (await exists(SENTINEL_LOG_FILE));
+  if (stillUsed) return;
+  try { await fs.rmdir(SYSTEM_LOG_DIR); } catch { /* dir not empty / not present */ }
+  if (await exists(LOGROTATE_FILE)) {
+    try { await fs.unlink(LOGROTATE_FILE); } catch { /* ignore */ }
+  }
+}
+
 export async function isScheduledInstalled() {
   return (
     await exists(SYSTEMD_TIMER) ||
@@ -70,6 +160,12 @@ export async function installScheduled(opts) {
   // Write the shared env file first; both Linux and macOS paths reference it.
   await writeEnvFile(accessKey, dryRun);
 
+  // Create the world-readable log dir + touch scheduled.log + drop the
+  // shared logrotate config. Both run before the systemd / launchd / cron
+  // entry so the daemon's first invocation has a target to append to.
+  await ensureSystemLogDir(SCHEDULED_LOG_FILE, { dryRun });
+  await writeLogrotateConfig({ dryRun });
+
   const platform = process.platform;
   if (platform === "linux") {
     await installSystemd({ dryRun, noActivate, interval, binaryPath });
@@ -91,6 +187,9 @@ async function writeEnvFile(accessKey, dryRun) {
 }
 
 async function installSystemd({ binaryPath, dryRun, noActivate, interval = 4 }) {
+  // StandardOutput=append: requires systemd 240+ (released 2018). Modern
+  // distros (RHEL 9 / Ubuntu 20.04+ / Debian 11+) all support it. Older
+  // RHEL 8 (systemd 239) operators must redirect manually or upgrade.
   const serviceContent = `[Unit]
 Description=AIDR scheduled endpoint-info scan
 After=network-online.target
@@ -101,6 +200,8 @@ Type=oneshot
 User=root
 EnvironmentFile=${SYSTEM_ENV_FILE}
 ExecStart=${binaryPath} scan endpoint-info
+StandardOutput=append:${SCHEDULED_LOG_FILE}
+StandardError=append:${SCHEDULED_LOG_FILE}
 `;
 
   const timerContent = `[Unit]
@@ -166,6 +267,10 @@ exec ${binaryPath} scan endpoint-info
   <integer>${interval * 3600}</integer>
   <key>RunAtLoad</key>
   <false/>
+  <key>StandardOutPath</key>
+  <string>${SCHEDULED_LOG_FILE}</string>
+  <key>StandardErrorPath</key>
+  <string>${SCHEDULED_LOG_FILE}</string>
 </dict>
 </plist>
 `;
@@ -193,8 +298,10 @@ exec ${binaryPath} scan endpoint-info
 
 async function installCronDir({ binaryPath, dryRun, interval = 4 }) {
   // /etc/cron.d entries run as the user named in the line. We embed the env
-  // file source via a small inline script.
-  const entry = `0 */${interval} * * * root . ${SYSTEM_ENV_FILE} && ${binaryPath} scan endpoint-info 2>/dev/null # aidr-scheduled
+  // file source via a small inline script. stdout + stderr are appended to
+  // the world-readable log so non-root users can read recent runs without
+  // sudo (replaces the old `2>/dev/null` which deliberately swallowed errors).
+  const entry = `0 */${interval} * * * root . ${SYSTEM_ENV_FILE} && ${binaryPath} scan endpoint-info >> ${SCHEDULED_LOG_FILE} 2>&1 # aidr-scheduled
 `;
   if (dryRun) {
     console.log("[dry-run] Would create:", CRON_FILE);
@@ -245,4 +352,9 @@ export async function uninstallScheduled({ dryRun = false, noActivate = false }
     if (!dryRun) { try { await fs.unlink(SYSTEM_ENV_FILE); } catch { /* ignore */ } }
     else { console.log("[dry-run] Would remove:", SYSTEM_ENV_FILE); }
   }
+
+  // Drop the scheduled log file. removeSystemLog also rmdirs SYSTEM_LOG_DIR
+  // and deletes /etc/logrotate.d/coworker if no daemon log files remain
+  // (i.e. sentinel is also uninstalled).
+  await removeSystemLog(SCHEDULED_LOG_FILE, { dryRun });
 }

package/src/sentinel.mjs

@@ -15,7 +15,14 @@ import path from "node:path";
 import { execFile, spawnSync } from "node:child_process";
 import { promisify } from "node:util";
 import { fetchSentinel, detectPlatform } from "./binary-fetcher.mjs";
-import { SYSTEM_BIN_DIR, SYSTEM_ENV_FILE } from "./scheduled.mjs";
+import {
+  SYSTEM_BIN_DIR,
+  SYSTEM_ENV_FILE,
+  SENTINEL_LOG_FILE,
+  ensureSystemLogDir,
+  writeLogrotateConfig,
+  removeSystemLog,
+} from "./scheduled.mjs";
 
 const execFileP = promisify(execFile);
 
@@ -24,7 +31,6 @@ const ROOT_PREFIX = process.env.AIDR_SCHEDULED_ROOT || "";
 export const SENTINEL_BIN = path.join(SYSTEM_BIN_DIR, "coworker-sentinel");
 export const SENTINEL_PLIST = ROOT_PREFIX + "/Library/LaunchDaemons/jp.coworker.sentinel.plist";
 export const SENTINEL_SERVICE = ROOT_PREFIX + "/etc/systemd/system/coworker-sentinel.service";
-export const SENTINEL_LOG_DIR = ROOT_PREFIX + "/var/log/coworker-sentinel";
 
 function isRoot() {
   if (process.env.AI_SCANNER_FAKE_ROOT === "1") return true;
@@ -54,16 +60,16 @@ function buildLaunchdPlist(envFile) {
   <array>
     <string>/bin/sh</string>
     <string>-c</string>
-    <string>. ${envFile} &amp;&amp; exec ${SENTINEL_BIN}</string>
+    <string>set -a; . ${envFile}; set +a; exec ${SENTINEL_BIN}</string>
   </array>
   <key>RunAtLoad</key>
   <true/>
   <key>KeepAlive</key>
   <true/>
   <key>StandardOutPath</key>
-  <string>${SENTINEL_LOG_DIR}/sentinel.log</string>
+  <string>${SENTINEL_LOG_FILE}</string>
   <key>StandardErrorPath</key>
-  <string>${SENTINEL_LOG_DIR}/sentinel.log</string>
+  <string>${SENTINEL_LOG_FILE}</string>
   <key>ThrottleInterval</key>
   <integer>10</integer>
 </dict>
@@ -84,8 +90,8 @@ EnvironmentFile=${envFile}
 ExecStart=${SENTINEL_BIN}
 Restart=on-failure
 RestartSec=5
-StandardOutput=journal
-StandardError=journal
+StandardOutput=append:${SENTINEL_LOG_FILE}
+StandardError=append:${SENTINEL_LOG_FILE}
 SyslogIdentifier=coworker-sentinel
 
 [Install]
@@ -127,10 +133,10 @@ export async function installSentinel(opts = {}) {
     console.error(`[sentinel] DRY-RUN: would download → ${SENTINEL_BIN}`);
   }
 
-  // 2. Create log directory
-  if (!dryRun) {
-    await fs.mkdir(SENTINEL_LOG_DIR, { recursive: true, mode: 0o755 });
-  }
+  // 2. Create the world-readable log dir + touch sentinel.log + drop the
+  //    shared logrotate config (covering both daemons; idempotent).
+  await ensureSystemLogDir(SENTINEL_LOG_FILE, { dryRun });
+  await writeLogrotateConfig({ dryRun });
 
   // 3. Write env file (append AI_SCANNER_ACCESS_KEY if missing)
   if (accessKey && !dryRun) {
@@ -161,13 +167,15 @@ async function _installMacos(dryRun, noActivate) {
     console.error(`[sentinel] Written: ${SENTINEL_PLIST}`);
 
     if (!noActivate && process.env.AI_SCANNER_NO_SCHEDULED_ACTIVATE !== "1") {
-      // Unload existing (ignore errors) then load
-      spawnSync("launchctl", ["unload", SENTINEL_PLIST], { stdio: "ignore" });
-      const load = spawnSync("launchctl", ["load", "-w", SENTINEL_PLIST]);
-      if (load.status !== 0) {
-        console.warn("[sentinel] launchctl load failed — daemon may need manual start");
-      } else {
+      // Modern launchctl API (bootstrap/bootout). Mirrors scheduled.mjs so
+      // both daemons share one mental model. Idempotent: bootout-before-
+      // bootstrap absorbs prior loads regardless of which API installed them.
+      try { await execFileP("launchctl", ["bootout", "system", SENTINEL_PLIST]); } catch { /* not loaded */ }
+      try {
+        await execFileP("launchctl", ["bootstrap", "system", SENTINEL_PLIST]);
         console.error("[sentinel] Daemon loaded via launchctl");
+      } catch (e) {
+        console.warn("[sentinel] launchctl bootstrap failed — daemon may need manual start:", e.message);
       }
     }
   } else {
@@ -206,7 +214,8 @@ export async function uninstallSentinel({ dryRun = false } = {}) {
   if (process.platform === "darwin") {
     if (await exists(SENTINEL_PLIST)) {
       if (!dryRun) {
-        spawnSync("launchctl", ["unload", SENTINEL_PLIST], { stdio: "ignore" });
+        // Modern launchctl API; mirrors scheduled.mjs's uninstallScheduled.
+        try { await execFileP("launchctl", ["bootout", "system", SENTINEL_PLIST]); } catch { /* not loaded */ }
         await fs.unlink(SENTINEL_PLIST);
         console.error(`[sentinel] Removed: ${SENTINEL_PLIST}`);
       } else {
@@ -235,5 +244,10 @@ export async function uninstallSentinel({ dryRun = false } = {}) {
     }
   }
 
+  // Drop the sentinel log file. removeSystemLog also rmdirs SYSTEM_LOG_DIR
+  // and deletes /etc/logrotate.d/coworker if scheduled.log is also gone
+  // (i.e. the other daemon is uninstalled).
+  await removeSystemLog(SENTINEL_LOG_FILE, { dryRun });
+
   console.error("[sentinel] Uninstall complete.");
 }