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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "3.0.0-beta.6",
+  "version": "3.0.0-beta.8",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -44,7 +44,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "3.0.0-beta.6",
+    "akanjs": "3.0.0-beta.8",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "dayjs": "^1.11.20",

package/subspace.test.ts

@@ -424,6 +424,27 @@ describe("SubspaceConfig", () => {
     ).toThrow(/duplicate subspace/);
   });
 
+  test("refuses two subspaces on one cloud workspace, and takes a declaration with none", () => {
+    expect(
+      () =>
+        new SubspaceConfig({
+          subspaces: [
+            { name: "a", repo: "a.git", apps: ["one"], workspaceId: "project" },
+            { name: "b", repo: "b.git", apps: ["two"], workspaceId: "project" },
+          ],
+        }),
+    ).toThrow(/same workspaceId/);
+    expect(
+      () =>
+        new SubspaceConfig({
+          subspaces: [
+            { name: "a", repo: "a.git", apps: ["one"] },
+            { name: "b", repo: "b.git", apps: ["two"], workspaceId: "project" },
+          ],
+        }),
+    ).not.toThrow();
+  });
+
   test("defaults the pushable branches and rejects anything else", () => {
     const config = new SubspaceConfig({ subspaces: [{ name: "a", repo: "a.git", apps: ["one"] }] });
     expect(config.pushableBranches).toEqual(SubspaceConfig.defaultPushableBranches);

package/subspace.ts

@@ -55,6 +55,17 @@ export interface SubspacePushResult {
   prunedDependencies?: string[];
 }
 
+export interface SubspaceEnvUploadResult {
+  name: string;
+  /** The cloud workspace whose env archive was replaced: the subspace's own, never this workspace's. */
+  workspaceId: string;
+  host: string;
+  outcome: "uploaded" | "cancelled";
+  apps: string[];
+  libs: string[];
+  files: string[];
+}
+
 export interface SubspacePullResult {
   name: string;
   applied: string[];
@@ -100,6 +111,9 @@ export class Subspace {
   get apps() {
     return this.#declaration.apps;
   }
+  get workspaceId() {
+    return this.#declaration.workspaceId;
+  }
   get #remote() {
     return `subspace-${this.#declaration.name}`;
   }
@@ -700,6 +714,25 @@ export function formatSubspacePullResult(result: SubspacePullResult) {
   return sections.join("\n");
 }
 
+export function formatSubspaceEnvUpload(result: SubspaceEnvUploadResult) {
+  const sections = [
+    `Akan Subspace Env Upload — ${result.name}`,
+    `cloud workspace: ${result.workspaceId} · host: ${result.host}`,
+    "",
+    ...(result.outcome === "cancelled"
+      ? ["  cancelled — 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("\n");
+}
+
 export function formatSubspaceDiff(result: SubspaceDiffResult) {
   const total = result.app.files.length + result.libs.files.length;
   const sections = [

package/subspaceConfig.ts

@@ -37,6 +37,7 @@ export class SubspaceConfig {
   #assertValid() {
     const seenNames = new Set<string>();
     const appOwners = new Map<string, string>();
+    const idOwners = new Map<string, string>();
     for (const subspace of this.subspaces) {
       if (!subspace.name || !subspace.repo)
         throw new Error(`${SubspaceConfig.fileName}: every subspace needs a name and a repo`);
@@ -55,6 +56,15 @@ export class SubspaceConfig {
           );
         appOwners.set(app, subspace.name);
       }
+      if (!subspace.workspaceId) continue;
+      const idOwner = idOwners.get(subspace.workspaceId);
+      //* An env upload replaces the cloud workspace's archive whole, so two subspaces sharing one would
+      //* each overwrite the other's values.
+      if (idOwner)
+        throw new Error(
+          `${SubspaceConfig.fileName}: subspaces "${idOwner}" and "${subspace.name}" declare the same workspaceId`,
+        );
+      idOwners.set(subspace.workspaceId, subspace.name);
     }
   }