@vodmal/vdx-cli 0.25.0 → 0.26.0

package/README.md

@@ -91,7 +91,7 @@ vdx ai@m3
 `vdx ai` reads a personal profile, never a bundled one: `$VDX_ENVIRONMENT`, else
 `~/.vdx-environment.yaml`, else a plain `claude`/`codex` with no flags. Format:
 [docs/specs/environment-format.md](../docs/specs/environment-format.md).
-The session's `{project}` is `[vdx] name` from the project's `mise.toml`, else the
+The session's `{project}` is `[_.vdx] name` (or the older `[vdx]`) from the project's `mise.toml`, else the
 first file in the profile's `session.project_names` that has one, else the repo
 name. `vdx ai@<host>` runs the same command on `<host>` over ssh — that machine's vdx,
 profile and tmux, the path taken under its home directory; `--detach` only
@@ -126,7 +126,7 @@ npm run typecheck
 ## Structure
 
 - `src/rubric.ts`     — types + YAML loader
-- `src/manifest.ts`   — parser for `[vdx]` block in `mise.toml` + `.vdx-overrides.yml`
+- `src/manifest.ts`   — parser for the `[_.vdx]` block in `mise.toml` (the older `[vdx]` too) + `.vdx-overrides.yml`
 - `src/facts.ts`      — fact source loaders (tasks, packages, configs, sub-package detection)
 - `src/predicates.ts` — predicate registry; true / false / unknown with a reason (schema 0.3)
 - `src/evaluator.ts`  — recursive evaluator + sugar notation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vodmal/vdx-cli",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "vdx — unified lifecycle interface (up/down/build/test/check/fix) + versioned maturity audit with drift detection. Pairs with the vdx Claude Code plugin.",
   "keywords": [
     "vdx",
@@ -40,8 +40,9 @@
     "smoke": "bash smoke.sh",
     "typecheck": "tsc --noEmit",
     "format:check": "prettier --check .",
-    "check": "npm run typecheck && npm run format:check",
-    "fix": "prettier --write .",
+    "lint": "eslint .",
+    "check": "npm run typecheck && npm run format:check && npm run lint",
+    "fix": "eslint --fix . && prettier --write .",
     "test": "vitest run",
     "test:unit": "vitest run tests/unit",
     "coverage": "vitest run --coverage"
@@ -57,12 +58,16 @@
     "zod": "^3.23.0"
   },
   "devDependencies": {
+    "@eslint/js": "^10.0.1",
     "@types/js-yaml": "^4.0.9",
     "@types/marked-terminal": "^6.1.1",
     "@types/node": "^22.0.0",
     "@vitest/coverage-v8": "^4.1.7",
+    "eslint": "^10.12.0",
+    "eslint-config-prettier": "^10.1.8",
     "prettier": "^3.9.10",
     "typescript": "^5.6.0",
+    "typescript-eslint": "^8.71.2",
     "vitest": "^4.1.7"
   },
   "publishConfig": {

package/rubric/vdx-rubric.yaml

@@ -11,7 +11,7 @@ schema_version: "0.3"
 
 metadata:
   name: vdx-rubric-vodmal
-  version: "1.4.0"
+  version: "1.4.2"
   description: "Personal maturity rubric for multi-stack projects (vodmal)"
   owner: vodmal
   homepage: "https://github.com/vodmal/vdx-rubric"
@@ -193,17 +193,24 @@ axes:
             predicate: { tsc_flag: { name: noImplicitOverride, equals: true } }
           - id: eslint_flat
             weight: 1.0
-            predicate:
+            # Имена flat-конфига — те, что ищет ESLint 10 (lib/config/config-loader.js).
+            # Одно определение на сет: code-style ссылается сюда (v1.4.1).
+            predicate: &eslint_flat_config
               any_of:
                 - has_file: eslint.config.js
                 - has_file: eslint.config.mjs
+                - has_file: eslint.config.cjs
                 - has_file: eslint.config.ts
+                - has_file: eslint.config.mts
+                - has_file: eslint.config.cts
           - id: eslint_type_checked
             weight: 1.0
             predicate:
               file_contains:
-                paths: [eslint.config.js, eslint.config.mjs, eslint.config.ts]
-                pattern: "recommended-type-checked"
+                paths: [eslint.config.js, eslint.config.mjs, eslint.config.cjs, eslint.config.ts, eslint.config.mts, eslint.config.cts]
+                # typescript-eslint во flat-конфиге — recommendedTypeChecked / strictTypeChecked,
+                # в .eslintrc было recommended-type-checked (v1.4.1).
+                pattern: "(recommended|strict)-?[Tt]ype-?[Cc]hecked"
         level_thresholds: { L4: 0.85, L3: 0.65, L2: 0.35, L1: 0.10 }
 
   - id: ci
@@ -316,9 +323,31 @@ axes:
             - has_file: ecs.php
             - has_file: .php-cs-fixer.php
             - has_file: phpcs.xml.dist
-            - has_file: .prettierrc
-            - has_file: biome.json
-            - has_file: eslint.config.js
+            # Форматтер: имена конфига — те, что ищет Prettier 3.9, и Biome (v1.4.1).
+            - &formatter_config
+              any_of:
+                - has_file: .prettierrc
+                - has_file: .prettierrc.json
+                - has_file: .prettierrc.yaml
+                - has_file: .prettierrc.yml
+                - has_file: .prettierrc.json5
+                - has_file: .prettierrc.toml
+                - has_file: .prettierrc.js
+                - has_file: .prettierrc.mjs
+                - has_file: .prettierrc.cjs
+                - has_file: .prettierrc.ts
+                - has_file: .prettierrc.mts
+                - has_file: .prettierrc.cts
+                - has_file: prettier.config.js
+                - has_file: prettier.config.mjs
+                - has_file: prettier.config.cjs
+                - has_file: prettier.config.ts
+                - has_file: prettier.config.mts
+                - has_file: prettier.config.cts
+                - config_value: { path: package.json, jsonpath: "prettier", op: present }
+                - has_file: biome.json
+                - has_file: biome.jsonc
+            - *eslint_flat_config
       L3:
         requires:
           any_of:
@@ -333,8 +362,8 @@ axes:
                 - has_file: ecs.php
                 - has_file: phpcs.xml.dist
             - all_of:
-                - any_of: [{ has_file: .prettierrc }, { has_file: biome.json }]
-                - has_file: eslint.config.js
+                - *formatter_config
+                - *eslint_flat_config
 
   - id: dependency-hygiene
     class: supporting
@@ -544,10 +573,17 @@ axes:
         requires:
           any_of:
             - file_contains: { path: scripts/docker-up.sh, pattern: "(traefik|nginx-proxy)" }
+            # Манифест vdx — в [_.vdx] (vdx 0.26+) или в старом [vdx]; оба места — с v1.4.2.
+            - config_value: { path: mise.toml, jsonpath: "_.vdx.shared_infra.precheck", equals: true }
             - config_value: { path: mise.toml, jsonpath: "vdx.shared_infra.precheck", equals: true }
       L4:
         requires:
           any_of:
+            - config_value:
+                path: mise.toml
+                jsonpath: "_.vdx.shared_infra.provider"
+                op: matches
+                pattern: "github.com/.+@v\\d+"
             - config_value:
                 path: mise.toml
                 jsonpath: "vdx.shared_infra.provider"

package/src/ai.ts

@@ -6,7 +6,7 @@ import YAML from 'js-yaml';
 import { evalPredicate } from './evaluator.ts';
 import { GIT_HOOK_EVENTS } from './hooks.ts';
 import { autoDetectStack, readStructured, resolveConfigPath, type Ctx } from './facts.ts';
-import { loadManifest } from './manifest.ts';
+import { loadManifestAt } from './manifest.ts';
 import { type Author, effectiveAuthor, isGitRepo, rankAuthors, scanPool, writeAuthor } from './author.ts';
 import type { Predicate } from './rubric.ts';
 import {
@@ -28,6 +28,7 @@ import {
   parseMachineReport,
   runsInProject,
 } from './conversations.ts';
+import { at, errorMessage, isStringList, str } from './narrow.ts';
 
 /**
  * `vdx ai` — start the person's agent in a project, with the flags their
@@ -82,7 +83,7 @@ export interface NameSource {
 export interface SessionProfile {
   multiplexer?: Multiplexer;
   name?: string;
-  /** Tried after `[vdx] name` in the project's mise.toml; the first non-empty string wins. */
+  /** Tried after `[_.vdx] name` (or the older `[vdx]`) in the project's mise.toml; the first non-empty string wins. */
   project_names?: NameSource[];
   /** The machines a project's agent may run on, as ssh destinations; vdx asks the others what runs there. */
   machines?: string[];
@@ -144,13 +145,9 @@ export function resolveEnvironmentPath(
   return fs.existsSync(user) ? user : null;
 }
 
-function isStringList(v: unknown): v is string[] {
-  return Array.isArray(v) && v.every((x) => typeof x === 'string');
-}
-
 /** Parse and validate a profile. Throws with the offending key named. */
 export function parseEnvironment(text: string, source: string): Environment {
-  const data = YAML.load(text) as unknown;
+  const data: unknown = YAML.load(text);
   if (data === null || data === undefined) return {};
   if (typeof data !== 'object' || Array.isArray(data)) {
     throw new Error(`${source}: expected a YAML mapping at the top level`);
@@ -271,8 +268,8 @@ export function loadEnvironment(file: string): Environment {
   let text: string;
   try {
     text = fs.readFileSync(file, 'utf8');
-  } catch (e: any) {
-    throw new Error(`cannot read profile ${file}: ${e?.code ?? e?.message ?? e}`);
+  } catch (e) {
+    throw new Error(`cannot read profile ${file}: ${str(at(e, 'code')) ?? errorMessage(e)}`, { cause: e });
   }
   return parseEnvironment(text, file);
 }
@@ -372,7 +369,7 @@ export function planLaunch(input: {
 }
 
 export function shellQuote(s: string): string {
-  if (s !== '' && /^[A-Za-z0-9_\/.:@%+=,-]+$/.test(s)) return s;
+  if (s !== '' && /^[A-Za-z0-9_/.:@%+=,-]+$/.test(s)) return s;
   return `'${s.replace(/'/g, `'\\''`)}'`;
 }
 
@@ -544,7 +541,7 @@ export interface ProjectName {
 }
 
 /**
- * `{project}`: `[vdx] name` in the project's mise.toml, else the first profile
+ * `{project}`: `[_.vdx] name` (or the older `[vdx]`) in the project's mise.toml, else the first profile
  * source holding a non-empty string, else the repository name. A source that is
  * missing or unreadable is skipped — a name is a label, not a reason to fail.
  */
@@ -555,8 +552,9 @@ export function resolveProjectName(input: {
   home: string;
   profileDir: string;
 }): ProjectName {
-  const own = loadManifest(input.projectRoot)?.name;
-  if (typeof own === 'string' && own.trim()) return { name: own.trim(), source: 'mise.toml [vdx] name' };
+  const found = loadManifestAt(input.projectRoot);
+  const own = found?.manifest.name;
+  if (typeof own === 'string' && own.trim()) return { name: own.trim(), source: `mise.toml [${found!.place}] name` };
   for (const src of input.sources) {
     const file = path.resolve(
       input.profileDir,
@@ -741,7 +739,7 @@ export interface AiDeps {
 
 export function runSsh(args: string[], capture: boolean): { status: number; stdout: string } | null {
   const res = spawnSync('ssh', args, { stdio: capture ? ['ignore', 'pipe', 'ignore'] : 'inherit', encoding: 'utf8' });
-  if ((res.error as NodeJS.ErrnoException | undefined)?.code === 'ENOENT') return null;
+  if (at(res.error, 'code') === 'ENOENT') return null;
   return { status: res.status ?? 1, stdout: res.stdout ?? '' };
 }
 
@@ -758,8 +756,8 @@ export function askLine(prompt: string): string | null {
     let n: number;
     try {
       n = fs.readSync(0, buf, 0, buf.length, null);
-    } catch (e: any) {
-      if (e?.code === 'EAGAIN') {
+    } catch (e) {
+      if (at(e, 'code') === 'EAGAIN') {
         sleepSync(50);
         continue;
       }
@@ -1351,8 +1349,8 @@ function prepare(pathArg: string, deps: AiDeps, focused = false): Prepared | num
   if (profilePath) {
     try {
       environment = loadEnvironment(profilePath);
-    } catch (e: any) {
-      log(`vdx ai: ${e?.message ?? e}`);
+    } catch (e) {
+      log(`vdx ai: ${errorMessage(e)}`);
       return EXIT_USAGE;
     }
   }
@@ -1390,8 +1388,8 @@ function prepare(pathArg: string, deps: AiDeps, focused = false): Prepared | num
   let plan: LaunchPlan;
   try {
     plan = replan(focused);
-  } catch (e: any) {
-    log(`vdx ai: ${profilePath ?? 'profile'}: ${e?.message ?? e}`);
+  } catch (e) {
+    log(`vdx ai: ${profilePath ?? 'profile'}: ${errorMessage(e)}`);
     return EXIT_USAGE;
   }
   return { projectRoot, environment, profilePath, profileDir, plan, replan };
@@ -1445,8 +1443,9 @@ export function unreadableFolders(tmux: Tmux | null, home: string): string[] {
     try {
       fs.readdirSync(d);
       return false;
-    } catch (e: any) {
-      return e?.code === 'EPERM' || e?.code === 'EACCES';
+    } catch (e) {
+      const code = at(e, 'code');
+      return code === 'EPERM' || code === 'EACCES';
     }
   });
 }
@@ -1672,7 +1671,7 @@ export function runAi(opts: AiOptions, deps: AiDeps): number {
     const env = plan.focused ? { ...process.env, [FOCUSED_ENV_VAR]: '1' } : undefined;
     const startedAt = Date.now();
     let res = spawnSync(plan.command, [...plan.args, ...plan.resumeArgs], { cwd: projectRoot, stdio: 'inherit', env });
-    if ((res.error as NodeJS.ErrnoException | undefined)?.code === 'ENOENT') {
+    if (at(res.error, 'code') === 'ENOENT') {
       log(`vdx ai: \`${plan.command}\` not found on PATH`);
       return 127;
     }

package/src/clone-checks.ts

@@ -34,7 +34,7 @@ function isGitWorkTree(root: string): boolean {
 
 function executableHooks(dir: string): Map<string, string> {
   const out = new Map<string, string>();
-  let names: string[] = [];
+  let names: string[];
   try {
     names = fs.readdirSync(dir).filter((f) => !f.startsWith('.') && !f.endsWith('.sample'));
   } catch {

package/src/conversations.ts

@@ -1,5 +1,6 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
+import { at, dict, str } from './narrow.ts';
 
 /**
  * Claude Code conversations of a project, and the machine each one was last
@@ -86,17 +87,20 @@ export function readConversation(file: string, updated: Date): Conversation | nu
     const isTitle = line.includes('"ai-title"') || line.includes('"last-prompt"');
     if (!turns && line.includes('"type":"user"')) turns = true;
     if (!isHook && !isTitle) continue;
-    let entry: any;
+    let entry: unknown;
     try {
       entry = JSON.parse(line);
     } catch {
       continue;
     }
-    if (entry?.type === 'ai-title' && typeof entry.aiTitle === 'string') aiTitle = entry.aiTitle;
-    else if (entry?.type === 'last-prompt' && typeof entry.lastPrompt === 'string') lastPrompt = entry.lastPrompt;
-    else if (entry?.type === 'attachment' && entry.attachment?.type === 'hook_additional_context') {
-      const content = entry.attachment.content;
-      for (const part of Array.isArray(content) ? content : [content]) {
+    const type = at(entry, 'type');
+    const title = str(at(entry, 'aiTitle'));
+    const prompt = str(at(entry, 'lastPrompt'));
+    if (type === 'ai-title' && title !== undefined) aiTitle = title;
+    else if (type === 'last-prompt' && prompt !== undefined) lastPrompt = prompt;
+    else if (type === 'attachment' && at(entry, 'attachment', 'type') === 'hook_additional_context') {
+      const content = at(entry, 'attachment', 'content');
+      for (const part of Array.isArray(content) ? (content as unknown[]) : [content]) {
         const label = typeof part === 'string' ? part.match(MACHINE_LINE_RE)?.[1] : undefined;
         if (label && LABEL_RE.test(label)) machine = label;
       }
@@ -197,9 +201,11 @@ export function latestPerMachine(
  */
 export function liveConversationId(env: NodeJS.ProcessEnv, home: string, pid: number): string | null {
   try {
-    const data = JSON.parse(fs.readFileSync(path.join(claudeConfigDir(env, home), 'sessions', `${pid}.json`), 'utf8'));
-    const id = data?.sessionId;
-    return typeof id === 'string' && isConversationId(id) ? id : null;
+    const data: unknown = JSON.parse(
+      fs.readFileSync(path.join(claudeConfigDir(env, home), 'sessions', `${pid}.json`), 'utf8'),
+    );
+    const id = str(at(data, 'sessionId'));
+    return id !== undefined && isConversationId(id) ? id : null;
   } catch {
     return null;
   }
@@ -209,9 +215,8 @@ export function liveConversationId(env: NodeJS.ProcessEnv, home: string, pid: nu
 export function liveStartedAt(env: NodeJS.ProcessEnv, home: string, pid: number): number | null {
   try {
     const file = path.join(claudeConfigDir(env, home), 'sessions', `${pid}.json`);
-    const data: unknown = JSON.parse(fs.readFileSync(file, 'utf8'));
-    const at = typeof data === 'object' && data !== null ? (data as { startedAt?: unknown }).startedAt : undefined;
-    return typeof at === 'number' ? at : null;
+    const started = at(JSON.parse(fs.readFileSync(file, 'utf8')), 'startedAt');
+    return typeof started === 'number' ? started : null;
   } catch {
     return null;
   }
@@ -234,20 +239,22 @@ export function parseLiveSessions(text: string): LiveSession[] {
   const out: LiveSession[] = [];
   for (const line of text.split('\n')) {
     if (!line.trim().startsWith('{')) continue;
-    let data: any;
+    let data: Record<string, unknown> | undefined;
     try {
-      data = JSON.parse(line);
+      data = dict(JSON.parse(line));
     } catch {
       continue;
     }
-    if (!Number.isInteger(data?.pid) || typeof data?.sessionId !== 'string' || !isConversationId(data.sessionId))
-      continue;
+    const pid = data?.['pid'];
+    const conversation = str(data?.['sessionId']);
+    if (typeof pid !== 'number' || !Number.isInteger(pid) || conversation === undefined) continue;
+    if (!isConversationId(conversation)) continue;
     out.push({
-      pid: data.pid,
-      conversation: data.sessionId,
-      tmux: typeof data.tmux === 'string' ? data.tmux : null,
-      status: typeof data.status === 'string' ? data.status : null,
-      cwd: typeof data.cwd === 'string' ? data.cwd : null,
+      pid,
+      conversation,
+      tmux: str(data?.['tmux']) ?? null,
+      status: str(data?.['status']) ?? null,
+      cwd: str(data?.['cwd']) ?? null,
     });
   }
   return out;
@@ -277,8 +284,8 @@ function pidAlive(pid: number): boolean {
   try {
     process.kill(pid, 0);
     return true;
-  } catch (e: any) {
-    return e?.code === 'EPERM';
+  } catch (e) {
+    return at(e, 'code') === 'EPERM';
   }
 }
 

package/src/doctor.ts

@@ -6,6 +6,7 @@ import { execFileSync } from 'node:child_process';
 import { effectiveAuthor, isGitRepo, rankAuthors, scanPool } from './author.ts';
 import { authorPoolDirs, loadEnvironment, resolveEnvironmentPath, shellQuote, type Environment } from './ai.ts';
 import { checkRepoHooks } from './clone-checks.ts';
+import { at, dict } from './narrow.ts';
 import {
   checkPersonalHooks,
   defaultPersonalHookDeps,
@@ -354,7 +355,7 @@ export function checkClaudeCodePlugin(
   claudeDir: string = process.env['CLAUDE_CONFIG_DIR'] || path.join(os.homedir(), '.claude'),
 ): CheckResult {
   const base = { id: 'claude-plugin', label: 'Claude Code vdx plugin' };
-  const readJson = (file: string): any => {
+  const readJson = (file: string): unknown => {
     try {
       return JSON.parse(fs.readFileSync(path.join(claudeDir, file), 'utf8'));
     } catch {
@@ -370,13 +371,13 @@ export function checkClaudeCodePlugin(
       remedy: PLUGIN_INSTALL_HINT,
     };
   }
-  const key = Object.keys(installed.plugins ?? {}).find((k) => k.startsWith('vdx@'));
+  const key = Object.keys(dict(at(installed, 'plugins')) ?? {}).find((k) => k.startsWith('vdx@'));
   if (!key) {
     return { ...base, status: 'warning', message: 'not installed', remedy: PLUGIN_INSTALL_HINT };
   }
-  const version = installed.plugins[key]?.[0]?.version;
+  const version = at(installed, 'plugins', key, '0', 'version');
   const label = `${key}${typeof version === 'string' ? ` ${version}` : ''}`;
-  if (readJson('settings.json')?.enabledPlugins?.[key] === false) {
+  if (at(readJson('settings.json'), 'enabledPlugins', key) === false) {
     return { ...base, status: 'warning', message: `${label} installed but disabled`, remedy: `/plugin enable ${key}` };
   }
   return { ...base, status: 'ok', message: label };

package/src/evaluator.ts

@@ -1,6 +1,7 @@
 import type { Predicate } from './rubric.ts';
 import type { Ctx } from './facts.ts';
-import { REGISTRY, isUnknown, type Unknown, type Verdict } from './predicates.ts';
+import { REGISTRY, isUnknown, type Args, type Unknown, type Verdict } from './predicates.ts';
+import { at, isDict, list } from './narrow.ts';
 
 export { isUnknown, type Unknown, type Verdict };
 
@@ -34,21 +35,21 @@ export function evalVerdict(p: Predicate, ctx: Ctx): Verdict {
   if (p === null || p === undefined) return false;
   if (typeof p === 'boolean') return p;
 
-  if (typeof p === 'object' && !Array.isArray(p)) {
-    const obj = p as Record<string, any>;
+  if (isDict(p)) {
+    const obj = p;
 
     if ('all_of' in obj) {
-      const vs = (obj.all_of as Predicate[]).map((q) => evalVerdict(q, ctx));
+      const vs = list(obj['all_of']).map((q) => evalVerdict(q, ctx));
       if (vs.some((v) => v === false)) return false;
       return firstUnknown(vs) ?? true;
     }
     if ('any_of' in obj) {
-      const vs = (obj.any_of as Predicate[]).map((q) => evalVerdict(q, ctx));
+      const vs = list(obj['any_of']).map((q) => evalVerdict(q, ctx));
       if (vs.some((v) => v === true)) return true;
       return firstUnknown(vs) ?? false;
     }
     if ('at_least_n_of' in obj) {
-      const { n, predicates } = obj.at_least_n_of as { n: number; predicates: Predicate[] };
+      const { n, predicates } = obj['at_least_n_of'] as { n: number; predicates: Predicate[] };
       const vs = predicates.map((q) => evalVerdict(q, ctx));
       const matched = vs.filter((v) => v === true).length;
       if (matched >= n) return true;
@@ -57,16 +58,18 @@ export function evalVerdict(p: Predicate, ctx: Ctx): Verdict {
       return firstUnknown(vs)!;
     }
     if ('not' in obj) {
-      const v = evalVerdict(obj.not, ctx);
+      const v = evalVerdict(obj['not'], ctx);
       return isUnknown(v) ? v : !v;
     }
     if ('fn' in obj) {
-      const fn = REGISTRY[String(obj.fn)];
+      const name = String(obj['fn']);
+      const fn = REGISTRY[name];
       if (!fn) {
-        process.stderr.write(`warning: unknown predicate "${obj.fn}"\n`);
+        process.stderr.write(`warning: unknown predicate "${name}"\n`);
         return false;
       }
-      return fn(obj.args ?? {}, ctx);
+      // `args` is the predicate's to read: package_present takes a bare string too.
+      return fn((obj['args'] ?? {}) as Args, ctx);
     }
 
     // Sugar form: single-key object where key is a registered predicate
@@ -76,9 +79,7 @@ export function evalVerdict(p: Predicate, ctx: Ctx): Verdict {
       const fn = REGISTRY[key];
       if (fn) {
         const value = obj[key];
-        if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
-          return fn(value, ctx);
-        }
+        if (isDict(value)) return fn(value, ctx);
         const argKey = SUGAR_ARG_KEY[key];
         if (argKey) {
           return fn({ [argKey]: value }, ctx);
@@ -104,14 +105,14 @@ export function evalPredicate(p: Predicate, ctx: Ctx): boolean {
 export function predicateNames(p: Predicate): string[] {
   const out: string[] = [];
   const walk = (q: Predicate): void => {
-    if (q === null || q === undefined || typeof q !== 'object' || Array.isArray(q)) return;
-    const obj = q as Record<string, any>;
-    if ('all_of' in obj) return (obj.all_of as Predicate[]).forEach(walk);
-    if ('any_of' in obj) return (obj.any_of as Predicate[]).forEach(walk);
-    if ('at_least_n_of' in obj) return ((obj.at_least_n_of?.predicates as Predicate[]) ?? []).forEach(walk);
-    if ('not' in obj) return walk(obj.not);
+    if (!isDict(q)) return;
+    const obj = q;
+    if ('all_of' in obj) return list(obj['all_of']).forEach(walk);
+    if ('any_of' in obj) return list(obj['any_of']).forEach(walk);
+    if ('at_least_n_of' in obj) return list(at(obj, 'at_least_n_of', 'predicates')).forEach(walk);
+    if ('not' in obj) return walk(obj['not']);
     if ('fn' in obj) {
-      out.push(String(obj.fn));
+      out.push(String(obj['fn']));
       return;
     }
     const keys = Object.keys(obj);