@akanjs/cli 3.0.0-alpha.3 → 3.0.0-alpha.31

package/{localRegistry.command-gb178ne8.js → localRegistry.command-53t758pt.js}

@@ -2,31 +2,32 @@
 import {
   CloudRunner,
   getNpmRegistryUrl
-} from "./index-zasydjxd.js";
+} from "./index-t71zvmt9.js";
 import {
   PackageScript
-} from "./index-k95xkh4p.js";
-import"./index-0cj2zxbm.js";
+} from "./index-33zce8gt.js";
+import"./index-sh01r3pm.js";
 import {
   ApplicationScript
-} from "./index-e16gnn26.js";
+} from "./index-8d2sv6pw.js";
+import"./index-73rnbwgg.js";
 import"./index-76rn3g2c.js";
-import"./index-7c6k4yvg.js";
 import {
   Workspace,
   command,
   runner,
   script
-} from "./index-8hsbnyes.js";
+} from "./index-n706txcv.js";
 import"./index-fgc8r6dj.js";
 import"./index-bjpxzr6s.js";
 import {
   PkgExecutor
-} from "./index-hgna5rjy.js";
+} from "./index-8vkkm7v0.js";
 import"./index-mxvakhsm.js";
+import"./index-1577bej2.js";
 import"./index-46tjzh6s.js";
 import"./index-67546d0j.js";
-import"./index-r24hmh0q.js";
+import"./index-yb2wsc7f.js";
 
 // pkgs/@akanjs/cli/localRegistry/localRegistry.runner.ts
 import { mkdir, rm } from "fs/promises";

package/{module.command-9c1bnsx4.js → module.command-pq6w84xg.js}

@@ -1,23 +1,24 @@
 // @bun
 import {
   ModuleScript
-} from "./index-yzmhasdb.js";
-import"./index-bbkek1bp.js";
+} from "./index-mykmf6wd.js";
 import"./index-ss469dec.js";
-import"./index-0cj2zxbm.js";
+import"./index-qc0tnhs2.js";
+import"./index-sh01r3pm.js";
 import {
   renderPrimitiveReport
-} from "./index-rzwcpcc3.js";
-import"./index-tdbas9r0.js";
+} from "./index-tsmjxph2.js";
+import"./index-j37qq1f2.js";
 import {
   Module,
   Sys,
   command
-} from "./index-8hsbnyes.js";
-import"./index-hgna5rjy.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/module/module.command.ts
 import { Logger, lowerlize } from "akanjs/common";

package/{package.command-t93p4jkj.js → package.command-qkcs60ts.js}

@@ -1,17 +1,18 @@
 // @bun
 import {
   PackageScript
-} from "./index-k95xkh4p.js";
+} from "./index-33zce8gt.js";
 import {
   Pkg,
   Workspace,
   command
-} from "./index-8hsbnyes.js";
-import"./index-hgna5rjy.js";
+} from "./index-n706txcv.js";
+import"./index-8vkkm7v0.js";
 import"./index-mxvakhsm.js";
+import"./index-1577bej2.js";
 import"./index-46tjzh6s.js";
 import"./index-67546d0j.js";
-import"./index-r24hmh0q.js";
+import"./index-yb2wsc7f.js";
 
 // pkgs/@akanjs/cli/package/package.command.ts
 class PackageCommand extends command("package", [PackageScript], ({ public: target }) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/cli",
-  "version": "3.0.0-alpha.3",
+  "version": "3.0.0-alpha.31",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -14,7 +14,7 @@
     "directory": "pkgs/@akanjs/cli"
   },
   "engines": {
-    "bun": ">=1.3.13"
+    "bun": ">=1.4.0"
   },
   "bin": {
     "akan": "./index.js",
@@ -34,7 +34,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "3.0.0-alpha.3",
+    "akanjs": "3.0.0-alpha.31",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "dayjs": "^1.11.20",
@@ -42,7 +42,6 @@
     "fonteditor-core": "^2.6.3",
     "ignore": "^7.0.5",
     "ink": "^6.8.0",
-    "js-yaml": "^4.1.1",
     "ora": "^9.4.0",
     "qrcode": "^1.5.4",
     "react": "19.2.7",

package/{page.command-k3k0meh2.js → page.command-qj5bfnh9.js}

@@ -1,16 +1,17 @@
 // @bun
 import {
   PageScript
-} from "./index-bbkek1bp.js";
+} from "./index-qc0tnhs2.js";
 import {
   App,
   Module,
   command
-} from "./index-8hsbnyes.js";
-import"./index-hgna5rjy.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/page/page.command.ts
 class PageCommand extends command("page", [PageScript], ({ public: target }) => ({

package/{primitive.command-de6nktdt.js → primitive.command-bw0nes6x.js}

@@ -1,23 +1,24 @@
 // @bun
 import {
   PrimitiveScript
-} from "./index-bekddz9q.js";
-import"./index-yzmhasdb.js";
-import"./index-bbkek1bp.js";
+} from "./index-9jsnb4vw.js";
+import"./index-mykmf6wd.js";
 import"./index-ss469dec.js";
-import"./index-0cj2zxbm.js";
+import"./index-qc0tnhs2.js";
+import"./index-sh01r3pm.js";
 import {
   renderPrimitiveReport
-} from "./index-rzwcpcc3.js";
-import"./index-tdbas9r0.js";
+} from "./index-tsmjxph2.js";
+import"./index-j37qq1f2.js";
 import {
   Workspace,
   command
-} from "./index-8hsbnyes.js";
-import"./index-hgna5rjy.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/primitive/primitive.command.ts
 import { Logger } from "akanjs/common";

package/{quality.command-z5kth2wa.js → quality.command-f8drhx6c.js}

@@ -7,16 +7,21 @@ import {
   command,
   runner,
   script
-} from "./index-8hsbnyes.js";
-import"./index-hgna5rjy.js";
+} from "./index-n706txcv.js";
+import {
+  appRootAllowedFiles,
+  libFacetRootAllowedFiles
+} from "./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/devkit/qualityScanner.ts
 import { createHash } from "crypto";
 import { readdir, readFile, stat } from "fs/promises";
 import path from "path";
