kibi-cli 2.25.0 → 2.26.1

package/dist/cli-errors.d.ts

@@ -12,4 +12,18 @@ export declare class OperationError extends Error {
     readonly exitCode = 1;
     constructor(code: string, detail: string, retryable?: boolean);
 }
+/** The error envelope fields a thrown Kibi error carries. */
+export type CodedErrorFields = {
+    readonly code: string;
+    readonly message: string;
+    readonly retryable: boolean;
+};
+/**
+ * The code, message and retryability of a thrown InputError or
+ * OperationError, so the CLI JSON route and the MCP server answer it with the
+ * same error envelope. A copy of these classes bundled into another package
+ * fails `instanceof`, so an error with the same name and a code-shaped `code`
+ * counts too. Any other error carries no Kibi code and returns null.
+ */
+export declare function codedErrorOf(error: unknown): CodedErrorFields | null;
 //# sourceMappingURL=cli-errors.d.ts.map

package/dist/cli-errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-errors.d.ts","sourceRoot":"","sources":["../src/cli-errors.ts"],"names":[],"mappings":"AACA,qBAAa,UAAW,SAAQ,KAAK;IAMjC,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM;IALzB,QAAQ,CAAC,QAAQ,KAAK;IACtB,QAAQ,CAAC,SAAS,SAAS;gBAGhB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM;CAK1B;AAGD,qBAAa,cAAe,SAAQ,KAAK;IAKrC,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,SAAS;IALpB,QAAQ,CAAC,QAAQ,KAAK;gBAGX,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,SAAS,UAAO;CAK5B"}
+{"version":3,"file":"cli-errors.d.ts","sourceRoot":"","sources":["../src/cli-errors.ts"],"names":[],"mappings":"AACA,qBAAa,UAAW,SAAQ,KAAK;IAMjC,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM;IALzB,QAAQ,CAAC,QAAQ,KAAK;IACtB,QAAQ,CAAC,SAAS,SAAS;gBAGhB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM;CAK1B;AAGD,qBAAa,cAAe,SAAQ,KAAK;IAKrC,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,SAAS;IALpB,QAAQ,CAAC,QAAQ,KAAK;gBAGX,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,SAAS,UAAO;CAK5B;AAED,6DAA6D;AAE7D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B,CAAC;AAIF;;;;;;GAMG;AAEH,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,gBAAgB,GAAG,IAAI,CA4BpE"}

package/dist/cli-errors.js

@@ -27,3 +27,34 @@ export class OperationError extends Error {
         this.name = "OperationError";
     }
 }
+const ERROR_CODE = /^[A-Z][A-Z0-9_]*$/;
+/**
+ * The code, message and retryability of a thrown InputError or
+ * OperationError, so the CLI JSON route and the MCP server answer it with the
+ * same error envelope. A copy of these classes bundled into another package
+ * fails `instanceof`, so an error with the same name and a code-shaped `code`
+ * counts too. Any other error carries no Kibi code and returns null.
+ */
+// implements REQ-mcp-coded-error-envelope
+export function codedErrorOf(error) {
+    if (error instanceof InputError || error instanceof OperationError)
+        return {
+            code: error.code,
+            message: error.detail,
+            retryable: error.retryable,
+        };
+    if (!(error instanceof Error))
+        return null;
+    const candidate = error;
+    if ((candidate.name !== "InputError" && candidate.name !== "OperationError") ||
+        typeof candidate.code !== "string" ||
+        !ERROR_CODE.test(candidate.code))
+        return null;
+    return {
+        code: candidate.code,
+        message: typeof candidate.detail === "string" ? candidate.detail : error.message,
+        retryable: typeof candidate.retryable === "boolean"
+            ? candidate.retryable
+            : candidate.name === "OperationError",
+    };
+}

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

