@akanjs/cli 3.0.2-rc.0 → 3.1.0-rc.0

package/templates/lib/cnst.ts

@@ -21,9 +21,9 @@ ${databaseModules.map((module) => `export * from "./${module}/${module}.constant
 ${databaseModules
   .map((module) => {
     const names = { Module: capitalize(module) };
-    return `export const ${module} = ConstantRegistry.buildModel("${module}" as const, ${module}Cnst.${names.Module}Input, ${module}Cnst.${names.Module}Object, ${module}Cnst.${names.Module}, ${module}Cnst.Light${names.Module}, ${module}Cnst.${names.Module}Insight, ${module}Cnst);`;
+    return `export const ${module} = ConstantRegistry.buildModel("${module}" as const, ${module}Cnst.${names.Module}Input, ${module}Cnst.${names.Module}Object, ${module}Cnst.${names.Module}, ${module}Cnst.Light${names.Module}, ${module}Cnst.${names.Module}Insight, ${module}Cnst, "${scanInfo.name}");`;
   })
   .join("\n")}
-${scalarModules.map((module) => `export const ${module} = ConstantRegistry.buildScalar("${module}" as const, ${module}Cnst.${capitalize(module)}, ${module}Cnst);`).join("\n")}
+${scalarModules.map((module) => `export const ${module} = ConstantRegistry.buildScalar("${module}" as const, ${module}Cnst.${capitalize(module)}, ${module}Cnst, "${scanInfo.name}");`).join("\n")}
 `;
 }

package/templates/lib/sig.ts

@@ -31,8 +31,8 @@ ${serviceModules.map((module) => `export * from "./_${module}/${module}.signal";
 ${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")}
+${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)}, "${scanInfo.name}");`).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)}, "${scanInfo.name}");`).join("\n")}
 
 export const fetchSignals = [${signalNames.join(", ")}] as const;
 export type Fetch = FetchClientType<typeof fetchSignals>;
@@ -41,6 +41,6 @@ export const fetch = FetchClient.from(...fetchSignals) as unknown as Fetch;
 // dictionary key and data instead of answering the original caller with Internal Server Error.
 fetch.setErrorConstructor(Err);
 
-export const getSerializedSignal = () => fetch.serializedSignal
+export const getSerializedSignal = () => fetch.ownSerializedSignal
 `;
 }

package/{tunnel.command-b3ymdk4f.js → tunnel.command-9x8nfn75.js}

@@ -1,21 +1,21 @@
 // @bun
-import"./index-52w0fvh8.js";
-import {
-  GlobalConfig,
-  CloudApi
-} from "./index-94s080qm.js";
 import {
   Workspace,
   runner,
   script,
   command
-} from "./index-q6ft9fkc.js";
+} from "./index-6jjtnhkw.js";
+import"./index-52w0fvh8.js";
 import {
   AppExecutor
-} from "./index-50wb2a26.js";
+} from "./index-55mynnqs.js";
+import {
+  GlobalConfig,
+  CloudApi
+} from "./index-r2tpeb3n.js";
 import {
   TunnelShare2
-} from "./index-2wc41k5w.js";
+} from "./index-7bymavqk.js";
 import {
   writeClipboard
 } from "./index-p6pbz9n5.js";
