mister-wolf 2.18.4 → 2.19.0

package/dist/adapters/cli/commands/memory-upgrade.js

@@ -1,10 +1,32 @@
 import { spawn } from 'child_process';
-import { realpathSync, readFileSync } from 'fs';
+import { existsSync, mkdtempSync, readdirSync, readFileSync, realpathSync, writeFileSync } from 'fs';
+import { tmpdir } from 'os';
 import { fileURLToPath } from 'url';
-import { dirname, join } from 'path';
+import { basename, dirname, join } from 'path';
+import { createInterface } from 'node:readline/promises';
 import { Command } from 'commander';
 import { runUpgrade } from '../../../app/use-cases/upgrade.js';
 import { UserFacingError } from '../../../domain/errors.js';
+import { runProjectStep } from '../../../app/use-cases/project-step.js';
+import { mapCategories, STATUS_TEXT, statusOf } from '../../../app/use-cases/upgrade-projects.js';
+import { projectPath } from '../../../app/use-cases/verify-against-map.js';
+import { compareVersions, loadUpdateMap } from '../../fs/update-map.js';
+import { ProjectsRegistry } from '../../fs/projects-registry.js';
+import { wolfUserConfigDir } from '../../fs/user-config.js';
+import { loadSyncState } from '../../render/sync-state.js';
+import { parseStamp } from '../../render/stamp.js';
+import { harnessTemplatesRoot, templatesRoot } from '../../render/templates-root.js';
+import { OpencodeBaseSetRenderer } from '../../render/opencode/opencode-renderer.js';
+import { MarkdownMemoryStore } from '../../fs/markdown-memory-store.js';
+import { JsonlEventLog } from '../../fs/jsonl-event-log.js';
+import { SQLiteSearchIndex } from '../../sqlite/sqlite-search-index.js';
+import { SystemClock } from '../../fs/system-clock.js';
+import { HashIdGenerator } from '../../fs/hash-id-generator.js';
+import { FsMemoryLock } from '../../fs/memory-lock.js';
+import { eventsPath, indexPath, memoryDir } from '../../fs/project-paths.js';
+import { colorsEnabled } from '../../../domain/facet-colors.js';
+import { renderReport, } from '../report-renderer.js';
+import { safeCwd } from '../cli-entry.js';
 // wolf upgrade (бриф 2026-09-02): npm-самообновление глобальной установки.
 // spawn npm идёт через PATH — e2e подменяет npm фейком первой записью PATH,
 // реальный registry в тестах не дёргается.
@@ -85,20 +107,500 @@ function printOutcome(outcome) {
             throw new UserFacingError(`a dev/linked copy is installed (${outcome.binaryPath ?? 'path unknown'}) — upgrade not applicable; to update: npm rm -g mister-wolf && npm i -g mister-wolf`);
     }
 }
