kibi-cli 2.2.0 → 2.3.0

package/dist/extractors/symbols-coordinator.js

@@ -17,42 +17,10 @@
 */
 import * as fs from "node:fs";
 import * as path from "node:path";
+import { createMaintenanceSourceAnalysisService } from "../plugins/maintenance-source-analysis.js";
 import { createSourceAnalysisService, } from "../plugins/source-analysis-service.js";
+import { extensionLanguage, isTsJsSourcePath, } from "../plugins/source-classification.js";
 import { createTsMorphSourceAnalysisProvider, enrichSymbolCoordinatesWithTsMorph, } from "./symbols-ts.js";
-const TS_JS_EXTENSIONS = new Set([
-    ".ts",
-    ".tsx",
-    ".js",
-    ".jsx",
-    ".mts",
-    ".cts",
-    ".mjs",
-    ".cjs",
-]);
-const SOURCE_LANGUAGE_EXTENSIONS = {
-    ".c": "c",
-    ".cc": "cpp",
-    ".cjs": "javascript",
-    ".cpp": "cpp",
-    ".cs": "csharp",
-    ".cts": "typescript",
-    ".go": "go",
-    ".h": "c",
-    ".hpp": "cpp",
-    ".java": "java",
-    ".js": "javascript",
-    ".jsx": "javascript",
-    ".kt": "kotlin",
-    ".mjs": "javascript",
-    ".mts": "typescript",
-    ".php": "php",
-    ".py": "python",
-    ".rb": "ruby",
-    ".rs": "rust",
-    ".swift": "swift",
-    ".ts": "typescript",
-    ".tsx": "typescript",
-};
 const DEFAULT_SOURCE_ANALYSIS_PROVIDERS = [
     createTsMorphSourceAnalysisProvider(),
 ];
@@ -114,10 +82,40 @@ export async function analyzeSourceTextWithRegistry(filePath, content, registry)
         return analyzeSourceText(filePath, content);
     }
 }
