@akanjs/cli 3.0.0-beta.19 → 3.0.0-beta.20

package/{recipeScanner-fpagtgc1.js → recipeScanner-4b69ybe0.js}

@@ -3,7 +3,7 @@ import {
   collectRecipeSources2,
   scanRecipes2,
   findInlineRecipeDuplicates2
-} from "./index-by5gpp8x.js";
+} from "./index-hj6w4ka1.js";
 export {
   collectRecipeSources2 as collectRecipeSources,
   findInlineRecipeDuplicates2 as findInlineRecipeDuplicates,

package/{repair.command-pkrsm3cw.js → repair.command-chsnjvvv.js}

@@ -3,34 +3,21 @@ import {
   Workspace,
   script,
   command
-} from "./index-qdgzsnhg.js";
-import"./index-q0y2jq9j.js";
-import"./index-crmeqnmf.js";
-import"./index-6wwzs1bc.js";
-import"./index-by5gpp8x.js";
-import"./index-2446k7b4.js";
-import"./index-18zybgkc.js";
+} from "./index-w2zdcw3k.js";
+import"./index-5b6tavv3.js";
+import"./index-9d9bgcx4.js";
+import"./index-hj6w4ka1.js";
+import"./index-myhc3c1j.js";
+import"./index-ygn77a5w.js";
 import {
   RepairRunner
-} from "./index-53176s7j.js";
+} from "./index-31yr441d.js";
 
 // pkgs/@akanjs/cli/repair/repair.script.ts
 import { Logger } from "akanjs/common";
 class RepairScript extends script("repair", [RepairRunner]) {
-  async repair(kind, {
-    workspace,
-    app = null,
-    module = null,
-    target = null,
-    format = "markdown"
-  }) {
-    Logger.rawLog(await this.repairRunner.repair(kind, {
-      workspace,
-      app,
-      module,
-      target,
-      format
-    }));
+  async repair(kind, options) {
+    Logger.rawLog(await this.repairRunner.repair(kind, options));
   }
 }
 
@@ -39,12 +26,7 @@ class RepairCommand extends command("repair", [RepairScript], ({ public: target
   repair: target({ desc: "Run a narrow Akan repair command and return a structured report" }).arg("kind", String, {
     desc: "generated, format, imports, dictionary, or module-shape",
     enum: ["generated", "format", "imports", "dictionary", "module-shape"]
-  }).with(Workspace).option("format", String, {
-    desc: "output format",
-    flag: "o",
-    default: "markdown",
-    enum: ["markdown", "json"]
-  }).option("app", String, {
+  }).with(Workspace).option("format", String, { desc: "output format", flag: "o", default: "markdown", enum: ["markdown", "json"] }).option("app", String, {
     desc: "target app or library for generated/dictionary/module-shape repair",
     nullable: true
   }).option("module", String, { desc: "target module for dictionary/module-shape repair", nullable: true }).option("target", String, {
@@ -52,13 +34,7 @@ class RepairCommand extends command("repair", [RepairScript], ({ public: target
     desc: "target app, library, or package for format/imports repair",
     nullable: true
   }).exec(async function(kind, workspace, format, app, module, targetName) {
-    await this.repairScript.repair(kind, {
-      workspace,
-      format,
-      app,
-      module,
-      target: targetName
-    });
+    await this.repairScript.repair(kind, { workspace, format, app, module, target: targetName });
   })
 })) {
 }

package/{scalar.command-0cpt3fc8.js → scalar.command-2v21newx.js}

@@ -2,16 +2,15 @@
 import {
   Sys,
   command
-} from "./index-qdgzsnhg.js";
-import"./index-q0y2jq9j.js";
-import"./index-crmeqnmf.js";
-import"./index-6wwzs1bc.js";
+} from "./index-w2zdcw3k.js";
+import"./index-5b6tavv3.js";
+import"./index-9d9bgcx4.js";
 import {
   renderPrimitiveReport
-} from "./index-2446k7b4.js";
+} from "./index-myhc3c1j.js";
 import {
   ScalarScript
-} from "./index-4m929vvn.js";
+} from "./index-3sq321ak.js";
 
 // pkgs/@akanjs/cli/scalar/scalar.command.ts
 import { Logger, lowerlize } from "akanjs/common";

package/skills/akan-code/SKILL.md

@@ -15,8 +15,9 @@ which command makes it take effect.
 
 ## MCP servers
 
-Declared in **`.akan/code/mcp.json`**, in the same `mcpServers` shape Claude, Cursor and VS Code already
-write, so a block can be pasted across rather than translated. VS Code's `servers` spelling is read too, and
+Declared in **`~/.akan/code/mcp.json`**, which every repo reads, or in this repo's **`.akan/code/mcp.json`**,
+which wins a name both declare — in the same `mcpServers` shape Claude, Cursor and VS Code already write, so a
+block can be pasted across rather than translated. VS Code's `servers` spelling is read too, and
 whichever key the file already uses is the one a write goes back into.
 
 ```jsonc
@@ -41,7 +42,9 @@ From the prompt:
 /mcp <name>               the tools that one server published
 /mcp add <name> <command> [args…]
 /mcp add <name> <https://…>
-/mcp remove <name>
+/mcp add --local <name> … this repo's file only, not ~/.akan/code/mcp.json
+/mcp remove <name>        this repo's file first, else ~/.akan/code/mcp.json
+/mcp remove --local <name>
 /mcp login <name>         OAuth, in the browser
 /mcp logout <name>        forget the token, leaving the server declared
 /mcp reload               reopen this session so the file takes effect
@@ -52,11 +55,16 @@ session is created, so `add`, `remove`, `login` and `logout` all reload by thems
 said nothing yet has nothing on disk to reopen, and says so. If you edit `mcp.json` yourself, tell the user to
 run `/mcp reload`.
 
+`/mcp remove` on a name both files declare takes this repo's entry and leaves the home file's in force; its
+notice says so, and running it again removes that one too.
+
 Sign-in is discovered, not configured: the server's `401` names its resource metadata, that names the
 authorization server, and most hosted servers register a client on demand — so a url is usually the whole
 entry. For a provider that issues client ids by hand, add `"oauth": { "clientId": "…", "scope": "…" }`.
 Tokens are stored per server in `~/.akan/code/mcpAuth.json` at mode 0600, never in the repo, and refreshed
-silently; `/mcp` shows `sign-in needed` when a server wants one.
+silently — at connect when one has expired, and mid-session when a server refuses one, after which the call is
+retried once. When a refresh cannot fix it, `/mcp` shows `sign-in needed` and that server's tools answer with
+`/mcp login <name>` until the user signs in; the sign-in reloads the session, which brings the server back.
 
 ## Sessions
 

package/{subspace.command-fktpwp0g.js → subspace.command-ckcbwfp1.js}

@@ -1,29 +1,28 @@
 // @bun
 import {
-  FileSys
-} from "./index-q0y2jq9j.js";
+  FileSys2
+} from "./index-5b6tavv3.js";
 import {
   GlobalConfig
-} from "./index-srmay5jw.js";
+} from "./index-22d57v4c.js";
 import {
   Workspace,
   CommandContainer,
   runner,
   script,
   command
-} from "./index-qdgzsnhg.js";
+} from "./index-w2zdcw3k.js";
 import {
   Executor,
   WorkspaceExecutor,
   AppExecutor
-} from "./index-crmeqnmf.js";
-import"./index-6wwzs1bc.js";
+} from "./index-9d9bgcx4.js";
 import {
   SlicePlanner
-} from "./index-kwaq3n9n.js";
+} from "./index-xqjwd384.js";
 import {
   LibSource
-} from "./index-3d9y066c.js";
+} from "./index-bjwxs904.js";
 
 // pkgs/@akanjs/devkit/subspace.ts
 import { mkdir, readdir, rename, rm } from "fs/promises";
@@ -118,16 +117,16 @@ class Subspace {
       return true;
     const normalize = (content) => {
       try {
-        const manifest = JSON.parse(content);
-        delete manifest[LibSource.manifestKey];
-        return JSON.stringify(manifest);
+        return LibSource.unstamped(content);
       } catch {
         return content;
       }
     };
     return normalize(theirs) !== normalize(ours);
   }
-  async#meaningfulFiles(ref, files) {
+  async#changedSliceFiles(ref, diffArgs) {
+    const files = (await this.#git(["diff", "--name-only", ...diffArgs])).split(`
+`).filter((file) => !!file.trim() && !this.#isSubspaceOwned(file));
     const kept = await Promise.all(files.map(async (file) => this.#isStamped(file) ? await this.#differsBeyondStamp(ref, file) : true));
     return files.filter((_, index) => kept[index]);
   }
@@ -140,14 +139,12 @@ class Subspace {
     if (!hasBranch)
       return { name: this.name, branch, hasBranch, anchor, behindPaths: [], driftedLibs: [] };
     const ref = `${this.#remote}/${branch}`;
-    const diff = await this.#git(["diff", "--name-only", "HEAD", ref, "--", ...paths]);
-    const behindPaths = await this.#meaningfulFiles(ref, diff.split(`
-`).filter((file) => !!file.trim()).filter((file) => !this.#isSubspaceOwned(file)));
+    const behindPaths = await this.#changedSliceFiles(ref, ["HEAD", ref, "--", ...paths]);
     const driftedLibs = libs.filter((lib) => behindPaths.some((file) => file.startsWith(`libs/${lib}/`)));
     return { name: this.name, branch, hasBranch, anchor, behindPaths, driftedLibs };
   }
   async#ensureClone(branch) {
-    if (!await FileSys.dirExists(path.join(this.#clonePath, ".git"))) {
+    if (!await FileSys2.dirExists(path.join(this.#clonePath, ".git"))) {
       await rm(this.#clonePath, { recursive: true, force: true });
       await mkdir(path.dirname(this.#clonePath), { recursive: true });
       await this.#workspace.spawn("git", ["clone", "--quiet", this.#declaration.repo, this.#clonePath]);
@@ -164,12 +161,12 @@ class Subspace {
     await rm(holdRoot, { recursive: true, force: true });
     for (const member of Subspace.memberDirs) {
       const memberRoot = path.join(this.#clonePath, member);
-      if (!await FileSys.dirExists(memberRoot))
+      if (!await FileSys2.dirExists(memberRoot))
         continue;
       for (const name of await readdir(memberRoot)) {
         for (const owned of Subspace.subspaceOwnedDirs) {
           const from = path.join(memberRoot, name, owned);
-          if (!await FileSys.dirExists(from))
+          if (!await FileSys2.dirExists(from))
             continue;
           const to = path.join(holdRoot, member, name, owned);
           await mkdir(path.dirname(to), { recursive: true });
@@ -192,7 +189,7 @@ class Subspace {
       const target = path.join(to, entry.name);
       if (entry.isDirectory())
         await Subspace.#copyMissing(source, target);
-      else if (!await FileSys.entryExists(target))
+      else if (!await FileSys2.entryExists(target))
         await rename(source, target);
     }
   }
@@ -225,32 +222,32 @@ class Subspace {
   }
   async#writeLocalEnv() {
     const excludePath = path.join(this.#clonePath, ".git/info/exclude");
-    const exclude = await FileSys.fileExists(excludePath) ? await FileSys.readText(excludePath) : "";
+    const exclude = await FileSys2.fileExists(excludePath) ? await FileSys2.readText(excludePath) : "";
     if (!exclude.split(`
 `).includes("/.env")) {
       await mkdir(path.dirname(excludePath), { recursive: true });
-      await FileSys.writeText(excludePath, exclude.trim() ? `${exclude.replace(/\n*$/, `
+      await FileSys2.writeText(excludePath, exclude.trim() ? `${exclude.replace(/\n*$/, `
 `)}/.env
 ` : `/.env
 `);
     }
     const envPath = path.join(this.#clonePath, ".env");
-    if (await FileSys.fileExists(envPath))
+    if (await FileSys2.fileExists(envPath))
       return;
     const lines = Object.entries(this.#localEnv()).map(([key, value]) => `${key}=${value}`);
-    await FileSys.writeText(envPath, `${lines.join(`
+    await FileSys2.writeText(envPath, `${lines.join(`
 `)}
 `);
   }
   async#rewriteManifest(plans) {
     const manifestPath = path.join(this.#clonePath, "package.json");
-    if (!await FileSys.fileExists(manifestPath))
+    if (!await FileSys2.fileExists(manifestPath))
       return [];
-    const rootPackageJson = await FileSys.readJson(manifestPath);
+    const rootPackageJson = await FileSys2.readJson(manifestPath);
     const { packageJson, pruned, warnings } = await SlicePlanner.pruneDependencies(this.#workspace, rootPackageJson, plans.flatMap((plan) => plan.requiredDependencies));
     for (const warning of warnings)
       this.#workspace.logger.warn(warning);
-    await FileSys.writeJson(manifestPath, {
+    await FileSys2.writeJson(manifestPath, {
       ...packageJson,
       name: this.name,
       description: `${this.name} workspace`
@@ -277,10 +274,10 @@ class Subspace {
   }
   async#rewriteGitignore() {
     const gitignorePath = path.join(this.#clonePath, ".gitignore");
-    if (!await FileSys.fileExists(gitignorePath))
+    if (!await FileSys2.fileExists(gitignorePath))
       return;
     const [begin = "", end = ""] = Subspace.secretsMarkers;
-    const lines = (await FileSys.readText(gitignorePath)).split(/\r?\n/);
+    const lines = (await FileSys2.readText(gitignorePath)).split(/\r?\n/);
     const beginIdx = lines.indexOf(begin);
     const endIdx = lines.indexOf(end);
     const filtered = beginIdx >= 0 && endIdx > beginIdx ? [
@@ -288,7 +285,7 @@ class Subspace {
       ...lines.slice(beginIdx + 1, endIdx).filter((line) => this.#declaration.apps.some((app) => line.startsWith(`apps/${app}/`))),
       ...lines.slice(endIdx)
     ] : lines;
-    await FileSys.writeText(gitignorePath, filtered.filter((line) => line.trim() !== "**/bun.lock").join(`
+    await FileSys2.writeText(gitignorePath, filtered.filter((line) => line.trim() !== "**/bun.lock").join(`
 `));
   }
   async#rewriteWorkspaceSection(libs) {
@@ -299,27 +296,27 @@ class Subspace {
     ];
     for (const file of ["AGENTS.md", "CLAUDE.md"]) {
       const filePath = path.join(this.#clonePath, file);
-      if (!await FileSys.fileExists(filePath))
+      if (!await FileSys2.fileExists(filePath))
         continue;
-      const content = await FileSys.readText(filePath);
+      const content = await FileSys2.readText(filePath);
       const rewritten = replacements.reduce((text, [pattern, value]) => text.replace(pattern, value), content);
       if (rewritten !== content)
-        await FileSys.writeText(filePath, rewritten);
+        await FileSys2.writeText(filePath, rewritten);
     }
   }
   async#stampLib(clone, lib, branch) {
     const manifestPath = path.join(this.#clonePath, "libs", lib, "package.json");
-    if (!await FileSys.fileExists(manifestPath))
+    if (!await FileSys2.fileExists(manifestPath))
       return;
     const origin = `${this.#workspace.repoName}#${branch}`;
     const sha = await this.headSha();
     const [hash, previous] = await Promise.all([this.#hashLib(clone, lib), this.#committedStamp(clone, lib)]);
-    const manifest = await FileSys.readJson(manifestPath);
+    const manifest = await FileSys2.readJson(manifestPath);
     const akan = manifest[LibSource.manifestKey] ?? {};
     const unchanged = previous?.origin === origin && previous.sha === sha && previous.hash === hash;
     const syncedAt = unchanged ? previous.syncedAt : new Date().toISOString();
     manifest[LibSource.manifestKey] = { ...akan, source: { origin, sha, hash, syncedAt } };
-    await FileSys.writeJson(manifestPath, manifest);
+    await FileSys2.writeJson(manifestPath, manifest);
   }
   async#committedStamp(clone, lib) {
     try {
@@ -342,22 +339,9 @@ class Subspace {
       `libs/${lib}`
     ]);
     const candidates = listed.split("\x00").filter((file) => !!file && !this.#isSubspaceOwned(file)).sort();
-    const present = await Promise.all(candidates.map(async (file) => await FileSys.entryExists(path.join(this.#clonePath, file))));
+    const present = await Promise.all(candidates.map(async (file) => await FileSys2.entryExists(path.join(this.#clonePath, file))));
     const files = candidates.filter((_, index) => present[index]);
-    const hasher = new Bun.CryptoHasher("sha256");
-    for (const file of files) {
-      const content = await FileSys.readText(path.join(this.#clonePath, file));
-      hasher.update(file);
-      hasher.update("\x00");
-      if (file === `libs/${lib}/package.json`) {
-        const manifest = JSON.parse(content);
-        delete manifest[LibSource.manifestKey];
-        hasher.update(JSON.stringify(manifest));
-      } else
-        hasher.update(content);
-      hasher.update("\x00");
-    }
-    return hasher.digest("hex").slice(0, 32);
+    return await LibSource.hashFiles(files, `libs/${lib}/package.json`, (file) => FileSys2.readText(path.join(this.#clonePath, file)));
   }
   async diff(branch, filter) {
     if (!await this.fetch(branch))
@@ -376,10 +360,7 @@ class Subspace {
     if (!scoped.length)
       return { files: [], patch: "" };
     const from = `${this.#remote}/${branch}`;
-    const pathspec = filter ? [filter] : scoped;
-    const names = await this.#git(["diff", "--name-only", from, "HEAD", "--", ...pathspec]);
-    const files = await this.#meaningfulFiles(from, names.split(`
-`).filter((file) => !!file.trim()).filter((file) => !this.#isSubspaceOwned(file)));
+    const files = await this.#changedSliceFiles(from, [from, "HEAD", "--", ...filter ? [filter] : scoped]);
     if (!files.length)
       return { files: [], patch: "" };
     return { files, patch: await this.#git(["diff", from, "HEAD", "--", ...files]) };
@@ -433,7 +414,7 @@ class Subspace {
     };
   }
   async#writeAnchorFile(branch) {
-    await FileSys.writeJson(path.join(this.#clonePath, Subspace.anchorFile), {
+    await FileSys2.writeJson(path.join(this.#clonePath, Subspace.anchorFile), {
       workspace: this.#workspace.repoName,
       hubSha: await this.headSha(),
       branch,
@@ -470,7 +451,7 @@ class Subspace {
   async#savePatch(range, files, label) {
     const patchPath = path.join(this.#workspace.workspaceRoot, ".akan/subspace", `${this.name}-${label}.patch`);
     await mkdir(path.dirname(patchPath), { recursive: true });
-    await FileSys.writeText(patchPath, await this.#git(["diff", range, "--", ...files]));
+    await FileSys2.writeText(patchPath, await this.#git(["diff", range, "--", ...files]));
     return { path: path.relative(this.#workspace.workspaceRoot, patchPath), absolute: patchPath, files };
   }
 }
@@ -592,7 +573,7 @@ class SubspaceConfig {
   static defaultPushableBranches = ["main", "develop", "debug"];
   static async from(workspace) {
     const configPath = path2.join(workspace.workspaceRoot, SubspaceConfig.fileName);
-    if (!await FileSys.fileExists(configPath))
+    if (!await FileSys2.fileExists(configPath))
       return null;
     const input = await import(configPath).then((mod) => mod.default);
     return new SubspaceConfig(input);
@@ -735,7 +716,7 @@ class SubspaceRunner extends runner("subspace") {
     if (!asked)
       return { name: subspace.name, workspaceId, host, apps, libs: [], outcome: "cancelled", files: [] };
     const { libs } = await subspace.slice();
-    const { CloudScript } = await import("./cloud.script-fwx3vb34.js");
+    const { CloudScript } = await import("./cloud.script-bkbpcr96.js");
     const { files } = await CommandContainer.get(CloudScript).uploadEnv(workspace, {
       host,
       workspaceId,

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 {

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

@@ -2,15 +2,15 @@ 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> {

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/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/server.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/{tunnel.command-d5jy9gk8.js → tunnel.command-kd2yr4fx.js}

@@ -1,22 +1,21 @@
 // @bun
-import"./index-q0y2jq9j.js";
+import"./index-5b6tavv3.js";
 import {
   GlobalConfig,
   CloudApi
-} from "./index-srmay5jw.js";
+} from "./index-22d57v4c.js";
 import {
   Workspace,
   runner,
   script,
   command
-} from "./index-qdgzsnhg.js";
+} from "./index-w2zdcw3k.js";
 import {
   AppExecutor
-} from "./index-crmeqnmf.js";
-import"./index-6wwzs1bc.js";
+} from "./index-9d9bgcx4.js";
 import {
   TunnelShare2
-} from "./index-n3cv0tm4.js";
+} from "./index-smme4r47.js";
 import {
   writeClipboard
 } from "./index-p6pbz9n5.js";

package/{typeChecker-3xgrzc2v.js → typeChecker-px49mezc.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   TypeChecker2
-} from "./index-92zztqy1.js";
+} from "./index-dy0jx9ay.js";
 export {
   TypeChecker2 as TypeChecker
 };

package/typecheck.proc.js

@@ -1,7 +1,7 @@
 // @bun
 import {
   TypeChecker2
-} from "./index-92zztqy1.js";
+} from "./index-dy0jx9ay.js";
 
 // pkgs/@akanjs/devkit/typecheck/typecheck.proc.ts
 import { Logger } from "akanjs/common";