+const HERE_TITLE = 'wolf upgrade — here';
+const msg = (err) => (err instanceof Error ? err.message : String(err));
+const line = (marker, text, dim = false) => ({ kind: 'line', marker, text, dim });
+/** Справочный состав/штамп cwd (формат T7 stampVersions): max/min set= по
+ * штампованным файлам свидетеля рендера; штамп недостоверен — свидетель, не истина. */
+function stampVersions(root) {
+    let max = null;
+    let min = null;
+    for (const rel of Object.keys(loadSyncState(root).files)) {
+        let stamp;
+        try {
+            stamp = parseStamp(readFileSync(join(root, rel), 'utf-8'));
+        }
+        catch {
+            continue;
+        }
+        if (!stamp)
+            continue;
+        if (max === null || compareVersions(stamp.set, max) > 0)
+            max = stamp.set;
+        if (min === null || compareVersions(stamp.set, min) < 0)
+            min = stamp.set;
+    }
+    return { max, min };
+}
+/** Одиночный план (правила REQ-02 для одного проекта, формат строк T7):
+ * имя · путь · состав/штамп → цель · категории карты числами · режим
+ * «вне реестра». Пinned не проверяем — --here осознанный ручной инструмент. */
+function planSection(cwd, map) {
+    const cats = mapCategories(map);
+    const stamps = stampVersions(cwd);
+    const floor = stamps.min !== null && stamps.min !== stamps.max ? ` (stamps from ${stamps.min})` : '';
+    return {
+        kind: 'section',
+        title: 'Plan',
+        children: [
+            line('info', `plan: ${basename(cwd)} · ${cwd}`),
+            line('info', `composition ${stamps.max ?? 'unknown'}${floor} → ${map.version}`, true),
+            line('info', `map: ${cats.new} new · ${cats.changed} changed · ${cats.deprecated} deprecated · ${cats.removed} removed · seed×${map.faces.filter((f) => f.seed).length}`, true),
+            line('info', 'outside the registry — manual mode', true),
+        ],
+    };
+}
+/** Детали шага одного проекта (REQ-05): base-set/лица/схема/сверка — формат
+ * строк T7 projectsSection. */
+function stepDetailLines(report) {
+    const out = [];
+    const counts = { updated: 0, created: 0, appended: 0, identical: 0, mutated: 0, conflict: 0 };
+    for (const o of report.sync.outcomes) {
+        if (o.action === 'skipped') {
+            if (o.mutated)
+                counts.mutated++;
+            else
+                counts.identical++;
+        }
+        else {
+            counts[o.action]++;
+        }
+    }
+    const bsParts = Object.entries(counts)
+        .filter(([, n]) => n > 0)
+        .map(([k, n]) => `${n} ${k}`);
+    if (bsParts.length > 0)
+        out.push(line('info', `base-set: ${bsParts.join(', ')}`, true));
+    if (report.seed.length > 0) {
+        const faces = report.seed.map((s) => `${s.file.replace(/-playbook\.md$/, '')} ${s.kind ?? s.action}`).join(', ');
+        out.push(line('info', `faces: ${faces}`, true));
+    }
+    if (report.schema.status !== 'ok') {
+        out.push(line('warn', `schema: ${report.schema.status}${report.schema.error ? ` — ${report.schema.error}` : ''}`, true));
+    }
+    const v = report.verify.summary;
+    const ok = report.verify.items.length - v.needsDecision - v.errors;
+    const parts = [`${ok}/${report.verify.items.length} ok`];
+    if (v.needsDecision > 0)
+        parts.push(`${v.needsDecision} needs decision`);
+    if (v.errors > 0)
+        parts.push(`${v.errors} errors`);
+    out.push(line(v.errors > 0 ? 'error' : v.needsDecision > 0 ? 'warn' : 'info', `verify: ${parts.join(' · ')}`, true));
+    return out;
+}
+/** Счётчик статуса одного проекта — лейблы паркового словаря T7. */
+const STATUS_COUNTER = {
+    updated: 'updated',
+    'up-to-date': 'up-to-date',
+    'needs-decision': 'needs decision',
+    error: 'errors',
+};
+/** Ручной режим (REQ-14): полный проектный шаг (T6) в cwd из текущего
+ * бинарника. Guard — именно .wolf/memory (не .wolf): каталог с .wolf без
+ * памяти — не живой проект, честный отказ с подсказкой init (exit 1 кладёт
+ * caller: UserFacingError → одна строка Error:, прецедент runCli).
+ * Отчёт — один проект REQ-05: план → статус+детали → summary → финальная
+ * строка exit-таблицы (та же таблица, что у прохода парка). Без banner. */
+export async function runUpgradeHere(deps, opts = {}) {
+    if (!existsSync(join(deps.cwd, '.wolf', 'memory'))) {
+        throw new UserFacingError(`no wolf memory in ${deps.cwd} — run wolf init first`);
+    }
+    const map = deps.loadMap();
+    const plan = planSection(deps.cwd, map);
+    // Подтверждение — правила REQ-02 для одиночного плана; список покрывает и
+    // удаления (ADR-4), второго вопроса шаг не задаёт.
+    let proceed = opts.yes === true;
+    let declinedByUser = false;
+    if (!proceed && opts.tty && opts.confirm) {
+        proceed = await opts.confirm(plan);
+        declinedByUser = !proceed;
+    }
+    if (!proceed) {
+        const finalText = declinedByUser ? 'Cancelled — no changes' : 'Cancelled: --yes is required';
+        return {
+            exitCode: 0,
+            report: { kind: 'section', title: HERE_TITLE, children: [plan, line('info', finalText, true)] },
+        };
+    }
+    const confirmedRemovals = map.files.filter((f) => f.category === 'removed').map(projectPath);
+    const runStep = deps.runStep ?? runProjectStep;
+    let report = null;
+    let error = null;
+    try {
+        report = await runStep(deps.makeStepDeps(deps.cwd), deps.cwd, map, { confirmedRemovals });
+    }
+    catch (err) {
+        error = msg(err); // изоляция сбоя шага: error-строка, не крах команды (REQ-06)
+    }
+    const status = report ? statusOf(report) : 'error';
+    const cats = mapCategories(map);
+    const seeded = report ? report.seed.filter((s) => s.kind === 'seeded' || s.kind === 'legacy-absorbed').length : 0;
+    const counters = [
+        { label: STATUS_COUNTER[status], count: 1 },
+        { label: 'new', count: cats.new },
+        { label: 'changed', count: cats.changed },
+        { label: 'deprecated', count: cats.deprecated },
+        { label: 'removed', count: cats.removed },
+        { label: 'faces seeded', count: seeded },
+    ];
+    // Exit-модель (design §«Exit-модель», та же таблица для одного проекта)
+    const exitCode = status === 'error' ? 1 : status === 'needs-decision' ? 2 : 0;
+    const finalText = status === 'error' ? 'Failed' : status === 'needs-decision' ? 'Done with attention' : 'Done';
+    const marker = status === 'error' ? 'error' : status === 'needs-decision' ? 'warn' : 'ok';
+    const children = [
+        plan,
+        line(marker, error !== null ? `${basename(deps.cwd)} — error: ${error}` : `${basename(deps.cwd)} — ${STATUS_TEXT[status]}`, status === 'up-to-date'),
+        ...(report ? stepDetailLines(report) : []),
+        { kind: 'summary', counters, done: false },
+        line(marker, finalText),
+    ];
+    return { exitCode, report: { kind: 'section', title: HERE_TITLE, children } };
+}
+/** Прод-deps шага для root (контейнер-прецедент по адаптерам, но БЕЗ
+ * createCliContainer: его selfHealRegistry пишет реестр, а --here реестр
+ * не трогает — REQ-14). Привязка к root напрямую, как per-project deps T7.
+ * Экспорт — точечный reuse фазы 2 (T8 upgrade-projects), не дубль сборки. */
+export function hereStepDeps(root) {
+    const tplPlaybooks = join(templatesRoot(), 'playbooks');
+    const files = new Map();
+    if (existsSync(tplPlaybooks)) {
+        for (const f of readdirSync(tplPlaybooks)) {
+            if (f.endsWith('.md'))
+                files.set(f, readFileSync(join(tplPlaybooks, f), 'utf-8'));
+        }
+    }
+    return {
+        renderer: new OpencodeBaseSetRenderer(templatesRoot(), {
+            harnessTemplatesRoot: harnessTemplatesRoot('opencode'),
+        }),
+        files,
+        store: new MarkdownMemoryStore(root),
+        log: new JsonlEventLog(eventsPath(root)),
+        index: new SQLiteSearchIndex(indexPath(root)),
+        clock: new SystemClock(),
+        idGen: new HashIdGenerator(),
+        lock: new FsMemoryLock(memoryDir(root)),
+    };
+}
+/** TermEnv из реального stdout/env (REQ-15): не-TTY/пайп/NO_COLOR → plain;
+ * глубина цвета деградирует COLORTERM → TERM → 16; ширина — columns (80).
+ * Экспорт — точечный reuse фазы 2 (T8 upgrade-projects). */
+export function termEnv(stdout, env) {
+    if (!colorsEnabled(stdout, env))
+        return { tty: false, colors: 'mono', width: 80 };
+    const colorterm = env.COLORTERM ?? '';
+    const colors = colorterm.includes('truecolor') || colorterm.includes('24bit')
+        ? 'truecolor'
+        : (env.TERM ?? '').includes('256color')
+            ? '256'
+            : '16';
+    return { tty: true, colors, width: stdout.columns ?? 80 };
+}
+/** CLI-обвязка --here: прод-deps + TTY-подтверждение (план показан ДО вопроса,
+ * REQ-02) + печать отчёта renderer'ом и простановка exit-кода. */
+async function upgradeHereAction(cwd, yes) {
+    const isTty = Boolean(process.stdout.isTTY);
+    const env = termEnv(process.stdout, process.env);
+    const confirm = isTty
+        ? async (plans) => {
+            process.stdout.write(`${renderReport(plans, env)}\n`);
+            const rl = createInterface({ input: process.stdin, output: process.stdout });
+            try {
+                const ans = (await rl.question('Upgrade this project? [y/N] ')).trim().toLowerCase();
+                return ans === 'y' || ans === 'yes';
+            }
+            finally {
+                rl.close();
+            }
+        }
+        : undefined;
+    const res = await runUpgradeHere({ cwd, loadMap: () => loadUpdateMap(), makeStepDeps: hereStepDeps }, { yes, tty: isTty, confirm });
+    process.stdout.write(`${renderReport(res.report, env)}\n`);
+    process.exitCode = res.exitCode;
+}
+const CLASS_TEXT = {
+    current: 'current',
+    behind: 'behind',
+    'needs-decision': 'needs decision',
+    unknown: 'unknown — out of coverage',
+};
+/** Чистая классификация (design §«--check»), приоритет правил — как в брифе:
+ *  mutated → «требует решения»; differs/missing по целям карты и существующий
+ *  removed-файл → «отстаёт»; foreign/unknown → «unknown — вне покрытия»;
+ *  иначе «актуальный». AGENTS.md — цель карты agents_md тем же словарём.
+ *  deprecated — report-only (REQ-11), вне-карты — справочно. */
+export function classifyProject(map, outcomes, removedExisting) {
+    const out = {
+        cls: 'current',
+        differs: [],
+        missing: [],
+        mutated: [],
+        foreign: [],
+        uncertain: [],
+        removedPresent: [...removedExisting],
+        deprecated: [],
+        outsideMap: [],
+    };
+    const byFile = new Map(outcomes.map((o) => [o.file, o.action]));
+    const targetRels = new Set();
+    const absorb = (rel, action) => {
+        if (action === 'mutated')
+            out.mutated.push(rel);
+        else if (action === 'foreign')
+            out.foreign.push(rel);
+        else if (action === 'unknown')
+            out.uncertain.push(rel);
+        else if (action === 'differs')
+            out.differs.push(rel);
+        else if (action === 'missing')
+            out.missing.push(rel);
+    };
+    for (const entry of map.files) {
+        const rel = projectPath(entry);
+        targetRels.add(rel);
+        if (entry.category === 'deprecated') {
+            out.deprecated.push(rel); // report-only (REQ-11)
+            continue;
+        }
+        absorb(rel, byFile.get(rel));
+    }
+    if (map.agents_md.category !== 'deprecated')
+        absorb('AGENTS.md', byFile.get('AGENTS.md'));
+    for (const o of outcomes) {
+        if (o.file !== 'AGENTS.md' && !targetRels.has(o.file))
+            out.outsideMap.push(o.file);
+    }
+    out.cls =
+        out.mutated.length > 0
+            ? 'needs-decision'
+            : out.differs.length > 0 || out.missing.length > 0 || out.removedPresent.length > 0
+                ? 'behind'
+                : out.foreign.length > 0 || out.uncertain.length > 0
+                    ? 'unknown'
+                    : 'current';
+    return out;
+}
+const CHECK_TITLE = 'wolf upgrade — check';
+/** Детали проекта одной строкой: `2 differ · 1 missing · mutated: …`. */
+function freshnessDetails(f) {
+    const parts = [];
+    if (f.differs.length > 0)
+        parts.push(`${f.differs.length} differ`);
+    if (f.missing.length > 0)
+        parts.push(`${f.missing.length} missing`);
+    if (f.mutated.length > 0)
+        parts.push(`mutated: ${f.mutated.join(', ')}`);
+    if (f.foreign.length > 0)
+        parts.push(`foreign: ${f.foreign.join(', ')}`);
+    if (f.uncertain.length > 0)
+        parts.push(`unknown: ${f.uncertain.join(', ')}`);
+    if (f.removedPresent.length > 0)
+        parts.push(`removed present: ${f.removedPresent.join(', ')}`);
+    if (f.outsideMap.length > 0)
+        parts.push(`${f.outsideMap.length} files outside the map`);
+    return parts.length > 0 ? parts.join(' · ') : null;
+}
+const stampNote = (root) => {
+    const stamps = stampVersions(root);
+    const floor = stamps.min !== null && stamps.min !== stamps.max ? ` (stamps from ${stamps.min})` : '';
+    return `stamps ${stamps.max ?? 'unknown'}${floor}`;
+};
+/** Секция одного проекта (REQ-08): имя · путь · класс · штамп/состав (справочно) ·
+ *  детали · deprecated-строка. Сбой инспекции — error-строка, не крах (REQ-06). */
+async function projectCheckLines(entry, map, deps) {
+    const name = basename(entry.path);
+    if (!existsSync(entry.path)) {
+        return [line('info', `${name} · ${entry.path} — ${CLASS_TEXT.unknown} (path does not exist)`, true)];
+    }
+    try {
+        const outcomes = await deps.inspect(entry.path);
+        const removedExisting = map.files
+            .filter((e) => e.category === 'removed' && existsSync(join(entry.path, projectPath(e))))
+            .map(projectPath);
+        const f = classifyProject(map, outcomes, removedExisting);
+        const marker = f.cls === 'current' ? 'ok' : f.cls === 'unknown' ? 'info' : 'warn';
+        const lines = [
+            line(marker, `${name} · ${entry.path} — ${CLASS_TEXT[f.cls]}`, f.cls === 'current'),
+            line('info', `${stampNote(entry.path)} · map ${map.version}`, true),
+        ];
+        const details = freshnessDetails(f);
+        if (details)
+            lines.push(line('info', details, true));
+        if (f.deprecated.length > 0) {
+            lines.push(line('info', `deprecated: ${f.deprecated.join(', ')} (report-only)`, true));
+        }
+        return lines;
+    }
+    catch (err) {
+        return [line('error', `${name} — error: ${msg(err)}`)];
+    }
+}
+/** `--check`-сводка парка (REQ-08): CLI-строка (installed vs available) →
+ *  перечисление проектов реестра. Деградации не крахят: битый реестр/npm —
+ *  error-строка; карты нет — штампы с пометкой недостоверности и классом
+ *  unknown (никогда current); пустой реестр — «no projects». exit 0. */
+export async function runUpgradeCheck(deps) {
+    const children = [];
+    try {
+        children.push(line('info', `cli: installed ${deps.installedVersion()} · available ${await deps.registryVersion()}`));
+    }
+    catch (err) {
+        children.push(line('error', `cli: installed ${deps.installedVersion()} · available unknown — ${msg(err)}`));
+    }
+    let registered = null;
+    try {
+        registered = await deps.registry.listStrict();
+    }
+    catch (err) {
+        children.push(line('error', `failed to read the projects registry: ${msg(err)}`));
+    }
+    if (registered !== null) {
+        if (registered.length === 0) {
+            children.push(line('info', 'no projects in the registry — run wolf init in a project to register it'));
+        }
+        else {
+            let map = null;
+            try {
+                map = deps.loadMap();
+            }
+            catch {
+                map = null;
+            }
+            if (map) {
+                for (const entry of registered)
+                    children.push(...(await projectCheckLines(entry, map, deps)));
+            }
+            else {
+                // Деградация (design §«--check»): карты нет у самого CLI — только штампы
+                // (свидетель касания, не истина) с явной пометкой недостоверности.
+                children.push(line('warn', 'map unavailable in this CLI — stamps only, unreliable'));
+                for (const entry of registered) {
+                    children.push(line('info', `${basename(entry.path)} · ${entry.path} — ${CLASS_TEXT.unknown}`));
+                    children.push(line('info', stampNote(entry.path), true));
+                }
+            }
+        }
+    }
+    children.push(line('ok', 'Done (read-only)'));
+    return { exitCode: 0, report: { kind: 'section', title: CHECK_TITLE, children } };
+}
+/** CLI-обвязка check-сводки (REQ-08): реестр — как projects (wolfUserConfigDir),
+ *  инспекция — read-only inspectBaseSet ('omit' — паритет sync-рендера);
+ *  exit не меняется (--check всегда 0). */
+async function upgradeCheckAction(viewVersion) {
+    const renderer = new OpencodeBaseSetRenderer(templatesRoot(), {
+        harnessTemplatesRoot: harnessTemplatesRoot('opencode'),
+    });
+    const res = await runUpgradeCheck({
+        registry: new ProjectsRegistry(wolfUserConfigDir()),
+        loadMap: () => loadUpdateMap(),
+        registryVersion: viewVersion,
+        installedVersion: readInstalledVersion,
+        inspect: (root) => renderer.inspectBaseSet(root, { models: 'omit' }),
+    });
+    process.stdout.write(`${renderReport(res.report, termEnv(process.stdout, process.env))}\n`);
+}
+/** Re-exec нового бинарника (ADR-2, «Контракт spawn»): state-файл
+ *  `{ from, to, startedAt }` пишется ДО spawn; spawn без shell со stdio
+ *  inherit и env: process.env (склейка фаз, REQ-15); код родителя = код
+ *  ребёнка (убит сигналом → 1); сбой spawn/старта → UserFacingError —
+ *  npm-фаза идемпотентна, повторный `wolf upgrade` при up-to-date сразу
+ *  уходит в проектный проход. State — только контекст отчёта (NFR-02),
+ *  чистка не требуется (ОС-tmp). */
+export async function reExecUpgradeProjects(from, to, npmPrefix, opts = {}) {
+    const stateDir = opts.stateDir ?? mkdtempSync(join(tmpdir(), 'wolf-upgrade-state-'));
+    const statePath = join(stateDir, 'state.json');
+    writeFileSync(statePath, JSON.stringify({ from, to, startedAt: (opts.now ?? Date.now)() }));
+    const childBin = opts.childBin ?? process.env.WOLF_UPGRADE_CHILD_BIN ?? join(npmPrefix ?? tmpdir(), 'bin', 'wolf');
+    const argv = [
+        'upgrade-projects',
+        '--from',
+        from,
+        '--to',
+        to,
+        ...(opts.yes === true ? ['--yes'] : []),
+        '--no-banner',
+        '--state',
+        statePath,
+    ];
+    const child = (opts.spawnImpl ?? spawn)(childBin, argv, { stdio: 'inherit', env: process.env });
+    const exit = opts.exit ?? ((code) => process.exit(code));
+    await new Promise((resolve, reject) => {
+        let settled = false; // error и close могут прийти оба (порядок не гарантирован)
+        child.on('error', () => {
+            if (settled)
+                return;
+            settled = true;
+            reject(new UserFacingError('CLI updated; projects not touched — run wolf upgrade again for the project pass'));
+        });
+        child.on('close', (code) => {
+            if (settled)
+                return;
+            settled = true;
+            exit(code ?? 1); // code null — ребёнок убит сигналом
+            resolve(); // прод: exit не возвращает; юнит: exit — колбэк
+        });
+    });
+}
+/** npm-фаза + re-exec (T8, REQ-01/04, ADR-2): шапку печатает ТОЛЬКО фаза 1
+ *  (склейка фаз, REQ-15 — фаза 2 идёт с --no-banner); npm-сбой закрывает
+ *  секцию `└ Failed` (REQ-01 AC3) и падает ДО spawn — проекты не тронуты;
+ *  up-to-date НЕ выход — фаза идемпотентна, идём к re-exec; local-newer —
+ *  реестру нечему обновляться, spawn не нужен (exit 0); linked-refusal —
+ *  отказ printOutcome. reExec-шов — юнит/R01.3-контур (шпион вместо spawn). */
+export async function runUpgradeWithProjects(deps, opts = {}) {
+    const env = termEnv(process.stdout, process.env);
+    process.stdout.write(`${renderReport({ kind: 'banner', version: deps.currentVersion }, env)}\n`);
+    let outcome;
+    try {
+        outcome = await runUpgrade(deps, false);
+    }
+    catch (err) {
+        console.log('└ Failed'); // секция закрыта; Error:-строку и exit 1 даст runCli
+        throw err;
+    }
+    printOutcome(outcome);
+    const reExec = deps.reExec ?? reExecUpgradeProjects;
+    if (outcome.kind === 'updated') {
+        await reExec(outcome.from, outcome.to, deps.npmPrefix, { yes: opts.yes });
+    }
+    else if (outcome.kind === 'up-to-date') {
+        await reExec(outcome.current, outcome.current, deps.npmPrefix, { yes: opts.yes });
+    }
+}
 export function memoryUpgradeCommand() {
     return new Command('upgrade')
-        .description('Upgrade the global wolf installation to the latest npm version (runs npm install -g mister-wolf@latest); --check only compares versions, no install')
+        .description('One command updates everything: npm phase (npm install -g mister-wolf@latest) followed by the registered-projects pass; --check only reports CLI + park freshness, no install; --here runs the full project update step in the current directory only (no npm self-update, no registry)')
         .option('--check', 'Only check for a newer version, do not install anything')
+        .option('--here', 'Update this project only: full project step in cwd (no npm, no re-exec, no registry)')
+        .option('--yes', 'Apply the plan without interactive confirmation (--here or the projects pass)')
         .action(async (options) => {
+        if (options.here === true) {
+            await upgradeHereAction(safeCwd(), options.yes === true);
+            return; // npm-ветка при --here не выполняется вообще (REQ-14)
+        }
         const checkOnly = options.check === true;
+        // npm view один на запуск: CLI-часть и парковая сводка делят результат
+        let available = null;
+        const viewOnce = async () => {
+            if (available === null)
+                available = await registryVersion();
+            return available;
+        };
         const deps = {
             currentVersion: readInstalledVersion(),
             binaryPath: process.argv[1] ? realPathOrNull(process.argv[1]) : null,
             npmPrefix: checkOnly ? null : await npmGlobalPrefix(), // --check тип установки не проверяет
-            registryVersion,
+            registryVersion: viewOnce,
             installLatest,
         };
-        printOutcome(await runUpgrade(deps, checkOnly));
+        if (options.check === true) {
+            printOutcome(await runUpgrade(deps, true));
+            await upgradeCheckAction(viewOnce); // порядок: CLI-версии → парк (REQ-08)
+            return;
+        }
+        // npm-фаза + re-exec фазы 2 (T8): --here выше вышел раньше, re-exec там нет
+        await runUpgradeWithProjects(deps, { yes: options.yes === true });
     });
 }
 //# sourceMappingURL=memory-upgrade.js.map

