harnery 0.5.0 → 0.7.0

package/src/commands/init.ts

@@ -22,7 +22,7 @@ import { dirname, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import type { Command } from "commander";
 import type { EmitContext } from "../commander.ts";
-import { DEFAULT_BIN_NAME, stripJsonComments } from "../core/config.ts";
+import { DEFAULT_BIN_NAME, pinnedBinName, stripJsonComments } from "../core/config.ts";
 import { HARNESS_SPECS, type HarnessId, type HarnessSpec } from "../core/hooks/harness/events.ts";
 import {
   commandWiresSubcommand,
@@ -31,6 +31,7 @@ import {
   makeEntry,
   type SettingsFile,
 } from "../core/hooks/harness/wiring.ts";
+import { applyInstructions, checkInstructions } from "../lib/instructions/apply.ts";
 
 // Re-exported for back-compat: callers (deinit, tests) import these names
 // from init.ts. The definitions now live in core/hooks/harness/wiring.ts.
@@ -42,6 +43,7 @@ const HARNERY_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..", ".."
 interface InitOpts {
   harness: string;
   dryRun?: boolean;
+  check?: boolean;
   projectRoot?: string;
 }
 
@@ -49,11 +51,14 @@ export function registerInitCommand(program: Command, emit: EmitContext, binName
   program
     .command("init")
     .description(
-      "Bootstrap harnery in this project: create .harnery/ and wire the harness " +
-        "hooks (idempotent; safe to re-run). Use --dry-run to preview.",
+      "Bootstrap harnery in this project: create .harnery/, wire the harness " +
+        "hooks, and inject the agent-facing instructions block + skills " +
+        "(idempotent; safe to re-run). Use --dry-run to preview, --check to " +
+        "report drift without writing (exit 0 fresh / 2 drift / 1 error).",
     )
     .option("--harness <id>", "claude-code | cursor | codex", "claude-code")
     .option("--dry-run", "Show what would change without writing")
+    .option("--check", "Report instructions/skills drift without writing; exit 0/2/1")
     .option("--project-root <path>", "Project root (default: git toplevel, else cwd)")
     .action((opts: InitOpts) => {
       const harness = opts.harness as HarnessId;
@@ -65,6 +70,28 @@ export function registerInitCommand(program: Command, emit: EmitContext, binName
       }
 
       const projectRoot = resolve(opts.projectRoot ?? gitTopLevel() ?? process.cwd());
+      // A binName already pinned in this project's config.jsonc beats the
+      // invoking CLI's name: the pin is a committed, deliberate declaration;
+      // the invoking bin is circumstantial (any embedding host's CLI can run
+      // init inside any checkout). Without this, re-running init from a host
+      // CLI re-stamps the host's name into committed agent-facing surfaces.
+      const bin = pinnedBinName(projectRoot) ?? (binName?.trim() ? binName : DEFAULT_BIN_NAME);
+
+      // ── --check: read-only drift report on the block + skills ──────────────
+      if (opts.check === true) {
+        const { status, issues } = checkInstructions(projectRoot, { binName: bin, harness });
+        const head =
+          status === "fresh"
+            ? "harn init --check: instructions + skills are current"
+            : status === "drift"
+              ? "harn init --check: drift found (re-run `init` to refresh)"
+              : "harn init --check: error";
+        const lines = issues.length ? `\n${issues.map((i) => `  ✗ ${i}`).join("\n")}` : "";
+        emit.text(`${head}${lines}`);
+        emit.setExitCode(status === "fresh" ? 0 : status === "drift" ? 2 : 1);
+        return;
+      }
+
       const dryRun = opts.dryRun === true;
       const actions: string[] = [];
 
@@ -85,10 +112,11 @@ export function registerInitCommand(program: Command, emit: EmitContext, binName
       // The coord binaries (agent-hook/agent-coord) and web UI run as harnery
       // itself, so they can't see a consumer CLI's name; they read it back from
       // config.jsonc. Standalone `harn` is the resolver's default, so only a
-      // consumer (binName ≠ "harn") needs the stamp.
-      if (binName && binName !== DEFAULT_BIN_NAME) {
+      // consumer (bin ≠ "harn") needs the stamp. `bin` already honors an
+      // existing pin, so this never overwrites a deliberate config value.
+      if (bin !== DEFAULT_BIN_NAME) {
         const configPath = resolve(coordDir, "config.jsonc");
-        const stamp = stampBinName(configPath, binName, dryRun);
+        const stamp = stampBinName(configPath, bin, dryRun);
         if (stamp) actions.push(stamp);
       }
 
@@ -111,25 +139,31 @@ export function registerInitCommand(program: Command, emit: EmitContext, binName
       } else {
         settings = {};
       }
-      const { wired, already } = wireHooks(settings, spec, agentHook, harness);
+      const { wired, already, removed } = wireHooks(settings, spec, agentHook, harness);
 
-      if (wired === 0) {
+      if (wired === 0 && removed === 0) {
         actions.push(
           `· all ${spec.events.length} ${harness} hooks already wired in ${rel(projectRoot, settingsPath)}`,
         );
       } else if (dryRun) {
         actions.push(
-          `+ would wire ${wired} hook(s) into ${rel(projectRoot, settingsPath)} (${already} already present)`,
+          `+ would wire ${wired} hook(s) and remove ${removed} legacy hook(s) in ` +
+            `${rel(projectRoot, settingsPath)} (${already} already present)`,
         );
       } else {
         mkdirSync(dirname(settingsPath), { recursive: true });
         writeFileSync(settingsPath, `${JSON.stringify(settings, null, 2)}\n`);
         actions.push(
-          `+ wired ${wired} hook(s) into ${rel(projectRoot, settingsPath)} (${already} already present)`,
+          `+ wired ${wired} hook(s) and removed ${removed} legacy hook(s) in ` +
+            `${rel(projectRoot, settingsPath)} (${already} already present)`,
         );
       }
 
-      emit.text(render(projectRoot, dryRun, actions));
+      // ── 3. agent-facing instructions block + skills ────────────────────────
+      const applied = applyInstructions(projectRoot, { binName: bin, harness, dryRun });
+      actions.push(...applied.actions);
+
+      emit.text(render(projectRoot, dryRun, actions, applied.warnings));
     });
 }
 
@@ -149,13 +183,24 @@ export function wireHooks(
   spec: HarnessSpec,
   agentHookPath: string,
   harness: HarnessId,
-): { wired: number; already: number } {
+): { wired: number; already: number; removed: number } {
   if (spec.rootVersion !== undefined && settings.version === undefined) {
     settings.version = spec.rootVersion;
   }
   if (!settings.hooks) settings.hooks = {};
   let wired = 0;
   let already = 0;
+  let removed = 0;
+  for (const { settingsKey, subcommand } of spec.legacyEvents ?? []) {
+    const groups = settings.hooks[settingsKey] ?? [];
+    const kept = groups.filter(
+      (group) =>
+        !groupCommands(group).some((command) => commandWiresSubcommand(command, subcommand)),
+    );
+    removed += groups.length - kept.length;
+    if (kept.length === 0) delete settings.hooks[settingsKey];
+    else settings.hooks[settingsKey] = kept;
+  }
   for (const { settingsKey, subcommand } of spec.events) {
     const command = `bash ${agentHookPath} ${subcommand} --harness ${harness}`;
     const groups = settings.hooks[settingsKey] ?? [];
@@ -170,7 +215,7 @@ export function wireHooks(
     settings.hooks[settingsKey] = groups;
     wired++;
   }
-  return { wired, already };
+  return { wired, already, removed };
 }
 
 /**
@@ -288,12 +333,18 @@ function firstBraceIndex(raw: string): number {
   return -1;
 }
 
-function render(projectRoot: string, dryRun: boolean, actions: string[]): string {
+function render(
+  projectRoot: string,
+  dryRun: boolean,
+  actions: string[],
+  warnings: string[] = [],
+): string {
   const head = dryRun ? "harn init (dry run): no changes written" : "harn init";
+  const warnBlock = warnings.length ? `\n${warnings.map((w) => `  ! ${w}`).join("\n")}` : "";
   const tail = dryRun
     ? "\nRe-run without --dry-run to apply."
     : "\nDone. Start a session and check `harn agents whoami`.";
-  return `${head}\n  root: ${projectRoot}\n${actions.map((a) => `  ${a}`).join("\n")}${tail}`;
+  return `${head}\n  root: ${projectRoot}\n${actions.map((a) => `  ${a}`).join("\n")}${warnBlock}${tail}`;
 }
 
 function gitTopLevel(): string | null {

package/src/commands/scratch.ts

@@ -20,7 +20,7 @@ import {
   scratchDir,
   scratchPath,
   sweepOrphanScratchpads,
-} from "../lib/scratch/index.ts";
+} from "../core/scratch/index.ts";
 
 /**
  * `harn scratch`: per-agent markdown journal at `.harnery/scratch/<instance_id>.md`.