akm-cli 0.9.15 → 0.9.16-alpha.1

package/dist/indexer/scan/drain-dir.js

@@ -5,19 +5,18 @@
  * Per-directory document drain — akm 0.9.0 Chunk 5, milestone F4a M-core-2 (the
  * engine swap). Replaces the live indexer's per-dir flat-walk matcher-pass
  * `IndexDocument` stream with the `akm` adapter's `recognize` `IndexDocument`
- * stream, reconstructing the durable `IndexDocument` via {@link
- * indexDocumentToStashEntry} (proven lossless by the shadow-parity gate).
+ * stream, reconstructing the durable `IndexDocument` via {@link parseFileDocument}
+ * (proven lossless by the shadow-parity gate).
  *
- * Two behaviors the adapter fold does NOT carry, restored here at the drain
- * layer (spec §14.2 "drain the full document stream"):
+ * One directory-scoped behavior the per-file parse does NOT carry, restored
+ * here at the drain layer (spec §14.2 "drain the full document stream"):
  *
- *  - **Broken-workflow drop (item 3).** The live path dropped a broken workflow
- *    via the renderer contributor's throw → metadata-pass skip-with-warning; the
- *    `akm` adapter's synchronous `foldRecognizedMetadata` SWALLOWS the parse
- *    error, so a broken workflow would otherwise silently index. We run the
- *    shared source-IR compiler on drained workflow docs and DROP
- *    the entry with the same `Skipped workflow …` warning
- *    ({@link buildMetadataSkipWarning}), so the workflow-skip summary counts it.
+ *  - **Peer-workflow-format ownership arbitration.** A full directory drain
+ *    may contain both peer workflow formats for one canonical ref; resolving
+ *    which one owns the ref requires seeing every file in the directory at
+ *    once, so it stays here rather than in the single-file
+ *    {@link parseFileDocument} (index-redesign B1 also calls that function to
+ *    parse one already-known-changed file, with no peer files in view).
  *
  * `doc.hash` (= sha256 of the file content) is surfaced per recognized file so
  * the persist layer can populate the `content_hash` column (item 2). It is keyed
@@ -31,12 +30,8 @@ import { akmAdapter } from "../../core/adapter/adapters/akm-adapter.js";
 import { compareCodePoints } from "../../core/common.js";
 import { canonicalizeWorkflowName } from "../../core/recognition-util.js";
 import { resolveWorkflowSourceDomains, workflowNameForSourcePath } from "../../workflows/source-files.js";
-import { compileWorkflowSource } from "../../workflows/source-ir/compile.js";
-import { buildMetadataSkipWarning } from "../passes/metadata.js";
 import { buildFileContext } from "../walk/file-context.js";
-import { indexDocumentToStashEntry } from "./doc-to-entry.js";
-/** The markdown-workflow renderer name the `akm` adapter carries on `documentJson.renderer`. */
-const WORKFLOW_MD_RENDERER = "workflow-md";
+import { parseFileDocument } from "./parse-file.js";
 /**
  * Drain one directory's recognized documents into durable entries.
  *
@@ -88,26 +83,24 @@ export function drainDirDocuments(adapter, component, fileContexts) {
                 continue;
             }
         }
-        const doc = adapter.recognize(component, file);
-        if (doc === null)
-            continue;
-        if (!doc.conceptId) {
-            warnings.push(`Skipped ${file.absPath}: adapter "${adapter.id}" returned no conceptId.`);
-            continue;
-        }
-        const entry = indexDocumentToStashEntry(doc);
-        // Workflow docs: drop-with-warning if broken; otherwise cache a lossless
-        // runtime projection when the current executor can represent the source.
-        const dropWarning = handleWorkflowDoc(doc, file, component.root);
-        if (dropWarning !== null) {
-            warnings.push(dropWarning);
-            if (workflowName !== undefined)
-                invalidWorkflowOwnerNames.add(canonicalizeWorkflowName(workflowName));
+        // The recognize → conceptId check → workflow-validity fold is the SAME
+        // per-file parse the reconcile engine uses for a single changed file
+        // (index-redesign B1) — extracted to `parse-file.ts` so the two never
+        // drift apart.
+        const outcome = parseFileDocument(adapter, component, file);
+        if (outcome.parsed === null) {
+            if (outcome.warning !== null) {
+                warnings.push(outcome.warning);
+                if (outcome.isWorkflowDrop && workflowName !== undefined) {
+                    invalidWorkflowOwnerNames.add(canonicalizeWorkflowName(workflowName));
+                }
+            }
             continue;
         }
-        if (doc.hash !== undefined)
-            hashByFile.set(file.absPath, doc.hash);
-        conceptIdByFile.set(file.absPath, doc.conceptId);
+        const { entry, hash, conceptId } = outcome.parsed;
+        if (hash !== undefined)
+            hashByFile.set(file.absPath, hash);
+        conceptIdByFile.set(file.absPath, conceptId);
         entries.push(entry);
     }
     return { entries, warnings, hashByFile, conceptIdByFile, rejectedPaths, rejectedConceptIds };
@@ -133,39 +126,3 @@ export function recognizeStashEntries(stashRoot, files) {
         ? { entries: drained.entries, warnings: drained.warnings }
         : { entries: drained.entries };
 }
-/**
- * If `doc` is a workflow, compile it through source IR: return a
- * `Skipped workflow …` drop warning when it is broken, or return `null` when
- * it compiles. Non-workflow docs return `null` immediately.
- */
-function handleWorkflowDoc(doc, file, workspaceRoot) {
-    if (doc.type !== "workflow" ||
-        (doc.adapterId !== "akm" && doc.adapterId !== "akm-workflow") ||
-        (docRenderer(doc) !== WORKFLOW_MD_RENDERER && doc.adapterId !== "akm-workflow")) {
-        return null;
-    }
-    const result = compileWorkflowSource(file.content(), { path: file.relPath, workspaceRoot });
-    if (!result.ok)
-        return workflowDropWarning(file, result.errors);
-    return null;
-}
-/** The winning renderer name the `akm` adapter carries on `documentJson.renderer`, or `undefined`. */
-function docRenderer(doc) {
-    const dj = doc.documentJson;
-    if (dj !== null && typeof dj === "object" && "renderer" in dj) {
-        const renderer = dj.renderer;
-        return typeof renderer === "string" ? renderer : undefined;
-    }
-    return undefined;
-}
-/**
- * Build the `Skipped workflow <path>:\n…` warning byte-for-byte the way the live
- * pipeline did: the workflow parser's `path:line — message` summary wrapped in
- * the `Workflow has errors:` prefix (the string `loadDocument`/`loadProgram`
- * threw), then {@link buildMetadataSkipWarning}'s workflow branch. `startsWith
- * "Skipped workflow "` so `isWorkflowSkipWarning` counts it for the summary.
- */
-function workflowDropWarning(file, errors) {
-    const summary = errors.map((e) => `${file.relPath}:${e.line} — ${e.message}`).join("\n");
-    return buildMetadataSkipWarning(file.absPath, "workflow", `Workflow has errors:\n${summary}`);
-}

