@neta-art/cohub-cli 5.0.0 → 6.0.1

package/dist/commands/desktop.js

@@ -0,0 +1,219 @@
+import { readFileSync } from "node:fs";
+import { HttpError, } from "@neta-art/cohub";
+import { parseAppRef, DESKTOP_COMMAND_DEFAULT_TIMEOUT_MS, DESKTOP_COMMAND_MAX_TIMEOUT_MS, } from "@neta-art/cohub";
+import { createClient } from "../client.js";
+import { error, handleHttp, json as outJson, jsonRequested, ok } from "../output.js";
+import { getAppByRef } from "../app-ref.js";
+const FILE_SCHEME = "file://";
+const APP_SCHEME = "app://";
+const LEGACY_WORK_SCHEME = "work://";
+function optionalSpaceId(command) {
+    let current = command;
+    while (current) {
+        const opts = current.opts();
+        if (typeof opts.space === "string" && opts.space.trim())
+            return opts.space.trim();
+        current = current.parent ?? null;
+    }
+    return process.env.COHUB_SPACE_ID?.trim() || undefined;
+}
+function parseFilePath(value) {
+    const path = value.slice(FILE_SCHEME.length).trim();
+    if (!path ||
+        path.startsWith("/") ||
+        path.includes("\0") ||
+        path.split("/").some((segment) => segment === "..") ||
+        path.includes("\\")) {
+        return error("Invalid file path", "Use a relative Space path after file://.");
+    }
+    return path;
+}
+function hasFileScheme(value) {
+    return value.toLowerCase().startsWith(FILE_SCHEME);
+}
+function hasAppScheme(value) {
+    const lowered = value.toLowerCase();
+    return lowered.startsWith(APP_SCHEME) || lowered.startsWith(LEGACY_WORK_SCHEME);
+}
+function readCallInput(opts) {
+    if (opts.data !== undefined && opts.input !== undefined) {
+        return error("Conflicting input", "Use either --data or --input, not both.");
+    }
+    const raw = opts.data !== undefined
+        ? opts.data
+        : opts.input !== undefined
+            ? opts.input === "-"
+                ? readFileSync(0, "utf-8")
+                : readFileSync(opts.input, "utf-8")
+            : undefined;
+    if (raw === undefined)
+        return undefined;
+    try {
+        return JSON.parse(raw);
+    }
+    catch {
+        return error("Invalid input", "Call input must be valid JSON.");
+    }
+}
+function parseTimeout(value) {
+    if (!value)
+        return DESKTOP_COMMAND_DEFAULT_TIMEOUT_MS;
+    const parsed = Math.floor(Number(value));
+    if (!Number.isFinite(parsed) || parsed <= 0 || parsed > DESKTOP_COMMAND_MAX_TIMEOUT_MS) {
+        return error("Invalid timeout", `--timeout-ms must be between 1 and ${DESKTOP_COMMAND_MAX_TIMEOUT_MS} milliseconds.`);
+    }
+    return parsed;
+}
+async function resolveAppTarget(client, ref) {
+    const normalized = hasAppScheme(ref) ? ref.replace(/^[a-zA-Z]+:\/\//, "") : ref;
+    const parsed = parseAppRef(normalized);
+    const detail = await getAppByRef(client, normalized);
+    return {
+        kind: "app",
+        appId: detail.app.id,
+        label: detail.app.slug,
+        launch: {
+            ...(parsed.search ? { search: parsed.search } : {}),
+            ...(parsed.hash ? { hash: parsed.hash } : {}),
+        },
+    };
+}
+async function resolveOpenTarget(client, command, value) {
+    if (hasFileScheme(value))
+        return { kind: "file", path: parseFilePath(value) };
+    if (hasAppScheme(value))
+        return resolveAppTarget(client, value);
+    const spaceId = optionalSpaceId(command);
+    if (spaceId) {
+        try {
+            await client.space(spaceId).files.read(value);
+            return { kind: "file", path: value };
+        }
+        catch (cause) {
+            if (!(cause instanceof HttpError) || cause.status !== 404)
+                throw cause;
+        }
+    }
+    return resolveAppTarget(client, value);
+}
+function reportDispatch(record) {
+    if (record.status !== "pending") {
+        reportOutcome(record, Boolean(record.command.call));
+        return;
+    }
+    ok(`Desktop command dispatched (${record.commandId})`);
+}
+function reportOutcome(record, called) {
+    if (record.status === "applied") {
+        ok(called ? "App window shown and method called" : "Window shown");
+        if (record.result !== undefined) {
+            console.log(typeof record.result === "string" ? record.result : JSON.stringify(record.result, null, 2));
+        }
+        return;
+    }
+    error(`Desktop command ${record.status}`, record.error?.message ?? "The Cohub desktop did not apply this command.");
+}
+async function openWindow(target, opts, command) {
+    const callInput = opts.call ? readCallInput(opts) : undefined;
+    if (!opts.call && (opts.data !== undefined || opts.input !== undefined)) {
+        return error("Missing --call", "--data and --input only apply together with --call.");
+    }
+    if (opts.noWait && opts.timeoutMs !== undefined) {
+        return error("Conflicting wait options", "Use either --no-wait or --timeout-ms, not both.");
+    }
+    const timeoutMs = parseTimeout(opts.timeoutMs);
+    const client = createClient();
+    try {
+        const resolved = await resolveOpenTarget(client, command, target);
+        if (resolved.kind === "file" && opts.call) {
+            return error("Unsupported option", "--call only applies to app targets.");
+        }
+        const call = opts.call
+            ? { method: opts.call, ...(callInput === undefined ? {} : { input: callInput }) }
+            : undefined;
+        const input = {
+            command: {
+                type: "desktop.open",
+                target: resolved.kind === "file"
+                    ? resolved
+                    : {
+                        kind: "app",
+                        appId: resolved.appId,
+                        label: resolved.label,
+                        ...(resolved.launch.search || resolved.launch.hash ? { launch: resolved.launch } : {}),
+                    },
+                ...(call ? { call } : {}),
+            },
+            ...(opts.client ? { targetClientId: opts.client } : {}),
+            ...(opts.commandId ? { commandId: opts.commandId } : {}),
+        };
+        const record = opts.noWait
+            ? (await client.desktop.create(input)).command
+            : await client.desktop.run(input, { timeoutMs });
+        if (jsonRequested(opts))
+            return outJson(record);
+        if (opts.noWait)
+            return reportDispatch(record);
+        reportOutcome(record, Boolean(call));
+    }
+    catch (e) {
+        if (e instanceof Error && e.name === "AppRefParseError")
+            return error(e.message);
+        handleHttp(e);
+    }
+}
+const OPEN_HELP = `
+Commands reach only the desktop that originated the current chat, resolved
+from request provenance. Nothing else can be targeted.
+
+Examples:
+  cohub desktop open <app-or-file>
+  cohub desktop open file://src/main.ts
+  cohub desktop open app://alice/studio/launch
+  cohub desktop open alice/studio/launch
+  cohub desktop open https://cohub.live/alice/studio/w/launch?view=timeline
+  cohub desktop open <app-id> --call selection.get
+  cohub desktop open <app-id> --call board.focus --data '{"nodeId":"n1"}'
+`;
+const OPEN_NOTES = `
+Notes:
+  - Use file:// and app:// to make the target explicit; the legacy work://
+    scheme is still accepted.
+  - A plain target checks the current Space for a file before resolving an app.
+  - Opening a window is idempotent; repeating it re-activates the same tab.
+  - --call waits for the app to announce readiness, then invokes the method.
+  - Which methods exist is up to the app author.
+`;
+function registerOpen(parent, deprecated) {
+    const open = parent
+        .command(deprecated ? "preview <app-or-file>" : "open <app-or-file>")
+        .description(deprecated ? "Deprecated: use `cohub desktop open`" : "Open a file or app window on the Cohub desktop, optionally calling an app method")
+        .option("--call <method>", "Method the app registered via client.app.surface.handle()")
+        .option("--data <json>", "Inline JSON input for --call")
+        .option("-i, --input <file>", "JSON input file for --call; use - for stdin")
+        .option("--client <clientId>", "Target a specific desktop instance of your account")
+        .option("--command-id <id>", "Stable id so retries never dispatch twice")
+        .option("--no-wait", "Dispatch the command and exit without waiting for a result")
+        .option("--timeout-ms <ms>", `How long to wait for the desktop (default: ${DESKTOP_COMMAND_DEFAULT_TIMEOUT_MS}; max: ${DESKTOP_COMMAND_MAX_TIMEOUT_MS})`)
+        .option("--json", "Output as JSON")
+        .action(async (target, opts, thisCommand) => {
+        if (deprecated) {
+            ok("Deprecated: `cohub ui preview` is now `cohub desktop open`.");
+        }
+        await openWindow(target, opts, thisCommand);
+    });
+    open.addHelpText("after", deprecated ? OPEN_NOTES : OPEN_HELP + OPEN_NOTES);
+}
+export function registerDesktop(program) {
+    const desktop = program
+        .command("desktop")
+        .description("Drive the Cohub desktop that started this chat");
+    registerOpen(desktop, false);
+}
+export function registerLegacyUi(program) {
+    const ui = program
+        .command("ui", { hidden: true })
+        .description("Deprecated: use `cohub desktop open`")
+        .addHelpText("after", OPEN_HELP);
+    registerOpen(ui, true);
+}

package/dist/commands/profile.js

@@ -16,7 +16,7 @@ export function registerProfile(program) {
             const handle = result.profile.username ? `@${result.profile.username}` : result.profile.userUuid;
             console.log(`\n  ${result.profile.displayName} (${handle})`);
             console.log(`  Spaces: ${result.spaces.length}`);
-            console.log(`  Works:  ${result.works.length}\n`);
+            console.log(`  Apps:   ${result.apps.length}\n`);
             if (result.spaces.length > 0) {
                 console.log("  Spaces:");
                 for (const space of result.spaces) {
@@ -24,10 +24,10 @@ export function registerProfile(program) {
                 }
                 console.log("");
             }
-            if (result.works.length > 0) {
-                console.log("  Works:");
-                for (const work of result.works) {
-                    console.log(`    - ${work.title} ${work.publicUrl}`);
+            if (result.apps.length > 0) {
+                console.log("  Apps:");
+                for (const app of result.apps) {
+                    console.log(`    - ${app.title} ${app.publicUrl}`);
                 }
                 console.log("");
             }

package/dist/index.js

@@ -19,8 +19,8 @@ import { registerPrompt, registerSpaces } from "./commands/spaces.js";
 import { maybeHandleRunCommand } from "./commands/run.js";
 import { registerSandbox } from "./commands/sandbox.js";
 import { registerTasks } from "./commands/tasks.js";
-import { registerUi } from "./commands/ui.js";
-import { registerWorks } from "./commands/works.js";
+import { registerDesktop, registerLegacyUi } from "./commands/desktop.js";
+import { registerApps } from "./commands/apps.js";
 const VERSION = (() => {
     try {
         const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
@@ -55,8 +55,8 @@ Common commands:
   cohub -s <space-id> spaces sessions turns ls <session-id>
   cohub -s <space-id> spaces files ls
   cohub -s <space-id> public upload ./dist demo
-  cohub -s <space-id> works publish demo --file dist/index.html
-  cohub ui preview <work-id> --call selection.get
+  cohub -s <space-id> apps publish demo --file dist/index.html
+  cohub desktop open <app-id> --call selection.get
   cohub -s <space-id> spaces commerce products list
   cohub models ls
   cohub models ls --model-type multimodal
@@ -84,8 +84,9 @@ registerReferences(program);
 registerReferrals(program);
 registerTasks(program);
 registerCronJobs(program);
-registerWorks(program);
-registerUi(program);
+registerApps(program);
+registerDesktop(program);
+registerLegacyUi(program);
 const argv = process.argv.slice(2);
 if (await maybeHandleRunCommand(argv)) {
     process.exit();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neta-art/cohub-cli",
-  "version": "5.0.0",
+  "version": "6.0.1",
   "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": "7.0.0"
+    "@neta-art/cohub": "8.0.1"
   },
   "publishConfig": {
     "access": "public"

package/dist/commands/ui.d.ts

@@ -1,2 +0,0 @@
-import type { Command } from "commander";
-export declare function registerUi(program: Command): void;

package/dist/commands/ui.js

@@ -1,199 +0,0 @@
-import { readFileSync } from "node:fs";
-import { HttpError, } from "@neta-art/cohub";
-import { parseWorkRef, UI_COMMAND_DEFAULT_TIMEOUT_MS, UI_COMMAND_MAX_TIMEOUT_MS, } from "@neta-art/cohub";
-import { createClient } from "../client.js";
-import { error, handleHttp, json as outJson, jsonRequested, ok } from "../output.js";
-import { getWorkByRef } from "../work-ref.js";
-const FILE_SCHEME = "file://";
-const WORK_SCHEME = "work://";
-function optionalSpaceId(command) {
-    let current = command;
-    while (current) {
-        const opts = current.opts();
-        if (typeof opts.space === "string" && opts.space.trim())
-            return opts.space.trim();
-        current = current.parent ?? null;
-    }
-    return process.env.COHUB_SPACE_ID?.trim() || undefined;
-}
-function parseFilePath(value) {
-    const path = value.slice(FILE_SCHEME.length).trim();
-    if (!path ||
-        path.startsWith("/") ||
-        path.includes("\0") ||
-        path.split("/").some((segment) => segment === "..") ||
-        path.includes("\\")) {
-        return error("Invalid file path", "Use a relative Space path after file://.");
-    }
-    return path;
-}
-function hasFileScheme(value) {
-    return value.toLowerCase().startsWith(FILE_SCHEME);
-}
-function hasWorkScheme(value) {
-    return value.toLowerCase().startsWith(WORK_SCHEME);
-}
-function readCallInput(opts) {
-    if (opts.data !== undefined && opts.input !== undefined) {
-        return error("Conflicting input", "Use either --data or --input, not both.");
-    }
-    const raw = opts.data !== undefined
-        ? opts.data
-        : opts.input !== undefined
-            ? opts.input === "-"
-                ? readFileSync(0, "utf-8")
-                : readFileSync(opts.input, "utf-8")
-            : undefined;
-    if (raw === undefined)
-        return undefined;
-    try {
-        return JSON.parse(raw);
-    }
-    catch {
-        return error("Invalid input", "Call input must be valid JSON.");
-    }
-}
-function parseTimeout(value) {
-    if (!value)
-        return UI_COMMAND_DEFAULT_TIMEOUT_MS;
-    const parsed = Math.floor(Number(value));
-    if (!Number.isFinite(parsed) || parsed <= 0 || parsed > UI_COMMAND_MAX_TIMEOUT_MS) {
-        return error("Invalid timeout", `--timeout-ms must be between 1 and ${UI_COMMAND_MAX_TIMEOUT_MS} milliseconds.`);
-    }
-    return parsed;
-}
-async function resolveWorkTarget(client, ref) {
-    const normalized = hasWorkScheme(ref) ? ref.slice(WORK_SCHEME.length) : ref;
-    const parsed = parseWorkRef(normalized);
-    const detail = await getWorkByRef(client, normalized);
-    return {
-        kind: "work",
-        workId: detail.work.id,
-        label: detail.work.slug,
-        launch: {
-            ...(parsed.search ? { search: parsed.search } : {}),
-            ...(parsed.hash ? { hash: parsed.hash } : {}),
-        },
-    };
-}
-async function resolvePreviewTarget(client, command, value) {
-    if (hasFileScheme(value))
-        return { kind: "file", path: parseFilePath(value) };
-    if (hasWorkScheme(value))
-        return resolveWorkTarget(client, value);
-    const spaceId = optionalSpaceId(command);
-    if (spaceId) {
-        try {
-            await client.space(spaceId).files.read(value);
-            return { kind: "file", path: value };
-        }
-        catch (cause) {
-            if (!(cause instanceof HttpError) || cause.status !== 404)
-                throw cause;
-        }
-    }
-    return resolveWorkTarget(client, value);
-}
-function reportDispatch(record) {
-    if (record.status !== "pending") {
-        reportOutcome(record, Boolean(record.command.request));
-        return;
-    }
-    ok(`UI command dispatched (${record.commandId})`);
-}
-function reportOutcome(record, called) {
-    if (record.status === "applied") {
-        ok(called ? "Work preview shown and method called" : "Preview shown");
-        if (record.result !== undefined) {
-            console.log(typeof record.result === "string" ? record.result : JSON.stringify(record.result, null, 2));
-        }
-        return;
-    }
-    error(`UI command ${record.status}`, record.error?.message ?? "The Cohub frontend did not apply this command.");
-}
-export function registerUi(program) {
-    const ui = program
-        .command("ui")
-        .description("Drive the Cohub frontend that started this work")
-        .addHelpText("after", `
-Commands reach only the frontend instance that originated the current chat,
-resolved from request provenance. Nothing else can be targeted.
-
-Examples:
-  cohub ui preview <work-or-file>
-  cohub ui preview file://src/main.ts
-  cohub ui preview work://alice/studio/launch
-  cohub ui preview alice/studio/launch
-  cohub ui preview https://cohub.live/alice/studio/w/launch?view=timeline
-  cohub ui preview <work-id> --call selection.get
-  cohub ui preview <work-id> --call board.focus --data '{"nodeId":"n1"}'
-`);
-    const preview = ui
-        .command("preview <work-or-file>")
-        .description("Show a file or Work preview tab, optionally calling a Work method")
-        .option("--call <method>", "Method the Work registered via client.work.surface.handle()")
-        .option("--data <json>", "Inline JSON input for --call")
-        .option("-i, --input <file>", "JSON input file for --call; use - for stdin")
-        .option("--client <clientId>", "Target a specific frontend instance of your account")
-        .option("--command-id <id>", "Stable id so retries never dispatch twice")
-        .option("--no-wait", "Dispatch the command and exit without waiting for a result")
-        .option("--timeout-ms <ms>", `How long to wait for the frontend (default: ${UI_COMMAND_DEFAULT_TIMEOUT_MS}; max: ${UI_COMMAND_MAX_TIMEOUT_MS})`)
-        .option("--json", "Output as JSON")
-        .action(async (work, opts) => {
-        const callInput = opts.call ? readCallInput(opts) : undefined;
-        if (!opts.call && (opts.data !== undefined || opts.input !== undefined)) {
-            return error("Missing --call", "--data and --input only apply together with --call.");
-        }
-        if (opts.noWait && opts.timeoutMs !== undefined) {
-            return error("Conflicting wait options", "Use either --no-wait or --timeout-ms, not both.");
-        }
-        const timeoutMs = parseTimeout(opts.timeoutMs);
-        const client = createClient();
-        try {
-            const target = await resolvePreviewTarget(client, preview, work);
-            if (target.kind === "file" && opts.call) {
-                return error("Unsupported option", "--call only applies to Work previews.");
-            }
-            const request = opts.call
-                ? { method: opts.call, ...(callInput === undefined ? {} : { input: callInput }) }
-                : undefined;
-            const input = {
-                command: {
-                    type: "preview.show",
-                    preview: target.kind === "file"
-                        ? target
-                        : {
-                            kind: "work",
-                            workId: target.workId,
-                            label: target.label,
-                            ...(target.launch.search || target.launch.hash ? { launch: target.launch } : {}),
-                        },
-                    ...(request ? { request } : {}),
-                },
-                ...(opts.client ? { targetClientId: opts.client } : {}),
-                ...(opts.commandId ? { commandId: opts.commandId } : {}),
-            };
-            const record = opts.noWait
-                ? (await client.ui.create(input)).command
-                : await client.ui.run(input, { timeoutMs });
-            if (jsonRequested(opts))
-                return outJson(record);
-            if (opts.noWait)
-                return reportDispatch(record);
-            reportOutcome(record, Boolean(request));
-        }
-        catch (e) {
-            if (e instanceof Error && e.name === "WorkRefParseError")
-                return error(e.message);
-            handleHttp(e);
-        }
-    });
-    preview.addHelpText("after", `
-Notes:
-  - Use file:// and work:// to make the target explicit.
-  - A plain target checks the current Space for a file before resolving a Work.
-  - Showing a preview is idempotent; repeating it re-activates the same tab.
-  - --call waits for the Work to announce readiness, then invokes the method.
-  - Which methods exist is up to the Work author.
-`);
-}

package/dist/commands/work-commerce.d.ts

@@ -1,2 +0,0 @@
-import type { Command } from "commander";
-export declare function registerWorkCommerce(worksCmd: Command): void;

package/dist/commands/works.d.ts

@@ -1,4 +0,0 @@
-import { type CohubHttpClient, type WorkViewStatsResponse } from "@neta-art/cohub";
-import type { Command } from "commander";
-export declare function getWorkStatsByRef(client: CohubHttpClient, work: string): Promise<WorkViewStatsResponse>;
-export declare function registerWorks(program: Command): void;

package/dist/work-download.d.ts

@@ -1,11 +0,0 @@
-import type { WorkGetResponse } from "@neta-art/cohub";
-type DownloadResult = {
-    workId: string;
-    version: number;
-    kind: "file" | "directory";
-    output: string;
-    files: number;
-    bytes: number;
-};
-export declare function downloadWork(detail: WorkGetResponse, outputOption?: string, fetcher?: typeof fetch): Promise<DownloadResult>;
-export {};

package/dist/work-ref.d.ts

@@ -1,5 +0,0 @@
-import type { CohubHttpClient, ParsedWorkRef, WorkGetResponse } from "@neta-art/cohub";
-import { formatWorkRef, parseWorkRef } from "@neta-art/cohub";
-export type { ParsedWorkRef };
-export { formatWorkRef, parseWorkRef };
-export declare function getWorkByRef(client: CohubHttpClient, input: string): Promise<WorkGetResponse>;

package/dist/work-ref.js

@@ -1,8 +0,0 @@
-import { formatWorkRef, parseWorkRef } from "@neta-art/cohub";
-export { formatWorkRef, parseWorkRef };
-export function getWorkByRef(client, input) {
-    const ref = parseWorkRef(input);
-    return "id" in ref
-        ? client.works.get(ref.id)
-        : client.works.getBySlug(ref.username, ref.spaceSlug, ref.workSlug);
-}