@vodmal/vdx-cli 0.24.0 → 0.26.0

package/src/audit.ts

@@ -28,12 +28,11 @@ export interface AuditResult {
  *   3. fallback на root ctx.
  *
  * Возвращает `{ ctx, relPath }` где relPath — относительный путь либо null
- * (если subpackage не разрезолвился — будем использовать root).
+ * (если subpackage не разрезолвился — будем использовать root). Файл, которого
+ * нет в subpackage, ищется в корне (`fallbackRoot`): `.github/` и `.gitignore`
+ * у репо одни.
  */
-function resolveSubpackageCtx(
-  ctx: Ctx,
-  manifest: VdxManifest | null,
-): { ctx: Ctx; relPath: string | null } {
+function resolveSubpackageCtx(ctx: Ctx, manifest: VdxManifest | null): { ctx: Ctx; relPath: string | null } {
   let relPath: string | null = null;
   let subpackageStack: string | null = null;
 
@@ -44,9 +43,7 @@ function resolveSubpackageCtx(
       relPath = p;
       subpackageStack = stackForDir(abs);
     } else {
-      process.stderr.write(
-        `warning: primary_subpackage "${p}" does not exist — falling back to root\n`,
-      );
+      process.stderr.write(`warning: primary_subpackage "${p}" does not exist — falling back to root\n`);
     }
   } else {
     const subs = findSubPackages(ctx.projectRoot);
@@ -68,11 +65,23 @@ function resolveSubpackageCtx(
       projectRoot: path.join(ctx.projectRoot, relPath),
       stack: subpackageStack ?? ctx.stack,
       cache: new Map(),
+      fallbackRoot: ctx.projectRoot,
     },
     relPath,
   };
 }
 
+/**
+ * Ctx осей без `applies_to`. Корень мета-репо (без своего манифеста стека)
+ * дочитывает недостающие файлы из subpackage: `engines` в `cli/package.json`
+ * — тоже про воспроизводимость всего репо. У корня со своим манифестом
+ * подстановки нет.
+ */
+function rootAxisCtx(ctx: Ctx, subpackage: Ctx, relPath: string | null): Ctx {
+  if (!relPath || stackForDir(ctx.projectRoot) !== null) return ctx;
+  return { ...ctx, cache: new Map(), fallbackRoot: subpackage.projectRoot };
+}
+
 export function audit(
   rubric: Rubric,
   ctx: Ctx,
@@ -92,6 +101,7 @@ export function audit(
   }
 
   const { ctx: subpackageCtx, relPath: subpackagePath } = resolveSubpackageCtx(ctx, manifest);
+  const rootCtx = rootAxisCtx(ctx, subpackageCtx, subpackagePath);
 
   const perAxis: AuditResult['per_axis'] = [];
   for (const axis of rubric.axes) {
@@ -106,7 +116,7 @@ export function audit(
       });
       continue;
     }
-    const evalCtx = axis.applies_to ? subpackageCtx : ctx;
+    const evalCtx = axis.applies_to ? subpackageCtx : rootCtx;
     if (axis.applies_to && !axis.applies_to.includes(evalCtx.stack)) {
       perAxis.push({
         axis_id: axis.id,

package/src/author.ts

@@ -61,8 +61,24 @@ export function remoteParts(url: string): { host: string; group: string; path: s
 
 /** Words that say nothing about whose repo it is. */
 const GENERIC = new Set([
-  'git', 'com', 'org', 'name', 'www', 'ssh', 'http', 'https', 'the', 'app', 'mcp',
-  'github', 'gitlab', 'dev', 'net', 'vorobyev', 'vodmal', 'dmitry',
+  'git',
+  'com',
+  'org',
+  'name',
+  'www',
+  'ssh',
+  'http',
+  'https',
+  'the',
+  'app',
+  'mcp',
+  'github',
+  'gitlab',
+  'dev',
+  'net',
+  'vorobyev',
+  'vodmal',
+  'dmitry',
 ]);
 
 export function nameTokens(dir: string, remotePath: string): Set<string> {
@@ -77,7 +93,11 @@ export function nameTokens(dir: string, remotePath: string): Set<string> {
 function describe(dir: string): PoolRepo {
   const cfg = git(dir, ['config', '--local', '--get-regexp', '^(user\\.(name|email)|remote\\.origin\\.url)$']) ?? '';
   const val = (key: string) =>
-    cfg.split('\n').find((l) => l.toLowerCase().startsWith(`${key} `))?.slice(key.length + 1).trim() ?? '';
+    cfg
+      .split('\n')
+      .find((l) => l.toLowerCase().startsWith(`${key} `))
+      ?.slice(key.length + 1)
+      .trim() ?? '';
   const email = val('user.email');
   const remote = remoteParts(val('remote.origin.url'));
   return {
@@ -177,11 +197,10 @@ export function rankAuthors(dir: string, pool: PoolRepo[]): AuthorCandidate[] {
   }
 
   const fallbackName = [...names.values()].flatMap((m) => [...m.entries()]).sort((a, b) => b[1] - a[1])[0]?.[0] ?? '';
-  return ranked
-    .map(([email, s]) => {
-      const byName = [...(names.get(email)?.entries() ?? [])].sort((a, b) => b[1] - a[1]);
-      return { email, name: byName[0]?.[0] ?? fallbackName, score: s, why: why.get(email) ?? [] };
-    });
+  return ranked.map(([email, s]) => {
+    const byName = [...(names.get(email)?.entries() ?? [])].sort((a, b) => b[1] - a[1]);
+    return { email, name: byName[0]?.[0] ?? fallbackName, score: s, why: why.get(email) ?? [] };
+  });
 }
 
 export function writeAuthor(dir: string, author: Author): boolean {

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 {
@@ -95,12 +95,14 @@ export function checkRepoHooks(root: string | null): CheckResult | null {
         remedy: `chmod +x ${hooksPath}/*`,
       };
     }
-    return bodyProblems(id, label, [...hooks.values()]) ?? {
-      id,
-      label,
-      status: 'ok',
-      message: `${hooks.size} hook(s) active via ${hooksPath}`,
-    };
+    return (
+      bodyProblems(id, label, [...hooks.values()]) ?? {
+        id,
+        label,
+        status: 'ok',
+        message: `${hooks.size} hook(s) active via ${hooksPath}`,
+      }
+    );
   }
 
   const states = cloneHookStates(root, ctx, frameworks);
@@ -110,7 +112,9 @@ export function checkRepoHooks(root: string | null): CheckResult | null {
       id,
       label,
       status: 'warning',
-      message: off.map((s) => `${s.framework.id} (${s.framework.declaredIn}): ${s.problem} — those hooks never run`).join('; '),
+      message: off
+        .map((s) => `${s.framework.id} (${s.framework.declaredIn}): ${s.problem} — those hooks never run`)
+        .join('; '),
       ...(off[0]!.remedy ? { remedy: off[0]!.remedy } : {}),
     };
   }
@@ -149,7 +153,8 @@ function bodyProblems(id: string, label: string, bodies: string[]): CheckResult
       label,
       status: 'warning',
       message: `hooks call ${missing.join(', ')} — not on this machine, the commit fails or the gate is skipped`,
-      remedy: 'install what the hook calls here, or move the hook out of the repository (a personal hook in git config)',
+      remedy:
+        'install what the hook calls here, or move the hook out of the repository (a personal hook in git config)',
     };
   }
   return null;

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;
       }
@@ -179,7 +183,10 @@ export function machineOf(c: Conversation, host: string): string | null {
 }
 
 /** The newest conversation of each machine (unknown counts as one), newest first. */
-export function latestPerMachine(conversations: Conversation[], machine: (c: Conversation) => string | null): Conversation[] {
+export function latestPerMachine(
+  conversations: Conversation[],
+  machine: (c: Conversation) => string | null,
+): Conversation[] {
   const out: Conversation[] = [];
   for (const c of [...conversations].sort((a, b) => b.updated.getTime() - a.updated.getTime())) {
     if (!out.some((o) => sameMachine(machine(o), machine(c)))) out.push(c);
@@ -187,7 +194,6 @@ export function latestPerMachine(conversations: Conversation[], machine: (c: Con
   return out;
 }
 
-
 /**
  * The conversation a running Claude Code process is in, from its session file
  * `<config>/sessions/<pid>.json` — it follows /clear. That folder is per
@@ -195,9 +201,22 @@ export function latestPerMachine(conversations: Conversation[], machine: (c: Con
  */
 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;
+  }
+}
+
+/** When a running Claude Code process started (ms), from the same session file; null — not known. */
+export function liveStartedAt(env: NodeJS.ProcessEnv, home: string, pid: number): number | null {
+  try {
+    const file = path.join(claudeConfigDir(env, home), 'sessions', `${pid}.json`);
+    const started = at(JSON.parse(fs.readFileSync(file, 'utf8')), 'startedAt');
+    return typeof started === 'number' ? started : null;
   } catch {
     return null;
   }
@@ -220,19 +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;
@@ -262,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';
   }
 }
 
@@ -282,7 +304,11 @@ export const LIVE_SESSIONS_SCRIPT =
   'kill -0 "$p" 2>/dev/null && tr -d "\\n" < "$f" && echo; done; exit 0';
 
 /** Claude Code processes alive on this machine. */
-export function liveSessionsHere(env: NodeJS.ProcessEnv, home: string, alive: (pid: number) => boolean = pidAlive): LiveSession[] {
+export function liveSessionsHere(
+  env: NodeJS.ProcessEnv,
+  home: string,
+  alive: (pid: number) => boolean = pidAlive,
+): LiveSession[] {
   const dir = path.join(claudeConfigDir(env, home), 'sessions');
   let names: string[];
   try {

package/src/doctor.ts

@@ -6,7 +6,13 @@ 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 { checkPersonalHooks, defaultPersonalHookDeps, fixPersonalHooks, type PersonalHookDeps } from './personal-hooks.ts';
+import { at, dict } from './narrow.ts';
+import {
+  checkPersonalHooks,
+  defaultPersonalHookDeps,
+  fixPersonalHooks,
+  type PersonalHookDeps,
+} from './personal-hooks.ts';
 
 export type CheckStatus = 'ok' | 'warning' | 'missing';
 
@@ -39,11 +45,7 @@ export interface DoctorReport {
 
 export function readCliVersion(): string {
   try {
-    const pkgPath = path.resolve(
-      path.dirname(fileURLToPath(import.meta.url)),
-      '..',
-      'package.json',
-    );
+    const pkgPath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', 'package.json');
     const raw = JSON.parse(fs.readFileSync(pkgPath, 'utf8')) as { version?: string };
     return raw.version ?? 'unknown';
   } catch {
@@ -315,8 +317,7 @@ function checkVdx(): CheckResult {
     status: 'ok',
     level,
     message: `${tag} — works inside this project only (${found})`,
-    remedy:
-      'npm i -g @vodmal/vdx-cli  OR  add `alias vdx="npx -y -p @vodmal/vdx-cli vdx"` to your shell rc',
+    remedy: 'npm i -g @vodmal/vdx-cli  OR  add `alias vdx="npx -y -p @vodmal/vdx-cli vdx"` to your shell rc',
   };
 }
 
@@ -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 };
@@ -458,9 +459,7 @@ export function runDoctorCheck(
   );
   return rows
     .map(
-      (c) =>
-        `vdx doctor: ${c.label} — ${c.message}.` +
-        (c.remedy ? ` Fix, on the user's word: \`${c.remedy}\`.` : ''),
+      (c) => `vdx doctor: ${c.label} — ${c.message}.` + (c.remedy ? ` Fix, on the user's word: \`${c.remedy}\`.` : ''),
     )
     .join('\n');
 }

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);