@akanjs/cli 3.0.0-alpha.99 → 3.0.0-beta.1

package/guidelines/workspaceRecipes/workspaceRecipes.instruction.md

@@ -186,11 +186,11 @@ export class TaskFilter extends from(cnst.Task, (filter) => ({
   })),
 }))
 
-// 4. In page — Init the slice in an async Page and hand the init to a Zone.
-export default async function Page() {
+// 4. In page — init the slice inside the page chain's render and hand the init to a Zone.
+export default page().render(async () => {
   const [{ taskInitInTodo }] = await Promise.all([fetch.initTaskInTodo()]);
   return <Task.Zone.Card init={taskInitInTodo} sliceName="taskInTodo" />;
-}
+});
 ```
 
 The slice name in code uses camelCase (`inTodo`). In dictionary and components it becomes `"taskInTodo"`.
@@ -328,6 +328,71 @@ export const Insight = ({ sliceName }: { sliceName: string }) => {
 
 ---
 
+### Recipe 7: Migrating `page/` to the Route Chain
+
+A route file used to be a default function beside named exports (`pageConfig`, `head`, `generateHead`, `Loading`,
+`fonts`, …). It is now one chain, and the chain is also what publishes a screen to agents. The legacy shape still
+loads and logs one warning per file at boot (`… uses the legacy route shape …`); migrate file by file, then run
+`bun run akan typecheck <app>` and `bun run akan lint <app>`.
+
+```tsx
+// before — page/(user)/project/[projectId]/_index.tsx
+import { fetch, usePage } from "@apps/<app>/client";
+import type { PageConfig } from "akanjs/client";
+
+interface PageProps {
+  params: { projectId: string };
+  searchParams: { tab?: string };
+}
+export function generateHead({ params }: PageProps) {
+  return <title>{params.projectId}</title>;
+}
+export default async function Page({ params: { projectId }, searchParams }: PageProps) {
+  const { l } = usePage();
+  const { project } = await fetch.viewProject(projectId);
+  return <Project.Zone.View view={project} tab={searchParams.tab} />;
+}
+export const pageConfig = { transition: "stack" } satisfies PageConfig;
+
+// after
+import { fetch, usePage } from "@apps/<app>/client";
+import { ID } from "akanjs/base";
+import { page } from "akanjs/client";
+
+export default page()
+  .param("projectId", ID, { desc: "The project to show." })
+  .search("tab", String)
+  .config({ transition: "stack" })
+  .head(({ projectId }) => <title>{projectId}</title>)
+  .prompt("briefProject", "Brief one project: its status and what is due.")
+  .render(async ({ projectId, tab }) => {
+    const { l } = usePage();
+    const { project } = await fetch.viewProject(projectId);
+    return <Project.Zone.View view={project} tab={tab} />;
+  });
+```
+
+| Legacy export | Chain stage |
+|---|---|
+| `interface PageProps { params }` + `[x]` folder | `.param("x", ID \| String \| Int \| …)` — one per `[x]` segment, every one of them, in path order |
+| `searchParams.k` | `.search("k", Type)`; `[Type]` for a repeated key; the value arrives typed and optional |
+| `params.lang` | `lang` — on every route's `.render()`, `.head()`, `.metadata()` and `.loading()` with no stage; `.param("lang")` is refused |
+| `export const pageConfig = {…}` | `.config({…})` — `devOnly` stays a literal |
+| `export const head = <…/>` / `generateHead({ params })` | `.head(<…/>)` / `.head(({ x }) => <…/>)` |
+| `export const metadata` / `generateMetadata` | `.metadata({…})` / `.metadata((args) => …)` |
+| `export function Loading()` | `.loading((args) => …)` |
+| `export default async function Page({ params, searchParams })` | `.render(async ({ x, k }) => { …same body… })` — `async` only if it awaits |
+| `_layout.tsx`: `export default function Layout({ children })` | `layout().render(({ children }) => …)` |
+| `export function NotFound` / `export function Error` | `.notFound(fn)` / `.error(fn)` on `layout()` |
+| root `_layout.tsx`: `fonts`, `theme`, `manifest`, `reconnect`, `wsConnect`, `layoutStyle`, `gaTrackingId` | `rootLayout().fonts([…]).theme("dark").manifest({…}).reconnect(false).wsConnect(false).layoutStyle("web").gaTrackingId("G-…")` |
+| `prompt()` on `endpoint()` (removed) | `.prompt(name, description)` on the page that shows the same screen |
+
+Rules the loader and `akan sync` enforce: a chain module has no other export; `page()` belongs in a page file and
+`layout()` / `rootLayout()` in a `_layout.tsx`; a page names every `[x]` of its path, a layout may name a subset;
+`.param()` and `.prompt()` names are string literals; `import "./styles.css"` stays the first line of a root layout;
+`_overrides.tsx` is untouched. MCP: `prompts/get` now runs the page's body under the caller's token and hands the
+model the description, what the page fetched, and the tools of those modules — see `mcpRule`.
+
 ### Data Flow Summary
 
 For each business question, follow this chain:

package/incrementalBuilder.proc.js

@@ -3,7 +3,7 @@ import {
   CodegenLock,
   WorkspaceExecutor,
   AppExecutor
-} from "./index-qsq3q8fy.js";
+} from "./index-2tv3fdx4.js";
 import"./index-q0y2jq9j.js";
 import"./index-6wwzs1bc.js";
 import {

package/{index-gq44bqjt.js → index-259dsnz3.js}

@@ -2,10 +2,10 @@
 import {
   runner,
   script
-} from "./index-znynzt5w.js";
+} from "./index-mak3cd28.js";
 import {
   LibExecutor
-} from "./index-qsq3q8fy.js";
+} from "./index-2tv3fdx4.js";
 import {
   LibSource,
   formatLibStatuses

package/{index-b9rkcrx8.js → index-2hq52jq3.js}

@@ -4,17 +4,17 @@ import {
   GlobalConfig,
   CloudApi,
   AiSession
-} from "./index-c69j78kk.js";
+} from "./index-kn1h7p1x.js";
 import {
   WorkspaceExecutor,
   AppExecutor
-} from "./index-qsq3q8fy.js";
+} from "./index-2tv3fdx4.js";
 import {
   runner
-} from "./index-znynzt5w.js";
+} from "./index-mak3cd28.js";
 import {
   openBrowser
-} from "./index-5wd728df.js";
+} from "./index-v0qh106m.js";
 
 // pkgs/@akanjs/cli/npmRegistry.ts
 var defaultNpmRegistry = "https://registry.npmjs.org";
@@ -283,9 +283,11 @@ ${chalk.green("\u27A4")} Authentication Required`));
         return;
       }
     }
