kushi-agents 5.4.2 → 5.4.4

package/plugin/skills/pull-onenote/SKILL.md

@@ -171,7 +171,7 @@ Every refresh writes `Evidence/<alias>/refresh-reports/<YYYY-MM-DD>-<HHMM>-oneno
 ## References (v4.4.7)
 
 - Name → ID resolution follows ..\..\instructions\fuzzy-disambiguation.instructions.md (universal fuzzy contract).
-- After this pull completes, the per-source verification gate runs: ..\..\instructions\per-source-verification-gate.instructions.md (retry once, then write FOLLOW-UPS.md).
+- After this pull completes, the per-source verification gate runs: ..\..\instructions\per-source-verification-gate.instructions.md (retry once, then write Evidence/<alias>/FOLLOW-UPS.md per v5.4.4+ per-user files doctrine; consolidated at _Consolidated/FOLLOW-UPS.md).
 
 
 ## Issue Recovery

package/plugin/skills/pull-sharepoint/SKILL.md

@@ -183,7 +183,7 @@ An entity that cannot meet the threshold is flagged `low_signal: true` in `_inde
 ## References (v4.4.7)
 
 - Name → ID resolution follows ..\..\instructions\fuzzy-disambiguation.instructions.md (universal fuzzy contract).
-- After this pull completes, the per-source verification gate runs: ..\..\instructions\per-source-verification-gate.instructions.md (retry once, then write FOLLOW-UPS.md).
+- After this pull completes, the per-source verification gate runs: ..\..\instructions\per-source-verification-gate.instructions.md (retry once, then write Evidence/<alias>/FOLLOW-UPS.md per v5.4.4+ per-user files doctrine; consolidated at _Consolidated/FOLLOW-UPS.md).
 
 
 ## Issue Recovery

package/plugin/skills/pull-teams/SKILL.md

@@ -170,7 +170,7 @@ After successful pass:
 ## References (v4.4.7)
 
 - Name → ID resolution follows ..\..\instructions\fuzzy-disambiguation.instructions.md (universal fuzzy contract).
-- After this pull completes, the per-source verification gate runs: ..\..\instructions\per-source-verification-gate.instructions.md (retry once, then write FOLLOW-UPS.md).
+- After this pull completes, the per-source verification gate runs: ..\..\instructions\per-source-verification-gate.instructions.md (retry once, then write Evidence/<alias>/FOLLOW-UPS.md per v5.4.4+ per-user files doctrine; consolidated at _Consolidated/FOLLOW-UPS.md).
 
 
 ## Issue Recovery

package/plugin/skills/refresh-project/SKILL.md

@@ -12,7 +12,7 @@ description: "USE WHEN the user says \"refresh <X>\", \"weekly extract for <X>\"
 >
 > **Per-user refresh report REQUIRED**: At end of run, write `<project>/Evidence/<alias>/refresh-reports/<YYYY-MM-DD-HHmm>_refresh.md` per `run-reports.instructions.md`. Even on a no-op run. Cite the registry: `Resolved IDs sourced from m365-mutable.json#knownSections.<projectKey>`.
 >
-> **Cleanup on resolution**: When this run resolves a previously-unknown ID/folder/section, prune the stale `no-match` / probe-trail notes from integrations.yml, m365-mutable.json, run-log, and bootstrap-status.md per `cleanup-on-resolution.instructions.md`. UPSERT the newly-resolved ID into `m365-mutable.json#knownSections.<projectKey>` mid-run.
+> **Cleanup on resolution**: When this run resolves a previously-unknown ID/folder/section, prune the stale `no-match` / probe-trail notes from integrations.yml, m365-mutable.json, run-log, and `Evidence/<alias>/bootstrap-status.md` (per-user, v5.4.4+) per `cleanup-on-resolution.instructions.md`. UPSERT the newly-resolved ID into `m365-mutable.json#knownSections.<projectKey>` mid-run.
 >
 > **Capture learnings**: Any quirk / fix / workaround discovered mid-run is appended to `<KUSHI_ROOT>/plugin/learnings/<source>.md` in the same turn per `capture-learnings.instructions.md`.
 >
