@vodmal/vdx-cli 0.25.0 → 0.26.0

package/src/mcp-server.ts

@@ -8,12 +8,13 @@ import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
 import * as TOML from 'smol-toml';
 
 import { loadRubric } from './rubric.ts';
-import { loadManifest, loadOverrides } from './manifest.ts';
+import { loadManifest, loadOverrides, manifestTable } from './manifest.ts';
 import { autoDetectStack, readToml, type Ctx } from './facts.ts';
 import { audit } from './audit.ts';
 import { reportJson, reportMarkdown } from './report.ts';
 import { DEFAULT_BASELINE, STANDARD_VERBS, type Verb } from './init.ts';
 import { resolveDefaultRubric } from './defaults.ts';
+import { at, dict, errorMessage, isStringList, str, type Dict } from './narrow.ts';
 
 const DEFAULT_RUBRIC = resolveDefaultRubric();
 
@@ -30,18 +31,16 @@ function freshCtx(): Ctx {
   return { projectRoot: PROJECT_ROOT, stack, cache: new Map() };
 }
 
-function readMiseToml(): any {
+function readMiseToml(): unknown {
   return readToml(freshCtx(), 'mise.toml');
 }
 
-function getVdxBlock(): any {
-  const t = readMiseToml();
-  return t?.vdx ?? null;
+function getVdxBlock(): Dict | null {
+  return manifestTable(readMiseToml())?.table ?? null;
 }
 
-function getTasks(): Record<string, any> {
-  const t = readMiseToml();
-  return (t?.tasks as Record<string, any>) ?? {};
+function getTasks(): Dict {
+  return dict(at(readMiseToml(), 'tasks')) ?? {};
 }
 
 interface RunResult {
@@ -61,10 +60,10 @@ function spawnVerb(verb: Verb, extraArgs: string[]): Promise<RunResult> {
     });
     let stdout = '';
     let stderr = '';
-    child.stdout.on('data', (b) => {
+    child.stdout.on('data', (b: Buffer) => {
       stdout += b.toString();
     });
-    child.stderr.on('data', (b) => {
+    child.stderr.on('data', (b: Buffer) => {
       stderr += b.toString();
     });
     child.on('error', (e) => {
@@ -91,32 +90,33 @@ function spawnVerb(verb: Verb, extraArgs: string[]): Promise<RunResult> {
 function buildCapabilities() {
   const vdxBlock = getVdxBlock();
   const tasks = getTasks();
-  const verbsList = (vdxBlock?.verbs as string[] | undefined) ?? STANDARD_VERBS.slice();
+  const declared = vdxBlock?.['verbs'];
+  const verbsList = isStringList(declared) ? declared : STANDARD_VERBS.slice();
   const verbs = verbsList.map((name) => {
     const t = tasks[name];
-    const nativeCommand = t && typeof t === 'object' && typeof t.run === 'string' ? t.run : null;
     return {
       name,
       has_manifest: Boolean(t),
-      native_command: nativeCommand,
+      native_command: str(at(t, 'run')) ?? null,
     };
   });
 
-  const sharedInfra = vdxBlock?.shared_infra
+  const infra = dict(vdxBlock?.['shared_infra']);
+  const sharedInfra = infra
     ? {
-        provider: String(vdxBlock.shared_infra.provider ?? ''),
-        precheck: Boolean(vdxBlock.shared_infra.precheck),
+        provider: str(infra['provider']) ?? '',
+        precheck: Boolean(infra['precheck']),
         is_running: false,
       }
     : null;
 
   return {
-    schema_version: String(vdxBlock?.schema_version ?? '0.2'),
-    stack: String(vdxBlock?.stack ?? autoDetectStack(PROJECT_ROOT)),
-    baseline: String(vdxBlock?.baseline ?? `file://${DEFAULT_RUBRIC}`),
+    schema_version: str(vdxBlock?.['schema_version']) ?? '0.2',
+    stack: str(vdxBlock?.['stack']) ?? autoDetectStack(PROJECT_ROOT),
+    baseline: str(vdxBlock?.['baseline']) ?? `file://${DEFAULT_RUBRIC}`,
     verbs,
     shared_infra: sharedInfra,
-    last_verified: vdxBlock?.success_path?.last_verified ?? null,
+    last_verified: at(vdxBlock, 'success_path', 'last_verified') ?? null,
   };
 }
 
@@ -138,40 +138,44 @@ function recordSuccessPath(input: {
   notes?: string;
 }): { ok: boolean; manifest_path: string; agents_md_updated: boolean } {
   const manifestPath = path.join(PROJECT_ROOT, 'mise.toml');
-  let doc: any = {};
+  let doc: Dict = {};
   if (fs.existsSync(manifestPath)) {
     const text = fs.readFileSync(manifestPath, 'utf8');
     try {
       doc = TOML.parse(text);
-    } catch (e: any) {
-      throw new Error(`mise.toml parse error: ${e?.message}`);
+    } catch (e) {
+      throw new Error(`mise.toml parse error: ${errorMessage(e)}`, { cause: e });
     }
   }
 
-  doc.tasks = doc.tasks ?? {};
+  const tasks = dict(doc['tasks']) ?? {};
   for (const v of input.verbs) {
-    doc.tasks[v.name] = { run: v.command };
+    tasks[v.name] = { run: v.command };
   }
+  doc['tasks'] = tasks;
 
-  doc.vdx = doc.vdx ?? {
+  // An existing manifest is updated where it is; a new one goes into [_.vdx].
+  const found = manifestTable(doc);
+  const vdx = found?.table ?? {
     schema_version: '0.2',
     baseline: DEFAULT_BASELINE,
     stack: autoDetectStack(PROJECT_ROOT),
   };
-  doc.vdx.verbs = input.verbs.map((v) => v.name);
+  vdx['verbs'] = input.verbs.map((v) => v.name);
 
   if (input.shared_infra) {
-    doc.vdx.shared_infra = {
+    vdx['shared_infra'] = {
       provider: input.shared_infra.provider,
       precheck: input.shared_infra.precheck,
     };
   }
 
-  doc.vdx.success_path = {
+  vdx['success_path'] = {
     last_verified: new Date().toISOString().slice(0, 10),
     verified_by: 'vdx-mcp',
     ...(input.notes ? { notes: input.notes } : {}),
   };
+  if (!found) doc['_'] = { ...dict(doc['_']), vdx };
 
   const newText = TOML.stringify(doc);
   fs.writeFileSync(manifestPath, newText, 'utf8');
@@ -191,7 +195,7 @@ server.registerTool(
       'Возвращает manifest проекта: stack, baseline, доступные глаголы и их native команды, shared_infra и last_verified. Самый частый вызов агента, входящего в проект.',
     inputSchema: {},
   },
-  async () => {
+  () => {
     const payload = buildCapabilities();
     return { content: [{ type: 'text', text: JSON.stringify(payload, null, 2) }] };
   },
@@ -221,7 +225,7 @@ server.registerTool(
       format: z.enum(['json', 'markdown']).optional(),
     },
   },
-  async ({ baseline, format }) => {
+  ({ baseline, format }) => {
     const fmt = format ?? 'json';
     const payload = buildAuditPayload(baseline, fmt);
     return { content: [{ type: 'text', text: payload }] };
@@ -232,14 +236,14 @@ server.registerTool(
   'vdx_record_success_path',
   {
     description:
-      'Записывает обнаруженные команды в [tasks.X] секцию mise.toml + обновляет [vdx.success_path]. Используется после успешной верификации команд агентом.',
+      'Записывает обнаруженные команды в [tasks.X] секцию mise.toml + обновляет [_.vdx.success_path] (у манифеста в старом [vdx] — там). Используется после успешной верификации команд агентом.',
     inputSchema: {
       verbs: z.array(z.object({ name: z.string(), command: z.string() })),
       shared_infra: z.object({ provider: z.string(), precheck: z.boolean() }).optional(),
       notes: z.string().optional(),
     },
   },
-  async ({ verbs, shared_infra, notes }) => {
+  ({ verbs, shared_infra, notes }) => {
     const args: Parameters<typeof recordSuccessPath>[0] = { verbs };
     if (shared_infra) args.shared_infra = shared_infra;
     if (notes !== undefined) args.notes = notes;
@@ -254,7 +258,7 @@ async function main() {
   process.stderr.write(`vdx-mcp connected (project: ${PROJECT_ROOT})\n`);
 }
 
-main().catch((e) => {
-  process.stderr.write(`vdx-mcp fatal: ${e?.message ?? e}\n`);
+main().catch((e: unknown) => {
+  process.stderr.write(`vdx-mcp fatal: ${errorMessage(e)}\n`);
   process.exit(1);
 });

package/src/narrow.ts

@@ -0,0 +1,56 @@
+/**
+ * What a parsed file (JSON, YAML, TOML) or a caught error holds is `unknown` until checked.
+ * These helpers check it on the way in, so the code past them works with real types.
+ */
+
+export type Dict = Record<string, unknown>;
+
+/** A plain object — not null, not an array. */
+export function isDict(v: unknown): v is Dict {
+  return typeof v === 'object' && v !== null && !Array.isArray(v);
+}
+
+/** `v` when it is a plain object, else undefined. */
+export function dict(v: unknown): Dict | undefined {
+  return isDict(v) ? v : undefined;
+}
+
+/**
+ * The value under `keys`, one level per key — an object's property or an array's index ("0");
+ * undefined as soon as a level is not an object.
+ */
+export function at(v: unknown, ...keys: string[]): unknown {
+  let cur = v;
+  for (const k of keys) {
+    if (typeof cur !== 'object' || cur === null) return undefined;
+    cur = (cur as Dict)[k];
+  }
+  return cur;
+}
+
+/** `v` when it is a string, else undefined. */
+export function str(v: unknown): string | undefined {
+  return typeof v === 'string' ? v : undefined;
+}
+
+/** `v` when it is an array, else an empty one. */
+export function list(v: unknown): unknown[] {
+  return Array.isArray(v) ? (v as unknown[]) : [];
+}
+
+export function isStringList(v: unknown): v is string[] {
+  return Array.isArray(v) && v.every((x) => typeof x === 'string');
+}
+
+/** The message of a caught value, whatever was thrown. */
+export function errorMessage(e: unknown): string {
+  return e instanceof Error ? e.message : String(e);
+}
+
+/** What a failed child process said: its stderr, else the error's message. */
+export function stderrOf(e: unknown): string {
+  const err = at(e, 'stderr');
+  if (typeof err === 'string' && err) return err;
+  if (Buffer.isBuffer(err) && err.length > 0) return err.toString();
+  return errorMessage(e);
+}

package/src/predicates.ts

@@ -15,8 +15,9 @@ import {
 import { checkingJobs, ciSystems, ciTaskCalls, mainPushSteps, readWorkflows, shippingJobs, upstream } from './gha.ts';
 import { detectHookFrameworks } from './hooks.ts';
 import { covers, expandTasks, isVocabularyTask, projectTaskCalls } from './vocabulary.ts';
+import { at, isStringList, str } from './narrow.ts';
 
-type Args = Record<string, any>;
+export type Args = Record<string, unknown>;
 
 /** A fact vdx could not read here — a CI system or a hosting it does not inspect. */
 export interface Unknown {
@@ -42,7 +43,7 @@ const DEFAULT_TEST_PATTERN =
 
 function testPattern(args: Args): RegExp {
   try {
-    return new RegExp(String(args.pattern ?? DEFAULT_TEST_PATTERN));
+    return new RegExp(str(args.pattern) ?? DEFAULT_TEST_PATTERN);
   } catch {
     return new RegExp(DEFAULT_TEST_PATTERN);
   }
@@ -102,7 +103,7 @@ export const REGISTRY: Record<string, PredicateFn> = {
   has_file: (args, ctx) => fileExists(ctx, String(args.path)),
 
   file_contains: (args, ctx) => {
-    const paths: string[] = Array.isArray(args.paths) ? args.paths : [String(args.path)];
+    const paths = isStringList(args.paths) ? args.paths : [String(args.path)];
     const expanded = expandPaths(paths, ctx);
     let re: RegExp;
     try {
@@ -119,7 +120,7 @@ export const REGISTRY: Record<string, PredicateFn> = {
 
   package_present: (args, ctx) => {
     if (typeof args === 'string') return isPackagePresent(args, 'any', ctx);
-    return isPackagePresent(String(args.name), String(args.ecosystem ?? 'any'), ctx);
+    return isPackagePresent(String(args.name), str(args.ecosystem) ?? 'any', ctx);
   },
 
   tsc_flag: (args, ctx) => {
@@ -143,7 +144,7 @@ export const REGISTRY: Record<string, PredicateFn> = {
   gh_workflow_blocks_pr: (args, ctx) => {
     const dir = path.join(ctx.projectRoot, '.github', 'workflows');
     if (!fs.existsSync(dir)) return false;
-    const wanted = args.check_name ? String(args.check_name) : null;
+    const wanted = str(args.check_name) || null;
     try {
       for (const f of fs.readdirSync(dir)) {
         if (!/\.ya?ml$/.test(f)) continue;
@@ -166,21 +167,19 @@ export const REGISTRY: Record<string, PredicateFn> = {
       const text = readText(ctx, f);
       if (text && new RegExp(`^${hook}:`, 'm').test(text)) return true;
     }
-    const composer = readJson(ctx, 'composer.json');
-    if (composer?.extra?.hooks?.[hook]) return true;
-    return false;
+    return Boolean(at(readJson(ctx, 'composer.json'), 'extra', 'hooks', hook));
   },
 
   config_value: (args, ctx) => {
-    const filePath = String(args.path ?? '');
-    const jsonpath = String(args.jsonpath ?? '');
+    const filePath = str(args.path) ?? '';
+    const jsonpath = str(args.jsonpath) ?? '';
     if (!filePath || !jsonpath) return false;
     const data = readStructured(ctx, filePath);
     if (data === null || data === undefined) return false;
     const value = resolveConfigPath(data, jsonpath);
 
     // Operator resolution: explicit `op`, otherwise infer from arg shape.
-    let op = args.op ? String(args.op) : null;
+    let op = str(args.op) || null;
     if (!op) {
       if (args.equals !== undefined) op = 'equals';
       else if (args.gte !== undefined) op = 'gte';

package/src/publish.ts

@@ -3,6 +3,7 @@ import * as path from 'node:path';
 import { execFileSync } from 'node:child_process';
 import type { AuditResult } from './audit.ts';
 import { stackForDir, type Ctx } from './facts.ts';
+import { at, dict, errorMessage, stderrOf, str } from './narrow.ts';
 
 export type BumpKind = 'patch' | 'minor' | 'major';
 
@@ -115,7 +116,7 @@ const runGit: GitRunner = (args, cwd) =>
  * since the last fetch; nothing is fetched.
  */
 export function planPush(projectRoot: string, enabled: boolean, git: GitRunner = runGit): PushPlan {
-  let upstream: string | null = null;
+  let upstream: string | null;
   try {
     upstream = git(['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'], projectRoot).trim() || null;
   } catch {
@@ -144,10 +145,10 @@ function fetchPublishedVersion(packageName: string, npm: NpmRunner): string | nu
   try {
     const out = npm(['view', packageName, 'version']);
     return out.trim() || null;
-  } catch (e: any) {
-    const stderr = String(e?.stderr ?? e?.message ?? '');
+  } catch (e) {
+    const stderr = stderrOf(e);
     if (stderr.includes('E404') || stderr.includes('404 Not Found')) return null;
-    throw new Error(`npm view failed: ${stderr.split('\n')[0] ?? stderr}`);
+    throw new Error(`npm view failed: ${stderr.split('\n')[0] ?? stderr}`, { cause: e });
   }
 }
 
@@ -155,12 +156,10 @@ function fetchPublishedVersion(packageName: string, npm: NpmRunner): string | nu
  * The registry `npm publish` sends this package to, when it is not npm's
  * default: `publishConfig.registry`, else the scope's registry from npm config.
  */
-export function publishRegistry(
-  pkg: { name?: string; publishConfig?: { registry?: string } },
-  npm: NpmRunner,
-): string | null {
-  if (pkg.publishConfig?.registry) return pkg.publishConfig.registry;
-  const scope = pkg.name?.match(/^(@[^/]+)\//)?.[1];
+export function publishRegistry(pkg: unknown, npm: NpmRunner): string | null {
+  const registry = str(at(pkg, 'publishConfig', 'registry'));
+  if (registry) return registry;
+  const scope = str(at(pkg, 'name'))?.match(/^(@[^/]+)\//)?.[1];
   if (!scope) return null;
   try {
     const value = npm(['config', 'get', `${scope}:registry`]).trim();
@@ -184,8 +183,8 @@ export function checkNpmAuth(registry: string | null, npm: NpmRunner): Preflight
     const who = npm(registry ? ['whoami', '--registry', registry] : ['whoami']).trim();
     if (who) return { name: 'npm-auth', ok: true, message: `OK (logged in to ${where} as ${who})` };
     return { name: 'npm-auth', ok: false, message: `npm whoami answered nothing for ${where}. Run: ${login}`, fix };
-  } catch (e: any) {
-    const stderr = String(e?.stderr ?? e?.message ?? '');
+  } catch (e) {
+    const stderr = stderrOf(e);
     if (/E401|ENEEDAUTH/.test(stderr)) {
       return {
         name: 'npm-auth',
@@ -268,9 +267,9 @@ export function planPublish(
     throw new Error(`vdx publish: package.json not found at ${pkgJsonPath}`);
   }
 
-  const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8'));
-  const packageName: string = pkg.name ?? '(unnamed)';
-  const currentVersion: string = pkg.version ?? '0.0.0';
+  const pkg: unknown = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8'));
+  const packageName = str(at(pkg, 'name')) ?? '(unnamed)';
+  const currentVersion = str(at(pkg, 'version')) ?? '0.0.0';
   const newVersion = bumpSemver(currentVersion, opts.bump);
 
   const preflight: PreflightCheck[] = [];
@@ -312,8 +311,8 @@ export function planPublish(
   let registryError: string | null = null;
   try {
     published = fetchPublishedVersion(packageName, npm);
-  } catch (e: any) {
-    registryError = e?.message ?? String(e);
+  } catch (e) {
+    registryError = errorMessage(e);
   }
   if (registryError) {
     preflight.push({
@@ -416,9 +415,10 @@ export function defaultPublishDeps(): PublishDeps {
 
 /** Set `version` in package-lock.json — the root and its own entry under `packages`. */
 export function bumpLockText(text: string, version: string): string {
-  const lock = JSON.parse(text);
-  lock.version = version;
-  if (lock.packages?.['']) lock.packages[''].version = version;
+  const lock = dict(JSON.parse(text)) ?? {};
+  lock['version'] = version;
+  const self = dict(at(lock, 'packages', ''));
+  if (self) self['version'] = version;
   return JSON.stringify(lock, null, 2) + '\n';
 }
 
@@ -502,8 +502,8 @@ export function executePublish(plan: PublishPlan, deps: PublishDeps = defaultPub
     fs.writeFileSync(file, next(text), 'utf8');
   };
   rewrite(plan.packageJsonPath, (text) => {
-    const pkg = JSON.parse(text);
-    pkg.version = plan.newVersion;
+    const pkg = dict(JSON.parse(text)) ?? {};
+    pkg['version'] = plan.newVersion;
     return JSON.stringify(pkg, null, 2) + '\n';
   });
   if (plan.lockPath) rewrite(plan.lockPath, (text) => bumpLockText(text, plan.newVersion));
@@ -521,11 +521,13 @@ export function executePublish(plan: PublishPlan, deps: PublishDeps = defaultPub
   for (const s of signals) process.on(s, holdOut);
   try {
     deps.run('npm', ['publish'], path.dirname(plan.packageJsonPath));
-  } catch (e: any) {
+  } catch (e) {
     for (const [file, text] of originals) fs.writeFileSync(file, text, 'utf8');
-    const what = e?.signal ? `interrupted (${e.signal})` : `failed (exit ${e?.status ?? '?'})`;
+    const signal = str(at(e, 'signal'));
+    const status = at(e, 'status');
+    const what = signal ? `interrupted (${signal})` : `failed (exit ${typeof status === 'number' ? status : '?'})`;
     deps.log(`✗ npm publish ${what}; reverted ${bumped.map((f) => path.basename(f)).join(' and ')}`);
-    throw new Error(`npm publish ${e?.signal ? 'interrupted' : 'failed'}`);
+    throw new Error(`npm publish ${signal ? 'interrupted' : 'failed'}`, { cause: e });
   } finally {
     for (const s of signals) process.off(s, holdOut);
   }

package/src/rubric.ts

@@ -124,8 +124,8 @@ export function parseRubric(text: string, source: string): Rubric {
   }
   // нормализуем default_target (если кто-то напишет "L4" со spaces)
   for (const ax of data.axes) {
-    ax.default_target = (ax.default_target ?? 'L4') as LevelName;
-    ax.storage = (ax.storage ?? 'level') as Storage;
+    ax.default_target = ax.default_target ?? 'L4';
+    ax.storage = ax.storage ?? 'level';
   }
   if (compareSchema(schema, '0.3')! >= 0) {
     const bad = invalidPredicates(data);

package/src/run.ts

@@ -1,6 +1,7 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as TOML from 'smol-toml';
+import { errorMessage } from './narrow.ts';
 
 export const LIFECYCLE_VERBS = ['up', 'down', 'build', 'test', 'check', 'fix'] as const;
 export type LifecycleVerb = (typeof LIFECYCLE_VERBS)[number];
@@ -21,8 +22,8 @@ export function resolveLifecycleVerb(projectRoot: string, verb: string): VerbRes
   let parsed: unknown;
   try {
     parsed = TOML.parse(fs.readFileSync(miseTomlPath, 'utf8'));
-  } catch (e: any) {
-    return { ok: false, reason: 'parse-error', detail: e?.message ?? String(e) };
+  } catch (e) {
+    return { ok: false, reason: 'parse-error', detail: errorMessage(e) };
   }
   const tasks = (parsed as { tasks?: Record<string, unknown> })?.tasks;
   if (!tasks || typeof tasks !== 'object' || !(verb in tasks)) {

package/src/vocabulary.ts

@@ -5,6 +5,7 @@
  * predicates (what a hook runs), so both read "the project's task" the same way.
  */
 import { listAllTasks, readJson, readToml, type Ctx } from './facts.ts';
+import { at, dict, list } from './narrow.ts';
 
 export const LIFECYCLE_VOCABULARY = ['up', 'down', 'build', 'test', 'check', 'fix'] as const;
 
@@ -99,11 +100,9 @@ export function isVocabularyTask(name: string, words: readonly string[] = ['test
 /** Tasks a task's definition calls: composer `@refs`, `npm run X` inside a script, mise `depends`/`run`. */
 export function taskChildren(ctx: Ctx, name: string): string[] {
   const out: string[] = [];
-  const composer = readJson(ctx, 'composer.json');
-  const entry = composer?.scripts?.[name];
+  const entry = at(readJson(ctx, 'composer.json'), 'scripts', name);
   if (entry !== undefined) {
-    const list = Array.isArray(entry) ? entry : [entry];
-    for (const e of list) {
+    for (const e of Array.isArray(entry) ? (entry as unknown[]) : [entry]) {
       if (typeof e !== 'string') continue;
       if (e.startsWith('@')) {
         const [ref, ...rest] = e.slice(1).trim().split(/\s+/);
@@ -114,15 +113,12 @@ export function taskChildren(ctx: Ctx, name: string): string[] {
       }
     }
   }
-  const pkg = readJson(ctx, 'package.json');
-  const script = pkg?.scripts?.[name];
+  const script = at(readJson(ctx, 'package.json'), 'scripts', name);
   if (typeof script === 'string') out.push(...runnerCalls(script));
-  const mise = readToml(ctx, 'mise.toml');
-  const task = mise?.tasks?.[name];
-  if (task && typeof task === 'object') {
-    if (Array.isArray(task.depends))
-      out.push(...task.depends.filter((d: unknown): d is string => typeof d === 'string'));
-    const runs = Array.isArray(task.run) ? task.run : [task.run];
+  const task = dict(at(readToml(ctx, 'mise.toml'), 'tasks', name));
+  if (task) {
+    out.push(...list(task['depends']).filter((d): d is string => typeof d === 'string'));
+    const runs = Array.isArray(task['run']) ? (task['run'] as unknown[]) : [task['run']];
     for (const r of runs) if (typeof r === 'string') out.push(...runnerCalls(r));
   }
   const tasks = listAllTasks(ctx);