@akanjs/cli 3.0.0-beta.6 → 3.0.0-beta.8

package/{scalar.command-6k1vhe9s.js → scalar.command-3bcmrrkv.js}

@@ -2,18 +2,19 @@
 import {
   Sys,
   command
-} from "./index-mak3cd28.js";
+} from "./index-0g7r8xz3.js";
 import"./index-q0y2jq9j.js";
 import"./index-2tv3fdx4.js";
 import"./index-6wwzs1bc.js";
 import {
   renderPrimitiveReport
 } from "./index-gyd220p2.js";
-import"./index-kn1h7p1x.js";
+import"./index-m0xccmmm.js";
+import"./index-te54x9zm.js";
 import"./index-h7yw2z9n.js";
 import {
   ScalarScript
-} from "./index-rwg2aa4f.js";
+} from "./index-a17x49vg.js";
 
 // pkgs/@akanjs/cli/scalar/scalar.command.ts
 import { Logger, lowerlize } from "akanjs/common";

package/{subspace.command-fwjfcts7.js → subspace.command-eddzqpx3.js}

@@ -1,13 +1,17 @@
 // @bun
+import {
+  FileSys
+} from "./index-q0y2jq9j.js";
+import {
+  GlobalConfig
+} from "./index-m0xccmmm.js";
 import {
   Workspace,
+  CommandContainer,
   runner,
   script,
   command
-} from "./index-mak3cd28.js";
-import {
-  FileSys
-} from "./index-q0y2jq9j.js";
+} from "./index-0g7r8xz3.js";
 import {
   Executor,
   WorkspaceExecutor,
@@ -45,6 +49,9 @@ class Subspace {
   get apps() {
     return this.#declaration.apps;
   }
+  get workspaceId() {
+    return this.#declaration.workspaceId;
+  }
   get #remote() {
     return `subspace-${this.#declaration.name}`;
   }
@@ -522,6 +529,23 @@ function formatSubspacePullResult(result) {
   return sections.join(`
 `);
 }
+function formatSubspaceEnvUpload(result) {
+  const sections = [
+    `Akan Subspace Env Upload \u2014 ${result.name}`,
+    `cloud workspace: ${result.workspaceId} \xB7 host: ${result.host}`,
+    "",
+    ...result.outcome === "cancelled" ? ["  cancelled \u2014 the subspace's env archive is untouched."] : [
+      `Uploaded (${result.files.length}), replacing that workspace's whole archive:`,
+      "",
+      ...result.files.map((file) => `  ${file}`),
+      "",
+      `  apps: ${result.apps.join(", ")}`,
+      `  libs: ${result.libs.join(", ") || "(none)"}`
+    ]
+  ];
+  return sections.join(`
+`);
+}
 function formatSubspaceDiff(result) {
   const total = result.app.files.length + result.libs.files.length;
   const sections = [
@@ -575,6 +599,7 @@ class SubspaceConfig {
   #assertValid() {
     const seenNames = new Set;
     const appOwners = new Map;
+    const idOwners = new Map;
     for (const subspace of this.subspaces) {
       if (!subspace.name || !subspace.repo)
         throw new Error(`${SubspaceConfig.fileName}: every subspace needs a name and a repo`);
@@ -589,6 +614,12 @@ class SubspaceConfig {
           throw new Error(`${SubspaceConfig.fileName}: app "${app}" is claimed by both "${owner}" and "${subspace.name}"`);
         appOwners.set(app, subspace.name);
       }
+      if (!subspace.workspaceId)
+        continue;
+      const idOwner = idOwners.get(subspace.workspaceId);
+      if (idOwner)
+        throw new Error(`${SubspaceConfig.fileName}: subspaces "${idOwner}" and "${subspace.name}" declare the same workspaceId`);
+      idOwners.set(subspace.workspaceId, subspace.name);
     }
   }
   select(names) {
@@ -625,10 +656,12 @@ class SubspaceRunner extends runner("subspace") {
     const branch = (await workspace.spawn("git", ["rev-parse", "--abbrev-ref", "HEAD"])).trim();
     return { config, subspaces, branch };
   }
+  static #isInteractive() {
+    return process.stdin.isTTY === true && process.stdout.isTTY === true;
+  }
   async selectNames(workspace, action) {
     const config = await this.config(workspace);
-    const interactive = process.stdin.isTTY === true && process.stdout.isTTY === true;
-    return await SubspaceRunner.chooseNames(config, action, { interactive });
+    return await SubspaceRunner.chooseNames(config, action, { interactive: SubspaceRunner.#isInteractive() });
   }
   static async chooseNames(config, action, { interactive, prompts }) {
     const multiple = SubspaceRunner.multiTargetActions.includes(action);
@@ -676,6 +709,43 @@ class SubspaceRunner extends runner("subspace") {
       throw new Error(`Unknown subspace "${name}"`);
     return await subspace.pull(branch, { adoptLibs });
   }
+  async uploadEnv(workspace, name, { host, force }) {
+    const config = await this.config(workspace);
+    const [declaration] = config.select([name]);
+    if (!declaration)
+      throw new Error(`Unknown subspace "${name}"`);
+    const subspace = new Subspace(workspace, config, declaration);
+    const { workspaceId } = subspace;
+    if (!workspaceId)
+      throw new Error(`Subspace "${subspace.name}" declares no workspaceId. Add its cloud workspace id to ${SubspaceConfig.fileName}.`);
+    if (workspaceId === workspace.getWorkspaceId({ allowEmpty: true }))
+      throw new Error(`Subspace "${subspace.name}" declares this workspace's own id. Uploading a slice there would replace the workspace's env archive with a subset of it.`);
+    const apps = subspace.apps;
+    const asked = await SubspaceRunner.confirmEnvUpload({ name: subspace.name, workspaceId, apps, force }, { interactive: SubspaceRunner.#isInteractive() });
+    if (!asked)
+      return { name: subspace.name, workspaceId, host, apps, libs: [], outcome: "cancelled", files: [] };
+    const { libs } = await subspace.slice();
+    const { CloudScript } = await import("./cloud.script-cm11xjdz.js");
+    const { files } = await CommandContainer.get(CloudScript).uploadEnv(workspace, {
+      host,
+      workspaceId,
+      scope: { apps, libs },
+      archivePath: `local/env.${subspace.name}.tar`
+    });
+    return { name: subspace.name, workspaceId, host, apps, libs, outcome: "uploaded", files };
+  }
+  static async confirmEnvUpload({ name, workspaceId, apps, force }, { interactive, prompts }) {
+    if (force)
+      return true;
+    const target = `subspace "${name}" (cloud workspace ${workspaceId})`;
+    if (!interactive)
+      throw new Error(`Refusing to replace the env archive of ${target} with no terminal to ask in. Pass --force.`);
+    const { confirm } = prompts ?? await loadPrompts();
+    return await confirm({
+      message: `Replace the env archive of ${target} with this workspace's env for ${apps.join(", ")} and the libraries they pull in?`,
+      default: false
+    });
+  }
 }
 
 // pkgs/@akanjs/cli/subspace/subspace.script.ts
@@ -706,6 +776,10 @@ class SubspaceScript extends script("subspace", [SubspaceRunner]) {
     spinner.succeed(`${total} file(s) differ (${result.libs.files.length} in shared libraries)`);
     Logger.rawLog(format === "json" ? JSON.stringify(result, null, 2) : formatSubspaceDiff(result));
   }
+  async uploadEnv(workspace, name, { host, force, format }) {
+    const result = await this.subspaceRunner.uploadEnv(workspace, name, { host, force });
+    Logger.rawLog(format === "json" ? JSON.stringify(result, null, 2) : formatSubspaceEnvUpload(result));
+  }
   async pull(workspace, name, { adoptLibs, format }) {
     const spinner = workspace.spinning(`Pulling customer commits from ${name}...`);
     const result = await this.subspaceRunner.pull(workspace, name, { adoptLibs });
@@ -719,7 +793,7 @@ class SubspaceCommand extends command("subspace", [SubspaceScript], ({ public: t
   subspace: target({ desc: "Mirror apps and libraries between this workspace and the customer repos it serves" }).arg("action", String, {
     desc: "subspace action; status-all and push-all take every declared subspace",
     default: "status",
-    enum: ["status", "status-all", "diff", "push", "push-all", "pull"]
+    enum: ["status", "status-all", "diff", "push", "push-all", "pull", "upload-env"]
   }).arg("subspace", String, {
     desc: "subspace name; asks which one(s) when omitted, and is refused by status-all / push-all",
     nullable: true
@@ -727,12 +801,16 @@ class SubspaceCommand extends command("subspace", [SubspaceScript], ({ public: t
     flag: "y",
     desc: "run bun install + akan sync in the subspace before committing",
     default: true
-  }).option("adoptLibs", Boolean, { desc: "pull: also apply the subspace's library edits", default: false }).option("path", String, { desc: "diff: limit to one path", nullable: true }).exec(async function(action, subspace, workspace, format, verify, adoptLibs, filePath) {
+  }).option("adoptLibs", Boolean, { desc: "pull: also apply the subspace's library edits", default: false }).option("path", String, { desc: "diff: limit to one path", nullable: true }).option("host", String, { desc: "upload-env: host of the cloud to target", default: GlobalConfig.akanCloudHost }).option("force", Boolean, {
+    flag: "F",
+    desc: "upload-env: replace the subspace's env archive without asking",
+    default: false
+  }).exec(async function(action, subspace, workspace, format, verify, adoptLibs, filePath, host, force) {
     const output = format;
     const all = action === "status-all" || action === "push-all";
     const base = all ? action.slice(0, -"-all".length) : action;
-    if (base !== "status" && base !== "diff" && base !== "push" && base !== "pull")
-      throw new Error(`Unknown subspace action: ${action}. Use status, status-all, diff, push, push-all or pull.`);
+    if (base !== "status" && base !== "diff" && base !== "push" && base !== "pull" && base !== "upload-env")
+      throw new Error(`Unknown subspace action: ${action}. Use status, status-all, diff, push, push-all, pull or upload-env.`);
     if (all && subspace)
       throw new Error(`\`akan subspace ${action}\` takes no name. Run \`akan subspace ${base} ${subspace}\` instead.`);
     const names = subspace ? [subspace] : all ? [] : await this.subspaceScript.select(workspace, base);
@@ -746,6 +824,8 @@ class SubspaceCommand extends command("subspace", [SubspaceScript], ({ public: t
         throw new Error(`\`akan subspace ${base}\` needs a name \u2014 it is reviewed one repo at a time.`);
       if (base === "diff")
         await this.subspaceScript.diff(workspace, name, filePath, output);
+      else if (base === "upload-env")
+        await this.subspaceScript.uploadEnv(workspace, name, { host, force, format: output });
       else
         await this.subspaceScript.pull(workspace, name, { adoptLibs, format: output });
     }

package/{workflow.command-nwpcdc8p.js → workflow.command-gtdnzvbz.js}

@@ -3,30 +3,31 @@ import {
   Workspace,
   script,
   command
-} from "./index-mak3cd28.js";
+} from "./index-0g7r8xz3.js";
 import"./index-q0y2jq9j.js";
 import"./index-2tv3fdx4.js";
 import"./index-6wwzs1bc.js";
 import {
   createWorkflowStepRegistry
 } from "./index-gyd220p2.js";
-import"./index-kn1h7p1x.js";
+import"./index-m0xccmmm.js";
+import"./index-te54x9zm.js";
 import {
   ModuleScript
-} from "./index-8pm30m73.js";
-import"./index-pnqbkf5p.js";
+} from "./index-5ystnsd5.js";
+import"./index-vyvre9en.js";
 import"./index-h7yw2z9n.js";
 import {
   PrimitiveScript
-} from "./index-4edzf1gr.js";
+} from "./index-d43r08tf.js";
 import {
   ScalarScript
-} from "./index-rwg2aa4f.js";
+} from "./index-a17x49vg.js";
 import"./index-by5gpp8x.js";
 import"./index-ktb5njgy.js";
 import {
   WorkflowRunner
-} from "./index-7737gxcp.js";
+} from "./index-ffvk10zz.js";
 
 // pkgs/@akanjs/cli/workflow/workflow.script.ts
 import { Logger } from "akanjs/common";

package/{workspace.command-8s050m0h.js → workspace.command-06wvstgr.js}

@@ -4,14 +4,14 @@ import {
 } from "./index-q0y2jq9j.js";
 import {
   GlobalConfig
-} from "./index-kn1h7p1x.js";
+} from "./index-m0xccmmm.js";
 import {
   Exec,
   Workspace,
   runner,
   script,
   command
-} from "./index-mak3cd28.js";
+} from "./index-0g7r8xz3.js";
 import {
   extractAgentBlock,
   collectScopeRecipeSources,
@@ -37,35 +37,36 @@ import"./index-ktb5njgy.js";
 import"./index-h7yw2z9n.js";
 import {
   AgentScript
-} from "./index-ne2qy0nk.js";
+} from "./index-k2j1hc4r.js";
 import {
   ApplicationScript
-} from "./index-v0qh106m.js";
+} from "./index-sj5vxr8f.js";
 import {
   LibraryScript
-} from "./index-259dsnz3.js";
+} from "./index-vxtad5bd.js";
 import"./index-hwkygn9s.js";
+import"./index-te54x9zm.js";
 import"./index-kcxmv48c.js";
 import {
   PackageScript
-} from "./index-ws5e0j51.js";
+} from "./index-9077wzd2.js";
 import {
   getNpmRegistryUrl,
   getLatestPackageVersion
-} from "./index-2hq52jq3.js";
+} from "./index-rtxxan88.js";
 import {
-  CloudScript
-} from "./index-zry5nz81.js";
+  CloudScript2
+} from "./index-2xp0kfkt.js";
 import {
   ContextScript
-} from "./index-600zhnve.js";
+} from "./index-y6n8nmny.js";
 import"./index-wt7qrtd4.js";
-import"./index-fz5q3gd7.js";
-import"./index-7737gxcp.js";
-import"./index-8pm30m73.js";
-import"./index-pnqbkf5p.js";
-import"./index-4edzf1gr.js";
-import"./index-rwg2aa4f.js";
+import"./index-04bk599g.js";
+import"./index-ffvk10zz.js";
+import"./index-5ystnsd5.js";
+import"./index-vyvre9en.js";
+import"./index-d43r08tf.js";
+import"./index-a17x49vg.js";
 import"./index-j9yhg404.js";
 
 // pkgs/@akanjs/cli/workspace/workspace.runner.ts
@@ -327,7 +328,7 @@ class WorkspaceScript extends script("workspace", [
   ApplicationScript,
   LibraryScript,
   PackageScript,
-  CloudScript,
+  CloudScript2,
   ContextScript,
   AgentScript
 ]) {

package/{index-mak3cd28.js → index-0g7r8xz3.js}

@@ -59,30 +59,6 @@ var Pkg = createInternalArgToken("Pkg");
 var Module = createInternalArgToken("Module");
 var Workspace = createInternalArgToken("Workspace");
 
-// pkgs/@akanjs/devkit/commandDecorators/command.ts
-import path2 from "path";
-import { Logger } from "akanjs/common";
-import chalk2 from "chalk";
-import { program } from "commander";
-
-// pkgs/@akanjs/devkit/appSelectionMemory.ts
-import path from "path";
-class AppSelectionMemory {
-  static pathIn(workspaceRoot) {
-    return path.join(workspaceRoot, "local", ".akan", "lastStart.json");
-  }
-  static async read(workspaceRoot) {
-    const stored = await Bun.file(AppSelectionMemory.pathIn(workspaceRoot)).json().catch(() => null);
-    const apps = stored?.apps;
-    return Array.isArray(apps) ? apps.filter((name) => typeof name === "string") : [];
-  }
-  static async write(workspaceRoot, apps) {
-    await FileSys.writeJson(AppSelectionMemory.pathIn(workspaceRoot), { apps }).catch(() => {
-      return;
-    });
-  }
-}
-
 // pkgs/@akanjs/devkit/commandDecorators/dependencyBuilder.ts
 var capitalize = (value) => value.slice(0, 1).toUpperCase() + value.slice(1);
 var createDependencyKey = (refName, kind) => `${refName}${capitalize(kind)}`;
@@ -160,6 +136,30 @@ var script = (refName, deps = []) => {
   return ScriptBase;
 };
 
+// pkgs/@akanjs/devkit/commandDecorators/command.ts
+import path2 from "path";
+import { Logger } from "akanjs/common";
+import chalk2 from "chalk";
+import { program } from "commander";
+
+// pkgs/@akanjs/devkit/appSelectionMemory.ts
+import path from "path";
+class AppSelectionMemory {
+  static pathIn(workspaceRoot) {
+    return path.join(workspaceRoot, "local", ".akan", "lastStart.json");
+  }
+  static async read(workspaceRoot) {
+    const stored = await Bun.file(AppSelectionMemory.pathIn(workspaceRoot)).json().catch(() => null);
+    const apps = stored?.apps;
+    return Array.isArray(apps) ? apps.filter((name) => typeof name === "string") : [];
+  }
+  static async write(workspaceRoot, apps) {
+    await FileSys.writeJson(AppSelectionMemory.pathIn(workspaceRoot), { apps }).catch(() => {
+      return;
+    });
+  }
+}
+
 // pkgs/@akanjs/devkit/commandDecorators/helpFormatter.ts
 import chalk from "chalk";
 var camelToKebabCase2 = (str) => str.replace(/([A-Z])/g, "-$1").toLowerCase();