@@ -83,7 +83,7 @@ For each marker (chronological order):
 2. Re-issue the canonical WorkIQ query (NOT the doubled-strict — give the first prompt another chance first; if it fails, then doubled-strict).
 3. If success → write the artifact to the current week's `Evidence/<alias>/<source>/weekly/<YYYY-MM-DD>_<source>-csc.md` per `weekly-csc.instructions.md` (v4.9.0+); or `{snapshot,stream}/` for pre-v4.9.0 legacy layout. Delete the marker. Append a `drained:` entry to the refresh report's `## Deferred-retry drain` section.
 4. If failure → increment `attempts`, update `last_attempt_at`, leave marker in place. Append a `still-deferred:` entry to the report.
-5. If `attempts >= 5` after this run → also promote to a row in `<project>/OPEN-QUESTIONS-DRAFT.md` (or `State/09_open-questions.md` on `full` profile) per the doctrine's escalation rule.
+5. If `attempts >= 5` after this run → also promote to a row in `<project>/Evidence/<alias>/OPEN-QUESTIONS-DRAFT.md` (per-user authored, v5.4.4+; cross-contributor rollup at `_Consolidated/OPEN-QUESTIONS-DRAFT.md` is owned by `consolidate-evidence`) — or `State/09_open-questions.md` on `full` profile — per the doctrine's escalation rule.
 
 **NEVER call `m365_get_*` / Graph as a fallback during drain.** A drain failure is just another deferral.
 
@@ -129,7 +129,7 @@ if gate.status == "fail":
     retry = dispatch(source, --window <same>, --retry)
     gate2 = run_verification_gate(source, retry)
     if gate2.status == "fail":
-        append_to_followups(<project>/FOLLOW-UPS.md, gate2)   # 5-field shape (D19)
+        append_to_followups(<project>/Evidence/<alias>/FOLLOW-UPS.md, gate2)   # per-user (v5.4.4+); _Consolidated/FOLLOW-UPS.md emitted by consolidate-evidence; 5-field shape (D19)
         append_to_runlog(<project>/Evidence/run-log.yml,
                          source, status: "failed-gate",
                          gate_failures: gate2.failures,
@@ -178,7 +178,7 @@ Display:
 - Per-source table: items pulled, weeks affected, errors, **gate status** (pass / retried-pass / failed-followups-written).
 - Side-by-side mutable hints written this run (per `side-by-side-config.instructions.md`).
 - New Open Questions opened/resolved/staled.
-- **Open follow-ups delta** — count of entries newly written to `<project>/FOLLOW-UPS.md` this run + count of entries auto-moved from Open → Resolved by `cleanup-on-resolution.instructions.md`.
+- **Open follow-ups delta** — count of entries newly written to `<project>/Evidence/<alias>/FOLLOW-UPS.md` this run + count of entries auto-moved from Open → Resolved by `cleanup-on-resolution.instructions.md`. Cross-contributor view: `<project>/_Consolidated/FOLLOW-UPS.md` (rebuilt by `consolidate-evidence`).
 
 ## Watermark semantics
 
@@ -205,7 +205,7 @@ Re-running refresh with the same window is safe:
 ## References (v4.4.7)
 
 - Name → ID resolution (any source) follows `..\..\instructions\fuzzy-disambiguation.instructions.md`.
-- After each per-source pull, run the gate per `..\..\instructions\per-source-verification-gate.instructions.md` (retry once → FOLLOW-UPS.md on failure).
+- After each per-source pull, run the gate per `..\..\instructions\per-source-verification-gate.instructions.md` (retry once → `Evidence/<alias>/FOLLOW-UPS.md` on failure; consolidated at `_Consolidated/FOLLOW-UPS.md`).
 - Parallel dispatch follows `..\..\instructions\parallel-execution.instructions.md` (v5.2.0+).
 - Post-pull hooks fired per source via `..\..\skills\_shared\Invoke-Hooks.ps1` (v5.2.0+).
 

package/plugin/skills/self-check/SKILL.md

@@ -78,6 +78,7 @@ Checks split into **core** (always run) and **deep** (opt-in).
 | D39.otel | OpenTelemetry export (v5.2.0+) | `otel.instructions.md` exists, `Emit-OtelSpan.ps1` helper exists, helper short-circuits when `KUSHI_OTEL_ENDPOINT` is unset. Sub-checks: `D39.otel-doctrine-exists`, `D39.otel-helper-exists`, `D39.otel-noop-when-unset`. |
 | D40.global-wiki | Global wiki + multi-wiki routing (v5.3.0+) | `global-wiki.instructions.md` + `multi-wiki-routing.instructions.md` both exist; `src/global-wiki.mjs` exports the init/promote surface; resolved `$KUSHI_GLOBAL_ROOT`'s `State/` (when initialized) carries `scope: global` frontmatter on all root pages; no `> [!warning] potential-customer-leak` callouts are unresolved. Sub-checks: `D40.global-wiki-doctrine-exists`, `D40.routing-doctrine-exists`, `D40.global-wiki-module-exists`, `D40.promote-module-exists`, `D40.global-wiki-shape`, `D40.no-customer-leak`. |
 | D41.stabilization | v5.4.0 stabilization + first-run polish | `plugin/skills/doctor/SKILL.md` + `doctor.ps1` ship; `docs/quickstart.md` exists and is ≤200 lines; `docs/migration/v4-to-v5.md` exists; `docs/audits/v5.4.0-soak-fixture.md` exists and mentions all 10 soak steps; `.github/workflows/pr-checks.yml` invokes both self-check and skill-checker with `-StrictExit`. Sub-checks: `D41.doctor-exists`, `D41.quickstart-exists`, `D41.migration-notes-exist`, `D41.soak-audit-exists`, `D41.pr-checks-strict`. |
+| D42.per-user-files-scoping | v5.4.4 per-user truth | SKILLs and prompts mentioning `bootstrap-status.md`, `FOLLOW-UPS.md`, or `OPEN-QUESTIONS-DRAFT.md` must also reference `Evidence/<alias>/` or `_Consolidated/` within ±5 lines. See `plugin/instructions/multi-user-shared-files.instructions.md`. |
 | **CSC weekly-layout checks (kushi v4.9.0)** | | gated on `Resolve-EngagementRoots` — no-ops on the kushi repo itself. |
 | D11.csc | CSC entity coverage + depth | every `Evidence/<alias>/<source>/weekly/*-csc.md` has ≥ 1 entity heading; per-source minimum bullet count + populated-section count (meetings 25/6, email 8/4, teams 6/3, onenote 10/4, sharepoint 8/3, crm 12/5, ado 8/4). Coverage-Notes-only blocks (low-signal escape) are exempt. |
 | D12.csc | CSC section order | every entity block's `###` section headings appear in the canonical order: Participants → Topics → Q&A → Who Said What → Decisions → Dates & Numbers → Action Items → Next Steps → Open Questions → Risks → Customer Asks → Artifacts → Coverage Notes. |

package/plugin/skills/self-check/run.ps1

@@ -2164,6 +2164,40 @@ process.stdout.write(JSON.stringify(out));
         }
     }
 
