@ionivetech/mugiwara 0.6.0 → 0.6.1

package/scripts/gate-selftest.ts

@@ -54,7 +54,7 @@ if (!existsSync(join(root, 'scripts', 'validate-content.ts'))) {
     const makeBody = (sectionLines: number) => {
       let body = '---\nname: test-skill\ndescription: Test skill for section-length gate, twenty chars\n---\n\n# Test\n\n## Skip when\n\n- Test\n\n## Long Section\n\n';
       for (let i = 0; i < sectionLines; i++) body += `Line ${i + 1} of content for section length test.\n`;
-      body += '\n';
+      body += '\n## Red flags\n\n- Test flag\n';
       return body;
     };
 
@@ -262,5 +262,56 @@ if (!existsSync(brainstormSkill)) {
   }
 }
 
+// --- F2: red-flags gate — strip the heading from one skill, prove red ---
+console.log('\nF2 — red-flags gate');
+const redSkill = join(root, 'content', 'skills', 'mugiwara-workflow', 'SKILL.md');
+if (!existsSync(redSkill)) {
+  console.log('  ⚠  mugiwara-workflow/SKILL.md not found, skipping');
+} else {
+  const original = readFileSync(redSkill, 'utf8');
+  try {
+    const broken = original.replace('## Red flags', '## Disabled');
+    writeFileSync(redSkill, broken);
+    assert('missing Red flags → exit 1', false, () => run('F2-redflags', 'bun scripts/validate-content.ts'));
+  } finally {
+    writeFileSync(redSkill, original);
+    assert('restored → exit 0', true, () => run('F2-redflags', 'bun scripts/validate-content.ts --check-manifest --check-docs'));
+  }
+}
+
+// --- W1: write-boundary gate — strip the section, prove red ---
+console.log('\nW1 — write-boundary gate');
+const wbSkill = join(root, 'content', 'skills', 'mugiwara-orchestration', 'SKILL.md');
+if (!existsSync(wbSkill)) {
+  console.log('  ⚠  mugiwara-orchestration/SKILL.md not found, skipping');
+} else {
+  const original = readFileSync(wbSkill, 'utf8');
+  try {
+    const broken = original.replace('## Write boundary', '## Boundary');
+    writeFileSync(wbSkill, broken);
+    assert('missing write boundary → exit 1', false, () => run('W1-wb', 'bun scripts/validate-content.ts'));
+  } finally {
+    writeFileSync(wbSkill, original);
+    assert('restored → exit 0', true, () => run('W1-wb', 'bun scripts/validate-content.ts --check-manifest --check-docs'));
+  }
+}
+
+// --- F14: agent-count gate — flip an internal agent to user-facing, prove red ---
+console.log('\nF14 — agent-count gate');
+const countAgent = join(root, 'content', 'agents', 'eval-runner.md');
+if (!existsSync(countAgent)) {
+  console.log('  ⚠  eval-runner.md not found, skipping');
+} else {
+  const original = readFileSync(countAgent, 'utf8');
+  try {
+    const broken = original.replace('internal: true', 'internal: false');
+    writeFileSync(countAgent, broken);
+    assert('count drift → exit 1', false, () => run('F14-count', 'bun scripts/validate-content.ts'));
+  } finally {
+    writeFileSync(countAgent, original);
+    assert('restored → exit 0', true, () => run('F14-count', 'bun scripts/validate-content.ts --check-manifest --check-docs'));
+  }
+}
+
 console.log(`\n${passed} passed, ${failed} failed`);
 process.exit(failed > 0 ? 1 : 0);

package/scripts/initiative.ts

@@ -46,6 +46,15 @@ function resolvePlan(planFile: string): string {
   throw new Error(err);
 }
 
