@akanjs/cli 3.0.0-alpha.4 → 3.0.0-alpha.40

package/{recipeScanner-tghkzrrt.js → recipeScanner-zrzev25x.js}

@@ -4,9 +4,9 @@ import {
   findInlineRecipeDuplicates,
   scanRecipes
 } from "./index-xys926f2.js";
-import"./index-r24hmh0q.js";
+import"./index-yb2wsc7f.js";
 export {
-  scanRecipes,
+  collectRecipeSources,
   findInlineRecipeDuplicates,
-  collectRecipeSources
+  scanRecipes
 };

package/{repair.command-nakkq2zp.js → repair.command-mzwtejpk.js}

@@ -1,19 +1,20 @@
 // @bun
 import {
   RepairRunner
-} from "./index-b978vs2e.js";
-import"./index-4yp06pn1.js";
-import"./index-4zgs8g1w.js";
+} from "./index-xyrb7pk5.js";
+import"./index-g9e2fhw2.js";
+import"./index-tsmjxph2.js";
 import {
   Workspace,
   command,
   script
-} from "./index-jk9q6pse.js";
-import"./index-jtm86byd.js";
-import"./index-6pz1j0zj.js";
+} from "./index-n706txcv.js";
+import"./index-8vkkm7v0.js";
+import"./index-mxvakhsm.js";
 import"./index-xys926f2.js";
+import"./index-1577bej2.js";
 import"./index-67546d0j.js";
-import"./index-r24hmh0q.js";
+import"./index-yb2wsc7f.js";
 
 // pkgs/@akanjs/cli/repair/repair.script.ts
 import { Logger } from "akanjs/common";

package/{routeSourceValidator-cncd92fv.js → routeSourceValidator-7fycdqyv.js}

@@ -1,50 +1,14 @@
 // @bun
-import"./index-r24hmh0q.js";
+import"./index-yb2wsc7f.js";
 
 // pkgs/@akanjs/devkit/routeSourceValidator.ts
+import { getRouteExports } from "akanjs/common";
 import ts from "typescript";
 
 class RouteSourceValidator {
-  static #pageExports = new Set([
-    "default",
-    "pageConfig",
-    "head",
-    "metadata",
-    "generateHead",
-    "generateMetadata",
-    "Loading"
-  ]);
-  static #rootLayoutExports = new Set([
-    "default",
-    "pageConfig",
-    "head",
-    "metadata",
-    "generateHead",
-    "generateMetadata",
-    "fonts",
-    "manifest",
-    "theme",
-    "reconnect",
-    "layoutStyle",
-    "gaTrackingId",
-    "Loading",
-    "NotFound",
-    "Error"
-  ]);
-  static #layoutExports = new Set([
-    "default",
-    "pageConfig",
-    "head",
-    "metadata",
-    "generateHead",
-    "generateMetadata",
-    "Loading",
-    "NotFound",
-    "Error"
-  ]);
   static validateRouteSourceExports(source, filePath, kind, options = {}) {
     const sourceFile = ts.createSourceFile(filePath, source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX);
-    const allowed = kind === "page" ? RouteSourceValidator.#pageExports : options.rootLayout ? RouteSourceValidator.#rootLayoutExports : RouteSourceValidator.#layoutExports;
+    const allowed = getRouteExports(kind, { rootLayout: options.rootLayout });
     const exported = new Set;
     const assertExport = (name) => {
       if (!allowed.has(name)) {

package/{scalar.command-fjq272gs.js → scalar.command-rm6k3c65.js}

@@ -1,21 +1,22 @@
 // @bun
 import {
   ScalarScript
-} from "./index-fmgbwsr5.js";
+} from "./index-x33gnap3.js";
 import"./index-ss469dec.js";
-import"./index-3pgtw35d.js";
+import"./index-sh01r3pm.js";
 import {
   renderPrimitiveReport
-} from "./index-4zgs8g1w.js";
-import"./index-xwgm94zr.js";
+} from "./index-tsmjxph2.js";
+import"./index-j37qq1f2.js";
 import {
   Sys,
   command
-} from "./index-jk9q6pse.js";
-import"./index-jtm86byd.js";
-import"./index-6pz1j0zj.js";
+} from "./index-n706txcv.js";
+import"./index-8vkkm7v0.js";
+import"./index-mxvakhsm.js";
+import"./index-1577bej2.js";
 import"./index-67546d0j.js";