+import { RESERVED_ROUTE_CONFIG_EXPORTS } from "akanjs/common";
 import ignore from "ignore";
 import ts2 from "typescript";
 
@@ -404,27 +409,6 @@ var SUGGESTED_RULES = [
   "Move shared app utilities to apps/*/common instead of creating apps/*/base.",
   "Avoid large mixed-purpose class files; class export files should import helpers from neighboring utility files instead of declaring them inline."
 ];
-var APP_ROOT_FILES = new Set([
-  "akan.app.json",
-  "akan.config.ts",
-  "capacitor.config.ts",
-  "client.ts",
-  "main.ts",
-  "package.json",
-  "server.ts",
-  "tsconfig.json"
-]);
-var LIB_ROOT_FILES = new Set([
-  "cnst.ts",
-  "db.ts",
-  "dict.ts",
-  "option.ts",
-  "sig.ts",
-  "srv.ts",
-  "st.ts",
-  "useClient.ts",
-  "useServer.ts"
-]);
 var CONVENTION_SUFFIXES = [
   ".constant.ts",
   ".dictionary.ts",
@@ -433,20 +417,6 @@ var CONVENTION_SUFFIXES = [
   ".signal.ts",
   ".store.ts"
 ];
-var PAGE_RESERVED_EXPORTS = new Set([
-  "pageConfig",
-  "head",
-  "metadata",
-  "generateHead",
-  "generateMetadata",
-  "fonts",
-  "manifest",
-  "theme",
-  "reconnect",
-  "wsConnect",
-  "layoutStyle",
-  "gaTrackingId"
-]);
 var RULE_FIXES = {
   "akan.global.duplicate-exported-function-name": "Rename one of the exports, or if they are the same thing, extract it into one shared module and import it in both places.",
   "akan.global.duplicate-exported-function-body": "Extract the shared implementation into a single exported helper and import it, instead of copying the body.",
@@ -703,7 +673,7 @@ class AkanQualityScanner {
   #scanLayoutQuality(sourceFile) {
     const segments = sourceFile.file.split("/");
     const warnings = [];
-    if (segments[0] === "apps" && segments.length === 3 && !APP_ROOT_FILES.has(segments[2])) {
+    if (segments[0] === "apps" && segments.length === 3 && !appRootAllowedFiles.has(segments[2])) {
       warnings.push({
         rule: "akan.layout.app-root-file",
         scope: "layout",
@@ -713,7 +683,7 @@ class AkanQualityScanner {
       });
     }
     const libRootFile = getLibRootFile(sourceFile.file);
-    if (libRootFile && !LIB_ROOT_FILES.has(libRootFile)) {
+    if (libRootFile && !libFacetRootAllowedFiles.has(libRootFile)) {
       warnings.push({
         rule: "akan.layout.lib-root-file",
         scope: "layout",
@@ -929,7 +899,7 @@ function isRestrictedInternalKind(kind) {
 function isAllowedComponentExport(declaration, isPage) {
   if (isComponentValueKind(declaration.kind) && isPascalCaseName(declaration.name))
     return true;
-  return isPage && PAGE_RESERVED_EXPORTS.has(declaration.name);
+  return isPage && RESERVED_ROUTE_CONFIG_EXPORTS.has(declaration.name);
 }
 function isPascalCaseName(name) {
   return /^[A-Z]/.test(name) && !/^[A-Z0-9_]+$/.test(name);

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-ehf2g112.js → repair.command-mzwtejpk.js}

@@ -1,19 +1,20 @@
 // @bun
 import {
   RepairRunner
-} from "./index-mr5s7mqd.js";
-import"./index-a00jg8x8.js";
-import"./index-rzwcpcc3.js";
+} from "./index-xyrb7pk5.js";
+import"./index-g9e2fhw2.js";
+import"./index-tsmjxph2.js";
 import {
   Workspace,
   command,
   script
-} from "./index-8hsbnyes.js";
-import"./index-hgna5rjy.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-7a2jtv33.js → scalar.command-rm6k3c65.js}

@@ -1,21 +1,22 @@
 // @bun
 import {
   ScalarScript
-} from "./index-ec09pws3.js";
+} from "./index-x33gnap3.js";
 import"./index-ss469dec.js";
-import"./index-0cj2zxbm.js";
+import"./index-sh01r3pm.js";
 import {
   renderPrimitiveReport
-} from "./index-rzwcpcc3.js";
-import"./index-tdbas9r0.js";
+} from "./index-tsmjxph2.js";
+import"./index-j37qq1f2.js";
 import {
   Sys,
   command
-} from "./index-8hsbnyes.js";
-import"./index-hgna5rjy.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,7 +13,7 @@ ${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")}

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")}