@akanjs/cli 2.3.9-rc.5 → 2.3.9-rc.7

package/incrementalBuilder.proc.js

@@ -4807,11 +4807,17 @@ var createWorkflowApplyReport = ({
   recommendedValidationCommands,
   commands = [],
   diagnostics = [],
+  postApplyChecks = [],
   recommendations = [],
   nextActions = [],
   plan
 }) => {
   const validationCommands = recommendedValidationCommands ?? commands;
+  const orderedNextActions = uniqueBy(nextActions, (action) => action.command).sort((left, right) => {
+    const leftRepair = left.command.startsWith("akan workflow explain") ? 0 : 1;
+    const rightRepair = right.command.startsWith("akan workflow explain") ? 0 : 1;
+    return leftRepair - rightRepair;
+  });
   return {
     schemaVersion: 1,
     workflow,
@@ -4823,8 +4829,9 @@ var createWorkflowApplyReport = ({
     recommendedValidationCommands: uniqueBy(validationCommands, (command) => command.command),
     commands: uniqueBy(validationCommands, (command) => command.command),
     diagnostics,
+    postApplyChecks,
     recommendations: uniqueBy(recommendations, (recommendation) => `${recommendation.kind}:${recommendation.code}`),
-    nextActions: uniqueBy(nextActions, (action) => action.command),
+    nextActions: orderedNextActions.slice(0, 3),
     plan
   };
 };
@@ -5048,6 +5055,7 @@ var createRepairReport = ({
 });
 // pkgs/@akanjs/devkit/workflow/executor.ts
 import { capitalize as capitalize2 } from "akanjs/common";
+import ts4 from "typescript";
 
 // pkgs/@akanjs/devkit/workflow/primitive.ts
 var createPrimitiveWriteReport = ({
@@ -5334,7 +5342,14 @@ var fieldExpression = (typeName, defaultValue, options = {}) => {
   const typeExpression = normalizeFieldType(typeName);
   const defaultExpression = coerceFieldDefault(options.enumValues ? "enum" : typeExpression, defaultValue, options).expression;
   const defaultOption = defaultExpression ? `, { default: ${defaultExpression} }` : "";
-  return `field(${typeExpression}${defaultOption})`;
+  return `${options.builderName ?? "field"}(${typeExpression}${defaultOption})`;
+};
+var viaBuilderParameterName = (content, className) => {
+  const classIndex = content.indexOf(`export class ${className} extends via`);
+  if (classIndex < 0)
+    return null;
+  const signature = content.slice(classIndex, content.indexOf("=>", classIndex));
+  return /via\(\(\s*([A-Za-z_$][\w$]*)\s*\)/.exec(signature)?.[1] ?? null;
 };
 var insertIntoObject = (content, className, line) => {
   const classIndex = content.indexOf(`export class ${className} extends via`);
@@ -5422,19 +5437,69 @@ ${values.map((value) => `  ${JSON.stringify(value)},`).join(`
 ${enumClass}`;
   return `${content.slice(0, firstClassIndex)}${enumClass}${content.slice(firstClassIndex)}`;
 };
+var findMatchingBrace = (content, openIndex) => {
+  let depth = 0;
+  let quote = null;
+  let escaped = false;
+  for (let index = openIndex;index < content.length; index++) {
+    const char = content[index];
+    if (quote) {
+      if (escaped) {
+        escaped = false;
+        continue;
+      }
+      if (char === "\\") {
+        escaped = true;
+        continue;
+      }
+      if (char === quote)
+        quote = null;
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      continue;
+    }
+    if (char === "{")
+      depth += 1;
+    if (char === "}") {
+      depth -= 1;
+      if (depth === 0)
+        return index;
+    }
+  }
+  return -1;
+};
+var dictionaryModelFieldLine = (fieldName) => {
+  const label = bilingualLabelForField(fieldName);
+  const desc = bilingualDescriptionForField(fieldName);
+  return `${fieldName}: t([${JSON.stringify(label.en)}, ${JSON.stringify(label.ko)}]).desc([${JSON.stringify(desc.en)}, ${JSON.stringify(desc.ko)}]),`;
+};
 var insertDictionaryModelField = (content, moduleClassName, fieldName) => {
   if (new RegExp(`\\b${fieldName}\\s*:`).test(content))
     return content;
-  const label = bilingualLabelForField(fieldName);
-  const desc = bilingualDescriptionForField(fieldName);
-  const modelIndex = content.indexOf(`.model<${moduleClassName}>((t) => ({`);
+  const modelIndex = content.indexOf(`.model<${moduleClassName}>((t) => (`);
   if (modelIndex < 0)
     return null;
-  const objectEndIndex = content.indexOf("  }))", modelIndex);
+  const objectStartIndex = content.indexOf("{", modelIndex);
+  if (objectStartIndex < 0)
+    return null;
+  const objectEndIndex = findMatchingBrace(content, objectStartIndex);
   if (objectEndIndex < 0)
     return null;
-  return `${content.slice(0, objectEndIndex)}    ${fieldName}: t([${JSON.stringify(label.en)}, ${JSON.stringify(label.ko)}]).desc([${JSON.stringify(desc.en)}, ${JSON.stringify(desc.ko)}]),
-${content.slice(objectEndIndex)}`;
+  const fieldLine = dictionaryModelFieldLine(fieldName);
+  const body = content.slice(objectStartIndex + 1, objectEndIndex);
+  if (body.trim().length === 0) {
+    return `${content.slice(0, objectStartIndex + 1)}
+    ${fieldLine}
+  ${content.slice(objectEndIndex)}`;
+  }
+  const insertion = body.endsWith(`
+`) ? `    ${fieldLine}
+` : `
+    ${fieldLine}
+`;
+  return `${content.slice(0, objectEndIndex)}${insertion}${content.slice(objectEndIndex)}`;
 };
 var ensureConstantTypeImport = (content, constantPath, typeName) => {
   if (new RegExp(`import type \\{[^}]*\\b${typeName}\\b[^}]*\\} from "${constantPath}";`).test(content))
@@ -5521,6 +5586,95 @@ var workflowStringInput = (value) => typeof value === "string" ? value : null;
 var workflowStringListInput = (value) => Array.isArray(value) ? value.join(",") : null;
 var workflowStringArrayInput = (value) => Array.isArray(value) ? value : null;
 var workflowBooleanInput = (value) => typeof value === "boolean" ? value : null;
+var postApplyDiagnostic = (code, message, target) => ({
+  severity: "error",
+  code,
+  message,
+  failureScope: "source-change",
+  context: { target }
+});
+var sourceKindForPath = (filePath) => {
+  if (filePath.endsWith(".tsx"))
+    return ts4.ScriptKind.TSX;
+  if (filePath.endsWith(".ts"))
+    return ts4.ScriptKind.TS;
+  return null;
+};
+var checkPathCasing = async (workspace, filePath) => {
+  const segments = filePath.split("/").filter(Boolean);
+  let current = ".";
+  for (const segment of segments) {
+    const entries = await workspace.readdir(current);
+    if (entries.includes(segment)) {
+      current = current === "." ? segment : `${current}/${segment}`;
+      continue;
+    }
+    const caseInsensitiveMatch = entries.find((entry) => entry.toLowerCase() === segment.toLowerCase());
+    return caseInsensitiveMatch ? {
+      code: "workflow-path-casing-mismatch",
+      message: `Reported path segment "${segment}" does not match actual casing "${caseInsensitiveMatch}" in ${filePath}.`
+    } : {
+      code: "workflow-path-missing",
+      message: `Reported path does not exist: ${filePath}.`
+    };
+  }
+  return null;
+};
+var checkTypeScriptSyntax = async (workspace, filePath) => {
+  const scriptKind = sourceKindForPath(filePath);
+  if (!scriptKind)
+    return null;
+  const content = await workspace.readFile(filePath);
+  const source = ts4.createSourceFile(filePath, content, ts4.ScriptTarget.Latest, true, scriptKind);
+  const diagnostic = source.parseDiagnostics[0];
+  if (!diagnostic)
+    return null;
+  const position = diagnostic.file?.getLineAndCharacterOfPosition(diagnostic.start ?? 0);
+  const location = position ? `:${position.line + 1}:${position.character + 1}` : "";
+  return {
+    code: "workflow-post-apply-syntax-error",
+    message: `Generated source has a TypeScript syntax error at ${filePath}${location}: ${ts4.flattenDiagnosticMessageText(diagnostic.messageText, " ")}`
+  };
+};
+var checkChangedFile = async (workspace, file) => {
+  if (file.action === "remove")
+    return { postApplyChecks: [] };
+  const diagnostics = [];
+  const checks = [];
+  const pathIssue = await checkPathCasing(workspace, file.path);
+  if (pathIssue) {
+    diagnostics.push(postApplyDiagnostic(pathIssue.code, pathIssue.message, file.path));
+    checks.push({ ...pathIssue, target: file.path, status: "failed" });
+    return { diagnostics, postApplyChecks: checks };
+  }
+  const syntaxIssue = await checkTypeScriptSyntax(workspace, file.path);
+  if (syntaxIssue) {
+    diagnostics.push(postApplyDiagnostic(syntaxIssue.code, syntaxIssue.message, file.path));
+    checks.push({ ...syntaxIssue, target: file.path, status: "failed" });
+    return { diagnostics, postApplyChecks: checks };
+  }
+  checks.push({
+    code: "workflow-post-apply-file-valid",
+    target: file.path,
+    status: "passed",
+    message: "Changed file exists with exact casing and parses as source when applicable."
+  });
+  return { postApplyChecks: checks };
+};
+var checkRecommendationPath = async (workspace, recommendation) => {
+  if (!recommendation.target || recommendation.target.includes("*") || recommendation.target.startsWith("<"))
+    return null;
+  const pathIssue = await checkPathCasing(workspace, recommendation.target);
+  if (!pathIssue)
+    return null;
+  return {
+    severity: "warning",
+    code: "workflow-recommendation-path-unverified",
+    message: `${pathIssue.message} Recommendation "${recommendation.code}" should not be treated as an exact file target until the path is corrected.`,
+    failureScope: "source-change",
+    context: { target: recommendation.target }
+  };
+};
 var resolveWorkflowSys = async (workspace, target) => {
   if (!target)
     return null;
@@ -5665,14 +5819,17 @@ var createWorkflowStepRegistry = ({
 };
 class WorkflowExecutor {
   registry;
-  constructor(registry) {
+  workspace;
+  constructor(registry, workspace) {
     this.registry = registry;
+    this.workspace = workspace;
   }
   async apply(plan) {
     const changedFiles = [];
     const generatedFiles = [];
     const recommendedValidationCommands = [];
     const diagnostics = [...plan.diagnostics];
+    const postApplyChecks = [];
     const recommendations = [...plan.recommendations];
     const nextActions = [];
     if (diagnostics.some((diagnostic) => diagnostic.severity === "error")) {
@@ -5683,6 +5840,7 @@ class WorkflowExecutor {
         generatedFiles,
         recommendedValidationCommands,
         diagnostics,
+        postApplyChecks,
         recommendations,
         nextActions,
         plan
@@ -5716,6 +5874,15 @@ class WorkflowExecutor {
       if (diagnostics.some((diagnostic) => diagnostic.severity === "error"))
         break;
     }
+    if (this.workspace && !diagnostics.some((diagnostic) => diagnostic.severity === "error")) {
+      for (const file of changedFiles) {
+        const result = await checkChangedFile(this.workspace, file);
+        postApplyChecks.push(...result.postApplyChecks ?? []);
+        diagnostics.push(...result.diagnostics ?? []);
+      }
+      const recommendationDiagnostics = await Promise.all(recommendations.map((recommendation) => checkRecommendationPath(this.workspace, recommendation)));
+      diagnostics.push(...recommendationDiagnostics.filter((diagnostic) => !!diagnostic));
+    }
     return createWorkflowApplyReport({
       workflow: plan.workflow,
       mode: "apply",
@@ -5723,6 +5890,7 @@ class WorkflowExecutor {
       generatedFiles,
       recommendedValidationCommands,
       diagnostics,
+      postApplyChecks,
       recommendations,
       nextActions,
       plan
@@ -6112,19 +6280,29 @@ var renderRecommendation = (recommendation) => {
   return `- [${recommendation.kind}]${target} ${recommendation.message}${action}`;
 };
 var renderDiagnostic = (diagnostic) => `- [${diagnostic.severity}] ${diagnostic.code}: ${diagnostic.message}`;
+var applySourceStatus = (report) => report.diagnostics.some((diagnostic) => diagnostic.severity === "error" && (diagnostic.failureScope === "source-change" || !diagnostic.failureScope || diagnostic.failureScope === "unknown")) ? "failed" : "passed";
 var renderWorkflowApplyReport = (report) => {
   const manualReviewItems = [
     ...report.diagnostics.filter((diagnostic) => diagnostic.severity === "warning").map(renderDiagnostic),
     ...report.recommendations.filter((recommendation) => recommendation.kind === "manual-action").map(renderRecommendation)
   ];
   const validationBlockers = report.diagnostics.filter((diagnostic) => diagnostic.severity === "error" && (diagnostic.failureScope === "workspace-config" || diagnostic.failureScope === "environment")).map(renderDiagnostic);
+  const sourceBlockers = report.diagnostics.filter((diagnostic) => diagnostic.severity === "error" && (diagnostic.failureScope === "source-change" || !diagnostic.failureScope || diagnostic.failureScope === "unknown")).map(renderDiagnostic);
   return [
     `# Workflow Apply: ${report.workflow}`,
     "",
     `- Mode: ${report.mode}`,
     `- Status: ${report.status}`,
+    `- Source-change status: ${applySourceStatus(report)}`,
+    `- Workspace status: ${validationBlockers.length ? "blocked" : "not blocked during apply"}`,
     ...report.validationTarget ? [`- Validation target: ${report.validationTarget}`] : [],
     "",
+    "## Apply Checks",
+    ...report.postApplyChecks?.length ? report.postApplyChecks.map((check) => `- [${check.status}] ${check.code} ${check.target}: ${check.message}`) : ["- not run"],
+    "",
+    "## Source Change Blockers",
+    ...sourceBlockers.length ? sourceBlockers : ["- none"],
+    "",
     "## Automatically Modified",
     ...report.changedFiles.length ? report.changedFiles.map((file) => `- \`${file.action}\` ${file.path}: ${file.reason}`) : ["- none"],
     "",
@@ -6147,7 +6325,7 @@ var renderWorkflowApplyReport = (report) => {
     ...report.diagnostics.length ? report.diagnostics.map(renderDiagnostic) : ["- none"],
     "",
     "## Recommendations",
-    ...report.recommendations.length ? report.recommendations.map(renderRecommendation) : ["- none"],
+    ...report.recommendations.length ? report.recommendations.slice(0, 3).map(renderRecommendation) : ["- none"],
     "",
     "## Next Actions",
     ...report.nextActions.length ? report.nextActions.map((action) => `- \`${action.command}\`: ${action.reason}`) : ["- none"],
@@ -6166,10 +6344,16 @@ var renderWorkflowValidationRunReport = (report) => [
   `- Overall status: ${report.overallStatus}`,
   "",
   "## Status Summary",
-  `- Required source-change validation: ${report.summary.sourceChange}`,
-  `- Generated sync validation: ${report.summary.generatedSync}`,
-  `- Workspace configuration validation: ${report.summary.workspaceConfig}`,
-  `- Environment validation: ${report.summary.environment}`,
+  `- Source-change: ${report.summary.sourceChange}`,
+  `- Generated sync: ${report.summary.generatedSync}`,
+  `- Workspace config: ${report.summary.workspaceConfig}`,
+  `- Environment: ${report.summary.environment}`,
+  "",
+  "## Source Change Diagnostics",
+  ...report.workflowDiagnostics?.length ? report.workflowDiagnostics.map((diagnostic) => `- [${diagnostic.severity}] ${diagnostic.code}: ${diagnostic.message}`) : ["- none"],
+  "",
+  "## Existing Workspace Blockers",
+  ...report.baselineDiagnostics?.length ? report.baselineDiagnostics.map((diagnostic) => `- [${diagnostic.severity}] ${diagnostic.code}: ${diagnostic.message}`) : ["- none"],
   "",
   "## Known Blockers",
   ...report.knownBlockers.length ? report.knownBlockers.map((blocker) => {
@@ -7245,7 +7429,7 @@ var collapseIndex = (relPathNoExt) => {
 
 // pkgs/@akanjs/devkit/transforms/barrelImportsPlugin.ts
 import path14 from "path";
-import ts4 from "typescript";
+import ts5 from "typescript";
 var createBarrelImportsPlugin = async (app, { skipPath = defaultSkipPath, pipeAfter } = {}) => {
   const akanConfig2 = await app.getConfig();
   const barrels = [...new Set(akanConfig2.barrelImports)].filter(Boolean);
@@ -7486,11 +7670,11 @@ var rewriteBarrelImports = async (source2, barrels, analyzer) => {
 };
 var findImportStatements = (source2) => {
   const statements = [];
-  const sourceFile2 = ts4.createSourceFile("barrel-imports.tsx", source2, ts4.ScriptTarget.Latest, true, ts4.ScriptKind.TSX);
+  const sourceFile2 = ts5.createSourceFile("barrel-imports.tsx", source2, ts5.ScriptTarget.Latest, true, ts5.ScriptKind.TSX);
   for (const statement of sourceFile2.statements) {
-    if (!ts4.isImportDeclaration(statement))
+    if (!ts5.isImportDeclaration(statement))
       continue;
-    if (!ts4.isStringLiteral(statement.moduleSpecifier))
+    if (!ts5.isStringLiteral(statement.moduleSpecifier))
       continue;
     const importClause = statement.importClause;
     if (!importClause)
@@ -8485,7 +8669,7 @@ import path22 from "path";
 // pkgs/@akanjs/devkit/frontendBuild/pagesEntrySourceGenerator.ts
 import fs3 from "fs";
 import path21 from "path";
-import ts5 from "typescript";
+import ts6 from "typescript";
 
 class PagesEntrySourceGenerator {
   #pageEntries;
@@ -8529,7 +8713,7 @@ ${entries.join(`
   static #hasAsyncDefaultExport(moduleAbsPath) {
     try {
       const source2 = fs3.readFileSync(path21.resolve(moduleAbsPath), "utf8");
-      const sourceFile2 = ts5.createSourceFile(moduleAbsPath, source2, ts5.ScriptTarget.Latest, true, PagesEntrySourceGenerator.#scriptKind(moduleAbsPath));
+      const sourceFile2 = ts6.createSourceFile(moduleAbsPath, source2, ts6.ScriptTarget.Latest, true, PagesEntrySourceGenerator.#scriptKind(moduleAbsPath));
       return PagesEntrySourceGenerator.#sourceFileHasAsyncDefaultExport(sourceFile2);
     } catch {
       return false;
@@ -8539,31 +8723,31 @@ ${entries.join(`
     const asyncBindings = new Map;
     let defaultIdentifier = null;
     for (const statement of sourceFile2.statements) {
-      if (ts5.isFunctionDeclaration(statement)) {
-        if (PagesEntrySourceGenerator.#hasModifier(statement, ts5.SyntaxKind.DefaultKeyword)) {
-          return PagesEntrySourceGenerator.#hasModifier(statement, ts5.SyntaxKind.AsyncKeyword);
+      if (ts6.isFunctionDeclaration(statement)) {
+        if (PagesEntrySourceGenerator.#hasModifier(statement, ts6.SyntaxKind.DefaultKeyword)) {
+          return PagesEntrySourceGenerator.#hasModifier(statement, ts6.SyntaxKind.AsyncKeyword);
         }
         if (statement.name) {
-          asyncBindings.set(statement.name.text, PagesEntrySourceGenerator.#hasModifier(statement, ts5.SyntaxKind.AsyncKeyword));
+          asyncBindings.set(statement.name.text, PagesEntrySourceGenerator.#hasModifier(statement, ts6.SyntaxKind.AsyncKeyword));
         }
         continue;
       }
-      if (ts5.isVariableStatement(statement)) {
+      if (ts6.isVariableStatement(statement)) {
         for (const declaration of statement.declarationList.declarations) {
-          if (!ts5.isIdentifier(declaration.name))
+          if (!ts6.isIdentifier(declaration.name))
             continue;
           asyncBindings.set(declaration.name.text, PagesEntrySourceGenerator.#isAsyncFunctionExpression(declaration.initializer));
         }
         continue;
       }
-      if (ts5.isExportAssignment(statement)) {
+      if (ts6.isExportAssignment(statement)) {
         if (PagesEntrySourceGenerator.#isAsyncFunctionExpression(statement.expression))
           return true;
-        if (ts5.isIdentifier(statement.expression))
+        if (ts6.isIdentifier(statement.expression))
           defaultIdentifier = statement.expression.text;
         continue;
       }
-      if (ts5.isExportDeclaration(statement) && statement.exportClause && ts5.isNamedExports(statement.exportClause)) {
+      if (ts6.isExportDeclaration(statement) && statement.exportClause && ts6.isNamedExports(statement.exportClause)) {
         const exportClause = statement.exportClause;
         for (const specifier of exportClause.elements) {
           if (specifier.name.text !== "default")
@@ -8575,13 +8759,13 @@ ${entries.join(`
     return defaultIdentifier ? asyncBindings.get(defaultIdentifier) === true : false;
   }
   static #hasModifier(node, kind) {
-    return ts5.canHaveModifiers(node) && (ts5.getModifiers(node)?.some((modifier) => modifier.kind === kind) ?? false);
+    return ts6.canHaveModifiers(node) && (ts6.getModifiers(node)?.some((modifier) => modifier.kind === kind) ?? false);
   }
   static #isAsyncFunctionExpression(node) {
-    return Boolean(node && (ts5.isArrowFunction(node) || ts5.isFunctionExpression(node)) && PagesEntrySourceGenerator.#hasModifier(node, ts5.SyntaxKind.AsyncKeyword));
+    return Boolean(node && (ts6.isArrowFunction(node) || ts6.isFunctionExpression(node)) && PagesEntrySourceGenerator.#hasModifier(node, ts6.SyntaxKind.AsyncKeyword));
   }
   static #scriptKind(moduleAbsPath) {
-    return moduleAbsPath.endsWith(".tsx") || moduleAbsPath.endsWith(".jsx") ? ts5.ScriptKind.TSX : ts5.ScriptKind.TS;
+    return moduleAbsPath.endsWith(".tsx") || moduleAbsPath.endsWith(".jsx") ? ts6.ScriptKind.TSX : ts6.ScriptKind.TS;
   }
 }
 
@@ -9500,7 +9684,7 @@ import {
 } from "fontaine";
 import { createFont, woff2 } from "fonteditor-core";
 import subsetFont from "subset-font";
-import ts6 from "typescript";
+import ts7 from "typescript";
 var FONT_URL_PREFIX = "/_akan/fonts";
 var DEFAULT_FONT_SUBSETS = ["latin"];
 
@@ -9565,17 +9749,17 @@ class FontOptimizer {
       this.#cssParts.push(...faceCss, this.#buildRootVariableRule(font));
   }
   #extractFontsExport(source2, filePath) {
-    const sourceFile2 = ts6.createSourceFile(filePath, source2, ts6.ScriptTarget.Latest, true, ts6.ScriptKind.TSX);
+    const sourceFile2 = ts7.createSourceFile(filePath, source2, ts7.ScriptTarget.Latest, true, ts7.ScriptKind.TSX);
     const fonts = [];
     for (const statement of sourceFile2.statements) {
-      if (!ts6.isVariableStatement(statement))
+      if (!ts7.isVariableStatement(statement))
         continue;
-      const modifiers = ts6.canHaveModifiers(statement) ? ts6.getModifiers(statement) : undefined;
-      const isExported = modifiers?.some((modifier) => modifier.kind === ts6.SyntaxKind.ExportKeyword) ?? false;
+      const modifiers = ts7.canHaveModifiers(statement) ? ts7.getModifiers(statement) : undefined;
+      const isExported = modifiers?.some((modifier) => modifier.kind === ts7.SyntaxKind.ExportKeyword) ?? false;
       if (!isExported)
         continue;
       for (const declaration of statement.declarationList.declarations) {
-        if (!ts6.isIdentifier(declaration.name) || declaration.name.text !== "fonts")
+        if (!ts7.isIdentifier(declaration.name) || declaration.name.text !== "fonts")
           continue;
         const value = declaration.initializer ? this.#literalToValue(declaration.initializer) : null;
         if (Array.isArray(value)) {
@@ -9586,20 +9770,20 @@ class FontOptimizer {
     return fonts;
   }
   #literalToValue(node) {
-    if (ts6.isStringLiteralLike(node))
+    if (ts7.isStringLiteralLike(node))
       return node.text;
-    if (ts6.isNumericLiteral(node))
+    if (ts7.isNumericLiteral(node))
       return Number(node.text);
-    if (node.kind === ts6.SyntaxKind.TrueKeyword)
+    if (node.kind === ts7.SyntaxKind.TrueKeyword)
       return true;
-    if (node.kind === ts6.SyntaxKind.FalseKeyword)
+    if (node.kind === ts7.SyntaxKind.FalseKeyword)
       return false;
-    if (ts6.isArrayLiteralExpression(node))
+    if (ts7.isArrayLiteralExpression(node))
       return node.elements.map((element) => this.#literalToValue(element));
-    if (ts6.isObjectLiteralExpression(node)) {
+    if (ts7.isObjectLiteralExpression(node)) {
       const obj = {};
       for (const prop of node.properties) {
-        if (!ts6.isPropertyAssignment(prop))
+        if (!ts7.isPropertyAssignment(prop))
           continue;
         const name = this.#getPropertyName(prop.name);
         if (!name)
@@ -9608,13 +9792,13 @@ class FontOptimizer {
       }
       return obj;
     }
-    if (ts6.isAsExpression(node) || ts6.isSatisfiesExpression(node) || ts6.isParenthesizedExpression(node)) {
+    if (ts7.isAsExpression(node) || ts7.isSatisfiesExpression(node) || ts7.isParenthesizedExpression(node)) {
       return this.#literalToValue(node.expression);
     }
     return;
   }
   #getPropertyName(name) {
-    if (ts6.isIdentifier(name) || ts6.isStringLiteral(name) || ts6.isNumericLiteral(name))
+    if (ts7.isIdentifier(name) || ts7.isStringLiteral(name) || ts7.isNumericLiteral(name))
       return name.text;
     return null;
   }
@@ -13089,7 +13273,7 @@ import { capitalize as capitalize8 } from "akanjs/common";
 // pkgs/@akanjs/devkit/getRelatedCnsts.ts
 import { readFileSync as readFileSync4, realpathSync } from "fs";
 import ora2 from "ora";
-import * as ts7 from "typescript";
+import * as ts8 from "typescript";
 var tsTranspiler = new Bun.Transpiler({ loader: "ts" });
 var tsxTranspiler = new Bun.Transpiler({ loader: "tsx" });
 var getTranspiler = (filePath) => filePath.endsWith(".tsx") ? tsxTranspiler : tsTranspiler;
@@ -13122,10 +13306,10 @@ var scanModuleSpecifiers = (source2, filePath, includeExports) => {
   return importSpecifiers;
 };
 var parseTsConfig = (tsConfigPath = "./tsconfig.json") => {
-  const configFile = ts7.readConfigFile(tsConfigPath, (path40) => {
-    return ts7.sys.readFile(path40);
+  const configFile = ts8.readConfigFile(tsConfigPath, (path40) => {
+    return ts8.sys.readFile(path40);
   });
-  return ts7.parseJsonConfigFileContent(configFile.config, ts7.sys, realpathSync(tsConfigPath).replace(/[^/\\]+$/, ""));
+  return ts8.parseJsonConfigFileContent(configFile.config, ts8.sys, realpathSync(tsConfigPath).replace(/[^/\\]+$/, ""));
 };
 var collectImportedFiles = (constantFilePath, parsedConfig) => {
   const allFilesToAnalyze = new Set([constantFilePath]);
@@ -13140,7 +13324,7 @@ var collectImportedFiles = (constantFilePath, parsedConfig) => {
     for (const importPath of scanModuleSpecifiers(source2, filePath, false)) {
       if (!importPath.startsWith("."))
         continue;
-      const resolved = ts7.resolveModuleName(importPath, filePath, parsedConfig.options, ts7.sys).resolvedModule?.resolvedFileName;
+      const resolved = ts8.resolveModuleName(importPath, filePath, parsedConfig.options, ts8.sys).resolvedModule?.resolvedFileName;
       if (resolved && !allFilesToAnalyze.has(resolved)) {
         allFilesToAnalyze.add(resolved);
         collectImported(resolved);
@@ -13157,7 +13341,7 @@ var collectImportedFiles = (constantFilePath, parsedConfig) => {
 var createTsProgram = (filePaths, options) => {
   const spinner = ora2("Creating TypeScript program for all files...");
   spinner.start();
-  const program2 = ts7.createProgram(Array.from(filePaths), options);
+  const program2 = ts8.createProgram(Array.from(filePaths), options);
   const checker = program2.getTypeChecker();
   spinner.succeed("TypeScript program created.");
   return {
@@ -13197,17 +13381,17 @@ var analyzeProperties = (filesToAnalyze, program2, checker) => {
     function visit(node) {
       if (!source2)
         return;
-      if (ts7.isPropertyAccessExpression(node)) {
+      if (ts8.isPropertyAccessExpression(node)) {
         const left = node.expression;
         const right = node.name;
-        const { line } = ts7.getLineAndCharacterOfPosition(source2, node.getStart());
-        if (ts7.isIdentifier(left) && sourceLines && sourceLines.length > line && sourceLines[line] && (sourceLines[line]?.includes(`@Field.Prop(() => ${left.text}.${right.text}`) || sourceLines[line].includes(`base.Filter(${left.text}.${right.text},`))) {
+        const { line } = ts8.getLineAndCharacterOfPosition(source2, node.getStart());
+        if (ts8.isIdentifier(left) && sourceLines && sourceLines.length > line && sourceLines[line] && (sourceLines[line]?.includes(`@Field.Prop(() => ${left.text}.${right.text}`) || sourceLines[line].includes(`base.Filter(${left.text}.${right.text},`))) {
           const symbol = getCachedSymbol(right);
           if (symbol?.declarations && symbol.declarations.length > 0) {
             const key = symbol.declarations[0]?.getSourceFile().fileName.split("/").pop()?.split(".")[0] ?? "";
             const property = propertyMap.get(key);
             const isScalar = symbol.declarations[0]?.getSourceFile().fileName.includes("_") ?? false;
-            const symbolFilePath = symbol.declarations[0]?.getSourceFile().fileName.replace(`${ts7.sys.getCurrentDirectory()}/`, "");
+            const symbolFilePath = symbol.declarations[0]?.getSourceFile().fileName.replace(`${ts8.sys.getCurrentDirectory()}/`, "");
             if (!symbolFilePath)
               throw new Error(`No symbol file path found for ${left.text}.${right.text}`);
             if (property) {
@@ -13231,10 +13415,10 @@ var analyzeProperties = (filesToAnalyze, program2, checker) => {
             }
           }
         }
-      } else if (ts7.isImportDeclaration(node) && ts7.isStringLiteral(node.moduleSpecifier)) {
+      } else if (ts8.isImportDeclaration(node) && ts8.isStringLiteral(node.moduleSpecifier)) {
         const importPath = node.moduleSpecifier.text;
         if (importPath.startsWith(".")) {
-          const resolved = ts7.resolveModuleName(importPath, filePath, program2.getCompilerOptions(), ts7.sys).resolvedModule?.resolvedFileName;
+          const resolved = ts8.resolveModuleName(importPath, filePath, program2.getCompilerOptions(), ts8.sys).resolvedModule?.resolvedFileName;
           const moduleName = importPath.split("/").pop()?.split(".")[0] ?? "";
           const property = propertyMap.get(moduleName);
           const isScalar = importPath.includes("_");
@@ -13249,7 +13433,7 @@ var analyzeProperties = (filesToAnalyze, program2, checker) => {
           }
         }
       }
-      ts7.forEachChild(node, visit);
+      ts8.forEachChild(node, visit);
     }
     visit(source2);
   }

package/index.js

@@ -4805,11 +4805,17 @@ var createWorkflowApplyReport = ({
   recommendedValidationCommands,
   commands = [],
   diagnostics = [],
+  postApplyChecks = [],
   recommendations = [],
   nextActions = [],
   plan
 }) => {
   const validationCommands = recommendedValidationCommands ?? commands;
+  const orderedNextActions = uniqueBy(nextActions, (action) => action.command).sort((left, right) => {
+    const leftRepair = left.command.startsWith("akan workflow explain") ? 0 : 1;
+    const rightRepair = right.command.startsWith("akan workflow explain") ? 0 : 1;
+    return leftRepair - rightRepair;
+  });
   return {
     schemaVersion: 1,
     workflow,
@@ -4821,8 +4827,9 @@ var createWorkflowApplyReport = ({
     recommendedValidationCommands: uniqueBy(validationCommands, (command) => command.command),
     commands: uniqueBy(validationCommands, (command) => command.command),
     diagnostics,
+    postApplyChecks,
     recommendations: uniqueBy(recommendations, (recommendation) => `${recommendation.kind}:${recommendation.code}`),
-    nextActions: uniqueBy(nextActions, (action) => action.command),
+    nextActions: orderedNextActions.slice(0, 3),
     plan
   };
 };
@@ -5046,6 +5053,7 @@ var createRepairReport = ({
 });
 // pkgs/@akanjs/devkit/workflow/executor.ts
 import { capitalize as capitalize2 } from "akanjs/common";
+import ts4 from "typescript";
 
 // pkgs/@akanjs/devkit/workflow/primitive.ts
 var createPrimitiveWriteReport = ({
@@ -5332,7 +5340,14 @@ var fieldExpression = (typeName, defaultValue, options = {}) => {
   const typeExpression = normalizeFieldType(typeName);
   const defaultExpression = coerceFieldDefault(options.enumValues ? "enum" : typeExpression, defaultValue, options).expression;
   const defaultOption = defaultExpression ? `, { default: ${defaultExpression} }` : "";
-  return `field(${typeExpression}${defaultOption})`;
+  return `${options.builderName ?? "field"}(${typeExpression}${defaultOption})`;
+};
+var viaBuilderParameterName = (content, className) => {
+  const classIndex = content.indexOf(`export class ${className} extends via`);
+  if (classIndex < 0)
+    return null;
+  const signature = content.slice(classIndex, content.indexOf("=>", classIndex));
+  return /via\(\(\s*([A-Za-z_$][\w$]*)\s*\)/.exec(signature)?.[1] ?? null;
 };
 var insertIntoObject = (content, className, line) => {
   const classIndex = content.indexOf(`export class ${className} extends via`);
@@ -5420,19 +5435,69 @@ ${values.map((value) => `  ${JSON.stringify(value)},`).join(`
 ${enumClass}`;
   return `${content.slice(0, firstClassIndex)}${enumClass}${content.slice(firstClassIndex)}`;
 };
+var findMatchingBrace = (content, openIndex) => {
+  let depth = 0;
+  let quote = null;
+  let escaped = false;
+  for (let index = openIndex;index < content.length; index++) {
+    const char = content[index];
+    if (quote) {
+      if (escaped) {
+        escaped = false;
+        continue;
+      }
+      if (char === "\\") {
+        escaped = true;
+        continue;
+      }
+      if (char === quote)
+        quote = null;
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      continue;
+    }
+    if (char === "{")
+      depth += 1;
+    if (char === "}") {
+      depth -= 1;
+      if (depth === 0)
+        return index;
+    }
+  }
+  return -1;
+};
+var dictionaryModelFieldLine = (fieldName) => {
+  const label = bilingualLabelForField(fieldName);
+  const desc = bilingualDescriptionForField(fieldName);
+  return `${fieldName}: t([${JSON.stringify(label.en)}, ${JSON.stringify(label.ko)}]).desc([${JSON.stringify(desc.en)}, ${JSON.stringify(desc.ko)}]),`;
+};
 var insertDictionaryModelField = (content, moduleClassName, fieldName) => {
   if (new RegExp(`\\b${fieldName}\\s*:`).test(content))
     return content;
-  const label = bilingualLabelForField(fieldName);
-  const desc = bilingualDescriptionForField(fieldName);
-  const modelIndex = content.indexOf(`.model<${moduleClassName}>((t) => ({`);
+  const modelIndex = content.indexOf(`.model<${moduleClassName}>((t) => (`);
   if (modelIndex < 0)
     return null;
-  const objectEndIndex = content.indexOf("  }))", modelIndex);
+  const objectStartIndex = content.indexOf("{", modelIndex);
+  if (objectStartIndex < 0)
+    return null;
+  const objectEndIndex = findMatchingBrace(content, objectStartIndex);
   if (objectEndIndex < 0)
     return null;
-  return `${content.slice(0, objectEndIndex)}    ${fieldName}: t([${JSON.stringify(label.en)}, ${JSON.stringify(label.ko)}]).desc([${JSON.stringify(desc.en)}, ${JSON.stringify(desc.ko)}]),
-${content.slice(objectEndIndex)}`;
+  const fieldLine = dictionaryModelFieldLine(fieldName);
+  const body = content.slice(objectStartIndex + 1, objectEndIndex);
+  if (body.trim().length === 0) {
+    return `${content.slice(0, objectStartIndex + 1)}
+    ${fieldLine}
+  ${content.slice(objectEndIndex)}`;
+  }
+  const insertion = body.endsWith(`
+`) ? `    ${fieldLine}
+` : `
+    ${fieldLine}
+`;
+  return `${content.slice(0, objectEndIndex)}${insertion}${content.slice(objectEndIndex)}`;
 };
 var ensureConstantTypeImport = (content, constantPath, typeName) => {
   if (new RegExp(`import type \\{[^}]*\\b${typeName}\\b[^}]*\\} from "${constantPath}";`).test(content))
@@ -5519,6 +5584,95 @@ var workflowStringInput = (value) => typeof value === "string" ? value : null;
 var workflowStringListInput = (value) => Array.isArray(value) ? value.join(",") : null;
 var workflowStringArrayInput = (value) => Array.isArray(value) ? value : null;
 var workflowBooleanInput = (value) => typeof value === "boolean" ? value : null;
+var postApplyDiagnostic = (code, message, target) => ({
+  severity: "error",
+  code,
+  message,
+  failureScope: "source-change",
+  context: { target }
+});
+var sourceKindForPath = (filePath) => {
+  if (filePath.endsWith(".tsx"))
+    return ts4.ScriptKind.TSX;
+  if (filePath.endsWith(".ts"))
+    return ts4.ScriptKind.TS;
+  return null;
+};
+var checkPathCasing = async (workspace, filePath) => {
+  const segments = filePath.split("/").filter(Boolean);
+  let current = ".";
+  for (const segment of segments) {
+    const entries = await workspace.readdir(current);
+    if (entries.includes(segment)) {
+      current = current === "." ? segment : `${current}/${segment}`;
+      continue;
+    }
+    const caseInsensitiveMatch = entries.find((entry) => entry.toLowerCase() === segment.toLowerCase());
+    return caseInsensitiveMatch ? {
+      code: "workflow-path-casing-mismatch",
+      message: `Reported path segment "${segment}" does not match actual casing "${caseInsensitiveMatch}" in ${filePath}.`
+    } : {
+      code: "workflow-path-missing",
+      message: `Reported path does not exist: ${filePath}.`
+    };
+  }
+  return null;
+};
+var checkTypeScriptSyntax = async (workspace, filePath) => {
+  const scriptKind = sourceKindForPath(filePath);
+  if (!scriptKind)
+    return null;
+  const content = await workspace.readFile(filePath);
+  const source = ts4.createSourceFile(filePath, content, ts4.ScriptTarget.Latest, true, scriptKind);
+  const diagnostic = source.parseDiagnostics[0];
+  if (!diagnostic)
+    return null;
+  const position = diagnostic.file?.getLineAndCharacterOfPosition(diagnostic.start ?? 0);
+  const location = position ? `:${position.line + 1}:${position.character + 1}` : "";
+  return {
+    code: "workflow-post-apply-syntax-error",
+    message: `Generated source has a TypeScript syntax error at ${filePath}${location}: ${ts4.flattenDiagnosticMessageText(diagnostic.messageText, " ")}`
+  };
+};
+var checkChangedFile = async (workspace, file) => {
+  if (file.action === "remove")
+    return { postApplyChecks: [] };
+  const diagnostics = [];
+  const checks = [];
+  const pathIssue = await checkPathCasing(workspace, file.path);
+  if (pathIssue) {
+    diagnostics.push(postApplyDiagnostic(pathIssue.code, pathIssue.message, file.path));
+    checks.push({ ...pathIssue, target: file.path, status: "failed" });
+    return { diagnostics, postApplyChecks: checks };
+  }
+  const syntaxIssue = await checkTypeScriptSyntax(workspace, file.path);
+  if (syntaxIssue) {
+    diagnostics.push(postApplyDiagnostic(syntaxIssue.code, syntaxIssue.message, file.path));
+    checks.push({ ...syntaxIssue, target: file.path, status: "failed" });
+    return { diagnostics, postApplyChecks: checks };
+  }
+  checks.push({
+    code: "workflow-post-apply-file-valid",
+    target: file.path,
+    status: "passed",
+    message: "Changed file exists with exact casing and parses as source when applicable."
+  });
+  return { postApplyChecks: checks };
+};
+var checkRecommendationPath = async (workspace, recommendation) => {
+  if (!recommendation.target || recommendation.target.includes("*") || recommendation.target.startsWith("<"))
+    return null;
+  const pathIssue = await checkPathCasing(workspace, recommendation.target);
+  if (!pathIssue)
+    return null;
+  return {
+    severity: "warning",
+    code: "workflow-recommendation-path-unverified",
+    message: `${pathIssue.message} Recommendation "${recommendation.code}" should not be treated as an exact file target until the path is corrected.`,
+    failureScope: "source-change",
+    context: { target: recommendation.target }
+  };
+};
 var resolveWorkflowSys = async (workspace, target) => {
   if (!target)
     return null;
@@ -5663,14 +5817,17 @@ var createWorkflowStepRegistry = ({
 };
 class WorkflowExecutor {
   registry;
-  constructor(registry) {
+  workspace;
+  constructor(registry, workspace) {
     this.registry = registry;
+    this.workspace = workspace;
   }
   async apply(plan) {
     const changedFiles = [];
     const generatedFiles = [];
     const recommendedValidationCommands = [];
     const diagnostics = [...plan.diagnostics];
+    const postApplyChecks = [];
     const recommendations = [...plan.recommendations];
     const nextActions = [];
     if (diagnostics.some((diagnostic) => diagnostic.severity === "error")) {
@@ -5681,6 +5838,7 @@ class WorkflowExecutor {
         generatedFiles,
         recommendedValidationCommands,
         diagnostics,
+        postApplyChecks,
         recommendations,
         nextActions,
         plan
@@ -5714,6 +5872,15 @@ class WorkflowExecutor {
       if (diagnostics.some((diagnostic) => diagnostic.severity === "error"))
         break;
     }
+    if (this.workspace && !diagnostics.some((diagnostic) => diagnostic.severity === "error")) {
+      for (const file of changedFiles) {
+        const result = await checkChangedFile(this.workspace, file);
+        postApplyChecks.push(...result.postApplyChecks ?? []);
+        diagnostics.push(...result.diagnostics ?? []);
+      }
+      const recommendationDiagnostics = await Promise.all(recommendations.map((recommendation) => checkRecommendationPath(this.workspace, recommendation)));
+      diagnostics.push(...recommendationDiagnostics.filter((diagnostic) => !!diagnostic));
+    }
     return createWorkflowApplyReport({
       workflow: plan.workflow,
       mode: "apply",
@@ -5721,6 +5888,7 @@ class WorkflowExecutor {
       generatedFiles,
       recommendedValidationCommands,
       diagnostics,
+      postApplyChecks,
       recommendations,
       nextActions,
       plan
@@ -6110,19 +6278,29 @@ var renderRecommendation = (recommendation) => {
   return `- [${recommendation.kind}]${target} ${recommendation.message}${action}`;
 };
 var renderDiagnostic = (diagnostic) => `- [${diagnostic.severity}] ${diagnostic.code}: ${diagnostic.message}`;
+var applySourceStatus = (report) => report.diagnostics.some((diagnostic) => diagnostic.severity === "error" && (diagnostic.failureScope === "source-change" || !diagnostic.failureScope || diagnostic.failureScope === "unknown")) ? "failed" : "passed";
 var renderWorkflowApplyReport = (report) => {
   const manualReviewItems = [
     ...report.diagnostics.filter((diagnostic) => diagnostic.severity === "warning").map(renderDiagnostic),
     ...report.recommendations.filter((recommendation) => recommendation.kind === "manual-action").map(renderRecommendation)
   ];
   const validationBlockers = report.diagnostics.filter((diagnostic) => diagnostic.severity === "error" && (diagnostic.failureScope === "workspace-config" || diagnostic.failureScope === "environment")).map(renderDiagnostic);
+  const sourceBlockers = report.diagnostics.filter((diagnostic) => diagnostic.severity === "error" && (diagnostic.failureScope === "source-change" || !diagnostic.failureScope || diagnostic.failureScope === "unknown")).map(renderDiagnostic);
   return [
     `# Workflow Apply: ${report.workflow}`,
     "",
     `- Mode: ${report.mode}`,
     `- Status: ${report.status}`,
+    `- Source-change status: ${applySourceStatus(report)}`,
+    `- Workspace status: ${validationBlockers.length ? "blocked" : "not blocked during apply"}`,
     ...report.validationTarget ? [`- Validation target: ${report.validationTarget}`] : [],
     "",
+    "## Apply Checks",
+    ...report.postApplyChecks?.length ? report.postApplyChecks.map((check) => `- [${check.status}] ${check.code} ${check.target}: ${check.message}`) : ["- not run"],
+    "",
+    "## Source Change Blockers",
+    ...sourceBlockers.length ? sourceBlockers : ["- none"],
+    "",
     "## Automatically Modified",
     ...report.changedFiles.length ? report.changedFiles.map((file) => `- \`${file.action}\` ${file.path}: ${file.reason}`) : ["- none"],
     "",
@@ -6145,7 +6323,7 @@ var renderWorkflowApplyReport = (report) => {
     ...report.diagnostics.length ? report.diagnostics.map(renderDiagnostic) : ["- none"],
     "",
     "## Recommendations",
-    ...report.recommendations.length ? report.recommendations.map(renderRecommendation) : ["- none"],
+    ...report.recommendations.length ? report.recommendations.slice(0, 3).map(renderRecommendation) : ["- none"],
     "",
     "## Next Actions",
     ...report.nextActions.length ? report.nextActions.map((action) => `- \`${action.command}\`: ${action.reason}`) : ["- none"],
@@ -6164,10 +6342,16 @@ var renderWorkflowValidationRunReport = (report) => [
   `- Overall status: ${report.overallStatus}`,
   "",
   "## Status Summary",
-  `- Required source-change validation: ${report.summary.sourceChange}`,
-  `- Generated sync validation: ${report.summary.generatedSync}`,
-  `- Workspace configuration validation: ${report.summary.workspaceConfig}`,
-  `- Environment validation: ${report.summary.environment}`,
+  `- Source-change: ${report.summary.sourceChange}`,
+  `- Generated sync: ${report.summary.generatedSync}`,
+  `- Workspace config: ${report.summary.workspaceConfig}`,
+  `- Environment: ${report.summary.environment}`,
+  "",
+  "## Source Change Diagnostics",
+  ...report.workflowDiagnostics?.length ? report.workflowDiagnostics.map((diagnostic) => `- [${diagnostic.severity}] ${diagnostic.code}: ${diagnostic.message}`) : ["- none"],
+  "",
+  "## Existing Workspace Blockers",
+  ...report.baselineDiagnostics?.length ? report.baselineDiagnostics.map((diagnostic) => `- [${diagnostic.severity}] ${diagnostic.code}: ${diagnostic.message}`) : ["- none"],
   "",
   "## Known Blockers",
   ...report.knownBlockers.length ? report.knownBlockers.map((blocker) => {
@@ -7243,7 +7427,7 @@ var collapseIndex = (relPathNoExt) => {
 
 // pkgs/@akanjs/devkit/transforms/barrelImportsPlugin.ts
 import path14 from "path";
-import ts4 from "typescript";
+import ts5 from "typescript";
 var createBarrelImportsPlugin = async (app, { skipPath = defaultSkipPath, pipeAfter } = {}) => {
   const akanConfig2 = await app.getConfig();
   const barrels = [...new Set(akanConfig2.barrelImports)].filter(Boolean);
@@ -7484,11 +7668,11 @@ var rewriteBarrelImports = async (source2, barrels, analyzer) => {
 };
 var findImportStatements = (source2) => {
   const statements = [];
-  const sourceFile2 = ts4.createSourceFile("barrel-imports.tsx", source2, ts4.ScriptTarget.Latest, true, ts4.ScriptKind.TSX);
+  const sourceFile2 = ts5.createSourceFile("barrel-imports.tsx", source2, ts5.ScriptTarget.Latest, true, ts5.ScriptKind.TSX);
   for (const statement of sourceFile2.statements) {
-    if (!ts4.isImportDeclaration(statement))
+    if (!ts5.isImportDeclaration(statement))
       continue;
-    if (!ts4.isStringLiteral(statement.moduleSpecifier))
+    if (!ts5.isStringLiteral(statement.moduleSpecifier))
       continue;
     const importClause = statement.importClause;
     if (!importClause)
@@ -8483,7 +8667,7 @@ import path22 from "path";
 // pkgs/@akanjs/devkit/frontendBuild/pagesEntrySourceGenerator.ts
 import fs3 from "fs";
 import path21 from "path";
-import ts5 from "typescript";
+import ts6 from "typescript";
 
 class PagesEntrySourceGenerator {
   #pageEntries;
@@ -8527,7 +8711,7 @@ ${entries.join(`
   static #hasAsyncDefaultExport(moduleAbsPath) {
     try {
       const source2 = fs3.readFileSync(path21.resolve(moduleAbsPath), "utf8");
-      const sourceFile2 = ts5.createSourceFile(moduleAbsPath, source2, ts5.ScriptTarget.Latest, true, PagesEntrySourceGenerator.#scriptKind(moduleAbsPath));
+      const sourceFile2 = ts6.createSourceFile(moduleAbsPath, source2, ts6.ScriptTarget.Latest, true, PagesEntrySourceGenerator.#scriptKind(moduleAbsPath));
       return PagesEntrySourceGenerator.#sourceFileHasAsyncDefaultExport(sourceFile2);
     } catch {
       return false;
@@ -8537,31 +8721,31 @@ ${entries.join(`
     const asyncBindings = new Map;
     let defaultIdentifier = null;
     for (const statement of sourceFile2.statements) {
-      if (ts5.isFunctionDeclaration(statement)) {
-        if (PagesEntrySourceGenerator.#hasModifier(statement, ts5.SyntaxKind.DefaultKeyword)) {
-          return PagesEntrySourceGenerator.#hasModifier(statement, ts5.SyntaxKind.AsyncKeyword);
+      if (ts6.isFunctionDeclaration(statement)) {
+        if (PagesEntrySourceGenerator.#hasModifier(statement, ts6.SyntaxKind.DefaultKeyword)) {
+          return PagesEntrySourceGenerator.#hasModifier(statement, ts6.SyntaxKind.AsyncKeyword);
         }
         if (statement.name) {
-          asyncBindings.set(statement.name.text, PagesEntrySourceGenerator.#hasModifier(statement, ts5.SyntaxKind.AsyncKeyword));
+          asyncBindings.set(statement.name.text, PagesEntrySourceGenerator.#hasModifier(statement, ts6.SyntaxKind.AsyncKeyword));
         }
         continue;
       }
-      if (ts5.isVariableStatement(statement)) {
+      if (ts6.isVariableStatement(statement)) {
         for (const declaration of statement.declarationList.declarations) {
-          if (!ts5.isIdentifier(declaration.name))
+          if (!ts6.isIdentifier(declaration.name))
             continue;
           asyncBindings.set(declaration.name.text, PagesEntrySourceGenerator.#isAsyncFunctionExpression(declaration.initializer));
         }
         continue;
       }
-      if (ts5.isExportAssignment(statement)) {
+      if (ts6.isExportAssignment(statement)) {
         if (PagesEntrySourceGenerator.#isAsyncFunctionExpression(statement.expression))
           return true;
-        if (ts5.isIdentifier(statement.expression))
+        if (ts6.isIdentifier(statement.expression))
           defaultIdentifier = statement.expression.text;
         continue;
       }
-      if (ts5.isExportDeclaration(statement) && statement.exportClause && ts5.isNamedExports(statement.exportClause)) {
+      if (ts6.isExportDeclaration(statement) && statement.exportClause && ts6.isNamedExports(statement.exportClause)) {
         const exportClause = statement.exportClause;
         for (const specifier of exportClause.elements) {
           if (specifier.name.text !== "default")
@@ -8573,13 +8757,13 @@ ${entries.join(`
     return defaultIdentifier ? asyncBindings.get(defaultIdentifier) === true : false;
   }
   static #hasModifier(node, kind) {
-    return ts5.canHaveModifiers(node) && (ts5.getModifiers(node)?.some((modifier) => modifier.kind === kind) ?? false);
+    return ts6.canHaveModifiers(node) && (ts6.getModifiers(node)?.some((modifier) => modifier.kind === kind) ?? false);
   }
   static #isAsyncFunctionExpression(node) {
-    return Boolean(node && (ts5.isArrowFunction(node) || ts5.isFunctionExpression(node)) && PagesEntrySourceGenerator.#hasModifier(node, ts5.SyntaxKind.AsyncKeyword));
+    return Boolean(node && (ts6.isArrowFunction(node) || ts6.isFunctionExpression(node)) && PagesEntrySourceGenerator.#hasModifier(node, ts6.SyntaxKind.AsyncKeyword));
   }
   static #scriptKind(moduleAbsPath) {
-    return moduleAbsPath.endsWith(".tsx") || moduleAbsPath.endsWith(".jsx") ? ts5.ScriptKind.TSX : ts5.ScriptKind.TS;
+    return moduleAbsPath.endsWith(".tsx") || moduleAbsPath.endsWith(".jsx") ? ts6.ScriptKind.TSX : ts6.ScriptKind.TS;
   }
 }
 
@@ -9498,7 +9682,7 @@ import {
 } from "fontaine";
 import { createFont, woff2 } from "fonteditor-core";
 import subsetFont from "subset-font";
-import ts6 from "typescript";
+import ts7 from "typescript";
 var FONT_URL_PREFIX = "/_akan/fonts";
 var DEFAULT_FONT_SUBSETS = ["latin"];
 
@@ -9563,17 +9747,17 @@ class FontOptimizer {
       this.#cssParts.push(...faceCss, this.#buildRootVariableRule(font));
   }
   #extractFontsExport(source2, filePath) {
-    const sourceFile2 = ts6.createSourceFile(filePath, source2, ts6.ScriptTarget.Latest, true, ts6.ScriptKind.TSX);
+    const sourceFile2 = ts7.createSourceFile(filePath, source2, ts7.ScriptTarget.Latest, true, ts7.ScriptKind.TSX);
     const fonts = [];
     for (const statement of sourceFile2.statements) {
-      if (!ts6.isVariableStatement(statement))
+      if (!ts7.isVariableStatement(statement))
         continue;
-      const modifiers = ts6.canHaveModifiers(statement) ? ts6.getModifiers(statement) : undefined;
-      const isExported = modifiers?.some((modifier) => modifier.kind === ts6.SyntaxKind.ExportKeyword) ?? false;
+      const modifiers = ts7.canHaveModifiers(statement) ? ts7.getModifiers(statement) : undefined;
+      const isExported = modifiers?.some((modifier) => modifier.kind === ts7.SyntaxKind.ExportKeyword) ?? false;
       if (!isExported)
         continue;
       for (const declaration of statement.declarationList.declarations) {
-        if (!ts6.isIdentifier(declaration.name) || declaration.name.text !== "fonts")
+        if (!ts7.isIdentifier(declaration.name) || declaration.name.text !== "fonts")
           continue;
         const value = declaration.initializer ? this.#literalToValue(declaration.initializer) : null;
         if (Array.isArray(value)) {
@@ -9584,20 +9768,20 @@ class FontOptimizer {
     return fonts;
   }
   #literalToValue(node) {
-    if (ts6.isStringLiteralLike(node))
+    if (ts7.isStringLiteralLike(node))
       return node.text;
-    if (ts6.isNumericLiteral(node))
+    if (ts7.isNumericLiteral(node))
       return Number(node.text);
-    if (node.kind === ts6.SyntaxKind.TrueKeyword)
+    if (node.kind === ts7.SyntaxKind.TrueKeyword)
       return true;
-    if (node.kind === ts6.SyntaxKind.FalseKeyword)
+    if (node.kind === ts7.SyntaxKind.FalseKeyword)
       return false;
-    if (ts6.isArrayLiteralExpression(node))
+    if (ts7.isArrayLiteralExpression(node))
       return node.elements.map((element) => this.#literalToValue(element));
-    if (ts6.isObjectLiteralExpression(node)) {
+    if (ts7.isObjectLiteralExpression(node)) {
       const obj = {};
       for (const prop of node.properties) {
-        if (!ts6.isPropertyAssignment(prop))
+        if (!ts7.isPropertyAssignment(prop))
           continue;
         const name = this.#getPropertyName(prop.name);
         if (!name)
@@ -9606,13 +9790,13 @@ class FontOptimizer {
       }
       return obj;
     }
-    if (ts6.isAsExpression(node) || ts6.isSatisfiesExpression(node) || ts6.isParenthesizedExpression(node)) {
+    if (ts7.isAsExpression(node) || ts7.isSatisfiesExpression(node) || ts7.isParenthesizedExpression(node)) {
       return this.#literalToValue(node.expression);
     }
     return;
   }
   #getPropertyName(name) {
-    if (ts6.isIdentifier(name) || ts6.isStringLiteral(name) || ts6.isNumericLiteral(name))
+    if (ts7.isIdentifier(name) || ts7.isStringLiteral(name) || ts7.isNumericLiteral(name))
       return name.text;
     return null;
   }
@@ -13087,7 +13271,7 @@ import { capitalize as capitalize8 } from "akanjs/common";
 // pkgs/@akanjs/devkit/getRelatedCnsts.ts
 import { readFileSync as readFileSync4, realpathSync } from "fs";
 import ora2 from "ora";
-import * as ts7 from "typescript";
+import * as ts8 from "typescript";
 var tsTranspiler = new Bun.Transpiler({ loader: "ts" });
 var tsxTranspiler = new Bun.Transpiler({ loader: "tsx" });
 var getTranspiler = (filePath) => filePath.endsWith(".tsx") ? tsxTranspiler : tsTranspiler;
@@ -13120,10 +13304,10 @@ var scanModuleSpecifiers = (source2, filePath, includeExports) => {
   return importSpecifiers;
 };
 var parseTsConfig = (tsConfigPath = "./tsconfig.json") => {
-  const configFile = ts7.readConfigFile(tsConfigPath, (path40) => {
-    return ts7.sys.readFile(path40);
+  const configFile = ts8.readConfigFile(tsConfigPath, (path40) => {
+    return ts8.sys.readFile(path40);
   });
-  return ts7.parseJsonConfigFileContent(configFile.config, ts7.sys, realpathSync(tsConfigPath).replace(/[^/\\]+$/, ""));
+  return ts8.parseJsonConfigFileContent(configFile.config, ts8.sys, realpathSync(tsConfigPath).replace(/[^/\\]+$/, ""));
 };
 var collectImportedFiles = (constantFilePath, parsedConfig) => {
   const allFilesToAnalyze = new Set([constantFilePath]);
@@ -13138,7 +13322,7 @@ var collectImportedFiles = (constantFilePath, parsedConfig) => {
     for (const importPath of scanModuleSpecifiers(source2, filePath, false)) {
       if (!importPath.startsWith("."))
         continue;
-      const resolved = ts7.resolveModuleName(importPath, filePath, parsedConfig.options, ts7.sys).resolvedModule?.resolvedFileName;
+      const resolved = ts8.resolveModuleName(importPath, filePath, parsedConfig.options, ts8.sys).resolvedModule?.resolvedFileName;
       if (resolved && !allFilesToAnalyze.has(resolved)) {
         allFilesToAnalyze.add(resolved);
         collectImported(resolved);
@@ -13155,7 +13339,7 @@ var collectImportedFiles = (constantFilePath, parsedConfig) => {
 var createTsProgram = (filePaths, options) => {
   const spinner = ora2("Creating TypeScript program for all files...");
   spinner.start();
-  const program2 = ts7.createProgram(Array.from(filePaths), options);
+  const program2 = ts8.createProgram(Array.from(filePaths), options);
   const checker = program2.getTypeChecker();
   spinner.succeed("TypeScript program created.");
   return {
@@ -13195,17 +13379,17 @@ var analyzeProperties = (filesToAnalyze, program2, checker) => {
     function visit(node) {
       if (!source2)
         return;
-      if (ts7.isPropertyAccessExpression(node)) {
+      if (ts8.isPropertyAccessExpression(node)) {
         const left = node.expression;
         const right = node.name;
-        const { line } = ts7.getLineAndCharacterOfPosition(source2, node.getStart());
-        if (ts7.isIdentifier(left) && sourceLines && sourceLines.length > line && sourceLines[line] && (sourceLines[line]?.includes(`@Field.Prop(() => ${left.text}.${right.text}`) || sourceLines[line].includes(`base.Filter(${left.text}.${right.text},`))) {
+        const { line } = ts8.getLineAndCharacterOfPosition(source2, node.getStart());
+        if (ts8.isIdentifier(left) && sourceLines && sourceLines.length > line && sourceLines[line] && (sourceLines[line]?.includes(`@Field.Prop(() => ${left.text}.${right.text}`) || sourceLines[line].includes(`base.Filter(${left.text}.${right.text},`))) {
           const symbol = getCachedSymbol(right);
           if (symbol?.declarations && symbol.declarations.length > 0) {
             const key = symbol.declarations[0]?.getSourceFile().fileName.split("/").pop()?.split(".")[0] ?? "";
             const property = propertyMap.get(key);
             const isScalar = symbol.declarations[0]?.getSourceFile().fileName.includes("_") ?? false;
-            const symbolFilePath = symbol.declarations[0]?.getSourceFile().fileName.replace(`${ts7.sys.getCurrentDirectory()}/`, "");
+            const symbolFilePath = symbol.declarations[0]?.getSourceFile().fileName.replace(`${ts8.sys.getCurrentDirectory()}/`, "");
             if (!symbolFilePath)
               throw new Error(`No symbol file path found for ${left.text}.${right.text}`);
             if (property) {
@@ -13229,10 +13413,10 @@ var analyzeProperties = (filesToAnalyze, program2, checker) => {
             }
           }
         }
-      } else if (ts7.isImportDeclaration(node) && ts7.isStringLiteral(node.moduleSpecifier)) {
+      } else if (ts8.isImportDeclaration(node) && ts8.isStringLiteral(node.moduleSpecifier)) {
         const importPath = node.moduleSpecifier.text;
         if (importPath.startsWith(".")) {
-          const resolved = ts7.resolveModuleName(importPath, filePath, program2.getCompilerOptions(), ts7.sys).resolvedModule?.resolvedFileName;
+          const resolved = ts8.resolveModuleName(importPath, filePath, program2.getCompilerOptions(), ts8.sys).resolvedModule?.resolvedFileName;
           const moduleName = importPath.split("/").pop()?.split(".")[0] ?? "";
           const property = propertyMap.get(moduleName);
           const isScalar = importPath.includes("_");
@@ -13247,7 +13431,7 @@ var analyzeProperties = (filesToAnalyze, program2, checker) => {
           }
         }
       }
-      ts7.forEachChild(node, visit);
+      ts8.forEachChild(node, visit);
     }
     visit(source2);
   }
@@ -15813,6 +15997,7 @@ class PrimitiveScript extends script("primitive", [ModuleScript]) {
     }
     let constantContent = await sys3.readFile(constantPath);
     let dictionaryContent = await sys3.readFile(dictionaryPath);
+    const fieldBuilderName = viaBuilderParameterName(constantContent, inputClassName) ?? "field";
     if (new RegExp(`\\b${input7.field}\\s*:`).test(constantContent)) {
       diagnostics.push({
         severity: "error",
@@ -15850,7 +16035,7 @@ class PrimitiveScript extends script("primitive", [ModuleScript]) {
       if (defaultCoercion.diagnostic)
         diagnostics.push(defaultCoercion.diagnostic);
     }
-    const nextConstantContent = insertIntoObject(constantContent, inputClassName, `${input7.field}: ${fieldExpression(input7.type, input7.defaultValue, { enumValues })},`);
+    const nextConstantContent = insertIntoObject(constantContent, inputClassName, `${input7.field}: ${fieldExpression(input7.type, input7.defaultValue, { enumValues, builderName: fieldBuilderName })},`);
     const nextConstantContentWithLight = nextConstantContent && input7.includeInLight ? insertLightProjectionField(nextConstantContent, moduleClassName, input7.field) : nextConstantContent;
     const nextDictionaryContent = insertDictionaryModelField(dictionaryContent, moduleClassName, input7.field);
     if (nextConstantContentWithLight && (input7.type === "Int" || input7.type === "Float") && new RegExp(`\\b${input7.field}\\s*:\\s*field\\(${input7.type}, \\{ default: "`, "m").test(nextConstantContentWithLight)) {
@@ -17088,7 +17273,7 @@ class WorkflowRunner extends runner("workflow") {
       ], plan2);
       return await renderApplyReport(report);
     }
-    return await renderApplyReport(await new WorkflowExecutor(registry).apply(plan2));
+    return await renderApplyReport(await new WorkflowExecutor(registry, workspace).apply(plan2));
   }
   async validate(runIdOrPlan, {
     format = "markdown",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "2.3.9-rc.5",
+  "version": "2.3.9-rc.7",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -34,7 +34,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.3.9-rc.5",
+    "akanjs": "2.3.9-rc.7",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "5.5.23",

package/templates/module/__model__.constant.ts

@@ -9,7 +9,7 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dic
   return `
 import { via } from "akanjs/constant";
 
-export class ${dict.Model}Input extends via((_field) => ({
+export class ${dict.Model}Input extends via((field) => ({
 })) {}
 
 export class ${dict.Model}Object extends via(${dict.Model}Input, (field) => ({})) {}