+function isCoordinateOnlyDecoratorPartial(analysis) {
+    if (analysis.status !== "partial" ||
+        analysis.language !== "python" ||
+        analysis.module.analysisMode !== "parser" ||
+        analysis.providerId !== "kibi-plugin-treesitter.tree-sitter.v2" ||
+        analysis.stamp?.pluginId !== "kibi-plugin-treesitter" ||
+        analysis.diagnostics.length === 0 ||
+        analysis.uncoveredRanges.length !== analysis.diagnostics.length)
+        return false;
+    return (analysis.diagnostics.every((diagnostic) => {
+        if (diagnostic.code !== "TREESITTER_DECORATOR_EXPANSION_UNAVAILABLE" ||
+            diagnostic.range === undefined)
+            return false;
+        const range = diagnostic.range;
+        return analysis.uncoveredRanges.some((uncovered) => uncovered.reason === "decorator-may-alter-or-create-declarations" &&
+            uncovered.startLine === range.startLine &&
+            uncovered.startColumn === range.startColumn &&
+            uncovered.endLine === range.endLine &&
+            uncovered.endColumn === range.endColumn);
+    }) &&
+        analysis.uncoveredRanges.every((uncovered) => uncovered.reason === "decorator-may-alter-or-create-declarations" &&
+            analysis.diagnostics.some(({ range }) => range !== undefined &&
+                uncovered.startLine === range.startLine &&
+                uncovered.startColumn === range.startColumn &&
+                uncovered.endLine === range.endLine &&
+                uncovered.endColumn === range.endColumn)));
+}
 export async function enrichSymbolCoordinates(entries, workspaceRoot, deps) {
     // implements REQ-vscode-traceability
     const enrichTsCoordinates = deps?.enrichTsCoordinates ?? enrichSymbolCoordinatesWithTsMorph;
     const output = entries.map((entry) => withoutGeneratedCoordinates(entry));
+    const service = deps?.sourceAnalysisService ??
+        createMaintenanceSourceAnalysisService(workspaceRoot);
+    const analyses = new Map();
     const tsIndices = [];
     const tsEntries = [];
     for (let index = 0; index < output.length; index++) {
@@ -125,15 +123,54 @@ export async function enrichSymbolCoordinates(entries, workspaceRoot, deps) {
         if (!entry)
             continue;
         const resolved = resolveSourcePath(entry.sourceFile, workspaceRoot);
-        if (!resolved)
+        if (!resolved || !fs.statSync(resolved.absolutePath).isFile())
             continue;
         const ext = path.extname(resolved.absolutePath).toLowerCase();
-        if (TS_JS_EXTENSIONS.has(ext)) {
+        if (isTsJsSourcePath(resolved.absolutePath)) {
             tsIndices.push(index);
             tsEntries.push(entry);
             continue;
         }
-        output[index] = enrichWithRegexHeuristic(entry, resolved.absolutePath);
+        const logicalPath = path
+            .relative(workspaceRoot, resolved.absolutePath)
+            .replaceAll("\\", "/");
+        let analysis = analyses.get(logicalPath);
+        const firstAnalysis = analysis === undefined;
+        if (!analysis) {
+            analysis = await service.analyzeTextV2(logicalPath, fs.readFileSync(resolved.absolutePath, "utf8"));
+            analyses.set(logicalPath, analysis);
+        }
+        const coordinateOnlyPartial = deps?.allowPythonDecoratorCoordinates === true &&
+            isCoordinateOnlyDecoratorPartial(analysis);
+        if (analysis.status === "failed" ||
+            (analysis.status === "partial" && !coordinateOnlyPartial))
+            throw new Error(`Cannot refresh incomplete source analysis for ${logicalPath}: ${analysis.diagnostics.map((d) => d.message).join("; ")}`);
+        if (coordinateOnlyPartial && firstAnalysis) {
+            await deps?.verifyPythonDecoratorCoordinates?.(logicalPath, analysis);
+            console.warn(`[kibi] Coordinate-only refresh for ${logicalPath}; source analysis remains partial: ${analysis.diagnostics.map((diagnostic) => diagnostic.message).join("; ")}`);
+        }
+        if (analysis.status === "unsupported") {
+            // Preserve the legacy coarse heuristic until the file-level migration;
+            // it is never exposed as parser-backed symbol evidence.
+            output[index] = enrichWithRegexHeuristic(entry, resolved.absolutePath);
+            continue;
+        }
+        const exact = analysis.symbols.filter((symbol) => (symbol.qualifiedName ?? symbol.name) === entry.title);
+        const candidates = exact.length
+            ? exact
+            : analysis.symbols.filter((symbol) => symbol.name === entry.title);
+        if (candidates.length !== 1)
+            continue;
+        const symbol = candidates[0];
+        if (!symbol)
+            continue;
+        output[index] = {
+            ...entry,
+            sourceLine: symbol.startLine,
+            sourceColumn: symbol.startColumn,
+            sourceEndLine: symbol.endLine,
+            sourceEndColumn: symbol.endColumn,
+        };
     }
     if (tsEntries.length > 0) {
         const enrichedTs = await enrichTsCoordinates(tsEntries, workspaceRoot);
@@ -218,8 +255,7 @@ function createFallbackAnalysis(filePath, fallbackReason) {
     };
 }
 function detectSourceLanguage(filePath) {
-    return (SOURCE_LANGUAGE_EXTENSIONS[path.extname(filePath).toLowerCase()] ??
-        "unknown");
+    return extensionLanguage(filePath);
 }
 function inferModuleTitle(filePath) {
     const extension = path.extname(filePath);

package/dist/operations/modeling/predicate-inference-1.js

@@ -1,7 +1,7 @@
 import { normalizePredicateToken, normalizeSubjectKey, singularize, slug, } from "./predicate-utils.js";
 // implements REQ-mcp-suggest-predicates
 export function inferPermissionRuleArgs(text) {
-    const prohibition = text.match(/^(?<actor>[a-z][a-z\s_-]*?)\s+(?:must\s+not|cannot|can't|is\s+forbidden\s+to)\s+(?<action>[a-z][a-z_-]*)\s+(?<resource>.+?)\.?$/i);
+    const prohibition = text.match(/^(?<actor>[a-z][a-z\s_-]*?)\s+(?:must\s+not|must\s+never|never|cannot|can't|is\s+forbidden\s+to)\s+(?<action>[a-z][a-z_-]*)\s+(?<resource>.+?)\.?$/i);
     if (prohibition?.groups) {
         return [
             singularize(slug(prohibition.groups.actor ?? "actor")),

package/dist/operations/mutation/source-authoring.d.ts.map

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

package/dist/operations/mutation/source-authoring.js

@@ -2,9 +2,11 @@ import { createHash } from "node:crypto";
 import { randomUUID } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
+import { isDeepStrictEqual } from "node:util";
 import { dump as dumpYaml, load as loadYaml } from "js-yaml";
 import { parseDocument, stringify } from "yaml";
 import { OperationError } from "../../cli-errors.js";
+import { canonicalFilesystemPath } from "../../utils/canonical-path.js";
 import { CANONICAL_ENTITY_PATHS, isDerivedKbPath, } from "../../utils/kb-paths.js";
 function digest(value) {
     return createHash("sha256").update(value).digest("hex");
@@ -69,21 +71,24 @@ export function resolveContainedSourcePath(workspaceRoot, relative) {
         throw new OperationError("SOURCE_PATH_INVALID", `document.path cannot target Kibi's derived state under ${workspaceRelative}: ${relative}`);
     }
     // A symlinked existing file or parent could otherwise escape the workspace.
-    let existing = fs.existsSync(absolute) ? absolute : path.dirname(absolute);
-    while (!fs.existsSync(existing) && path.dirname(existing) !== existing) {
-        existing = path.dirname(existing);
-    }
-    const real = fs.realpathSync.native(existing);
-    if (real !== root && !real.startsWith(`${root}${path.sep}`)) {
+    const realRoot = canonicalFilesystemPath(root);
+    const real = canonicalFilesystemPath(absolute);
+    if (real !== realRoot && !real.startsWith(`${realRoot}${path.sep}`)) {
         throw new OperationError("SOURCE_PATH_INVALID", `document.path resolves outside the workspace: ${relative}`);
     }
     return absolute;
 }
 export function normalizeAuthoredSourcePath(workspaceRoot, source) {
     const normalized = source.replaceAll("\\", "/");
-    const relative = path.isAbsolute(normalized)
-        ? path.relative(path.resolve(workspaceRoot), path.resolve(normalized))
-        : normalized;
+    const root = path.resolve(workspaceRoot);
+    let relative = normalized;
+    if (path.isAbsolute(normalized)) {
+        const absolute = path.resolve(normalized);
+        relative =
+            absolute === root || absolute.startsWith(`${root}${path.sep}`)
+                ? path.relative(root, absolute)
+                : path.relative(canonicalFilesystemPath(root), canonicalFilesystemPath(absolute));
+    }
     return path
         .relative(path.resolve(workspaceRoot), resolveContainedSourcePath(workspaceRoot, relative))
         .replaceAll(path.sep, "/");
@@ -246,13 +251,97 @@ export function manifestRelationships(item) {
             : [];
     });
 }
-function mergeManifestRelationships(existing, incoming, entityId) {
+// implements REQ-source-analysis-v2
+function manifestRecord(item) {
+    if (item === null ||
+        typeof item !== "object" ||
+        !("toJSON" in item) ||
+        typeof item.toJSON !== "function") {
+        return undefined;
+    }
+    const value = item.toJSON();
+    return value !== null && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : undefined;
+}
+// implements REQ-source-analysis-v2
+function failDuplicateConflict(entityId, field) {
+    throw new OperationError("SOURCE_DUPLICATE_CONFLICT", `Duplicate symbol ${entityId} has conflicting authored field "${field}"; no source was written`, false);
+}
+// implements REQ-source-analysis-v2
+function mergeCompatibleManifestField(target, field, value, entityId, conflictField = field) {
+    if (Object.hasOwn(target, field)) {
+        if (!isDeepStrictEqual(target[field], value)) {
+            failDuplicateConflict(entityId, conflictField);
+        }
+        return;
+    }
+    Object.defineProperty(target, field, {
+        configurable: true,
+        enumerable: true,
+        value,
+        writable: true,
+    });
+}
+// implements REQ-source-analysis-v2
+function mergeDuplicateManifestFields(records, entityId) {
+    const merged = Object.create(null);
+    for (const record of records) {
+        // Links and typed relationships are collections, so merge them separately
+        // instead of treating a difference as conflicting scalar metadata.
+        const authored = Object.fromEntries(Object.entries(symbolManifestRecord(record)).filter(([key]) => key !== "links"));
+        for (const [key, value] of Object.entries(authored)) {
+            mergeCompatibleManifestField(merged, key, value, entityId);
+        }
+    }
+    return merged;
+}
+// implements REQ-source-analysis-v2
+function manifestRelationshipRecords(record, entityId) {
+    if (record.relationships === undefined)
+        return [];
+    if (!Array.isArray(record.relationships)) {
+        failDuplicateConflict(entityId, "relationships");
+    }
+    return record.relationships;
+}
+// implements REQ-source-analysis-v2
+function mergeManifestRelationshipRecords(records, incoming, entityId) {
     const merged = new Map();
-    for (const relationship of existing) {
-        merged.set(`${relationship.type}\u0000${relationship.target}`, {
-            type: relationship.type,
-            target: relationship.target,
-        });
+    const untyped = [];
+    for (const record of records) {
+        for (const row of manifestRelationshipRecords(record, entityId)) {
+            if (row === null || typeof row !== "object" || Array.isArray(row)) {
+                if (!untyped.some((value) => isDeepStrictEqual(value, row))) {
+                    untyped.push(row);
+                }
+                continue;
+            }
+            const candidate = row;
+            const type = candidate.type;
+            const target = candidate.target ?? candidate.to;
+            if (typeof type !== "string" || typeof target !== "string") {
+                if (!untyped.some((value) => isDeepStrictEqual(value, row))) {
+                    untyped.push(row);
+                }
+                continue;
+            }
+            const key = `${type}\u0000${target}`;
+            const normalized = {
+                ...Object.fromEntries(Object.entries(candidate).filter(([key]) => key !== "to")),
+                type,
+                target,
+            };
+            const previous = merged.get(key);
+            if (previous) {
+                for (const [field, value] of Object.entries(normalized)) {
+                    mergeCompatibleManifestField(previous, field, value, entityId, `relationship ${type} -> ${target}.${field}`);
+                }
+            }
+            else {
+                merged.set(key, normalized);
+            }
+        }
     }
     for (const relationship of incoming) {
         if (relationship.from !== entityId ||
@@ -260,10 +349,45 @@ function mergeManifestRelationships(existing, incoming, entityId) {
             typeof relationship.to !== "string") {
             continue;
         }
-        const normalized = { type: relationship.type, target: relationship.to };
-        merged.set(`${normalized.type}\u0000${normalized.target}`, normalized);
+        const key = `${relationship.type}\u0000${relationship.to}`;
+        const normalized = {
+            ...Object.fromEntries(Object.entries(relationship).filter(([key]) => key !== "from" && key !== "to")),
+            type: relationship.type,
+            target: relationship.to,
+        };
+        const previous = merged.get(key);
+        if (previous) {
+            for (const [field, value] of Object.entries(normalized)) {
+                mergeCompatibleManifestField(previous, field, value, entityId, `relationship ${relationship.type} -> ${relationship.to}.${field}`);
+            }
+        }
+        else {
+            merged.set(key, normalized);
+        }
+    }
+    return [
+        ...[...merged.values()].sort((left, right) => `${String(left.type)}\u0000${String(left.target)}`.localeCompare(`${String(right.type)}\u0000${String(right.target)}`)),
+        ...untyped,
+    ];
+}
+// implements REQ-source-analysis-v2
+function mergeManifestLinks(records, entity) {
+    const values = [
+        ...records.map((record) => record.links),
+        entity.links,
+    ].filter((value) => value !== undefined);
+    if (values.length === 0)
+        return undefined;
+    const links = [];
+    for (const value of values) {
+        const entries = Array.isArray(value) ? value : [value];
+        for (const entry of entries) {
+            if (!links.some((existing) => isDeepStrictEqual(existing, entry))) {
+                links.push(entry);
+            }
+        }
     }
-    return [...merged.values()].sort((left, right) => `${left.type}\u0000${left.target}`.localeCompare(`${right.type}\u0000${right.target}`));
+    return links;
 }
 /** Indexes of every manifest entry whose `id` equals `id`, in file order. */
 function symbolManifestIndexes(items, id) {
@@ -276,11 +400,11 @@ function symbolManifestIndexes(items, id) {
 }
 function renderSymbolManifest(entity, relationships, existingContent) {
     if (existingContent === undefined) {
-        const doc = parseDocument(stringify({
-            symbols: [
-                symbolManifestRecord(entity, mergeManifestRelationships([], relationships, String(entity.id))),
-            ],
-        }));
+        const created = symbolManifestRecord(entity);
+        const rows = mergeManifestRelationshipRecords([], relationships, String(entity.id));
+        if (rows.length > 0)
+            created.relationships = rows;
+        const doc = parseDocument(stringify({ symbols: [created] }));
         return doc.toString(AUTHORED_YAML_OPTIONS);
     }
     const doc = parseDocument(existingContent);
@@ -290,36 +414,34 @@ function renderSymbolManifest(entity, relationships, existingContent) {
     }
     const items = symbols.items;
     const id = String(entity.id);
-    // A rebase that unions both sides of the manifest can leave the same id
-    // twice with different ownership. Fold every copy into the first one so an
-    // upsert repairs the duplicate instead of updating one copy and leaving the
-    // other to shadow it.
-    const matches = symbolManifestIndexes(items, id);
-    const index = matches[0] ?? -1;
-    const existingRelationships = matches.flatMap((match) => manifestRelationships(items[match]));
-    let next = symbolManifestRecord(entity, mergeManifestRelationships(existingRelationships, relationships, id));
-    if (index >= 0) {
-        // Partial symbol payloads (for example a relationship-only upsert) must
-        // never erase authored provenance from the manifest. Preserve fields the
-        // payload omits, with incoming values winning on explicit conflicts; the
-        // first copy wins over later duplicates.
-        let preserved = {};
-        for (const match of [...matches].reverse()) {
-            const item = items[match];
-            const previous = typeof item?.toJSON === "function" ? item.toJSON() : null;
-            if (typeof previous === "object" &&
-                previous !== null &&
-                !Array.isArray(previous)) {
-                preserved = {
-                    ...preserved,
-                    ...symbolManifestRecord(previous, []),
-                };
-            }
-        }
-        next = { ...preserved, ...next };
-        doc.setIn(["symbols", index], next);
-        for (const duplicate of matches.slice(1).reverse()) {
-            doc.deleteIn(["symbols", duplicate]);
+    const indices = items.flatMap((item, index) => {
+        if (!item || typeof item !== "object" || !("get" in item))
+            return [];
+        return String(item.get("id")) === id
+            ? [index]
+            : [];
+    });
+    const existingRecords = indices
+        .map((index) => manifestRecord(items[index]))
+        .filter((record) => record !== undefined);
+    if (existingRecords.length !== indices.length) {
+        failDuplicateConflict(id, "record");
+    }
+    const previous = mergeDuplicateManifestFields(existingRecords, id);
+    const next = { ...previous, ...symbolManifestRecord(entity) };
+    const mergedRelationships = mergeManifestRelationshipRecords(existingRecords, relationships, id);
+    if (mergedRelationships.length > 0) {
+        next.relationships = mergedRelationships;
+    }
+    const mergedLinks = mergeManifestLinks(existingRecords, entity);
+    if (mergedLinks !== undefined)
+        next.links = mergedLinks;
+    if (indices.length > 0) {
+        // Patch one canonical row and remove all redundant copies only after
+        // compatible authored fields and all links have been merged successfully.
+        doc.setIn(["symbols", indices[0]], next);
+        for (const duplicateIndex of indices.slice(1).reverse()) {
+            items.splice(duplicateIndex, 1);
         }
     }
     else {

package/dist/operations/mutation/upsert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upsert.d.ts","sourceRoot":"","sources":["../../../src/operations/mutation/upsert.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAoCxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAuGhF,wBAAsB,+BAA+B,CACnD,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,IAAI,CAAC,CAaf;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,aAAa,EAAE,SAAS,iBAAiB,EAAE,EAC3C,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,SAAS,iBAAiB,EAAE,CAAC,CAuBvC;AAmCD,MAAM,MAAM,sBAAsB,GAAG,QAAQ,CAAC;IAC5C;;;;;;OAMG;IAEH,QAAQ,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IACzC;;;;OAIG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IACtC;;;;OAIG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACxC,CAAC,CAAC;AAEH,wBAAsB,aAAa,CACjC,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAshBzC"}
+{"version":3,"file":"upsert.d.ts","sourceRoot":"","sources":["../../../src/operations/mutation/upsert.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAqCxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAoGhF,wBAAsB,+BAA+B,CACnD,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,IAAI,CAAC,CAaf;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EACzC,aAAa,EAAE,SAAS,iBAAiB,EAAE,EAC3C,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,SAAS,iBAAiB,EAAE,CAAC,CAuBvC;AAmCD,MAAM,MAAM,sBAAsB,GAAG,QAAQ,CAAC;IAC5C;;;;;;OAMG;IAEH,QAAQ,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IACzC;;;;OAIG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IACtC;;;;OAIG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACxC,CAAC,CAAC;AAEH,wBAAsB,aAAa,CACjC,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAshBzC"}

package/dist/operations/mutation/upsert.js

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { existsSync, readFileSync, realpathSync, unlinkSync, writeFileSync, } from "node:fs";
+import { existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { OperationError } from "../../cli-errors.js";
 import { readManifestWithCoordinateOverlay } from "../../extractors/manifest.js";
@@ -9,6 +9,7 @@ import { loadEntities } from "../../public/operations/discovery-entities.js";
 import { appendOnlyProofReceiptHistoryErrors } from "../../public/proof-receipt.js";
 import { appendRelationship, computeShardPath, } from "../../relationships/shards.js";
 import { resolveBranchAttachment } from "../../utils/branch-resolver.js";
+import { canonicalFilesystemPath } from "../../utils/canonical-path.js";
 import { entityIdStyleWarnings } from "../../utils/entity-id-style.js";
 import { analyzeSemanticAdvisorInput } from "../semantic-advisor/analyze-prose.js";
 import { assertLogicalGroundingClaimKeys, assertSemanticInventoryBoundary, } from "../semantic-advisor/ingestion-boundary.js";
@@ -57,12 +58,9 @@ function assertRelationshipShardContained(workspaceRoot, shardPath) {
     if (!absolute.startsWith(`${relationshipRoot}${path.sep}`)) {
         throw new OperationError("SOURCE_PATH_INVALID", `Relationship shard escapes the canonical workspace lane: ${shardPath}`);
     }
-    let existing = absolute;
-    while (!existsSync(existing) && path.dirname(existing) !== existing) {
-        existing = path.dirname(existing);
-    }
-    const real = realpathSync.native(existing);
-    if (real !== root && !real.startsWith(`${root}${path.sep}`)) {
+    const realRoot = canonicalFilesystemPath(root);
+    const real = canonicalFilesystemPath(absolute);
+    if (real !== realRoot && !real.startsWith(`${realRoot}${path.sep}`)) {
         throw new OperationError("SOURCE_PATH_INVALID", `Relationship shard follows a symlink outside the workspace: ${shardPath}`);
     }
 }

package/dist/operations/planning/apply-plan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply-plan.d.ts","sourceRoot":"","sources":["../../../src/operations/planning/apply-plan.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAGjF,OAAO,EACL,KAAK,eAAe,EAIrB,MAAM,uBAAuB,CAAC;AAwB/B,OAAO,KAAK,EACV,aAAa,EACb,eAAe,EAGhB,MAAM,uBAAuB,CAAC;AAE/B,YAAY,EACV,aAAa,EACb,eAAe,EACf,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAG/B,eAAO,MAAM,yBAAyB,EAAG,2BAAoC,CAAC;AAmI9E,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,IAAI,CAMN;AAED,wBAAgB,mCAAmC,CACjD,SAAS,EAAE,SAAS;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,EAAE,EACnE,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,GAC3B,IAAI,CAaN;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,SAAS,eAAe,EAAE,EACnC,SAAS,cAAoB,GAC5B,eAAe,EAAE,CA2CnB;AAy+CD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC;IACT,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,iBAAiB,EAAE,eAAe,CAAC;CACpC,CAAC,CA2BD"}
+{"version":3,"file":"apply-plan.d.ts","sourceRoot":"","sources":["../../../src/operations/planning/apply-plan.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAIjF,OAAO,EACL,KAAK,eAAe,EAIrB,MAAM,uBAAuB,CAAC;AAwB/B,OAAO,KAAK,EACV,aAAa,EACb,eAAe,EAGhB,MAAM,uBAAuB,CAAC;AAE/B,YAAY,EACV,aAAa,EACb,eAAe,EACf,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAG/B,eAAO,MAAM,yBAAyB,EAAG,2BAAoC,CAAC;AAmI9E,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,IAAI,CAMN;AAED,wBAAgB,mCAAmC,CACjD,SAAS,EAAE,SAAS;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,EAAE,EACnE,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,GAC3B,IAAI,CAaN;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,SAAS,eAAe,EAAE,EACnC,SAAS,cAAoB,GAC5B,eAAe,EAAE,CA2CnB;AAm+CD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC;IACT,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,iBAAiB,EAAE,eAAe,CAAC;CACpC,CAAC,CA2BD"}

package/dist/operations/planning/apply-plan.js

@@ -1,5 +1,4 @@
 import { createHash, randomUUID } from "node:crypto";
-import { existsSync, realpathSync } from "node:fs";
 import path from "node:path";
 import { OperationError } from "../../cli-errors.js";
 import { branchEnsureCommand, branchMigrateCommand, branchRecoverCommand, } from "../../commands/branch.js";
@@ -10,6 +9,7 @@ import { executeStatus } from "../../public/operations/discovery-executors.js";
 import { PREDICATE_SCHEMA_ALIGNMENT_CODE, migrationPlanHash, } from "../../public/operations/migration-plan.js";
 import { readMigrationConfigStatus } from "../../public/operations/migration-plan.js";
 import { readWorkspaceSnapshot } from "../../public/operations/workspace-snapshot.js";
+import { canonicalFilesystemPath } from "../../utils/canonical-path.js";
 import { isDerivedKbPath } from "../../utils/kb-paths.js";
 import { bootstrapEmptyKbSnapshotId, bootstrapPlanHash, } from "../bootstrap/types.js";
 import { executeDelete } from "../mutation/delete.js";
@@ -427,14 +427,10 @@ async function applySourceWrites(context, writes, planHash, allowReplay = false,
             if (workspaceRelative === ".kb" || isDerivedKbPath(workspaceRelative)) {
                 throw new Error("Apply plan failed: sourceWrites.path cannot target Kibi's derived .kb runtime trees");
             }
-            let existingPath = absolute;
-            while (!existsSync(existingPath) &&
-                path.dirname(existingPath) !== existingPath) {
-                existingPath = path.dirname(existingPath);
-            }
-            const realExisting = realpathSync.native(existingPath);
-            if (realExisting !== root &&
-                !realExisting.startsWith(`${root}${path.sep}`)) {
+            const realRoot = canonicalFilesystemPath(root);
+            const realExisting = canonicalFilesystemPath(absolute);
+            if (realExisting !== realRoot &&
+                !realExisting.startsWith(`${realRoot}${path.sep}`)) {
                 throw new Error(`Apply plan failed: sourceWrites.path follows a symlink outside the workspace: ${write.path}`);
             }
             const existing = await context.fs

package/dist/operations/proof/ingest-proof.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ingest-proof.d.ts","sourceRoot":"","sources":["../../../src/operations/proof/ingest-proof.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,KAAK,QAAQ,EAEd,MAAM,yBAAyB,CAAC;AAOjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAkBjF,OAAO,EAEL,KAAK,YAAY,EAGlB,MAAM,+BAA+B,CAAC;AAqBvC,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5C,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7B,CAAC,CAAC;AAEH,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAAC;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,SAAS,QAAQ,EAAE,CAAC;CAC3B,CAAC,CAAC;AAGH,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACvC,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,SAAS,qBAAqB,EAAE,CAAC;CAC3C,CAAC,CAAC;AAEH,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC;AAokBF,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAuC5B"}
+{"version":3,"file":"ingest-proof.d.ts","sourceRoot":"","sources":["../../../src/operations/proof/ingest-proof.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,KAAK,QAAQ,EAEd,MAAM,yBAAyB,CAAC;AAOjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAkBjF,OAAO,EAEL,KAAK,YAAY,EAGlB,MAAM,+BAA+B,CAAC;AAqBvC,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5C,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7B,CAAC,CAAC;AAEH,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAAC;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,SAAS,QAAQ,EAAE,CAAC;CAC3B,CAAC,CAAC;AAGH,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACvC,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,SAAS,qBAAqB,EAAE,CAAC;CAC3C,CAAC,CAAC;AAEH,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC;AAqkBF,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAuC5B"}

package/dist/operations/proof/ingest-proof.js

@@ -446,6 +446,7 @@ async function executeIngestProofUnlocked(args, context, lifecycle) {
         },
     };
 }
+// implements REQ-kibi-verification-evidence-contract
 export async function executeIngestProof(args, context) {
     if (!context.fs ||
         context.sourceFirst === false ||

package/dist/operations/semantic-advisor/analysis-receipt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analysis-receipt.d.ts","sourceRoot":"","sources":["../../../src/operations/semantic-advisor/analysis-receipt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EACL,KAAK,OAAO,EAMb,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EACV,6BAA6B,EAI7B,4BAA4B,EAC5B,0BAA0B,EAC1B,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACf,MAAM,YAAY,CAAC;AAyBpB,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,SAAS,cAAc,EAAE,EAClC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,SAAS,0BAA0B,EAAE,EAClD,OAAO,EAAE,SAAS,cAAc,EAAE,EAClC,YAAY,EAAE,SAAS,mBAAmB,EAAE,EAC5C,eAAe,EAAE,SAAS,4BAA4B,EAAE,EACxD,cAAc,EAAE,SAAS,iBAAiB,EAAE,GAC3C,6BAA6B,CAkH/B"}
+{"version":3,"file":"analysis-receipt.d.ts","sourceRoot":"","sources":["../../../src/operations/semantic-advisor/analysis-receipt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EACL,KAAK,OAAO,EAMb,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EACV,6BAA6B,EAI7B,4BAA4B,EAC5B,0BAA0B,EAC1B,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACf,MAAM,YAAY,CAAC;AAyBpB,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,SAAS,cAAc,EAAE,EAClC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,SAAS,0BAA0B,EAAE,EAClD,OAAO,EAAE,SAAS,cAAc,EAAE,EAClC,YAAY,EAAE,SAAS,mBAAmB,EAAE,EAC5C,eAAe,EAAE,SAAS,4BAA4B,EAAE,EACxD,cAAc,EAAE,SAAS,iBAAiB,EAAE,GAC3C,6BAA6B,CA2H/B"}

package/dist/operations/semantic-advisor/analysis-receipt.js

@@ -27,9 +27,15 @@ export function buildAdvisorResult(payload, signals, modeled, suggestions, claus
             : suggestions.some(({ kind }) => kind === "predicate")
                 ? "predicate"
                 : null;
+    const signalLane = chooseLane(signals);
+    const unresolvedNormative = propositions.some(({ role, status }) => role === "normative" &&
+        ["missing", "ambiguous", "ontology_gap"].includes(status));
     const candidateLane = modeled
         ? "none"
-        : (suggestionLane ?? chooseLane(signals));
+        : (suggestionLane ??
+            (signalLane === "none" && unresolvedNormative
+                ? "observation_review"
+                : signalLane));
     const readiness = modeled
         ? "modeled"
         : candidateLane === "none"

package/dist/operations/semantic-advisor/analyze-prose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyze-prose.d.ts","sourceRoot":"","sources":["../../../src/operations/semantic-advisor/analyze-prose.ts"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EACV,6BAA6B,EAC7B,oBAAoB,EAWrB,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,wBAAwB,wBAAwB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,CAI1D;AAg0BD,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,oBAAoB,GAC1B,6BAA6B,CA+D/B"}
+{"version":3,"file":"analyze-prose.d.ts","sourceRoot":"","sources":["../../../src/operations/semantic-advisor/analyze-prose.ts"],"names":[],"mappings":"AAmCA,OAAO,KAAK,EACV,6BAA6B,EAC7B,oBAAoB,EAWrB,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,wBAAwB,wBAAwB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,CAI1D;AAk2BD,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,oBAAoB,GAC1B,6BAA6B,CA+D/B"}

package/dist/operations/semantic-advisor/analyze-prose.js

@@ -2,7 +2,7 @@ import { createBuiltinOntologyPack, detectSignals as detectBuiltinSignals, } fro
 import { utf8Span, validateLogicIr, } from "../../logic/ir.js";
 import { logicRuleFactId } from "../modeling/logic-modeling.js";
 import { buildAdvisorResult } from "./analysis-receipt.js";
-import { extractSemanticClauses, semanticClaimKey, } from "./clauses.js";
+import { extractSemanticClauses, hasNormativeAssertion, semanticClaimKey, } from "./clauses.js";
 import { observationPlan } from "./observation-plan.js";
 import { predicateSuggestion as buildPredicateSuggestion, isRecord, payloadHash, propertiesOf, relationship, semanticClausesOf, semanticSourceHash, semanticSourceOf, sourceOf, statementOf, stringValue, } from "./shared.js";
 import { detectStrictSuggestion } from "./strict-rules.js";
@@ -371,11 +371,33 @@ function unmatchedClauseSuggestion(payload, clause, clauses, expectedClaimKeys)
     }, clause, clauses, expectedClaimKeys, statementOf(payload), semanticSourceOf(payload).field);
 }
 function propositionRole(statement, normative) {
-    if (/\b(?:for example|e\.g\.|such as|illustrative)\b/i.test(statement))
+    // Explicit context labels may quote obligations. Incidental explanatory
+    // words within an asserted obligation must not exempt it from grounding.
+    const assertedNormative = normative && hasNormativeAssertion(statement);
+    // A bare desired impression is subjective, even when phrased with should.
+    // Keep concrete actions, quantitative conditions and any independent
+    // obligation assertive instead of exempting them through subjective words.
+    const impression = /\bshould\s+(?:feel\s+(?:welcoming|comfortable|energetic)(?:\s+and\s+(?:welcoming|comfortable|energetic))*|(?:look|seem)\s+complete)\b/i.exec(statement);
+    const impressionTail = impression
+        ? statement.slice(impression.index + impression[0].length).trim()
+        : "";
+    const subjectiveAspiration = impression !== null &&
+        (impressionTail.length === 0 ||
+            /^(?:to|for)\s+[^,;.!?]+$/i.test(impressionTail)) &&
+        !/\b(?:and|or)\b/i.test(impressionTail) &&
+        !/\d|\b(?:at least|at most|exactly|within|no more than)\b/i.test(statement) &&
+        !hasNormativeAssertion(statement.replace(impression[0], ""));
+    if (/^\s*(?:for example\b|e\.g\.|(?:example|illustrative(?: example)?)\s*:)/i.test(statement) ||
+        (!assertedNormative &&
+            /\b(?:for example|e\.g\.|such as|illustrative)\b/i.test(statement)))
         return "example";
-    if (/\b(?:because|so that|in order to| rationale|therefore)\b/i.test(statement))
+    if (/^\s*rationale\s*:/i.test(statement) ||
+        (!assertedNormative &&
+            /\b(?:because|so that|in order to| rationale|therefore)\b/i.test(statement)))
         return "rationale";
-    if (/\b(?:feel|comfortable|looks complete|seems complete|subjective|prefer)\b/i.test(statement))
+    if (subjectiveAspiration ||
+        (!assertedNormative &&
+            /\b(?:feel|comfortable|looks complete|seems complete|subjective|prefer)\b/i.test(statement)))
         return "subjective";
     if (/\b(?:means|defined as|refers to|is called)\b/i.test(statement))
         return "definition";