kibi-cli 2.12.0 → 2.13.0

package/dist/commands/doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AA+EA,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC3B;AAGD,wBAAsB,aAAa,CACjC,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAgG/B;AAED,wBAAsB,4BAA4B,CAChD,IAAI,GAAE,MAAM,OAAO,CAAC;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE,CACT,GACxC,OAAO,CAAC,OAAO,CAAC,CAOlB;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;;;;;;;;;;;;;;;;MAkE3C;AAkGD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGzE;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,SAAS,CAepB"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AAiFA,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC3B;AAGD,wBAAsB,aAAa,CACjC,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAoG/B;AAED,wBAAsB,4BAA4B,CAChD,IAAI,GAAE,MAAM,OAAO,CAAC;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE,CACT,GACxC,OAAO,CAAC,OAAO,CAAC,CAOlB;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;;;;;;;;;;;;;;;;MAkE3C;AAkGD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGzE;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,SAAS,CAepB"}

package/dist/commands/doctor.js

@@ -21,9 +21,11 @@ import { createRequire } from "node:module";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 import { bootstrapKibiEnvironment, secretSourceFromBootstrap, } from "../env/bootstrap.js";
+import { kibiPackageVersions } from "../package-versions.js";
 import { describeConfiguredCapabilityPlugins, readProjectKibiConfig, } from "../plugins/project-config.js";
 import { SwiplResolutionError, inspectSwiplBundle, probeRequiredLibraries, resolveSwipl, } from "../prolog/swipl-resolver.js";
 import { buildMigrationPlan, migrationAction, } from "../public/operations/migration-plan.js";
+import { resolveReadBranchAttachment } from "../utils/branch-resolver.js";
 import { resolveGitRepository, } from "../utils/git-repository-context.js";
 import { readKbManifestStatus } from "../utils/kb-manifest.js";
 import { hasManagedHooks, outdatedManagedHooks } from "./init-helpers.js";
@@ -86,6 +88,10 @@ export async function doctorCommand(options = {}) {
             name: "Capability plugins",
             check: checkCapabilityPlugins,
         },
