@akanjs/cli 3.0.0-beta.9 → 3.0.1

package/templates/appSample/lib/task/task.abstract.ts

@@ -3,38 +3,18 @@ import type { AppInfo, LibInfo } from "akanjs";
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { appName: string }) {
   return {
     filename: "task.abstract.md",
-    content: `# Task Abstract
-
-## Akan.js Module Pattern
-
-Task is a **database-backed domain module** — the standard Akan.js pattern for persisted entities.
-This module demonstrates the full Akan.js module lifecycle:
-constant -> document -> service -> signal -> store -> UI.
-
-Every database module in Akan.js follows this layered architecture:
-- task.constant.ts — data shape (enum, Input, Object, Light, Full layers via via())
-- task.document.ts — DB queries, filters, sorts, indexes, Document chain methods
-- task.dictionary.ts — i18n labels, error messages, UI translations
-- task.service.ts — business logic orchestration bound to DB via serve(db.task, ...)
-- task.signal.ts — API surface (query, mutation, pubsub endpoints bound via endpoint(srv.task, ...))
-- task.store.ts — client state management bound to signal via store(sig.task, ...)
-- Task.*.tsx — UI components (Zone -> Load -> Unit / View / Template / Util)
-
-## Convention: lib/<module>/ directory naming
-
-- Database modules live under lib/<module>/ (no underscore prefix)
-- Files follow <module>.<layer>.ts naming — e.g., task.constant.ts, task.service.ts
-- UI files use PascalCase with explicit suffix: Task.Zone.tsx, Task.Unit.tsx, Task.View.tsx
-
-## Convention: scan-registered barrels
-
-akan sync auto-discovers each file and registers it in the corresponding barrel:
-cnst.ts, db.ts, dict.ts, srv.ts, sig.ts, st.ts
-
-## Related Modules
-
-- lib/__scalar/workHistory/ — standard scalar modules with double-underscore prefix (reusable field sets)
-- lib/_noti/ — pure service module (compare structure differences: no constant/document, serve without DB binding)
+    content: `# task Abstract
+A task is one unit of work that moves from todo through in progress to completed, and keeps a record of each move.
+
+## Rules
+- A task only moves forward: \`start()\` needs \`todo\` and \`complete()\` needs \`inProgress\`; any other state throws.
+- Every move appends one \`workHistory\` entry, and creation writes the first (\`created\`), so the history is never
+  empty and its last entry always matches \`status\`.
+- Anyone may read a task; creating, changing, starting and completing one needs a signed-in caller. There is no
+  generated admin API (\`root: None\`).
+- Removal is soft: a removed task keeps its row with \`removedAt\` set.
+
+todo -> inProgress -> completed
 `,
   };
 }

package/templates/appSample/lib/task/task.signal.spec.ts