-    Logger.info("Logging in to npm...");
-    await workspace.spawn("npm", ["login"], { stdio: "inherit" });
-    Logger.info("Logged in to npm");
+    if (!registry) {
+      Logger.info("Logging in to npm...");
+      await workspace.spawn("npm", ["login"], { stdio: "inherit" });
+      Logger.info("Logged in to npm");
+    }
     for (const library of akanPkgs) {
       Logger.info(`Publishing ${library}@${nextVersion} to ${registry ?? "npm"}...`);
       await workspace.spawn("npm", ["publish", "--tag", tag, ...this.#getRegistryArgs(registry), ...this.#getLocalRegistryAuthArgs(registry)], {

package/{index-qsq3q8fy.js → index-2tv3fdx4.js}

@@ -947,6 +947,8 @@ class AsyncDefaultExportDetector {
       if (ts.isExportAssignment(statement)) {
         if (this.#isAsyncFunctionExpression(statement.expression))
           return true;
+        if (ts.isCallExpression(statement.expression))
+          return true;
         if (ts.isIdentifier(statement.expression))
           defaultIdentifier = statement.expression.text;
         continue;
@@ -1096,13 +1098,18 @@ async function writeGeneratedRootLayoutFile(opts) {
 void st;
 ` : `import "@apps/${opts.appName}/client";
 `;
-  const inheritedImport = inheritedSourceSpecifier ? `import * as inheritedLayout from ${JSON.stringify(inheritedSourceSpecifier)};
-` : `const inheritedLayout = {};
+  const inheritedLabel = inheritedSourceAbsPath ? path4.relative(opts.appCwdPath, inheritedSourceAbsPath) : "";
+  const inheritedImport = inheritedSourceSpecifier ? `import * as inheritedModule from ${JSON.stringify(inheritedSourceSpecifier)};
+const inheritedLayout = resolveRouteModule(inheritedModule as never, ${JSON.stringify(inheritedLabel)}).module as LayoutModule;
+` : `const inheritedLayout: LayoutModule = {};
 `;
   const prefix = routePrefixForSegments(opts.boundary.segments);
-  const userImport = sourceSpecifier ? `import UserLayout, * as userLayout from ${JSON.stringify(sourceSpecifier)};
-` : `const UserLayout = ({ children }) => children;
-const userLayout = {};
+  const userLabel = opts.boundary.sourceAbsPath ? path4.relative(opts.appCwdPath, opts.boundary.sourceAbsPath) : "";
+  const userImport = sourceSpecifier ? `import * as userModule from ${JSON.stringify(sourceSpecifier)};
+const userLayout = resolveRouteModule(userModule as never, ${JSON.stringify(userLabel)}).module as LayoutModule;
+const UserLayout = userLayout.default as (props: LayoutProps) => ReactNode | Promise<ReactNode>;
+` : `const UserLayout = ({ children }: LayoutProps) => children;
+const userLayout: LayoutModule = {};
 `;
   const isAsyncUserLayout = opts.boundary.sourceAbsPath ? await AsyncDefaultExportDetector.detect(opts.boundary.sourceAbsPath) : false;
   const userLayoutElement = "<UserLayout params={params} searchParams={searchParams}>{children}</UserLayout>";
@@ -1114,8 +1121,9 @@ const userLayout = {};
 ` : "";
   const layoutChild = isAsyncUserLayout ? "{layout}" : userLayoutElement;
   const layoutReturn = isAsyncUserLayout ? "layout" : userLayoutElement;
-  const source = opts.includeSystemProvider ? `import type { LayoutProps, PageProps } from "akanjs/client";
-import { loadFonts } from "akanjs/client";
+  const source = opts.includeSystemProvider ? `import type { LayoutModule, LayoutProps, PageProps } from "akanjs/client";
+import { loadFonts, resolveRouteModule } from "akanjs/client";
+import type { ReactNode } from "react";
 import { System } from "akanjs/ui";
 import { env } from "@apps/${opts.appName}/env/env.client";
 import { allDictionary } from ${JSON.stringify(dictMacroSpecifier)};
@@ -1166,7 +1174,9 @@ ${layoutBinding}  return (
     </System.Provider>
   );
 }
-` : `import type { LayoutProps, PageProps } from "akanjs/client";
+` : `import type { LayoutModule, LayoutProps, PageProps } from "akanjs/client";
+import { resolveRouteModule } from "akanjs/client";
+import type { ReactNode } from "react";
 ${inheritedImport}${userImport}
 export async function generateHead(props: PageProps) {
   if (userLayout.generateHead) return userLayout.generateHead(props);
@@ -3245,7 +3255,7 @@ class SysExecutor extends Executor {
 class AppExecutor extends SysExecutor {
   static #routeSourceValidator = null;
   static async#getRouteSourceValidator() {
-    AppExecutor.#routeSourceValidator ??= (await import("./routeSourceValidator-ze6x894c.js")).RouteSourceValidator;
+    AppExecutor.#routeSourceValidator ??= (await import("./routeSourceValidator-apyqw7wk.js")).RouteSourceValidator;
     return AppExecutor.#routeSourceValidator;
   }
   dist;
@@ -3419,7 +3429,8 @@ class AppExecutor extends SysExecutor {
           validator.validateOverridesSourceExports(routeSource, absPath);
         else {
           const info = validator.validateRouteSourceExports(routeSource, absPath, parsed.kind, {
-            rootLayout: isRootLayout
+            rootLayout: isRootLayout,
+            pattern: parsed.pattern
           });
           if (info.devOnly) {
             devOnlyKeys.add(key);

package/{index-qkk27bk6.js → index-4edzf1gr.js}

@@ -1,12 +1,12 @@
 // @bun
 import {
   script
-} from "./index-znynzt5w.js";
+} from "./index-mak3cd28.js";
 import {
   AppExecutor,
   LibExecutor,
   ModuleExecutor
-} from "./index-qsq3q8fy.js";
+} from "./index-2tv3fdx4.js";
 import {
   compactDiagnostics,
   createPrimitiveWriteReport,
@@ -39,10 +39,10 @@ import {
   hasSignalFactoryEntry,
   insertSignalFactoryEntry,
   addFieldUiPolicyForType
-} from "./index-fc1bh0a7.js";
+} from "./index-gyd220p2.js";
 import {
   ModuleScript
-} from "./index-zmjppp25.js";
+} from "./index-8pm30m73.js";
 
 // pkgs/@akanjs/cli/primitive/primitive.script.ts
 import { capitalize } from "akanjs/common";

package/{index-yza7zkpt.js → index-600zhnve.js}

@@ -1,14 +1,14 @@
 // @bun
 import {
   AppExecutor
-} from "./index-qsq3q8fy.js";
+} from "./index-2tv3fdx4.js";
 import {
   jsonText,
   createWorkflowBaselineSummary,
   buildAkanModuleContextIndex,
   createWorkflowStepRegistry,
   toolingRolloutGate
-} from "./index-fc1bh0a7.js";
+} from "./index-gyd220p2.js";
 import {
   buildResourceList,
   codexMcpConfigPath,
@@ -19,33 +19,33 @@ import {
   upsertCodexMcpServerBlock,
   renderDoctorText,
   AkanContextAnalyzer
-} from "./index-gtmz74tj.js";
+} from "./index-ktb5njgy.js";
 import {
   CommandContainer,
   runner,
   script
-} from "./index-znynzt5w.js";
+} from "./index-mak3cd28.js";
 import {
   isPlaceholderAppId2
-} from "./index-1yxtbmbj.js";
+} from "./index-wt7qrtd4.js";
 import {
   Prompter
 } from "./index-h7yw2z9n.js";
 import {
   RepairRunner
-} from "./index-0amdxycf.js";
+} from "./index-fz5q3gd7.js";
 import {
   WorkflowRunner
-} from "./index-srdssqj7.js";
+} from "./index-7737gxcp.js";
 import {
   ModuleScript
-} from "./index-zmjppp25.js";
+} from "./index-8pm30m73.js";
 import {
   PrimitiveScript
-} from "./index-qkk27bk6.js";
+} from "./index-4edzf1gr.js";
 import {
   ScalarScript
-} from "./index-8p8p0cf8.js";
+} from "./index-rwg2aa4f.js";
 import {
   getMobileTargets
 } from "./index-47pj3aee.js";

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

