@akanjs/cli 3.0.0-beta.2 → 3.0.0-beta.21

package/{index-7737gxcp.js → index-m0ms3n1c.js}

@@ -4,11 +4,13 @@ import {
   workflowPlanApproval,
   createWorkflowApplyReport,
   workflowCommandsForPlan,
+  workflowPathsForPlan,
   writeWorkflowRunArtifact,
   readWorkflowRunArtifact,
   createWorkflowBaselineSummary,
   createWorkflowValidationRunReport,
   createDryRunWorkflowApplyReport,
+  createWorkflowStepRegistry,
   WorkflowExecutor,
   listWorkflowSpecs,
   getWorkflowSpec,
@@ -20,18 +22,31 @@ import {
   renderWorkflowApply,
   renderWorkflowValidation,
   renderWorkflowRunArtifact
-} from "./index-gyd220p2.js";
+} from "./index-yy4s1j72.js";
 import {
   AkanContextAnalyzer
-} from "./index-ktb5njgy.js";
+} from "./index-9629w7ns.js";
 import {
+  CommandContainer,
   runner
-} from "./index-mak3cd28.js";
+} from "./index-rmcw8yc8.js";
+import {
+  ModuleScript
+} from "./index-tgjy8xf3.js";
+import {
+  PrimitiveScript
+} from "./index-wp43xrjv.js";
+import {
+  spawnShell
+} from "./index-ya5qbmyg.js";
+import {
+  ScalarScript
+} from "./index-pp54p5zk.js";
 
 // pkgs/@akanjs/cli/workflow/workflow.runner.ts
 import { mkdir, readFile, writeFile } from "fs/promises";
 import path from "path";
-import { capitalize } from "akanjs/common";
+import { isRecord } from "akanjs/common";
 
 // pkgs/@akanjs/cli/workflows/shared.ts
 var sysInputs = {
@@ -56,6 +71,12 @@ var baseValidation = [
     kind: "lint"
   }
 ];
