akm-cli 0.9.1 → 0.9.2-alpha.2

package/dist/workflows/runtime/workflow-asset-loader.js

@@ -2,23 +2,18 @@
 // 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 fs from "node:fs";
-import path from "node:path";
 import { detectAdapterId } from "../../core/adapter/detect-adapter.js";
-import { adapterForId } from "../../core/adapter/registry.js";
 import { makeBundleRef, parseBundleRef } from "../../core/asset/asset-ref.js";
-import { isWithin } from "../../core/common.js";
 import { loadConfig } from "../../core/config/config.js";
 import { NotFoundError, UsageError } from "../../core/errors.js";
 import { getDbPath } from "../../core/paths.js";
-import { canonicalizeWorkflowName, WORKFLOW_EXTENSIONS } from "../../core/recognition-util.js";
+import { canonicalizeWorkflowName } from "../../core/recognition-util.js";
 import { deriveInstallations } from "../../indexer/installations.js";
+import { resolveAdapterConceptOwner } from "../../indexer/lookup/adapter-concept-owner.js";
 import { resolveSourceEntries } from "../../indexer/search/search-source.js";
-import { buildFileContext } from "../../indexer/walk/file-context.js";
-import { resolveAssetPath } from "../../sources/resolve.js";
 import { withIndexDb } from "../../storage/repositories/index-db.js";
-import { formatWorkflowErrors } from "../authoring/authoring.js";
-import { parseWorkflow } from "../parser.js";
-import { WORKFLOW_SCHEMA_VERSION } from "../schema.js";
+import { compileWorkflowSource } from "../source-ir/compile.js";
+import { sourceStepInstructions } from "../source-ir/program.js";
 /**
  * Build the canonical `workflow_runs.workflow_ref` for an AKM workflow asset.
  */
