tickmarkr 1.90.0 → 1.90.2

package/dist/cli/commands/doctor.d.ts

@@ -9,20 +9,23 @@ export type DoctorOpts = {
     catalog?: CatalogReadResult;
     catalogNow?: () => Date;
 };
-/**
- * Q122s (TRIAL T-OBS-3): tickmarkr provisions run worktrees INSIDE the repo
- * (.tickmarkr/worktrees.noindex/). A target repo whose test runner collects with
- * repo-wide globs (jest's default `**​/__tests__/**` shape, vitest's default include)
- * scans every suite once per live worktree — duplicate-suite interference red the
- * baseline AND tip-verify on SentioQ's first external run, a class invisible to
- * dogfooding (this repo's own includes are rooted at tests/).
- *
- * Text-level heuristic, advisory only — never enters health/doctor.json or routing.
- * ponytail: ceilings — a commented-out ignore false-passes; an include built from
- * variables is judged by its literal text. Both cost one advisory row, nothing more.
- */
 export declare function runnerIgnoreFinding(cwd: string): {
     verdict: "pass" | "warn";
     detail: string;
 } | undefined;
+/**
+ * Q134s (doctor --fix): the WRITE half of Q122s/Q130s. Doctor's advisory row cost two
+ * repos a hand-edit (SentioQ run 2 paid a whole run first); --fix applies the ignore
+ * where a safe textual edit exists and refuses loudly otherwise.
+ *
+ * Safety contract: only three write shapes, each verified by re-running
+ * runnerIgnoreFinding afterward — a write that does not turn the row green is
+ * REVERTED and reported as manual. Never touches package.json (jest block → manual).
+ * ponytail: text-level edits, same ceilings as the finding; the verify-then-revert
+ * loop is what makes them safe to ship.
+ */
+export declare function applyRunnerIgnore(cwd: string): {
+    action: "none" | "wrote" | "manual";
+    detail: string;
+};
 export declare function doctor(_argv: string[], cwd?: string, adapters?: WorkerAdapter[], opts?: DoctorOpts): Promise<string>;

package/dist/cli/commands/doctor.js

@@ -14,37 +14,63 @@ import { readCachedCatalog, refreshCatalogCommand } from "../../adapters/catalog
 const visual = () => process.stdout.isTTY === true && process.env.NO_COLOR === undefined;
 const alignedStatusRow = (verdict, key, value) => `  ${statusRow(verdict, kvRow(key, value).slice(2))}`;
 const attentionRow = (text) => `  ${statusRow("warn", text)}`;