package/dist/adapters/cli/commands/memory-upgrade.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory-upgrade.js","sourceRoot":"","sources":["../../../../src/adapters/cli/commands/memory-upgrade.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"memory-upgrade.js","sourceRoot":"","sources":["../../../../src/adapters/cli/commands/memory-upgrade.ts"],"names":[],"mappings":"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"}

package/dist/adapters/cli/commands/upgrade-projects.d.ts

@@ -0,0 +1,17 @@
+import { Command } from 'commander';
+import { type UpgradeProjectsDeps } from '../../../app/use-cases/upgrade-projects.js';
+import { type TermEnv } from '../report-renderer.js';
+/** IO-шов юнит-контура фазы 2: tty/печать/вопрос; прод — process stdio + readline. */
+export interface ProjectsIo {
+    tty: boolean;
+    env: TermEnv;
+    write(text: string): void;
+    ask(): Promise<boolean>;
+}
+/** Прод-deps фазы 2 (T8): реестр/карта/фабрика шага/lock/скан — риск-список Ф4. */
+export declare function upgradeProjectsDeps(): UpgradeProjectsDeps;
+/** Обвязка фазы 2: deps + TTY-confirm (plans ДО вопроса, REQ-02) + печать
+ *  отчёта renderer'ом и простановка exit-кода. */
+export declare function upgradeProjectsAction(yes: boolean, deps?: UpgradeProjectsDeps, io?: ProjectsIo): Promise<void>;
+export declare function upgradeProjectsCommand(): Command;
+//# sourceMappingURL=upgrade-projects.d.ts.map

package/dist/adapters/cli/commands/upgrade-projects.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade-projects.d.ts","sourceRoot":"","sources":["../../../../src/adapters/cli/commands/upgrade-projects.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAsB,KAAK,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AAO1G,OAAO,EAAiC,KAAK,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEpF,sFAAsF;AACtF,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACzB;AAoBD,mFAAmF;AACnF,wBAAgB,mBAAmB,IAAI,mBAAmB,CAQzD;AAED;kDACkD;AAClD,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,OAAO,EACZ,IAAI,GAAE,mBAA2C,EACjD,EAAE,GAAE,UAAqB,GACxB,OAAO,CAAC,IAAI,CAAC,CAWf;AAED,wBAAgB,sBAAsB,IAAI,OAAO,CAchD"}