@neta-art/cohub-cli 1.2.0 → 1.4.0

package/dist/commands/auth.js

@@ -1,56 +1,117 @@
-import { resolveToken, saveToken, clearToken, tokenSource, getTokenPath } from "../auth.js";
+import { authSource, loginWithDeviceFlow, readAuthSession, refreshAccessToken, requestDeviceCode, revokeAndClearAuthSession, verifyDeviceCode } from "../auth.js";
 import { createClient } from "../client.js";
 import { table, json as outJson, ok, error, spinner, handleHttp } from "../output.js";
 export function registerAuth(program) {
     const auth = program.command("auth").description("Authentication management");
     auth
-        .command("login <token>")
-        .description("Set auth token for the current environment")
-        .action((token) => {
+        .command("login")
+        .description("Sign in with Logto device authorization")
+        .option("--request-code", "Request a device code without polling")
+        .option("--verify-code", "Exchange a previously requested device code")
+        .option("--json", "Output as JSON")
+        .action(async (opts, command) => {
+        const asJson = Boolean(opts.json || command.parent?.optsWithGlobals().json);
+        if (opts.requestCode && opts.verifyCode) {
+            return error("Conflicting options", "Use only one of --request-code or --verify-code");
+        }
         try {
-            saveToken(token);
-            ok(`Token saved to ${getTokenPath()}`);
+            if (opts.requestCode) {
+                const code = await requestDeviceCode();
+                if (asJson)
+                    return outJson(code);
+                printDeviceCode(code);
+                return;
+            }
+            if (opts.verifyCode) {
+                await verifyDeviceCode();
+                return showSignedIn(asJson);
+            }
+            const sp = spinner();
+            sp.start("Starting login");
+            await loginWithDeviceFlow((code) => {
+                sp.stop("Login started");
+                printDeviceCode(code);
+                process.stderr.write("  Waiting for authorization...\n");
+            });
+            return showSignedIn(asJson);
         }
         catch (e) {
-            return error(e instanceof Error ? e.message : String(e));
+            handleHttp(e);
         }
     });
     auth
         .command("whoami")
         .description("Show current user info")
         .option("--json", "Output as JSON")
-        .action(async (opts) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated", "Run 'cohub auth login <token>'");
-        const client = createClient(token);
-        const sp = spinner();
-        sp.start("Fetching user info");
+        .action(async (opts, command) => {
+        const asJson = Boolean(opts.json || command.parent?.optsWithGlobals().json);
+        return showSignedIn(asJson);
+    });
+    auth
+        .command("refresh")
+        .description("Refresh the stored Logto access token")
+        .action(async () => {
         try {
-            const user = await client.user.getMe();
-            sp.stop("Done");
-            if (opts.json)
-                return outJson(user);
-            const src = tokenSource();
-            const u = user;
-            console.log(`  Auth source: ${src}\n`);
-            table([u], [
-                { key: "id", label: "ID" },
-                { key: "name", label: "Name" },
-                { key: "email", label: "Email" },
-                { key: "created_at", label: "Created" },
-            ]);
+            if (authSource() === "execution-token") {
+                return error("Cannot refresh COHUB_EXECUTION_TOKEN", "Run `cohub auth login` for long-lived Logto auth.");
+            }
+            await refreshAccessToken();
+            ok("Token refreshed");
         }
         catch (e) {
-            sp.stop("Failed");
             handleHttp(e);
         }
     });
     auth
         .command("logout")
-        .description("Clear stored token")
-        .action(() => {
-        clearToken();
-        ok("Token cleared");
+        .description("Clear stored Logto session")
+        .action(async () => {
+        await revokeAndClearAuthSession();
+        if (process.env.COHUB_EXECUTION_TOKEN?.trim()) {
+            ok("Local session cleared. COHUB_EXECUTION_TOKEN is still set.");
+        }
+        else {
+            ok("Signed out");
+        }
     });
 }
+async function showSignedIn(asJson) {
+    const source = authSource();
+    if (!source)
+        return error("Not authenticated", "Run `cohub auth login`.");
+    const client = createClient();
+    const sp = spinner();
+    sp.start("Fetching user info");
+    try {
+        const user = await client.user.getMe();
+        sp.stop("Done");
+        const session = readAuthSession();
+        const payload = {
+            source,
+            refreshable: source === "logto" && Boolean(session?.refreshToken),
+            user,
+        };
+        if (asJson)
+            return outJson(payload);
+        const u = user;
+        console.log(`  Auth source: ${source}`);
+        console.log(`  Token: ${payload.refreshable ? "refreshable" : "ephemeral"}\n`);
+        table([u], [
+            { key: "id", label: "ID" },
+            { key: "name", label: "Name" },
+            { key: "email", label: "Email" },
+            { key: "created_at", label: "Created" },
+        ]);
+    }
+    catch (e) {
+        sp.stop("Failed");
+        handleHttp(e);
+    }
+}
+function printDeviceCode(code) {
+    console.log("\nOpen this URL to sign in:\n");
+    console.log(`  ${code.verificationUriComplete}\n`);
+    console.log("Or enter this code manually:\n");
+    console.log(`  ${code.userCode}\n`);
+    console.log(`Code expires at ${new Date(code.expiresAt).toLocaleString()}.`);
+}

package/dist/commands/channels.js

@@ -1,18 +1,14 @@
-import { resolveToken } from "../auth.js";
 import { createClient } from "../client.js";
 import { table, json as outJson, ok, error, handleHttp } from "../output.js";
 export function registerChannels(program) {
-    const cmd = program.command("channels").description("Channel management");
+    const cmd = program.command("channels", { hidden: true }).description("Channel integrations");
     cmd
         .command("ls")
         .alias("list")
         .description("List channels")
         .option("--json", "Output as JSON")
         .action(async (opts) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated", "Run 'cohub auth login <token>'");
-        const client = createClient(token);
+        const client = createClient();
         try {
             const items = await client.channels.list();
             if (opts.json)
@@ -38,9 +34,6 @@ export function registerChannels(program) {
         .option("--credentials <json>", "Credentials as JSON string")
         .option("--json", "Output as JSON")
         .action(async (opts) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated");
         let credentials = {};
         if (opts.credentials) {
             try {
@@ -50,7 +43,7 @@ export function registerChannels(program) {
                 return error("Invalid JSON", "--credentials must be valid JSON");
             }
         }
-        const client = createClient(token);
+        const client = createClient();
         try {
             const result = await client.channels.create({
                 provider: opts.provider,
@@ -69,10 +62,7 @@ export function registerChannels(program) {
         .command("delete <id>")
         .description("Delete a channel")
         .action(async (id) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated");
-        const client = createClient(token);
+        const client = createClient();
         try {
             await client.channels.delete(id);
             ok(`Channel deleted: ${id}`);

package/dist/commands/cron-jobs.js

@@ -1,18 +1,14 @@
-import { resolveToken } from "../auth.js";
 import { createClient } from "../client.js";
-import { table, json as outJson, ok, error, handleHttp } from "../output.js";
+import { table, json as outJson, ok, handleHttp } from "../output.js";
 export function registerCronJobs(program) {
-    const cmd = program.command("cron-jobs").description("Cron job management");
+    const cmd = program.command("cron-jobs", { hidden: true }).description("Scheduled prompt jobs");
     cmd
         .command("ls [spaceId]")
         .alias("list")
         .description("List cron jobs")
         .option("--json", "Output as JSON")
         .action(async (spaceId, opts) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated", "Run 'cohub auth login <token>'");
-        const client = createClient(token);
+        const client = createClient();
         try {
             const result = await client.cronJobs.list(spaceId);
             if (opts.json)
@@ -35,10 +31,7 @@ export function registerCronJobs(program) {
         .command("delete <id>")
         .description("Delete a cron job")
         .action(async (id) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated");
-        const client = createClient(token);
+        const client = createClient();
         try {
             await client.cronJobs.delete(id);
             ok(`Cron job deleted: ${id}`);
@@ -51,11 +44,8 @@ export function registerCronJobs(program) {
         .command("toggle <id> <on|off>")
         .description("Enable or disable a cron job")
         .action(async (id, state) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated");
         const enabled = state === "on";
-        const client = createClient(token);
+        const client = createClient();
         try {
             await client.cronJobs.toggle(id, enabled);
             ok(`Cron job ${enabled ? "enabled" : "disabled"}: ${id}`);
@@ -69,10 +59,7 @@ export function registerCronJobs(program) {
         .description("List cron job runs")
         .option("--json", "Output as JSON")
         .action(async (id, opts) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated");
-        const client = createClient(token);
+        const client = createClient();
         try {
             const result = await client.cronJobs.runs(id);
             if (opts.json)

package/dist/commands/generations.js

@@ -1,8 +1,7 @@
 import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
-import { basename, extname, join } from "node:path";
-import { resolveToken } from "../auth.js";
+import { basename, dirname, extname, join } from "node:path";
 import { createClient } from "../client.js";
-import { table, json as outJson, error, handleHttp } from "../output.js";
+import { json as outJson, ok, handleHttp } from "../output.js";
 const mimeByExt = {
     ".png": "image/png",
     ".jpg": "image/jpeg",
@@ -52,16 +51,25 @@ async function contentFromPathOrUrl(type, value) {
     return { type, source: { type: "base64", media_type, data: data.toString("base64") } };
 }
 async function saveOutputs(output, outputPath) {
-    const files = output.filter((block) => block.type !== "text");
-    if (files.length === 0)
-        return;
+    const outputs = output.filter((block) => block.type === "text" || block.type === "image" || block.type === "video" || block.type === "audio");
+    if (outputs.length === 0)
+        return [];
     const info = await stat(outputPath).catch(() => null);
-    const isDir = info?.isDirectory() ?? (!extname(outputPath) && files.length > 1);
-    if (files.length > 1 && !isDir)
-        throw new Error("--output must be a directory when generation returns multiple files");
+    const isDir = info?.isDirectory() ?? (!extname(outputPath) && outputs.length > 1);
+    if (outputs.length > 1 && !isDir)
+        throw new Error("--output must be a directory when generation returns multiple outputs");
     if (isDir)
         await mkdir(outputPath, { recursive: true });
-    for (const [i, block] of files.entries()) {
+    else
+        await mkdir(dirname(outputPath), { recursive: true });
+    const savedPaths = [];
+    for (const [i, block] of outputs.entries()) {
+        if (block.type === "text") {
+            const target = isDir ? join(outputPath, `generation-${i + 1}.txt`) : outputPath;
+            await writeFile(target, block.text, "utf-8");
+            savedPaths.push(target);
+            continue;
+        }
         const source = block.source;
         const target = isDir ? join(outputPath, outputName(block.type, source.type === "url" ? source.url : undefined, i)) : outputPath;
         if (source.type === "url") {
@@ -69,11 +77,17 @@ async function saveOutputs(output, outputPath) {
             if (!response.ok)
                 throw new Error(`Failed to download ${source.url}: HTTP ${response.status}`);
             await writeFile(target, Buffer.from(await response.arrayBuffer()));
+            savedPaths.push(target);
         }
         else if (source.type === "base64") {
             await writeFile(target, Buffer.from(source.data, "base64"));
+            savedPaths.push(target);
+        }
+        else {
+            throw new Error(`Cannot save space file output locally: ${source.space_id}:${source.path}`);
         }
     }
+    return savedPaths;
 }
 function outputName(type, url, index) {
     const fromUrl = url ? basename(new URL(url).pathname) : "";
@@ -97,61 +111,42 @@ function printGeneration(output) {
 export function registerGenerations(program) {
     program
         .command("generate")
-        .description("Generate multimodal content")
+        .description("Generate multimodal outputs")
         .argument("<prompt>", "Prompt text")
-        .requiredOption("--model <model>", "Generation model")
-        .option("--image <path-or-url>", "Image input", collect, [])
-        .option("--video <path-or-url>", "Video input", collect, [])
-        .option("--audio <path-or-url>", "Audio input", collect, [])
-        .option("--param <key=value>", "Generation parameter", collect, [])
-        .option("--parameters <json>", "Generation parameters JSON")
-        .option("--metadata <json>", "Metadata JSON")
-        .option("--output <path>", "Save generated file output")
+        .requiredOption("--model <model>", "Multimodal model ID from `cohub models ls --model-type multimodal`")
+        .option("--image <path-or-url>", "Image input file path or URL; repeatable", collect, [])
+        .option("--video <path-or-url>", "Video input file path or URL; repeatable", collect, [])
+        .option("--audio <path-or-url>", "Audio input file path or URL; repeatable", collect, [])
+        .option("--param <key=value>", "Generation parameter; repeatable, values may be JSON/number/boolean", collect, [])
+        .option("--parameters <json>", "Generation parameters as a JSON object")
+        .option("--metadata <json>", "Metadata as a JSON object")
+        .option("--output <path>", "Save generated output to a file or directory")
         .option("--json", "Output as JSON")
+        .addHelpText("after", `
+
+Examples:
+  cohub models ls --model-type multimodal
+  cohub generate "A calm lake at sunrise" --model <model> --output lake.png
+  cohub generate "Restyle this image" --model <model> --image input.png --param size=1024x1024
+`)
         .action(async (prompt, opts) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated", "Run 'cohub auth login <token>'");
         try {
             const content = [{ type: "text", text: prompt }];
             content.push(...await Promise.all(opts.image.map((value) => contentFromPathOrUrl("image", value))));
             content.push(...await Promise.all(opts.video.map((value) => contentFromPathOrUrl("video", value))));
             content.push(...await Promise.all(opts.audio.map((value) => contentFromPathOrUrl("audio", value))));
-            const generation = await createClient(token).generations.create({
+            const generation = await createClient().generations.create({
                 model: opts.model,
                 content,
                 parameters: parseParams(opts.param, opts.parameters),
                 metadata: opts.metadata ? JSON.parse(opts.metadata) : undefined,
             });
-            if (opts.output && generation.output)
-                await saveOutputs(generation.output, opts.output);
+            const savedPaths = opts.output && generation.output ? await saveOutputs(generation.output, opts.output) : [];
             if (opts.json)
-                return outJson(generation);
+                return outJson(savedPaths.length > 0 ? { ...generation, savedPaths } : generation);
             printGeneration(generation.output ?? []);
-        }
-        catch (e) {
-            handleHttp(e);
-        }
-    });
-    const cmd = program.command("generations").description("Generation model declarations");
-    cmd
-        .command("ls")
-        .alias("list")
-        .description("List generation declarations")
-        .option("--json", "Output as JSON")
-        .action(async (opts) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated", "Run 'cohub auth login <token>'");
-        try {
-            const response = await createClient(token).generations.listDeclarations();
-            if (opts.json)
-                return outJson(response);
-            table(response.declarations, [
-                { key: "model", label: "Model" },
-                { key: "title", label: "Title" },
-                { key: "description", label: "Description" },
-            ]);
+            if (savedPaths.length > 0)
+                ok(`Saved to ${savedPaths.join(", ")}`);
         }
         catch (e) {
             handleHttp(e);

package/dist/commands/models.js

@@ -1,19 +1,39 @@
-import { resolveToken } from "../auth.js";
 import { createClient } from "../client.js";
 import { table, json as outJson, error, handleHttp } from "../output.js";
 export function registerModels(program) {
-    const cmd = program.command("models").description("Model management");
+    const cmd = program
+        .command("models")
+        .description("List available LLM and multimodal models")
+        .addHelpText("after", `
+
+Examples:
+  cohub models ls
+  cohub models ls --model-type multimodal
+  cohub models ls --model-type multimodal --json
+`);
     cmd
         .command("ls")
         .alias("list")
         .description("List available models")
+        .option("--model-type <type>", "Model type: llm | multimodal", "llm")
         .option("--json", "Output as JSON")
         .action(async (opts) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated", "Run 'cohub auth login <token>'");
-        const client = createClient(token);
+        const client = createClient();
         try {
+            if (opts.modelType === "multimodal") {
+                const response = await client.models.listMultimodal();
+                if (opts.json)
+                    return outJson(response);
+                table(response.models, [
+                    { key: "model", label: "Model" },
+                    { key: "title", label: "Title" },
+                    { key: "description", label: "Description" },
+                ]);
+                return;
+            }
+            if (opts.modelType && opts.modelType !== "llm") {
+                return error("Invalid model type", "Use --model-type llm or --model-type multimodal");
+            }
             const catalog = await client.models.list();
             if (opts.json)
                 return outJson(catalog);

package/dist/commands/prompts.js

@@ -1,6 +1,5 @@
-import { resolveToken } from "../auth.js";
 import { createClient } from "../client.js";
-import { table, json as outJson, error, handleHttp } from "../output.js";
+import { table, json as outJson, handleHttp } from "../output.js";
 export function registerPrompts(program) {
     const cmd = program.command("prompts").description("Prompt template management");
     cmd
@@ -10,10 +9,7 @@ export function registerPrompts(program) {
         .option("--space <id>", "Filter by space")
         .option("--json", "Output as JSON")
         .action(async (opts) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated", "Run 'cohub auth login <token>'");
-        const client = createClient(token);
+        const client = createClient();
         try {
             const result = await client.prompts.list({ spaceId: opts.space });
             if (opts.json)

package/dist/commands/search.d.ts

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

package/dist/commands/search.js

@@ -0,0 +1,104 @@
+import { createClient } from "../client.js";
+import { table, json as outJson, error, handleHttp } from "../output.js";
+const DEFAULT_LIMIT = 20;
+const MAX_TITLE_LENGTH = 72;
+const MAX_CONTEXT_LENGTH = 42;
+const SEARCH_TYPES = new Set(["turn", "session", "space"]);
+const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+function clampLimit(value) {
+    const parsed = Number(value ?? DEFAULT_LIMIT);
+    if (!Number.isFinite(parsed))
+        return DEFAULT_LIMIT;
+    return Math.min(Math.max(Math.floor(parsed), 1), 50);
+}
+function truncate(value, maxLength) {
+    const text = (value ?? "").replace(/\s+/g, " ").trim();
+    if (text.length <= maxLength)
+        return text;
+    return `${text.slice(0, Math.max(0, maxLength - 1)).trimEnd()}…`;
+}
+function contextFor(item) {
+    if (item.type === "space")
+        return item.spaceName ?? "";
+    if (item.type === "session")
+        return item.spaceName ?? "";
+    return item.sessionTitle || item.spaceName || "";
+}
+function parseTypes(value) {
+    const types = value
+        ?.split(",")
+        .map((type) => type.trim())
+        .filter(Boolean);
+    if (!types?.length)
+        return undefined;
+    const invalidType = types.find((type) => !SEARCH_TYPES.has(type));
+    if (invalidType)
+        throw new Error(`Invalid search type: ${invalidType}`);
+    return [...new Set(types)];
+}
+function parseSearchInput(opts) {
+    const types = parseTypes(opts.types);
+    const spaceId = opts.spaceId?.trim();
+    if (spaceId && !UUID_PATTERN.test(spaceId))
+        throw new Error("Invalid space id");
+    return { types, spaceId: spaceId || undefined };
+}
+function rowsFor(items) {
+    return items.map((item) => ({
+        type: item.type,
+        title: truncate(item.title || item.excerpt, MAX_TITLE_LENGTH),
+        context: truncate(contextFor(item), MAX_CONTEXT_LENGTH),
+        match: item.matchedField,
+        updated: item.updatedAt ? item.updatedAt.slice(0, 10) : "",
+        href: item.href,
+    }));
+}
+export function registerSearch(program) {
+    program
+        .command("search")
+        .description("Search spaces, chats, and turns")
+        .argument("<query>", "Search query")
+        .option("--limit <n>", "Maximum results, 1-50", String(DEFAULT_LIMIT))
+        .option("--types <types>", "Comma-separated result types: turn,session,space")
+        .option("--space-id <id>", "Limit search to a space")
+        .option("--json", "Output as JSON")
+        .addHelpText("after", `
+
+Examples:
+  cohub search "release notes"
+  cohub search "failing tests" --limit 10
+  cohub search "bug" --types turn,session --space-id <spaceId>
+  cohub search "design review" --json
+`)
+        .action(async (query, opts) => {
+        const client = createClient();
+        try {
+            const input = parseSearchInput(opts);
+            const result = await client.search.query({
+                q: query,
+                limit: clampLimit(opts.limit),
+                types: input.types,
+                spaceId: input.spaceId,
+            });
+            if (opts.json)
+                return outJson(result);
+            if (result.degraded) {
+                process.stderr.write("  Search is temporarily degraded; results may be incomplete.\n");
+            }
+            table(rowsFor(result.items), [
+                { key: "type", label: "Type" },
+                { key: "title", label: "Title" },
+                { key: "context", label: "Context" },
+                { key: "match", label: "Match" },
+                { key: "updated", label: "Updated" },
+                { key: "href", label: "Href" },
+            ]);
+        }
+        catch (e) {
+            if (e instanceof Error && (e.message === "Invalid space id" || e.message.startsWith("Invalid search type:"))) {
+                return error(e.message);
+            }
+            handleHttp(e);
+        }
+    });
+}

package/dist/commands/session-access.js

@@ -1,6 +1,5 @@
-import { resolveToken } from "../auth.js";
 import { createClient } from "../client.js";
-import { table, json as outJson, ok, error, handleHttp } from "../output.js";
+import { table, json as outJson, ok, handleHttp } from "../output.js";
 export function registerSessionAccess(program) {
     const cmd = program
         .command("session-access")
@@ -10,10 +9,7 @@ export function registerSessionAccess(program) {
         .description("Get session access policy")
         .option("--json", "Output as JSON")
         .action(async (id, opts) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated", "Run 'cohub auth login <token>'");
-        const client = createClient(token);
+        const client = createClient();
         try {
             const policy = await client.sessionAccess.get(id);
             if (opts.json)
@@ -33,10 +29,7 @@ export function registerSessionAccess(program) {
         .option("--anonymous <role>", "Anonymous role (host|builder|guest|null)")
         .option("--json", "Output as JSON")
         .action(async (id, opts) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated");
-        const client = createClient(token);
+        const client = createClient();
         try {
             const policy = await client.sessionAccess.set(id, {
                 anonymous_user: (opts.anonymous ?? null),
@@ -57,10 +50,7 @@ export function registerSessionAccess(program) {
         .command("remove <id>")
         .description("Remove session access override")
         .action(async (id) => {
-        const token = resolveToken();
-        if (!token)
-            return error("Not authenticated");
-        const client = createClient(token);
+        const client = createClient();
         try {
             await client.sessionAccess.remove(id);
             ok(`Session access override removed: ${id}`);

package/dist/commands/spaces.d.ts

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