@armstrongnate/april 0.0.4 → 0.0.8

package/README.md

@@ -112,8 +112,10 @@ Healthy logs include `Starting webhook forwarder for <repo>` and no immediate er
 
 | Command | What it does |
 | --- | --- |
-| `april init` | Copies the bundled `config.example.yaml` to `~/.config/april/config.yaml` and the `issue-worker` skill to `~/.claude/skills/`. Won't overwrite without `--force`. |
+| `april init` | Copies the bundled `config.example.yaml` to `~/.config/april/config.yaml` and the `issue-worker` skill to `~/.claude/skills/`. **Only writes files that don't already exist** — never overwrites. |
 | `april install` | Installs and starts the user service. Pass `--print` to see the unit/plist without writing it. |
+| `april install-skill [-y]` | Install or refresh the issue-worker skill. Prompts before overwriting an existing copy; `--yes` skips the prompt (use in non-interactive scripts). |
+| `april upgrade [VER]` | Upgrade the npm package, regenerate the unit, restart the service, and reconcile the skill. |
 | `april uninstall` | Stops and removes the service. |
 | `april start` / `stop` / `restart` | Lifecycle. |
 | `april status` | Shows service status. |
@@ -147,6 +149,12 @@ After editing:
 - **Linux** uses systemd user services at `~/.config/systemd/user/april.service`. Logs go to the journal (`journalctl --user -u april`).
 - **macOS** uses launchd LaunchAgents at `~/Library/LaunchAgents/dev.april.daemon.plist`. Logs go to `~/Library/Logs/april/april.log`.
 
+### Restarts and tmux sessions
+
+The unit/plist sets `KillMode=process` (systemd) / `AbandonProcessGroup=true` (launchd), which means `april restart` only signals the daemon itself — tmux sessions and the Claude processes inside them keep running. The daemon's shutdown handler explicitly terminates the `gh webhook forward` children before exiting.
+
+If the daemon ever has to be SIGKILLed (it hung past the systemd stop timeout), the forwarders will be orphaned to PID 1. Clean them up with `pkill -f 'gh webhook forward'`.
+
 ### Node version managers
 
 `april install` captures the absolute path of the `node` binary it was invoked with (e.g. `~/.nvm/versions/node/v22.x.x/bin/node`) and bakes it into the unit/plist. If you later remove or change that node version, the service will fail to start — re-run `april install` after switching.
@@ -185,6 +193,16 @@ april restart
 
 **If you skip `april install` after upgrading, new template features (`EnvironmentFile=`, env-var changes, etc.) will not appear in your existing unit file** — `npm` only updates the package, not anything systemd has on disk.
 
+`april upgrade` ends by running `april install-skill`, which:
+
+- silently installs the skill if missing,
+- says "already up to date" if your installed copy matches the bundled one, or
+- **prompts you** before overwriting if your copy differs (in case you customized it).
+
+For non-interactive scripts, pass `--yes` to `april install-skill` (or to the upgrade flow indirectly: `april install-skill -y`).
+
+Your `~/.config/april/config.yaml` is never overwritten by any `april` command. To reset it from the example, delete the file manually and re-run `april init`.
+
 ## Troubleshooting
 
 ### `Required gh extension not installed: cli/gh-webhook`

package/dist/cli.js

@@ -2,16 +2,19 @@
 import { backend } from "./service/index.js";
 import { run as runInit } from "./commands/init.js";
 import { run as runUpgrade } from "./commands/upgrade.js";
