@neta-art/cohub-cli 6.1.5 → 6.2.0

package/README.md

@@ -278,6 +278,11 @@ cohub -s <spaceId> spaces files mv <from> <to>
 cohub -s <spaceId> spaces files rm <path>
 ```
 
+`upload` places each file under `--dir`; a directory argument contributes its
+contents directly (like `aws s3 cp dir remote:path`), so `upload dist --dir apps/demo`
+lands at `apps/demo/index.html`, not `apps/demo/dist/index.html`. Upload adds or
+overwrites files; it never deletes existing ones.
+
 Confirm before deleting files or directories.
 
 ## Works

package/dist/commands/spaces.d.ts

@@ -9,9 +9,20 @@ export type SpaceCreateOptions = {
     spec?: string;
     json?: boolean;
 };
+type UploadFile = {
+    id: string;
+    localPath: string;
+    relativePath: string;
+    name: string;
+    size: number;
+    mimeType: string | null;
+};
 export declare function buildSpaceCreateInput(opts: SpaceCreateOptions): CreateSpaceInput;
+export declare const planUploadInput: (input: string) => Promise<UploadFile[]>;
+export declare function collectUploadFiles(paths: string[]): Promise<UploadFile[]>;
 export declare function registerPrompt(program: Command): void;
 export declare function registerSpaceCreate(spacesCmd: Command, dependencies?: {
     createClient?: () => CohubHttpClient;
 }): Command;
 export declare function registerSpaces(program: Command): void;
+export {};

package/dist/commands/spaces.js

@@ -107,14 +107,13 @@ const formatAutoDestroy = (policy) => {
     return `${policy.ttlSeconds}s`;
 };
 const slashPath = (value) => value.split(sep).join("/");
-const walkUploadPath = async (input, root, prefix = "") => {
-    const localPath = resolve(input);
+const walkUploadPath = async (localPath, root) => {
     const info = await stat(localPath);
     const name = basename(localPath);
-    const relativePath = slashPath(prefix ? `${prefix}/${name}` : relative(root, localPath) || name);
+    const relativePath = slashPath(relative(root, localPath) || name);
     if (info.isDirectory()) {
         const children = await readdir(localPath);
-        const nested = await Promise.all(children.map((child) => walkUploadPath(resolve(localPath, child), root, relativePath)));
+        const nested = await Promise.all(children.map((child) => walkUploadPath(resolve(localPath, child), root)));
         return nested.flat();
     }
     if (!info.isFile())
@@ -129,17 +128,31 @@ const walkUploadPath = async (input, root, prefix = "") => {
         }];
 };
 const randomUploadEntryId = () => randomUUID();
-async function collectUploadFiles(paths) {
+// Upload semantics: a file keeps its name, and a directory contributes its
+// contents directly under the target dir — like `aws s3 cp dir remote:path`
+// or `rclone copy`.
+export const planUploadInput = async (input) => {
+    const localPath = resolve(input);
+    const info = await stat(localPath);
+    if (!info.isDirectory())
+        return walkUploadPath(localPath, dirname(localPath));
+    const children = await readdir(localPath);
+    const nested = await Promise.all(children.map((child) => walkUploadPath(resolve(localPath, child), localPath)));
+    return nested.flat();
+};
+export async function collectUploadFiles(paths) {
     if (paths.length === 0)
         return error("No files provided", "Pass one or more local files or directories.");
-    const roots = paths.map((path) => {
-        const resolved = resolve(path);
-        return dirname(resolved);
-    });
-    const nested = await Promise.all(paths.map((path, index) => walkUploadPath(path, roots[index] ?? process.cwd())));
-    const files = nested.flat();
+    const files = (await Promise.all(paths.map(planUploadInput))).flat();
     if (files.length === 0)
         return error("No regular files found");
+    const seen = new Map();
+    for (const file of files) {
+        const source = seen.get(file.relativePath);
+        if (source)
+            throw new Error(`Duplicate upload path "${file.relativePath}" from ${source} and ${file.localPath}`);
+        seen.set(file.relativePath, file.localPath);
+    }
     return files;
 }
 async function putUploadEntry(entry, uploadUrl, headers) {
@@ -1176,7 +1189,7 @@ function registerFiles(spacesCmd) {
     });
     filesCmd
         .command("upload <paths...>")
-        .description("Upload local files or directories")
+        .description("Upload local files; directory contents land under the target dir")
         .option("--dir <path>", "Target directory in the space")
         .option("--json", "Output as JSON")
         .action((paths, opts) => uploadFiles(spacesCmd, paths, opts));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neta-art/cohub-cli",
-  "version": "6.1.5",
+  "version": "6.2.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.19.0",
     "sharp": "^0.35.3",
-    "@neta-art/cohub": "8.4.0"
+    "@neta-art/cohub": "8.5.0"
   },
   "publishConfig": {
     "access": "public"