+var stepOf = (id, title, tool) => (description) => ({ id, title, tool, description });
+var inspectModuleStep = stepOf("inspect-module", "Inspect module", "inspectModule");
+var inspectSystemStep = stepOf("inspect-system", "Inspect target system", "inspectSystem");
+var syncGeneratedStep = stepOf("sync-generated", "Sync generated files", "syncTarget");
+var validateTargetStep = stepOf("validate-target", "Validate target", "lintTarget");
+var validateTarget = validateTargetStep("Run validation commands for the target.");
 
 // pkgs/@akanjs/cli/workflows/addEnumField.ts
 var addEnumFieldWorkflowSpec = {
@@ -79,12 +100,7 @@ var addEnumFieldWorkflowSpec = {
     store: "infer"
   },
   steps: [
-    {
-      id: "inspect-module",
-      title: "Inspect module",
-      tool: "inspectModule",
-      description: "Read module files and existing enum conventions."
-    },
+    inspectModuleStep("Read module files and existing enum conventions."),
     {
       id: "update-constant",
       title: "Update enum field",
@@ -103,18 +119,8 @@ var addEnumFieldWorkflowSpec = {
       tool: "updateOptionEnum",
       description: "Plan option entries used by UI controls."
     },
-    {
-      id: "sync-generated",
-      title: "Sync generated files",
-      tool: "syncTarget",
-      description: "Refresh generated files after enum source changes."
-    },
-    {
-      id: "validate-target",
-      title: "Validate target",
-      tool: "lintTarget",
-      description: "Run validation commands for the target."
-    }
+    syncGeneratedStep("Refresh generated files after enum source changes."),
+    validateTarget
   ],
   predictedChanges: [
     { target: "*/lib/<module>/<module>.constant.ts", action: "modify", reason: "Enum field shape is added." },
@@ -146,7 +152,7 @@ var addFieldWorkflowSpec = {
     values: { type: "string-list", description: "Comma-separated enum values when type is enum." },
     default: {
       type: "string",
-      description: "Optional default value. plan/apply coerce by field type: Int/Float to numeric literals, Boolean to true/false, Date to new Date(...), String/scalar to string literals, and enum only when the value is in values."
+      description: "Optional default value. plan/apply coerce by field type: Int/Float to numeric literals, Boolean to true/false, Date (now, a timestamp, or a date string) to a () => dayjs(...) thunk, String/scalar to string literals, and enum only when the value is in values."
     },
     surfaces: {
       type: "string-list",
@@ -165,12 +171,7 @@ var addFieldWorkflowSpec = {
     store: "infer"
   },
   steps: [
-    {
-      id: "inspect-module",
-      title: "Inspect module",
-      tool: "inspectModule",
-      description: "Read module files and detect existing field/UI patterns."
-    },
+    inspectModuleStep("Read module files and detect existing field/UI patterns."),
     {
       id: "update-constant",
       title: "Update constant",
@@ -190,18 +191,8 @@ var addFieldWorkflowSpec = {
       description: "Plan optional Template, Unit, View, and Store updates according to inferred surfaces.",
       when: "optionalSurfaces.* is include or infer"
     },
-    {
-      id: "sync-generated",
-      title: "Sync generated files",
-      tool: "syncTarget",
-      description: "Refresh generated files after source changes."
-    },
-    {
-      id: "validate-target",
-      title: "Validate target",
-      tool: "lintTarget",
-      description: "Run validation commands for the target."
-    }
+    syncGeneratedStep("Refresh generated files after source changes."),
+    validateTarget
   ],
   predictedChanges: [
     {
@@ -272,12 +263,7 @@ var addMutationWorkflowSpec = {
     dictionary: "include"
   },
   steps: [
-    {
-      id: "inspect-module",
-      title: "Inspect module",
-      tool: "inspectModule",
-      description: "Read service, signal, store, and UI action patterns."
-    },
+    inspectModuleStep("Read service, signal, store, and UI action patterns."),
     {
       id: "update-service",
       title: "Update service",
@@ -296,18 +282,8 @@ var addMutationWorkflowSpec = {
       tool: "updateActionSurfaces",
       description: "Plan optional store and UI action changes."
     },
-    {
-      id: "sync-generated",
-      title: "Sync generated files",
-      tool: "syncTarget",
-      description: "Refresh generated service and signal barrels."
-    },
-    {
-      id: "validate-target",
-      title: "Validate target",
-      tool: "lintTarget",
-      description: "Run validation commands for the target."
-    }
+    syncGeneratedStep("Refresh generated service and signal barrels."),
+    validateTarget
   ],
   predictedChanges: [
     {
@@ -355,12 +331,7 @@ var addSliceWorkflowSpec = {
     dictionary: "include"
   },
   steps: [
-    {
-      id: "inspect-module",
-      title: "Inspect module",
-      tool: "inspectModule",
-      description: "Read existing query, slice, zone, and page loading patterns."
-    },
+    inspectModuleStep("Read existing query, slice, zone, and page loading patterns."),
     {
       id: "update-service-query",
       title: "Update service query",
@@ -379,18 +350,8 @@ var addSliceWorkflowSpec = {
       tool: "connectSliceSurfaces",
       description: "Plan optional Zone and page loader changes."
     },
-    {
-      id: "sync-generated",
-      title: "Sync generated files",
-      tool: "syncTarget",
-      description: "Refresh generated files after slice changes."
-    },
-    {
-      id: "validate-target",
-      title: "Validate target",
-      tool: "lintTarget",
-      description: "Run validation commands for the target."
-    }
+    syncGeneratedStep("Refresh generated files after slice changes."),
+    validateTarget
   ],
   predictedChanges: [
     {
@@ -445,30 +406,15 @@ var createModuleWorkflowSpec = {
     view: "include"
   },
   steps: [
-    {
-      id: "inspect-system",
-      title: "Inspect target system",
-      tool: "inspectSystem",
-      description: "Check the target app or library before planning new module files."
-    },
+    inspectSystemStep("Check the target app or library before planning new module files."),
     {
       id: "create-module",
       title: "Create module",
       tool: "createModule",
       description: "Use the existing create-module primitive to scaffold conventional module files."
     },
-    {
-      id: "sync-generated",
-      title: "Sync generated files",
-      tool: "syncTarget",
-      description: "Refresh generated barrels after adding a module."
-    },
-    {
-      id: "validate-target",
-      title: "Validate target",
-      tool: "lintTarget",
-      description: "Run validation commands that prove the scaffold matches Akan conventions."
-    }
+    syncGeneratedStep("Refresh generated barrels after adding a module."),
+    validateTargetStep("Run validation commands that prove the scaffold matches Akan conventions.")
   ],
   predictedChanges: [
     { target: "*/lib/<module>/*", action: "create", reason: "New module source files are scaffolded." },
@@ -498,30 +444,15 @@ var createScalarWorkflowSpec = {
     dictionary: "include"
   },
   steps: [
-    {
-      id: "inspect-system",
-      title: "Inspect target system",
-      tool: "inspectSystem",
-      description: "Check the target app or library before planning a scalar."
-    },
+    inspectSystemStep("Check the target app or library before planning a scalar."),
     {
       id: "create-scalar",
       title: "Create scalar",
       tool: "createScalar",
       description: "Use the existing create-scalar primitive to scaffold scalar files."
     },
-    {
-      id: "sync-generated",
-      title: "Sync generated files",
-      tool: "syncTarget",
-      description: "Refresh generated barrels after adding a scalar."
-    },
-    {
-      id: "validate-target",
-      title: "Validate target",
-      tool: "lintTarget",
-      description: "Run validation commands for the scalar target."
-    }
+    syncGeneratedStep("Refresh generated barrels after adding a scalar."),
+    validateTargetStep("Run validation commands for the scalar target.")
   ],
   predictedChanges: [
     { target: "*/lib/__scalar/<scalar>/*", action: "create", reason: "New scalar source files are scaffolded." }
@@ -551,30 +482,15 @@ var createUiWorkflowSpec = {
     store: "infer"
   },
   steps: [
-    {
-      id: "inspect-module",
-      title: "Inspect module",
-      tool: "inspectModule",
-      description: "Read existing module context and component files."
-    },
+    inspectModuleStep("Read existing module context and component files."),
     {
       id: "create-ui",
       title: "Create UI surface",
       tool: "createUi",
       description: "Create the requested UI surface through an Akan primitive."
     },
-    {
-      id: "sync-generated",
-      title: "Sync generated files",
-      tool: "syncTarget",
-      description: "Refresh UI barrels after adding a component."
-    },
-    {
-      id: "validate-target",
-      title: "Validate target",
-      tool: "lintTarget",
-      description: "Run validation commands for the target."
-    }
+    syncGeneratedStep("Refresh UI barrels after adding a component."),
+    validateTarget
   ],
   predictedChanges: [
     { target: "*/lib/<module>/<Module>.<Surface>.tsx", action: "create", reason: "New UI component is created." },
@@ -597,7 +513,6 @@ var workflowSpecs = [
 
 // pkgs/@akanjs/cli/workflow/workflow.runner.ts
 var resolvePath = (filePath) => path.isAbsolute(filePath) ? filePath : path.join(process.cwd(), filePath);
-var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var isWorkflowPlan = (value) => {
   if (!isRecord(value))
     return false;
@@ -627,17 +542,19 @@ var failedPlan = (workflow, diagnostics) => ({
   requiresApproval: true,
   approval: workflowPlanApproval
 });
-var failedApplyReport = (workflow, diagnostics, plan) => createWorkflowApplyReport({
-  workflow,
-  mode: "apply",
-  changedFiles: [],
-  generatedFiles: [],
-  commands: [],
-  diagnostics,
-  nextActions: [],
-  plan: plan ?? failedPlan(workflow, diagnostics)
-});
-var commandForShell = (command) => command.startsWith("akan ") ? `bun run ${command}` : command;
+var failedApplyReport = (workflow, code, message, plan) => {
+  const diagnostics = [{ severity: "error", code, message }];
+  return createWorkflowApplyReport({
+    workflow,
+    mode: "apply",
+    changedFiles: [],
+    generatedFiles: [],
+    commands: [],
+    diagnostics,
+    nextActions: [],
+    plan: plan ?? failedPlan(workflow, diagnostics)
+  });
+};
 var inferValidationKind = (command) => {
   if (command.kind)
     return command.kind;
@@ -667,25 +584,13 @@ ${error.message ?? ""}`.toLowerCase();
   return "unknown";
 };
 var defaultValidationExecutor = (workspace) => async (command) => {
-  const kind = inferValidationKind(command);
+  const base = { command: command.command, reason: command.reason, kind: inferValidationKind(command) };
   try {
-    const stdout = await workspace.spawn("bash", ["-lc", commandForShell(command.command)], {
-      cwd: workspace.workspaceRoot
-    });
-    return {
-      command: command.command,
-      reason: command.reason,
-      kind,
-      status: "passed",
-      exitCode: 0,
-      stdout
-    };
+    return { ...base, status: "passed", exitCode: 0, stdout: await spawnShell(workspace, command.command) };
   } catch (error) {
     const commandError = error;
     return {
-      command: command.command,
-      reason: command.reason,
-      kind,
+      ...base,
       status: "failed",
       exitCode: commandError.code ?? 1,
       failureScope: classifyValidationFailure(command, commandError),
@@ -695,24 +600,17 @@ var defaultValidationExecutor = (workspace) => async (command) => {
   }
 };
 var readJsonFile = async (filePath) => JSON.parse(await readFile(resolvePath(filePath), "utf8"));
-var planInputString = (plan, key) => {
-  const value = plan.inputs[key];
-  return typeof value === "string" ? value : "";
+var workflowDiagnosticFromDoctor = ({
+  severity,
+  code,
+  message,
+  scope,
+  context
+}, fallbackScope) => {
+  const resolvedScope = scope ?? fallbackScope;
+  const failureScope = resolvedScope === "baseline" ? "workspace-config" : resolvedScope === "workflow" ? "source-change" : "unknown";
+  return { severity, code, message, scope: resolvedScope, failureScope, context };
 };
-var workflowPathsForPlanLike = (plan) => {
-  const app = planInputString(plan, "app");
-  const module = planInputString(plan, "module");
-  const moduleClass = module ? capitalize(module) : "<Module>";
-  return plan.predictedChanges.map((change) => change.target.replace(/^\*\//, app ? `apps/${app}/` : "").replaceAll("<module>", module || "<module>").replaceAll("<Module>", moduleClass));
-};
-var workflowDiagnosticFromDoctor = (diagnostic, fallbackScope) => ({
-  severity: diagnostic.severity,
-  code: diagnostic.code,
-  message: diagnostic.message,
-  scope: diagnostic.scope ?? fallbackScope,
-  failureScope: (diagnostic.scope ?? fallbackScope) === "baseline" ? "workspace-config" : (diagnostic.scope ?? fallbackScope) === "workflow" ? "source-change" : "unknown",
-  context: diagnostic.context
-});
 var baselineBlockerCachePath = (workflow) => `.akan/workflows/baseline/${workflow}.json`;
 var blockerFingerprint = (blocker) => [blocker.failureScope, blocker.code, blocker.command ?? "", blocker.kind ?? "", blocker.message].join("|");
 var applyBaselineBlockerCache = async (workspace, report) => {
@@ -768,6 +666,18 @@ var withBaselineDetailsPolicy = (report, includeBaselineDetails) => {
 };
 
 class WorkflowRunner extends runner("workflow") {
+  static stepRegistry(workspace) {
+    return createWorkflowStepRegistry({
+      workspace,
+      createModule: (sys, module) => CommandContainer.get(ModuleScript).createModuleTemplate(sys, module),
+      createScalar: (sys, scalar) => CommandContainer.get(ScalarScript).createScalar(sys, scalar),
+      createUi: (input) => CommandContainer.get(PrimitiveScript).createUi(workspace, input),
+      addField: (input) => CommandContainer.get(PrimitiveScript).addField(workspace, input),
+      addEnumField: (input) => CommandContainer.get(PrimitiveScript).addEnumField(workspace, input),
+      addMutation: (input) => CommandContainer.get(PrimitiveScript).addMutation(workspace, input),
+      addSlice: (input) => CommandContainer.get(PrimitiveScript).addSlice(workspace, input)
+    });
+  }
   list({ format = "markdown" } = {}) {
     const workflows = listWorkflowSpecs(workflowSpecs);
     if (format === "json")
@@ -809,50 +719,24 @@ class WorkflowRunner extends runner("workflow") {
     };
     let plan;
     try {
-      const parsed = JSON.parse(await readFile(resolvePath(planPath), "utf8"));
-      if (!isWorkflowPlan(parsed)) {
-        const report = failedApplyReport("unknown", [
-          {
-            severity: "error",
-            code: "workflow-plan-invalid",
-            message: `Workflow plan file is invalid: ${planPath}.`
-          }
-        ]);
-        return await renderApplyReport(report);
-      }
+      const parsed = await readJsonFile(planPath);
+      if (!isWorkflowPlan(parsed))
+        return await renderApplyReport(failedApplyReport("unknown", "workflow-plan-invalid", `Workflow plan file is invalid: ${planPath}.`));
       plan = parsed;
     } catch (error) {
-      const report = failedApplyReport("unknown", [
-        {
-          severity: "error",
-          code: "workflow-plan-read-failed",
-          message: `Could not read workflow plan file: ${planPath}. ${error instanceof Error ? error.message : ""}`.trim()
-        }
-      ]);
-      return await renderApplyReport(report);
+      const message = `Could not read workflow plan file: ${planPath}. ${error instanceof Error ? error.message : ""}`;
+      return await renderApplyReport(failedApplyReport("unknown", "workflow-plan-read-failed", message.trim()));
     }
     const spec = getWorkflowSpec(workflowSpecs, plan.workflow);
     if (!spec) {
-      const report = failedApplyReport(plan.workflow, [
-        {
-          severity: "error",
-          code: "workflow-unknown",
-          message: `Unknown workflow in plan: ${plan.workflow}.`
-        }
-      ], plan);
-      return await renderApplyReport(report);
+      const message = `Unknown workflow in plan: ${plan.workflow}.`;
+      return await renderApplyReport(failedApplyReport(plan.workflow, "workflow-unknown", message, plan));
     }
     if (dryRun)
       return await renderApplyReport(createDryRunWorkflowApplyReport(plan));
     if (!registry) {
-      const report = failedApplyReport(plan.workflow, [
-        {
-          severity: "error",
-          code: "workflow-registry-missing",
-          message: "Workflow apply requires a step runner registry."
-        }
-      ], plan);
-      return await renderApplyReport(report);
+      const message = "Workflow apply requires a step runner registry.";
+      return await renderApplyReport(failedApplyReport(plan.workflow, "workflow-registry-missing", message, plan));
     }
     return await renderApplyReport(await new WorkflowExecutor(registry, workspace).apply(plan));
   }
@@ -909,6 +793,15 @@ class WorkflowRunner extends runner("workflow") {
     }
   }
   async loadValidationTarget(runIdOrPlan, workspace) {
+    const unreadable = (code, message) => ({
+      workflow: "unknown",
+      source: { type: "run-report", runId: runIdOrPlan },
+      plan: undefined,
+      commands: [],
+      diagnostics: [{ severity: "error", code, message }],
+      changedFiles: [],
+      repairActions: []
+    });
     const loadFromArtifact = (artifact, sourcePath) => {
       if (isWorkflowApplyReport(artifact)) {
         return {
@@ -932,21 +825,7 @@ class WorkflowRunner extends runner("workflow") {
           repairActions: artifact.repairActions
         };
       }
-      return {
-        workflow: "unknown",
-        source: { type: "run-report", runId: runIdOrPlan },
-        plan: undefined,
-        commands: [],
-        diagnostics: [
-          {
-            severity: "error",
-            code: "workflow-validation-source-unsupported",
-            message: `Workflow validation source is not supported: ${runIdOrPlan}.`
-          }
-        ],
-        changedFiles: [],
-        repairActions: []
-      };
+      return unreadable("workflow-validation-source-unsupported", `Workflow validation source is not supported: ${runIdOrPlan}.`);
     };
     try {
       const parsed = await readJsonFile(runIdOrPlan);
@@ -957,7 +836,7 @@ class WorkflowRunner extends runner("workflow") {
           plan: parsed,
           commands: workflowCommandsForPlan(parsed),
           diagnostics: parsed.diagnostics,
-          changedFiles: workflowPathsForPlanLike(parsed),
+          changedFiles: workflowPathsForPlan(parsed),
           repairActions: []
         };
       }
@@ -968,21 +847,8 @@ class WorkflowRunner extends runner("workflow") {
       const artifact = await readWorkflowRunArtifact(workspace, runIdOrPlan);
       return loadFromArtifact(artifact, runIdOrPlan);
     } catch (error) {
-      return {
-        workflow: "unknown",
-        source: { type: "run-report", runId: runIdOrPlan },
-        plan: undefined,
-        commands: [],
-        diagnostics: [
-          {
-            severity: "error",
-            code: "workflow-validation-source-read-failed",
-            message: `Could not read workflow validation source: ${runIdOrPlan}. ${error instanceof Error ? error.message : ""}`.trim()
-          }
-        ],
-        changedFiles: [],
-        repairActions: []
-      };
+      const message = `Could not read workflow validation source: ${runIdOrPlan}. ${error instanceof Error ? error.message : ""}`;
+      return unreadable("workflow-validation-source-read-failed", message.trim());
     }
   }
 }