@@ -20,13 +20,13 @@ import {
   renderWorkflowApply,
   renderWorkflowValidation,
   renderWorkflowRunArtifact
-} from "./index-fc1bh0a7.js";
+} from "./index-gyd220p2.js";
 import {
   AkanContextAnalyzer
-} from "./index-gtmz74tj.js";
+} from "./index-ktb5njgy.js";
 import {
   runner
-} from "./index-znynzt5w.js";
+} from "./index-mak3cd28.js";
 
 // pkgs/@akanjs/cli/workflow/workflow.runner.ts
 import { mkdir, readFile, writeFile } from "fs/promises";

package/{index-zmjppp25.js → index-8pm30m73.js}

@@ -4,14 +4,14 @@ import {
 } from "./index-q0y2jq9j.js";
 import {
   AiSession
-} from "./index-c69j78kk.js";
+} from "./index-kn1h7p1x.js";
 import {
   ModuleExecutor
-} from "./index-qsq3q8fy.js";
+} from "./index-2tv3fdx4.js";
 import {
   runner,
   script
-} from "./index-znynzt5w.js";
+} from "./index-mak3cd28.js";
 import {
   sourceFile,
   moduleSourcePaths,
@@ -19,10 +19,10 @@ import {
   createPassedPrimitiveReport,
   bilingualLabelForField,
   bilingualDescriptionForField
-} from "./index-fc1bh0a7.js";
+} from "./index-gyd220p2.js";
 import {
   PageScript
-} from "./index-hyywke0f.js";
+} from "./index-pnqbkf5p.js";
 import {
   Prompter
 } from "./index-h7yw2z9n.js";