-import"./index-r24hmh0q.js";
+import"./index-yb2wsc7f.js";
 
 // pkgs/@akanjs/cli/scalar/scalar.command.ts
 import { Logger, lowerlize } from "akanjs/common";

package/templates/app/env/env.server.debug.ts.template

@@ -1,7 +1,3 @@
-import { getEnv } from "akanjs/base";
-
 import type { ModulesOptions } from "../lib/option";
 
-export const env: ModulesOptions = {
-  ...getEnv(),
-};
+export const env: ModulesOptions = {};

package/templates/app/env/env.server.develop.ts.template

@@ -1,7 +1,3 @@
-import { getEnv } from "akanjs/base";
-
 import type { ModulesOptions } from "../lib/option";
 
-export const env: ModulesOptions = {
-  ...getEnv(),
-};
+export const env: ModulesOptions = {};

package/templates/app/env/env.server.local.ts.template

@@ -1,7 +1,3 @@
-import { getEnv } from "akanjs/base";
-
 import type { ModulesOptions } from "../lib/option";
 
-export const env: ModulesOptions = {
-  ...getEnv(),
-};
+export const env: ModulesOptions = {};

package/templates/app/env/env.server.main.ts.template

@@ -1,7 +1,3 @@
-import { getEnv } from "akanjs/base";
-
 import type { ModulesOptions } from "../lib/option";
 
-export const env: ModulesOptions = {
-  ...getEnv(),
-};
+export const env: ModulesOptions = {};

package/templates/app/page/styles.css.template

@@ -1,10 +1,10 @@
 @import "tailwindcss";
 @import "akanjs/ui/styles.css";
 
