@staticduo/opencode-scheduler 1.3.2 → 1.3.4

package/README.md

@@ -96,7 +96,7 @@ Jobs run from the working directory where you created them, picking up your `ope
 - **No overlap**: if the previous run is still active, the next scheduled tick is skipped.
 - **Non-interactive by default**: scheduled runs force `OPENCODE_PERMISSION` to deny "question" prompts, so jobs don't hang waiting for approvals.
 - **Optional timeout**: set `timeoutSeconds` to hard-stop long runs (SIGTERM, then SIGKILL).
-- **Transactional systemd updates**: Linux unit installation restores the prior unit files, permissions, enabled state, and active state if any install step fails.
+- **Transactional systemd updates**: Linux installation preserves regular files or exact symlink targets (including masked units), permissions, unit-file state, and active state on failure. A bounded cross-process lock serializes updates to the same scoped timer; live locks are never broken and dead stale locks are reclaimed.
 
 ### Platform Support
 

package/dist/index.js

@@ -12335,7 +12335,7 @@ function tool(input) {
 }
 tool.schema = exports_external;
 // src/index.ts
-import { createWriteStream, existsSync as existsSync2, mkdirSync as mkdirSync2, readdirSync, readFileSync as readFileSync2, rmSync, writeFileSync as writeFileSync2, unlinkSync as unlinkSync2 } from "fs";
+import { createWriteStream, existsSync as existsSync2, mkdirSync as mkdirSync2, readdirSync, readFileSync as readFileSync2, rmSync as rmSync2, writeFileSync as writeFileSync2, unlinkSync as unlinkSync2 } from "fs";
 import { basename, dirname, join as join2, resolve as resolvePath } from "path";
 import { homedir, platform } from "os";
 import { execFileSync, execSync, spawn } from "child_process";
@@ -12435,10 +12435,14 @@ function cronToSystemdCalendars(cron) {
 import {
   chmodSync,
   existsSync,
+  lstatSync,
   mkdirSync,
   readFileSync,
+  readlinkSync,
   renameSync,
+  rmSync,
   statSync,
+  symlinkSync,
   unlinkSync,
   writeFileSync
 } from "fs";
@@ -12467,36 +12471,83 @@ function withSystemdRuntimeEnv(env, dependencies = defaultRuntimeEnvDependencies
 var defaultFileSystem = {
   chmod: chmodSync,
   exists: existsSync,
+  lstat: lstatSync,
   mkdir: mkdirSync,
   readFile: readFileSync,
+  readlink: readlinkSync,
   rename: renameSync,
+  rm: rmSync,
   stat: statSync,
+  symlink: symlinkSync,
   unlink: unlinkSync,
   writeFile: writeFileSync
 };
+var sleepArray = new Int32Array(new SharedArrayBuffer(4));
+var defaultLockOptions = {
+  timeoutMs: 1e4,
+  staleAfterMs: 60000,
+  pollMs: 25,
+  now: Date.now,
+  pid: process.pid,
+  isPidAlive(pid) {
+    try {
+      process.kill(pid, 0);
+      return true;
+    } catch {
+      return false;
+    }
+  },
+  sleep(milliseconds) {
+    Atomics.wait(sleepArray, 0, 0, milliseconds);
+  }
+};
 function snapshotFile(path, fileSystem) {
-  if (!fileSystem.exists(path))
-    return { path, existed: false };
-  return {
-    path,
-    existed: true,
-    content: fileSystem.readFile(path),
-    mode: fileSystem.stat(path).mode & 511
-  };
+  let stats;
+  try {
+    stats = fileSystem.lstat(path);
+  } catch (error45) {
+    if (isErrorCode(error45, "ENOENT"))
+      return { path, type: "missing" };
+    throw error45;
+  }
+  if (stats.isSymbolicLink())
+    return { path, type: "symlink", target: fileSystem.readlink(path) };
+  if (stats.isFile()) {
+    return { path, type: "regular", content: fileSystem.readFile(path), mode: stats.mode & 511 };
+  }
+  throw new Error(`Unsupported systemd unit node type at ${path}; refusing to mutate it`);
 }
 var temporaryFileSequence = 0;
-function atomicReplace(path, content, mode, fileSystem) {
+function temporaryPath(path) {
   temporaryFileSequence += 1;
-  const temporaryPath = `${path}.tmp-${process.pid}-${temporaryFileSequence}`;
+  return `${path}.tmp-${process.pid}-${temporaryFileSequence}`;
+}
+function atomicReplace(path, content, mode, fileSystem) {
+  const temporary = temporaryPath(path);
   try {
-    fileSystem.writeFile(temporaryPath, content, { mode });
-    fileSystem.chmod(temporaryPath, mode);
-    fileSystem.rename(temporaryPath, path);
+    fileSystem.writeFile(temporary, content, { mode });
+    fileSystem.chmod(temporary, mode);
+    fileSystem.rename(temporary, path);
     fileSystem.chmod(path, mode);
   } finally {
-    try {
-      fileSystem.unlink(temporaryPath);
-    } catch {}
+    removeNode(temporary, fileSystem);
+  }
+}
+function atomicSymlink(path, target, fileSystem) {
+  const temporary = temporaryPath(path);
+  try {
+    fileSystem.symlink(target, temporary);
+    fileSystem.rename(temporary, path);
+  } finally {
+    removeNode(temporary, fileSystem);
+  }
+}
+function removeNode(path, fileSystem) {
+  try {
+    fileSystem.unlink(path);
+  } catch (error45) {
+    if (!isErrorCode(error45, "ENOENT"))
+      throw error45;
   }
 }
 function commandOutput(value) {
@@ -12513,57 +12564,153 @@ function commandOutput(value) {
   }
   return "";
 }
-function queryTimerState(run, timerUnit, query) {
+function queryUnitFileState(run, timerUnit) {
+  let output = "";
+  try {
+    output = commandOutput(run(`systemctl --user is-enabled ${timerUnit}`, { stdio: ["ignore", "pipe", "ignore"] }));
+  } catch (error45) {
+    output = commandOutput(error45);
+  }
+  const supported = [
+    "enabled",
+    "enabled-runtime",
+    "disabled",
+    "static",
+    "indirect",
+    "masked",
+    "masked-runtime",
+    "linked",
+    "linked-runtime",
+    "alias",
+    "not-found"
+  ];
+  if (supported.includes(output))
+    return output;
+  const unrecoverable = ["generated", "transient", "bad"];
+  if (unrecoverable.includes(output)) {
+    throw new Error(`Cannot safely restore ${timerUnit} from systemd unit-file state ${output}; refusing to mutate it`);
+  }
+  throw new Error(`Unable to determine ${timerUnit} unit-file state: ${output || "no status returned"}`);
+}
+function queryActiveState(run, timerUnit) {
   let output = "";
   try {
-    output = commandOutput(run(`systemctl --user ${query} ${timerUnit}`, { stdio: ["ignore", "pipe", "ignore"] }));
+    output = commandOutput(run(`systemctl --user is-active ${timerUnit}`, { stdio: ["ignore", "pipe", "ignore"] }));
   } catch (error45) {
     output = commandOutput(error45);
   }
-  return query === "is-enabled" ? ["enabled", "enabled-runtime", "linked", "linked-runtime", "alias"].includes(output) : ["active", "activating", "reloading"].includes(output);
+  if (["active", "activating", "reloading"].includes(output))
+    return true;
+  if (["inactive", "failed", "deactivating", "unknown"].includes(output))
+    return false;
+  throw new Error(`Unable to determine whether ${timerUnit} is active: ${output || "no status returned"}`);
 }
 function restoreFile(snapshot, fileSystem) {
-  if (!snapshot.existed) {
-    try {
-      fileSystem.unlink(snapshot.path);
-    } catch {}
-    return;
+  if (snapshot.type === "missing") {
+    removeNode(snapshot.path, fileSystem);
+  } else if (snapshot.type === "symlink") {
+    atomicSymlink(snapshot.path, snapshot.target, fileSystem);
+  } else {
+    atomicReplace(snapshot.path, snapshot.content, snapshot.mode, fileSystem);
   }
-  atomicReplace(snapshot.path, snapshot.content ?? Buffer.alloc(0), snapshot.mode ?? 420, fileSystem);
 }
 function bestEffort(action) {
   try {
     action();
   } catch {}
 }
+function restoreUnitFileState(run, timerUnit, state) {
+  if (state === "enabled")
+    run(`systemctl --user enable ${timerUnit}`, { stdio: "ignore" });
+  if (state === "enabled-runtime")
+    run(`systemctl --user enable --runtime ${timerUnit}`, { stdio: "ignore" });
+  if (state === "disabled")
+    run(`systemctl --user disable ${timerUnit}`, { stdio: "ignore" });
+}
+function isErrorCode(error45, code) {
+  return typeof error45 === "object" && error45 !== null && "code" in error45 && error45.code === code;
+}
+function readLockMetadata(lockPath, fileSystem) {
+  try {
+    const parsed = JSON.parse(fileSystem.readFile(join(lockPath, "owner.json"), "utf8"));
+    if (typeof parsed !== "object" || parsed === null)
+      return {};
+    const record2 = parsed;
+    return {
+      pid: typeof record2.pid === "number" ? record2.pid : undefined,
+      timestamp: typeof record2.timestamp === "number" ? record2.timestamp : undefined
+    };
+  } catch {
+    return {};
+  }
+}
+function acquireLock(lockRoot, timerUnit, fileSystem, overrides) {
+  const options = { ...defaultLockOptions, ...overrides };
+  fileSystem.mkdir(lockRoot, { recursive: true });
+  const lockPath = join(lockRoot, `${timerUnit}.lock`);
+  const startedAt = options.now();
+  while (true) {
+    try {
+      fileSystem.mkdir(lockPath);
+      try {
+        fileSystem.writeFile(join(lockPath, "owner.json"), JSON.stringify({ pid: options.pid, timestamp: options.now() }));
+      } catch (error45) {
+        fileSystem.rm(lockPath, { recursive: true, force: true });
+        throw error45;
+      }
+      return () => fileSystem.rm(lockPath, { recursive: true, force: true });
+    } catch (error45) {
+      if (!isErrorCode(error45, "EEXIST"))
+        throw error45;
+      const metadata = readLockMetadata(lockPath, fileSystem);
+      const timestamp = metadata.timestamp ?? fileSystem.lstat(lockPath).mtimeMs;
+      const oldEnough = options.now() - timestamp >= options.staleAfterMs;
+      const ownerAlive = metadata.pid !== undefined && options.isPidAlive(metadata.pid);
+      if (oldEnough && !ownerAlive) {
+        fileSystem.rm(lockPath, { recursive: true, force: true });
+        continue;
+      }
+      if (options.now() - startedAt >= options.timeoutMs) {
+        throw new Error(`Timed out waiting ${options.timeoutMs}ms for systemd install lock ${lockPath}`);
+      }
+      options.sleep(options.pollMs);
+    }
+  }
+}
 function installSystemdUnits(request) {
   const fileSystem = request.fileSystem ?? defaultFileSystem;
-  fileSystem.mkdir(request.unitDir, { recursive: true });
-  const servicePath = join(request.unitDir, request.serviceUnit);
-  const timerPath = join(request.unitDir, request.timerUnit);
-  const serviceSnapshot = snapshotFile(servicePath, fileSystem);
-  const timerSnapshot = snapshotFile(timerPath, fileSystem);
-  const wasEnabled = queryTimerState(request.run, request.timerUnit, "is-enabled");
-  const wasActive = queryTimerState(request.run, request.timerUnit, "is-active");
+  const releaseLock = acquireLock(request.lockDir ?? join(request.unitDir, ".opencode-scheduler-locks"), request.timerUnit, fileSystem, request.lock);
   try {
-    atomicReplace(servicePath, request.serviceContent, 420, fileSystem);
-    atomicReplace(timerPath, request.timerContent, 420, fileSystem);
-    request.run("systemctl --user daemon-reload");
-    request.run(`systemctl --user enable ${request.timerUnit}`);
-    request.run(`systemctl --user start ${request.timerUnit}`);
-  } catch (error45) {
-    if (!wasActive)
-      bestEffort(() => request.run(`systemctl --user stop ${request.timerUnit}`, { stdio: "ignore" }));
-    if (!wasEnabled)
-      bestEffort(() => request.run(`systemctl --user disable ${request.timerUnit}`, { stdio: "ignore" }));
-    bestEffort(() => restoreFile(serviceSnapshot, fileSystem));
-    bestEffort(() => restoreFile(timerSnapshot, fileSystem));
-    bestEffort(() => request.run("systemctl --user daemon-reload", { stdio: "ignore" }));
-    if (wasEnabled)
-      bestEffort(() => request.run(`systemctl --user enable ${request.timerUnit}`, { stdio: "ignore" }));
-    if (wasActive)
-      bestEffort(() => request.run(`systemctl --user start ${request.timerUnit}`, { stdio: "ignore" }));
-    throw error45;
+    fileSystem.mkdir(request.unitDir, { recursive: true });
+    const servicePath = join(request.unitDir, request.serviceUnit);
+    const timerPath = join(request.unitDir, request.timerUnit);
+    const serviceSnapshot = snapshotFile(servicePath, fileSystem);
+    const timerSnapshot = snapshotFile(timerPath, fileSystem);
+    const unitFileState = queryUnitFileState(request.run, request.timerUnit);
+    const wasActive = queryActiveState(request.run, request.timerUnit);
+    let enabledByAttempt = false;
+    try {
+      atomicReplace(servicePath, request.serviceContent, 420, fileSystem);
+      atomicReplace(timerPath, request.timerContent, 420, fileSystem);
+      request.run("systemctl --user daemon-reload");
+      request.run(`systemctl --user enable ${request.timerUnit}`);
+      enabledByAttempt = true;
+      request.run(`systemctl --user start ${request.timerUnit}`);
+    } catch (error45) {
+      if (!wasActive)
+        bestEffort(() => request.run(`systemctl --user stop ${request.timerUnit}`, { stdio: "ignore" }));
+      if (enabledByAttempt)
+        bestEffort(() => request.run(`systemctl --user disable ${request.timerUnit}`, { stdio: "ignore" }));
+      bestEffort(() => restoreFile(serviceSnapshot, fileSystem));
+      bestEffort(() => restoreFile(timerSnapshot, fileSystem));
+      bestEffort(() => request.run("systemctl --user daemon-reload", { stdio: "ignore" }));
+      bestEffort(() => restoreUnitFileState(request.run, request.timerUnit, unitFileState));
+      if (wasActive)
+        bestEffort(() => request.run(`systemctl --user start ${request.timerUnit}`, { stdio: "ignore" }));
+      throw error45;
+    }
+  } finally {
+    releaseLock();
   }
 }
 
@@ -13424,6 +13571,7 @@ function installSystemdJob(job, run = defaultSystemdCommandRunner) {
   const timerUnit = timerPath.slice(SYSTEMD_USER_DIR.length + 1);
   installSystemdUnits({
     unitDir: SYSTEMD_USER_DIR,
+    lockDir: join2(SCHEDULER_DIR, "systemd-install-locks"),
     serviceUnit,
     timerUnit,
     serviceContent: createSystemdService(job),
@@ -13811,7 +13959,7 @@ function removePaths(paths, errors3) {
     if (!existsSync2(path))
       continue;
     try {
-      rmSync(path, { recursive: true, force: true });
+      rmSync2(path, { recursive: true, force: true });
       removed.push(path);
     } catch (error45) {
       const msg = error45 instanceof Error ? error45.message : String(error45);

package/dist/systemd.d.ts

@@ -1,4 +1,4 @@
-import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } from "fs";
+import { chmodSync, existsSync, lstatSync, mkdirSync, readFileSync, readlinkSync, renameSync, rmSync, statSync, symlinkSync, unlinkSync, writeFileSync } from "fs";
 import type { ExecSyncOptions } from "child_process";
 export type SystemdCommandRunner = (command: string, options?: ExecSyncOptions) => Buffer | string;
 export interface RuntimeEnvDependencies {
@@ -8,21 +8,37 @@ export interface RuntimeEnvDependencies {
 export declare function withSystemdRuntimeEnv(env: NodeJS.ProcessEnv, dependencies?: RuntimeEnvDependencies): NodeJS.ProcessEnv;
 export interface SystemdInstallRequest {
     unitDir: string;
+    lockDir?: string;
     serviceUnit: string;
     timerUnit: string;
     serviceContent: string;
     timerContent: string;
     run: SystemdCommandRunner;
     fileSystem?: SystemdFileSystem;
+    lock?: Partial<SystemdLockOptions>;
 }
 export interface SystemdFileSystem {
     chmod: typeof chmodSync;
     exists: typeof existsSync;
+    lstat: typeof lstatSync;
     mkdir: typeof mkdirSync;
     readFile: typeof readFileSync;
+    readlink: typeof readlinkSync;
     rename: typeof renameSync;
+    rm: typeof rmSync;
     stat: typeof statSync;
+    symlink: typeof symlinkSync;
     unlink: typeof unlinkSync;
     writeFile: typeof writeFileSync;
 }
+interface SystemdLockOptions {
+    timeoutMs: number;
+    staleAfterMs: number;
+    pollMs: number;
+    now: () => number;
+    pid: number;
+    isPidAlive: (pid: number) => boolean;
+    sleep: (milliseconds: number) => void;
+}
 export declare function installSystemdUnits(request: SystemdInstallRequest): void;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@staticduo/opencode-scheduler",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "OpenCode plugin for scheduling recurring jobs using launchd, systemd, Task Scheduler, or cron fallback",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",