@akanjs/devkit 3.0.0-beta.17 → 3.0.0-beta.19

package/routeSourceValidator.ts

@@ -86,18 +86,6 @@ export class RouteSourceValidator {
     if (exported.has("head") && exported.has("generateHead")) {
       throw new Error(`[route-convention] head and generateHead cannot both be exported in ${filePath}`);
     }
-    if (
-      !options.rootLayout &&
-      (exported.has("head") || exported.has("generateHead")) &&
-      (exported.has("metadata") || exported.has("generateMetadata"))
-    ) {
-      throw new Error(
-        `[route-convention] head/generateHead and metadata/generateMetadata cannot both be exported in ${filePath}`,
-      );
-    }
-    if (exported.has("metadata") && exported.has("generateMetadata")) {
-      throw new Error(`[route-convention] metadata and generateMetadata cannot both be exported in ${filePath}`);
-    }
     const chain = RouteSourceValidator.#readChain(sourceFile, filePath);
     if (!chain) return { devOnly: RouteSourceValidator.#readDevOnly(sourceFile, filePath) };
     const named = [...exported].filter((name) => name !== "default");

package/scanInfo.ts

@@ -524,16 +524,19 @@ export class PkgInfo {
     const [tsconfig, rootPackageJson] = await Promise.all([exec.getTsConfig(), exec.workspace.getPackageJson()]);
     const scanner = await createDependencyScanner(exec);
     const npmSet = new Set(Object.keys({ ...rootPackageJson.dependencies, ...rootPackageJson.devDependencies }));
+    const workspacePathOf = (resolve: string) => resolve.replace(/^\.\//, "");
     const pkgPathSet = new Set(
       Object.keys(tsconfig.compilerOptions.paths ?? {})
-        .filter((path) => tsconfig.compilerOptions.paths?.[path]?.some((resolve) => resolve.startsWith("pkgs/")))
+        .filter((path) =>
+          tsconfig.compilerOptions.paths?.[path]?.some((resolve) => workspacePathOf(resolve).startsWith("pkgs/")),
+        )
         .map((path) => path.replace("/*", "")),
     );
     const [npmDepSet, pkgPathDepSet] = await scanner.getImportSets([npmSet, pkgPathSet]);
     const pkgDeps = [...pkgPathDepSet]
       .map((path) => {
         const pathSplitLength = path.split("/").length;
-        return (tsconfig.compilerOptions.paths?.[path]?.[0] ?? "*")
+        return workspacePathOf(tsconfig.compilerOptions.paths?.[path]?.[0] ?? "*")
           .split("/")
           .slice(1, 1 + pathSplitLength)
           .join("/");

package/subspace.test.ts

@@ -1,4 +1,4 @@
-import { afterEach, beforeEach, describe, expect, test } from "bun:test";
+import { afterEach, beforeEach, describe, expect, setDefaultTimeout, test } from "bun:test";
 import { mkdir, mkdtemp, readdir, rm, writeFile } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
@@ -7,6 +7,9 @@ import { FileSys } from "./fileSys";
 import { formatSubspaceDiff, formatSubspacePushResults, formatSubspaceStatuses, Subspace } from "./subspace";
 import { SubspaceConfig } from "./subspaceConfig";
 
+//? Each case drives several real git clones and pushes; on a 4-core Windows VM that alone lands at 2-5s.
+setDefaultTimeout(20_000);
+
 const tempRoots: string[] = [];
 const originalEnv = { ...process.env };
 
@@ -96,7 +99,7 @@ const makeMirror = async (servedApp: string, privateApp: string, libName: string
   await write(path.join(wsRoot, "benchmarks/bench.ts"), "export {};\n");
   await write(
     path.join(wsRoot, "akan.subspace.ts"),
-    `export default { pushableBranches: ["develop"], exclude: ["benchmarks"], subspaces: [{ name: "acme", repo: "${bareRoot}", apps: ["${servedApp}"] }] };\n`,
+    `export default { pushableBranches: ["develop"], exclude: ["benchmarks"], subspaces: [{ name: "acme", repo: ${JSON.stringify(bareRoot)}, apps: ["${servedApp}"] }] };\n`,
   );
 
   await makeSys(wsRoot, "apps", servedApp, {

package/subspace.ts

@@ -296,15 +296,25 @@ export class Subspace {
   /**
    * `git archive` emits exactly the tracked files at HEAD, which is why the copy needs no exclude list of
    * its own: generated barrels, the `(libs)`/`public/libs` symlinks, env values, secrets and the lockfile
-   * are all outside git and cannot enter the archive. Directory arguments only — a file list would put
-   * route paths like `page/(docs)/…` through a shell.
+   * are all outside git and cannot enter the archive. Spawned without a shell, whose quoting differs between
+   * `sh` and `cmd.exe`.
    */
   async #extract(paths: string[], excludes: string[] = []) {
-    const pathspec = paths.map((entry) => `'${entry}'`).join(" ");
-    const excludeArgs = excludes.map((entry) => `--exclude='${entry}'`).join(" ");
-    await this.#workspace.exec(
-      `git archive HEAD -- ${pathspec} | tar -x -C '${this.#clonePath}' ${excludeArgs}`.trim(),
-    );
+    // Relative, because GNU tar reads a drive-letter archive name (`C:\…`) as `host:path` on a remote host.
+    const archivePath = path.relative(this.#workspace.workspaceRoot, `${this.#clonePath}.tar`);
+    await this.#workspace.spawn("git", ["archive", "-o", archivePath, "HEAD", "--", ...paths]);
+    try {
+      await this.#workspace.spawn("tar", [
+        "-x",
+        "-f",
+        archivePath,
+        "-C",
+        this.#clonePath,
+        ...excludes.map((entry) => `--exclude=${entry}`),
+      ]);
+    } finally {
+      await rm(path.join(this.#workspace.workspaceRoot, archivePath), { force: true });
+    }
   }
 
   /**
@@ -399,7 +409,8 @@ export class Subspace {
     const gitignorePath = path.join(this.#clonePath, ".gitignore");
     if (!(await FileSys.fileExists(gitignorePath))) return;
     const [begin = "", end = ""] = Subspace.secretsMarkers;
-    const lines = (await FileSys.readText(gitignorePath)).split("\n");
+    // `git archive` checks text out as CRLF under Windows Git's default `core.autocrlf=true`.
+    const lines = (await FileSys.readText(gitignorePath)).split(/\r?\n/);
     const beginIdx = lines.indexOf(begin);
     const endIdx = lines.indexOf(end);
     const filtered =

package/workflow/executor.ts

@@ -1,3 +1,4 @@
+import { capitalize } from "akanjs/common";
 import ts from "typescript";
 import type { AkanModuleContext } from "../akanContext";
 import type { Sys, Workspace } from "../commandDecorators";
@@ -396,6 +397,54 @@ const addFieldUiSurfaceInspection = (plan: WorkflowPlan): WorkflowStepResult =>
   };
 };
 
+const addMutationActionSurfaceInspection = (plan: WorkflowPlan): WorkflowStepResult => {
+  const module = workflowStringInput(plan.inputs.module) ?? "<module>";
+  const mutation = workflowStringInput(plan.inputs.mutation) ?? "<mutation>";
+  const moduleClassName = moduleComponentName(module);
+  return {
+    recommendations: [
+      {
+        code: "add-mutation-action-surface-review",
+        kind: "manual-action",
+        target: `*/${moduleSourcePaths(module).store}`,
+        action: `Name the endpoint's guards and add its dictionary .endpoint() entry with a .desc(). After sync, fetch.${mutation} exists; write a store action only for a toast, an optimistic update, or a multi-field write, and put the control that calls it in ${moduleClassName}.Util.tsx.`,
+        confidence: "medium",
+        message: `Workflow apply does not write store or UI code for ${module}.${mutation}; review whether a screen should call it.`,
+      },
+    ],
+    nextActions: [
+      {
+        command: `akan workflow explain ${plan.workflow}`,
+        reason: "Review action surface guidance before manually editing store or UI files.",
+      },
+    ],
+  };
+};
+
+const addSliceViewSurfaceInspection = (plan: WorkflowPlan): WorkflowStepResult => {
+  const module = workflowStringInput(plan.inputs.module) ?? "<module>";
+  const slice = workflowStringInput(plan.inputs.slice) ?? "<slice>";
+  const moduleClassName = moduleComponentName(module);
+  return {
+    recommendations: [
+      {
+        code: "add-slice-view-surface-review",
+        kind: "manual-action",
+        target: `*/${moduleSourcePaths(module).zone}`,
+        action: `Fill in the service query stub and add the dictionary .slice() entry. After sync, load fetch.init${moduleClassName}${capitalize(slice)}() in the page and pass the result to a ${moduleClassName}.Zone as an init prop.`,
+        confidence: "medium",
+        message: `Workflow apply does not write page or Zone code for ${module}.${slice}; review where the list should render.`,
+      },
+    ],
+    nextActions: [
+      {
+        command: `akan workflow explain ${plan.workflow}`,
+        reason: "Review view surface guidance before manually editing Zone or page files.",
+      },
+    ],
+  };
+};
+
 export const createWorkflowStepRegistry = ({
   workspace,
   createModule,
@@ -494,6 +543,8 @@ export const createWorkflowStepRegistry = ({
         }),
       ),
     [workflowStepKey("add-mutation", "update-signal")]: inspect,
+    [workflowStepKey("add-mutation", "update-action-surfaces")]: async (_step, plan) =>
+      addMutationActionSurfaceInspection(plan),
     [workflowStepKey("add-slice", "update-service-query")]: async (_step, plan) =>
       primitiveReportToWorkflowStepResult(
         await addSlice({
@@ -503,6 +554,7 @@ export const createWorkflowStepRegistry = ({
         }),
       ),
     [workflowStepKey("add-slice", "update-signal-slice")]: inspect,
+    [workflowStepKey("add-slice", "connect-view-surfaces")]: async (_step, plan) => addSliceViewSurfaceInspection(plan),
   };
 };
 

package/workflow/rolloutGate.test.ts

@@ -24,7 +24,7 @@ const workspacePackageManifestPaths = async () => {
   for (const workspace of workspaces) {
     const glob = new Bun.Glob(`${workspace}/package.json`);
     for await (const relativePath of glob.scan({ cwd: workspaceRoot, onlyFiles: true })) {
-      paths.add(relativePath);
+      paths.add(relativePath.split(path.sep).join("/"));
     }
   }
   return [...paths].sort();

package/workflow/source.ts

@@ -160,21 +160,27 @@ export const normalizeFieldType = (typeName: string) => {
   return normalizedTypes[typeName.toLowerCase()] ?? typeName;
 };
 
-export const ensureBaseTypeImport = (content: string, typeName: string) => {
-  if (typeName !== "Int" && typeName !== "Float") return content;
-  const source = sourceFileFor("constant.ts", content);
-  const baseImport = findNamedImport(source, "akanjs/base");
-  if (baseImport) {
-    if (baseImport.names.includes(typeName)) return content;
-    const nextNames = [...baseImport.names, typeName].sort();
+export const ensureNamedImport = (content: string, moduleSpecifier: string, name: string) => {
+  const source = sourceFileFor("source.ts", content);
+  const namedImport = findNamedImport(source, moduleSpecifier);
+  if (namedImport) {
+    if (namedImport.names.includes(name)) return content;
+    const nextNames = [...namedImport.names, name].sort();
     return spliceText(
       content,
-      baseImport.namedBindingsStart,
-      baseImport.namedBindingsEnd,
+      namedImport.namedBindingsStart,
+      namedImport.namedBindingsEnd,
       `{ ${nextNames.join(", ")} }`,
     );
   }
-  return `import { ${typeName} } from "akanjs/base";\n${content}`;
+  return `import { ${name} } from "${moduleSpecifier}";\n${content}`;
+};
+
+export const ensureBaseImport = (content: string, name: string) => ensureNamedImport(content, "akanjs/base", name);
+
+export const ensureBaseTypeImport = (content: string, typeName: string) => {
+  if (typeName !== "Int" && typeName !== "Float") return content;
+  return ensureBaseImport(content, typeName);
 };
 
 export type FieldDefaultValue = string | number | boolean | null;
@@ -200,12 +206,12 @@ const booleanDefault = (rawDefault: FieldDefaultValue): string | null => {
 };
 
 const dateDefault = (rawDefault: FieldDefaultValue): string | null => {
-  if (typeof rawDefault === "number" && Number.isFinite(rawDefault)) return `new Date(${rawDefault})`;
+  if (typeof rawDefault === "number" && Number.isFinite(rawDefault)) return `() => dayjs(${rawDefault})`;
   if (typeof rawDefault !== "string") return null;
   const trimmed = rawDefault.trim();
   if (!trimmed) return null;
-  if (trimmed === "now") return "new Date()";
-  if (!Number.isNaN(Date.parse(trimmed))) return `new Date(${JSON.stringify(trimmed)})`;
+  if (trimmed === "now") return "() => dayjs()";
+  if (!Number.isNaN(Date.parse(trimmed))) return `() => dayjs(${JSON.stringify(trimmed)})`;
   return null;
 };
 

package/guideline.ts

@@ -1,19 +0,0 @@
-export interface GuideScan {
-  type: "example" | "source" | "usage" | (string & {});
-  description: string;
-  path: string;
-  filterText?: string;
-  sample?: number;
-}
-export interface GuideUpdate {
-  filePath: string;
-  contents: string[];
-  rules: string[];
-}
-export interface GuideGenerateJson {
-  title: string;
-  description: string;
-  scans: GuideScan[];
-  update: GuideUpdate;
-  page?: string;
-}