+// A plan is a markdown document. Garbage (no markdown structure) is not a
+// "solo mission" — it is a malformed plan. Heading check keeps the
+// no-sub-missions-but-valid-markdown case working as solo mission.
+function assertPlanContent(content: string, planFile: string): void {
+  if (!/^#{1,6}\s/m.test(content)) {
+    throw new Error(`Not a valid plan file: "${planFile}" — expected markdown (no heading found)`);
+  }
+}
+
 function parseSubMissions(content: string): SubMission[] {
   const lines = content.split('\n');
   let inTable = false;
@@ -93,6 +102,7 @@ function parseSubMissions(content: string): SubMission[] {
 
 function cmdStatus(planFile: string): void {
   const content = readFileSync(planFile, 'utf8');
+  assertPlanContent(content, planFile);
   const subs = parseSubMissions(content);
 
   if (subs.length === 0) {
@@ -122,6 +132,7 @@ function cmdStatus(planFile: string): void {
 
 function cmdConflictCheck(planFile: string): void {
   const content = readFileSync(planFile, 'utf8');
+  assertPlanContent(content, planFile);
   const subs = parseSubMissions(content);
 
   if (subs.length === 0) {
@@ -161,15 +172,13 @@ function cmdConflictCheck(planFile: string): void {
 }
 
 function cmdSetStatus(planFile: string, id: string, status: string): void {
-  if (!STATUS_MARKERS[id]) {
-    // `status` here is the status string from args — check it
-  }
   if (!STATUS_MARKERS[status]) {
     console.error(`Invalid status: "${status}". Use: pending, in-progress, done, blocked`);
     process.exit(1);
   }
 
   const content = readFileSync(planFile, 'utf8');
+  assertPlanContent(content, planFile);
   const lines = content.split('\n');
   const newMarker = STATUS_MARKERS[status];
   let inTable = false;
@@ -225,24 +234,29 @@ if (args.length === 0 || args.includes('--help') || args.includes('-h')) {
 
 const cmd = args[0];
 
-if (cmd === 'status') {
-  if (args.length < 2) { console.error('Missing plan-file argument.'); process.exit(1); }
-  cmdStatus(resolvePlan(args[1]));
-} else if (cmd === 'conflict-check') {
-  if (args.length < 2) { console.error('Missing plan-file argument.'); process.exit(1); }
-  cmdConflictCheck(resolvePlan(args[1]));
-} else if (cmd === 'set-status') {
-  const idIdx = args.indexOf('--id');
-  const statusIdx = args.indexOf('--status');
-  if (idIdx === -1 || statusIdx === -1 || args.length < 6) {
-    console.error('set-status requires --id <id> --status <status>');
+try {
+  if (cmd === 'status') {
+    if (args.length < 2) { console.error('Missing plan-file argument.'); process.exit(1); }
+    cmdStatus(resolvePlan(args[1]));
+  } else if (cmd === 'conflict-check') {
+    if (args.length < 2) { console.error('Missing plan-file argument.'); process.exit(1); }
+    cmdConflictCheck(resolvePlan(args[1]));
+  } else if (cmd === 'set-status') {
+    const idIdx = args.indexOf('--id');
+    const statusIdx = args.indexOf('--status');
+    if (idIdx === -1 || statusIdx === -1 || args.length < 6) {
+      console.error('set-status requires --id <id> --status <status>');
+      process.exit(1);
+    }
+    const id = args[idIdx + 1];
+    const statusVal = args[statusIdx + 1];
+    cmdSetStatus(resolvePlan(args[1]), id, statusVal);
+  } else {
+    console.error(`Unknown command: "${cmd}"`);
+    console.log(USAGE);
     process.exit(1);
   }
-  const id = args[idIdx + 1];
-  const statusVal = args[statusIdx + 1];
-  cmdSetStatus(resolvePlan(args[1]), id, statusVal);
-} else {
-  console.error(`Unknown command: "${cmd}"`);
-  console.log(USAGE);
+} catch (err) {
+  console.error(err instanceof Error ? err.message : String(err));
   process.exit(1);
 }

package/scripts/lane.sh

@@ -51,7 +51,9 @@ else
   REASON="$FILE_COUNT files"
 fi
 
-if [ "$HAS_SENSITIVE" -eq 1 ] && [ "$LANE" != "full" ]; then
+# Sensitive-path escalation is unconditional — it wins over any count-based
+# lane AND over the docs-only downgrade below (bug C9).
+if [ "$HAS_SENSITIVE" -eq 1 ]; then
   PREV="$LANE"
   LANE="full"
   REASON="sensitive paths ($SENSITIVE) — escalated from $PREV"
@@ -63,7 +65,7 @@ fi
 # Product surface for mugiwara: content/, src/, scripts/, test/, hooks/,
 # .opencode/, .claude/, evals/ — everything else is docs/config/asset.
 PRODUCT_PAT="^content/|^src/|^scripts/|^test/|^hooks/|^\.opencode/|^\.claude/|^evals/"
-if [ "$LANE" = "full" ] && [ -n "$CHANGED" ]; then
+if [ "$LANE" = "full" ] && [ "$HAS_SENSITIVE" -eq 0 ] && [ -n "$CHANGED" ]; then
   CODE_COUNT=$(echo "$CHANGED" | grep -E "$PRODUCT_PAT" 2>/dev/null | grep -c . || true)
   if [ -z "$CODE_COUNT" ] || [ "$CODE_COUNT" -eq 0 ] 2>/dev/null; then
     PREV="$LANE"

package/scripts/mission-report.sh

@@ -2,6 +2,9 @@
 # scripts/mission-report.sh — generate aggregate mission report from state.json
 # + per-mission wave artifacts. Usage: mission-report.sh <mission>
 # Output: .mugiwara/reports/YYYY-MM-DD-<mission>.md — one-file summary of all waves.
+# Enriched: mission header, token budget (WARN/STOP flag), tasks (state or plan
+# doc fallback), gate/quality excerpt from 06-closure.md, evidence file list.
+# Every section degrades to n/a when state.json or results/ artifacts are absent.
 set -u
 
 MISSION="${1:-}"
@@ -17,8 +20,6 @@ RESULTS_DIR="$MUGIWARA_DIR/results/$MISSION"
 REVIEW_DIR="$MUGIWARA_DIR/review"
 ISSUES_DIR="$MUGIWARA_DIR/issues"
 
-[ -f "$STATE_FILE" ] || { echo "mission-report: $STATE_FILE not found" >&2; exit 1; }
-
 export STATE_FILE REPORT_DIR RESULTS_DIR REVIEW_DIR ISSUES_DIR MISSION
 node << 'NODE'
 const fs = require('fs');
@@ -29,33 +30,49 @@ const reportDir = process.env.REPORT_DIR || ".mugiwara/reports";
 const resultsDir = process.env.RESULTS_DIR || ".mugiwara/results/unknown";
 const reviewDir = process.env.REVIEW_DIR || ".mugiwara/review";
 const issuesDir = process.env.ISSUES_DIR || ".mugiwara/issues";
+const mugiDir = path.dirname(stateFile);
 const mission = process.env.MISSION || "unknown";
 
-if (!fs.existsSync(stateFile)) {
-  console.error("mission-report: " + stateFile + " not found");
-  process.exit(1);
+fs.mkdirSync(reportDir, { recursive: true });
+
+// state.json is optional — degrade gracefully, never hard-exit
+let s = null;
+if (fs.existsSync(stateFile)) {
+  try {
+    s = JSON.parse(fs.readFileSync(stateFile, 'utf8'));
+  } catch (e) {
+    console.error("mission-report: warning: " + stateFile + " unreadable — degraded report");
+  }
+} else {
+  console.error("mission-report: warning: " + stateFile + " not found — degraded report");
 }
 
-fs.mkdirSync(reportDir, { recursive: true });
-const s = JSON.parse(fs.readFileSync(stateFile, 'utf8'));
+const val = (obj, key, dflt) => {
+  if (!s || !obj) return dflt;
+  const v = obj[key];
+  return (v === undefined || v === null || v === "") ? dflt : v;
+};
 
 const now = new Date().toISOString().slice(0, 10);
 const reportFile = path.join(reportDir, now + "-" + mission + ".md");
-const lane = s.lane || "unknown";
-const mode = s.mode || "guided";
-const actor = s.actor || "unknown";
-const branch = s.branch || "unknown";
-const wave = s.wave || 0;
-const filesTouched = s.files_touched || 0;
-const locDelta = s.loc_delta || 0;
-const sensitive = s.sensitive_paths || [];
-const tasks = s.tasks || {};
-const blockers = s.blockers_open || 0;
-const healCycle = s.heal_cycle || 1;
-const tokens = s.tokens_est || 0;
-const budget = s.budget || 0;
-const evidence = s.evidence || [];
-const updated = s.updated_at || new Date().toISOString();
+const lane = val(s, 'lane', 'n/a');
+const laneReason = val(s, 'lane_reason', 'n/a');
+const mode = val(s, 'mode', 'n/a');
+const actor = val(s, 'actor', 'n/a');
+const branch = val(s, 'branch', 'n/a');
+const wave = val(s, 'wave', 'n/a');
+const filesTouched = val(s, 'files_touched', 0);
+const locDelta = val(s, 'loc_delta', 0);
+const sensitive = s ? (s.sensitive_paths || []) : [];
+const tasks = s ? (s.tasks || {}) : {};
+const blockers = val(s, 'blockers_open', 0);
+const healCycle = val(s, 'heal_cycle', 1);
+const tokens = Number(val(s, 'tokens_est', 0)) || 0;
+const tokensSource = val(s, 'tokens_source', 'n/a');
+const budget = Number(val(s, 'budget', 0)) || 0;
+const budgetStatus = val(s, 'budget_status', 'n/a');
+const evidence = s ? (s.evidence || []) : [];
+const updated = val(s, 'updated_at', now);
 
 // --- wave artifact scan: results/<mission>/NN-*.md with verdict sniffing ---
 const WAVE_LABEL = {
@@ -117,26 +134,133 @@ if (fs.existsSync(issuesDir)) {
   }
 }
 
+// --- tasks: state.json counts, plan-doc fallback (savepoint-style counting) ---
+function findPlan(mDir, m) {
+  const plansDir = path.join(mDir, 'plans');
+  if (!fs.existsSync(plansDir)) return null;
+  const direct = path.join(plansDir, m + '.md');
+  if (fs.existsSync(direct)) return direct;
+  const matches = fs.readdirSync(plansDir).filter(f => f.endsWith('-' + m + '.md'));
+  return matches.length ? path.join(plansDir, matches.sort()[0]) : null;
+}
+
+let tasksDone = tasks.done || 0;
+let tasksTotal = tasks.total || 0;
+let tasksSource = "state.json";
+if (tasksTotal === 0) {
+  const plan = findPlan(mugiDir, mission);
+  if (plan) {
+    const lines = fs.readFileSync(plan, 'utf8').split(/\r?\n/);
+    const done = lines.filter(l => l.includes('[x]')).length;
+    const total = done + lines.filter(l => l.includes('[ ]')).length;
+    if (total > 0) {
+      tasksDone = done;
+      tasksTotal = total;
+      tasksSource = "plan doc";
+    }
+  }
+}
+if (tasksDone === 0 && tasksTotal === 0) { tasksDone = 'n/a'; tasksTotal = 'n/a'; }
+
+// --- token budget flag: WARN/STOP line when status is not ok ---
+let budgetFlag = "";
+if (budgetStatus === "warn" || budgetStatus === "stop") {
+  const warnAt = Math.floor(budget * 3 / 2);
+  const stopAt = budget * 3;
+  if (budgetStatus === "stop") {
+    budgetFlag = "🛑 STOP: tokens " + tokens.toLocaleString() + " ≥ 3× budget " + budget.toLocaleString() + " (stop at " + stopAt.toLocaleString() + ") — halt; escalate to Luffy";
+  } else {
+    budgetFlag = "⚠ WARN: tokens " + tokens.toLocaleString() + " ≥ 1.5× budget " + budget.toLocaleString() + " (warn at " + warnAt.toLocaleString() + ") — checkpoint before continuing";
+  }
+}
+
+// --- gate/quality excerpt: headings + body from 06-closure.md, as-is ---
+function sectionExcerpt(file, heading) {
+  if (!fs.existsSync(file)) return null;
+  const lines = fs.readFileSync(file, 'utf8').split(/\r?\n/);
+  let collecting = false;
+  let content = 0;
+  const out = [];
+  for (const l of lines) {
+    if (/^##\s/.test(l)) {
+      if (collecting) break;
+      if (l.trim() === heading) { collecting = true; out.push(l); continue; }
+    } else if (collecting) {
+      if (l.trim()) {
+        out.push(l);
+        content++;
+        if (content >= 20) break; // cap excerpt
+      }
+    }
+  }
+  return collecting ? out : null;
+}
+
+const closureFile = path.join(resultsDir, "06-closure.md");
+const gateSec = sectionExcerpt(closureFile, "## Gate verdicts");
+const testsSec = sectionExcerpt(closureFile, "## Tests");
+
+// --- evidence file list: all .md artifacts in results/<mission>/ ---
+let evidenceFiles = [];
+if (fs.existsSync(resultsDir)) {
+  evidenceFiles = fs.readdirSync(resultsDir).filter(f => f.endsWith('.md')).sort();
+}
+
+// --- assemble report ---
 let report = "# Mission: " + mission + " . " + now + "\n\n";
-report += "**Lane** " + lane + " . **Mode** " + mode + " . **Actor** " + actor + " . **Branch** " + branch + "\n\n";
+
+report += "## Mission header\n\n| Field | Value |\n|-------|-------|\n";
+report += "| Mission | " + mission + " |\n";
+report += "| Branch | " + branch + " |\n";
+report += "| Lane | " + lane + " |\n";
+report += "| Lane reason | " + laneReason + " |\n";
+report += "| Mode | " + mode + " |\n";
+report += "| Wave | " + wave + " |\n";
+report += "| Actor | " + actor + " |\n\n";
+
+report += "## Token budget\n\n| Field | Value |\n|-------|-------|\n";
+report += "| Tokens (est) | " + tokens.toLocaleString() + " |\n";
+report += "| Tokens source | " + tokensSource + " |\n";
+report += "| Budget | " + budget.toLocaleString() + " |\n";
+report += "| Budget status | " + budgetStatus + " |\n";
+if (budgetFlag) report += "\n" + budgetFlag;
+report += "\n\n";
+
+report += "## Tasks\n\n| Field | Value |\n|-------|-------|\n";
+report += "| Done | " + tasksDone + " |\n";
+report += "| Total | " + tasksTotal + " |\n";
+report += "| Source | " + tasksSource + " |\n\n";
 
 report += "## What changed\n\n";
 report += filesTouched + " files, +" + locDelta + " LOC";
 if (sensitive.length) report += "\nSensitive paths: " + sensitive.join(", ");
+report += "\n\n";
 
-report += "\n\n## Waves\n\n| Wave | Artifact | Verdict |\n|------|----------|---------|";
+report += "## Waves\n\n| Wave | Artifact | Verdict |\n|------|----------|---------|";
 if (waveRows.length) {
   for (const r of waveRows) report += "\n| " + r.label + " | `" + r.file + "` | " + r.verdict + " |";
 } else {
   report += "\n| (no wave artifacts found in `" + resultsDir + "`) | | |";
 }
+report += "\n\n";
+
+report += "## Gate & quality\n\n";
+if (gateSec) report += gateSec.join("\n") + "\n";
+if (testsSec) report += (gateSec ? "\n" : "") + testsSec.join("\n") + "\n";
+if (!gateSec && !testsSec) report += "n/a\n";
+report += "\n";
 
-report += "\n\n## Review & blockers\n\n";
+report += "## Evidence files\n\n";
+report += evidenceFiles.length ? evidenceFiles.map(f => "- " + f).join("\n") : "n/a";
+report += "\n\n";
+
+report += "## Review & blockers\n\n";
 report += "Review + security files: " + (reviewFiles.length ? reviewFiles.join(", ") : "none") + "\n";
 report += "Findings: " + reviewFindings + "\n";
 report += "Blocker ledger rows: " + issueRows.length + (issueRows.length ? "\n" + issueRows.map(r => "- " + r).join("\n") : "");
+report += "\n\n";
 
-report += "\n\n## State\n\n| Field | Value |\n|-------|-------|\n";
+report += "## State\n\n| Field | Value |\n|-------|-------|\n";
 report += "| Wave | " + wave + " |\n";
 report += "| Tasks | " + (tasks.done || 0) + "/" + (tasks.total || 0) + " done |\n";
 report += "| Blockers open | " + blockers + " |\n";
@@ -144,9 +268,8 @@ report += "| Heal cycles | " + healCycle + " |\n";
 report += "| Tokens used | " + tokens.toLocaleString() + " / " + budget.toLocaleString() + " |\n\n";
 
 report += "## Evidence\n\n";
-for (const e of evidence) report += "- " + e + "\n";
-
-report += "\n## Updated\n\n" + updated + "\n";
+report += evidence.length ? evidence.map(e => "- " + e).join("\n") : "n/a";
+report += "\n\n## Updated\n\n" + updated + "\n";
 
 fs.writeFileSync(reportFile, report);
 console.log("\u2713 mission report: " + reportFile);

package/scripts/savepoint.sh

@@ -31,6 +31,11 @@ fi
 case "$MISSION" in
   ""|*[!a-zA-Z0-9._-]*) die "invalid mission name \"$MISSION\" (allowlist: [a-zA-Z0-9._-])" ;;
 esac
+# dot-only names (".", "..", "...") pass the char allowlist but resolve upward
+# through join(...,"..") — reject them before any path is built from MISSION.
+if [[ "$MISSION" =~ ^\.+$ ]]; then
+  die "invalid mission name \"$MISSION\" (allowlist: [a-zA-Z0-9._-], not a dot-path)"
+fi
 
 # per-branch state file when --branch used
 BRANCH_SLUG=$(echo "$BRANCH" | tr '/' '-')
@@ -59,20 +64,35 @@ if [ "$BASE_SHA" != "unknown" ]; then
 fi
 [ -z "$LOC_DELTA" ] && LOC_DELTA=0
 
-SENSITIVE_PATTERNS="auth/|payment/|billing/|crypto/|secrets/|\.env|config/|migration/|\.sql$|schema\.|\.prisma$"
+SENSITIVE_PATTERNS="auth/|payment/|billing/|crypto/|secrets/|\.env$|config/.*key|migration/|\.sql$|schema\.|\.prisma$|\.terraform|\.tf$"
 SENSITIVE_PATHS=$(echo "$CHANGED_FILES" | grep -E "$SENSITIVE_PATTERNS" 2>/dev/null | tr '\n' ',' | sed 's/,$//' || true)
 
 LANE="direct"
 LANE_REASON=""
-if [ "$FILES_TOUCHED" -ge 9 ] 2>/dev/null || [ -n "$SENSITIVE_PATHS" ]; then
+# Sensitive-path escalation is unconditional — it wins over any count-based
+# lane AND over the docs-only downgrade below (bug C9).
+if [ -n "$SENSITIVE_PATHS" ]; then
+  LANE="full"
+  LANE_REASON="sensitive paths: $SENSITIVE_PATHS"
+elif [ "$FILES_TOUCHED" -ge 9 ] 2>/dev/null; then
   LANE="full"
-  LANE_REASON="$( [ -n "$SENSITIVE_PATHS" ] && echo "sensitive paths: $SENSITIVE_PATHS" || echo "$FILES_TOUCHED files")"
+  LANE_REASON="$FILES_TOUCHED files"
 elif [ "$FILES_TOUCHED" -ge 3 ] 2>/dev/null; then
   LANE="standard"
   LANE_REASON="$FILES_TOUCHED files"
 elif [ "$FILES_TOUCHED" -ge 2 ] 2>/dev/null; then
   LANE="lean"
   LANE_REASON="$FILES_TOUCHED files"
+elif [ "$FILES_TOUCHED" -eq 1 ] 2>/dev/null; then
+  # 1-file rule mirrors lane.sh: >=20 added LOC -> lean, else direct
+  ADDED=$(git diff --numstat "$BASE_SHA"..HEAD 2>/dev/null | awk '{s+=$1} END {print s+0}')
+  if [ "${ADDED:-0}" -ge 20 ] 2>/dev/null; then
+    LANE="lean"
+    LANE_REASON="1 file, $ADDED LOC"
+  else
+    LANE="direct"
+    LANE_REASON="1 file, <20 LOC"
+  fi
 else
   LANE="direct"
   LANE_REASON="$FILES_TOUCHED file(s) under 20 LOC"
@@ -82,7 +102,7 @@ fi
 # surface never escalate to full from file count alone; sensitive-path
 # escalation above still wins.
 PRODUCT_PAT="^content/|^src/|^scripts/|^test/|^hooks/|^\.opencode/|^\.claude/|^evals/"
-if [ "$LANE" = "full" ] && [ -n "$CHANGED_FILES" ]; then
+if [ "$LANE" = "full" ] && [ -z "$SENSITIVE_PATHS" ] && [ -n "$CHANGED_FILES" ]; then
   CODE_COUNT=$(echo "$CHANGED_FILES" | grep -E "$PRODUCT_PAT" 2>/dev/null | grep -c . || true)
   if [ -z "$CODE_COUNT" ] || [ "$CODE_COUNT" -eq 0 ] 2>/dev/null; then
     PREV="$LANE"
@@ -91,20 +111,26 @@ if [ "$LANE" = "full" ] && [ -n "$CHANGED_FILES" ]; then
   fi
 fi
 
-# task counts from plan doc
-PLAN_FILE=$(ls "$MUGIWARA_DIR/plans/${MISSION}.md" 2>/dev/null || true)
+# task counts from plan doc — plan is written date-prefixed (plans/YYYY-MM-DD-<mission>.md)
+# or bare (plans/<mission>.md); glob both, first match wins.
+PLAN_FILE=$(ls "$MUGIWARA_DIR"/plans/${MISSION}.md "$MUGIWARA_DIR"/plans/*-${MISSION}.md 2>/dev/null | head -1 || true)
 TASKS_DONE=0
 TASKS_TOTAL=0
 if [ -n "$PLAN_FILE" ] && [ -f "$PLAN_FILE" ]; then
-  TASKS_TOTAL=$(grep -c '\[ \]' "$PLAN_FILE" 2>/dev/null || echo 0)
-  TASKS_DONE=$(grep -c '\[x\]' "$PLAN_FILE" 2>/dev/null || echo 0)
+  # total counts ALL task lines (checked + unchecked); done counts checked only.
+  # A fully-completed plan must read total=N done=N, never total=0 (the old
+  # unchecked-only grep degenerated a done plan to tasks.total=0).
+  TASKS_TOTAL=$(grep -cE '^\s*-\s*\[[ xX]\]' "$PLAN_FILE" 2>/dev/null || true)
+  TASKS_DONE=$(grep -c '\[x\]' "$PLAN_FILE" 2>/dev/null || true)
 fi
 
 # blocker count
 BLOCKERS_FILE=$(ls "$MUGIWARA_DIR/issues/${MISSION}-blockers.md" 2>/dev/null || true)
 BLOCKERS_OPEN=0
 if [ -n "$BLOCKERS_FILE" ] && [ -f "$BLOCKERS_FILE" ]; then
-  BLOCKERS_OPEN=$(grep -c '|' "$BLOCKERS_FILE" 2>/dev/null || echo 0)
+  # data rows start with a wave number; header "| wave |" and separator
+  # "|---|" are excluded by the ^\| ?[0-9]+ \| pattern
+  BLOCKERS_OPEN=$(grep -cE '^\| ?[0-9]+ ?\|' "$BLOCKERS_FILE" 2>/dev/null || true)
 fi
 
 # heal cycle — count WAVE-8 banner occurrences in the trace, not the word
@@ -113,7 +139,7 @@ fi
 HEAL_CYCLE=1
 TRACE_FILE=$(ls "$MUGIWARA_DIR/results/${MISSION}/"*trace*.md 2>/dev/null | head -1 || true)
 if [ -n "$TRACE_FILE" ] && [ -f "$TRACE_FILE" ]; then
-  HEAL_COUNT=$(grep -ci '^.*Wave 8.*\|wave 8' "$TRACE_FILE" 2>/dev/null || echo 0)
+  HEAL_COUNT=$(grep -ci '^.*Wave 8.*\|wave 8' "$TRACE_FILE" 2>/dev/null || true)
   HEAL_CYCLE=$((HEAL_COUNT + 1))
 fi
 
@@ -132,8 +158,25 @@ if [ -f package.json ]; then
   [ -f "$PKG_JSON" ] && SKILL_VERSION=$(node -e "try{console.log(JSON.parse(require('fs').readFileSync(process.argv[1],'utf8')).version.split('.')[0])}catch(e){console.log('1')}" "$PKG_JSON" 2>/dev/null || echo "1")
 fi
 
-# tokens from env var (harness exports estimated tokens consumed)
-TOKENS_EST=${MUGIWARA_TOKENS:-0}
+# tokens proxy (F7): deterministic estimate when the harness does not report
+# real usage. Monotonic beats precise — LANE_BASE stands in for the skills
+# loaded this lane; loc_delta and written-artifact words scale with growth.
+# MUGIWARA_TOKENS overrides as the reported value.
+LANE_BASE=0
+case "$LANE" in
+  lean) LANE_BASE=1500 ;;
+  standard) LANE_BASE=4000 ;;
+  full) LANE_BASE=9000 ;;
+  spike) LANE_BASE=1000 ;;
+esac
+DOC_WORDS=$(cat "$MUGIWARA_DIR"/results/${MISSION}/*.md "$MUGIWARA_DIR"/plans/${MISSION}.md "$MUGIWARA_DIR"/plans/*-${MISSION}.md "$MUGIWARA_DIR"/spec/${MISSION}.md "$MUGIWARA_DIR"/spec/*-${MISSION}.md "$MUGIWARA_DIR"/logs/${MISSION}.md "$MUGIWARA_DIR"/logs/*-${MISSION}.md 2>/dev/null | wc -w | tr -d ' ')
+LOC_TOKENS=$(( LOC_DELTA > 0 ? LOC_DELTA * 12 : 0 ))
+TOKENS_SOURCE="computed"
+TOKENS_EST=$(( LANE_BASE + DOC_WORDS * 135 / 100 + LOC_TOKENS ))
+if [ -n "${MUGIWARA_TOKENS:-}" ]; then
+  TOKENS_EST="${MUGIWARA_TOKENS}"
+  TOKENS_SOURCE="reported"
+fi
 
 # budget per lane
 BUDGET=0
@@ -191,6 +234,7 @@ const data = {
   blockers_open: parseInt(process.argv[15], 10),
   heal_cycle: parseInt(process.argv[16], 10),
   tokens_est: parseInt(process.argv[17], 10) || 0,
+  tokens_source: process.argv[26] || 'computed',
   budget: parseInt(process.argv[18], 10) || 0,
   budget_status: process.argv[19],
   skill_version: process.argv[20],
@@ -205,7 +249,7 @@ require('fs').writeFileSync(process.argv[23], JSON.stringify(data, null, 2) + '\
   "$BLOCKERS_OPEN" "$HEAL_CYCLE" "$TOKENS_EST" "$BUDGET" \
   "$STATUS" "$SKILL_VERSION" "$EVIDENCE" \
   "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
-  "$STATE_FILE" "$LANE_PREV" "$LANE_ROSE"
+  "$STATE_FILE" "$LANE_PREV" "$LANE_ROSE" "$TOKENS_SOURCE"
 
 if [ "$LANE_ROSE" = true ]; then
   echo "⚠ LANE ROSE: $LANE_PREV → $LANE ($LANE_REASON) — escalate per check-in protocol"

package/scripts/validate-content.ts

@@ -27,6 +27,7 @@ function checkFile(file: string, wantName: string, kind: 'skill' | 'agent'): Rec
     if (bullets.length === 0) errors.push(`skill ${file}: "## Skip when" needs ≥1 bullet`);
     if (bullets.length > 4) errors.push(`skill ${file}: "## Skip when" block exceeds 4 bullets`);
   }
+  if (kind === 'skill' && !body.includes('## Red flags')) errors.push(`skill ${file}: missing required "## Red flags" block`);
   if (kind === 'skill') {
     const lines = body.split(/\r?\n/);
     const headingRe = /^## /;
@@ -145,6 +146,25 @@ for (const f of agentFiles) {
   if (scope === 'source' && !SOURCE_SCOPED.has(name)) errors.push(`agent ${f}: only zoro-execution and brook-healing may declare write-scope: source`);
 }
 
+// --- write-boundary gate (W1): the hub skill must carry the refusal rule ---
+const hubFile = join(root, 'skills', 'mugiwara-orchestration', 'SKILL.md');
+if (existsSync(hubFile) && !readFileSync(hubFile, 'utf8').includes('## Write boundary')) {
+  errors.push('skill mugiwara-orchestration: missing "## Write boundary" section (non-executors refuse source writes)');
+}
+
+// --- agent-count gate (F14): user-facing/internal split derivable from content/agents/ ---
+const internalAgents = agentFiles.filter(f => {
+  const parsed = parseFrontmatter(readFileSync(join(agentDir, f), 'utf8'));
+  return parsed.data.internal === 'true';
+});
+const canonicalCount = `${agentFiles.length - internalAgents.length} agents (+${internalAgents.length} internal)`;
+for (const doc of ['README.md', 'docs/index.md', 'docs/concepts/agents.md']) {
+  const p = join(import.meta.dirname, '..', doc);
+  if (existsSync(p) && !readFileSync(p, 'utf8').includes(canonicalCount)) {
+    errors.push(`${doc}: missing canonical agent count "${canonicalCount}"`);
+  }
+}
+
 // --- hub-rule gate (F3): every non-Luffy agent carries both hub sections ---
 for (const f of agentFiles) {
   const name = f.replace(/\.md$/, '');