palmier 0.1.8 → 0.2.0

package/src/systemd.ts

@@ -1,232 +1,164 @@
-import * as fs from "fs";
-import * as path from "path";
-import { homedir } from "os";
-import { execSync } from "child_process";
-import type { AgentConfig } from "./types.js";
-import type { ParsedTask, TaskStatus } from "./types.js";
-
-const UNIT_DIR = path.join(homedir(), ".config", "systemd", "user");
-
-function getTimerName(taskId: string): string {
-  return `palmier-task-${taskId}.timer`;
-}
-
-function getServiceName(taskId: string): string {
-  return `palmier-task-${taskId}.service`;
-}
-
-/**
- * Convert a cron expression (5-field) to a systemd OnCalendar string.
- * Handles basic cron patterns: minute hour day-of-month month day-of-week
- */
-export function cronToOnCalendar(cron: string): string {
-  const parts = cron.trim().split(/\s+/);
-  if (parts.length !== 5) {
-    throw new Error(`Invalid cron expression (expected 5 fields): ${cron}`);
-  }
-
-  const [minute, hour, dayOfMonth, month, dayOfWeek] = parts;
-
-  // Map cron day-of-week names/numbers to systemd abbreviated names
-  const dowMap: Record<string, string> = {
-    "0": "Sun",
-    "1": "Mon",
-    "2": "Tue",
-    "3": "Wed",
-    "4": "Thu",
-    "5": "Fri",
-    "6": "Sat",
-    "7": "Sun",
-  };
-
-  // Convert day-of-week
-  let dow = dayOfWeek === "*" ? "*" : dayOfWeek;
-  if (dowMap[dow]) {
-    dow = dowMap[dow];
-  }
-
-  // Build OnCalendar string
-  // Format: DayOfWeek Year-Month-Day Hour:Minute:Second
-  const monthPart = month === "*" ? "*" : month.padStart(2, "0");
-  const dayPart = dayOfMonth === "*" ? "*" : dayOfMonth.padStart(2, "0");
-  const hourPart = hour === "*" ? "*" : hour.padStart(2, "0");
-  const minutePart = minute === "*" ? "*" : minute.padStart(2, "0");
-
-  if (dow === "*") {
-    return `*-${monthPart}-${dayPart} ${hourPart}:${minutePart}:00`;
-  }
-
-  return `${dow} *-${monthPart}-${dayPart} ${hourPart}:${minutePart}:00`;
-}
-
-/**
- * Install a systemd user timer + service for a task.
- */
-export function installTaskTimer(config: AgentConfig, task: ParsedTask): void {
-  fs.mkdirSync(UNIT_DIR, { recursive: true });
-
-  const taskId = task.frontmatter.id;
-  const serviceName = getServiceName(taskId);
-  const timerName = getTimerName(taskId);
-
-  // Determine the palmier binary path
-  const palmierBin = process.argv[1] || "palmier";
-
-  // Generate service unit
-  const serviceContent = `[Unit]
-Description=Palmier Task: ${task.frontmatter.name || taskId}
-
-[Service]
-Type=oneshot
-ExecStart=${palmierBin} run ${taskId}
-WorkingDirectory=${config.projectRoot}
-Environment=PATH=${process.env.PATH || "/usr/local/bin:/usr/bin:/bin"}
-`;
-
-  // Generate timer unit with OnCalendar entries for each cron trigger
-  const onCalendarLines: string[] = [];
-  for (const trigger of task.frontmatter.triggers || []) {
-    if (trigger.type === "cron") {
-      onCalendarLines.push(`OnCalendar=${cronToOnCalendar(trigger.value)}`);
-    } else if (trigger.type === "once") {
-      // "once" triggers use OnActiveSec or a specific timestamp
-      onCalendarLines.push(`OnActiveSec=${trigger.value}`);
-    }
-  }
-
-  const timerContent = `[Unit]
-Description=Timer for Palmier Task: ${task.frontmatter.name || taskId}
-
-[Timer]
-${onCalendarLines.join("\n")}
-Persistent=true
-
-[Install]
-WantedBy=timers.target
-`;
-
-  // Write unit files
-  fs.writeFileSync(path.join(UNIT_DIR, serviceName), serviceContent, "utf-8");
-  fs.writeFileSync(path.join(UNIT_DIR, timerName), timerContent, "utf-8");
-
-  // Reload and enable
-  daemonReload();
-
-  if (task.frontmatter.enabled) {
-    execSync(`systemctl --user enable --now ${timerName}`, { stdio: "inherit" });
-  } else {
-    execSync(`systemctl --user enable ${timerName}`, { stdio: "inherit" });
-  }
-}
-
-/**
- * Remove a task's systemd timer and service files.
- */
-export function removeTaskTimer(taskId: string): void {
-  const timerName = getTimerName(taskId);
-  const serviceName = getServiceName(taskId);
-
-  // Stop and disable
-  try {
-    execSync(`systemctl --user stop ${timerName}`, { stdio: "inherit" });
-  } catch {
-    // Timer might not be running
-  }
-
-  try {
-    execSync(`systemctl --user disable ${timerName}`, { stdio: "inherit" });
-  } catch {
-    // Timer might not be enabled
-  }
-
-  // Remove unit files
-  const timerPath = path.join(UNIT_DIR, timerName);
-  const servicePath = path.join(UNIT_DIR, serviceName);
-
-  if (fs.existsSync(timerPath)) fs.unlinkSync(timerPath);
-  if (fs.existsSync(servicePath)) fs.unlinkSync(servicePath);
-
-  daemonReload();
-}
-
-/**
- * Query systemd for task status information.
- */
-export function getTaskStatus(taskId: string): TaskStatus {
-  const timerName = getTimerName(taskId);
-  const serviceName = getServiceName(taskId);
-
-  let state: TaskStatus["state"] = "inactive";
-  let lastRun: string | undefined;
-  let lastResult: number | undefined;
-  let nextRun: string | undefined;
-
-  // Check if timer is active
-  try {
-    const activeState = execSync(`systemctl --user is-active ${timerName}`, {
-      encoding: "utf-8",
-    }).trim();
-    if (activeState === "active") {
-      state = "active";
-    }
-  } catch {
-    // Not active
-  }
-
-  // Check if service has failed
-  try {
-    const serviceState = execSync(`systemctl --user is-failed ${serviceName}`, {
-      encoding: "utf-8",
-    }).trim();
-    if (serviceState === "failed") {
-      state = "failed";
-    }
-  } catch {
-    // Not failed
-  }
-
-  // Get last run time and result
-  try {
-    const props = execSync(
-      `systemctl --user show ${serviceName} --property=ExecMainStartTimestamp,ExecMainStatus`,
-      { encoding: "utf-8" }
-    );
-    for (const line of props.split("\n")) {
-      if (line.startsWith("ExecMainStartTimestamp=") && line.trim() !== "ExecMainStartTimestamp=") {
-        const val = line.split("=", 2)[1].trim();
-        if (val) lastRun = val;
-      }
-      if (line.startsWith("ExecMainStatus=")) {
-        const val = parseInt(line.split("=", 2)[1].trim(), 10);
-        if (!isNaN(val)) lastResult = val;
-      }
-    }
-  } catch {
-    // Couldn't get properties
-  }
-
-  // Get next run time from timer
-  try {
-    const timerProps = execSync(
-      `systemctl --user show ${timerName} --property=NextElapseUSecRealtime`,
-      { encoding: "utf-8" }
-    );
-    for (const line of timerProps.split("\n")) {
-      if (line.startsWith("NextElapseUSecRealtime=")) {
-        const val = line.split("=", 2)[1].trim();
-        if (val) nextRun = val;
-      }
-    }
-  } catch {
-    // Couldn't get next run
-  }
-
-  return { state, lastRun, lastResult, nextRun };
-}
-
-/**
- * Run systemctl --user daemon-reload.
- */
-export function daemonReload(): void {
-  execSync("systemctl --user daemon-reload", { stdio: "inherit" });
-}
+import * as fs from "fs";
+import * as path from "path";
+import { homedir } from "os";
+import { execSync } from "child_process";
+import type { AgentConfig } from "./types.js";
+import type { ParsedTask } from "./types.js";
+
+const UNIT_DIR = path.join(homedir(), ".config", "systemd", "user");
+
+function getTimerName(taskId: string): string {
+  return `palmier-task-${taskId}.timer`;
+}
+
+function getServiceName(taskId: string): string {
+  return `palmier-task-${taskId}.service`;
+}
+
+/**
+ * Convert a cron expression (5-field) to a systemd OnCalendar string.
+ * Handles basic cron patterns: minute hour day-of-month month day-of-week
+ */
+export function cronToOnCalendar(cron: string): string {
+  const parts = cron.trim().split(/\s+/);
+  if (parts.length !== 5) {
+    throw new Error(`Invalid cron expression (expected 5 fields): ${cron}`);
+  }
+
+  const [minute, hour, dayOfMonth, month, dayOfWeek] = parts;
+
+  // Map cron day-of-week names/numbers to systemd abbreviated names
+  const dowMap: Record<string, string> = {
+    "0": "Sun",
+    "1": "Mon",
+    "2": "Tue",
+    "3": "Wed",
+    "4": "Thu",
+    "5": "Fri",
+    "6": "Sat",
+    "7": "Sun",
+  };
+
+  // Convert day-of-week
+  let dow = dayOfWeek === "*" ? "*" : dayOfWeek;
+  if (dowMap[dow]) {
+    dow = dowMap[dow];
+  }
+
+  // Build OnCalendar string
+  // Format: DayOfWeek Year-Month-Day Hour:Minute:Second
+  const monthPart = month === "*" ? "*" : month.padStart(2, "0");
+  const dayPart = dayOfMonth === "*" ? "*" : dayOfMonth.padStart(2, "0");
+  const hourPart = hour === "*" ? "*" : hour.padStart(2, "0");
+  const minutePart = minute === "*" ? "*" : minute.padStart(2, "0");
+
+  if (dow === "*") {
+    return `*-${monthPart}-${dayPart} ${hourPart}:${minutePart}:00`;
+  }
+
+  return `${dow} *-${monthPart}-${dayPart} ${hourPart}:${minutePart}:00`;
+}
+
+/**
+ * Install a systemd user timer + service for a task.
+ */
+export function installTaskTimer(config: AgentConfig, task: ParsedTask): void {
+  fs.mkdirSync(UNIT_DIR, { recursive: true });
+
+  const taskId = task.frontmatter.id;
+  const serviceName = getServiceName(taskId);
+  const timerName = getTimerName(taskId);
+
+  // Determine the palmier binary path
+  const palmierBin = process.argv[1] || "palmier";
+
+  // Generate service unit
+  const serviceContent = `[Unit]
+Description=Palmier Task: ${taskId}
+
+[Service]
+Type=oneshot
+ExecStart=${palmierBin} run ${taskId}
+WorkingDirectory=${config.projectRoot}
+Environment=PATH=${process.env.PATH || "/usr/local/bin:/usr/bin:/bin"}
+`;
+
+  // Write service unit (always needed for on-demand runs)
+  fs.writeFileSync(path.join(UNIT_DIR, serviceName), serviceContent, "utf-8");
+  daemonReload();
+
+  // Only create and enable a timer if there are actual triggers
+  const triggers = task.frontmatter.triggers || [];
+  const onCalendarLines: string[] = [];
+  for (const trigger of triggers) {
+    if (trigger.type === "cron") {
+      onCalendarLines.push(`OnCalendar=${cronToOnCalendar(trigger.value)}`);
+    } else if (trigger.type === "once") {
+      onCalendarLines.push(`OnActiveSec=${trigger.value}`);
+    }
+  }
+
+  if (onCalendarLines.length > 0) {
+    const timerContent = `[Unit]
+Description=Timer for Palmier Task: ${taskId}
+
+[Timer]
+${onCalendarLines.join("\n")}
+Persistent=true
+
+[Install]
+WantedBy=timers.target
+`;
+    fs.writeFileSync(path.join(UNIT_DIR, timerName), timerContent, "utf-8");
+    daemonReload();
+
+    try {
+      execSync(`systemctl --user enable --now ${timerName}`, { encoding: "utf-8" });
+    } catch (err: unknown) {
+      const e = err as { stderr?: string };
+      console.error(`Failed to enable timer ${timerName}: ${e.stderr || err}`);
+    }
+  }
+}
+
+/**
+ * Remove a task's systemd timer and service files.
+ */
+export function removeTaskTimer(taskId: string): void {
+  const timerName = getTimerName(taskId);
+  const serviceName = getServiceName(taskId);
+
+  const timerPath = path.join(UNIT_DIR, timerName);
+  const servicePath = path.join(UNIT_DIR, serviceName);
+
+  // Only stop/disable the timer if the file exists
+  if (fs.existsSync(timerPath)) {
+    try {
+      execSync(`systemctl --user stop ${timerName}`, { encoding: "utf-8" });
+    } catch {
+      // Timer might not be running
+    }
+    try {
+      execSync(`systemctl --user disable ${timerName}`, { encoding: "utf-8" });
+    } catch {
+      // Timer might not be enabled
+    }
+    fs.unlinkSync(timerPath);
+  }
+
+  if (fs.existsSync(servicePath)) fs.unlinkSync(servicePath);
+
+  daemonReload();
+}
+
+/**
+ * Run systemctl --user daemon-reload.
+ */
+export function daemonReload(): void {
+  try {
+    execSync("systemctl --user daemon-reload", { encoding: "utf-8" });
+  } catch (err: unknown) {
+    const e = err as { stderr?: string };
+    console.error(`daemon-reload failed: ${e.stderr || err}`);
+  }
+}