@@ -46,8 +46,8 @@ class TunnelRunner extends runner("tunnel") {
 `));
     await TunnelRunner.holdUntilInterrupt(() => share.close());
   }
-  async list(workspace, host = GlobalConfig.akanCloudHost) {
-    const api = await CloudApi.fromHost(workspace, host);
+  async list(workspace, host) {
+    const api = await CloudApi.fromHost(workspace, await GlobalConfig.hostFor(workspace, host));
     const tunnels = await api.tunnelListInSelf();
     if (!tunnels.length) {
       Logger.rawLog("No tunnels are open.");
@@ -56,8 +56,8 @@ class TunnelRunner extends runner("tunnel") {
     for (const tunnel of tunnels)
       Logger.rawLog(`${tunnel.connected ? chalk.green("\u25CF") : chalk.dim("\u25CB")} ${tunnel.code}  ${tunnel.url}` + `${tunnel.name ? `  ${chalk.dim(tunnel.name)}` : ""}` + `${tunnel.expiresAt ? chalk.dim(`  expires ${tunnel.expiresAt}`) : ""}`);
   }
-  async stop(code, workspace, host = GlobalConfig.akanCloudHost) {
-    const api = await CloudApi.fromHost(workspace, host);
+  async stop(code, workspace, host) {
+    const api = await CloudApi.fromHost(workspace, await GlobalConfig.hostFor(workspace, host));
     const stopped = await api.revokeTunnel(code);
     if (stopped)
       Logger.rawLog(`Stopped ${code}.`);
@@ -115,7 +115,10 @@ class TunnelScript extends script("tunnel", [TunnelRunner]) {
 
 // pkgs/@akanjs/cli/tunnel/tunnel.command.ts
 class TunnelCommand extends command("tunnel", [TunnelScript], ({ public: target }) => ({
-  tunnel: target({ desc: "Share a locally running app on a public URL" }).arg("app", String, { desc: "app to share", nullable: true }).option("list", Boolean, { desc: "list the shares this account is holding", default: false }).option("stop", String, { desc: "stop the share with this code", default: "" }).option("host", String, { desc: "host of the cloud", default: GlobalConfig.akanCloudHost }).option("port", Number, { desc: "local port to share (default: the app's dev port)", nullable: true }).option("ttl", Number, { desc: "minutes before the share expires", nullable: true }).with(Workspace).exec(async function(app, list, stop, host, port, ttl, workspace) {
+  tunnel: target({ desc: "Share a locally running app on a public URL" }).arg("app", String, { desc: "app to share", nullable: true }).option("list", Boolean, { desc: "list the shares this account is holding", default: false }).option("stop", String, { desc: "stop the share with this code", default: "" }).option("host", String, {
+    desc: "host of the cloud (default: cloud.host of the root akan.config.ts, else Akan Cloud)",
+    nullable: true
+  }).option("port", Number, { desc: "local port to share (default: the app's dev port)", nullable: true }).option("ttl", Number, { desc: "minutes before the share expires", nullable: true }).with(Workspace).exec(async function(app, list, stop, host, port, ttl, workspace) {
     if (list)
       return await this.tunnelScript.list(workspace, host);
     if (stop)

package/{workflow.command-z1srcdfw.js → workflow.command-jx0wag5r.js}

@@ -3,20 +3,20 @@ import {
   Workspace,
   script,
   command
-} from "./index-q6ft9fkc.js";
+} from "./index-6jjtnhkw.js";
 import"./index-52w0fvh8.js";
-import"./index-50wb2a26.js";
+import"./index-55mynnqs.js";
 import"./index-hj6w4ka1.js";
-import"./index-h9ht6s60.js";
-import"./index-zyw622y1.js";
-import"./index-g38nhv87.js";
-import"./index-f4e08ptp.js";
-import"./index-6keyf4sg.js";
-import"./index-hp3stk1m.js";
-import"./index-cb6yc5mb.js";
+import"./index-05g3jayg.js";
+import"./index-2mx692qq.js";
+import"./index-2etcv0sc.js";
+import"./index-e0cvze1s.js";
+import"./index-ctanya41.js";
+import"./index-fm46xrf1.js";
+import"./index-c76k723e.js";
 import {
   WorkflowRunner
-} from "./index-bsv901fd.js";
+} from "./index-rwq3ekqc.js";
 
 // pkgs/@akanjs/cli/workflow/workflow.script.ts
 import { Logger } from "akanjs/common";

package/{workspace.command-17c46dbp.js → workspace.command-cmj6mqyk.js}

@@ -1,17 +1,14 @@
 // @bun
-import {
-  FileSys2
-} from "./index-52w0fvh8.js";
-import {
-  GlobalConfig
-} from "./index-94s080qm.js";
 import {
   Exec,
   Workspace,
   runner,
   script,
   command
-} from "./index-q6ft9fkc.js";
+} from "./index-6jjtnhkw.js";
+import {
+  FileSys2
+} from "./index-52w0fvh8.js";
 import {
   extractAgentBlock,
   collectScopeRecipeSources,
@@ -22,7 +19,7 @@ import {
   AppExecutor,
   LibExecutor,
   PkgExecutor
-} from "./index-50wb2a26.js";
+} from "./index-55mynnqs.js";
 import {
   countBlocking,
   formatStyleContract,
@@ -32,45 +29,48 @@ import {
   collectRecipeSources2,
   scanRecipes2
 } from "./index-hj6w4ka1.js";
-import"./index-h9ht6s60.js";
-import"./index-zyw622y1.js";
+import"./index-05g3jayg.js";
+import"./index-2mx692qq.js";
 import"./index-zzvvc845.js";
 import {
   AgentScript
-} from "./index-1gs9g12n.js";
-import"./index-senscydg.js";
-import"./index-jk9xnck6.js";
+} from "./index-v29746vb.js";
+import"./index-k9rrten6.js";
+import"./index-kjvrq3nc.js";
 import {
   LibraryScript
-} from "./index-1bjkfvm9.js";
+} from "./index-c1x0be5j.js";
 import {
   ApplicationScript
-} from "./index-61mmsdjg.js";
+} from "./index-p9ystjrp.js";
 import"./index-7md2g9vw.js";
+import"./index-r2tpeb3n.js";
 import"./index-2ahj896a.js";
 import {
   PackageScript
-} from "./index-3xmzr1p1.js";
+} from "./index-gnyf1fqy.js";
 import {
   getNpmRegistryUrl,
   getLatestPackageVersion
-} from "./index-hxnnfy57.js";
+} from "./index-y8q31011.js";
 import {
   CloudScript2
-} from "./index-gvpvxdm1.js";
-import"./index-j38qkvkk.js";
-import"./index-hp3stk1m.js";
-import"./index-g38nhv87.js";
-import"./index-f4e08ptp.js";
-import"./index-6keyf4sg.js";
-import"./index-cb6yc5mb.js";
-import"./index-bsv901fd.js";
+} from "./index-tn4rpqp1.js";
+import"./index-0bm04n5g.js";
+import"./index-fm46xrf1.js";
+import"./index-2etcv0sc.js";
+import"./index-e0cvze1s.js";
+import"./index-ctanya41.js";
+import"./index-c76k723e.js";
+import"./index-rwq3ekqc.js";
 import {
   ContextScript
-} from "./index-zwd84m0w.js";
-import"./index-50jjwg8y.js";
+} from "./index-jyv387qw.js";
+import"./index-qt22xstj.js";
 
 // pkgs/@akanjs/cli/workspace/workspace.runner.ts
+import { generateKeyPairSync } from "crypto";
+import { mkdir, writeFile } from "fs/promises";
 import path from "path";
 
 // pkgs/@akanjs/devkit/biomeBase.ts
@@ -95,6 +95,22 @@ var defaultWorkspacePeerDependencies = new Set([
 var defaultMaxDiagnostics = 200;
 
 class WorkspaceRunner extends runner("workspace") {
+  async machineKeygen(workspace, out) {
+    const file = path.resolve(workspace.workspaceRoot, out);
+    const { privateKey, publicKey } = generateKeyPairSync("ed25519");
+    await mkdir(path.dirname(file), { recursive: true });
+    try {
+      await writeFile(file, privateKey.export({ format: "pem", type: "pkcs8" }).toString(), {
+        mode: 384,
+        flag: "wx"
+      });
+    } catch (error) {
+      if (error.code === "EEXIST")
+        throw new Error(`${file} exists; machine-keygen never overwrites a key. Name another file.`);
+      throw error;
+    }
+    return { file, publicKey: publicKey.export({ format: "jwk" }).x ?? "" };
+  }
   async generateAgentRules(workspace, { overwrite = false, cursorRules = true } = {}) {
     const [appNames] = await workspace.getExecs();
     const dict = { repoName: workspace.repoName, appName: appNames[0] ?? "app" };
@@ -365,6 +381,12 @@ class WorkspaceScript extends script("workspace", [
       await this.agentScript.agent(workspace, "install", "agents-md", { force: overwrite });
     spinner.succeed(`Agent rules ready (${files.length} file${files.length === 1 ? "" : "s"})`);
   }
+  async machineKeygen(workspace, out) {
+    const { file, publicKey } = await this.workspaceRunner.machineKeygen(workspace, out);
+    Logger.rawLog(`Wrote the private key to ${file} (mode 600). Set it as AKAN_MACHINE_PRIVATE_KEY on the server that issues machine tokens; nothing else needs it.`);
+    Logger.rawLog(`A server that only verifies them takes the public key:
+AKAN_MACHINE_PUBLIC_KEY=${publicKey}`);
+  }
   async lint(exec, workspace, { fix = true, maxDiagnostics } = {}) {
     if (exec instanceof AppExecutor)
       await this.applicationScript.sync(exec);
@@ -471,10 +493,18 @@ class WorkspaceCommand extends command("workspace", [WorkspaceScript], ({ public
   lintAll: target({ desc: "Lint and fix code in all apps and libraries" }).option("fix", Boolean, { default: true }).option("maxDiagnostics", Number, maxDiagnosticsOption).with(Workspace).exec(async function(fix, maxDiagnostics, workspace) {
     await this.workspaceScript.lintAll(workspace, { fix, maxDiagnostics });
   }),
+  machineKeygen: target({
+    desc: "Make an Ed25519 key for machine tokens: write the private key to a file, print the public key"
+  }).arg("out", String, { desc: "file the private key is written to (mode 600); an existing one is refused" }).with(Workspace).exec(async function(out, workspace) {
+    await this.workspaceScript.machineKeygen(workspace, out);
+  }),
   syncAll: target({ desc: "Sync dependencies and configuration for all apps and libraries" }).with(Workspace).exec(async function(workspace) {
     await this.workspaceScript.syncAll(workspace);
   }),
-  init: target({ desc: "Initialize the workspace", runsOnWorkspaceRoot: false }).arg("devProjectId", String, { desc: "the ID of the workspace" }).option("host", String, { desc: "host of the cloud to target", default: GlobalConfig.akanCloudHost }).with(Workspace).exec(async function(devProjectId, host, workspace) {
+  init: target({ desc: "Initialize the workspace", runsOnWorkspaceRoot: false }).arg("devProjectId", String, { desc: "the ID of the workspace" }).option("host", String, {
+    desc: "host of the cloud to target (default: cloud.host of the root akan.config.ts, else Akan Cloud)",
+    nullable: true
+  }).with(Workspace).exec(async function(devProjectId, host, workspace) {
     await this.workspaceScript.init(devProjectId, workspace, { host });
   })
 })) {

package/cloud.command-c0rnwy65.js

@@ -1,95 +0,0 @@
-// @bun
-import"./index-52w0fvh8.js";
-import {
-  GlobalConfig
-} from "./index-94s080qm.js";
-import {
-  Workspace,
-  command
-} from "./index-q6ft9fkc.js";
-import"./index-50wb2a26.js";
-import {
-  PlatformTestRun
-} from "./index-hxnnfy57.js";
-import"./index-senscydg.js";
-import"./index-jk9xnck6.js";
-import"./index-1bjkfvm9.js";
-import"./index-61mmsdjg.js";
-import"./index-7md2g9vw.js";
-import"./index-2ahj896a.js";
-import"./index-3xmzr1p1.js";
-import {
-  CloudScript2
-} from "./index-gvpvxdm1.js";
-import"./index-50jjwg8y.js";
-
-// pkgs/@akanjs/cli/cloud/cloud.command.ts
-var localRegistryUrl = () => process.env.AKAN_NPM_REGISTRY ?? "http://127.0.0.1:4873";
-var resolveRegistryUrl = (registry) => registry === "local" ? localRegistryUrl() : undefined;
-
-class CloudCommand extends command("cloud", [CloudScript2], ({ public: target }) => ({
-  login: target({ desc: "Login to Akan Cloud services" }).option("host", String, { desc: "host of the cloud", default: GlobalConfig.akanCloudHost }).with(Workspace).exec(async function(host, workspace) {
-    await this.cloudScript.login(workspace, host);
-  }),
-  logout: target({ desc: "Logout from Akan Cloud services" }).option("host", String, { desc: "host of the cloud", default: GlobalConfig.akanCloudHost }).with(Workspace).exec(async function(host, workspace) {
-    await this.cloudScript.logout(workspace, host);
-  }),
-  deployAkan: target({ devOnly: true, desc: "Deploy Akan.js framework to cloud (internal use)" }).option("test", Boolean, { desc: "test the deployment", default: true }).option("registry", String, {
-    desc: "registry target for publishing Akan packages",
-    ask: "Select a registry target",
-    enum: [
-      { label: "local", value: "local" },
-      { label: "npm", value: "npm" }
-    ]
-  }).option("platforms", String, {
-    desc: "platforms to test on besides this machine, comma-separated: linux, windows (none to skip)",
-    default: "linux,windows"
-  }).with(Workspace).exec(async function(test, registry, platforms, workspace) {
-    await this.cloudScript.deployAkan(workspace, {
-      test,
-      registryUrl: resolveRegistryUrl(registry),
-      platforms: PlatformTestRun.parsePlatforms(platforms)
-    });
-  }),
-  testPlatforms: target({
-    devOnly: true,
-    desc: "Run the Akan package suites on Linux (Docker) and Windows (SSH) against a snapshot of this tree"
-  }).option("platforms", String, {
-    desc: "platforms to test on, comma-separated: linux, windows",
-    default: "linux,windows"
-  }).option("pkgs", String, {
-    flag: "k",
-    desc: "packages to test, comma-separated (default: every Akan package)",
-    nullable: true
-  }).with(Workspace).exec(async function(platforms, pkgs, workspace) {
-    await this.cloudScript.testPlatforms(workspace, {
-      platforms: PlatformTestRun.parsePlatforms(platforms),
-      pkgs: pkgs?.split(",").map((pkg) => pkg.trim()).filter(Boolean)
-    });
-  }),
-  update: target({ desc: "Update Akan.js framework to the latest version" }).with(Workspace).option("tag", String, {
-    desc: "tag of the update",
-    default: "latest",
-    enum: ["latest", "dev", "canary", "beta", "rc", "alpha"]
-  }).option("registry", String, {
-    desc: "registry target for resolving Akan packages",
-    ask: "Select a registry target",
-    enum: [
-      { label: "npm", value: "npm" },
-      { label: "local", value: "local" }
-    ],
-    default: process.env.USE_AKANJS_PKGS === "true" ? undefined : "npm"
-  }).exec(async function(workspace, tag, registry) {
-    await this.cloudScript.update(workspace, tag, { registryUrl: resolveRegistryUrl(registry) });
-  }),
-  downloadEnv: target({ desc: "Download environment variables from cloud or SCP server" }).option("host", String, { desc: "host of the cloud to target", default: GlobalConfig.akanCloudHost }).with(Workspace).exec(async function(host, workspace) {
-    await this.cloudScript.downloadEnv(workspace, undefined, { host });
-  }),
-  uploadEnv: target({ desc: "Upload environment variables to cloud or SCP server" }).option("host", String, { desc: "host of the cloud to target", default: GlobalConfig.akanCloudHost }).with(Workspace).exec(async function(host, workspace) {
-    await this.cloudScript.uploadEnv(workspace, { host });
-  })
-})) {
-}
-export {
-  CloudCommand
-};

package/cloud.script-6ba8e9v8.js

@@ -1,20 +0,0 @@
-// @bun
-import {
-  CloudScript2
-} from "./index-gvpvxdm1.js";
-import"./index-hxnnfy57.js";
-import"./index-3xmzr1p1.js";
-import"./index-61mmsdjg.js";
-import"./index-50jjwg8y.js";
-import"./index-1bjkfvm9.js";
-import"./index-jk9xnck6.js";
-import"./index-94s080qm.js";
-import"./index-q6ft9fkc.js";
-import"./index-7md2g9vw.js";
-import"./index-senscydg.js";
-import"./index-50wb2a26.js";
-import"./index-2ahj896a.js";
-import"./index-52w0fvh8.js";
-export {
-  CloudScript2 as CloudScript
-};

package/context.runner-hnkvv3z3.js

@@ -1,21 +0,0 @@
-// @bun
-import {
-  ContextRunner2
-} from "./index-j38qkvkk.js";
-import"./index-bsv901fd.js";
-import"./index-cb6yc5mb.js";
-import"./index-6keyf4sg.js";
-import"./index-hp3stk1m.js";
-import"./index-f4e08ptp.js";
-import"./index-g38nhv87.js";
-import"./index-jk9xnck6.js";
-import"./index-zyw622y1.js";
-import"./index-h9ht6s60.js";
-import"./index-zzvvc845.js";
-import"./index-q6ft9fkc.js";
-import"./index-50wb2a26.js";
-import"./index-hj6w4ka1.js";
-import"./index-52w0fvh8.js";
-export {
-  ContextRunner2 as ContextRunner
-};