@kisev/agentomatic 11.0.2 → 12.0.0

package/dist/config-setup.d.ts

@@ -6,20 +6,20 @@ export declare const CONFIG_TARGETS: readonly ["opencode", "kilo", "mimo"];
 export type ConfigTargetName = (typeof CONFIG_TARGETS)[number];
 export type TargetFileKind = "main" | "tui";
 export declare const CONFIG_FRAGMENTS: readonly [{
+    readonly name: "core-disable";
+    readonly description: "Disconnect only the agentomatic plugin, preserving unrelated configuration";
+    readonly targets: readonly ["opencode"];
+    readonly file: "main";
+}, {
     readonly name: "core-plugin";
     readonly description: "Register @kisev/agentomatic in the plugin array (OpenCode only)";
     readonly targets: readonly ["opencode"];
     readonly file: "main";
 }, {
     readonly name: "skills-state-permissions";
-    readonly description: "Allow the standard skills XDG state paths without per-run prompts";
+    readonly description: "Allow the canonical ~/.agents/skills tree, legacy skills state paths, and reviewmatic-managed review worktrees without per-run prompts";
     readonly targets: readonly ["opencode", "kilo", "mimo"];
     readonly file: "main";
-}, {
-    readonly name: "lsp-preset";
-    readonly description: "Add LSP servers from the shared catalog (OpenCode only)";
-    readonly targets: readonly ["opencode"];
-    readonly file: "main";
 }, {
     readonly name: "secrets-guard";
     readonly description: "Deny reads and edits of common secret files";
@@ -32,7 +32,7 @@ export declare const CONFIG_FRAGMENTS: readonly [{
     readonly file: "main";
 }, {
     readonly name: "tui-schema";
-    readonly description: "Unify each agent TUI file: schema, theme, stacked diffs, and leader keybinds";
+    readonly description: "Configure terminal settings: OpenCode V2 cli.json or Kilo/MiMo TUI files";
     readonly targets: readonly ["opencode", "kilo", "mimo"];
     readonly file: "tui";
 }];
@@ -77,9 +77,15 @@ export declare function recoverConfigSetup(scope: Scope, dryRun: boolean, cwd?:
 }>;
 export declare function normalizeConfigSelection(scope: Scope, value?: Partial<ConfigSetupSelection>): ConfigSetupSelection;
 export declare function defaultConfigSelection(scope: Scope, cwd?: string, home?: string): Promise<ConfigSetupSelection>;
-export declare function previewConfigSetup(selection: ConfigSetupSelection, scope: Scope, cwd?: string, home?: string, provisionDependency?: boolean): Promise<ConfigSetupPlan>;
+export declare function inspectIntegration(scope: Scope, cwd?: string, home?: string): Promise<{
+    path: string;
+    connected: boolean;
+    problem?: string;
+}>;
+export declare function previewConfigSetup(selection: ConfigSetupSelection, scope: Scope, cwd?: string, home?: string, provisionDependency?: boolean, syncSelection?: boolean): Promise<ConfigSetupPlan>;
 export declare function applyConfigSetup(selection: ConfigSetupSelection, scope: Scope, cwd?: string, home?: string, options?: {
     dependencyRunner?: DependencyRunner;
     provisionDependency?: boolean;
     receipt?: string;
+    syncSelection?: boolean;
 }): Promise<ConfigSetupPlan>;

package/dist/config-setup.js

@@ -1,19 +1,30 @@
-import { readFileSync } from "node:fs";
 import { randomUUID } from "node:crypto";
 import { lstat } from "node:fs/promises";
 import { homedir } from "node:os";
-import { dirname, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import { archiveMutations } from "./installer.js";
+import { join, resolve } from "node:path";
+import { archiveMutations, coreSelectionMutation } from "./installer.js";
 import { requirePackageVersion } from "./package-metadata.js";
 import { ensureDependency, planDependency } from "./self-install.js";
 import { applyTransaction, archiveRoot, deploymentRoot, LifecycleError, lifecycleRoot, inspectTransaction, readRegular, recoverTransaction, sha256, withLifecycleLock, } from "./lifecycle.js";
 import { applyJsoncEdits, parseJsonc } from "./jsonc.js";
-const PACKAGE_NAME = "@kisev/agentomatic";
-const LEGACY_PACKAGE_NAME = "@kisev/skills-opencode";
-const packageRoot = resolve(dirname(fileURLToPath(import.meta.url)), "..");
+import { corePluginEdits, corePluginRemovalEdits, permissionEdits, } from "./opencode-config.js";
 const XDG_STATE_GLOB = "~/.local/state/agent-skills/**";
 const OPENCODE_SKILLS_GLOB = "~/.config/opencode/skills/**";
+const AGENTS_SKILLS_GLOB = "~/.agents/skills/**";
+// Structural pattern for reviewmatic-managed review worktrees: one managed
+// catalog per repository as a sibling of the checkout (`<repo>.worktrees/
+// reviewmatic/<hash>`). No per-repository or per-MR path is predetermined, and
+// a typo'd sibling state directory such as `agent-skill` never matches this
+// pattern or the state globs above.
+const WORKTREE_TREE_GLOB = "*.worktrees/reviewmatic/**";
+const WORKTREE_ROOT = "*.worktrees/reviewmatic";
+const WORKTREE_BASE = "*.worktrees";
+// V2 checks external paths against a canonical directory boundary that
+// normally ends in `/*`, so the exact roots above never match an actual
+// worktree access. This boundary pattern covers the managed reviewmatic
+// catalog and every managed worktree inside it, without opening sibling
+// directories of other tools under `<repo>.worktrees`.
+const WORKTREE_BOUNDARY_GLOB = "*.worktrees/reviewmatic/*";
 const SECRET_PATHS = [
     "**/.env",
     "**/.env.*",
@@ -40,6 +51,12 @@ export class ConfigSetupError extends LifecycleError {
 }
 export const CONFIG_TARGETS = ["opencode", "kilo", "mimo"];
 export const CONFIG_FRAGMENTS = [
+    {
+        name: "core-disable",
+        description: "Disconnect only the agentomatic plugin, preserving unrelated configuration",
+        targets: ["opencode"],
+        file: "main",
+    },
     {
         name: "core-plugin",
         description: "Register @kisev/agentomatic in the plugin array (OpenCode only)",
@@ -48,16 +65,10 @@ export const CONFIG_FRAGMENTS = [
     },
     {
         name: "skills-state-permissions",
-        description: "Allow the standard skills XDG state paths without per-run prompts",
+        description: "Allow the canonical ~/.agents/skills tree, legacy skills state paths, and reviewmatic-managed review worktrees without per-run prompts",
         targets: ["opencode", "kilo", "mimo"],
         file: "main",
     },
-    {
-        name: "lsp-preset",
-        description: "Add LSP servers from the shared catalog (OpenCode only)",
-        targets: ["opencode"],
-        file: "main",
-    },
     {
         name: "secrets-guard",
         description: "Deny reads and edits of common secret files",
@@ -72,7 +83,7 @@ export const CONFIG_FRAGMENTS = [
     },
     {
         name: "tui-schema",
-        description: "Unify each agent TUI file: schema, theme, stacked diffs, and leader keybinds",
+        description: "Configure terminal settings: OpenCode V2 cli.json or Kilo/MiMo TUI files",
         targets: ["opencode", "kilo", "mimo"],
         file: "tui",
     },
@@ -94,16 +105,43 @@ async function configSnapshot(built) {
 }
 async function requireNoRecovery(stateRoot) {
     if (await readRegular(join(stateRoot, "transaction-journal.json")))
-        throw new ConfigSetupError("recovery_required", "An interrupted transaction requires config recover --dry-run, then confirmed config recover before a fresh preview");
+        throw new ConfigSetupError("recovery_required", "An interrupted transaction requires maintenance recover --dry-run, then confirmed maintenance recover before a fresh preview");
 }
 export async function recoverConfigSetup(scope, dryRun, cwd = process.cwd(), home = homedir(), expectedDigest) {
     const root = deploymentRoot(scope, cwd, home);
     const state = lifecycleRoot(scope, cwd, home);
-    const built = await build({ targets: [...CONFIG_TARGETS], fragments: [...FRAGMENT_NAMES] }, scope, cwd, home);
-    const allowed = [...built.allowedRoots, archiveRoot(scope, cwd, home)];
-    const paths = await inspectTransaction(root, state, allowed);
     const journalPath = join(state, "transaction-journal.json");
     const journal = await readRegular(journalPath);
+    const scopeRoot = resolve(scope === "global" ? home : cwd);
+    let recoveryRoot = root;
+    if (journal) {
+        let candidate;
+        try {
+            candidate = JSON.parse(journal.toString("utf8"));
+        }
+        catch {
+            throw new ConfigSetupError("invalid_journal", "Transaction journal is not valid JSON");
+        }
+        if (candidate.root === scopeRoot && scopeRoot !== root) {
+            const prefix = scope === "global" ? ".config/opencode/" : ".opencode/";
+            if (!Array.isArray(candidate.operations) ||
+                candidate.operations.some((operation) => !operation.root && !operation.path?.startsWith(prefix)))
+                throw new ConfigSetupError("invalid_journal", "Cleanup journal contains paths outside the deployment");
+            recoveryRoot = scopeRoot;
+        }
+    }
+    const allowed = [
+        root,
+        archiveRoot(scope, cwd, home),
+        ...(scope === "project"
+            ? [resolve(cwd)]
+            : [
+                join(home, ".config", "opencode"),
+                join(home, ".config", "kilo"),
+                join(home, ".config", "mimocode"),
+            ]),
+    ];
+    const paths = await inspectTransaction(recoveryRoot, state, allowed);
     const digest = journal ? sha256(journal) : null;
     if (dryRun || !paths.length)
         return { paths, recovered: false, digest };
@@ -111,7 +149,7 @@ export async function recoverConfigSetup(scope, dryRun, cwd = process.cwd(), hom
         const current = await readRegular(journalPath);
         if (!current || !expectedDigest || sha256(current) !== expectedDigest)
             throw new ConfigSetupError("stale_receipt", "Recovery journal changed; preview recovery again");
-        return recoverTransaction(root, state, allowed);
+        return recoverTransaction(recoveryRoot, state, allowed);
     });
     return { paths, recovered, digest };
 }
@@ -137,23 +175,26 @@ const UNIFIED_TUI_KEYBINDS = {
     messages_toggle_conceal: "<leader>h,<leader>р",
     tips_toggle: "<leader>h,<leader>р",
 };
-const LSP_SERVER_COMMANDS = {
-    python: ["basedpyright-langserver", "--stdio"],
-    typescript: ["typescript-language-server", "--stdio"],
-    yaml: ["yaml-language-server", "--stdio"],
-    shell: ["bash-language-server", "start"],
+const OPENCODE_KEYBINDS = {
+    "command.palette.show": "alt+p",
+    "app.exit": "ctrl+d,<leader>q,<leader>й",
+    "session.first": "ctrl+g",
+    "session.last": "ctrl+alt+g",
+    "prompt.editor": "<leader>e,<leader>у",
+    "theme.switch": "<leader>t,<leader>е",
+    "session.sidebar.toggle": "<leader>b,<leader>и",
+    "opencode.status": "<leader>s,<leader>ы",
+    "session.export": "<leader>x,<leader>ч",
+    "session.new": "<leader>n,<leader>т",
+    "session.list": "<leader>l,<leader>д",
+    "session.timeline": "<leader>g,<leader>п",
+    "session.compact": "<leader>c,<leader>с",
+    "model.list": "<leader>m,<leader>ь",
+    "agent.list": "<leader>a,<leader>ф",
+    "messages.copy": "<leader>y,<leader>н",
+    "session.undo": "<leader>u,<leader>г",
+    "session.redo": "<leader>r,<leader>к",
 };
-function lspCatalog() {
-    const raw = readFileSync(resolve(packageRoot, "dist", "assets", "lsp-catalog.json"), "utf8");
-    const catalog = JSON.parse(raw);
-    if (!Array.isArray(catalog.servers))
-        throw new ConfigSetupError("invalid_package", "LSP catalog is unavailable");
-    return catalog.servers
-        .filter((server) => typeof server.name === "string" &&
-        Array.isArray(server.extensions) &&
-        server.extensions.every((extension) => typeof extension === "string"))
-        .filter((server) => LSP_SERVER_COMMANDS[server.name]);
-}
 function mapAllowsAll(value) {
     return Boolean(value &&
         typeof value === "object" &&
@@ -171,20 +212,41 @@ function fragmentEdits(fragment, target, current) {
         ? value.permission
         : {};
     if (fragment === "core-plugin") {
-        return [
-            { kind: "set-if-absent", path: ["$schema"], value: "https://opencode.ai/config.json" },
-            { kind: "set-if-absent", path: ["plugin"], value: [] },
-            {
-                kind: "replace-array-value",
-                path: ["plugin"],
-                from: LEGACY_PACKAGE_NAME,
-                to: PACKAGE_NAME,
-            },
-            { kind: "append-unique", path: ["plugin"], value: PACKAGE_NAME },
-        ];
+        return corePluginEdits(value);
     }
+    if (fragment === "core-disable")
+        return corePluginRemovalEdits(value);
     if (fragment === "skills-state-permissions") {
-        const statePaths = target === "opencode" ? [XDG_STATE_GLOB, OPENCODE_SKILLS_GLOB] : [XDG_STATE_GLOB];
+        const statePaths = target === "opencode"
+            ? [XDG_STATE_GLOB, OPENCODE_SKILLS_GLOB, AGENTS_SKILLS_GLOB]
+            : [XDG_STATE_GLOB];
+        if (target === "opencode")
+            return permissionEdits(value, [
+                ...statePaths.flatMap((resource) => [
+                    { action: "read", resource, effect: "allow" },
+                    { action: "external_directory", resource, effect: "allow" },
+                ]),
+                { action: "edit", resource: XDG_STATE_GLOB, effect: "allow" },
+                // Directory enumeration (glob/list) targets the roots themselves, which
+                // the tree globs above do not match; allow those exact directories.
+                ...statePaths.map((resource) => ({
+                    action: "external_directory",
+                    resource: resource.replace(/\/\*\*$/, ""),
+                    effect: "allow",
+                })),
+                { action: "external_directory", resource: "~/.agents", effect: "allow" },
+                // Read-only access to reviewmatic-managed review worktrees, including
+                // the directory boundaries external access is checked against. Read is
+                // scoped to the managed reviewmatic catalog, and pre-existing user or
+                // secret denies keep priority: the insertion rule in permissionEdits
+                // places each new allow before any overlapping recorded deny. No shell
+                // or edit permission is added, and sibling catalogs of other tools
+                // under `<repo>.worktrees` stay unapproved.
+                { action: "read", resource: WORKTREE_TREE_GLOB, effect: "allow" },
+                { action: "external_directory", resource: WORKTREE_BOUNDARY_GLOB, effect: "allow" },
+                { action: "external_directory", resource: WORKTREE_ROOT, effect: "allow" },
+                { action: "external_directory", resource: WORKTREE_BASE, effect: "allow" },
+            ]);
         const edits = [];
         if (!mapAllowsAll(permission.read))
             edits.push(...permissionMapEdits(["permission", "read"], Object.fromEntries(statePaths.map((glob) => [glob, "allow"]))));
@@ -192,16 +254,22 @@ function fragmentEdits(fragment, target, current) {
             edits.push(...permissionMapEdits(["permission", "edit"], { [XDG_STATE_GLOB]: "allow" }));
         if (!mapAllowsAll(permission.external_directory))
             edits.push(...permissionMapEdits(["permission", "external_directory"], Object.fromEntries(statePaths.map((glob) => [glob, "allow"]))));
-        return edits;
-    }
-    if (fragment === "lsp-preset") {
-        return lspCatalog().map((server) => ({
-            kind: "set-if-absent",
-            path: ["lsp", server.name],
-            value: { command: LSP_SERVER_COMMANDS[server.name], extensions: server.extensions },
+        edits.push(...permissionMapEdits(["permission", "read"], { [WORKTREE_TREE_GLOB]: "allow" }), ...permissionMapEdits(["permission", "external_directory"], {
+            [WORKTREE_BOUNDARY_GLOB]: "allow",
+            [WORKTREE_ROOT]: "allow",
+            [WORKTREE_BASE]: "allow",
         }));
+        return edits;
     }
     if (fragment === "secrets-guard") {
+        if (target === "opencode")
+            return permissionEdits(value, [
+                ...SECRET_PATHS.flatMap((glob) => [
+                    { action: "read", resource: glob.replace(/^\*\*\//, "*"), effect: "deny" },
+                    { action: "edit", resource: glob.replace(/^\*\*\//, "*"), effect: "deny" },
+                ]),
+                { action: "read", resource: "*.env.example", effect: "allow" },
+            ]);
         const deny = Object.fromEntries(SECRET_PATHS.map((glob) => [glob, "deny"]));
         return [
             ...permissionMapEdits(["permission", "read"], {
@@ -219,8 +287,18 @@ function fragmentEdits(fragment, target, current) {
             { kind: "set-if-absent", path: ["mcp_tool_display"], value: "expanded" },
         ];
     }
+    if (target === "opencode")
+        return [
+            { kind: "set-if-absent", path: ["$schema"], value: "https://opencode.ai/v2/cli.json" },
+            { kind: "set-if-absent", path: ["theme", "name"], value: "ayu" },
+            ...Object.entries(OPENCODE_KEYBINDS).map(([key, value]) => ({
+                kind: "set-if-absent",
+                path: ["keybinds", key],
+                value,
+            })),
+        ];
     const tuiSchemas = {
-        opencode: "https://opencode.ai/tui.json",
+        opencode: undefined,
         kilo: undefined,
         mimo: "https://mimo.xiaomi.com/mimocode/tui.json",
     };
@@ -255,6 +333,8 @@ export function normalizeConfigSelection(scope, value = {}) {
     if (scope === "project" && (targets.length !== 1 || targets[0] !== "opencode"))
         throw new ConfigSetupError("invalid_selection", "Project scope supports only the opencode target");
     const requestedFragments = value.fragments ?? [];
+    if (requestedFragments.includes("core-plugin") && requestedFragments.includes("core-disable"))
+        throw new ConfigSetupError("invalid_selection", "Choose either core-plugin or core-disable");
     const fragments = FRAGMENT_NAMES.filter((fragment) => requestedFragments.includes(fragment));
     if (fragments.length !== requestedFragments.length)
         throw new ConfigSetupError("invalid_selection", "Unknown config fragment selection");
@@ -275,9 +355,26 @@ export async function defaultConfigSelection(scope, cwd = process.cwd(), home =
     }
     return normalizeConfigSelection(scope, {
         targets: [...new Set(targets)],
-        fragments: [...FRAGMENT_NAMES],
+        fragments: FRAGMENT_NAMES.filter((name) => name !== "core-disable"),
     });
 }
+export async function inspectIntegration(scope, cwd = process.cwd(), home = homedir()) {
+    const file = await resolveTargetFile("opencode", scope, cwd, home);
+    const raw = await readRegular(file.absolute);
+    if (!raw)
+        return { path: file.absolute, connected: false };
+    try {
+        const current = parseJsonc(raw.toString("utf8"));
+        return { path: file.absolute, connected: corePluginRemovalEdits(current).length > 0 };
+    }
+    catch (error) {
+        return {
+            path: file.absolute,
+            connected: false,
+            problem: error instanceof Error ? error.message : "Invalid configuration",
+        };
+    }
+}
 async function resolveTargetFile(target, scope, cwd, home, kind = "main") {
     const existing = async (root, path) => Boolean(await readRegular(join(root, path)).catch(() => undefined));
     const globalRoot = deploymentRoot("global", cwd, home);
@@ -308,9 +405,9 @@ async function resolveTargetFile(target, scope, cwd, home, kind = "main") {
         return {
             target,
             root: globalRoot,
-            path: "tui.json",
-            absolute: join(globalRoot, "tui.json"),
-            exists: await existing(globalRoot, "tui.json"),
+            path: "cli.json",
+            absolute: join(globalRoot, "cli.json"),
+            exists: await existing(globalRoot, "cli.json"),
         };
     }
     if (target === "opencode") {
@@ -362,7 +459,7 @@ async function resolveTargetFile(target, scope, cwd, home, kind = "main") {
         exists: false,
     };
 }
-async function build(selection, scope, cwd = process.cwd(), home = homedir()) {
+async function build(selection, scope, cwd = process.cwd(), home = homedir(), syncSelection = true) {
     const root = deploymentRoot(scope, cwd, home);
     const operations = [];
     const mutations = [];
@@ -404,6 +501,20 @@ async function build(selection, scope, cwd = process.cwd(), home = homedir()) {
             for (const fragment of selection.fragments) {
                 if (!applicable(fragment, target) || fragmentFileKind(fragment) !== kind)
                     continue;
+                if (target === "opencode" &&
+                    kind === "tui" &&
+                    !file.exists &&
+                    ((await readRegular(join(file.root, "tui.json"))) ||
+                        (await readRegular(join(file.root, "tui.jsonc"))))) {
+                    operations.push({
+                        target,
+                        path: file.absolute,
+                        fragment,
+                        operation: "conflict",
+                        reason: "Start OpenCode V2 once to migrate existing TUI preferences into cli.json before applying terminal presets",
+                    });
+                    continue;
+                }
                 let parsed = undefined;
                 try {
                     parsed = parseJsonc(text);
@@ -464,6 +575,23 @@ async function build(selection, scope, cwd = process.cwd(), home = homedir()) {
             ? "TUI files are global-only"
             : "no selected target supports this fragment",
     }));
+    const core = selection.fragments.find((fragment) => fragment === "core-plugin" || fragment === "core-disable");
+    if (syncSelection &&
+        core &&
+        selection.targets.includes("opencode") &&
+        !operations.some((operation) => operation.fragment === core && operation.operation === "conflict")) {
+        const mutation = await coreSelectionMutation(root, core === "core-plugin");
+        if (mutation) {
+            mutations.push(mutation);
+            operations.push({
+                target: "opencode",
+                path: join(root, mutation.path),
+                fragment: core,
+                operation: "update",
+                reason: "Save connection choice for repeat install and repair",
+            });
+        }
+    }
     const sorted = operations.sort((left, right) => CONFIG_TARGETS.indexOf(left.target) - CONFIG_TARGETS.indexOf(right.target) ||
         FRAGMENT_NAMES.indexOf(left.fragment) -
             FRAGMENT_NAMES.indexOf(right.fragment) ||
@@ -491,11 +619,11 @@ async function build(selection, scope, cwd = process.cwd(), home = homedir()) {
         allowedRoots: [...allowedRoots],
     };
 }
-export async function previewConfigSetup(selection, scope, cwd = process.cwd(), home = homedir(), provisionDependency = true) {
+export async function previewConfigSetup(selection, scope, cwd = process.cwd(), home = homedir(), provisionDependency = true, syncSelection = true) {
     const stateRoot = lifecycleRoot(scope, cwd, home);
     try {
         await requireNoRecovery(stateRoot);
-        const built = await build(selection, scope, cwd, home);
+        const built = await build(selection, scope, cwd, home, syncSelection);
         if (provisionDependency &&
             selection.fragments.includes("core-plugin") &&
             selection.targets.includes("opencode"))
@@ -507,6 +635,7 @@ export async function previewConfigSetup(selection, scope, cwd = process.cwd(),
             resolve(cwd),
             resolve(home),
             provisionDependency,
+            syncSelection,
         ]);
         for (const [id, prior] of configReceipts)
             if (prior.key === key || prior.expires < Date.now())
@@ -532,7 +661,8 @@ export async function applyConfigSetup(selection, scope, cwd = process.cwd(), ho
     try {
         return await withLifecycleLock(stateRoot, async () => {
             await requireNoRecovery(stateRoot);
-            const built = await build(selection, scope, cwd, home);
+            const syncSelection = options.syncSelection !== false;
+            const built = await build(selection, scope, cwd, home, syncSelection);
             const provisionDependency = options.provisionDependency !== false;
             if (provisionDependency &&
                 selection.fragments.includes("core-plugin") &&
@@ -544,6 +674,7 @@ export async function applyConfigSetup(selection, scope, cwd = process.cwd(), ho
                 resolve(cwd),
                 resolve(home),
                 provisionDependency,
+                syncSelection,
             ]);
             const id = options.receipt ?? [...configReceipts].find(([, entry]) => entry.key === key)?.[0];
             const receipt = id ? configReceipts.get(id) : undefined;
@@ -574,6 +705,8 @@ export async function applyConfigSetup(selection, scope, cwd = process.cwd(), ho
                     await provision();
                     return built.plan;
                 }
+                if (!built.plan.operations.some((operation) => operation.operation === "conflict"))
+                    return built.plan;
                 throw new ConfigSetupError("invalid_state", "Config setup plan has no applicable changes");
             }
             const backups = [];

package/dist/contracts.js

@@ -9,6 +9,32 @@ function strings(value) {
 export function validateAgentReport(agent, report, card) {
     if (!object(report))
         throw new Error("agent report must be an object");
+    if ((agent === "review" || agent === "critic") &&
+        !card &&
+        report.schema === "portable-gitlab/critic-receipt/v2") {
+        const required = [
+            "schema",
+            "evidence_digest",
+            "run_id",
+            "session_id",
+            "findings",
+            "external_mutations",
+        ];
+        const allowed = [...required, "scope_digest", "target_finding_ids"];
+        if (!required.every((key) => key in report) ||
+            Object.keys(report).some((key) => !allowed.includes(key)) ||
+            !/^[0-9a-f]{64}$/.test(String(report.evidence_digest)) ||
+            typeof report.run_id !== "string" ||
+            !report.run_id ||
+            typeof report.session_id !== "string" ||
+            !report.session_id ||
+            !Array.isArray(report.findings) ||
+            report.external_mutations !== false ||
+            ("scope_digest" in report && !/^[0-9a-f]{64}$/.test(String(report.scope_digest))) ||
+            ("target_finding_ids" in report && !strings(report.target_finding_ids)))
+            throw new Error("code-review critic receipt has an invalid transport envelope");
+        return;
+    }
     if (agent === "critic" && !card && "review_report" in report) {
         validateAgentReport("review", report);
         return;

package/dist/doctor.d.ts

@@ -9,7 +9,6 @@ export type DoctorCheck = {
 };
 export type DoctorHost = {
     config?: () => Promise<unknown>;
-    lsp?: () => Promise<unknown>;
 };
 export type DoctorReport = {
     schema_version: 1;