@@ -1,8 +1,7 @@
 import type { AppInfo, LibInfo } from "akanjs";
 
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { appName: string }) {
-  return `import { expect } from "bun:test";
-import type { DocumentModel } from "akanjs/constant";
+  return `import type { DocumentModel } from "akanjs/constant";
 import { getOrSetupSignalTestFetch, sampleOf } from "akanjs/test";
 
 import * as cnst from "../cnst";
@@ -27,13 +26,6 @@ export const createTask = async (overrides: Partial<DocumentModel<cnst.TaskInput
 
   const task = await fetch.createTask(taskInput);
 
-  expect(task).toMatchObject({
-    title: taskInput.title,
-    content: taskInput.content,
-    status: "todo",
-  });
-  expect(task.workHistory.map((entry) => entry.action)).toEqual(["created"]);
-
   return {
     task,
     fetch,
@@ -45,9 +37,6 @@ export const getStartedTask = async (overrides: Partial<DocumentModel<cnst.TaskI
   const agent = await createTask(overrides);
   const task = await agent.fetch.startTask(agent.task.id);
 
-  expect(task.status).toBe("inProgress");
-  expect(task.workHistory.map((entry) => entry.action)).toEqual(["created", "started"]);
-
   return {
     ...agent,
     task,
@@ -58,9 +47,6 @@ export const getCompletedTask = async (overrides: Partial<DocumentModel<cnst.Tas
   const agent = await getStartedTask(overrides);
   const task = await agent.fetch.completeTask(agent.task.id);
 
-  expect(task.status).toBe("completed");
-  expect(task.workHistory.map((entry) => entry.action)).toEqual(["created", "started", "completed"]);
-
   return {
     ...agent,
     task,

package/templates/appSample/lib/task/task.signal.test.ts

@@ -6,9 +6,23 @@ import { configureSignalTest } from "akanjs/test";
 
 import * as taskSpec from "./task.signal.spec";
 
-configureSignalTest({ databaseMode: "memory" });
+configureSignalTest({ storage: "memory" });
 
 describe("Task signal smoke", () => {
+  test("creates a task in todo", async () => {
+    const { task, taskInput } = await taskSpec.createTask({ title: "Signal smoke task" });
+
+    expect(task).toMatchObject({ title: taskInput.title, content: taskInput.content, status: "todo" });
+    expect(task.workHistory.map((entry) => entry.action)).toEqual(["created"]);
+  });
+
+  test("starts a task", async () => {
+    const { task } = await taskSpec.getStartedTask({ title: "Signal smoke task" });
+
+    expect(task.status).toBe("inProgress");
+    expect(task.workHistory.map((entry) => entry.action)).toEqual(["created", "started"]);
+  });
+
   test("exposes custom task mutations over fetch", async () => {
     const { task } = await taskSpec.getCompletedTask({ title: "Signal smoke task" });
 

package/templates/appSample/lib/task/task.signal.ts

@@ -1,8 +1,7 @@
 import type { AppInfo, LibInfo } from "akanjs";
 
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { appName: string }) {
-  return `import { SignedIn } from "@apps/${dict.appName}/srvkit";
-import { endpoint, internal, None, Public, slice } from "akanjs/signal";
+  return `import { endpoint, internal, None, Public, slice } from "akanjs/signal";
 
 import * as cnst from "../cnst";
 import * as srv from "../srv";
@@ -23,23 +22,26 @@ import * as srv from "../srv";
 export class TaskInternal extends internal(srv.task, ({ interval }) => ({})) {}
 
 // Guards, per key: root = the generated admin API (runs any filter with caller-supplied args), get = reads,
-// cru = create/update/remove. root and cru are never Public; None here means "nobody until you name a guard".
-export class TaskSlice extends slice(srv.task, { guards: { root: None, get: Public, cru: SignedIn } }, (init) => ({
-  inPublic: init().exec(function () {
+// cru = create/update/remove. None here means "nobody until you name a guard".
+// The sample lets guests write so it works before the app has sign-in. Once it does, swap Public for SignedIn
+// (srvkit/guards.ts) on cru and on the mutations below — a real app never leaves writes Public.
+export class TaskSlice extends slice(srv.task, { guards: { root: None, get: Public, cru: Public } }, (init) => ({
+  inPublic: init({ guards: [Public] }).exec(function () {
     return this.taskService.queryAny();
   }),
 })) {}
 
 // Every custom endpoint names its own guards array — the slice's map above only covers generated CRUD.
-// It is also the MCP decision: an endpoint declaring no guard is not published to agents at all.
+// It is also the MCP decision: an endpoint declaring no guard, or a mutation guarded only by Public, is not
+// published to agents at all.
 export class TaskEndpoint extends endpoint(srv.task, ({ mutation }) => ({
-  startTask: mutation(cnst.Task, { guards: [SignedIn] })
+  startTask: mutation(cnst.Task, { guards: [Public] })
     .param("taskId", String)
     .exec(async function (taskId) {
       return await this.taskService.startTask(taskId);
     }),
 
-  completeTask: mutation(cnst.Task, { guards: [SignedIn] })
+  completeTask: mutation(cnst.Task, { guards: [Public] })
     .param("taskId", String)
     .exec(async function (taskId) {
       return await this.taskService.completeTask(taskId);

package/templates/appSample/page/task/[taskId]/_index.tsx

@@ -3,11 +3,11 @@ import type { AppInfo, LibInfo } from "akanjs";
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { appName: string }) {
   return {
     filename: "_index.tsx",
-    content: `import { fetch, usePage } from "@apps/${dict.appName}/client";
-import { Task } from "@apps/${dict.appName}/lib/task";
+    content: `import { fetch, Task, usePage } from "@apps/${dict.appName}/client";
+import { jellyButtonRecipe } from "@apps/${dict.appName}/ui";
 import { ID } from "akanjs/base";
 import { page } from "akanjs/client";
-import { Link, buttonRecipe } from "akanjs/ui";
+import { Link } from "akanjs/ui";
 
 export default page()
   .param("taskId", ID)
@@ -17,10 +17,10 @@ export default page()
     return (
       <main className="mx-auto max-w-4xl px-6 py-8">
         <div className="mb-6 flex items-center justify-between">
-          <a href="/task" className={buttonRecipe({ variant: "ghost", size: "sm" })}>
+          <Link href="/task" className={jellyButtonRecipe({ variant: "ghost", size: "sm" })}>
             {l("task.taskBackToTasks")}
-          </a>
-          <Link href={\`/task/\${taskId}/edit\`} className={buttonRecipe({ variant: "primary", size: "sm" })}>
+          </Link>
+          <Link href={\`/task/\${taskId}/edit\`} className={jellyButtonRecipe({ variant: "primary", size: "sm" })}>
             {l("task.taskEdit")}
           </Link>
         </div>

package/templates/appSample/page/task/[taskId]/edit.tsx

@@ -4,9 +4,10 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { a
   return {
     filename: "edit.tsx",
     content: `import { fetch, Task } from "@apps/${dict.appName}/client";
+import { jellyButtonRecipe } from "@apps/${dict.appName}/ui";
 import { ID } from "akanjs/base";
 import { page } from "akanjs/client";
-import { Load, Link, buttonRecipe } from "akanjs/ui";
+import { Link, Load } from "akanjs/ui";
 
 export default page()
   .param("taskId", ID)
@@ -16,15 +17,15 @@ export default page()
     return (
       <main className="mx-auto max-w-2xl px-6 py-8">
         <div className="mb-6">
-          <Link href={\`/task/\${taskId}\`} className={buttonRecipe({ variant: "ghost", size: "sm" })}>
+          <Link href={\`/task/\${taskId}\`} className={jellyButtonRecipe({ variant: "ghost", size: "sm" })}>
             ← Back to Task
           </Link>
         </div>
         <div className="mb-6">
-          <h1 className="font-extrabold text-3xl text-foreground">Edit Task</h1>
+          <h1 className="font-black text-4xl text-foreground">Edit Task</h1>
           <p className="mt-1 text-foreground/60 text-sm">Update the task details</p>
         </div>
-        <div className="rounded-xl border border-foreground/10 bg-background p-6 shadow-sm">
+        <div className="jelly-glass rounded-box p-6">
           <Load.Edit slice={fetch.slice.taskInPublic} edit={taskEdit} type="form" onSubmit={\`/task/\${taskId}\`}>
             <Task.Template.General />
           </Load.Edit>

package/templates/appSample/page/task/_index.tsx

@@ -4,8 +4,9 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { a
   return {
     filename: "_index.tsx",
     content: `import { fetch, Task, usePage } from "@apps/${dict.appName}/client";
+import { jellyButtonRecipe } from "@apps/${dict.appName}/ui";
 import { page } from "akanjs/client";
-import { Link, buttonRecipe } from "akanjs/ui";
+import { Link } from "akanjs/ui";
 
 export default page().render(async () => {
   const { l } = usePage();
@@ -14,10 +15,10 @@ export default page().render(async () => {
     <main className="mx-auto max-w-4xl px-6 py-8">
       <div className="mb-6 flex items-center justify-between">
         <div>
-          <h1 className="font-extrabold text-3xl text-foreground">{l("task.modelName")}</h1>
+          <h1 className="font-black text-4xl text-foreground">{l("task.modelName")}</h1>
           <p className="mt-1 text-foreground/60 text-sm">{l("task.modelDesc")}</p>
         </div>
-        <Link href="/task/new" className={buttonRecipe({ variant: "primary", size: "sm" })}>
+        <Link href="/task/new" className={jellyButtonRecipe({ variant: "primary", size: "sm" })}>
           {l("task.taskNew")}
         </Link>
       </div>

package/templates/appSample/page/task/_layout.tsx

@@ -6,7 +6,7 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { a
     content: `import { layout } from "akanjs/client";
 
 export default layout().render(({ children }) => {
-  return <div className="min-h-screen bg-muted">{children}</div>;
+  return <div className="min-h-screen">{children}</div>;
 });
 `,
   };

package/templates/appSample/page/task/new.tsx

@@ -4,8 +4,9 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { a
   return {
     filename: "new.tsx",
     content: `import { type cnst, fetch, Task } from "@apps/${dict.appName}/client";
+import { jellyButtonRecipe } from "@apps/${dict.appName}/ui";
 import { page } from "akanjs/client";
-import { Load, Link, buttonRecipe } from "akanjs/ui";
+import { Link, Load } from "akanjs/ui";
 
 export default page().render(() => {
   const taskForm: Partial<cnst.Task> = { status: "todo" };
@@ -13,15 +14,15 @@ export default page().render(() => {
   return (
     <main className="mx-auto max-w-2xl px-6 py-8">
       <div className="mb-6">
-        <Link href="/task" className={buttonRecipe({ variant: "ghost", size: "sm" })}>
+        <Link href="/task" className={jellyButtonRecipe({ variant: "ghost", size: "sm" })}>
           ← Tasks
         </Link>
       </div>
       <div className="mb-6">
-        <h1 className="font-extrabold text-3xl text-foreground">New Task</h1>
+        <h1 className="font-black text-4xl text-foreground">New Task</h1>
         <p className="mt-1 text-foreground/60 text-sm">Create a new task with title and description</p>
       </div>
-      <div className="rounded-xl border border-foreground/10 bg-background p-6 shadow-sm">
+      <div className="jelly-glass rounded-box p-6">
         <Load.Edit slice={fetch.slice.taskInPublic} edit={taskForm} type="form" onCancel="back" onSubmit="/task">
           <Task.Template.General />
         </Load.Edit>

package/templates/appSample/srvkit/{AuthGuard.ts → guards.ts}

@@ -2,14 +2,14 @@ import type { AppInfo, LibInfo } from "akanjs";
 
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { appName: string }) {
   return {
-    filename: "AuthGuard.ts",
+    filename: "guards.ts",
     content: `import type { Guard, GuardScope, SignalContext } from "akanjs/signal";
 
-// ===== AuthGuard.ts =====
+// ===== guards.ts =====
 // Convention: srvkit/ folder — server-only helpers, cannot import from client code.
 // Implements the Guard interface from akanjs/signal.
 // Guards are applied at endpoint/slice declaration: { guards: { root: SignedIn } }.
-// Naming: PascalCase .ts, static name property matches the guard identifier.
+// Naming: camelCase file, PascalCase classes; each static name matches its guard identifier.
 // Scanned by akan sync into srvkit/index.ts barrel automatically.
 
 export class SignedIn implements Guard {
@@ -21,7 +21,10 @@ export class SignedIn implements Guard {
 
   canPass(context: SignalContext): boolean {
     // Reads the account the middleware resolved, so the same guard answers over HTTP, a websocket and MCP alike.
-    return !!context.get<{ id?: string }>("account");
+    // A guest still has an account — libs/shared resolves one to \`{ appName, environment }\` — so only an
+    // identity on it proves a sign-in: your own middleware's \`id\`, or libs/shared's \`self\` (user) / \`me\` (admin).
+    const account = context.get<{ id?: string; self?: { id?: string }; me?: { id?: string } }>("account");
+    return !!(account?.id ?? account?.self?.id ?? account?.me?.id);
   }
 }
 

package/templates/appSample/srvkit/{SessionInternalArg.ts → internalArgs.ts}

@@ -2,22 +2,24 @@ import type { AppInfo, LibInfo } from "akanjs";
 
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { appName: string }) {
   return {
-    filename: "SessionInternalArg.ts",
+    filename: "internalArgs.ts",
     content: `import type { InternalArg, SignalContext } from "akanjs/signal";
 
-// ===== SessionInternalArg.ts =====
+// ===== internalArgs.ts =====
 // Convention: srvkit/ folder — server-only helpers.
 // Implements the InternalArg interface from akanjs/signal.
 // InternalArg is an auto-injected argument for resolveField/endpoint .with() chains.
 // Appended to a query/mutation via: .with(CurrentUserId, { nullable: true }).exec(...)
-// Naming: PascalCase .ts, class name = arg identifier.
+// Naming: camelCase file, PascalCase classes; each class name is its arg identifier.
 // Scanned by akan sync into srvkit/index.ts barrel automatically.
 
 export class CurrentUserId implements InternalArg<string | null> {
   getArg(context: SignalContext): string | 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;
+    // An app's own middleware may put the id on the account itself; libs/shared puts it on \`self\` or \`me\`.
+    const account = context.get<{ id?: string; self?: { id?: string }; me?: { id?: string } }>("account");
+    return account?.id ?? account?.self?.id ?? account?.me?.id ?? null;
   }
 }
 

package/templates/appSample/ui/GlobalLoading.tsx

@@ -6,6 +6,7 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { a
     content: `"use client";
 
 import { cn } from "akanjs/client";
+import { Image } from "akanjs/ui";
 
 // ===== GlobalLoading.tsx =====
 // Convention: ui/ folder — reusable visual components. PascalCase .tsx, "use client" directive.
@@ -20,7 +21,7 @@ interface GlobalLoadingProps {
 export const GlobalLoading = ({ className, message = "Loading..." }: GlobalLoadingProps) => {
   return (
     <div className={cn("flex flex-col items-center justify-center gap-4 py-32", className)}>
-      <span className="inline-block size-8 animate-spin rounded-full border-2 border-primary border-t-transparent" />
+      <Image alt="" className="size-12 animate-bounce" height={96} src="/jelly/star.webp" width={96} />
       <span className="text-foreground/60 text-sm">{message}</span>
     </div>
   );

package/templates/appSample/ui/QuantityControl.tsx

@@ -6,7 +6,7 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { a
     content: `"use client";
 
 import { cn } from "akanjs/client";
-import { buttonRecipe } from "akanjs/ui";
+import { jellyButtonRecipe } from "./Recipe";
 
 // ===== QuantityControl.tsx =====
 // Convention: ui/ folder — reusable visual components. PascalCase .tsx, "use client" directive.
@@ -31,7 +31,7 @@ export const QuantityControl = ({
   return (
     <div className={cn("inline-flex items-center gap-1", className)}>
       <button
-        className={buttonRecipe({ variant: "outline", size: "icon" }, "size-6 rounded-full")}
+        className={jellyButtonRecipe({ variant: "default", size: "icon" }, "size-7")}
         disabled={value <= min}
         onClick={() => onChange(Math.max(min, value - 1))}
       >
@@ -39,7 +39,7 @@ export const QuantityControl = ({
       </button>
       <span className="w-8 text-center font-medium tabular-nums">{value}</span>
       <button
-        className={buttonRecipe({ variant: "outline", size: "icon" }, "size-6 rounded-full")}
+        className={jellyButtonRecipe({ variant: "default", size: "icon" }, "size-7")}
         disabled={value >= max}
         onClick={() => onChange(Math.min(max, value + 1))}
       >

package/templates/client.ts

@@ -4,36 +4,13 @@ const capitalize = (str: string) => str.charAt(0).toUpperCase() + str.slice(1);
 
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [key: string]: string } = {}) {
   if (!scanInfo) return null;
-  const databaseModules = [...scanInfo.database.entries()]
-    .filter(
-      ([_, fileTypes]) =>
-        fileTypes.has("template") ||
-        fileTypes.has("unit") ||
-        fileTypes.has("util") ||
-        fileTypes.has("view") ||
-        fileTypes.has("zone"),
-    )
-    .map(([key]) => key);
-  const scalarModules = [...scanInfo.scalar.entries()]
-    .filter(
-      ([_, fileTypes]) =>
-        fileTypes.has("template") ||
-        fileTypes.has("unit") ||
-        fileTypes.has("util") ||
-        fileTypes.has("view") ||
-        fileTypes.has("zone"),
-    )
-    .map(([key]) => key);
-  const serviceModules = [...scanInfo.service.entries()]
-    .filter(
-      ([_, fileTypes]) =>
-        fileTypes.has("template") ||
-        fileTypes.has("unit") ||
-        fileTypes.has("util") ||
-        fileTypes.has("view") ||
-        fileTypes.has("zone"),
-    )
-    .map(([key]) => key);
+  const uiModules = (modules: Map<string, Set<string>>) =>
+    [...modules.entries()]
+      .filter(([_, fileTypes]) => ["template", "unit", "util", "view", "zone"].some((type) => fileTypes.has(type)))
+      .map(([key]) => key);
+  const databaseModules = uiModules(scanInfo.database);
+  const scalarModules = uiModules(scanInfo.scalar);
+  const serviceModules = uiModules(scanInfo.service);
   return `
 export * as cnst from "./lib/cnst";
 export { msg, Err, usePage, fetch, sig } from "./lib/useClient";

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

@@ -4,12 +4,13 @@ interface Dict {
   Model: string;
   model: string;
   appName: string;
+  clientPath: string;
 }
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dict) {
   return {
     filename: "_index.tsx",
     content: `
-import { ${dict.Model}, fetch, usePage } from "@apps/${dict.appName}/client";
+import { ${dict.Model}, fetch, usePage } from "${dict.clientPath}";
 import { ID } from "akanjs/base";
 import { page } from "akanjs/client";
 import { Load } from "akanjs/ui";

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

@@ -4,12 +4,13 @@ interface Dict {
   Model: string;
   model: string;
   appName: string;
+  clientPath: string;
 }
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dict) {
   return {
     filename: "_index.tsx",
     content: `
-import { ${dict.Model}, fetch, usePage } from "@apps/${dict.appName}/client";
+import { ${dict.Model}, fetch, usePage } from "${dict.clientPath}";
 import { ID } from "akanjs/base";
 import { page } from "akanjs/client";
 import { buttonRecipe, Link } from "akanjs/ui";

package/templates/crudPages/new/page.tsx

@@ -4,12 +4,13 @@ interface Dict {
   Model: string;
   model: string;
   appName: string;
+  clientPath: string;
 }
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dict) {
   return {
     filename: "_index.tsx",
     content: `
-import { type cnst, fetch, usePage, ${dict.Model} } from "@apps/${dict.appName}/client";
+import { type cnst, fetch, usePage, ${dict.Model} } from "${dict.clientPath}";
 import { page } from "akanjs/client";
 import { Load } from "akanjs/ui";
 

package/templates/crudPages/page.tsx

@@ -4,12 +4,13 @@ interface Dict {
   Model: string;
   model: string;
   appName: string;
+  clientPath: string;
 }
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dict) {
   return {
     filename: "_index.tsx",
     content: `
-import { ${dict.Model}, fetch, usePage } from "@apps/${dict.appName}/client";
+import { ${dict.Model}, fetch, usePage } from "${dict.clientPath}";
 import { page } from "akanjs/client";
 import { buttonRecipe, Link } from "akanjs/ui";
 

package/templates/crudSinglePage/page.tsx

@@ -4,12 +4,13 @@ interface Dict {
   Model: string;
   model: string;
   appName: string;
+  clientPath: string;
 }
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: Dict) {
   return {
     filename: "_index.tsx",
     content: `
-import { ${dict.Model}, fetch, usePage } from "@apps/${dict.appName}/client";
+import { ${dict.Model}, fetch, usePage } from "${dict.clientPath}";
 import { page } from "akanjs/client";
 import { buttonRecipe, Model } from "akanjs/ui";
 

package/templates/lib/__lib/lib.dictionary.ts

@@ -1,7 +1,5 @@
 import type { AppInfo, LibInfo } from "akanjs";
 
-const capitalize = (str: string) => str.charAt(0).toUpperCase() + str.slice(1);
-
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [key: string]: string } = {}) {
   if (!scanInfo) return null;
   const libs = scanInfo.getLibs();

package/templates/lib/__lib/lib.document.ts

@@ -1,7 +1,5 @@
 import type { AppInfo, LibInfo } from "akanjs";
 
-const capitalize = (str: string) => str.charAt(0).toUpperCase() + str.slice(1);
-
 export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [key: string]: string } = {}) {
   if (!scanInfo) return null;
   const libs = scanInfo.getLibs();

package/templates/lib/sig.ts

@@ -13,6 +13,8 @@ export default function getContent(scanInfo: AppInfo | LibInfo | null, dict: { [
   const libs = scanInfo.getLibs();
 
   const signalNames = [...(libs.length === 0 ? ["base"] : libs), ...databaseModules, ...serviceModules];
+  const serverSignalClass = (module: string) =>
+    `export class ${capitalize(module)} extends serverSignal(${module}Sig.${capitalize(module)}Endpoint, ${module}Sig.${capitalize(module)}Internal) {}`;
 
   return `
 import { FetchClient, type FetchClientType } from "akanjs/fetch";
@@ -20,38 +22,14 @@ import { SignalRegistry, serverSignal${libs.length === 0 ? ", fetch as base" : "
 import { Err } from "./dict";
 ${libs.map((lib) => `import { fetch as ${lib} } from "@libs/${lib}/lib/sig";`).join("\n")}
 
-${[...scanInfo.database.entries()]
-  .filter(([_, files]) => files.has("signal"))
-  .map(([module]) => `import * as ${module}Sig from "./${module}/${module}.signal";`)
-  .join("\n")}
-${[...scanInfo.service.entries()]
-  .filter(([_, files]) => files.has("signal"))
-  .map(([module]) => `import * as ${module}Sig from "./_${module}/${module}.signal";`)
-  .join("\n")}
+${databaseModules.map((module) => `import * as ${module}Sig from "./${module}/${module}.signal";`).join("\n")}
+${serviceModules.map((module) => `import * as ${module}Sig from "./_${module}/${module}.signal";`).join("\n")}
 
-${[...scanInfo.database.entries()]
-  .filter(([_, files]) => files.has("signal"))
-  .map(([module]) => `export * from "./${module}/${module}.signal";`)
-  .join("\n")}
-${[...scanInfo.service.entries()]
-  .filter(([_, files]) => files.has("signal"))
-  .map(([module]) => `export * from "./_${module}/${module}.signal";`)
-  .join("\n")}
+${databaseModules.map((module) => `export * from "./${module}/${module}.signal";`).join("\n")}
+${serviceModules.map((module) => `export * from "./_${module}/${module}.signal";`).join("\n")}
 
-${[...scanInfo.database.entries()]
-  .filter(([_, files]) => files.has("signal"))
-  .map(
-    ([module]) =>
-      `export class ${capitalize(module)} extends serverSignal(${module}Sig.${capitalize(module)}Endpoint, ${module}Sig.${capitalize(module)}Internal) {}`,
-  )
-  .join("\n")}
-${[...scanInfo.service.entries()]
-  .filter(([_, files]) => files.has("signal"))
-  .map(
-    ([module]) =>
-      `export class ${capitalize(module)} extends serverSignal(${module}Sig.${capitalize(module)}Endpoint, ${module}Sig.${capitalize(module)}Internal) {}`,
-  )
-  .join("\n")}
+${databaseModules.map(serverSignalClass).join("\n")}
+${serviceModules.map(serverSignalClass).join("\n")}
 
 ${databaseModules.map((module) => `export const ${module} = SignalRegistry.registerDatabase("${module}" as const, ${module}Sig.${capitalize(module)}Internal, ${module}Sig.${capitalize(module)}Endpoint, ${module}Sig.${capitalize(module)}Slice, ${capitalize(module)});`).join("\n")}
 ${serviceModules.map((module) => `export const ${module} = SignalRegistry.registerService("${module}" as const, ${module}Sig.${capitalize(module)}Internal, ${module}Sig.${capitalize(module)}Endpoint, ${capitalize(module)});`).join("\n")}

package/templates/localDev/docker-compose.yaml.template

@@ -1,29 +1,18 @@
-version: "3.8"
 networks:
   <%= repoName %>-network:
     driver: bridge
 services:
   redis:
     container_name: <%= repoName %>-redis
-    image: redis
+    image: redis:8
     restart: unless-stopped
     ports:
       - 6379:6379
     networks:
       - <%= repoName %>-network
-  libsql:
-    container_name: <%= repoName %>-libsql
-    image: ghcr.io/tursodatabase/libsql-server:latest
-    restart: unless-stopped
-    ports:
-      - 8080:8080
-    volumes:
-      - ./libsql:/var/lib/sqld
-    networks:
-      - <%= repoName %>-network
   postgres:
     container_name: <%= repoName %>-postgres
-    image: postgres:17
+    image: postgres:18
     restart: unless-stopped
     ports:
       - 5432:5432
@@ -32,6 +21,6 @@ services:
       - POSTGRES_USER=akan
       - POSTGRES_PASSWORD=akan
     volumes:
-      - ./postgres:/var/lib/postgresql/data
+      - ./postgres:/var/lib/postgresql
     networks:
       - <%= repoName %>-network