-/* 테마 시스템(브랜드-중립 기본 팔레트 · @theme inline 매핑 · dark 변형 · 런타임 data-theme 전환)은
-   akanjs/ui/styles.css(프레임워크)가 전부 제공한다. 이 앱은 import 만으로 즉시 동작한다.
+/* The theme system (brand-neutral default palette, @theme inline mapping, dark variant, and runtime
+   data-theme switching) is fully provided by akanjs/ui/styles.css. This app works from the import alone.
 
-   이 앱만의 브랜드 색을 쓰려면 아래처럼 토큰만 override 하면 된다:
+   To use this app's own brand colors, override the tokens like this:
 
    :root,
    [data-theme="dark"] {

package/templates/appSample/srvkit/AuthGuard.ts

@@ -3,7 +3,7 @@ import type { AppInfo, LibInfo } from "akanjs";
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { appName: string }) {
   return {
     filename: "AuthGuard.ts",
-    content: `import type { Guard, SignalContext } from "akanjs/signal";
+    content: `import type { Guard, GuardScope, SignalContext } from "akanjs/signal";
 
 // ===== AuthGuard.ts =====
 // Convention: srvkit/ folder — server-only helpers, cannot import from client code.
@@ -14,10 +14,14 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { a
 
 export class SignedIn implements Guard {
   static name = "SignedIn";
+  // "account" — the verdict reads the caller and nothing about the call, so an MCP catalogue can evaluate it with
+  // no arguments and hide what this caller certainly cannot use. Required: "resource" is never evaluated for a
+  // listing, so a guard like this one marked that way would filter nothing.
+  static scope: GuardScope = "account";
 
   canPass(context: SignalContext): boolean {
-    const user = context.getHttpContext<{ user?: { id: string } }>().req.user;
-    return !!user;
+    // Reads the account the middleware resolved, so the same guard answers over HTTP, a websocket and MCP alike.
+    return !!context.get<{ id?: string }>("account");
   }
 }
 
@@ -25,9 +29,9 @@ export class SignedIn implements Guard {
 // Role-based guard: only allow users with a specific role
 // export class IsAdmin implements Guard {
 //   static name = "IsAdmin";
+//   static scope: GuardScope = "account";
 //   canPass(context: SignalContext): boolean {
-//     const user = context.getHttpContext<{ user?: { role: string } }>().req.user;
-//     return user?.role === "admin";
+//     return context.get<{ role?: string }>("account")?.role === "admin";
 //   }
 // }
 `,

package/templates/appSample/srvkit/SessionInternalArg.ts

@@ -15,8 +15,9 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { a
 
 export class CurrentUserId implements InternalArg<string | null> {
   getArg(context: SignalContext): string | null {
-    const user = context.getHttpContext<{ user?: { id: string } }>().req.user;
-    return user?.id ?? null;
+    // \`context.get\` reads what the account middleware resolved, on every transport. Branching on
+    // \`getHttpContext()\` would return null for the same caller arriving over a websocket or MCP.
+    return context.get<{ id?: string }>("account")?.id ?? null;
   }
 }
 
@@ -24,7 +25,7 @@ export class CurrentUserId implements InternalArg<string | null> {
 // Inject current session language/locale
 // export class CurrentLocale implements InternalArg<string> {
 //   getArg(context: SignalContext): string {
-//     return context.getHttpContext<{ locale?: string }>().req.locale ?? "en";
+//     return context.get<string>("locale") ?? "en";
 //   }
 // }
 `,

package/templates/crudPages/[__model__Id]/edit/page.tsx

@@ -30,7 +30,7 @@ export default async function Page({ params }: PageProps) {
       </div>
       <Load.Edit
         className="flex flex-col items-center"
-        slice={fetch.slice["${dict.model}InPublic"]}
+        slice={fetch.slice.${dict.model}InPublic}
         edit={${dict.model}Edit}
         type="form"
         onCancel="back"

package/templates/crudPages/new/page.tsx

@@ -25,7 +25,7 @@ export default function Page() {
       </div>
       <Load.Edit
         className="flex flex-col items-center"
-        slice={fetch.slice["${dict.model}InPublic"]}
+        slice={fetch.slice.${dict.model}InPublic}
         edit={${dict.model}Form}
         type="form"
         onCancel="back"

package/templates/crudSinglePage/page.tsx

@@ -20,7 +20,7 @@ export default async function Page() {
     <>
       <div className="animate-fadeIn flex items-center gap-4 px-4 pt-4">
         <div className="text-lg font-bold md:text-4xl">{l("${dict.model}.modelName")}</div>
-        <Model.New className="inline-flex items-center gap-2 rounded-field px-3 py-1.5 text-sm transition-colors hover:bg-muted" slice={fetch.slice["${dict.model}InPublic"]} renderTitle="id">
+        <Model.New className="inline-flex items-center gap-2 rounded-field px-3 py-1.5 text-sm transition-colors hover:bg-muted" slice={fetch.slice.${dict.model}InPublic} renderTitle="id">
           <${dict.Model}.Template.General />
         </Model.New>
       </div>

package/templates/env/_env.server.type.ts

@@ -5,12 +5,14 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [
   const libs = scanInfo.getLibs();
   return {
     filename: "env.server.type.ts",
-    content: `
-${libs.length ? libs.map((lib) => `import { env as ${lib}Option } from "@libs/${lib}/server";`).join("\n") : 'import { getEnv } from "akanjs/base";'}
+    content: libs.length
+      ? `
+${libs.map((lib) => `import { env as ${lib}Option } from "@libs/${lib}/server";`).join("\n")}
 
 export const libEnv = {
-${libs.length ? libs.map((lib) => `  ...${lib}Option,`).join("\n") : "  ...getEnv(),"}
-};
-`,
+${libs.map((lib) => `  ...${lib}Option,`).join("\n")}
+};`
+      : `
+export const libEnv = {};`,
   };
 }

package/templates/lib/db.ts

@@ -13,10 +13,12 @@ ${scalarModules.map((module) => `import { ${capitalize(module)} } from "./__scal
 ${databaseModules.length ? `import * as cnst from "./cnst";` : ""}
 ${databaseModules.map((module) => `import * as ${module}Db from "./${module}/${module}.document";`).join("\n")}
 
-${libs.map((lib) => `export { db as ${lib} } from "@libs/${lib}/server";`).join("\n")}
+${libs.map((lib) => `export * as ${lib} from "@libs/${lib}/lib/db";`).join("\n")}
 
 ${databaseModules.map((module) => `class ${capitalize(module)}Input extends by(cnst.${capitalize(module)}Input) {}`).join("\n")}
+${databaseModules.map((module) => `class ${capitalize(module)}Insight extends by(cnst.${capitalize(module)}Insight) {}`).join("\n")}
 ${databaseModules.length ? `export type { ${databaseModules.map((module) => `${capitalize(module)}Input`).join(", ")} };` : ""}
+${databaseModules.length ? `export type { ${databaseModules.map((module) => `${capitalize(module)}Insight`).join(", ")} };` : ""}
 
 ${scalarModules.map((module) => `export type * from "./__scalar/${module}/${module}.document";`).join("\n")}
 ${databaseModules.map((module) => `export type * from "./${module}/${module}.document";`).join("\n")}
@@ -24,7 +26,7 @@ ${databaseModules.map((module) => `export type * from "./${module}/${module}.doc
 ${databaseModules
   .map((module) => {
     const names = { Module: module.charAt(0).toUpperCase() + module.slice(1) };
-    return `export const ${module} = DatabaseRegistry.buildModel("${module}" as const, ${names.Module}Input, ${module}Db.${names.Module}, ${module}Db.${names.Module}Model, cnst.${names.Module}, cnst.${names.Module}Insight, ${module}Db.${names.Module}Filter);`;
+    return `export const ${module} = DatabaseRegistry.buildModel("${module}" as const, ${names.Module}Input, ${module}Db.${names.Module}, ${module}Db.${names.Module}Model, cnst.${names.Module}, ${names.Module}Insight, ${module}Db.${names.Module}Filter);`;
   })
   .join("\n")}
 ${scalarModules.map((module) => `export const ${module} = DatabaseRegistry.buildScalar("${module}" as const, ${capitalize(module)});`).join("\n")}

package/templates/lib/dict.ts

@@ -9,7 +9,7 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [
   const libs = scanInfo.getLibs();
   return `
 import { makeDictionary, makeTrans, registerScalarTrans, registerServiceTrans, registerModelTrans${libs.length === 0 ? `, dictionary as base` : ""} } from "akanjs/dictionary";
-${libs.length ? libs.map((lib) => `import { dictionary as ${lib} } from "@libs/${lib}/server";`).join("\n") : ""}
+${libs.length ? libs.map((lib) => `import { dictionary as ${lib} } from "@libs/${lib}/lib/dict";`).join("\n") : ""}
 
 ${databaseModules.map((module) => `import * as ${module} from "./${module}/${module}.dictionary";`).join("\n")}
 ${serviceModules.map((module) => `import * as ${module} from "./_${module}/${module}.dictionary";`).join("\n")}

package/templates/lib/sig.ts

@@ -17,7 +17,7 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [
   return `
 import { FetchClient, type FetchClientType } from "akanjs/fetch";
 import { SignalRegistry, serverSignal${libs.length === 0 ? ", fetch as base" : ""} } from "akanjs/signal";
-${libs.map((lib) => `import { fetch as ${lib} } from "@libs/${lib}/server";`).join("\n")}
+${libs.map((lib) => `import { fetch as ${lib} } from "@libs/${lib}/lib/sig";`).join("\n")}
 
 ${[...scanInfo.database.entries()]
   .filter(([_, files]) => files.has("signal"))

package/templates/lib/srv.ts

@@ -13,7 +13,11 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [
   const libs = scanInfo.getLibs();
   return `
 import { ServiceModel } from "akanjs/service";
-${libs.length ? libs.map((lib) => `import { option as ${lib} } from "@libs/${lib}/server";`).join("\n") : 'import type { BackendEnv } from "akanjs/base";'}
+${
+  libs.length
+    ? libs.map((lib) => `import * as ${lib} from "@libs/${lib}/lib/option";`).join("\n")
+    : 'import type { BackendEnv } from "akanjs/base";'
+}
 
 import * as cnst from "./cnst";
 import * as db from "./db";
@@ -21,7 +25,7 @@ import * as db from "./db";
 ${databaseModules.map((module) => `import { ${capitalize(module)}Service } from "./${module}/${module}.service";`).join("\n")}
 ${serviceModules.map((module) => `import { ${capitalize(module)}Service } from "./_${module}/${module}.service";`).join("\n")}
 
-${libs.map((lib) => `export { srv as ${lib} } from "@libs/${lib}/server";`).join("\n")}
+${libs.map((lib) => `export * as ${lib} from "@libs/${lib}/lib/srv";`).join("\n")}
 
 ${databaseModules.map((module) => `export { ${capitalize(module)}Service } from "./${module}/${module}.service";`).join("\n")}
 ${serviceModules.map((module) => `export { ${capitalize(module)}Service } from "./_${module}/${module}.service";`).join("\n")}

package/templates/lib/useClient.ts

@@ -1,16 +1,22 @@
 import type { AppInfo, LibInfo } from "akanjs";
 
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [key: string]: string } = {}) {
+  const isApp = (scanInfo?.type ?? "lib") === "app";
   return `
 import { makePageProto, registerClientRuntime } from "akanjs/client";
 import { FetchClient } from "akanjs/fetch";
 import * as cnst from "./cnst";
-import { getAllDictionary } from "./dict" with { type: "macro" };
-import type * as dict from "./dict";
+${isApp ? `import { getAllDictionary } from "./dict" with { type: "macro" };\n` : ""}import type * as dict from "./dict";
 import { getSerializedSignal } from "./sig" with { type: "macro" };
 import type * as signal from "./sig";
 
-const dictionary = process.env.AKAN_PUBLIC_RENDER_ENV === "csr" ? getAllDictionary() : {};
+${
+  isApp
+    ? `const dictionary = process.env.AKAN_PUBLIC_RENDER_ENV === "csr" ? getAllDictionary() : {};`
+    : `// dict.ts is cumulative, so a lib dictionary is a subset of the mounting app's. Translator state is global,
+// so the app's seed already resolves l() here — seeding again would ship the same payload a second time.
+const dictionary = {};`
+}
 const pageProto = makePageProto<typeof dict>(dictionary);
 const fetchProto = FetchClient.build<typeof signal>(cnst, getSerializedSignal(), { Err: pageProto.Err });
 export const runtime = registerClientRuntime({ ...pageProto, ...fetchProto }, { scope: ${JSON.stringify(scanInfo?.type ?? "lib")} });

package/templates/module/__Model__.Util.tsx

@@ -21,7 +21,7 @@ interface RemoveProps {
 export const Remove = ({ ${dict.model}Id }: RemoveProps) => {
   const { l } = usePage();
   return (
-    <Model.Remove modelId={${dict.model}Id} slice={fetch.slice["${dict.model}"]}>
+    <Model.Remove modelId={${dict.model}Id} slice={fetch.slice.${dict.model}}>
       <BiTrash /> {l("base.remove")}
     </Model.Remove>
   );

package/templates/module/__Model__.Zone.tsx

@@ -12,9 +12,7 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dic
     content: `
 "use client";
 import { Load } from "akanjs/ui";
-// Alias the domain namespace so the Card/View exports below never collide with the model name
-// (a model literally named "card" or "view" would otherwise shadow this import).
-import { type cnst, ${dict.Model} as ${dict.Model}Domain } from "@${dict.sysType}s/${dict.sysName}/client";
+import { type cnst, ${dict.Model} as ${dict.Model} } from "@${dict.sysType}s/${dict.sysName}/client";
 import type { ClientInit, ClientView, SliceMeta } from "akanjs/fetch";
 
 interface CardProps {
@@ -28,7 +26,7 @@ export const Card = ({ className, init, slice }: CardProps) => {
       className={className}
       init={init}
       renderItem={(${dict.model}) => (
-        <${dict.Model}Domain.Unit.Card key={${dict.model}.id} href={\`/${dict.model}/\${${dict.model}.id}\`} ${dict.model}={${dict.model}} />
+        <${dict.Model}.Unit.Card key={${dict.model}.id} href={\`/${dict.model}/\${${dict.model}.id}\`} ${dict.model}={${dict.model}} />
       )}
     />
   );
@@ -39,7 +37,7 @@ interface ViewProps {
   view: ClientView<"${dict.model}", cnst.${dict.Model}>;
 }
 export const View = ({ view }: ViewProps) => {
-  return <Load.View view={view} renderView={(${dict.model}) => <${dict.Model}Domain.View.General ${dict.model}={${dict.model}} />} />;
+  return <Load.View view={view} renderView={(${dict.model}) => <${dict.Model}.View.General ${dict.model}={${dict.model}} />} />;
 };
 `,
   };