package/{index-p5neav9b.js → index-a64esmtb.js}

@@ -2,7 +2,7 @@
 import {
   AsyncDefaultExportDetector,
   resolveSsrPageEntriesForApp
-} from "./index-qsq3q8fy.js";
+} from "./index-2tv3fdx4.js";
 import {
   BarrelAnalyzer,
   createBarrelImportsPlugin,
@@ -1490,24 +1490,69 @@ class FontOptimizer {
   }
   #extractFontsExport(source, filePath) {
     const sourceFile = ts.createSourceFile(filePath, source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX);
-    const fonts = [];
+    const declaration = this.#findFontsDeclaration(sourceFile);
+    if (!declaration)
+      return [];
+    const value = this.#literalToValue(declaration);
+    const entries = Array.isArray(value) ? value : [];
+    const fonts = entries.filter((entry) => this.#isReadableFont(entry));
+    if (fonts.length !== entries.length || !Array.isArray(value))
+      this.#app.logger.warn(`[font] ${path10.relative(this.#app.cwdPath, filePath)} declares fonts the build cannot read without evaluating the module \u2014 write the list inline, or nothing is subset for it and every /_akan/fonts request 404s`);
+    return fonts.map((font) => this.#withFontDefaults(font));
+  }
+  #isReadableFont(value) {
+    if (!value || typeof value !== "object")
+      return false;
+    const font = value;
+    return typeof font.name === "string" && Array.isArray(font.paths);
+  }
+  #findFontsDeclaration(sourceFile) {
     for (const statement of sourceFile.statements) {
+      if (ts.isExportAssignment(statement)) {
+        if (statement.isExportEquals)
+          continue;
+        const stage = this.#findChainStageArgument(statement.expression, "fonts");
+        if (stage)
+          return stage;
+        continue;
+      }
       if (!ts.isVariableStatement(statement))
         continue;
       const modifiers = ts.canHaveModifiers(statement) ? ts.getModifiers(statement) : undefined;
-      const isExported = modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword) ?? false;
-      if (!isExported)
+      if (!modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword))
         continue;
       for (const declaration of statement.declarationList.declarations) {
         if (!ts.isIdentifier(declaration.name) || declaration.name.text !== "fonts")
           continue;
-        const value = declaration.initializer ? this.#literalToValue(declaration.initializer) : null;
-        if (Array.isArray(value)) {
-          fonts.push(...value.map((font) => this.#withFontDefaults(font)));
-        }
+        if (declaration.initializer)
+          return declaration.initializer;
       }
     }
-    return fonts;
+    return null;
+  }
+  #findChainStageArgument(expression, stageName) {
+    let node = this.#unwrapExpression(expression);
+    let argument = null;
+    while (node && ts.isCallExpression(node)) {
+      const callee = this.#unwrapExpression(node.expression);
+      if (!callee)
+        return null;
+      if (ts.isIdentifier(callee))
+        return callee.text === "rootLayout" ? argument : null;
+      if (!ts.isPropertyAccessExpression(callee))
+        return null;
+      if (callee.name.text === stageName)
+        argument ??= node.arguments[0] ?? null;
+      node = this.#unwrapExpression(callee.expression);
+    }
+    return null;
+  }
+  #unwrapExpression(expression) {
+    let current = expression;
+    while (current && (ts.isAsExpression(current) || ts.isSatisfiesExpression(current) || ts.isParenthesizedExpression(current))) {
+      current = current.expression;
+    }
+    return current;
   }
   #literalToValue(node) {
     if (ts.isStringLiteralLike(node))

