@armstrongnate/april 0.0.3 → 0.0.7

package/README.md

@@ -8,7 +8,7 @@ april watches for GitHub issues assigned to you with a specific label, then spin
 
 - [Node.js](https://nodejs.org/) >= 22
 - [gh](https://cli.github.com/) (authenticated)
-- The `gh-webhook` extension: `gh extension install cli/gh-webhook`
+- The [`gh-webhook` extension](https://github.com/cli/gh-webhook): `gh extension install cli/gh-webhook`
 - [tmux](https://github.com/tmux/tmux)
 - [Claude Code](https://claude.ai/claude-code) CLI
 
@@ -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. |
@@ -185,6 +187,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/config.example.yaml

@@ -2,10 +2,7 @@ assignee: "your-github-username"
 label: "agent:todo"
 claudeSkill: "issue-worker"
 # claudeModel: "opus"              # optional, defaults to opus
-# claudeAllowedTools:              # optional, defaults to Edit, Write, Bash(*)
-#   - "Edit"
-#   - "Write"
-#   - "Bash(*)"
+# claudePermissionMode: "auto"     # optional, defaults to auto (others: default, acceptEdits, plan, bypassPermissions)
 port: 7890
 repos:
   - owner: "org"

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/config.js

@@ -63,9 +63,7 @@ export function loadConfig() {
     const label = validateString(parsed, "label", "config");
     const claudeSkill = validateString(parsed, "claudeSkill", "config");
     const claudeModel = typeof parsed.claudeModel === "string" ? parsed.claudeModel.trim() : undefined;
-    const claudeAllowedTools = Array.isArray(parsed.claudeAllowedTools)
-        ? parsed.claudeAllowedTools.filter((t) => typeof t === "string" && t.trim().length > 0).map((t) => t.trim())
-        : undefined;
+    const claudePermissionMode = typeof parsed.claudePermissionMode === "string" ? parsed.claudePermissionMode.trim() : undefined;
     const port = Number(parsed.port);
     if (!Number.isInteger(port) || port < 1024 || port > 65535) {
         throw new Error(`config: "port" must be an integer between 1024 and 65535, got: ${parsed.port}`);
@@ -96,7 +94,7 @@ export function loadConfig() {
             : undefined;
         return { owner, name, path: resolvedPath, defaultBranch, slackChannel, postWorktreeHook };
     });
-    const config = { assignee, label, claudeSkill, claudeModel, claudeAllowedTools, port, repos };
+    const config = { assignee, label, claudeSkill, claudeModel, claudePermissionMode, port, repos };
     log.info(`Config loaded: assignee=${assignee}, label=${label}, repos=${repos.map((r) => `${r.owner}/${r.name}`).join(", ")}`);
     return config;
 }

package/dist/processes.js

@@ -30,7 +30,6 @@ function cleanupStaleWebhooks(repoKey) {
 const INITIAL_BACKOFF_MS = 1000;
 const MAX_BACKOFF_MS = 30_000;
 const UPTIME_RESET_MS = 60_000;
-const MAX_CONSECUTIVE_FAILURES = 5;
 const forwarders = [];
 function spawnForwarder(config, repoKey, url) {
     const state = {
@@ -82,12 +81,8 @@ function spawnForwarder(config, repoKey, url) {
                 state.consecutiveFailures++;
                 state.backoffMs = Math.min(state.backoffMs * 2, MAX_BACKOFF_MS);
             }
-            if (state.consecutiveFailures >= MAX_CONSECUTIVE_FAILURES) {
-                log.error(`Forwarder for ${repoKey} failed ${MAX_CONSECUTIVE_FAILURES} consecutive times, giving up`);
-                return;
-            }
             log.warn(`Forwarder for ${repoKey} exited (code=${code}, signal=${signal}), ` +
-                `restarting in ${state.backoffMs}ms (failure ${state.consecutiveFailures}/${MAX_CONSECUTIVE_FAILURES})`);
+                `restarting in ${state.backoffMs}ms (consecutive failures: ${state.consecutiveFailures})`);
             setTimeout(() => start(), state.backoffMs);
         });
     }

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/dist/spawner.js

@@ -149,15 +149,11 @@ export function spawnClaude(config, repo, issue, worktreePath, sessionName) {
         // Session does not exist, proceed
     }
     const model = config.claudeModel || "opus";
-    const allowedTools = [
-        ...(config.claudeAllowedTools ?? ["Read", "Search", "Edit", "Write", "Bash(*)"]),
-        ...(repo.slackChannel ? ["mcp__plugin_slack_slack__*"] : []),
-    ];
+    const permissionMode = config.claudePermissionMode || "auto";
     const slackPart = repo.slackChannel ? ` Post the PR to Slack channel #${repo.slackChannel}.` : "";
     const prompt = `/${config.claudeSkill} Read GitHub issue #${issue.number} on ${repo.owner}/${repo.name} using the gh CLI. Implement it and open a PR.${slackPart}`;
     log.debug(`Prompt: ${prompt}`);
-    const allowedToolsArgs = allowedTools.map((t) => `--allowedTools '${t}'`).join(" ");
-    const claudeCommand = `claude --model ${model} ${allowedToolsArgs}`;
+    const claudeCommand = `claude --model ${model} --permission-mode ${permissionMode}`;
     log.info(`Spawning tmux session "${sessionName}" with claude`);
     execSync(`tmux new-session -d -s ${JSON.stringify(sessionName)} -c ${JSON.stringify(worktreePath)} ${JSON.stringify(claudeCommand)}`);
     // Send the prompt via send-keys after Claude starts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armstrongnate/april",
-  "version": "0.0.3",
+  "version": "0.0.7",
   "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": {

package/skills/issue-worker/SKILL.md

@@ -1,11 +1,11 @@
 ---
 name: issue-worker
-description: Autonomously work a GitHub issue end-to-end — read, implement, and open a PR with no human input required.
+description: Autonomously work a GitHub issue end-to-end — read, implement, open a PR, and monitor CI/review feedback.
 ---
 
 # issue-worker
 
-You have been assigned a GitHub issue. Work it to completion autonomously. Do not stop to ask for approval or confirmation — go straight from reading the issue to opening a PR.
+You have been assigned a GitHub issue. Work it to completion autonomously. Do not stop to ask for approval or confirmation — go straight from reading the issue to opening a PR, then monitor and respond to CI failures and review feedback.
 
 ## 1. Read the issue
 
@@ -25,16 +25,17 @@ gh issue view {issue_number} --repo {owner}/{repo} --comments
 - Write or update tests as appropriate
 - Ensure the code builds/lints/passes tests
 
-## 4. Review and simplify
+## 4. Review
 
-Run `git diff` and review your own changes. Fix any issues before committing.
+Run `/simplify` to review your changes for reuse, quality, and efficiency, and fix anything it surfaces.
 
-- **Correctness:** Does it fully address the issue? Missing edge cases?
-- **Simplify:** Can anything be combined, inlined, or removed? Prefer fewer files, less indirection, and no unnecessary abstractions.
-- **Reuse:** Are you duplicating logic that already exists in the codebase? Use existing helpers and patterns.
-- **Cleanup:** Remove leftover debug code, TODOs, unused imports, and dead code.
-- **Style:** Match the conventions of the surrounding code.
-- **Tests:** Are the tests meaningful, not just testing mocks?
+Then do a quick manual pass on things `/simplify` won't catch:
+
+- **Correctness:** Does the change fully address the issue? Any missing edge cases?
+- **Tests:** Are the tests meaningful, or are they just asserting on mocks?
+- **Cleanup:** Any leftover debug code, TODOs, or commented-out lines?
+
+Fix anything you find before moving on.
 
 ## 5. Commit, push, and open a PR
 
@@ -42,12 +43,28 @@ Run `git diff` and review your own changes. Fix any issues before committing.
 gh pr create --title "..." --body "..."
 ```
 
-Then update the issue labels:
+## 6. Post to Slack (if instructed)
+
+If the prompt specifies a Slack channel, use the Slack MCP tool to post a message with a link to the PR. Format: `<pr_url|PR> repo-name: title of the pr`
+
+## 7. Monitor CI and review feedback
+
+After creating the PR, monitor it until all checks pass and all review feedback is addressed.
+
+Loop:
+1. Sleep for 3 minutes (`sleep 180`)
+2. Check CI status: `gh pr checks {pr_number} --repo {owner}/{repo}`
+3. If any checks failed, read the failure logs, fix the issue, commit, and push
+4. Check for review comments: `gh pr view {pr_number} --repo {owner}/{repo} --comments`
+5. If there are new or unresolved comments, address them, commit, and push
+6. Repeat from step 1
+
+Stop when:
+- All CI checks pass AND
+- No unresolved review comments remain
+
+Once everything is green, update the issue labels:
 
 ```
 gh issue edit {issue_number} --repo {owner}/{repo} --add-label agent:review --remove-label agent:wip
 ```
-
-## 6. Post to Slack (if instructed)
-
-If the prompt specifies a Slack channel, use the Slack MCP tool to post a message with a link to the PR. Format: `<pr_url|PR> title of the pr`