cclaw-cli 0.48.18 → 0.48.20

package/dist/content/node-hooks.js

@@ -368,13 +368,31 @@ function normalizeText(value) {
   return String(value || "").replace(/\\s+/gu, " ").trim();
 }
 
+// Mirrors \`src/tdd-cycle.ts::normalizeTddPath\`. Any change to
+// canonical normalization must be updated in BOTH places; the
+// tdd-parity test asserts matcher behavior agrees end-to-end.
 function normalizePathForMatch(rawPath) {
-  return normalizeText(rawPath)
+  return String(rawPath == null ? "" : rawPath)
+    .trim()
     .replace(/\\\\/gu, "/")
     .replace(/^\\.\\//u, "")
     .toLowerCase();
 }
 
+// Mirrors \`src/tdd-cycle.ts::pathMatchesTarget\`. Use instead of raw
+// \`===\` when checking recorded files against a target path.
+function pathMatchesTargetInline(candidate, target) {
+  const normalizedCandidate = normalizePathForMatch(candidate);
+  const normalizedTarget = normalizePathForMatch(target);
+  if (normalizedCandidate.length === 0 || normalizedTarget.length === 0) {
+    return false;
+  }
+  return (
+    normalizedCandidate === normalizedTarget ||
+    normalizedCandidate.endsWith("/" + normalizedTarget)
+  );
+}
+
 function normalizeToolName(value) {
   if (typeof value === "string" && value.trim().length > 0) return value.trim();
   if (value && typeof value === "object") {
@@ -1279,27 +1297,6 @@ async function handlePromptGuard(runtime) {
   return 0;
 }
 
-async function tddCycleCounts(stateDir, runId) {
-  const filePath = path.join(stateDir, "tdd-cycle-log.jsonl");
-  const raw = await readTextFile(filePath, "");
-  const lines = raw.split(/\\r?\\n/gu).map((line) => line.trim()).filter((line) => line.length > 0);
-  let red = 0;
-  let green = 0;
-  for (const line of lines) {
-    try {
-      const row = JSON.parse(line);
-      if (!row || typeof row !== "object" || Array.isArray(row)) continue;
-      const rowRun = typeof row.runId === "string" && row.runId.length > 0 ? row.runId : runId;
-      if (rowRun !== runId) continue;
-      if (row.phase === "red") red += 1;
-      if (row.phase === "green") green += 1;
-    } catch {
-      // ignore malformed rows
-    }
-  }
-  return { red, green };
-}
-
 // Mirrors src/knowledge-store.ts::computeCompoundReadiness — kept inline so
 // SessionStart can refresh compound-readiness.json without the CLI binary.
 // Any schema change must update src/knowledge-store.ts::computeCompoundReadiness
@@ -1458,14 +1455,7 @@ async function computeRalphLoopStatusInline(stateDir, runId) {
   };
 }
 
-function tddCycleStateFromCounts(counts) {
-  if (counts.red <= 0) return "need_red";
-  if (counts.red > counts.green) return "red_open";
-  return "green_done";
-}
-
 async function hasFailingRedEvidenceForPath(stateDir, runId, rawPath) {
-  const normalizedTarget = normalizePathForMatch(rawPath);
   const cycleRaw = await readTextFile(path.join(stateDir, "tdd-cycle-log.jsonl"), "");
   for (const line of cycleRaw.split(/\\r?\\n/gu)) {
     const trimmed = line.trim();
@@ -1484,7 +1474,10 @@ async function hasFailingRedEvidenceForPath(stateDir, runId, rawPath) {
       const files = Array.isArray(row.files) ? row.files : [];
       for (const filePath of files) {
         if (typeof filePath !== "string") continue;
-        if (normalizePathForMatch(filePath) === normalizedTarget) return true;
+        // endsWith-aware match (mirrors tdd-cycle.ts::pathMatchesTarget)
+        // — previously the inline impl used strict === which disagreed
+        // with the CLI/internal path and produced guard blind spots.
+        if (pathMatchesTargetInline(filePath, rawPath)) return true;
       }
     } catch {
       // ignore malformed line
@@ -1508,7 +1501,7 @@ async function hasFailingRedEvidenceForPath(stateDir, runId, rawPath) {
       const paths = Array.isArray(row.paths) ? row.paths : [];
       for (const filePath of paths) {
         if (typeof filePath !== "string") continue;
-        if (normalizePathForMatch(filePath) === normalizedTarget) return true;
+        if (pathMatchesTargetInline(filePath, rawPath)) return true;
       }
     } catch {
       // ignore malformed line
@@ -1667,9 +1660,14 @@ async function handleWorkflowGuard(runtime) {
         reasons.push("tdd_write_without_red_for_path");
       }
     } else if (productionPatterns.length === 0 && !isTestPayload(payloadLower, payloadPaths, testPatterns)) {
-      const counts = await tddCycleCounts(stateDir, currentRun);
-      const cycleState = tddCycleStateFromCounts(counts);
-      if (cycleState === "need_red") {
+      // Slice-aware fallback: the previous implementation used a flat
+      // red/green count which said "ok" as long as the totals balanced
+      // across ALL slices, so a closed S-1 could unlock production
+      // writes that actually belonged to a new, not-yet-red S-2. Now
+      // we reuse the canonical Ralph Loop status: if NO slice has an
+      // open RED, we block.
+      const ralphStatus = await computeRalphLoopStatusInline(stateDir, currentRun);
+      if (!ralphStatus.redOpen) {
         reasons.push("tdd_write_without_open_red");
       }
     }

package/dist/internal/tdd-red-evidence.js

@@ -2,10 +2,10 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import { RUNTIME_ROOT } from "../constants.js";
 import { readFlowState } from "../runs.js";
-import { hasFailingTestForPath, parseTddCycleLog } from "../tdd-cycle.js";
-function normalizePath(value) {
-    return value.replace(/\\/gu, "/").toLowerCase();
-}
+import { hasFailingTestForPath, parseTddCycleLog, pathMatchesTarget } from "../tdd-cycle.js";
+// normalizePath and the path matcher live in src/tdd-cycle.ts so all
+// TDD-related guards (internal CLI, runtime hook, unit tests) agree on
+// what "path X matches recorded file Y" means.
 function parseArgs(tokens) {
     const args = { quiet: false };
     for (const token of tokens) {
@@ -73,15 +73,12 @@ function parseAutoEvidence(text) {
     return out;
 }
 function hasFailingAutoEvidenceForPath(entries, targetPath, options = {}) {
-    const normalizedTarget = normalizePath(targetPath);
     for (const entry of entries) {
         if (options.runId && entry.runId !== options.runId)
             continue;
         for (const filePath of entry.paths) {
-            const normalized = normalizePath(filePath);
-            if (normalized === normalizedTarget || normalized.endsWith(`/${normalizedTarget}`)) {
+            if (pathMatchesTarget(filePath, targetPath))
                 return true;
-            }
         }
     }
     return false;
@@ -89,14 +86,40 @@ function hasFailingAutoEvidenceForPath(entries, targetPath, options = {}) {
 export async function runTddRedEvidenceCommand(projectRoot, tokens, io) {
     const args = parseArgs(tokens);
     const flowState = await readFlowState(projectRoot).catch(() => null);
+    // Strict runId scoping: a previous implementation fell back to no
+    // filter when both `--runId` and `flowState.activeRunId` were missing,
+    // which let evidence rows from past runs satisfy the current check
+    // (false positive). Now: require an explicit or inferred runId or
+    // fail loud so the caller cannot silently inherit cross-run state.
     const effectiveRunId = args.runId ?? flowState?.activeRunId;
+    if (!effectiveRunId || effectiveRunId.trim().length === 0) {
+        const reason = "tdd-red-evidence: cannot scope check — no --runId provided and " +
+            "flow-state.json has no activeRunId. Pass --runId=<id> explicitly " +
+            "or run `cclaw doctor` to reconcile state.";
+        if (!args.quiet) {
+            io.stdout.write(`${JSON.stringify({
+                ok: false,
+                path: args.targetPath,
+                runId: null,
+                error: reason,
+                sources: { tddCycleLog: false, autoEvidence: false }
+            }, null, 2)}\n`);
+        }
+        else {
+            io.stderr.write(`${reason}\n`);
+        }
+        return 2;
+    }
     const tddLogPath = path.join(projectRoot, RUNTIME_ROOT, "state", "tdd-cycle-log.jsonl");
     const autoEvidencePath = path.join(projectRoot, RUNTIME_ROOT, "state", "tdd-red-evidence.jsonl");
     let cycleLogHasRed = false;
     let autoEvidenceHasRed = false;
     try {
         const raw = await fs.readFile(tddLogPath, "utf8");
-        const entries = parseTddCycleLog(raw);
+        // Strict parse: drop malformed/underspecified rows rather than
+        // backfilling runId=active / stage=tdd defaults, which used to
+        // silently glue foreign entries to the current run.
+        const entries = parseTddCycleLog(raw, { strict: true });
         cycleLogHasRed = hasFailingTestForPath(entries, args.targetPath, {
             runId: effectiveRunId
         });
@@ -119,7 +142,7 @@ export async function runTddRedEvidenceCommand(projectRoot, tokens, io) {
         io.stdout.write(`${JSON.stringify({
             ok: hasRed,
             path: args.targetPath,
-            runId: effectiveRunId ?? null,
+            runId: effectiveRunId,
             sources: {
                 tddCycleLog: cycleLogHasRed,
                 autoEvidence: autoEvidenceHasRed

package/dist/tdd-cycle.d.ts

@@ -22,10 +22,48 @@ export interface TddCycleValidation {
     openRedSlices: string[];
     sliceCount: number;
 }
-export declare function parseTddCycleLog(text: string): TddCycleEntry[];
+export interface TddCycleParseIssue {
+    lineNumber: number;
+    reason: string;
+    rawLine: string;
+}
+export interface ParseTddCycleLogOptions {
+    /**
+     * Collect one issue per dropped/malformed line. Callers that care
+     * (doctor, red-evidence) can surface them; hooks keep soft-fail.
+     */
+    issues?: TddCycleParseIssue[];
+    /**
+     * When true, reject lines that omit required fields instead of
+     * back-filling them with defaults. Used by validation paths
+     * (`validateTddCycleOrder`, `cclaw doctor`) to avoid silently
+     * bucketing unscoped rows into "runId=active, stage=tdd". Soft paths
+     * (generated hooks) keep the legacy defaults so a half-written file
+     * never takes the session down.
+     */
+    strict?: boolean;
+}
+export declare function parseTddCycleLog(text: string, options?: ParseTddCycleLogOptions): TddCycleEntry[];
 export declare function validateTddCycleOrder(entries: TddCycleEntry[], options?: {
     runId?: string;
 }): TddCycleValidation;
+/**
+ * Canonical path normalization used by ALL TDD path-matching layers
+ * (cycle-log analysis, internal CLI `tdd-red-evidence`, and the
+ * inline runtime hook). Previously each layer had its own near-copy,
+ * which produced subtle drift (e.g. `./src/app.ts` vs `src/app.ts`
+ * differing between hook and CLI). Keep this function in one place
+ * so all callers agree.
+ */
+export declare function normalizeTddPath(value: string): string;
+/**
+ * Shared "does the recorded file path refer to the target" matcher.
+ * Uses canonical normalization plus the traditional `endsWith('/'+x)`
+ * rule so a recorded `src/app.ts` matches either `src/app.ts` or
+ * `subdir/src/app.ts` but NOT `src/app.test.ts`. All TDD path checks
+ * MUST go through this helper.
+ */
+export declare function pathMatchesTarget(candidate: string, target: string): boolean;
 export interface RalphLoopSliceState {
     slice: string;
     redCount: number;

package/dist/tdd-cycle.js

@@ -1,41 +1,77 @@
-export function parseTddCycleLog(text) {
+export function parseTddCycleLog(text, options = {}) {
+    const issues = options.issues;
+    const strict = options.strict === true;
     const out = [];
     // Strip a leading UTF-8 BOM on the whole blob so the first line parses
     // cleanly; `trim()` handles BOM on subsequent lines through the same
     // codepath (empty/whitespace-only lines are skipped).
     const normalized = text.charCodeAt(0) === 0xfeff ? text.slice(1) : text;
-    for (const raw of normalized.split(/\r?\n/)) {
+    const lines = normalized.split(/\r?\n/);
+    for (let index = 0; index < lines.length; index += 1) {
+        const raw = lines[index] ?? "";
         const line = raw.trim();
         if (!line)
             continue;
+        const lineNumber = index + 1;
+        let parsed;
         try {
-            const parsed = JSON.parse(line);
-            const phase = parsed.phase;
-            if (phase !== "red" && phase !== "green" && phase !== "refactor") {
+            parsed = JSON.parse(line);
+        }
+        catch (err) {
+            issues?.push({
+                lineNumber,
+                reason: `json-parse-failed: ${err instanceof Error ? err.message : String(err)}`,
+                rawLine: raw
+            });
+            continue;
+        }
+        const phase = parsed.phase;
+        if (phase !== "red" && phase !== "green" && phase !== "refactor") {
+            issues?.push({
+                lineNumber,
+                reason: `invalid-phase: ${JSON.stringify(parsed.phase)}`,
+                rawLine: raw
+            });
+            continue;
+        }
+        const runIdField = typeof parsed.runId === "string" ? parsed.runId : null;
+        const stageField = typeof parsed.stage === "string" ? parsed.stage : null;
+        const sliceField = typeof parsed.slice === "string" ? parsed.slice : null;
+        if (strict) {
+            const missing = [];
+            if (!runIdField)
+                missing.push("runId");
+            if (!stageField)
+                missing.push("stage");
+            if (!sliceField)
+                missing.push("slice");
+            if (missing.length > 0) {
+                issues?.push({
+                    lineNumber,
+                    reason: `missing-required-fields: ${missing.join(",")}`,
+                    rawLine: raw
+                });
                 continue;
             }
-            const entry = {
-                ts: typeof parsed.ts === "string" ? parsed.ts : "",
-                runId: typeof parsed.runId === "string" ? parsed.runId : "active",
-                stage: typeof parsed.stage === "string" ? parsed.stage : "tdd",
-                slice: typeof parsed.slice === "string" ? parsed.slice : "S-unknown",
-                phase,
-                command: typeof parsed.command === "string" ? parsed.command : "",
-                files: Array.isArray(parsed.files)
-                    ? parsed.files.filter((item) => typeof item === "string")
-                    : undefined,
-                exitCode: typeof parsed.exitCode === "number" ? parsed.exitCode : undefined,
-                note: typeof parsed.note === "string" ? parsed.note : undefined,
-                acIds: Array.isArray(parsed.acIds)
-                    ? parsed.acIds
-                        .filter((item) => typeof item === "string" && item.length > 0)
-                    : undefined
-            };
-            out.push(entry);
-        }
-        catch {
-            // skip malformed line
         }
+        const entry = {
+            ts: typeof parsed.ts === "string" ? parsed.ts : "",
+            runId: runIdField ?? "active",
+            stage: stageField ?? "tdd",
+            slice: sliceField ?? "S-unknown",
+            phase,
+            command: typeof parsed.command === "string" ? parsed.command : "",
+            files: Array.isArray(parsed.files)
+                ? parsed.files.filter((item) => typeof item === "string")
+                : undefined,
+            exitCode: typeof parsed.exitCode === "number" ? parsed.exitCode : undefined,
+            note: typeof parsed.note === "string" ? parsed.note : undefined,
+            acIds: Array.isArray(parsed.acIds)
+                ? parsed.acIds
+                    .filter((item) => typeof item === "string" && item.length > 0)
+                : undefined
+        };
+        out.push(entry);
     }
     return out;
 }
@@ -123,8 +159,40 @@ export function validateTddCycleOrder(entries, options = {}) {
         sliceCount: bySlice.size
     };
 }
+/**
+ * Canonical path normalization used by ALL TDD path-matching layers
+ * (cycle-log analysis, internal CLI `tdd-red-evidence`, and the
+ * inline runtime hook). Previously each layer had its own near-copy,
+ * which produced subtle drift (e.g. `./src/app.ts` vs `src/app.ts`
+ * differing between hook and CLI). Keep this function in one place
+ * so all callers agree.
+ */
+export function normalizeTddPath(value) {
+    const trimmed = String(value ?? "").trim();
+    return trimmed
+        .replace(/\\/gu, "/")
+        .replace(/^\.\//u, "")
+        .toLowerCase();
+}
+// Legacy alias kept for local callers below.
 function normalizePath(value) {
-    return value.replace(/\\/gu, "/").toLowerCase();
+    return normalizeTddPath(value);
+}
+/**
+ * Shared "does the recorded file path refer to the target" matcher.
+ * Uses canonical normalization plus the traditional `endsWith('/'+x)`
+ * rule so a recorded `src/app.ts` matches either `src/app.ts` or
+ * `subdir/src/app.ts` but NOT `src/app.test.ts`. All TDD path checks
+ * MUST go through this helper.
+ */
+export function pathMatchesTarget(candidate, target) {
+    const normalizedCandidate = normalizeTddPath(candidate);
+    const normalizedTarget = normalizeTddPath(target);
+    if (normalizedCandidate.length === 0 || normalizedTarget.length === 0) {
+        return false;
+    }
+    return (normalizedCandidate === normalizedTarget ||
+        normalizedCandidate.endsWith(`/${normalizedTarget}`));
 }
 /**
  * Derive a lightweight Ralph Loop summary from parsed tdd-cycle-log entries.
@@ -197,7 +265,6 @@ export function computeRalphLoopStatus(entries, options = {}) {
  * `productionPath` for the active run.
  */
 export function hasFailingTestForPath(entries, productionPath, options = {}) {
-    const normalizedTarget = normalizePath(productionPath);
     const filtered = options.runId
         ? entries.filter((entry) => entry.runId === options.runId)
         : entries;
@@ -208,10 +275,7 @@ export function hasFailingTestForPath(entries, productionPath, options = {}) {
             continue;
         if (!Array.isArray(entry.files) || entry.files.length === 0)
             continue;
-        const hasMatch = entry.files.some((filePath) => {
-            const normalized = normalizePath(filePath);
-            return normalized === normalizedTarget || normalized.endsWith(`/${normalizedTarget}`);
-        });
+        const hasMatch = entry.files.some((filePath) => pathMatchesTarget(filePath, productionPath));
         if (hasMatch) {
             return true;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cclaw-cli",
-  "version": "0.48.18",
+  "version": "0.48.20",
   "description": "Installer-first flow toolkit for coding agents",
   "type": "module",
   "bin": {