package/dist/indexer/scan/parse-file.js

@@ -0,0 +1,66 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+import { compileWorkflowSource } from "../../workflows/source-ir/compile.js";
+import { buildMetadataSkipWarning } from "../passes/metadata.js";
+import { indexDocumentToStashEntry } from "./doc-to-entry.js";
+/** The markdown-workflow renderer name the `akm` adapter carries on `documentJson.renderer`. */
+const WORKFLOW_MD_RENDERER = "workflow-md";
+/**
+ * Parse one file through `adapter.recognize`, reconstruct its durable entry,
+ * and drop it with a warning when it names no conceptId or is a workflow
+ * document that fails to compile. Pure of DB/global state.
+ */
+export function parseFileDocument(adapter, component, file) {
+    const doc = adapter.recognize(component, file);
+    if (doc === null)
+        return { parsed: null, warning: null, isWorkflowDrop: false };
+    if (!doc.conceptId) {
+        return {
+            parsed: null,
+            warning: `Skipped ${file.absPath}: adapter "${adapter.id}" returned no conceptId.`,
+            isWorkflowDrop: false,
+        };
+    }
+    const entry = indexDocumentToStashEntry(doc);
+    const dropWarning = handleWorkflowDoc(doc, file, component.root);
+    if (dropWarning !== null) {
+        return { parsed: null, warning: dropWarning, isWorkflowDrop: true };
+    }
+    return { parsed: { entry, hash: doc.hash, conceptId: doc.conceptId }, warning: null, isWorkflowDrop: false };
+}
+/**
+ * If `doc` is a workflow, compile it through source IR: return a
+ * `Skipped workflow …` drop warning when it is broken, or return `null` when
+ * it compiles. Non-workflow docs return `null` immediately.
+ */
+function handleWorkflowDoc(doc, file, workspaceRoot) {
+    if (doc.type !== "workflow" ||
+        (doc.adapterId !== "akm" && doc.adapterId !== "akm-workflow") ||
+        (docRenderer(doc) !== WORKFLOW_MD_RENDERER && doc.adapterId !== "akm-workflow")) {
+        return null;
+    }
+    const result = compileWorkflowSource(file.content(), { path: file.relPath, workspaceRoot });
+    if (!result.ok)
+        return workflowDropWarning(file, result.errors);
+    return null;
+}
+/** The winning renderer name the `akm` adapter carries on `documentJson.renderer`, or `undefined`. */
+function docRenderer(doc) {
+    const dj = doc.documentJson;
+    if (dj !== null && typeof dj === "object" && "renderer" in dj) {
+        const renderer = dj.renderer;
+        return typeof renderer === "string" ? renderer : undefined;
+    }
+    return undefined;
+}
+/**
+ * Build the `Skipped workflow <path>:\n…` warning byte-for-byte the way the live
+ * pipeline did: the workflow parser's `path:line — message` summary wrapped in
+ * the `Workflow has errors:` prefix (the string `loadDocument`/`loadProgram`
+ * threw), then {@link buildMetadataSkipWarning}'s workflow branch.
+ */
+function workflowDropWarning(file, errors) {
+    const summary = errors.map((e) => `${file.relPath}:${e.line} — ${e.message}`).join("\n");
+    return buildMetadataSkipWarning(file.absPath, "workflow", `Workflow has errors:\n${summary}`);
+}