package/src/task.ts

@@ -35,6 +35,9 @@ function parseTaskContent(content: string): ParsedTask {
     throw new Error("TASK.md frontmatter must include at least: id");
   }
 
+  frontmatter.command_line ??= "claude -p --dangerously-skip-permissions";
+  frontmatter.triggers_enabled ??= true;
+
   return { frontmatter, body };
 }
 

package/src/types.ts

@@ -1,63 +1,41 @@
-export interface AgentConfig {
-  agentId: string;
-  userId: string;
-  natsUrl: string;
-  natsWsUrl: string;
-  natsToken: string;
-  projectRoot: string;
-}
-
-export interface TaskFrontmatter {
-  id: string;
-  name: string;
-  user_prompt: string;
-  triggers: Trigger[];
-  requires_confirmation: boolean;
-  suppress_permissions: boolean;
-  enabled: boolean;
-}
-
-export interface Trigger {
-  type: "cron" | "once";
-  value: string;
-}
-
-export interface ParsedTask {
-  frontmatter: TaskFrontmatter;
-  body: string;
-}
-
-export interface TaskStatus {
-  state: "active" | "inactive" | "failed";
-  lastRun?: string;
-  lastResult?: number;
-  nextRun?: string;
-}
-
-export interface TaskWithStatus extends ParsedTask {
-  status: TaskStatus;
-}
-
-export interface HookPayload {
-  type: "confirm" | "permission" | "input";
-  task_id: string;
-  hook_id: string;
-  agent_id: string;
-  user_id: string;
-  details: Record<string, unknown>;
-  status: string;
-}
-
-export interface ClaudeHookEvent {
-  hook_name: string;
-  session_id: string;
-  tool_name?: string;
-  tool_input?: Record<string, unknown>;
-  message?: string;
-  [key: string]: unknown;
-}
-
-export interface RpcMessage {
-  method: string;
-  params: Record<string, unknown>;
-}
+export interface AgentConfig {
+  agentId: string;
+  userId: string;
+  natsUrl: string;
+  natsWsUrl: string;
+  natsToken: string;
+  projectRoot: string;
+}
+
+export interface TaskFrontmatter {
+  id: string;
+  user_prompt: string;
+  command_line: string;
+  triggers: Trigger[];
+  triggers_enabled: boolean;
+  requires_confirmation: boolean;
+}
+
+export interface Trigger {
+  type: "cron" | "once";
+  value: string;
+}
+
+export interface ParsedTask {
+  frontmatter: TaskFrontmatter;
+  body: string;
+}
+
+export interface ConfirmPayload {
+  type: "confirm";
+  task_id: string;
+  agent_id: string;
+  user_id: string;
+  details: Record<string, unknown>;
+  status: "pending" | "confirmed" | "aborted";
+}
+
+export interface RpcMessage {
+  method: string;
+  params: Record<string, unknown>;
+}