+        {
+            name: "Engine daemon",
+            check: checkEngineDaemon,
+        },
     ];
     const results = [];
     for (const { name, check } of checks) {
@@ -227,7 +233,7 @@ async function runtimeProvenance() {
         mcpCliRange: mcp.dependencies?.["kibi-cli"] ?? "unknown",
         executeApplyPlanExported,
         entrypoint: process.argv[1] ?? "unknown",
-        packageVersions: process.env.KIBI_PACKAGE_VERSIONS ?? "unknown",
+        packageVersions: kibiPackageVersions(),
         locations: {
             cli: packagePath,
             cliEntrypoint: process.argv[1] ?? "unknown",
@@ -494,6 +500,75 @@ function formatJevStaticConfigParts(env = process.env) {
     }
     return [`jev.model=${model}`, `jev.timeoutMs=${String(timeoutMs)}`];
 }
+/**
+ * The package versions and SWI-Prolog of the engine daemon serving this
+ * workspace and branch, read through its handshake without starting one. A
+ * daemon with other versions is replaced by the next Kibi command, so it is
+ * reported, not failed.
+ */
+// implements REQ-engine-daemon-package-versions
+async function checkEngineDaemon() {
+    const workspaceRoot = path.resolve(process.env.KIBI_WORKSPACE ??
+        process.env.KIBI_PROJECT_ROOT ??
+        process.env.KIBI_ROOT ??
+        process.cwd());
+    const expected = kibiPackageVersions();
+    const attachment = resolveReadBranchAttachment(workspaceRoot);
+    if ("error" in attachment) {
+        return {
+            passed: true,
+            message: "Not checked: no branch to address the engine daemon",
+            details: { running: false, expectedPackageVersions: expected },
+        };
+    }
+    const { EngineClient } = await import("../engine.js");
+    const client = new EngineClient({
+        workspaceRoot,
+        branch: attachment.kbBranch,
+    });
+    let daemon = null;
+    try {
+        daemon = await client.inspectLiveDaemon();
+    }
+    catch (error) {
+        return {
+            passed: true,
+            message: `Not reachable: ${error instanceof Error ? error.message : String(error)}`,
+            details: { running: false, expectedPackageVersions: expected },
+        };
+    }
+    finally {
+        await client.terminate();
+    }
+    if (daemon === null) {
+        return {
+            passed: true,
+            message: "Not running",
+            details: { running: false, expectedPackageVersions: expected },
+        };
+    }
+    const details = {
+        running: true,
+        pid: client.getPid(),
+        branch: attachment.kbBranch,
+        packageVersions: daemon.packageVersions,
+        prologIdentity: daemon.prologIdentity,
+        expectedPackageVersions: expected,
+    };
+    if (daemon.packageVersions === expected) {
+        return {
+            passed: true,
+            message: `Running ${daemon.packageVersions}`,
+            details,
+        };
+    }
+    return {
+        passed: true,
+        message: `Running ${daemon.packageVersions ?? "a daemon that reports no package versions"}, not this CLI's ${expected}; the next Kibi command replaces it`,
+        remediation: "Run: kibi engine stop",
+        details,
+    };
+}
 function checkKbDirectory() {
     const kbDir = path.join(process.cwd(), ".kb");
     if (!existsSync(kbDir)) {

package/dist/engine.d.ts

@@ -8,6 +8,14 @@ export { EngineQueryLimitError, QUERY_LIMIT_EXCEEDED_CODE, queryLimitExceededOf,
 export type { EngineLimitExceeded, EngineQueryLimits, } from "./engine-limits.js";
 export declare const ENGINE_PROTOCOL_VERSION = 1;
 export declare const ENGINE_IDLE_TIMEOUT_MS: number;
+/**
+ * Package versions this engine build carries (KIBI_PACKAGE_VERSIONS when
+ * set). The client sends them on every request and the daemon reports its
+ * own in the handshake; a daemon with other versions is replaced, never
+ * reused.
+ */
+export declare function enginePackageVersions(): string;
+/** @deprecated The versions at module load; call enginePackageVersions(). */
 export declare const ENGINE_PACKAGE_VERSIONS: string;
 /**
  * Identity of the SWI-Prolog this process would launch (`<bin>@<version>`).
@@ -43,6 +51,11 @@ export type EnginePublicationLease = Readonly<{
     readonly release: () => void;
 }>;
 export declare function acquireEnginePublicationLease(workspaceRoot: string, branch: string): EnginePublicationLease;
+/** What a live daemon reports in its handshake. */
+export type EngineDaemonIdentity = Readonly<{
+    prologIdentity: string | null;
+    packageVersions: string | null;
+}>;
 export type EngineClientOptions = {
     readonly workspaceRoot: string;
     readonly branch: string;
@@ -99,11 +112,21 @@ export declare class EngineClient {
     invalidateCache(): void;
     isRunning(): boolean;
     private readAttachedIdentity;
-    private daemonRuntimeMatches;
+    /** The live daemon's handshake: its SWI-Prolog and package versions. */
+    private daemonHandshake;
+    /**
+     * The identity a live daemon reports, without starting one; null when no
+     * daemon serves this workspace and branch. The connection is closed again.
+     */
+    inspectLiveDaemon(): Promise<EngineDaemonIdentity | null>;
+    /** Why the live daemon may not serve this client, or null when it may. */
+    private daemonRuntimeMismatch;
     /**
-     * A live daemon keeps the SWI-Prolog it was started with. When this client
-     * resolves a different executable or version (KIBI_SWIPL changed, the
-     * bundled package was upgraded, a pre-handshake daemon), the daemon is
+     * A live daemon keeps the SWI-Prolog and the package versions it was
+     * started with. When this client resolves a different executable or
+     * version (KIBI_SWIPL changed, the bundled package was upgraded, a
+     * pre-handshake daemon) or carries other package versions (a daemon left
+     * by another install, for example one a git hook started), the daemon is
      * stopped and replaced; it is never reused.
      */
     private reconcileRuntime;

package/dist/engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"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"}

package/dist/engine.js

@@ -14,6 +14,7 @@ import * as path from "node:path";
 import { performance } from "node:perf_hooks";
 import { fileURLToPath } from "node:url";
 import { BOUNDED_READ_HELPER_DEFINITION, assertWithinQueryLimits, boundedReadGoal, normalizeQueryLimits, queryLimitsFromEnv, settleBoundedRead, } from "./engine-limits.js";
+import { kibiPackageVersions } from "./package-versions.js";
 import { writePerformanceTraceEvent } from "./performance-trace.js";
 import { PrologProcess, resolveKbPlPath } from "./prolog.js";
 import { parseEntityFromList, parseListOfLists } from "./prolog/codec.js";
@@ -33,7 +34,18 @@ const READ_LIMITED_METHODS = new Set([
 ]);
 export const ENGINE_PROTOCOL_VERSION = 1;
 export const ENGINE_IDLE_TIMEOUT_MS = 10 * 60 * 1000;
-export const ENGINE_PACKAGE_VERSIONS = process.env.KIBI_PACKAGE_VERSIONS ?? "unknown";
+/**
+ * Package versions this engine build carries (KIBI_PACKAGE_VERSIONS when
+ * set). The client sends them on every request and the daemon reports its
+ * own in the handshake; a daemon with other versions is replaced, never
+ * reused.
+ */
+// implements REQ-engine-daemon-package-versions
+export function enginePackageVersions() {
+    return kibiPackageVersions();
+}
+/** @deprecated The versions at module load; call enginePackageVersions(). */
+export const ENGINE_PACKAGE_VERSIONS = kibiPackageVersions();
 /**
  * Identity of the SWI-Prolog this process would launch (`<bin>@<version>`).
  * The daemon and every client compare it; a daemon running a different
@@ -864,6 +876,10 @@ export class EngineClient {
                             env: {
                                 ...process.env,
                                 KIBI_ENGINE_PROTOCOL: String(ENGINE_PROTOCOL_VERSION),
+                                // The daemon reports the versions of the client that
+                                // started it, so this client and its own daemon agree even
+                                // when the daemon entry is resolved from a bundled host.
+                                KIBI_PACKAGE_VERSIONS: enginePackageVersions(),
                             },
                         });
                         await new Promise((resolve, reject) => {
@@ -978,7 +994,7 @@ export class EngineClient {
                         ...limits,
                         id,
                         protocolVersion: ENGINE_PROTOCOL_VERSION,
-                        packageVersions: ENGINE_PACKAGE_VERSIONS,
+                        packageVersions: enginePackageVersions(),
                         prologIdentity: engineSwiplIdentity(),
                         workspaceRoot: this.workspaceRoot,
                         branch: this.branch,
@@ -1092,7 +1108,7 @@ export class EngineClient {
             method: "cancel",
             cancelOf: requestId,
             protocolVersion: ENGINE_PROTOCOL_VERSION,
-            packageVersions: ENGINE_PACKAGE_VERSIONS,
+            packageVersions: enginePackageVersions(),
             prologIdentity: engineSwiplIdentity(),
             workspaceRoot: this.workspaceRoot,
             branch: this.branch,
@@ -1136,30 +1152,68 @@ export class EngineClient {
             return null;
         return parseEngineAttachmentIdentity(status.bindings.JsonString);
     }
-    async daemonRuntimeMatches() {
+    /** The live daemon's handshake: its SWI-Prolog and package versions. */
+    async daemonHandshake() {
         const reply = await this.request({
             method: "handshake",
         });
-        return reply?.prologIdentity === engineSwiplIdentity();
+        return {
+            prologIdentity: typeof reply?.prologIdentity === "string" ? reply.prologIdentity : null,
+            packageVersions: typeof reply?.packageVersions === "string"
+                ? reply.packageVersions
+                : null,
+        };
+    }
+    /**
+     * The identity a live daemon reports, without starting one; null when no
+     * daemon serves this workspace and branch. The connection is closed again.
+     */
+    // implements REQ-engine-daemon-package-versions
+    async inspectLiveDaemon() {
+        const wasConnected = this.isRunning();
+        if (!wasConnected)
+            await this.connect(false);
+        if (!this.isRunning())
+            return null;
+        try {
+            return await this.daemonHandshake();
+        }
+        finally {
+            if (!wasConnected)
+                await this.terminate();
+        }
+    }
+    /** Why the live daemon may not serve this client, or null when it may. */
+    async daemonRuntimeMismatch() {
+        const daemon = await this.daemonHandshake();
+        const packageVersions = enginePackageVersions();
+        if (daemon.packageVersions !== packageVersions)
+            return `Kibi engine is running other package versions (${daemon.packageVersions ?? "not reported"}) than this client (${packageVersions})`;
+        if (daemon.prologIdentity !== engineSwiplIdentity())
+            return `Kibi engine is running a different SWI-Prolog than this client resolved (${engineSwiplIdentity()})`;
+        return null;
     }
     /**
-     * A live daemon keeps the SWI-Prolog it was started with. When this client
-     * resolves a different executable or version (KIBI_SWIPL changed, the
-     * bundled package was upgraded, a pre-handshake daemon), the daemon is
+     * A live daemon keeps the SWI-Prolog and the package versions it was
+     * started with. When this client resolves a different executable or
+     * version (KIBI_SWIPL changed, the bundled package was upgraded, a
+     * pre-handshake daemon) or carries other package versions (a daemon left
+     * by another install, for example one a git hook started), the daemon is
      * stopped and replaced; it is never reused.
      */
-    // implements REQ-prolog-daemon-runtime-identity
+    // implements REQ-prolog-daemon-runtime-identity, REQ-engine-daemon-package-versions
     async reconcileRuntime() {
         if (this.replacingStaleDaemon || this.socket === null)
             return;
-        if (await this.daemonRuntimeMatches())
+        if ((await this.daemonRuntimeMismatch()) === null)
             return;
         this.replacingStaleDaemon = true;
         try {
             await this.shutdownConnectedDaemon();
             await this.connect(true);
-            if (!(await this.daemonRuntimeMatches())) {
-                throw new Error(`Kibi engine is running a different SWI-Prolog than this client resolved (${engineSwiplIdentity()}); run 'kibi engine stop' and retry`);
+            const mismatch = await this.daemonRuntimeMismatch();
+            if (mismatch !== null) {
+                throw new Error(`${mismatch} after replacing it; run 'kibi engine stop' and retry`);
             }
         }
         finally {
@@ -1577,6 +1631,7 @@ export async function runEngineDaemon(requestedOptions) {
     await session.boot();
     let attachedIdentity = readEngineAttachmentIdentity(branchPath);
     const serverPrologIdentity = engineSwiplIdentity();
+    const serverPackageVersions = enginePackageVersions();
     mkdirSync(path.dirname(options.socketPath), { recursive: true, mode: 0o700 });
     if (existsSync(options.socketPath)) {
         const isLivePeerSignal = (error) => {
@@ -1739,23 +1794,22 @@ export async function runEngineDaemon(requestedOptions) {
         if (request.protocolVersion !== ENGINE_PROTOCOL_VERSION) {
             throw new Error(`Kibi engine protocol mismatch: client=${request.protocolVersion ?? "missing"}, server=${ENGINE_PROTOCOL_VERSION}`);
         }
-        const expectedPackages = process.env.KIBI_PACKAGE_VERSIONS;
-        if (expectedPackages !== undefined &&
-            request.packageVersions !== expectedPackages) {
-            throw new Error(`Kibi engine package-version mismatch: client=${request.packageVersions ?? "missing"}, server=${expectedPackages}`);
-        }
         if (canonicalFilesystemPath(request.workspaceRoot ?? "") !==
             options.workspaceRoot ||
             request.branch !== options.branch) {
             throw new Error("Kibi engine workspace identity mismatch");
         }
-        // A client that resolved a different Prolog must not be served by this
-        // daemon. Handshake reports the identity and stop must still work so the
+        // A client from another install (other package versions) or one that
+        // resolved a different Prolog must not be served by this daemon.
+        // Handshake reports both identities and stop must still work so the
         // client can replace the daemon.
-        if (request.method !== "handshake" &&
-            request.method !== "stop" &&
-            request.prologIdentity !== serverPrologIdentity) {
-            throw new Error(`Kibi engine SWI-Prolog mismatch: client=${request.prologIdentity ?? "missing"}, server=${serverPrologIdentity}`);
+        if (request.method !== "handshake" && request.method !== "stop") {
+            if (request.packageVersions !== serverPackageVersions) {
+                throw new Error(`Kibi engine package-version mismatch: client=${request.packageVersions ?? "missing"}, server=${serverPackageVersions}`);
+            }
+            if (request.prologIdentity !== serverPrologIdentity) {
+                throw new Error(`Kibi engine SWI-Prolog mismatch: client=${request.prologIdentity ?? "missing"}, server=${serverPrologIdentity}`);
+            }
         }
         if (!isEngineLifecycleRequest(request) && (await session.ensureLive())) {
             // A recycled session re-read the store; nothing cached from the lost
@@ -2037,7 +2091,10 @@ export async function runEngineDaemon(requestedOptions) {
                     throw new Error("export.targetDirectory is required");
                 return prolog.query(`kb_storage_export('${quoteProlog(request.targetDirectory)}')`);
             case "handshake":
-                return { prologIdentity: serverPrologIdentity };
+                return {
+                    prologIdentity: serverPrologIdentity,
+                    packageVersions: serverPackageVersions,
+                };
             case "stop":
                 setImmediate(() => void shutdown());
                 return { stopped: true };
@@ -2134,7 +2191,7 @@ export async function runEngineDaemon(requestedOptions) {
                             id: request.id,
                             ok: false,
                             error: "Kibi engine is shutting down; request was not executed",
-                            serverPackageVersions: ENGINE_PACKAGE_VERSIONS,
+                            serverPackageVersions,
                         });
                         return;
                     }
@@ -2149,7 +2206,7 @@ export async function runEngineDaemon(requestedOptions) {
                                 id: request.id,
                                 ok: false,
                                 error: "Kibi engine request cancelled",
-                                serverPackageVersions: ENGINE_PACKAGE_VERSIONS,
+                                serverPackageVersions,
                             });
                             return;
                         }
@@ -2159,7 +2216,7 @@ export async function runEngineDaemon(requestedOptions) {
                                 id: request.id,
                                 ok: true,
                                 result,
-                                serverPackageVersions: ENGINE_PACKAGE_VERSIONS,
+                                serverPackageVersions,
                             });
                         }
                         catch (error) {
@@ -2167,7 +2224,7 @@ export async function runEngineDaemon(requestedOptions) {
                                 id: request.id,
                                 ok: false,
                                 error: error instanceof Error ? error.message : String(error),
-                                serverPackageVersions: ENGINE_PACKAGE_VERSIONS,
+                                serverPackageVersions,
                             });
                         }
                         finally {

package/dist/operations/modeling/predicate-applyplan.d.ts

@@ -11,6 +11,13 @@ export declare function buildSuggestion(schema: PredicateSchemaCandidate, text:
      * the caller bound that argument or passed subjectHint.
      */
     requirementSubject?: string;
+    /**
+     * Every subject_key the requirement constrains. When there are any, the
+     * predicate must be about one of them (its `subject` argument or, for a
+     * schema without one, its subject_key) or kb_check reports
+     * strict-req-fact-pairing; an unpaired candidate stays incomplete.
+     */
+    constrainedSubjects?: readonly string[];
 }): PredicateSuggestion;
 export declare function buildPredicateApplyPlan(suggestion: PredicateSuggestion, args: SuggestPredicatesArgs): Array<Record<string, unknown>>;
 export declare function buildRelationshipPlan(factId: string | undefined, requirementId: string | undefined, claimText?: string, existingLogicClaims?: readonly string[]): Record<string, unknown> | null;

package/dist/operations/modeling/predicate-applyplan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"predicate-applyplan.d.ts","sourceRoot":"","sources":["../../../src/operations/modeling/predicate-applyplan.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAEV,wBAAwB,EACxB,wBAAwB,EACxB,mBAAmB,EACnB,0BAA0B,EAC1B,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAQ9B,wBAAgB,eAAe,CAC7B,MAAM,EAAE,wBAAwB,EAChC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,gBAAgB,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM,EACvD,YAAY,CAAC,EAAE,QAAQ,GAAG,MAAM,EAChC,WAAW,CAAC,EAAE;IACZ,WAAW,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;IACtC,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,eAAe,CAAC,EAAE,wBAAwB,CAAC;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,GACA,mBAAmB,CAsHrB;AAGD,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,mBAAmB,EAC/B,IAAI,EAAE,qBAAqB,GAC1B,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAqChC;AAGD,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,SAAS,CAAC,EAAE,MAAM,EAClB,mBAAmB,GAAE,SAAS,MAAM,EAAO,GAC1C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAuBhC;AAoBD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,qBAAqB,GAC1B,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAwBhC;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,0BAA0B,CAoE5B"}
+{"version":3,"file":"predicate-applyplan.d.ts","sourceRoot":"","sources":["../../../src/operations/modeling/predicate-applyplan.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAEV,wBAAwB,EACxB,wBAAwB,EACxB,mBAAmB,EACnB,0BAA0B,EAC1B,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAQ9B,wBAAgB,eAAe,CAC7B,MAAM,EAAE,wBAAwB,EAChC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,gBAAgB,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM,EACvD,YAAY,CAAC,EAAE,QAAQ,GAAG,MAAM,EAChC,WAAW,CAAC,EAAE;IACZ,WAAW,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;IACtC,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,eAAe,CAAC,EAAE,wBAAwB,CAAC;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC,GACA,mBAAmB,CA4JrB;AAGD,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,mBAAmB,EAC/B,IAAI,EAAE,qBAAqB,GAC1B,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA0ChC;AAGD,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,SAAS,CAAC,EAAE,MAAM,EAClB,mBAAmB,GAAE,SAAS,MAAM,EAAO,GAC1C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAuBhC;AAoBD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,qBAAqB,GAC1B,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAwBhC;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,0BAA0B,CAoE5B"}

package/dist/operations/modeling/predicate-applyplan.js

@@ -5,21 +5,28 @@ import { inferArgs } from "./predicate-inference.js";
 import { schemaForCandidate } from "./predicate-loader.js";
 import { hashId } from "./predicate-utils.js";
 import { applyArgumentRewrites, predicateArgumentConformance, } from "./predicate-vocabulary.js";
-// implements REQ-mcp-suggest-predicates
+// implements REQ-mcp-suggest-predicates, REQ-model-predicates-requirement-subject-v2, REQ-model-predicates-binding-clauses
 export function buildSuggestion(schema, text, subject, score, argumentBindings = {}, polarityHint, diagnostics) {
     const inferredArgs = inferArgs(schema, text, subject);
     const canonicalLauncherArgs = exactLauncherPredicateArgs(schema.predicate_name, text);
     const hasExactBinding = (name) => typeof argumentBindings[name] === "string" &&
         argumentBindings[name].trim().length > 0;
-    const requirementSubjectArgument = diagnostics?.requirementSubject &&
-        diagnostics.explicitSubject !== true &&
-        !hasExactBinding("subject")
-        ? schema.argument_names.indexOf("subject")
+    // The argument the schema names `subject`, wherever it sits; -1 when the
+    // schema names no subject (permission_rule(actor, action, resource, ...)).
+    const subjectArgument = schema.argument_names.indexOf("subject");
+    const explicitSubject = diagnostics?.explicitSubject === true;
+    // The reviewed subject: subjectHint, else the requirement's constrained
+    // subject. It binds the `subject` argument unless that argument is bound.
+    const reviewedSubject = explicitSubject
+        ? subject
+        : diagnostics?.requirementSubject;
+    const reviewedSubjectArgument = reviewedSubject !== undefined && !hasExactBinding("subject")
+        ? subjectArgument
         : -1;
     const boundArgs = schema.argument_names.map((name, index) => {
         const exactBinding = argumentBindings[name];
-        if (index === requirementSubjectArgument)
-            return diagnostics?.requirementSubject ?? "unknown";
+        if (index === reviewedSubjectArgument)
+            return reviewedSubject ?? "unknown";
         return typeof exactBinding === "string" && exactBinding.trim().length > 0
             ? exactBinding.trim()
             : (inferredArgs[index] ?? "unknown");
@@ -34,32 +41,59 @@ export function buildSuggestion(schema, text, subject, score, argumentBindings =
     const conformance = predicateArgumentConformance(schema.argument_names, boundArgs, vocabulary);
     const predicateArgs = applyArgumentRewrites(boundArgs, conformance.rewrites);
     const undeclaredArguments = new Set(conformance.undeclared.map((value) => value.argumentName));
+    // A schema without a `subject` argument may still lead with the hinted
+    // subject (inference put it there): that value is the agent's reviewed
+    // value, even when the schema names its first argument after it.
+    const hintedFirstArgument = explicitSubject &&
+        subjectArgument < 0 &&
+        !hasExactBinding(schema.argument_names[0] ?? "") &&
+        predicateArgs[0] === subject
+        ? 0
+        : -1;
     const bindingProvenanceByArgument = Object.fromEntries(schema.argument_names.map((name, index) => [
         name,
-        index === requirementSubjectArgument && !undeclaredArguments.has(name)
-            ? "requirement"
-            : classifyBinding(predicateArgs[index] ?? "unknown", text, (typeof argumentBindings[name] === "string" &&
-                argumentBindings[name].trim().length > 0) ||
-                (diagnostics?.explicitSubject === true && index === 0), canonicalLauncherArgs?.[index] === predicateArgs[index] &&
+        index === reviewedSubjectArgument && !undeclaredArguments.has(name)
+            ? explicitSubject
+                ? classifyBinding(predicateArgs[index] ?? "unknown", text, true)
+                : "requirement"
+            : classifyBinding(predicateArgs[index] ?? "unknown", text, hasExactBinding(name) || index === hintedFirstArgument, canonicalLauncherArgs?.[index] === predicateArgs[index] &&
                 !(index === 0 &&
                     predicateArgs[index] === "launcher" &&
-                    diagnostics?.explicitSubject !== true &&
-                    typeof argumentBindings[name] !== "string"), 
-            // A subject named through subjectHint is the agent's reviewed
-            // subject, even when the schema names its first argument after it.
-            index === 0 &&
-                diagnostics?.explicitSubject === true &&
-                typeof argumentBindings[name] !== "string"
+                    !explicitSubject &&
+                    typeof argumentBindings[name] !== "string"), index === hintedFirstArgument
                 ? { constants: schema.argument_constants?.[name] }
                 : {
                     argumentName: name,
                     argumentNames: schema.argument_names,
+                    argumentType: schema.argument_types[index],
                     constants: schema.argument_constants?.[name],
                 }),
     ]));
+    // The subject the planned predicate fact is about, when the requirement
+    // constrains subjects: the `subject` argument's value, or for a schema
+    // without one the reviewed subject, recorded as the fact's subject_key.
+    const constrainedSubjects = diagnostics?.constrainedSubjects ?? [];
+    const subjectKey = constrainedSubjects.length === 0
+        ? null
+        : subjectArgument >= 0
+            ? (predicateArgs[subjectArgument] ?? null)
+            : (reviewedSubject ?? null);
+    const subjectPairing = constrainedSubjects.length === 0
+        ? "not_required"
+        : subjectKey !== null && constrainedSubjects.includes(subjectKey)
+            ? "paired"
+            : "unpaired";
     const bindingProvenance = aggregateBindingProvenance(Object.values(bindingProvenanceByArgument));
     const unboundArguments = schema.argument_names.filter((name) => undeclaredArguments.has(name) ||
         !bindingCanBeApplied(bindingProvenanceByArgument[name] ?? "placeholder"));
+    // An unpaired predicate would leave kb_check's strict-req-fact-pairing on
+    // the requirement, so the subject still needs a binding: the `subject`
+    // argument, or the fact's subject_key for a schema without one.
+    if (subjectPairing === "unpaired") {
+        const missing = subjectArgument >= 0 ? "subject" : "subject_key";
+        if (!unboundArguments.includes(missing))
+            unboundArguments.push(missing);
+    }
     const canonicalKey = `${schema.predicate_name}(${predicateArgs.join(",")})`;
     // Permission-style inference carries the deontic decision as its final
     // argument. Preserve that polarity in the typed suggestion instead of
@@ -79,6 +113,8 @@ export function buildSuggestion(schema, text, subject, score, argumentBindings =
         unbound_arguments: unboundArguments,
         binding_provenance: bindingProvenance,
         binding_provenance_by_argument: bindingProvenanceByArgument,
+        subject_key: subjectKey,
+        subject_pairing: subjectPairing,
         eligibility: diagnostics?.eligibility ?? "eligible",
         rejection_reasons: [...(diagnostics?.rejectionReasons ?? [])],
         applicability_score: diagnostics?.applicabilityScore ?? score,
@@ -97,7 +133,7 @@ export function buildSuggestion(schema, text, subject, score, argumentBindings =
         schema: schemaForCandidate(schema),
     };
 }
-// implements REQ-mcp-suggest-predicates
+// implements REQ-mcp-suggest-predicates, REQ-model-predicates-requirement-subject-v2
 export function buildPredicateApplyPlan(suggestion, args) {
     if (suggestion.binding_status !== "complete" ||
         suggestion.eligibility !== "eligible")
@@ -123,6 +159,11 @@ export function buildPredicateApplyPlan(suggestion, args) {
                     ...suggestion.schema.tags.map((tag) => `predicate:${tag}`),
                 ],
                 fact_kind: "predicate",
+                // The subject the predicate is about, so kb_check pairs it with the
+                // requirement's subject fact whatever argument holds the subject.
+                ...(suggestion.subject_key
+                    ? { subject_key: suggestion.subject_key }
+                    : {}),
                 predicate_name: suggestion.predicate_name,
                 predicate_args: suggestion.predicate_args,
                 canonical_key: suggestion.canonical_key,

package/dist/operations/modeling/predicate-binding-hints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"predicate-binding-hints.d.ts","sourceRoot":"","sources":["../../../src/operations/modeling/predicate-binding-hints.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAoD7E;;;;;GAKG;AAEH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,mBAAmB,EAC9B,IAAI,EAAE,MAAM,EACZ,mBAAmB,GAAE,SAAS,MAAM,EAAO,GAC1C,WAAW,EAAE,CAiCf;AAED,wEAAwE;AACxE,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,SAAS,WAAW,EAAE,GAAG,MAAM,CAW1E"}
+{"version":3,"file":"predicate-binding-hints.d.ts","sourceRoot":"","sources":["../../../src/operations/modeling/predicate-binding-hints.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AA0D7E;;;;;GAKG;AAEH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,mBAAmB,EAC9B,IAAI,EAAE,MAAM,EACZ,mBAAmB,GAAE,SAAS,MAAM,EAAO,GAC1C,WAAW,EAAE,CA6Df;AAED,wEAAwE;AACxE,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,SAAS,WAAW,EAAE,GAAG,MAAM,CAW1E"}

package/dist/operations/modeling/predicate-binding-hints.js

@@ -1,4 +1,4 @@
-import { isGenericPlaceholder, nameOrStopWordReason, } from "./predicate-bindings.js";
+import { bindingCanBeApplied, clauseBindingReason, isGenericPlaceholder, nameOrStopWordReason, } from "./predicate-bindings.js";
 const MAX_EXAMPLES = 5;
 /** Split `name(a, b(c), d)` into its top-level arguments, or [] when it is not a call. */
 function exampleArguments(example) {
@@ -36,6 +36,12 @@ function unboundReason(candidate, name, value, text) {
     });
     if (nameReason !== null)
         return `The value "${value}" is not a binding: ${nameReason}.`;
+    const clauseReason = clauseBindingReason(value, {
+        argumentType: schema.argument_types[schema.argument_names.indexOf(name)],
+        constants: schema.argument_constants?.[name],
+    });
+    if (clauseReason !== null)
+        return `The value "${value}" is not a binding: ${clauseReason}. Bind a noun of at most 3 words, or the requirement's subject key.`;
     if (!value.trim() || isGenericPlaceholder(value))
         return "The claim text names no value for this argument.";
     if (provenance === "inferred")
@@ -50,11 +56,25 @@ function unboundReason(candidate, name, value, text) {
  * current value was not accepted, so the agent binds from the claim text
  * instead of guessing.
  */
-// implements REQ-model-predicates-binding-placeholders, REQ-model-predicates-requirement-subject
+// implements REQ-model-predicates-binding-placeholders, REQ-model-predicates-requirement-subject-v2, REQ-model-predicates-binding-clauses
 export function buildBindingHints(candidate, text, requirementSubjects = []) {
     const schema = candidate.schema;
     const parsedExamples = schema.examples.map(exampleArguments);
+    const namesSubject = schema.argument_names.includes("subject");
     return candidate.unbound_arguments.map((name) => {
+        // A schema without a subject argument records the requirement's subject
+        // as the predicate fact's subject_key instead.
+        if (name === "subject_key" && !namesSubject)
+            return {
+                argument: name,
+                position: -1,
+                type: "subject_key",
+                description: "The subject the predicate fact is about; recorded as its subject_key because the schema names no subject argument.",
+                examples: requirementSubjects.slice(0, MAX_EXAMPLES),
+                currentValue: candidate.subject_key ?? "",
+                provenance: "placeholder",
+                reason: `The ${schema.predicate_name} schema does not name the requirement's subject, so kb_check pairs the predicate with the subject fact only through subject_key. Pass subjectHint with one of the subjects the requirement constrains.`,
+            };
         const position = schema.argument_names.indexOf(name);
         const constants = schema.argument_constants?.[name];
         const exampleValues = parsedExamples
@@ -63,7 +83,13 @@ export function buildBindingHints(candidate, text, requirementSubjects = []) {
         // The subject keys the requirement already constrains come first, so
         // the predicate and the subject fact use one identifier for the subject.
         const examples = Array.from(new Set([
-            ...(name === "subject" ? requirementSubjects : []),
+            ...(name === "subject" ||
+                (!namesSubject &&
+                    clauseBindingReason(candidate.predicate_args[position] ?? "", {
+                        argumentType: schema.argument_types[position],
+                    }) !== null)
+                ? requirementSubjects
+                : []),
             ...(constants ?? []),
             ...exampleValues,
         ])).slice(0, MAX_EXAMPLES);
@@ -78,7 +104,11 @@ export function buildBindingHints(candidate, text, requirementSubjects = []) {
             examples,
             currentValue: current,
             provenance: candidate.binding_provenance_by_argument[name] ?? "placeholder",
-            reason: unboundReason(candidate, name, current, text),
+            reason: name === "subject" &&
+                candidate.subject_pairing === "unpaired" &&
+                bindingCanBeApplied(candidate.binding_provenance_by_argument[name] ?? "placeholder")
+                ? `The value "${current}" is not a subject the requirement constrains (${requirementSubjects.join(", ")}), so kb_check would not pair the predicate with the subject fact. Bind one of them.`
+                : unboundReason(candidate, name, current, text),
         };
     });
 }

package/dist/operations/modeling/predicate-bindings.d.ts

@@ -10,6 +10,8 @@ export type BindingContext = Readonly<{
     argumentNames?: readonly string[];
     /** Declared constants of this argument: always valid when matched. */
     constants?: readonly string[] | undefined;
+    /** The argument's declared type (`entity`, `actor`, `resource`, ...). */
+    argumentType?: string | undefined;
     /**
      * The claim text. A value that repeats an argument name is still a real
      * binding when the claim itself names it (a `launcher` argument bound to
@@ -23,6 +25,17 @@ export type BindingContext = Readonly<{
  * word. Declared constants and the booleans `true`/`false` always pass.
  */
 export declare function nameOrStopWordReason(value: string, context?: BindingContext): string | null;
+/** The most words a value of a naming argument may have. */
+export declare const MAX_NAMING_BINDING_WORDS = 3;
+/**
+ * Why a value taken from the claim text cannot name a participant, or null
+ * when it can: a value of an entity-, actor- or resource-like argument with
+ * more than MAX_NAMING_BINDING_WORDS words is a clause of the claim (for
+ * example everything before the modal verb), not the participant's name.
+ * Explicit bindings, requirement subjects and declared constants are not
+ * judged here.
+ */
+export declare function clauseBindingReason(value: string, context?: BindingContext): string | null;
 export declare function classifyBinding(value: string, text: string, explicit: boolean, canonical?: boolean, context?: BindingContext): BindingProvenance;
 export declare function aggregateBindingProvenance(values: readonly BindingProvenance[]): BindingProvenance;
 export declare function bindingCanBeApplied(value: BindingProvenance): boolean;

package/dist/operations/modeling/predicate-bindings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"predicate-bindings.d.ts","sourceRoot":"","sources":["../../../src/operations/modeling/predicate-bindings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAgH9D,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAW3D;AAgED,iEAAiE;AACjE,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMlD;AAED,sDAAsD;AACtD,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC;IACpC,qCAAqC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yCAAyC;IACzC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,sEAAsE;IACtE,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC1C;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC,CAAC;AAiBH;;;;GAIG;AAEH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,cAAmB,GAC3B,MAAM,GAAG,IAAI,CAYf;AAGD,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,EACjB,SAAS,UAAQ,EACjB,OAAO,GAAE,cAAmB,GAC3B,iBAAiB,CAmBnB;AAUD,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,SAAS,iBAAiB,EAAE,GACnC,iBAAiB,CAQnB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAIrE"}
+{"version":3,"file":"predicate-bindings.d.ts","sourceRoot":"","sources":["../../../src/operations/modeling/predicate-bindings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAgH9D,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAW3D;AAgED,iEAAiE;AACjE,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMlD;AAED,sDAAsD;AACtD,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC;IACpC,qCAAqC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yCAAyC;IACzC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,sEAAsE;IACtE,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC1C,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC,CAAC;AAiBH;;;;GAIG;AAEH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,cAAmB,GAC3B,MAAM,GAAG,IAAI,CAYf;AAgBD,4DAA4D;AAC5D,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAE1C;;;;;;;GAOG;AAEH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,cAAmB,GAC3B,MAAM,GAAG,IAAI,CAOf;AAGD,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,EACjB,SAAS,UAAQ,EACjB,OAAO,GAAE,cAAmB,GAC3B,iBAAiB,CAsBnB;AAUD,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,SAAS,iBAAiB,EAAE,GACnC,iBAAiB,CAQnB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAIrE"}

package/dist/operations/modeling/predicate-bindings.js

@@ -209,7 +209,42 @@ export function nameOrStopWordReason(value, context = {}) {
         return `it repeats the argument name ${token} and the claim does not name it`;
     return null;
 }
-// implements REQ-mcp-suggest-predicates, REQ-model-predicates-binding-placeholders
+/**
+ * Argument types that name a participant (who or what), so a value is a
+ * short noun or a subject key, never a clause of the claim.
+ */
+const NAMING_ARGUMENT_TYPES = new Set([
+    "entity",
+    "actor",
+    "actor_scope",
+    "resource",
+    "owner",
+    "role",
+    "component",
+]);
+/** The most words a value of a naming argument may have. */
+export const MAX_NAMING_BINDING_WORDS = 3;
+/**
+ * Why a value taken from the claim text cannot name a participant, or null
+ * when it can: a value of an entity-, actor- or resource-like argument with
+ * more than MAX_NAMING_BINDING_WORDS words is a clause of the claim (for
+ * example everything before the modal verb), not the participant's name.
+ * Explicit bindings, requirement subjects and declared constants are not
+ * judged here.
+ */
+// implements REQ-model-predicates-binding-clauses
+export function clauseBindingReason(value, context = {}) {
+    const type = context.argumentType ? bindingToken(context.argumentType) : "";
+    if (!NAMING_ARGUMENT_TYPES.has(type))
+        return null;
+    if (matchesConstant(value, context))
+        return null;
+    const words = bindingToken(value).split("_").filter(Boolean);
+    if (words.length <= MAX_NAMING_BINDING_WORDS)
+        return null;
+    return `it is a ${words.length}-word clause of the claim, not a short name for this ${type}`;
+}
+// implements REQ-mcp-suggest-predicates, REQ-model-predicates-binding-placeholders, REQ-model-predicates-binding-clauses
 export function classifyBinding(value, text, explicit, canonical = false, context = {}) {
     const normalized = value.trim();
     // A value that only repeats an argument name or a stop word is unbound
@@ -226,6 +261,10 @@ export function classifyBinding(value, text, explicit, canonical = false, contex
         return "explicit";
     if (!normalized || isGenericPlaceholder(normalized))
         return "placeholder";
+    // A clause lifted from the claim names no participant: it stays unbound
+    // like a placeholder so the agent binds a short noun or the subject key.
+    if (clauseBindingReason(normalized, context) !== null)
+        return "placeholder";
     if (textContainsValue(text, normalized))
         return "extracted";
     return "inferred";

package/dist/operations/modeling/predicate-types.d.ts

@@ -53,6 +53,18 @@ export interface PredicateSuggestion {
     binding_provenance: BindingProvenance;
     /** Per-argument provenance retained for review and deterministic diagnostics. */
     binding_provenance_by_argument: Record<string, BindingProvenance>;
+    /**
+     * The subject_key the planned predicate fact is about when the requirement
+     * constrains subjects: the value of the argument named `subject`, or for a
+     * schema without one the requirement's subject. Null otherwise.
+     */
+    subject_key: string | null;
+    /**
+     * Whether the predicate is about a subject the requirement constrains, so
+     * kb_check pairs it with the subject fact. `unpaired` keeps the candidate
+     * incomplete; `not_required` when the requirement constrains no subject.
+     */
+    subject_pairing: "paired" | "unpaired" | "not_required";
     eligibility: "eligible" | "rejected";
     rejection_reasons: string[];
     applicability_score: number;

package/dist/operations/modeling/predicate-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"predicate-types.d.ts","sourceRoot":"","sources":["../../../src/operations/modeling/predicate-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"predicate-types.d.ts","sourceRoot":"","sources":["../../../src/operations/modeling/predicate-types.ts"],"names":[],"mappings":"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"}

package/dist/operations/modeling/predicate-utils.js

@@ -49,7 +49,7 @@ export function hashId(prefix, parts) {
  * requirement without a subject fact the subject stays a placeholder, so the
  * agent binds it instead of getting a demo subject such as editor.annotation.
  */
-// implements REQ-mcp-suggest-predicates, REQ-model-predicates-requirement-subject
+// implements REQ-mcp-suggest-predicates, REQ-model-predicates-requirement-subject-v2
 export function inferSubject(text, subjectHint, requirement) {
     const explicit = normalizeOptionalString(subjectHint);
     if (explicit)

package/dist/operations/modeling/suggest-predicates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"suggest-predicates.d.ts","sourceRoot":"","sources":["../../../src/operations/modeling/suggest-predicates.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACX,MAAM,0CAA0C,CAAC;AAyBlD,OAAO,KAAK,EAGV,mBAAmB,EACnB,qBAAqB,EACrB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAG9B,YAAY,EACV,iBAAiB,EACjB,wBAAwB,EACxB,mBAAmB,EACnB,0BAA0B,EAC1B,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,sBAAsB,CAAC;AA6H9B,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,IAAI,CAAC,mBAAmB,EAAE,qBAAqB,GAAG,gBAAgB,CAAC,EACzE,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,qBAAqB,GAAG,gBAAgB,CAAC,GACzE,MAAM,CAIR;AAED,wBAAgB,2CAA2C,CACzD,IAAI,EAAE,IAAI,CACR,mBAAmB,EACnB,qBAAqB,GAAG,OAAO,GAAG,gBAAgB,CACnD,EACD,KAAK,EAAE,IAAI,CACT,mBAAmB,EACnB,qBAAqB,GAAG,OAAO,GAAG,gBAAgB,CACnD,GACA,MAAM,CAKR;AA+HD,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,UAAU,GAAG,IAAI,EACzB,IAAI,EAAE,qBAAqB,EAC3B,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,uBAAuB,CAAC,CA8QlC;AA8GD,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,qBAAqB,EAC3B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,uBAAuB,CAAC,CAElC"}
+{"version":3,"file":"suggest-predicates.d.ts","sourceRoot":"","sources":["../../../src/operations/modeling/suggest-predicates.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACX,MAAM,0CAA0C,CAAC;AAyBlD,OAAO,KAAK,EAGV,mBAAmB,EACnB,qBAAqB,EACrB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAG9B,YAAY,EACV,iBAAiB,EACjB,wBAAwB,EACxB,mBAAmB,EACnB,0BAA0B,EAC1B,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,sBAAsB,CAAC;AA6H9B,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,IAAI,CAAC,mBAAmB,EAAE,qBAAqB,GAAG,gBAAgB,CAAC,EACzE,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,qBAAqB,GAAG,gBAAgB,CAAC,GACzE,MAAM,CAIR;AAED,wBAAgB,2CAA2C,CACzD,IAAI,EAAE,IAAI,CACR,mBAAmB,EACnB,qBAAqB,GAAG,OAAO,GAAG,gBAAgB,CACnD,EACD,KAAK,EAAE,IAAI,CACT,mBAAmB,EACnB,qBAAqB,GAAG,OAAO,GAAG,gBAAgB,CACnD,GACA,MAAM,CAKR;AA+HD,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,UAAU,GAAG,IAAI,EACzB,IAAI,EAAE,qBAAqB,EAC3B,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,uBAAuB,CAAC,CAwRlC;AAkID,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,qBAAqB,EAC3B,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,uBAAuB,CAAC,CAElC"}

package/dist/operations/modeling/suggest-predicates.js

@@ -200,7 +200,7 @@ function hasSubjectHint(value) {
  * contradiction checks by subject see the predicate and the subject fact as
  * one subject.
  */
-// implements REQ-model-predicates-requirement-subject
+// implements REQ-model-predicates-requirement-subject-v2
 async function constrainedSubjectKeys(prolog, requirementId, warnings) {
     if (prolog === null || !requirementId?.trim())
         return [];
@@ -221,12 +221,12 @@ async function constrainedSubjectKeys(prolog, requirementId, warnings) {
 export async function handleKbSuggestPredicates(prolog, args, context) {
     const text = normalizeText(args.text);
     const warnings = [];
-    const requirementSubjects = hasSubjectHint(args.subjectHint)
-        ? []
-        : await constrainedSubjectKeys(prolog, args.requirementId, warnings);
+    const requirementSubjects = await constrainedSubjectKeys(prolog, args.requirementId, warnings);
     // One constrained subject is the requirement's subject; with several the
-    // agent picks one, so they are offered as binding examples instead.
-    const requirementSubject = requirementSubjects.length === 1 ? requirementSubjects[0] : undefined;
+    // agent picks one (subjectHint), so they are offered as binding examples.
+    const requirementSubject = !hasSubjectHint(args.subjectHint) && requirementSubjects.length === 1
+        ? requirementSubjects[0]
+        : undefined;
     const subject = inferSubject(text, args.subjectHint, {
         requirementId: args.requirementId,
         subjectKey: requirementSubject,
@@ -289,6 +289,7 @@ export async function handleKbSuggestPredicates(prolog, args, context) {
             scoreComponents: ranked.components,
             explicitSubject: Boolean(args.subjectHint?.trim()),
             ...(requirementSubject ? { requirementSubject } : {}),
+            constrainedSubjects: requirementSubjects,
         });
     });
     const evaluatedCandidates = withMarginRejection(initialCandidates)
@@ -370,6 +371,9 @@ export async function handleKbSuggestPredicates(prolog, args, context) {
     const bindingHints = recommendedAction === "provide_argument_bindings" && recommendedCandidate
         ? buildBindingHints(recommendedCandidate, text, requirementSubjects)
         : [];
+    if (recommendedCandidate?.subject_pairing === "unpaired") {
+        warnings.push(unpairedSubjectWarning(recommendedCandidate, args, requirementSubjects));
+    }
     const recommendedPredicateSchema = !recommendedCandidate && !unavailableSchema
         ? buildPredicateSchemaDraft(text, subject)
         : null;
@@ -412,6 +416,20 @@ export async function handleKbSuggestPredicates(prolog, args, context) {
         applyPlan,
     };
 }
+/**
+ * Why the recommended predicate is not offered for grounding: it is not about
+ * a subject the requirement constrains, so kb_check would keep reporting
+ * strict-req-fact-pairing after the link.
+ */
+// implements REQ-model-predicates-requirement-subject-v2
+function unpairedSubjectWarning(candidate, args, constrainedSubjects) {
+    const subjects = constrainedSubjects.join(", ");
+    const schemaNamesSubject = candidate.schema.argument_names.includes("subject");
+    const cause = schemaNamesSubject
+        ? `its subject argument is ${candidate.subject_key ?? "unbound"}, not a subject ${args.requirementId} constrains (${subjects})`
+        : `the ${candidate.predicate_name} schema does not name the requirement's subject (its arguments are ${candidate.schema.argument_names.join(", ")}) and its subject_key ${candidate.subject_key === null ? "cannot be chosen" : `${candidate.subject_key} is not`} one of the subjects ${args.requirementId} constrains (${subjects})`;
+    return `${candidate.predicate_name} is not offered for grounding because ${cause}, so kb_check would report strict-req-fact-pairing after the link. Pass subjectHint with one of ${subjects} and retry.`;
+}
 /** Stored requirement fields a relationship-only update must restate. */
 const RESTATED_REQUIREMENT_FIELDS = [
     "title",

package/dist/package-versions.d.ts

@@ -0,0 +1,10 @@
+/**
+ * The package versions this build of the engine and its Prolog core carry,
+ * for example `kibi-cli@3.6.0,kibi-core@0.18.0`. The engine client and the
+ * daemon compare them, so a daemon left running by another install is
+ * replaced instead of serving this client.
+ */
+export declare const KIBI_BUILT_PACKAGE_VERSIONS: string;
+/** KIBI_PACKAGE_VERSIONS when set (an explicit override), else the built versions. */
+export declare function kibiPackageVersions(): string;
+//# sourceMappingURL=package-versions.d.ts.map

package/dist/package-versions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"package-versions.d.ts","sourceRoot":"","sources":["../src/package-versions.ts"],"names":[],"mappings":"AAiFA;;;;;GAKG;AAEH,eAAO,MAAM,2BAA2B,QAAwD,CAAC;AAEjG,sFAAsF;AAEtF,wBAAgB,mBAAmB,IAAI,MAAM,CAK5C"}

package/dist/package-versions.js

@@ -0,0 +1,68 @@
+/*
+ Kibi — repo-local, per-branch, queryable long-term memory for software projects
+ Copyright (C) 2026 Piotr Franczyk
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+import { readFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+const require = createRequire(import.meta.url);
+const moduleDirectory = path.dirname(fileURLToPath(import.meta.url));
+function manifestVersion(manifestPath, expectedName) {
+    try {
+        const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
+        return manifest.name === expectedName &&
+            typeof manifest.version === "string"
+            ? manifest.version
+            : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function cliVersion() {
+    if (typeof __KIBI_CLI_VERSION__ === "string")
+        return __KIBI_CLI_VERSION__;
+    // src/ and dist/ both sit directly under the package root.
+    return (manifestVersion(path.join(moduleDirectory, "..", "package.json"), "kibi-cli") ?? "unknown");
+}
+function coreVersion() {
+    try {
+        const resolved = manifestVersion(require.resolve("kibi-core/package.json"), "kibi-core");
+        if (resolved)
+            return resolved;
+    }
+    catch {
+        // Fall back to the monorepo layout below.
+    }
+    return (manifestVersion(path.join(moduleDirectory, "..", "..", "core", "package.json"), "kibi-core") ?? "unknown");
+}
+/**
+ * The package versions this build of the engine and its Prolog core carry,
+ * for example `kibi-cli@3.6.0,kibi-core@0.18.0`. The engine client and the
+ * daemon compare them, so a daemon left running by another install is
+ * replaced instead of serving this client.
+ */
+// implements REQ-engine-daemon-package-versions
+export const KIBI_BUILT_PACKAGE_VERSIONS = `kibi-cli@${cliVersion()},kibi-core@${coreVersion()}`;
+/** KIBI_PACKAGE_VERSIONS when set (an explicit override), else the built versions. */
+// implements REQ-engine-daemon-package-versions
+export function kibiPackageVersions() {
+    const override = process.env.KIBI_PACKAGE_VERSIONS;
+    return override !== undefined && override.length > 0
+        ? override
+        : KIBI_BUILT_PACKAGE_VERSIONS;
+}

package/dist/prolog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prolog.d.ts","sourceRoot":"","sources":["../src/prolog.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prolog.d.ts","sourceRoot":"","sources":["../src/prolog.ts"],"names":[],"mappings":"AA2BA,OAAO,EACL,KAAK,iBAAiB,EAEvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,KAAK,aAAa,EAGnB,MAAM,4BAA4B,CAAC;AAUpC,wBAAgB,eAAe,IAAI,MAAM,CAsCxC;AACD,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gFAAgF;IAChF,aAAa,CAAC,EAAE,MAAM,aAAa,CAAC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;GAMG;AACH,qBAAa,4BAA6B,SAAQ,KAAK;IACrD,QAAQ,CAAC,IAAI,+BAA+B;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEZ,MAAM,EAAE,MAAM;CAO3B;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,iBAAiB,CAAC;CACjC;AAGD,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,EAC5B,OAAO,EAAE,MAAM,IAAI,EACnB,EAAE,GAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK,IAChB,GAC5B,MAAM,IAAI,CAIZ;AAGD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,EAC5B,SAAS,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EACrC,EAAE,GAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK,IAChB,GAC5B,MAAM,IAAI,CAQZ;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,iBAAiB,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,YAAY,CAAM;IAC1B,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,WAAW,CAAM;IACzB,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,KAAK,CAAuC;IACpD,OAAO,CAAC,oBAAoB,CAAoC;IAChE,OAAO,CAAC,kBAAkB,CAA8B;IACxD,OAAO,CAAC,gBAAgB,CAA2B;IACnD,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC;;;;OAIG;IACH,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,iBAAiB,CAAuB;IAChD,6EAA6E;IAC7E,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,mBAAmB,CAAS;gBAExB,OAAO,GAAE,aAAkB;IAiBvC,wBAAwB,CACtB,EAAE,GAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK,IAChB,GAC5B,IAAI;IAQP;;;OAGG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED;;;OAGG;IACH,YAAY,IAAI,OAAO;IAIvB;;;;OAIG;IACH,OAAO,CAAC,YAAY;IAOd,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAqEd,YAAY;IAgDpB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IA6Q1D,wEAAwE;IAClE,UAAU,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IAIhE,eAAe,IAAI,IAAI;IAIvB,OAAO,CAAC,eAAe;IAwBvB,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,kBAAkB;YAIZ,YAAY;IA2C1B,OAAO,CAAC,WAAW;IAiOnB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,gBAAgB;IAcxB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,mBAAmB;IAK3B,OAAO,CAAC,iBAAiB;YAkBX,oBAAoB;IAyBlC,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,eAAe;IAmCvB,sEAAsE;IACtE,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,cAAc;IAoGtB,SAAS,IAAI,OAAO;IASpB,MAAM,IAAI,MAAM;IAIhB,OAAO,CAAC,gBAAgB;IASlB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAqCjC"}

package/dist/prolog.js

@@ -22,6 +22,7 @@ import path from "node:path";
 import { performance } from "node:perf_hooks";
 import { fileURLToPath } from "node:url";
 import { getKbPlPathOverride, isPrologDebugEnabled } from "./env.js";
+import { kibiPackageVersions } from "./package-versions.js";
 import { writePerformanceTraceEvent } from "./performance-trace.js";
 import { extractPrologErrorRecord, } from "./prolog/error-terms.js";
 import { resolveSwipl, swiplChildEnv, } from "./prolog/swipl-resolver.js";
@@ -30,22 +31,6 @@ const DEFAULT_PROLOG_OUTPUT_MAX_BUFFER_BYTES = 8 * 1024 * 1024;
 const PROLOG_OUTPUT_OVERFLOW_ERROR = "Query exceeded bounded Prolog output capacity (ENOBUFS); narrow the operation or reduce stored entity size";
 const INTERACTIVE_QUERY_FRAME_END = "__KIBI_QUERY_FRAME_END__";
 const require = createRequire(import.meta.url);
-function packageVersion(packagePath) {
-    try {
-        const packageJson = require(packagePath);
-        return typeof packageJson.version === "string"
-            ? packageJson.version
-            : "unknown";
-    }
-    catch {
-        return "unknown";
-    }
-}
-const KIBI_PACKAGE_VERSIONS = [
-    `kibi-cli@${packageVersion(path.join(importMetaDir, "..", "package.json"))}`,
-    `kibi-core@${packageVersion(path.join(importMetaDir, "..", "..", "core", "package.json"))}`,
-    `kibi-mcp@${packageVersion(path.join(importMetaDir, "..", "..", "mcp", "package.json"))}`,
-].join(",");
 export function resolveKbPlPath() {
     // implements REQ-009
     const overrideKbPath = getKbPlPathOverride();
@@ -207,7 +192,7 @@ export class PrologProcess {
                 ...launch.env,
                 KIBI_RUNTIME_NAME: process.versions.bun !== undefined ? "bun" : "node",
                 KIBI_RUNTIME_VERSION: process.versions.bun ?? process.versions.node ?? "unknown",
-                KIBI_PACKAGE_VERSIONS: process.env.KIBI_PACKAGE_VERSIONS ?? KIBI_PACKAGE_VERSIONS,
+                KIBI_PACKAGE_VERSIONS: kibiPackageVersions(),
             },
         });
         this.clearQueryBuffers();
@@ -363,7 +348,7 @@ export class PrologProcess {
                         const runtime = this.errorBuffer
                             .split("\n")
                             .find((line) => line.includes("__KIBI_RUNTIME__"));
-                        console.error(`[prolog debug] runtime=${runtime ?? "unknown"} packages=${process.env.KIBI_PACKAGE_VERSIONS ?? KIBI_PACKAGE_VERSIONS}`);
+                        console.error(`[prolog debug] runtime=${runtime ?? "unknown"} packages=${kibiPackageVersions()}`);
                     }
                     settle();
                     this.terminationReason = `query timeout: ${goalLabel}`;
@@ -604,7 +589,7 @@ export class PrologProcess {
         ].join(", ");
         const runtimeName = process.versions.bun !== undefined ? "bun" : "node";
         const runtimeVersion = process.versions.bun ?? process.versions.node ?? "unknown";
-        const packageVersions = process.env.KIBI_PACKAGE_VERSIONS ?? KIBI_PACKAGE_VERSIONS;
+        const packageVersions = kibiPackageVersions();
         let child;
         try {
             const launch = this.launchTarget();

package/dist/public/skills/kibi-usage/SKILL.md

@@ -2,7 +2,7 @@
 id: kibi-usage
 name: Kibi Usage
 description: Use Kibi's source-first, exact-Git, migration-aware, proof-aware operations safely across MCP or the trusted local CLI, including partial completion repair.
-version: 2.8.0
+version: 2.9.0
 kibiCompatibility: ">=1.0.0"
 tags:
   - kibi
@@ -260,7 +260,11 @@ constants) or `examples`, and why the current value was refused. With a
 `requirementId` whose requirement `constrains` one subject fact, the `subject`
 argument is already bound to that fact's `subject_key` (provenance
 `requirement`); keep it, so the predicate and the subject fact name one
-subject. Bind them
+subject. A schema without a `subject` argument (`permission_rule`) records
+that key as the planned fact's `subject_key` instead; when the requirement
+constrains several subjects, an unbound `subject_key` asks you to pass
+`subjectHint` with one of them. A participant (`actor`, `resource`, entity)
+is a short noun, never a clause of the claim. Bind them
 from the claim's own words and call again with the same `text` and
 `requirementId`, plus `schemaId` and `argumentBindings` keyed by
 `argument_names` (reuse `argument_constants` values when the schema has them).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kibi-cli",
-  "version": "2.12.0",
+  "version": "2.13.0",
   "type": "module",
   "description": "Kibi CLI for knowledge base management",
   "engines": {
@@ -235,7 +235,7 @@
     "fast-glob": "^3.2.12",
     "gray-matter": "^4.0.3",
     "js-yaml": "^4.1.0",
-    "kibi-core": "^0.17.1",
+    "kibi-core": "^0.17.2",
     "kibi-plugin-builtin": "^0.4.2",
     "kibi-plugin-sdk": "^0.4.1",
     "kibi-swipl": "^1.0.1",

package/src/public/skills/kibi-usage/SKILL.md

@@ -2,7 +2,7 @@
 id: kibi-usage
 name: Kibi Usage
 description: Use Kibi's source-first, exact-Git, migration-aware, proof-aware operations safely across MCP or the trusted local CLI, including partial completion repair.
-version: 2.8.0
+version: 2.9.0
 kibiCompatibility: ">=1.0.0"
 tags:
   - kibi
@@ -260,7 +260,11 @@ constants) or `examples`, and why the current value was refused. With a
 `requirementId` whose requirement `constrains` one subject fact, the `subject`
 argument is already bound to that fact's `subject_key` (provenance
 `requirement`); keep it, so the predicate and the subject fact name one
-subject. Bind them
+subject. A schema without a `subject` argument (`permission_rule`) records
+that key as the planned fact's `subject_key` instead; when the requirement
+constrains several subjects, an unbound `subject_key` asks you to pass
+`subjectHint` with one of them. A participant (`actor`, `resource`, entity)
+is a short noun, never a clause of the claim. Bind them
 from the claim's own words and call again with the same `text` and
 `requirementId`, plus `schemaId` and `argumentBindings` keyed by
 `argument_names` (reuse `argument_constants` values when the schema has them).