package/{index-0amdxycf.js → index-fz5q3gd7.js}

@@ -5,13 +5,13 @@ import {
   writeGeneratedSyncState,
   createRepairReport,
   renderRepairReport
-} from "./index-fc1bh0a7.js";
+} from "./index-gyd220p2.js";
 import {
   AkanContextAnalyzer
-} from "./index-gtmz74tj.js";
+} from "./index-ktb5njgy.js";
 import {
   runner
-} from "./index-znynzt5w.js";
+} from "./index-mak3cd28.js";
 
 // pkgs/@akanjs/cli/repair/repair.runner.ts
 var commandForShell = (command) => command.startsWith("akan ") ? `bun run ${command}` : command;

package/{index-fc1bh0a7.js → index-gyd220p2.js}

@@ -2,7 +2,7 @@
 import {
   AppExecutor,
   LibExecutor
-} from "./index-qsq3q8fy.js";
+} from "./index-2tv3fdx4.js";
 
 // pkgs/@akanjs/devkit/workflow/utils.ts
 var jsonText = (value, { trailingNewline = true } = {}) => `${JSON.stringify(value, null, 2)}${trailingNewline ? `

package/{index-5svjba73.js → index-j9yhg404.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   AppInfo
-} from "./index-qsq3q8fy.js";
+} from "./index-2tv3fdx4.js";
 
 // pkgs/@akanjs/devkit/slicePlanner.ts
 class SlicePlanner {

package/{index-c69j78kk.js → index-kn1h7p1x.js}

@@ -4,7 +4,7 @@ import {
 } from "./index-q0y2jq9j.js";
 import {
   Spinner
-} from "./index-qsq3q8fy.js";
+} from "./index-2tv3fdx4.js";
 
 // pkgs/@akanjs/devkit/cloud/globalConfig.ts
 import { chmod, mkdir } from "fs/promises";

