@neta-art/cohub-cli 6.6.0 → 6.7.0

package/dist/commands/apps.js

@@ -1,3 +1,6 @@
+import { randomUUID } from "node:crypto";
+import { createReadStream } from "node:fs";
+import { basename } from "node:path";
 import { HttpError } from "@neta-art/cohub";
 import { createClient, createClientWithAccessToken } from "../client.js";
 import { error, handleHttp, json as outJson, jsonRequested, ok, table } from "../output.js";
@@ -6,6 +9,7 @@ import { downloadApp } from "../app-download.js";
 import { getAppByRef, parseAppRef } from "../app-ref.js";
 import { checkAppTarget } from "../app-target.js";
 import { registerAppCommerce } from "./app-commerce.js";
+import { collectPublicUpload } from "./public.js";
 const APP_STATUSES = ["published", "disabled"];
 const APP_VISIBILITIES = ["public", "space"];
 const collectOption = (value, previous = []) => [...previous, value];
@@ -57,6 +61,69 @@ function withCohubBarMeta(input) {
         delete meta.presentation;
     return Object.keys(meta).length > 0 ? meta : null;
 }
+const MAX_APP_SOURCE_FILES = 1000;
+const MAX_APP_SOURCE_BYTES = 1024 * 1024 * 1024;
+const APP_SOURCE_UPLOAD_CONCURRENCY = 4;
+async function uploadLocalAppSource(client, spaceId, source) {
+    if (source.targetType === "port")
+        return null;
+    const upload = await collectPublicUpload(source.targetRef);
+    const totalBytes = upload.files.reduce((sum, file) => sum + file.size, 0);
+    if (upload.files.length > MAX_APP_SOURCE_FILES)
+        return error("App source is too large", `Use no more than ${MAX_APP_SOURCE_FILES} files.`);
+    if (totalBytes > MAX_APP_SOURCE_BYTES)
+        return error("App source is too large", "The total source size must not exceed 1 GiB.");
+    const uploadId = randomUUID();
+    const directoryPrefix = source.targetType === "directory" ? upload.destination.replace(/\/$/, "") : "";
+    const files = new Array(upload.files.length);
+    let nextIndex = 0;
+    const workers = Array.from({ length: Math.min(APP_SOURCE_UPLOAD_CONCURRENCY, upload.files.length) }, async () => {
+        while (nextIndex < upload.files.length) {
+            const index = nextIndex++;
+            const file = upload.files[index];
+            if (!file)
+                return;
+            const plan = await client.publicAssets.createUpload({
+                purpose: "app_source",
+                uploadProtocol: "presigned_put_v1",
+                spaceId,
+                sessionId: uploadId,
+                file: { size: file.size, mimeType: file.mimeType, filename: basename(file.publicPath) },
+            });
+            const response = await fetch(plan.asset.uploadUrl, {
+                method: "PUT",
+                headers: plan.asset.uploadHeaders,
+                body: createReadStream(file.localPath),
+                duplex: "half",
+            });
+            if (!response.ok)
+                throw new Error(`Failed to upload ${file.publicPath}: HTTP ${response.status}`);
+            const path = directoryPrefix && file.publicPath.startsWith(`${directoryPrefix}/`)
+                ? file.publicPath.slice(directoryPrefix.length + 1)
+                : basename(file.publicPath);
+            files[index] = { path, objectKey: plan.asset.objectKey, size: file.size, mimeType: file.mimeType };
+        }
+    });
+    await Promise.all(workers);
+    const manifest = JSON.stringify({ kind: "cohub.app-source", version: 1, targetType: source.targetType, files });
+    const manifestBlob = new Blob([manifest], { type: "application/json" });
+    const manifestPlan = await client.publicAssets.createUpload({
+        purpose: "app_source",
+        uploadProtocol: "presigned_put_v1",
+        spaceId,
+        sessionId: uploadId,
+        file: { size: manifestBlob.size, mimeType: "application/json", filename: "manifest.json" },
+    });
+    const manifestResponse = await fetch(manifestPlan.asset.uploadUrl, {
+        method: "PUT",
+        headers: manifestPlan.asset.uploadHeaders,
+        body: manifestBlob,
+    });
+    if (!manifestResponse.ok)
+        throw new Error(`Failed to upload app source manifest: HTTP ${manifestResponse.status}`);
+    const manifestAsset = manifestPlan.asset;
+    return { sourceRef: manifestAsset.objectKey, targetRef: source.targetType === "file" ? files[0]?.path ?? "" : "." };
+}
 function resolveTarget(opts) {
     const targets = [
         opts.file ? { targetType: "file", targetRef: opts.file } : null,
@@ -321,8 +388,9 @@ export function registerApps(program) {
     appsCmd
         .command("publish <slug>")
         .description("Create or publish an app in the target space")
-        .option("--file <path>", "Publish a file (HTML page, board, or any other file) from the Space workspace")
-        .option("--dir <path>", "Publish a directory site from the Space workspace")
+        .option("--source <source>", "Source: workspace (default) or local")
+        .option("--file <path>", "Publish a file from the selected source")
+        .option("--dir <path>", "Publish a directory site from the selected source")
         .option("--port <port>", "Publish a public sandbox port")
         .option("--disabled", "Create as disabled")
         .option("--status <status>", "App status: published, disabled")
@@ -339,27 +407,42 @@ export function registerApps(program) {
         const target = resolveTarget(opts);
         if (!target)
             return error("Missing target", "Use one of --file, --dir, or --port.");
+        const source = opts.source ? parseChoice(opts.source, "source", ["workspace", "local"]) : "workspace";
+        if (target.targetType === "port" && opts.source)
+            return error("Invalid source", "--source applies only to --file and --dir.");
         const spaceId = resolveSpace(appsCmd);
         const client = createClient();
-        const { targetType, targetRef } = target;
-        if (targetType !== "port")
+        let { targetType, targetRef } = target;
+        let sourceRef = null;
+        if (source === "local") {
+            const uploaded = await uploadLocalAppSource(client, spaceId, target);
+            if (!uploaded)
+                return error("Invalid source", "--source local applies only to --file and --dir.");
+            targetRef = uploaded.targetRef;
+            sourceRef = uploaded.sourceRef;
+        }
+        else if (targetType !== "port") {
             await guardAppTarget(client, spaceId, { targetType, targetRef });
+        }
         const status = resolveStatus(opts);
         const meta = withCohubBarMeta({
             meta: parseJsonObject(opts.meta, "meta"),
             hideCohubBar: opts.hideCohubBar,
             showCohubBar: opts.showCohubBar,
         });
+        const publishMeta = source === "local"
+            ? { ...(meta ?? {}), runtime: { source: { type: "upload", ref: sourceRef } } }
+            : meta;
         const input = {
             spaceId,
             slug,
             status,
             visibility: resolveVisibility(opts.visibility),
             targetType: target.targetType,
-            targetRef: target.targetRef,
+            targetRef,
             appScopes: opts.appScope,
             allowedViewerScopes: opts.viewerScope,
-            meta,
+            meta: publishMeta,
         };
         try {
             const result = await client.apps.create(input);
@@ -381,10 +464,10 @@ export function registerApps(program) {
                     status: status === "published" && existingApp.status !== "published" ? existingApp.status : status,
                     visibility: resolveVisibility(opts.visibility),
                     targetType: target.targetType,
-                    targetRef: target.targetRef,
+                    targetRef,
                     appScopes: opts.appScope,
                     allowedViewerScopes: opts.viewerScope,
-                    meta,
+                    meta: publishMeta,
                 });
                 const publishedVersion = status === "published"
                     ? await client.apps.publishVersion(app.id)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neta-art/cohub-cli",
-  "version": "6.6.0",
+  "version": "6.7.0",
   "description": "CLI for Cohub — spaces, sessions, and agent collaboration.",
   "type": "module",
   "license": "Apache-2.0",
@@ -19,7 +19,7 @@
     "commander": "^15.0.0",
     "pixi.js": "^8.20.1",
     "sharp": "^0.35.4",
-    "@neta-art/cohub": "8.9.0"
+    "@neta-art/cohub": "8.10.0"
   },
   "publishConfig": {
     "access": "public"