@@ -41,9 +36,7 @@ export async function canonicalizeWorkflowRefInput(ref) {
     return (await loadWorkflowAsset(ref)).ref;
 }
 /**
- * Resolve a workflow ref to a fully-projected {@link WorkflowAsset}. Prefers the
- * parsed document cached in `index.db` (fast path) and falls back to reading +
- * parsing the source file from disk.
+ * Resolve a workflow ref and compile its authored bytes into source IR.
  */
 export async function loadWorkflowAsset(ref) {
     const bundleRef = parseWorkflowRefInput(ref);
@@ -67,34 +60,21 @@ export async function loadWorkflowAsset(ref) {
     let rejectedSource;
     for (const candidateSource of searchSources) {
         const { source, bundleId } = candidateSource;
-        try {
-            const adapterId = source.adapterId ?? detectAdapterId(source.path);
-            const candidateName = adapterId === "akm-workflow" ? bundleRef.conceptId : workflowNameFromConceptId(bundleRef.conceptId);
-            const ownedSource = source.adapterId ? source : { ...source, adapterId };
-            if (!candidateName) {
-                if (adapterOwnsConcept(source.path, adapterId, bundleRef.conceptId)) {
-                    rejectedSource ??= { source: ownedSource, bundleId };
-                    break;
-                }
-                continue;
-            }
-            const candidate = await resolveNativeWorkflowPath(source.path, adapterId, candidateName);
-            if (!ownsNativeWorkflowRuntime(ownedSource)) {
-                rejectedSource ??= { source: ownedSource, bundleId };
-                break;
-            }
-            assetPath = candidate;
-            sourcePath = source.path;
-            sourceBundleId = bundleId;
-            workflowName = candidateName;
-            workflowAdapterId = adapterId;
+        const adapterId = source.adapterId ?? detectAdapterId(source.path);
+        const ownedSource = source.adapterId ? source : { ...source, adapterId };
+        const owner = resolveAdapterConceptOwner(source.path, adapterId, bundleRef.conceptId);
+        if (!owner)
+            continue;
+        if (!ownsNativeWorkflowRuntime(ownedSource) || !owner.workflowSource) {
+            rejectedSource ??= { source: ownedSource, bundleId };
             break;
         }
-        catch (error) {
-            if (error instanceof NotFoundError)
-                continue;
-            throw error;
-        }
+        assetPath = owner.path;
+        sourcePath = source.path;
+        sourceBundleId = bundleId;
+        workflowName = owner.workflowSource.canonicalName;
+        workflowAdapterId = adapterId;
+        break;
     }
     if (!assetPath) {
         if (rejectedSource) {
@@ -111,185 +91,45 @@ export async function loadWorkflowAsset(ref) {
     const fullRef = workflowAdapterId === "akm-workflow"
         ? makeBundleRef(sourceBundleId, canonicalName)
         : canonicalWorkflowRunRef(sourceBundleId, canonicalName);
-    const cached = readWorkflowDocumentFromIndex(resolvedSourcePath, fullRef, workflowAdapterId);
-    const document = cached ?? loadWorkflowDocumentFromDisk(assetPath);
-    return projectAsset(document, fullRef, assetPath, resolvedSourcePath, workflowAdapterId, canonicalName);
+    const sourceIr = compileWorkflowSourceFromDisk(assetPath, resolvedSourcePath);
+    return projectAsset(sourceIr, fullRef, assetPath, resolvedSourcePath, workflowAdapterId, canonicalName);
 }
 function ownsNativeWorkflowRuntime(source) {
     return source.adapterId === "akm" || source.adapterId === "akm-workflow";
 }
-function workflowNameFromConceptId(conceptId) {
-    const prefix = "workflows/";
-    return conceptId.startsWith(prefix) && conceptId.length > prefix.length ? conceptId.slice(prefix.length) : undefined;
-}
-function adapterOwnsConcept(sourcePath, adapterId, conceptId) {
-    const adapter = adapterForId(adapterId);
-    if (!adapter)
-        return false;
-    const normalized = conceptId.replaceAll("\\", "/");
-    if (!normalized ||
-        path.posix.isAbsolute(normalized) ||
-        normalized === ".." ||
-        normalized.startsWith("../") ||
-        path.posix.normalize(normalized) !== normalized) {
-        return false;
-    }
-    const extensions = [...adapter.extensions].sort((left, right) => right.length - left.length);
-    const extension = extensions.find((candidate) => normalized.toLowerCase().endsWith(candidate.toLowerCase()));
-    const extensionless = extension ? normalized.slice(0, -extension.length) : normalized;
-    const parent = path.join(sourcePath, path.posix.dirname(extensionless));
-    let realRoot;
-    let realParent;
-    try {
-        realRoot = fs.realpathSync(sourcePath);
-        realParent = fs.realpathSync(parent);
-    }
-    catch {
-        return false;
-    }
-    if (!isWithin(realParent, realRoot))
-        return false;
-    const basename = path.posix.basename(extensionless);
-    let entries;
-    try {
-        entries = fs.readdirSync(realParent, { withFileTypes: true });
-    }
-    catch {
-        return false;
-    }
-    for (const entry of entries) {
-        if (!entry.isFile())
-            continue;
-        const recognizedExtension = extensions.find((candidate) => entry.name.toLowerCase().endsWith(candidate.toLowerCase()) &&
-            entry.name.slice(0, -candidate.length) === basename);
-        if (!recognizedExtension)
-            continue;
-        const candidatePath = path.join(realParent, entry.name);
-        try {
-            const document = adapter.recognize({ id: adapterId, adapter: adapterId, root: realRoot, writable: false }, buildFileContext(realRoot, candidatePath));
-            if (document)
-                return true;
-        }
-        catch {
-            // A malformed matching file still belongs to the earlier adapter and cannot be bypassed for execution.
-            return true;
-        }
-    }
-    return false;
-}
-async function resolveNativeWorkflowPath(sourcePath, adapterId, name) {
-    if (adapterId !== "akm-workflow")
-        return resolveAssetPath(sourcePath, "workflow", name);
-    const canonicalName = canonicalizeWorkflowName(name);
-    let realRoot;
-    try {
-        realRoot = fs.realpathSync(sourcePath);
-    }
-    catch {
-        throw new NotFoundError(`Workflow bundle root not found: ${sourcePath}`);
-    }
-    const parent = path.join(sourcePath, path.dirname(canonicalName));
-    if (!isWithin(parent, realRoot)) {
-        throw new UsageError("Workflow ref resolves outside the bundle root.", "PATH_ESCAPE_VIOLATION");
-    }
-    let entries;
-    try {
-        entries = fs.readdirSync(parent, { withFileTypes: true });
-    }
-    catch {
-        throw new NotFoundError(`Workflow not found: ${name}`);
-    }
-    const basename = path.basename(canonicalName);
-    for (const extension of WORKFLOW_EXTENSIONS) {
-        const matches = entries.filter((entry) => {
-            if (!entry.isFile() && !entry.isSymbolicLink())
-                return false;
-            const entryExtension = path.extname(entry.name);
-            return entryExtension.toLowerCase() === extension && entry.name.slice(0, -entryExtension.length) === basename;
-        });
-        if (matches.length > 1) {
-            throw new UsageError(`Workflow "${canonicalName}" has multiple ${extension} files that differ only by extension case.`, "RESOURCE_ALREADY_EXISTS");
-        }
-        const match = matches[0];
-        if (!match)
-            continue;
-        const candidate = path.join(parent, match.name);
-        let realTarget;
-        try {
-            if (!fs.statSync(candidate).isFile())
-                continue;
-            realTarget = fs.realpathSync(candidate);
-        }
-        catch {
-            continue;
-        }
-        if (!isWithin(realTarget, realRoot)) {
-            throw new UsageError("Workflow ref resolves outside the bundle root.", "PATH_ESCAPE_VIOLATION");
-        }
-        return realTarget;
-    }
-    throw new NotFoundError(`Workflow not found: ${name}`);
-}
 /**
  * Resolve the `entries.id` for an indexed workflow, or null when the index
  * database does not yet exist or has no matching entry.
  */
-export function resolveWorkflowEntryId(sourcePath, ref, adapterId) {
+export function resolveWorkflowEntryId(_sourcePath, ref, adapterId) {
     if (!fs.existsSync(getDbPath()))
         return null;
-    const entryKey = workflowEntryKey(sourcePath, ref, adapterId);
+    const parsed = parseBundleRef(ref);
+    if (!parsed.bundle)
+        throw new UsageError(`Expected a bundle-qualified workflow ref, got "${ref}".`);
+    const itemRef = makeBundleRef(parsed.bundle, parsed.conceptId);
     return withIndexDb((db) => {
         const row = db
             .prepare(`SELECT id
          FROM entries
-         WHERE entry_type = 'workflow'
-            AND entry_key = ?
+         WHERE type = 'workflow'
+           AND item_ref = ?
+           ${adapterId ? "AND adapter_id = ?" : ""}
           LIMIT 1`)
-            .get(entryKey);
+            .get(itemRef, ...(adapterId ? [adapterId] : []));
         return row?.id ?? null;
     });
 }
-function loadWorkflowDocumentFromDisk(assetPath) {
+function compileWorkflowSourceFromDisk(assetPath, workspaceRoot) {
     const content = fs.readFileSync(assetPath, "utf8");
-    const result = parseWorkflow(content, { path: assetPath });
+    const result = compileWorkflowSource(content, { path: assetPath, workspaceRoot });
     if (!result.ok) {
-        throw new UsageError(formatWorkflowErrors(assetPath, result.errors));
-    }
-    return result.document;
-}
-function readWorkflowDocumentFromIndex(sourcePath, ref, adapterId) {
-    if (!fs.existsSync(getDbPath()))
-        return null;
-    const entryKey = workflowEntryKey(sourcePath, ref, adapterId);
-    return withIndexDb((db) => {
-        const row = db
-            .prepare(`SELECT wd.document_json AS document_json, wd.schema_version AS schema_version
-           FROM workflow_documents wd
-           JOIN entries e ON e.id = wd.entry_id
-          WHERE e.entry_type = 'workflow' AND e.entry_key = ?
-          LIMIT 1`)
-            .get(entryKey);
-        if (!row || row.schema_version !== WORKFLOW_SCHEMA_VERSION)
-            return null;
-        try {
-            return JSON.parse(row.document_json);
-        }
-        catch {
-            return null;
-        }
-    });
-}
-function workflowEntryKey(sourcePath, ref, adapterId) {
-    const bundleRef = parseBundleRef(ref);
-    if ((adapterId ?? detectAdapterId(sourcePath)) === "akm-workflow") {
-        return `${sourcePath}:concept:${bundleRef.conceptId}`;
+        const details = result.errors.map((error) => `  ${error.path}:${error.line} — ${error.message}`).join("\n");
+        throw new UsageError(`Workflow source has ${result.errors.length} error(s):\n${details}`);
     }
-    const name = workflowNameFromConceptId(bundleRef.conceptId);
-    if (!name)
-        throw new UsageError(`Expected a workflow ref, got "${ref}".`);
-    return `${sourcePath}:workflow:${name}`;
+    return result.ir;
 }
-function projectAsset(doc, ref, assetPath, sourcePath, adapterId, canonicalName) {
+function projectAsset(sourceIr, ref, assetPath, sourcePath, adapterId, canonicalName) {
     const title = canonicalName.split("/").pop() || canonicalName;
     return {
         ref,
@@ -297,22 +137,22 @@ function projectAsset(doc, ref, assetPath, sourcePath, adapterId, canonicalName)
         sourcePath,
         adapterId,
         title,
-        ...(doc.params
+        ...(sourceIr.params
             ? {
-                parameters: Object.entries(doc.params).map(([name, schema]) => {
+                parameters: Object.entries(sourceIr.params).map(([name, schema]) => {
                     const description = schema.description;
                     return { name, ...(typeof description === "string" && description ? { description } : {}) };
                 }),
             }
             : {}),
-        steps: doc.steps.map((s) => ({
-            id: s.id,
-            title: s.id,
-            instructions: s.instructions?.text ?? stepFallbackInstructions(s),
-            ...(s.gateRubric?.text.trim() ? { completionCriteria: [s.gateRubric.text] } : {}),
-            sequenceIndex: s.sequenceIndex,
-        })),
-        document: doc,
+        steps: sourceIr.jobs.flatMap((job) => job.steps.map((step, sequenceIndex) => ({
+            id: step.id,
+            title: step.id,
+            instructions: step.route ? stepFallbackInstructions(step) : sourceStepInstructions(step),
+            ...(step.gate?.rubric?.trim() ? { completionCriteria: [step.gate.rubric] } : {}),
+            sequenceIndex,
+        }))),
+        sourceIr,
     };
 }
 /** A route-only step with no body section still needs a non-empty spine instructions string. */