-/**
- * Q122s (TRIAL T-OBS-3): tickmarkr provisions run worktrees INSIDE the repo
- * (.tickmarkr/worktrees.noindex/). A target repo whose test runner collects with
- * repo-wide globs (jest's default `**​/__tests__/**` shape, vitest's default include)
- * scans every suite once per live worktree — duplicate-suite interference red the
- * baseline AND tip-verify on SentioQ's first external run, a class invisible to
- * dogfooding (this repo's own includes are rooted at tests/).
- *
- * Text-level heuristic, advisory only — never enters health/doctor.json or routing.
- * ponytail: ceilings — a commented-out ignore false-passes; an include built from
- * variables is judged by its literal text. Both cost one advisory row, nothing more.
- */
-export function runnerIgnoreFinding(cwd) {
+function detectRunner(cwd) {
     const readIf = (p) => (existsSync(join(cwd, p)) ? readFileSync(join(cwd, p), "utf8") : "");
-    const pkgText = readIf("package.json");
     let pkg = {};
     try {
-        pkg = JSON.parse(pkgText || "{}");
+        pkg = JSON.parse(readIf("package.json") || "{}");
     }
     catch { /* unparseable manifest: judge config files alone */ }
     const jestConfig = ["jest.config.js", "jest.config.cjs", "jest.config.mjs", "jest.config.ts", "jest.config.json"].find((p) => existsSync(join(cwd, p)));
     const vitestConfig = ["vitest.config.ts", "vitest.config.js", "vitest.config.mts", "vitest.config.mjs", "vitest.config.cts"].find((p) => existsSync(join(cwd, p)));
     const testScript = pkg.scripts?.test ?? "";
-    const isJest = jestConfig !== undefined || pkg.jest !== undefined || /\bjest\b/.test(testScript);
-    const isVitest = !isJest && (vitestConfig !== undefined || /\bvitest\b/.test(testScript));
-    if (!isJest && !isVitest)
+    if (jestConfig !== undefined || pkg.jest !== undefined || /\bjest\b/.test(testScript)) {
+        return { kind: "jest", configPath: jestConfig, pkgJestBlock: pkg.jest !== undefined };
+    }
+    if (vitestConfig !== undefined || /\bvitest\b/.test(testScript)) {
+        return { kind: "vitest", configPath: vitestConfig, pkgJestBlock: false };
+    }
+    return undefined;
+}
+export function runnerIgnoreFinding(cwd) {
+    const readIf = (p) => (existsSync(join(cwd, p)) ? readFileSync(join(cwd, p), "utf8") : "");
+    const runner = detectRunner(cwd);
+    if (!runner)
         return undefined;
-    const configText = isJest
+    const isJest = runner.kind === "jest";
+    const jestConfig = isJest ? runner.configPath : undefined;
+    const vitestConfig = isJest ? undefined : runner.configPath;
+    let pkg = {};
+    try {
+        pkg = JSON.parse(readIf("package.json") || "{}");
+    }
+    catch { /* judged above */ }
+    // Comment LINES are stripped before judgment: a commented-out ignore must not
+    // false-pass, and a prose comment mentioning .tickmarkr must not false-warn the
+    // anchor probe. Stripping is LINE-granular on purpose: in-line regex stripping ate
+    // glob strings — `'**/*.d.ts'` contains `/*` and later globs contain `*/`, so a
+    // naive block-comment regex deleted the middle of real configs and false-PASSED a
+    // repo-wide vitest include (caught on Intl-Dossier's config; shipped briefly in
+    // 1.90.1). Trailing same-line comments survive — acceptable: they can only make the
+    // probe more conservative on lines that also carry code.
+    const stripComments = (s) => s.split("\n").filter((l) => {
+        const t = l.trimStart();
+        return !(t.startsWith("//") || t.startsWith("/*") || t.startsWith("*"));
+    }).join("\n");
+    const configText = stripComments(isJest
         ? `${jestConfig ? readIf(jestConfig) : ""}${pkg.jest ? JSON.stringify(pkg.jest) : ""}`
-        : vitestConfig ? readIf(vitestConfig) : "";
+        : vitestConfig ? readIf(vitestConfig) : "");
     if (/\.tickmarkr|worktrees\.noindex/.test(configText)) {
+        // Q130s self-match probe: erase every <rootDir>-anchored token (through the end of
+        // its quoted string); any surviving mention is a pattern that would also match
+        // inside a provisioned worktree (jest regex-vs-absolute-path semantics only).
+        const unanchored = configText.replace(/<rootDir>[^"'`\s]*/g, "");
+        if (isJest && /\.tickmarkr|worktrees\.noindex/.test(unanchored)) {
+            return {
+                verdict: "warn",
+                detail: `jest ignore for .tickmarkr/ is not <rootDir>-anchored — testPathIgnorePatterns are regexes against ABSOLUTE paths, so inside run worktrees (provisioned under .tickmarkr/worktrees.noindex/) it matches EVERY suite and the test gate fails closed; use "<rootDir>/\\\\.tickmarkr/" in ${jestConfig ?? "the package.json jest block"}`,
+            };
+        }
         return { verdict: "pass", detail: `${isJest ? "jest" : "vitest"} config ignores .tickmarkr/ — run worktrees stay out of the suite` };
     }
     // Rooted collection globs never reach .tickmarkr/…; only repo-wide `**/`-style patterns (or
@@ -54,13 +80,75 @@ export function runnerIgnoreFinding(cwd) {
         return { verdict: "pass", detail: `${isJest ? "jest" : "vitest"} collection globs are rooted — run worktrees are not collectable` };
     }
     const remedy = isJest
-        ? `add "/.tickmarkr/" to testPathIgnorePatterns in ${jestConfig ?? "the package.json jest block"}`
-        : `add "**/.tickmarkr/**" to test.exclude in ${vitestConfig ?? "a vitest config"}`;
+        ? `add "<rootDir>/\\\\.tickmarkr/" to testPathIgnorePatterns in ${jestConfig ?? "the package.json jest block"}`
+        : `add ".tickmarkr/**" to test.exclude in ${vitestConfig ?? "a vitest config"}`;
     return {
         verdict: "warn",
         detail: `${isJest ? "jest" : "vitest"} collects repo-wide and will scan .tickmarkr/ run worktrees (duplicate suites, false reds) — ${remedy}`,
     };
 }
+/**
+ * Q134s (doctor --fix): the WRITE half of Q122s/Q130s. Doctor's advisory row cost two
+ * repos a hand-edit (SentioQ run 2 paid a whole run first); --fix applies the ignore
+ * where a safe textual edit exists and refuses loudly otherwise.
+ *
+ * Safety contract: only three write shapes, each verified by re-running
+ * runnerIgnoreFinding afterward — a write that does not turn the row green is
+ * REVERTED and reported as manual. Never touches package.json (jest block → manual).
+ * ponytail: text-level edits, same ceilings as the finding; the verify-then-revert
+ * loop is what makes them safe to ship.
+ */
+export function applyRunnerIgnore(cwd) {
+    const finding = runnerIgnoreFinding(cwd);
+    if (!finding)
+        return { action: "none", detail: "no recognized test runner" };
+    if (finding.verdict === "pass")
+        return { action: "none", detail: finding.detail };
+    const runner = detectRunner(cwd);
+    if (!runner?.configPath) {
+        // package.json jest block, or a runner detected only via the test script: hand edit.
+        return { action: "manual", detail: finding.detail };
+    }
+    const file = join(cwd, runner.configPath);
+    const original = readFileSync(file, "utf8");
+    let text = original;
+    if (runner.kind === "jest") {
+        // 1) Replace unanchored poison entries in place (the SentioQ run-2 shape).
+        text = text.replace(/(["'])\/?\.tickmarkr\/?\1/g, '"<rootDir>/\\\\.tickmarkr/"');
+        if (text === original && !/\.tickmarkr/.test(text)) {
+            const arr = /testPathIgnorePatterns(["']?)\s*:\s*\[/;
+            if (arr.test(text)) {
+                // 2) Existing ignore array: prepend the anchored entry.
+                text = text.replace(arr, (m) => `${m}"<rootDir>/\\\\.tickmarkr/", `);
+                if (runner.configPath.endsWith(".json"))
+                    text = text.replace(/,(\s*)\]/g, "$1]");
+            }
+            else {
+                // 3) No array: add the property, preserving jest's default /node_modules/ ignore.
+                const anchor = /(module\.exports\s*=\s*\{|export\s+default\s+\{|export\s+default\s+defineConfig\(\{)/g;
+                if ((text.match(anchor) ?? []).length === 1) {
+                    text = text.replace(anchor, (m) => `${m}\n  testPathIgnorePatterns: ["/node_modules/", "<rootDir>/\\\\.tickmarkr/"],`);
+                }
+            }
+        }
+    }
+    else if (!/\.tickmarkr/.test(text)) {
+        // vitest: add the glob to every exclude array — test.exclude is the target;
+        // coverage.exclude gaining it is correct behavior, not collateral.
+        const arr = /exclude\s*:\s*\[/g;
+        if (arr.test(text))
+            text = text.replace(arr, (m) => `${m}'.tickmarkr/**', `);
+    }
+    if (text === original)
+        return { action: "manual", detail: finding.detail };
+    writeFileSync(file, text);
+    const after = runnerIgnoreFinding(cwd);
+    if (after?.verdict === "pass") {
+        return { action: "wrote", detail: `wrote ${runner.configPath} — ${after.detail}` };
+    }
+    writeFileSync(file, original); // verify failed: never leave a half-fix behind
+    return { action: "manual", detail: finding.detail };
+}
 export async function doctor(_argv, cwd = process.cwd(), adapters = allAdapters(), opts = {}) {
     if (_argv.length === 1 && _argv[0] === "--refresh-catalog") {
         const refreshed = await refreshCatalogCommand({ repoRoot: cwd, now: opts.catalogNow });
@@ -139,9 +227,19 @@ export async function doctor(_argv, cwd = process.cwd(), adapters = allAdapters(
     const herdr = HerdrDriver.available();
     rows.push(alignedStatusRow(herdr ? "pass" : "fail", "herdr", herdr ? "driver available (HERDR_ENV=1)" : "not detected — subprocess driver will be used"));
     // Q122s: the target repo's runner must not scan tickmarkr's own worktrees (advisory row).
+    // Q134s: `doctor --fix` writes the ignore when a safe edit exists (verified, else reverted).
     const runnerIgnore = runnerIgnoreFinding(cwd);
-    if (runnerIgnore)
-        rows.push(alignedStatusRow(runnerIgnore.verdict, "test-runner", runnerIgnore.detail));
+    if (runnerIgnore) {
+        if (_argv.includes("--fix") && runnerIgnore.verdict === "warn") {
+            const fixed = applyRunnerIgnore(cwd);
+            rows.push(fixed.action === "wrote"
+                ? alignedStatusRow("pass", "test-runner", fixed.detail)
+                : alignedStatusRow("warn", "test-runner", `--fix could not edit safely — apply by hand: ${fixed.detail}`));
+        }
+        else {
+            rows.push(alignedStatusRow(runnerIgnore.verdict, "test-runner", runnerIgnore.detail));
+        }
+    }
     // v1.22 T5: workspace-trust pre-flight — per installed adapter: trusted | seeded | action-required | n/a.
     // action-required names the exact one-time command (or dialog) the operator must run once.
     rows.push(legend("workspace trust:"));

package/dist/cli/index.d.ts

@@ -5,7 +5,7 @@ export type CommandResult = string | {
 };
 export type CommandMap = Record<string, (argv: string[]) => Promise<CommandResult>>;
 export declare const COMMANDS: CommandMap;
-export declare const USAGE = "tickmarkr \u2014 spec-driven orchestration harness for AI coding agents\nusage: tickmarkr <command>\n  init          guided setup + doctor; init --agent [--force] [--docs] adds agent skills/docs\n  doctor        re-probe adapters, herdr, auth; print capability matrix\n  fleet         interactive fleet editor (fleet --print for CI drift checks)\n  compile <src> spec \u2192 .tickmarkr/graph.json (fails without acceptance criteria)\n  scope <intent> draft a compiled native spec beside an answered intent (--force to overwrite)\n  plan          dry-run routing table + cost estimate + floor lints\n  eval          run checked-in fixtures against every channel in isolated temp repos\n  run           execute the graph (--concurrency N --driver herdr|subprocess --route-strict)\n  status        live run state\n  verify        run the gate battery standalone against merge-base(--base, HEAD)..HEAD \u2014 no daemon, one verdict (--base main --criteria <file> | --task <id> [--files <glob>] [--author adapter:model] [--no-review] [--json])\n  resume <id>   continue a run from its journal\n  report <id>   cost/quality report (--md for committable execution record)\n  profile       show learned routing profile (profile reset = forget history via cursor, keeps telemetry)\n  ui            open the Fleet Studio TUI (full-screen tabbed cockpit)\n  unlock        remove a stale/garbage run lock (refuses if the holder is alive)\n  approve <id> <task>  release a park (--uphold sides with the reviewer and funds a fixed attempt; --by <name> --reason <text>); takes effect on resume";
+export declare const USAGE = "tickmarkr \u2014 spec-driven orchestration harness for AI coding agents\nusage: tickmarkr <command>\n  init          guided setup + doctor; init --agent [--force] [--docs] adds agent skills/docs\n  doctor        re-probe adapters, herdr, auth; print capability matrix (--fix writes the test-runner ignore when a safe edit exists)\n  fleet         interactive fleet editor (fleet --print for CI drift checks)\n  compile <src> spec \u2192 .tickmarkr/graph.json (fails without acceptance criteria)\n  scope <intent> draft a compiled native spec beside an answered intent (--force to overwrite)\n  plan          dry-run routing table + cost estimate + floor lints\n  eval          run checked-in fixtures against every channel in isolated temp repos\n  run           execute the graph (--concurrency N --driver herdr|subprocess --route-strict)\n  status        live run state\n  verify        run the gate battery standalone against merge-base(--base, HEAD)..HEAD \u2014 no daemon, one verdict (--base main --criteria <file> | --task <id> [--files <glob>] [--author adapter:model] [--no-review] [--json])\n  resume <id>   continue a run from its journal\n  report <id>   cost/quality report (--md for committable execution record)\n  profile       show learned routing profile (profile reset = forget history via cursor, keeps telemetry)\n  ui            open the Fleet Studio TUI (full-screen tabbed cockpit)\n  unlock        remove a stale/garbage run lock (refuses if the holder is alive)\n  approve <id> <task>  release a park (--uphold sides with the reviewer and funds a fixed attempt; --by <name> --reason <text>); takes effect on resume";
 export declare function dispatch(cmd: string | undefined, argv: string[], commands?: CommandMap): Promise<{
     out: string;
     code: number;

package/dist/cli/index.js

@@ -28,7 +28,7 @@ import { BANNER } from "../brand.js";
 export const USAGE = `tickmarkr — spec-driven orchestration harness for AI coding agents
 usage: tickmarkr <command>
   init          guided setup + doctor; init --agent [--force] [--docs] adds agent skills/docs
-  doctor        re-probe adapters, herdr, auth; print capability matrix
+  doctor        re-probe adapters, herdr, auth; print capability matrix (--fix writes the test-runner ignore when a safe edit exists)
   fleet         interactive fleet editor (fleet --print for CI drift checks)
   compile <src> spec → .tickmarkr/graph.json (fails without acceptance criteria)
   scope <intent> draft a compiled native spec beside an answered intent (--force to overwrite)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tickmarkr",
-  "version": "1.90.0",
+  "version": "1.90.2",
   "description": "Spec in, verified work out.",
   "type": "module",
   "license": "MIT",