+import { run as runInstallSkill } from "./commands/install-skill.js";
 const HELP = `april — issue worker
 
 Usage:
   april <command> [options]
 
 Commands:
-  init              Copy bundled config + skill to ~/.config/april and ~/.claude
+  init              Copy bundled config + skill to ~/.config/april and ~/.claude (only if missing).
   install [--print] Install and start the user service. --print emits the unit/plist to stdout instead.
-  upgrade [VER]     Upgrade the npm package, regenerate the unit, and restart. VER defaults to "latest".
-                    Pass --with npm|pnpm|yarn to override the auto-detected package manager.
+  install-skill [-y] Install or refresh the issue-worker skill. Prompts before overwriting an existing
+                    one; --yes (-y) skips the prompt.
+  upgrade [VER]     Upgrade the npm package, regenerate the unit, restart, and reconcile the skill.
+                    VER defaults to "latest". --with npm|pnpm|yarn overrides the package manager.
   uninstall         Stop and remove the user service
   start             Start the service
   stop              Stop the service
@@ -22,8 +25,9 @@ Commands:
   help              Show this help
   version           Show version
 
-Options for init:
-  --force, -f       Overwrite existing files
+Notes:
+  Nothing is ever overwritten silently. To reset config, delete ~/.config/april/config.yaml
+  and re-run init. To refresh the skill, use install-skill (it prompts before overwriting).
 `;
 function parseLogsArgs(args) {
     let follow = false;
@@ -76,6 +80,9 @@ async function main() {
     if (cmd === "upgrade") {
         return runUpgrade(rest);
     }
+    if (cmd === "install-skill") {
+        return await runInstallSkill(rest);
+    }
     if (cmd === "daemon") {
         // Run the long-running process inline. Importing index.js triggers main();
         // we then hang forever and let its SIGINT/SIGTERM handlers terminate the process.

package/dist/commands/init.js

@@ -4,24 +4,24 @@ import { copyFileSync, existsSync, mkdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { ensureEnvFile, envFilePath } from "../service/envfile.js";
 import { isGhWebhookExtensionInstalled, GH_EXTENSION_INSTALL_CMD } from "../precheck.js";
+import { SKILL_DST, bundledSkillPath, compareSkill } from "../skill.js";
 // Resolve the bundled package root from this file's installed location.
-// dist/commands/init.js -> dist/.. (the package root, where config.example.yaml + skills/ live)
+// dist/commands/init.js -> dist/.. (the package root, where config.example.yaml lives)
 function packageRoot() {
     const here = fileURLToPath(import.meta.url);
     return resolve(dirname(here), "..", "..");
 }
-function copyIfMissing(src, dst, label, force) {
+function copyIfMissing(src, dst, label) {
     mkdirSync(dirname(dst), { recursive: true });
-    if (existsSync(dst) && !force) {
-        console.log(`  ${label}: already exists at ${dst} (use --force to overwrite)`);
+    if (existsSync(dst)) {
+        console.log(`  ${label}: already exists at ${dst}`);
         return "exists";
     }
     copyFileSync(src, dst);
     console.log(`  ${label}: wrote ${dst}`);
     return "wrote";
 }
-export function run(args) {
-    const force = args.includes("--force") || args.includes("-f");
+export function run(_args) {
     const root = packageRoot();
     console.log("april init");
     console.log("");
@@ -31,14 +31,13 @@ export function run(args) {
         console.error(`  Cannot find bundled config.example.yaml at ${configSrc}`);
         return 1;
     }
-    const configResult = copyIfMissing(configSrc, configDst, "config", force);
-    const skillSrc = join(root, "skills", "issue-worker", "SKILL.md");
-    const skillDst = join(homedir(), ".claude", "skills", "issue-worker", "SKILL.md");
+    const configResult = copyIfMissing(configSrc, configDst, "config");
+    const skillSrc = bundledSkillPath();
     if (!existsSync(skillSrc)) {
         console.error(`  Cannot find bundled skill at ${skillSrc}`);
         return 1;
     }
-    copyIfMissing(skillSrc, skillDst, "skill", force);
+    copyIfMissing(skillSrc, SKILL_DST, "skill");
     const envState = ensureEnvFile();
     console.log(`  env:    ${envState === "created" ? "wrote" : "already exists"} ${envFilePath()}`);
     console.log("");
@@ -51,6 +50,11 @@ export function run(args) {
         console.log(`    Install with:  ${GH_EXTENSION_INSTALL_CMD}`);
         console.log("    (april will refuse to start without it.)");
     }
+    // If the installed skill differs from what we shipped, surface it without prompting.
+    if (compareSkill() === "differs-from-bundled") {
+        console.log("");
+        console.log(`  i  installed skill differs from bundled. Refresh with: april install-skill`);
+    }
     console.log("");
     if (configResult === "wrote") {
         console.log(`Next: edit ${configDst}, then run \`april install\`.`);

package/dist/commands/install-skill.js

@@ -0,0 +1,50 @@
+import { copyFileSync, existsSync, mkdirSync } from "node:fs";
+import { dirname } from "node:path";
+import { createInterface } from "node:readline/promises";
+import { stdin, stdout } from "node:process";
+import { SKILL_DST, bundledSkillPath, compareSkill } from "../skill.js";
+export async function run(args) {
+    const yes = args.includes("--yes") || args.includes("-y");
+    const src = bundledSkillPath();
+    if (!existsSync(src)) {
+        console.error(`Cannot find bundled skill at ${src}`);
+        return 1;
+    }
+    const state = compareSkill();
+    if (state === "matches-bundled") {
+        console.log(`✓ Skill at ${SKILL_DST} is already up to date`);
+        return 0;
+    }
+    if (state === "missing") {
+        mkdirSync(dirname(SKILL_DST), { recursive: true });
+        copyFileSync(src, SKILL_DST);
+        console.log(`✓ Installed skill at ${SKILL_DST}`);
+        return 0;
+    }
+    // differs-from-bundled
+    console.log("Bundled issue-worker skill differs from the installed copy.");
+    console.log(`  installed: ${SKILL_DST}`);
+    console.log(`  bundled:   ${src}`);
+    console.log("");
+    console.log(`Diff with: diff ${SKILL_DST} ${src}`);
+    console.log("");
+    if (!yes) {
+        if (!stdin.isTTY) {
+            console.error("Refusing to overwrite without confirmation in a non-interactive session.\n" +
+                "Re-run with --yes to confirm, or run interactively to be prompted.");
+            return 1;
+        }
+        const rl = createInterface({ input: stdin, output: stdout });
+        const answer = (await rl.question("Overwrite installed skill with bundled version? [y/N] "))
+            .trim()
+            .toLowerCase();
+        rl.close();
+        if (answer !== "y" && answer !== "yes") {
+            console.log("Skipped — installed skill is unchanged.");
+            return 0;
+        }
+    }
+    copyFileSync(src, SKILL_DST);
+    console.log(`✓ Overwrote skill at ${SKILL_DST}`);
+    return 0;
+}

package/dist/commands/upgrade.js

@@ -2,7 +2,6 @@ import { spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
 const PACKAGE = "@armstrongnate/april";
 function detectPackageManager() {
-    // Where this script lives reveals which global install dir it's in.
     const here = fileURLToPath(import.meta.url);
     if (/[\\/]\.?pnpm[\\/]|[\\/]Library[\\/]pnpm[\\/]/.test(here))
         return "pnpm";
@@ -30,7 +29,6 @@ function step(name, cmd, args) {
 }
 export function run(args) {
     let pm = detectPackageManager();
-    // --with <pm> override
     const withIdx = args.indexOf("--with");
     if (withIdx >= 0) {
         const v = args[withIdx + 1];
@@ -41,7 +39,6 @@ export function run(args) {
         pm = v;
     }
     let ref = `${PACKAGE}@latest`;
-    // Allow `april upgrade <version>` to pin
     const positional = args.filter((a, i) => !a.startsWith("--") && args[i - 1] !== "--with");
     if (positional[0])
         ref = `${PACKAGE}@${positional[0]}`;
@@ -50,6 +47,7 @@ export function run(args) {
     // From here on, `april` resolves to the freshly installed binary on PATH.
     step("Regenerating service unit (april install)", "april", ["install"]);
     step("Restarting service (april restart)", "april", ["restart"]);
+    step("Reconciling skill (april install-skill)", "april", ["install-skill"]);
     console.log("\n✓ Upgrade complete. Tail logs with: april logs -f");
     return 0;
 }

package/dist/service/launchd.js

@@ -58,6 +58,11 @@ ${envEntries}
     <string>${escapeXml(log)}</string>
     <key>ProcessType</key>
     <string>Background</string>
+    <!-- launchd's equivalent of systemd's KillMode=process: when the daemon
+         exits, don't kill children that share its process group. Keeps tmux
+         sessions and any in-flight Claude work alive across restarts. -->
+    <key>AbandonProcessGroup</key>
+    <true/>
 </dict>
 </plist>
 `;

package/dist/service/systemd.js

@@ -32,6 +32,10 @@ Environment=NODE_ENV=production
 EnvironmentFile=-${envFilePath()}
 StandardOutput=journal
 StandardError=journal
+# Only signal the main process on stop; leave tmux sessions and any other
+# children running so an april restart doesn't trash in-flight Claude work.
+# The daemon's own shutdown handler still SIGTERMs the gh webhook forwarders.
+KillMode=process
 
 [Install]
 WantedBy=default.target

package/dist/skill.js

@@ -0,0 +1,20 @@
+import { fileURLToPath } from "node:url";
+import { dirname, join, resolve } from "node:path";
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+export const SKILL_DST = join(homedir(), ".claude", "skills", "issue-worker", "SKILL.md");
+export function bundledSkillPath() {
+    // dist/skill.js -> dist/.. -> package root, then skills/issue-worker/SKILL.md
+    const here = fileURLToPath(import.meta.url);
+    return resolve(dirname(here), "..", "skills", "issue-worker", "SKILL.md");
+}
+export function compareSkill() {
+    if (!existsSync(SKILL_DST))
+        return "missing";
+    const src = bundledSkillPath();
+    if (!existsSync(src))
+        return "matches-bundled"; // can't compare; don't alarm
+    return readFileSync(SKILL_DST).equals(readFileSync(src))
+        ? "matches-bundled"
+        : "differs-from-bundled";
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armstrongnate/april",
-  "version": "0.0.4",
+  "version": "0.0.8",
   "description": "She does all the work so you don't have to. Watches GitHub issues and spawns Claude Code sessions to work them.",
   "type": "module",
   "bin": {