package/{index-gtmz74tj.js → index-ktb5njgy.js}

@@ -7,7 +7,7 @@ import {
   isScannedRootEntry,
   AppExecutor,
   LibExecutor
-} from "./index-qsq3q8fy.js";
+} from "./index-2tv3fdx4.js";
 import {
   FileSys
 } from "./index-q0y2jq9j.js";
@@ -19,7 +19,7 @@ import {
 import {
   workflowRunArtifactPath,
   workflowSyncDir
-} from "./index-fc1bh0a7.js";
+} from "./index-gyd220p2.js";
 
 // pkgs/@akanjs/devkit/akanContext.ts
 import { readdir } from "fs/promises";

package/{index-znynzt5w.js → index-mak3cd28.js}

@@ -9,7 +9,7 @@ import {
   LibExecutor,
   PkgExecutor,
   ModuleExecutor
-} from "./index-qsq3q8fy.js";
+} from "./index-2tv3fdx4.js";
 import {
   getDirname2
 } from "./index-6wwzs1bc.js";

package/{index-29sxqfaw.js → index-ne2qy0nk.js}

@@ -2,7 +2,7 @@
 import {
   runner,
   script
-} from "./index-znynzt5w.js";
+} from "./index-mak3cd28.js";
 import {
   AGENT_BLOCK_START,
   AGENT_BLOCK_END,
@@ -13,14 +13,14 @@ import {
   CLAUDE_COMMENT_RULE,
   AppExecutor,
   LibExecutor
-} from "./index-qsq3q8fy.js";
+} from "./index-2tv3fdx4.js";
 import {
   collectRecipeSources2,
   scanRecipes2
 } from "./index-by5gpp8x.js";
 import {
   AkanContextAnalyzer
-} from "./index-gtmz74tj.js";
+} from "./index-ktb5njgy.js";
 import {
   Prompter
 } from "./index-h7yw2z9n.js";

package/{index-hyywke0f.js → index-pnqbkf5p.js}

@@ -2,7 +2,7 @@
 import {
   runner,
   script
-} from "./index-znynzt5w.js";
+} from "./index-mak3cd28.js";
 
 // pkgs/@akanjs/cli/page/page.runner.ts
 class PageRunner extends runner("page") {

package/{index-8p8p0cf8.js → index-rwg2aa4f.js}

@@ -2,15 +2,15 @@
 import {
   runner,
   script
-} from "./index-znynzt5w.js";
+} from "./index-mak3cd28.js";
 import {
   generatedFilesForSync,
   createPassedPrimitiveReport,
   scalarChangedFiles
-} from "./index-fc1bh0a7.js";
+} from "./index-gyd220p2.js";
 import {
   AiSession
-} from "./index-c69j78kk.js";
+} from "./index-kn1h7p1x.js";
 import {
   Prompter
 } from "./index-h7yw2z9n.js";