+    # D42.per-user-files-scoping (v5.4.4+)
+    # Three previously-shared root files are now per-user under Evidence/<alias>/.
+    # Whenever a SKILL.md or prompt file mentions one of the basenames, the same file
+    # MUST also reference 'Evidence/<alias>/' or '_Consolidated/' within a 5-line window
+    # of each occurrence so readers see the per-user scoping in context.
+    $perUserBasenames = @('bootstrap-status.md','FOLLOW-UPS.md','OPEN-QUESTIONS-DRAFT.md')
+    $perUserScopeRe   = [regex]'Evidence[\\/][^\s\)`]+[\\/]|_Consolidated[\\/]'
+    $d42Targets = @()
+    foreach ($d in $skillDirs) {
+        $s = Join-Path $d.FullName 'SKILL.md'
+        if (Test-Path $s) { $d42Targets += [pscustomobject]@{ Path=$s; Lines=Get-Content -Path $s } }
+    }
+    foreach ($p in $promptFiles) {
+        $d42Targets += [pscustomobject]@{ Path=$p.FullName; Lines=Get-Content -Path $p.FullName }
+    }
+    foreach ($t in $d42Targets) {
+        $lines = $t.Lines
+        for ($i = 0; $i -lt $lines.Count; $i++) {
+            $line = $lines[$i]
+            foreach ($bn in $perUserBasenames) {
+                if ($line -match [regex]::Escape($bn)) {
+                    # Skip when the same line already scopes the mention (per-user OR consolidated path).
+                    if ($perUserScopeRe.IsMatch($line)) { continue }
+                    # Allow when 'Evidence/<alias>/' / '_Consolidated/' appears within ±5 lines.
+                    $lo = [Math]::Max(0, $i - 5)
+                    $hi = [Math]::Min($lines.Count - 1, $i + 5)
+                    $window = ($lines[$lo..$hi] -join "`n")
+                    if ($perUserScopeRe.IsMatch($window)) { continue }
+                    Add-Finding 'D42.per-user-files-scoping' 'Stabilization' 'error' "$($t.Path):$($i+1) mentions $bn at project root without per-user (Evidence/<alias>/) or consolidated (_Consolidated/) scoping" "Reword the mention to reference Evidence/<alias>/$bn (per-user truth) or _Consolidated/$bn (auto-rollup) — see plugin/instructions/multi-user-shared-files.instructions.md." $t.Path ($i+1)
+                }
+            }
+        }
+    }
+
 # === Output ===
 if ($Targeted) {
     # Filter findings to those whose code, surface, file path, or message contain the substring.

package/src/per-user-files.test.mjs

@@ -0,0 +1,137 @@
+// v5.4.4: per-user truth + auto-consolidated root view.
+// Tests cover (a) bootstrap-project SKILL.md target path, (b) self-check D42
+// probe (positive + negative), and (c) migrate-per-user-files migration
+// script (fresh migration, idempotent no-op, defensive needs-merge).
+
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { spawnSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+import url from 'node:url';
+
+const here = path.dirname(url.fileURLToPath(import.meta.url));
+const repoRoot = path.resolve(here, '..');
+const migrate  = path.join(repoRoot, 'plugin', 'skills', 'migrate-per-user-files', 'migrate.ps1');
+const selfCheck = path.join(repoRoot, 'plugin', 'skills', 'self-check', 'run.ps1');
+
+function pwsh(args) {
+  return spawnSync('pwsh', ['-NoProfile', '-File', ...args], { encoding: 'utf8' });
+}
+
+function tmpProject(label) {
+  const root = path.join(repoRoot, '.testtmp', `per-user-files-${label}-${Date.now()}`);
+  fs.mkdirSync(root, { recursive: true });
+  fs.mkdirSync(path.join(root, '.kushi', 'config', 'user'), { recursive: true });
+  fs.writeFileSync(
+    path.join(root, '.kushi', 'config', 'user', 'project-evidence.yml'),
+    'alias: ushak\n'
+  );
+  return root;
+}
+
+test('bootstrap-project SKILL.md targets per-user bootstrap-status path', () => {
+  const skillMd = fs.readFileSync(
+    path.join(repoRoot, 'plugin', 'skills', 'bootstrap-project', 'SKILL.md'),
+    'utf8'
+  );
+  assert.ok(
+    /Evidence\/<alias>\/bootstrap-status\.md/.test(skillMd),
+    'bootstrap-project SKILL.md must reference Evidence/<alias>/bootstrap-status.md'
+  );
+  // No bare root mention of the three per-user files outside of the v5.4.4
+  // migration callout. We enforce by requiring 'Evidence/<alias>/' on every
+  // line that mentions bootstrap-status.md.
+  const lines = skillMd.split(/\r?\n/);
+  for (let i = 0; i < lines.length; i++) {
+    if (/bootstrap-status\.md/.test(lines[i])) {
+      const window = lines.slice(Math.max(0, i - 5), Math.min(lines.length, i + 6)).join('\n');
+      assert.ok(
+        /Evidence[\\/][^\s)`]+[\\/]|_Consolidated[\\/]/.test(window),
+        `bootstrap-project SKILL.md line ${i + 1} mentions bootstrap-status.md but is not per-user scoped within 5 lines`
+      );
+    }
+  }
+});
+
+test('self-check D42 probe catches a bare root mention in a synthetic skill', () => {
+  // Create a temporary skill that violates D42 and run self-check -Targeted D42 on it.
+  const stageRoot = path.join(repoRoot, '.testtmp', `d42-probe-${Date.now()}`);
+  // Mirror the minimum file shape self-check expects.
+  fs.mkdirSync(path.join(stageRoot, 'plugin', 'skills', 'sample-bad'), { recursive: true });
+  fs.mkdirSync(path.join(stageRoot, 'plugin', 'instructions'), { recursive: true });
+  fs.mkdirSync(path.join(stageRoot, 'plugin', 'prompts'), { recursive: true });
+  fs.mkdirSync(path.join(stageRoot, 'plugin', 'agents'), { recursive: true });
+  fs.writeFileSync(
+    path.join(stageRoot, 'plugin', 'skills', 'sample-bad', 'SKILL.md'),
+    `---\nname: "sample-bad"\nversion: "1.0.0"\ndescription: "USE WHEN testing."\n---\n\n# Sample bad\n\nThis skill writes FOLLOW-UPS.md at the project root.\n`
+  );
+  fs.writeFileSync(
+    path.join(stageRoot, 'plugin', 'agents', 'kushi.agent.md'),
+    `---\nname: "kushi"\nversion: "5.4.4"\n---\n`
+  );
+  try {
+    const r = pwsh([selfCheck, '-Root', stageRoot, '-Deep', '-Targeted', 'D42', '-Json']);
+    const findings = JSON.parse(r.stdout || '[]');
+    const d42 = findings.filter((f) => f.code && f.code.startsWith('D42'));
+    assert.ok(d42.length >= 1, `expected at least one D42 finding, got ${d42.length}`);
+    assert.match(d42[0].message, /FOLLOW-UPS\.md/);
+  } finally {
+    fs.rmSync(stageRoot, { recursive: true, force: true });
+  }
+});
+
+test('migrate-per-user-files: fresh migration moves all three root files', () => {
+  const root = tmpProject('fresh');
+  try {
+    fs.writeFileSync(path.join(root, 'bootstrap-status.md'), 'BS-1\n');
+    fs.writeFileSync(path.join(root, 'FOLLOW-UPS.md'), 'FU-1\n');
+    fs.writeFileSync(path.join(root, 'OPEN-QUESTIONS-DRAFT.md'), 'OQ-1\n');
+    const r = pwsh([migrate, '-ProjectRoot', root, '-Apply']);
+    assert.equal(r.status, 0, `migrate exited ${r.status}: ${r.stdout} :: ${r.stderr}`);
+    assert.ok(fs.existsSync(path.join(root, 'Evidence', 'ushak', 'bootstrap-status.md')));
+    assert.ok(fs.existsSync(path.join(root, 'Evidence', 'ushak', 'FOLLOW-UPS.md')));
+    assert.ok(fs.existsSync(path.join(root, 'Evidence', 'ushak', 'OPEN-QUESTIONS-DRAFT.md')));
+    assert.ok(!fs.existsSync(path.join(root, 'bootstrap-status.md')));
+    assert.ok(!fs.existsSync(path.join(root, 'FOLLOW-UPS.md')));
+    assert.ok(!fs.existsSync(path.join(root, 'OPEN-QUESTIONS-DRAFT.md')));
+    const runLog = fs.readFileSync(path.join(root, 'Evidence', 'run-log.yml'), 'utf8');
+    assert.match(runLog, /migrations:/);
+    assert.match(runLog, /alias: ushak/);
+  } finally {
+    fs.rmSync(root, { recursive: true, force: true });
+  }
+});
+
+test('migrate-per-user-files: re-running --apply on migrated repo is a no-op', () => {
+  const root = tmpProject('idem');
+  try {
+    fs.writeFileSync(path.join(root, 'bootstrap-status.md'), 'X\n');
+    fs.writeFileSync(path.join(root, 'FOLLOW-UPS.md'), 'Y\n');
+    fs.writeFileSync(path.join(root, 'OPEN-QUESTIONS-DRAFT.md'), 'Z\n');
+    const r1 = pwsh([migrate, '-ProjectRoot', root, '-Apply']);
+    assert.equal(r1.status, 0);
+    const r2 = pwsh([migrate, '-ProjectRoot', root, '-Apply']);
+    assert.equal(r2.status, 0);
+    assert.match(r2.stdout, /nothing-to-do/);
+  } finally {
+    fs.rmSync(root, { recursive: true, force: true });
+  }
+});
+
+test('migrate-per-user-files: refuses to overwrite when per-user copy differs', () => {
+  const root = tmpProject('merge');
+  try {
+    fs.mkdirSync(path.join(root, 'Evidence', 'ushak'), { recursive: true });
+    fs.writeFileSync(path.join(root, 'Evidence', 'ushak', 'bootstrap-status.md'), 'A\n');
+    fs.writeFileSync(path.join(root, 'bootstrap-status.md'), 'B\n');
+    const r = pwsh([migrate, '-ProjectRoot', root, '-Apply']);
+    assert.equal(r.status, 1, `expected exit 1 on needs-merge, got ${r.status}`);
+    assert.match(r.stdout, /needs-merge/);
+    // Per-user file must NOT have been overwritten.
+    assert.equal(fs.readFileSync(path.join(root, 'Evidence', 'ushak', 'bootstrap-status.md'), 'utf8'), 'A\n');
+    assert.equal(fs.readFileSync(path.join(root, 'bootstrap-status.md'), 'utf8'), 'B\n');
+  } finally {
+    fs.rmSync(root, { recursive: true, force: true });
+  }
+});