harnery 0.6.0 → 0.7.1

package/dist/commands/env.js

@@ -4,7 +4,7 @@ import { exec, sh } from "../lib/exec.js";
 export function registerEnvCommand(program, emit, context) {
     program
         .command("env [section]")
-        .description("Show environment status (docker, gcp, bq, node, python, git)")
+        .description("Show environment status (runtimes, docker, git; hosts can add sections)")
         .action(async (section) => {
         try {
             await handleEnv(section, emit, context);
@@ -20,9 +20,9 @@ async function handleEnv(section, emit, context) {
     const sections = {
         runtimes: checkRuntimes,
         docker: checkDocker,
-        gcp: checkGcp,
-        bq: checkBigQuery,
         git: () => checkGit(context),
+        // Host-registered sections (e.g. gcp/bq) merge in after the generic ones.
+        ...(context?.envSections ?? {}),
     };
     if (section) {
         const fn = sections[section];
@@ -110,66 +110,6 @@ async function checkDocker() {
     }
     return checks;
 }
-async function checkGcp() {
-    const checks = [];
-    const account = await sh("gcloud config get-value account 2>/dev/null").catch(() => ({
-        stdout: "",
-        exitCode: 1,
-        stderr: "",
-    }));
-    const project = await sh("gcloud config get-value project 2>/dev/null").catch(() => ({
-        stdout: "",
-        exitCode: 1,
-        stderr: "",
-    }));
-    if (account.exitCode === 0 && account.stdout) {
-        checks.push({ label: "GCP Account", value: account.stdout, status: "ok" });
-    }
-    else {
-        checks.push({ label: "GCP Account", value: "not authenticated", status: "missing" });
-    }
-    if (project.exitCode === 0 && project.stdout) {
-        checks.push({ label: "GCP Project", value: project.stdout, status: "ok" });
-    }
-    else {
-        checks.push({ label: "GCP Project", value: "not set", status: "missing" });
-    }
-    return checks;
-}
-async function checkBigQuery() {
-    const checks = [];
-    const result = await sh("bq ls --max_results=1 2>/dev/null").catch(() => ({
-        stdout: "",
-        exitCode: 1,
-        stderr: "",
-    }));
-    if (result.exitCode === 0) {
-        checks.push({ label: "BigQuery", value: "connected", status: "ok" });
-    }
-    else {
-        checks.push({ label: "BigQuery", value: "not connected (check GCP auth)", status: "missing" });
-    }
-    const datasets = await sh("bq ls --format=json --max_results=20 2>/dev/null").catch(() => ({
-        stdout: "",
-        exitCode: 1,
-        stderr: "",
-    }));
-    if (datasets.exitCode === 0 && datasets.stdout) {
-        try {
-            const ds = JSON.parse(datasets.stdout);
-            const names = ds
-                .map((d) => d.datasetReference?.datasetId)
-                .filter(Boolean)
-                .join(", ");
-            if (names)
-                checks.push({ label: "Datasets", value: names, status: "info" });
-        }
-        catch {
-            // Ignore parse failures
-        }
-    }
-    return checks;
-}
 async function checkGit(context) {
     const checks = [];
     const cwd = context?.repoRoot ?? process.cwd();

package/dist/commands/init.d.ts

@@ -35,6 +35,7 @@ export declare function registerInitCommand(program: Command, emit: EmitContext,
 export declare function wireHooks(settings: SettingsFile, spec: HarnessSpec, agentHookPath: string, harness: HarnessId): {
     wired: number;
     already: number;
+    removed: number;
 };
 /**
  * Inverse of {@link wireHooks}: strip every harnery-owned hook entry from a

package/dist/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD,OAAO,EAAiB,KAAK,SAAS,EAAE,KAAK,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAClG,OAAO,EAGL,KAAK,SAAS,EAEd,KAAK,YAAY,EAClB,MAAM,iCAAiC,CAAC;AAIzC,YAAY,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;AAWxC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAsF/F;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,YAAY,EACtB,IAAI,EAAE,WAAW,EACjB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,SAAS,GACjB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAsBpC;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAmB1F;AAED;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAmDhG"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD,OAAO,EAAiB,KAAK,SAAS,EAAE,KAAK,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAClG,OAAO,EAGL,KAAK,SAAS,EAEd,KAAK,YAAY,EAClB,MAAM,iCAAiC,CAAC;AAKzC,YAAY,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;AAYxC,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAsH/F;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,YAAY,EACtB,IAAI,EAAE,WAAW,EACjB,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,SAAS,GACjB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAiCrD;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAmB1F;AAED;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAmDhG"}

package/dist/commands/init.js

@@ -19,18 +19,22 @@ import { spawnSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { DEFAULT_BIN_NAME, stripJsonComments } from "../core/config.js";
+import { DEFAULT_BIN_NAME, pinnedBinName, stripJsonComments } from "../core/config.js";
 import { HARNESS_SPECS } from "../core/hooks/harness/events.js";
 import { commandWiresSubcommand, groupCommands, makeEntry, } from "../core/hooks/harness/wiring.js";
+import { applyInstructions, checkInstructions } from "../lib/instructions/apply.js";
 // This file is src/commands/init.ts → harnery package root is two levels up.
 const HARNERY_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..", "..");
 export function registerInitCommand(program, emit, 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.")
+        .description("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) => {
         const harness = opts.harness;
@@ -41,6 +45,25 @@ export function registerInitCommand(program, emit, binName) {
             return;
         }
         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 = [];
         // ── 1. coord root ──────────────────────────────────────────────────────
@@ -61,10 +84,11 @@ export function registerInitCommand(program, emit, 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);
         }
@@ -86,19 +110,24 @@ export function registerInitCommand(program, emit, binName) {
         else {
             settings = {};
         }
-        const { wired, already } = wireHooks(settings, spec, agentHook, harness);
-        if (wired === 0) {
+        const { wired, already, removed } = wireHooks(settings, spec, agentHook, harness);
+        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)`);
+            actions.push(`+ 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)`);
+            actions.push(`+ 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));
     });
 }
 /**
@@ -120,6 +149,16 @@ export function wireHooks(settings, spec, agentHookPath, harness) {
         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] ?? [];
@@ -132,7 +171,7 @@ export function wireHooks(settings, spec, agentHookPath, harness) {
         settings.hooks[settingsKey] = groups;
         wired++;
     }
-    return { wired, already };
+    return { wired, already, removed };
 }
 /**
  * Inverse of {@link wireHooks}: strip every harnery-owned hook entry from a
@@ -258,12 +297,13 @@ function firstBraceIndex(raw) {
     }
     return -1;
 }
-function render(projectRoot, dryRun, actions) {
+function render(projectRoot, dryRun, actions, warnings = []) {
     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() {
     const r = spawnSync("git", ["rev-parse", "--show-toplevel"], { encoding: "utf8" });

package/dist/commands/scratch.js

@@ -2,7 +2,7 @@ import { existsSync, readdirSync, readFileSync, statSync, unlinkSync, watch } fr
 import { resolve as resolvePath } from "node:path";
 import { emitCanonical, normalizeHarness, readHeartbeat } from "../core/agents/index.js";
 import { resolveBinName } from "../core/config.js";
-import { appendEntry, archiveScratch, currentOwnerOrThrow, lintScratch, listArchives, loadScratch, parseScratch, pruneArchives, resolveOwnerByName, SCRATCH_CATEGORIES, scratchDir, scratchPath, sweepOrphanScratchpads, } from "../lib/scratch/index.js";
+import { appendEntry, archiveScratch, currentOwnerOrThrow, lintScratch, listArchives, loadScratch, parseScratch, pruneArchives, resolveOwnerByName, SCRATCH_CATEGORIES, scratchDir, scratchPath, sweepOrphanScratchpads, } from "../core/scratch/index.js";
 /**
  * `harn scratch`: per-agent markdown journal at `.harnery/scratch/<instance_id>.md`.
  * Used both for self-notes (surviving compaction) and peer coordination (other

package/dist/commands/tunnel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel.d.ts","sourceRoot":"","sources":["../../src/commands/tunnel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AA4jB1E,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,WAAW,EACtB,YAAY,CAAC,EAAE,qBAAqB,GACnC,IAAI,CAuDN"}
+{"version":3,"file":"tunnel.d.ts","sourceRoot":"","sources":["../../src/commands/tunnel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AA2yB1E,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,WAAW,EACtB,YAAY,CAAC,EAAE,qBAAqB,GACnC,IAAI,CAmEN"}