@@ -1 +1 @@
-{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":"AAqCA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAiF7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAE3D,YAAY,EAAE,SAAS,EAAE,CAAC;AAE1B,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B;AA8gBD,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EACtC,MAAM,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,EAC5B,MAAM,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,GAC3B,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAMpB;AAGD,wBAAsB,YAAY,CAChC,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CA2oB/B;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAoDtB;AAID,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CAgBnB;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,aAAa,EACrB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,EAAE,CAAC,CAiBnB;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAkEtB;AAID,wBAAsB,aAAa,CACjC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAmGtB;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,EACrB,YAAY,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,SAAS,EAAE,CAAC,CAyCtB;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAgDtB;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CA0BtB;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAqBtB;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAqBtB;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAqBtB"}
+{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":"AAqCA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAkF7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAE3D,YAAY,EAAE,SAAS,EAAE,CAAC;AAE1B,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B;AA6hBD,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EACtC,MAAM,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,EAC5B,MAAM,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,GAC3B,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAMpB;AAGD,wBAAsB,YAAY,CAChC,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAgqB/B;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAoDtB;AAID,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CAgBnB;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,aAAa,EACrB,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,EAAE,CAAC,CAiBnB;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAkEtB;AAID,wBAAsB,aAAa,CACjC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAmGtB;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,EACrB,YAAY,EAAE,MAAM,EAAE,GACrB,OAAO,CAAC,SAAS,EAAE,CAAC,CAyCtB;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAgDtB;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CA0BtB;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAqBtB;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAqBtB;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,SAAS,EAAE,CAAC,CAqBtB"}

package/dist/commands/check.js

@@ -39,6 +39,7 @@ import { createStagedEntityIdStyleDiagnostics } from "../traceability/staged-ent
 import { analyzeStagedFileCoverage, } from "../traceability/staged-file-coverage.js";
 import { classifyKibiImpactEvidence, isBehaviorSourceEdit, parseKibiImpactOverride, } from "../traceability/staged-impact-contract.js";
 import { stagedInventoryDriftViolations } from "../traceability/staged-inventory-drift.js";
+import { stagedCommitCarriesMigration } from "../traceability/staged-migration.js";
 import { assessStagedSymbolsManifest, collectStagedAuthoredSymbolsManifestEvidence, } from "../traceability/staged-symbols-manifest.js";
 import { createManifestLookupSentinelKey, extractSymbolsFromStagedFileAsync, } from "../traceability/symbol-extract.js";
 import { cleanupTempKb, consultOverlay, createOverlayFacts, createTempKb, projectStagedEntities, } from "../traceability/temp-kb.js";
@@ -323,6 +324,13 @@ function noValidatedSymbolsMessage(sourceAnalysis) {
 function uniqueSorted(values) {
     return Array.from(new Set(values)).sort();
 }
+/** The Baseline-style line naming records changed only by a migration. */
+// implements REQ-cli-migration-first-commit
+function migrationOnlyNote(entityIds) {
+    const shown = entityIds.slice(0, 5).join(", ");
+    const more = entityIds.length > 5 ? ` and ${entityIds.length - 5} more` : "";
+    return `Migration commit: ${entityIds.length} symbol record(s) changed only by kibi migrate (legacy-link marks, review:context-missing tags) are not judged as changed by this commit: ${shown}${more}. Run kibi check for the full report.`;
+}
 function hasYamlFrontmatter(content) {
     const trimmed = content.trimStart();
     return trimmed.startsWith("---") && trimmed.slice(3).includes("\n---");
@@ -361,7 +369,10 @@ function buildStagedKibiImpactEvidence(options) {
         ...(options.readBaseFile ? { readBaseFile: options.readBaseFile } : {}),
         stagedFiles,
         sourceFiles: behaviorSourceFiles,
+        ignoreMigrationOwnedEdits: options.ignoreMigrationOwnedEdits === true,
     });
+    if (stagedAuthoredSymbolsEvidence.migrationOnlyEntityIds !== undefined)
+        options.onMigrationOnlySymbols?.(stagedAuthoredSymbolsEvidence.migrationOnlyEntityIds);
     const resolvedKbArtifacts = [];
     let override = null;
     for (const file of markdownFiles) {
@@ -670,7 +681,24 @@ export async function checkCommand(options) {
                     ...scopedManifestResults,
                     ...markdownResultsByPath.values(),
                 ];
+                const readTreeFile = (tree) => (filePath) => {
+                    try {
+                        return snapshot
+                            .readGit(["show", `${tree}:${filePath}`])
+                            .toString("utf8");
+                    }
+                    catch {
+                        return null;
+                    }
+                };
+                // A commit that carries a kibi migrate run is not charged with the
+                // fields the migration rewrote mechanically in existing records.
+                const carriesMigration = stagedCommitCarriesMigration(readTreeFile(snapshot.baseTree), readTreeFile(snapshot.headTree));
                 const stagedKibiEvidence = buildStagedKibiImpactEvidence({
+                    ignoreMigrationOwnedEdits: carriesMigration,
+                    onMigrationOnlySymbols: (entityIds) => {
+                        baselineNotes.push(migrationOnlyNote(entityIds));
+                    },
                     analyzeSource: (filePath) => {
                         const result = sourceAnalysis.get(filePath)?.after;
                         if (!result)

package/dist/commands/migrate.d.ts

@@ -31,6 +31,8 @@ export interface MigrationAuditRecord {
     sourcePathsRewritten: number;
     /** Authored source values this run removed: they named the entity's own file or nothing. */
     sourcePathsRemoved: number;
+    /** Requirements whose delivery status (implemented, done, completed) this run mapped to closed plus tag implemented. */
+    legacyStatusesMapped: number;
     toVersion: number;
     /** The schema warning the KB showed before this run migrated it. */
     preMigrationWarning: string | null;

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

@@ -1 +1 @@
-{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/commands/migrate.ts"],"names":[],"mappings":"AA+CA,OAAO,KAAK,EACV,eAAe,EAEhB,MAAM,wCAAwC,CAAC;AAwBhD,UAAU,cAAc;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,uFAAuF;IACvF,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,6EAA6E;IAC7E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qFAAqF;IACrF,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,uBAAuB,EAAE,SAAS,GAAG,WAAW,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAC3E,MAAM,EAAE,SAAS,CAAC;IAClB,4BAA4B,EAAE,MAAM,CAAC;IACrC,8EAA8E;IAC9E,oBAAoB,EAAE,MAAM,CAAC;IAC7B,8DAA8D;IAC9D,4BAA4B,EAAE,MAAM,CAAC;IACrC,sEAAsE;IACtE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,4FAA4F;IAC5F,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,oEAAoE;IACpE,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1B;AAED,iFAAiF;AACjF,MAAM,WAAW,mBAAmB;IAClC,kEAAkE;IAClE,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,oBAAoB,CAAC;IAC5B,0EAA0E;IAC1E,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAgJD,wBAAgB,mBAAmB,CACjC,gBAAgB,EAAE,OAAO,EACzB,UAAU,EAAE,MAAM,GAAG,IAAI,GACxB,MAAM,CAUR;AAsOD,wBAAgB,+BAA+B,IAAI;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAKtE;AAGD,wBAAsB,cAAc,CAClC,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,mBAAmB,CAAA;CAAE,CAAC,CAmb9D;AAED;;;;GAIG;AAEH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,GAAG,MAAM,CAGzE;AA+WD;;;;;GAKG;AAEH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,GACpC,OAAO,CAOT"}
+{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/commands/migrate.ts"],"names":[],"mappings":"AA0DA,OAAO,KAAK,EACV,eAAe,EAEhB,MAAM,wCAAwC,CAAC;AAwBhD,UAAU,cAAc;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,uFAAuF;IACvF,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,6EAA6E;IAC7E,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qFAAqF;IACrF,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,uBAAuB,EAAE,SAAS,GAAG,WAAW,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAC3E,MAAM,EAAE,SAAS,CAAC;IAClB,4BAA4B,EAAE,MAAM,CAAC;IACrC,8EAA8E;IAC9E,oBAAoB,EAAE,MAAM,CAAC;IAC7B,8DAA8D;IAC9D,4BAA4B,EAAE,MAAM,CAAC;IACrC,sEAAsE;IACtE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,4FAA4F;IAC5F,kBAAkB,EAAE,MAAM,CAAC;IAC3B,wHAAwH;IACxH,oBAAoB,EAAE,MAAM,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,oEAAoE;IACpE,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1B;AAED,iFAAiF;AACjF,MAAM,WAAW,mBAAmB;IAClC,kEAAkE;IAClE,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,oBAAoB,CAAC;IAC5B,0EAA0E;IAC1E,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAgJD,wBAAgB,mBAAmB,CACjC,gBAAgB,EAAE,OAAO,EACzB,UAAU,EAAE,MAAM,GAAG,IAAI,GACxB,MAAM,CAUR;AAiWD,wBAAgB,+BAA+B,IAAI;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAKtE;AAGD,wBAAsB,cAAc,CAClC,OAAO,GAAE,cAAmB,GAC3B,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,mBAAmB,CAAA;CAAE,CAAC,CAkd9D;AAED;;;;GAIG;AAEH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,GAAG,MAAM,CAGzE;AA+WD;;;;;GAKG;AAEH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,GACpC,OAAO,CAOT"}

package/dist/commands/migrate.js

@@ -19,8 +19,10 @@ import { existsSync, mkdirSync, renameSync, writeFileSync, } from "node:fs";
 import * as path from "node:path";
 import { applySafeInventoryRederivations, planInventoryRederivation, } from "../operations/migration/inventory-rederive.js";
 import { applyOriginBackfill, planOriginBackfill, } from "../operations/migration/origin-backfill.js";
+import { applyDeliveredStatusMappings, planRequirementStatusMappings, } from "../operations/migration/requirement-status.js";
 import { applySourcePathRepairs, findSourceRepairs, } from "../operations/migration/source-paths.js";
 import { applySupersededClosures, planSupersededClosures, } from "../operations/migration/superseded-closure.js";
+import { coordinateRefreshFailureMessage, readGeneratedManifestBytes, refreshCoordinatesAfterMigration, } from "../operations/migration/symbol-coordinates-refresh.js";
 import { applySymbolLegacyLinks, planSymbolLegacyLinks, } from "../operations/migration/symbol-legacy-links.js";
 import { resolveBranchAttachment } from "../utils/branch-resolver.js";
 import { defaultKbManifest, readKbManifest, readKbManifestStatus, writeKbManifest, } from "../utils/kb-manifest.js";
@@ -155,6 +157,7 @@ function buildMigrationAuditRecord(args) {
         supersededRequirementsClosed: args.supersededRequirementsClosed,
         sourcePathsRewritten: args.sourcePathsRewritten,
         sourcePathsRemoved: args.sourcePathsRemoved,
+        legacyStatusesMapped: args.legacyStatusesMapped,
         toVersion: LATEST_KB_SCHEMA_VERSION,
         preMigrationWarning: args.preMigrationWarning,
         steps: args.steps,
@@ -187,6 +190,19 @@ function markLegacySymbolLinks(cwd, dryRun, manifestPath) {
         printWarning(`Could not mark ${unmarked.join(", ")} as legacy-link in place; add granularity_reason: legacy-link to them in ${CANONICAL_ENTITY_PATHS.symbols} by hand.`);
     return marked.length;
 }
+/**
+ * Refresh generated symbol coordinates after the migration rewrote or moved
+ * .kb/symbols.yaml, so the first commit does not hit the generated-manifest
+ * gate. A failure leaves the migration applied and names the manual step.
+ */
+// implements REQ-cli-migration-first-commit
+async function refreshMigratedSymbolCoordinates(cwd, before) {
+    const refresh = await refreshCoordinatesAfterMigration(cwd, before);
+    if (refresh.outcome === "refreshed")
+        console.log("Refreshed generated symbol coordinates for the migrated .kb/symbols.yaml; stage .kb/symbols.yaml and .kb/symbol-coordinates.yaml with the migration.");
+    else if (refresh.outcome === "failed")
+        printWarning(coordinateRefreshFailureMessage(refresh.reason));
+}
 function describeRederivation(plan) {
     const { keptModeled, roleChanges, newlyUnresolved, downgradedModeled } = plan.summary;
     return `${plan.requirementId}: ${keptModeled} modeled claim(s) kept, ${roleChanges} role change(s), ${newlyUnresolved} claim(s) now unresolved, ${downgradedModeled} modeled claim(s) downgraded`;
@@ -300,6 +316,74 @@ function repairLifecycleFindings(cwd, dryRun) {
         manual: supersession.cycles.length + unrepaired.length,
     };
 }
+function describeDeliveredMappings(findings) {
+    const byStatus = new Map();
+    for (const finding of findings) {
+        byStatus.set(finding.status, [
+            ...(byStatus.get(finding.status) ?? []),
+            finding,
+        ]);
+    }
+    return [...byStatus]
+        .map(([status, group]) => `legacy status ${status} -> ${group[0]?.automatic?.status ?? "closed"} (tag ${group[0]?.automatic?.tag ?? "implemented"}) on ${group.length} requirement(s): ${group.map((finding) => finding.requirementId).join(", ")}`)
+        .join("; ");
+}
+/**
+ * Map delivery statuses (implemented, done, completed) to closed plus the tag
+ * implemented: kibi sync cannot compile them, and that is their one lossless
+ * reading. Returns the requirement statuses a person still has to decide.
+ */
+// implements REQ-cli-schema-migration
+function mapLegacyRequirementStatuses(cwd, dryRun) {
+    const findings = planRequirementStatusMappings(cwd);
+    const delivered = findings.filter((finding) => finding.automatic !== null);
+    if (dryRun) {
+        const review = findings.filter((finding) => finding.automatic === null);
+        if (delivered.length > 0)
+            console.log(`dry run: would map ${describeDeliveredMappings(delivered)}.`);
+        if (review.length > 0)
+            console.log(`dry run: ${review.length} requirement status(es) need a person to choose the current status: ${review.map((finding) => `${finding.requirementId} (${finding.status})`).join(", ")}; kibi migrate --format json lists them as req_status_vocabulary_map.`);
+        return { mapped: delivered.length, review };
+    }
+    if (delivered.length === 0)
+        return { mapped: 0, review: findings };
+    const result = applyDeliveredStatusMappings(cwd);
+    if (result.mapped.length > 0)
+        console.log(`Mapped ${describeDeliveredMappings(result.mapped)}.`);
+    for (const skip of result.skipped)
+        printWarning(`Status not mapped for ${skip.path}: ${skip.reason}.`);
+    return {
+        mapped: result.mapped.length,
+        review: planRequirementStatusMappings(cwd),
+    };
+}
+/**
+ * Print what a `kibi migrate --yes` run left for a person, naming the
+ * requirements kibi sync cannot compile first. Returns false when nothing
+ * remains, so the caller may call the migration complete.
+ */
+// implements REQ-cli-schema-migration
+function printRemainingMigrationWork(remaining) {
+    const { statuses, manualInventories, manualLifecycle } = remaining;
+    if (statuses.length === 0 && manualInventories === 0 && manualLifecycle === 0)
+        return false;
+    const uncompiled = statuses.filter((finding) => finding.extractionError !== null);
+    const skipped = statuses.filter((finding) => finding.extractionError === null);
+    const notCompiled = uncompiled.length + manualInventories;
+    console.log(`Migration incomplete: ${notCompiled} requirement(s) are not compiled, so kb_query, kb_coverage and kb_upsert do not see them, and ${skipped.length + manualLifecycle} other item(s) need a decision.`);
+    for (const finding of uncompiled) {
+        console.log(`  ${finding.requirementId} (${finding.path}): status ${finding.status} is not a status Kibi knows, so kibi sync cannot compile it (${finding.extractionError}). Set status to open, in_progress or closed in the file (closed with the tag implemented for delivered work), then run kibi sync.`);
+    }
+    if (manualInventories > 0)
+        console.log(`  ${manualInventories} requirement inventory(ies) need the manual fix in the warnings above; kibi sync rejects them until then.`);
+    for (const finding of skipped) {
+        console.log(`  ${finding.requirementId} (${finding.path}): status ${finding.status} is not a requirement status, so the proof ladder skips it. ${finding.suggestedStatus === null ? "Set status to open, in_progress or closed in the file" : `Approve req-status-vocabulary-map-${finding.requirementId} (${finding.status} -> ${finding.suggestedStatus}) with kibi migrate --apply-safe, or set the status in the file`}.`);
+    }
+    if (manualLifecycle > 0)
+        console.log(`  ${manualLifecycle} lifecycle item(s) need a person; see the warnings above.`);
+    console.log("Run 'kibi migrate' for the remaining actions; rerun 'kibi migrate --yes' after fixing them.");
+    return true;
+}
 export function warnMigrationRequiredWithoutYes() {
     printWarning("Migration required for this repository.");
     console.log("No changes applied.");
@@ -375,26 +459,43 @@ export async function migrateCommand(options = {}) {
         console.error(`Unsupported schemaVersion ${configStatus.currentVersion}. Upgrade kibi-cli before migrating this KB.`);
         return { exitCode: 1 };
     }
+    // What the generated manifests held before this run, so the run refreshes
+    // coordinates only when it rewrote or moved the symbols manifest.
+    const generatedManifestsBefore = readGeneratedManifestBytes(cwd);
     if (!needsStorageMigration && !needsSchemaUpgrade) {
         const { planPolarityValueBackfill, applyPolarityValueBackfill } = await import("../operations/migration/polarity-values.js");
         const polarityCount = options.dryRun
             ? planPolarityValueBackfill(cwd).length
             : applyPolarityValueBackfill(cwd);
+        // Delivery statuses keep requirements out of the store at any version;
+        // map them before the drift check, which only sees compiled requirements.
+        const statuses = mapLegacyRequirementStatuses(cwd, options.dryRun === true);
         // An advisor change can make stored inventories drift at any version,
         // and lifecycle findings block kibi check at any version.
         const drift = rederiveDriftedInventories(cwd, options.dryRun === true);
         const lifecycle = repairLifecycleFindings(cwd, options.dryRun === true);
         const legacyLinks = markLegacySymbolLinks(cwd, options.dryRun === true);
         const rewroteSources = polarityCount > 0 ||
+            statuses.mapped > 0 ||
             legacyLinks > 0 ||
             drift.rederived.length > 0 ||
             lifecycle.closed > 0 ||
             lifecycle.rewritten > 0 ||
             lifecycle.removed > 0;
-        if (rewroteSources || drift.manual > 0 || lifecycle.manual > 0) {
+        if (rewroteSources ||
+            statuses.review.length > 0 ||
+            drift.manual > 0 ||
+            lifecycle.manual > 0) {
             if (options.dryRun !== true && rewroteSources) {
+                await refreshMigratedSymbolCoordinates(cwd, generatedManifestsBefore);
                 console.log("Run 'kibi sync' to recompile the rewritten sources.");
             }
+            if (options.dryRun !== true)
+                printRemainingMigrationWork({
+                    statuses: statuses.review,
+                    manualInventories: drift.manual,
+                    manualLifecycle: lifecycle.manual,
+                });
             if (options.yes === true)
                 updateGitIgnore(cwd);
             return { exitCode: 0 };
@@ -468,6 +569,7 @@ export async function migrateCommand(options = {}) {
                 console.log(`dry run: would record origin {kind: migration} on ${backfill.targets.length} authored entit(ies) without one.`);
             }
         }
+        mapLegacyRequirementStatuses(cwd, true);
         rederiveDriftedInventories(cwd, true);
         repairLifecycleFindings(cwd, true);
         console.log(`dry run: would write migration audit metadata to ${toRelativePath(cwd, auditPath)}.`);
@@ -520,7 +622,8 @@ export async function migrateCommand(options = {}) {
     const originBackfill = originBackfillStep
         ? applyOriginBackfill(cwd, migratedAt)
         : { written: [], skipped: [], previouslyStamped: 0 };
-    rederiveDriftedInventories(cwd, false);
+    const statuses = mapLegacyRequirementStatuses(cwd, false);
+    const drift = rederiveDriftedInventories(cwd, false);
     const lifecycle = repairLifecycleFindings(cwd, false);
     const supersedesUnexplained = decisionFirmnessStep
         ? planSupersedesReasonAcknowledgement(cwd)
@@ -558,6 +661,7 @@ export async function migrateCommand(options = {}) {
         console.log(`Acknowledged ${supersedesUnexplained.length} supersede(s) recorded without a 'Why this changed' section; new supersedes must explain themselves.`);
     if (firmSupersedes.length > 0)
         console.log(`Acknowledged ${firmSupersedes.length} supersede(s) of decisions without firmness that read as firm from schema 10; a new replacement of such a decision must be firm.`);
+    await refreshMigratedSymbolCoordinates(cwd, generatedManifestsBefore);
     const auditRecord = buildMigrationAuditRecord({
         branch,
         manifestPath: KB_MANIFEST_RELATIVE,
@@ -569,6 +673,7 @@ export async function migrateCommand(options = {}) {
         supersededRequirementsClosed: lifecycle.closed,
         sourcePathsRewritten: lifecycle.rewritten,
         sourcePathsRemoved: lifecycle.removed,
+        legacyStatusesMapped: statuses.mapped,
         preMigrationWarning: migrationWarning,
         steps: migrationSteps.map((step) => step.id),
     });
@@ -584,7 +689,13 @@ export async function migrateCommand(options = {}) {
         printWarning(`Origin not recorded for ${skip.path}: ${skip.reason}.`);
     }
     console.log(`Wrote migration audit metadata to ${toRelativePath(cwd, auditPath)}.`);
-    console.log("Migration complete. Future 'kibi migrate' runs will be a no-op.");
+    const incomplete = printRemainingMigrationWork({
+        statuses: statuses.review,
+        manualInventories: drift.manual,
+        manualLifecycle: lifecycle.manual,
+    });
+    if (!incomplete)
+        console.log("Migration complete. Future 'kibi migrate' runs will be a no-op.");
     const mergeDriverGaps = manifestMergeDriverGaps(cwd);
     if (mergeDriverGaps !== null && mergeDriverGaps.length > 0) {
         console.log(`Tip: kibi merge-driver resolves .kb/symbols.yaml merges by record id, but it is not wired up (${mergeDriverGaps.join("; ")}). ${MERGE_DRIVER_SETUP}`);
@@ -607,7 +718,7 @@ export async function migrateCommand(options = {}) {
 // implements REQ-agent-guided-migration-orchestration, REQ-cli-schema-migration
 export function describeMigrationRun(summary) {
     const { audit } = summary;
-    return `Migrated schema ${audit.fromVersion ?? "none"} -> ${audit.toVersion} (audit ${summary.auditPath}): legacy-link marks ${audit.symbolGranularityLegacyLinks}, origin backfill ${audit.entityOriginBackfill}, superseded requirements closed ${audit.supersededRequirementsClosed}, source paths rewritten ${audit.sourcePathsRewritten}, source paths removed ${audit.sourcePathsRemoved}; .gitignore ${summary.gitignoreUpdated ? "updated" : "unchanged"}.`;
+    return `Migrated schema ${audit.fromVersion ?? "none"} -> ${audit.toVersion} (audit ${summary.auditPath}): legacy-link marks ${audit.symbolGranularityLegacyLinks}, origin backfill ${audit.entityOriginBackfill}, superseded requirements closed ${audit.supersededRequirementsClosed}, source paths rewritten ${audit.sourcePathsRewritten}, source paths removed ${audit.sourcePathsRemoved}, legacy statuses mapped ${audit.legacyStatusesMapped}; .gitignore ${summary.gitignoreUpdated ? "updated" : "unchanged"}.`;
 }
 const KB_MANIFEST_RELATIVE = ".kb/manifest.json";
 // implements REQ-agent-guided-migration-orchestration, REQ-cli-schema-migration

package/dist/commands/sync/cache.d.ts

@@ -23,6 +23,24 @@ export type SyncCache = {
     semanticContracts: Record<string, boolean>;
     /** Compiler contract that produced the cached compilation; see below. */
     compilerFingerprint?: string;
+    /**
+     * Authored sources the last sync could not extract, keyed like `hashes`:
+     * their entities are missing from the store, so kb_status reports them.
+     */
+    extractionFailures?: Record<string, SourceExtractionFailure>;
+};
+/** One authored source the last sync could not extract. */
+export type SourceExtractionFailure = {
+    /** SHA-256 of the bytes that failed. */
+    hash: string;
+    /** The extraction error sync reported. */
+    message: string;
+    /**
+     * The source failed in the store's first compilation (or in every sync
+     * since), so it is legacy content that missed the semantic baseline, not
+     * new authoring.
+     */
+    baseline?: boolean;
 };
 /**
  * v2: cache identities are workspace-root relative instead of process-cwd
@@ -46,6 +64,18 @@ export declare const SYNC_COMPILER_FINGERPRINT: string;
  * visible before the next sync repairs it.
  */
 export declare function compilerFingerprintReason(storePath: string, deps?: Partial<SyncCacheDeps>): Record<string, unknown> | null;
+/** Stale-reason code for an authored source the last sync could not extract. */
+export declare const SOURCE_EXTRACTION_FAILED = "source_extraction_failed";
+/**
+ * One blocking reason per authored source the last sync could not extract
+ * and that still has the bytes that failed: its entities are missing from the
+ * store, so the KB is not current even when every compiled file is. A file
+ * edited since then is reported by the changed-source reasons instead, and a
+ * deleted one by nothing.
+ */
+export declare function sourceExtractionFailureReasons(workspaceRoot: string, storePath: string, deps?: Partial<SyncCacheDeps>): Record<string, unknown>[];
+/** How to make an authored source that sync cannot extract compile. */
+export declare function sourceExtractionRemediation(file: string, message: string): string;
 export declare function toCacheKey(workspaceRoot: string, filePath: string): string;
 export declare function hashFile(workspaceRoot: string, filePath: string, deps?: Partial<SyncCacheDeps>): string;
 /** Deterministically hash a JSON-compatible compiler payload. */

package/dist/commands/sync/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/cache.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAO7E,UAAU,aAAa;IACrB,UAAU,EAAE,OAAO,UAAU,CAAC;IAC9B,UAAU,EAAE,OAAO,UAAU,CAAC;IAC9B,SAAS,EAAE,OAAO,SAAS,CAAC;IAC5B,YAAY,EAAE,OAAO,YAAY,CAAC;IAClC,aAAa,EAAE,OAAO,aAAa,CAAC;CACrC;AAaD,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,sEAAsE;IACtE,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C,sEAAsE;IACtE,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,iEAAiE;IACjE,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3C,kEAAkE;IAClE,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,yEAAyE;IACzE,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,iBAAiB,QAA2B,CAAC;AAE1D;;;;;;GAMG;AAEH,eAAO,MAAM,yBAAyB,QAEtB,CAAC;AAEjB;;;;GAIG;AAEH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAC5B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAyBhC;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAM1E;AAED,wBAAgB,QAAQ,CAEtB,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAC5B,MAAM,CAIR;AAED,iEAAiE;AACjE,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAerD;AAED;;;;;GAKG;AAEH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,GAAG,IAAI,EAC9B,IAAI,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAC5B,MAAM,CA4FR;AAED,wBAAgB,aAAa,CAE3B,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,EAC7B,OAAO,GAAE;IACP,oEAAoE;IACpE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAClC,GACL,SAAS,CA8DX;AAED,wBAAgB,cAAc,CAE5B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,SAAS,EAChB,IAAI,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAC5B,IAAI,CAaN;AAED,wBAAgB,aAAa,CAE3B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,GAC5B,IAAI,CASN"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/cache.ts"],"names":[],"mappings":"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"}

package/dist/commands/sync/cache.js

@@ -81,6 +81,64 @@ export function compilerFingerprintReason(storePath, deps) {
         remediation: { command_argv: ["kibi", "sync"], applyRequired: false },
     };
 }
+/** Stale-reason code for an authored source the last sync could not extract. */
+// implements REQ-kibi-uncompiled-source-visibility
+export const SOURCE_EXTRACTION_FAILED = "source_extraction_failed";
+/**
+ * One blocking reason per authored source the last sync could not extract
+ * and that still has the bytes that failed: its entities are missing from the
+ * store, so the KB is not current even when every compiled file is. A file
+ * edited since then is reported by the changed-source reasons instead, and a
+ * deleted one by nothing.
+ */
+// implements REQ-kibi-uncompiled-source-visibility
+export function sourceExtractionFailureReasons(workspaceRoot, storePath, deps) {
+    const resolved = resolveDeps(deps);
+    const cachePath = path.join(storePath, "sync-cache.json");
+    if (!resolved.existsSync(cachePath))
+        return [];
+    let failures;
+    try {
+        const parsed = JSON.parse(resolved.readFileSync(cachePath, "utf8"));
+        if (parsed.extractionFailures === null ||
+            typeof parsed.extractionFailures !== "object")
+            return [];
+        failures = parsed.extractionFailures;
+    }
+    catch {
+        return [];
+    }
+    const reasons = [];
+    for (const [key, failure] of Object.entries(failures).sort(([a], [b]) => a.localeCompare(b))) {
+        const absolute = path.resolve(workspaceRoot, key);
+        let current;
+        try {
+            current = hashFile(workspaceRoot, absolute, deps);
+        }
+        catch {
+            continue;
+        }
+        if (current !== failure?.hash)
+            continue;
+        const message = String(failure.message);
+        reasons.push({
+            code: SOURCE_EXTRACTION_FAILED,
+            path: key,
+            entityIds: [],
+            detail: `${key} cannot be compiled, so the entities it declares are missing from the KB: ${message}`,
+            remediation: sourceExtractionRemediation(key, message),
+            blocking: true,
+        });
+    }
+    return reasons;
+}
+/** How to make an authored source that sync cannot extract compile. */
+// implements REQ-kibi-uncompiled-source-visibility
+export function sourceExtractionRemediation(file, message) {
+    if (/\/status\b/.test(message))
+        return `Run 'kibi migrate --yes' to map a legacy requirement status (implemented, done and completed become closed with the tag implemented), or set status in ${file} to a status Kibi knows (open, in_progress or closed for a requirement); then run kibi sync.`;
+    return `Fix the front matter of ${file} named in the error (edit the file, or rewrite the entity with kb_upsert so the write replaces the failing field), then run kibi sync.`;
+}
 export function toCacheKey(workspaceRoot, filePath) {
     const root = path.resolve(workspaceRoot);
     const target = path.isAbsolute(filePath)
@@ -255,6 +313,9 @@ cachePath, deps, options = {}) {
         if (parsed.compilerFingerprint !== undefined) {
             cache.compilerFingerprint = parsed.compilerFingerprint;
         }
+        if (parsed.extractionFailures !== undefined) {
+            cache.extractionFailures = parsed.extractionFailures;
+        }
         return cache;
     }
     catch {

package/dist/commands/sync/extraction.d.ts

@@ -2,10 +2,16 @@ import { type ExtractionResult } from "../../extractors/markdown.js";
 export interface ExtractionOutput {
     results: ExtractionResult[];
     failedCacheKeys: Set<string>;
+    /** Extraction failures, collected only in validate-only mode. */
     errors: {
         file: string;
         message: string;
     }[];
+    /** Every source that could not be extracted, in any mode. */
+    failures: {
+        file: string;
+        message: string;
+    }[];
 }
 /**
  * Authored source identities are workspace-relative POSIX paths. Code symbol

package/dist/commands/sync/extraction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extraction.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/extraction.ts"],"names":[],"mappings":"AAuBA,OAAO,EACL,KAAK,gBAAgB,EAGtB,MAAM,8BAA8B,CAAC;AAGtC,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC7C;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,SAAS,gBAAgB,EAAE,EACpC,aAAa,EAAE,MAAM,GACpB,gBAAgB,EAAE,CAoBpB;AAED,UAAU,sBAAsB;IAC9B,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,gBAAgB,CAAC;IACxD,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,gBAAgB,EAAE,CAAC;CAC3D;AAOD,wBAAsB,kBAAkB,CAEtC,oBAAoB,EAAE,MAAM,EAAE,EAC9B,oBAAoB,EAAE,MAAM,EAAE,EAC9B,YAAY,EAAE,OAAO,EACrB,aAAa,SAAgB,EAC7B,YAAY,GAAE,sBAAwD,GACrE,OAAO,CAAC,gBAAgB,CAAC,CAmD3B"}
+{"version":3,"file":"extraction.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/extraction.ts"],"names":[],"mappings":"AAuBA,OAAO,EACL,KAAK,gBAAgB,EAGtB,MAAM,8BAA8B,CAAC;AAGtC,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,iEAAiE;IACjE,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,6DAA6D;IAC7D,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC/C;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,SAAS,gBAAgB,EAAE,EACpC,aAAa,EAAE,MAAM,GACpB,gBAAgB,EAAE,CAoBpB;AAED,UAAU,sBAAsB;IAC9B,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,gBAAgB,CAAC;IACxD,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,gBAAgB,EAAE,CAAC;CAC3D;AAOD,wBAAsB,kBAAkB,CAEtC,oBAAoB,EAAE,MAAM,EAAE,EAC9B,oBAAoB,EAAE,MAAM,EAAE,EAC9B,YAAY,EAAE,OAAO,EACrB,aAAa,SAAgB,EAC7B,YAAY,GAAE,sBAAwD,GACrE,OAAO,CAAC,gBAAgB,CAAC,CAsD3B"}

package/dist/commands/sync/extraction.js

@@ -57,6 +57,7 @@ changedMarkdownFiles, changedManifestFiles, validateOnly, workspaceRoot = proces
     const results = [];
     const failedCacheKeys = new Set();
     const errors = [];
+    const failures = [];
     for (const file of changedMarkdownFiles) {
         try {
             results.push(dependencies.extractFromMarkdown(file));
@@ -74,6 +75,7 @@ changedMarkdownFiles, changedManifestFiles, validateOnly, workspaceRoot = proces
             else {
                 console.warn(`Warning: Failed to extract from ${file}: ${message}`);
             }
+            failures.push({ file, message });
             failedCacheKeys.add(toCacheKey(workspaceRoot, file));
         }
     }
@@ -95,8 +97,9 @@ changedMarkdownFiles, changedManifestFiles, validateOnly, workspaceRoot = proces
             else {
                 console.warn(`Warning: Failed to extract from ${file}: ${message}`);
             }
+            failures.push({ file, message });
             failedCacheKeys.add(toCacheKey(workspaceRoot, file));
         }
     }
-    return { results, failedCacheKeys, errors };
+    return { results, failedCacheKeys, errors, failures };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA6BjE,OAAO,EAEL,yBAAyB,EAE1B,MAAM,gDAAgD,CAAC;AAGxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EACL,KAAK,gBAAgB,EAGtB,MAAM,6BAA6B,CAAC;AAyBrC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAkCxE,qBAAa,SAAU,SAAQ,KAAK;gBACtB,OAAO,EAAE,MAAM;CAI5B;AAmCD,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,4BAA4B,UAAQ,EACpC,4BAA4B,GAAE,4BAA4B,EAAO,GAChE,MAAM,EAAE,CAuGV;AAiFD,MAAM,WAAW,UAAW,SAAQ,WAAW;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,yBAAyB;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,UAAU,kBAAkB;IAC1B,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,yBAAyB,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC3E,UAAU,CAAC,EAAE,CACX,OAAO,EAAE,yBAAyB,GAAG;QAAE,UAAU,EAAE,OAAO,CAAA;KAAE,KACzD,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,aAAa,CAAC;IAC/D,yBAAyB,CAAC,EAAE,OAAO,yBAAyB,CAAC;CAC9D;AA+FD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAGvE;AAGD,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,IAAI,GAChB,IAAI,CAMN;AAED,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,UAAU,EAAE,EACzB,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,GACf,IAAI,CAIN;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,IAAI,CAMP;AAED,wBAAgB,iCAAiC,CAC/C,WAAW,EAAE,UAAU,EAAE,EACzB,oBAAoB,EAAE,OAAO,EAC7B,iBAAiB,EAAE,MAAM,EACzB,WAAW,EAAE,MAAM,GAClB,IAAI,CAUN;AAGD,wBAAsB,WAAW,CAC/B,OAAO,GAAE;IACP,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,wEAAwE;IACxE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,uEAAuE;IACvE,KAAK,CAAC,EAAE,OAAO,CAAC;CACZ,EACN,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,UAAU,CAAC,CA4rCrB;AAED,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA6BjE,OAAO,EAEL,yBAAyB,EAE1B,MAAM,gDAAgD,CAAC;AAGxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EACL,KAAK,gBAAgB,EAGtB,MAAM,6BAA6B,CAAC;AAyBrC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAkCxE,qBAAa,SAAU,SAAQ,KAAK;gBACtB,OAAO,EAAE,MAAM;CAI5B;AAmCD,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,4BAA4B,UAAQ,EACpC,4BAA4B,GAAE,4BAA4B,EAAO,GAChE,MAAM,EAAE,CAuGV;AAiFD,MAAM,WAAW,UAAW,SAAQ,WAAW;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,yBAAyB;IACjC,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,UAAU,kBAAkB;IAC1B,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,yBAAyB,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC3E,UAAU,CAAC,EAAE,CACX,OAAO,EAAE,yBAAyB,GAAG;QAAE,UAAU,EAAE,OAAO,CAAA;KAAE,KACzD,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,aAAa,CAAC;IAC/D,yBAAyB,CAAC,EAAE,OAAO,yBAAyB,CAAC;CAC9D;AA+FD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAGvE;AAGD,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,IAAI,GAChB,IAAI,CAMN;AAED,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,UAAU,EAAE,EACzB,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,GACf,IAAI,CAIN;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,IAAI,CAMP;AAED,wBAAgB,iCAAiC,CAC/C,WAAW,EAAE,UAAU,EAAE,EACzB,oBAAoB,EAAE,OAAO,EAC7B,iBAAiB,EAAE,MAAM,EACzB,WAAW,EAAE,MAAM,GAClB,IAAI,CAUN;AAGD,wBAAsB,WAAW,CAC/B,OAAO,GAAE;IACP,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,2EAA2E;IAC3E,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,wEAAwE;IACxE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,uEAAuE;IACvE,KAAK,CAAC,EAAE,OAAO,CAAC;CACZ,EACN,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,UAAU,CAAC,CAstCrB;AAED,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC"}

package/dist/commands/sync.js

@@ -644,6 +644,27 @@ export async function syncCommand(options = {}, runtime = {}) {
             changedManifestFiles.length === manifestFiles.length;
         const extraction = await processExtractions(changedMarkdownFiles, changedManifestFiles, validateOnly, workspaceRoot);
         const { failedCacheKeys, errors } = extraction;
+        // implements REQ-kibi-uncompiled-source-visibility
+        // Sources sync could not extract stay out of the store; record them so
+        // kb_status can say so. A source that failed in the store's first
+        // compilation (and in every sync since) is legacy content that missed the
+        // semantic baseline, so it keeps the baseline treatment once it compiles.
+        const previousExtractionFailures = syncCache.extractionFailures ?? {};
+        const nextExtractionFailures = {};
+        for (const failure of extraction.failures) {
+            const key = toCacheKey(workspaceRoot, failure.file);
+            const hash = nextHashes[key];
+            if (hash === undefined)
+                continue;
+            nextExtractionFailures[key] = {
+                hash,
+                message: failure.message,
+                ...(initialSemanticBaseline ||
+                    previousExtractionFailures[key]?.baseline === true
+                    ? { baseline: true }
+                    : {}),
+            };
+        }
         const extractedResults = normalizeExtractionSources(extraction.results, workspaceRoot);
         const nextEntityHashes = {
             ...(syncCache.entityHashes ?? {}),
@@ -739,7 +760,9 @@ export async function syncCommand(options = {}, runtime = {}) {
             const advertisedContract = result.entity.semantic_inventory_version !== undefined ||
                 result.entity.semantic_source_hash !== undefined ||
                 result.entity.semantic_inventory !== undefined;
-            const enforceBoundary = (!initialSemanticBaseline && syncCache.hashes[key] === undefined) ||
+            const enforceBoundary = (!initialSemanticBaseline &&
+                syncCache.hashes[key] === undefined &&
+                previousExtractionFailures[key]?.baseline !== true) ||
                 syncCache.semanticContracts[key] === true ||
                 (previousSemanticHash !== undefined &&
                     previousSemanticHash !== boundary.sourceHash) ||
@@ -841,6 +864,7 @@ export async function syncCommand(options = {}, runtime = {}) {
                 semanticHashes: evictedSemanticHashes,
                 semanticContracts: evictedSemanticContracts,
                 compilerFingerprint: SYNC_COMPILER_FINGERPRINT,
+                extractionFailures: nextExtractionFailures,
             });
             info("✓ Imported 0 entities, 0 relationships (no changes)");
             return withOptionalCommit({
@@ -990,6 +1014,7 @@ export async function syncCommand(options = {}, runtime = {}) {
                     semanticHashes: evictedSemanticHashes,
                     semanticContracts: evictedSemanticContracts,
                     compilerFingerprint: SYNC_COMPILER_FINGERPRINT,
+                    extractionFailures: nextExtractionFailures,
                 });
                 published = true;
                 if (performedFullReindex &&
@@ -1180,6 +1205,7 @@ export async function syncCommand(options = {}, runtime = {}) {
                 semanticHashes: evictedSemanticHashes,
                 semanticContracts: evictedSemanticContracts,
                 compilerFingerprint: SYNC_COMPILER_FINGERPRINT,
+                extractionFailures: nextExtractionFailures,
             });
             published = true;
             maybePushDocsNotIndexedDiagnostic(diagnostics, performedFullReindex, markdownFiles.length, entityCount);