simt-dev 0.7.1 → 0.8.0

package/src/commands/mcp.mjs

@@ -9,17 +9,14 @@
 // misconfigured the command needs to be able to ask what it exposes without hanging, and
 // a command that only speaks when spoken to cannot answer that.
 
-import { readFile } from 'node:fs/promises';
-import { fileURLToPath } from 'node:url';
-import { dirname, join } from 'node:path';
-
 import { EXIT, emit, emitJson, fail, isJson } from '../output/index.mjs';
 import { TOOLS } from '../mcp/tools.mjs';
 import { PROTOCOL_VERSION, SUPPORTED_VERSIONS, serve } from '../mcp/server.mjs';
 import { CLI } from '../name.mjs';
+import { packageVersion } from '../package-version.mjs';
 
 export async function mcpCommand(positional, flags) {
-  const { version } = await packageVersion();
+  const version = packageVersion();
 
   if (flags.list === true) {
     if (isJson(flags)) {
@@ -62,16 +59,4 @@ export async function mcpCommand(positional, flags) {
   } catch (error) {
     return fail(`mcp transport failed: ${error.message}`, EXIT.FAIL, `run: ${CLI} mcp --list to check the surface loads`);
   }
-}
-
-async function packageVersion() {
-  try {
-    const here = dirname(fileURLToPath(import.meta.url));
-    const pkg = JSON.parse(await readFile(join(here, '..', '..', 'package.json'), 'utf8'));
-    return { version: pkg.version };
-  } catch {
-    // A missing version must not stop the server: the client already knows which
-    // build it launched, and a hard failure here would look like a protocol bug.
-    return { version: 'unknown' };
-  }
 }

package/src/commands/repoindex.mjs

@@ -2,12 +2,11 @@
 // content: it is gitignored, and a second run with the same blobs writes the same
 // rows (ADR-089).
 
-import { execFile } from 'node:child_process';
-
 import { EXIT, emit, emitJson, fail, isJson } from '../output/index.mjs';
 import { CLI } from '../name.mjs';
 import { JSONL_FILE, SQLITE_FILE, reindex } from '../index/store.mjs';
 import { commandRoot } from '../repo-root.mjs';
+import { git } from '../sys/git.mjs';
 
 export async function indexCommand(args, flags) {
   if (args.length > 0) return fail(`unknown index argument ${args[0]}`, EXIT.USAGE, `run: ${CLI} index`);
@@ -51,10 +50,11 @@ export async function indexCommand(args, flags) {
   return EXIT.OK;
 }
 
-function isIgnored(root, file) {
-  return new Promise((resolve) => {
-    execFile('git', ['check-ignore', '-q', '--', file], { cwd: root }, (error) => {
-      resolve(!error);
-    });
-  });
+async function isIgnored(root, file) {
+  try {
+    await git(root, ['check-ignore', '-q', '--', file]);
+    return true;
+  } catch {
+    return false;
+  }
 }

package/src/commands/rules.mjs

@@ -18,7 +18,8 @@ import { readdir } from 'node:fs/promises';
 import { repoContext } from '../context.mjs';
 import { join } from 'node:path';
 import { renderDecisionsIndex } from '../decisions/index-doc.mjs';
-import { commitJournal, journaledWriteFile } from '../journal.mjs';
+import { applyPlan, change } from '../write/plan.mjs';
+import { readBefore } from '../diff.mjs';
 import { EXIT, emit, emitJson, fail, isJson } from '../output/index.mjs';
 import { loadRules, select } from '../projection/project.mjs';
 import { loadMdcRules } from '../projection/mdc.mjs';
@@ -529,9 +530,12 @@ export async function decisionsCommand(args, flags) {
   // table - the index is not internal state even though it is generated.
   if (flags.yes === true) {
     const rootDir = root ?? process.cwd();
-    const journal = [];
-    await journaledWriteFile(rootDir, journal, join(rootDir, 'docs', 'decisions-index.md'), renderDecisionsIndex(rows));
-    await commitJournal(rootDir, 'rules decisions', journal);
+    const index = join(rootDir, 'docs', 'decisions-index.md');
+    await applyPlan(
+      rootDir,
+      [change({ path: index, before: await readBefore(index), after: renderDecisionsIndex(rows), owner: 'rules decisions', reason: 'the index follows the decision files' })],
+      { mode: { apply: true }, label: 'rules decisions' },
+    );
     emit(`wrote docs/decisions-index.md (${rows.length} decisions)`);
     return EXIT.OK;
   }

package/src/commands/shared.mjs

@@ -29,6 +29,7 @@ import {
 } from '../projection/shared.mjs';
 import { buildManifest, declaredShared, manifestPath, manifestText, readManifest, writeManifest } from '../projection/manifest.mjs';
 import { desiredRegion } from '../projection/rules.mjs';
+import { plainNumber } from '../util/fs.mjs';
 
 /**
  * Everything `plan` and `install` both need, computed once.
@@ -76,9 +77,9 @@ async function gather(flags) {
  */
 function divergentNote(d, total) {
   if (d.reason === 'coverage') {
-    return `${d.id}  carried by ${plain(d.roots.length)} of ${plain(total)} repositories, so each region keeps its own`;
+    return `${d.id}  carried by ${plainNumber(d.roots.length)} of ${plainNumber(total)} repositories, so each region keeps its own`;
   }
-  return `${d.id}  rendered differently in ${plain(d.roots.length)} repositories, so each region keeps its own`;
+  return `${d.id}  rendered differently in ${plainNumber(d.roots.length)} repositories, so each region keeps its own`;
 }
 
 /** Why a selected rule cannot leave any region, in the words its reason deserves. */
@@ -98,7 +99,7 @@ function excludedNote({ id, why }) {
 function capNote(target, bytes) {
   if (target.path === null || target.cap === null || bytes <= target.cap.bytes) return null;
   return [
-    `${target.surface}  ${plain(bytes)} B exceeds the ${plain(target.cap.bytes)} B it allows for ${target.cap.appliesTo}`,
+    `${target.surface}  ${plainNumber(bytes)} B exceeds the ${plainNumber(target.cap.bytes)} B it allows for ${target.cap.appliesTo}`,
     `  ${target.cap.why}`,
     `  the rules above that limit are not read; move rules this workspace does not share back into each region, or drop the shared copy for this surface`,
   ].join('\n');
@@ -157,10 +158,10 @@ export async function sharedPlanCommand(_args, flags) {
   }
 
   const lines = [
-    `shared   ${target.root}  ${plain(roots.length)} repositories  (${target.source})`,
-    `rules    ${plain(shared.length)} of ${plain(candidates)} ids carried once  ${plain(bytes)} B`,
+    `shared   ${target.root}  ${plainNumber(roots.length)} repositories  (${target.source})`,
+    `rules    ${plainNumber(shared.length)} of ${plainNumber(candidates)} ids carried once  ${plainNumber(bytes)} B`,
   ];
-  for (const r of shared) lines.push(`  ${r.id}  ${r.priority ?? 'unclassified'}  ${plain(Buffer.byteLength(r.rendered))} B  ${r.source}`);
+  for (const r of shared) lines.push(`  ${r.id}  ${r.priority ?? 'unclassified'}  ${plainNumber(Buffer.byteLength(r.rendered))} B  ${r.source}`);
   if (divergent.length > 0) {
     // Named, not summarised: a reader who expected a python rule here and did not get it
     // is owed the reason, and "divergent: 2" is not a reason.
@@ -171,9 +172,9 @@ export async function sharedPlanCommand(_args, flags) {
     lines.push(`left in every region  ${excluded.length} rule(s) no root can hand over:`);
     for (const e of excluded) lines.push(`  ${excludedNote(e)}`);
   }
-  lines.push(`saves    ${plain(save)} B across ${plain(roots.length)} regions`);
+  lines.push(`saves    ${plainNumber(save)} B across ${plainNumber(roots.length)} regions`);
   for (const r of rows) {
-    lines.push(`  ${r.name}  ${plain(r.bytes)} B  ${r.mode}  ${r.rules.length > 0 ? r.rules.join(', ') : '(carries nothing extra)'}`);
+    lines.push(`  ${r.name}  ${plainNumber(r.bytes)} B  ${r.mode}  ${r.rules.length > 0 ? r.rules.join(', ') : '(carries nothing extra)'}`);
   }
   lines.push('writes');
   for (const t of targets) {
@@ -297,7 +298,7 @@ export async function sharedInstallCommand(_args, flags) {
     }
     emit(
       [
-        `shared   ${plain(shared.length)} rule(s), ${plain(Buffer.byteLength(sharedBody(shared)))} B`,
+        `shared   ${plainNumber(shared.length)} rule(s), ${plainNumber(Buffer.byteLength(sharedBody(shared)))} B`,
         ...states.map((s) =>
           s.path === null
             ? `  paste     ${s.surface}  no user-level file is recorded for it`
@@ -326,8 +327,8 @@ export async function sharedInstallCommand(_args, flags) {
   }
 
   const lines = [
-    `shared   installed for ${plain(roots.length)} repositories`,
-    `rules    ${plain(shared.length)} carried once  ${shared.map((r) => r.id).join(', ')}`,
+    `shared   installed for ${plainNumber(roots.length)} repositories`,
+    `rules    ${plainNumber(shared.length)} carried once  ${shared.map((r) => r.id).join(', ')}`,
   ];
   for (const w of written) {
     // `inject`'s word for a file with no region in it is "added"; the word for a file
@@ -417,11 +418,6 @@ function describeShared(state, targets) {
   return `${targets.length} user-level file(s) carry every rule this repository handed over`;
 }
 
-/** `1234567`, never `1,234,567`: two machines must print the same bytes (ADR-013). */
-function plain(n) {
-  return String(n);
-}
-
 /** The directory name, for a line that has to name several repositories at once. */
 function basename(path) {
   return path.split('/').filter(Boolean).pop() ?? path;

package/src/commands/skills.mjs

@@ -20,12 +20,14 @@ import { bodyFile, sourcePath } from '../resolve/body.mjs';
 import { unknownSkills, scoreCorpus } from '../resolve/eval.mjs';
 import { PACKAGE_ROOT, resolveWorkspace, WORKSPACE_REMEDY } from '../workspace.mjs';
 import { fingerprint } from '../resolve/fingerprint.mjs';
-import { tokenize, rankSkills, closure, selectWithinBudget, resolveAlias, scoreSkill, selectionVerdict, stackCompatible } from '../resolve/resolve.mjs';
+import { rankSkills, closure, selectWithinBudget, resolveAlias, scoreSkill, selectionVerdict, stackCompatible } from '../resolve/resolve.mjs';
+import { tokenize } from '../text/tokens.mjs';
 import { localSkillNodes } from '../resolve/local.mjs';
 import { nearMatches } from '../resolve/near.mjs';
 import { CLI } from '../name.mjs';
 import { parsePathList } from '../argv.mjs';
 import { commandRoot } from '../repo-root.mjs';
+import { gitText } from '../sys/git.mjs';
 
 export { parsePathList };
 
@@ -34,11 +36,8 @@ const DEFAULT_BUDGET = 20480;
 /** git status paths, so path signals come from the real diff. */
 export async function dirtyPaths(root) {
   try {
-    const { execFile } = await import('node:child_process');
-    const { promisify } = await import('node:util');
-    const run = promisify(execFile);
-    const { stdout } = await run('git', ['-C', root, 'status', '--porcelain=v1'], { maxBuffer: 8 << 20 });
-    return stdout
+    const stdout = await gitText(root, ['status', '--porcelain=v1'], { maxBuffer: 8 << 20 });
+    return (stdout ?? '')
       .split('\n')
       .filter(Boolean)
       .map((line) => line.slice(3).trim())

package/src/commands/skillscompile.mjs

@@ -14,9 +14,9 @@ import {
   evaluateSkillTriggers,
   proposeSkillDescription,
 } from '../graph/compile.mjs';
-import { loadRunRecords } from '../bench/report.mjs';
-import { extractPatchFiles } from '../bench/grade.mjs';
-import { resolveVaultDir } from '../bench/mine.mjs';
+import { loadRunRecords } from '../measure/records.mjs';
+import { extractPatchFiles } from '../testing/patches.mjs';
+import { resolveVaultDir } from '../testing/vault.mjs';
 import { locateSource, sourceHeldLocally } from '../resolve/source.mjs';
 import { nearMatches } from '../resolve/near.mjs';
 import { resolveWorkspace, WORKSPACE_REMEDY } from '../workspace.mjs';

package/src/commands/skillsinstall.mjs

@@ -39,6 +39,7 @@ import { CLI } from '../name.mjs';
 import { MANIFEST_FILE } from '../name.mjs';
 import { nameProblems } from '../graph/spec.mjs';
 import { commandRoot } from '../repo-root.mjs';
+import { parseFrontmatter } from '../text/frontmatter.mjs';
 
 /**
  * Where skills live in this repo. The estate already has a convention - a
@@ -498,13 +499,13 @@ async function dirEntries(root) {
  */
 export async function wrapFlat(src, name) {
   const text = await readFile(src, 'utf8');
-  const fm = /^---\n([\s\S]*?)\n---\n?/.exec(text);
-  if (!fm) return `---\nname: ${name}\n---\n\n${text.trim()}\n`;
-  const keys = fm[1]
+  const { front, block } = parseFrontmatter(text);
+  if (front === null) return `---\nname: ${name}\n---\n\n${text.trim()}\n`;
+  const keys = front
     .split('\n')
     .filter((l) => !/^name:/.test(l))
     .join('\n');
-  return `---\nname: ${name}\n${keys}\n---\n\n${text.slice(fm[0].length).trim()}\n`;
+  return `---\nname: ${name}\n${keys}\n---\n\n${text.slice(block.length).trim()}\n`;
 }
 
 async function fileSha(path) {