kollab 0.1.4 → 0.1.5

package/README.md

@@ -69,6 +69,8 @@ The CLI opens a browser flow against Kollab auth and stores credentials locally.
 kollab logout
 ```
 
+By default, login uses `https://kollab.im`. Use `kollab login --api-url <site>` or `KOLLAB_API_URL` only when you intentionally target test or alpha.
+
 ## What You Can Do
 
 ```bash

package/dist/index.js

@@ -32,6 +32,14 @@ var import_commander = require("commander");
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 var os = __toESM(require("os"));
+
+// src/config/api-url.ts
+var DEFAULT_KOLLAB_API_URL = "https://kollab.im";
+function readEnvApiUrlOrDefault() {
+  return process.env.KOLLAB_API_URL || DEFAULT_KOLLAB_API_URL;
+}
+
+// src/auth/credential-store.ts
 var KOLLAB_DIR = path.join(os.homedir(), ".kollab");
 var CREDENTIALS_FILE = path.join(KOLLAB_DIR, "credentials.json");
 function ensureDir() {
@@ -50,7 +58,7 @@ function loadCredentials() {
   const envToken = (process.env.KOLLAB_API_TOKEN ?? process.env.KOLLAB_TOKEN ?? "").trim();
   if (envToken) {
     return {
-      api_url: process.env.KOLLAB_API_URL || "https://test.flowus.work",
+      api_url: readEnvApiUrlOrDefault(),
       token: envToken,
       space_id: process.env.KOLLAB_SPACE_ID,
       created_at: (/* @__PURE__ */ new Date()).toISOString()
@@ -92,7 +100,7 @@ function resolveApiUrl() {
   if (envUrl) return envUrl;
   const creds = loadCredentials();
   if (creds?.api_url) return creds.api_url;
-  return "https://test.flowus.work";
+  return DEFAULT_KOLLAB_API_URL;
 }
 function requireCredentials() {
   const creds = loadCredentials();
@@ -375,7 +383,7 @@ function registerAuthCommands(program2) {
   program2.command("login").description("Authenticate with Kollab workspace").option("--token <token>", "Workspace token (skip browser login)").option(
     "--api-url <url>",
     "API base URL",
-    process.env.KOLLAB_API_URL || "https://test.flowus.work"
+    readEnvApiUrlOrDefault()
   ).action(async (opts) => {
     if (opts.token) {
       await loginWithToken(opts.apiUrl, opts.token);
@@ -1704,6 +1712,186 @@ function parseQuestionnaireAnswers(raw) {
   return normalized;
 }
 
+// src/commands/task-long-task.ts
+var TERMINAL_STATUSES = /* @__PURE__ */ new Set(["succeeded", "failed", "cancelled"]);
+function sleep3(ms) {
+  return new Promise((resolve2) => setTimeout(resolve2, ms));
+}
+function resolveConversationId(optValue) {
+  const envValue = process.env.CURRENT_CONVERSATION_ID?.trim();
+  const result = optValue?.trim() || envValue || "";
+  if (!result) {
+    console.error(
+      JSON.stringify({
+        ok: false,
+        error: "--conversation-id is required, or set CURRENT_CONVERSATION_ID in the environment."
+      })
+    );
+    process.exit(1);
+  }
+  return result;
+}
+function registerTaskLongTaskCommand(task) {
+  const longTask = task.command("long-task").description(
+    "Generic long-task polling: list, check status, or watch a job to completion"
+  );
+  longTask.command("list").description(
+    "List long-running jobs for a conversation (video, tts, asr, ...)"
+  ).option(
+    "--conversation-id <uuid>",
+    "Conversation ID (defaults to $CURRENT_CONVERSATION_ID)"
+  ).option("--limit <number>", "Maximum number of jobs to return", "20").option(
+    "--kind <kind>",
+    "Client-side filter: video | tts | asr | all (default: all)",
+    "all"
+  ).action(
+    async (opts) => {
+      const creds = requireCredentials();
+      const conversationId = resolveConversationId(opts.conversationId);
+      const params = new URLSearchParams({
+        conversationId,
+        limit: opts.limit
+      });
+      const result = await api(
+        creds,
+        "GET",
+        `/skills/tools/long-tasks/list?${params}`
+      );
+      if (result.ok && opts.kind !== "all") {
+        const raw = result.data;
+        const jobs = raw?.jobs ?? raw?.data;
+        if (Array.isArray(jobs)) {
+          const filtered = jobs.filter(
+            (j) => j.kind === opts.kind
+          );
+          const key = raw?.jobs !== void 0 ? "jobs" : "data";
+          result.data = { ...raw, [key]: filtered };
+        }
+      }
+      printResult(result);
+    }
+  );
+  longTask.command("status").description("Get the current snapshot of a single long-running job").option(
+    "--conversation-id <uuid>",
+    "Conversation ID (defaults to $CURRENT_CONVERSATION_ID)"
+  ).requiredOption("--job-id <id>", "Job ID to query").action(async (opts) => {
+    const creds = requireCredentials();
+    const conversationId = resolveConversationId(opts.conversationId);
+    const params = new URLSearchParams({
+      conversationId,
+      jobId: opts.jobId
+    });
+    const result = await api(
+      creds,
+      "GET",
+      `/skills/tools/long-tasks/status?${params}`
+    );
+    printResult(result);
+  });
+  longTask.command("watch").description(
+    "Poll a long-running job until it reaches a terminal state or timeout"
+  ).option(
+    "--conversation-id <uuid>",
+    "Conversation ID (defaults to $CURRENT_CONVERSATION_ID)"
+  ).requiredOption("--job-id <id>", "Job ID to watch").option("--timeout <seconds>", "Maximum seconds to wait", "300").option("--interval <seconds>", "Polling interval in seconds", "5").action(
+    async (opts) => {
+      const creds = requireCredentials();
+      const conversationId = resolveConversationId(opts.conversationId);
+      const timeoutMs = Number.parseFloat(opts.timeout) * 1e3;
+      const intervalMs = Number.parseFloat(opts.interval) * 1e3;
+      const isTTY = process.stdout.isTTY === true;
+      let interrupted = false;
+      process.on("SIGINT", () => {
+        interrupted = true;
+        console.log(
+          JSON.stringify(
+            {
+              ok: true,
+              data: {
+                watch_result: "interrupted",
+                job_id: opts.jobId,
+                conversation_id: conversationId
+              }
+            },
+            null,
+            2
+          )
+        );
+        process.exit(130);
+      });
+      const params = new URLSearchParams({
+        conversationId,
+        jobId: opts.jobId
+      });
+      const startMs = Date.now();
+      let lastSnapshot = null;
+      let lastStatus;
+      while (!interrupted) {
+        const elapsed = Date.now() - startMs;
+        if (elapsed >= timeoutMs) {
+          console.log(
+            JSON.stringify(
+              {
+                ok: true,
+                data: {
+                  watch_result: "timeout",
+                  job_id: opts.jobId,
+                  conversation_id: conversationId,
+                  elapsed_seconds: Math.round(elapsed / 1e3),
+                  last_status: lastStatus,
+                  last_snapshot: lastSnapshot
+                }
+              },
+              null,
+              2
+            )
+          );
+          process.exit(0);
+        }
+        const result = await api(
+          creds,
+          "GET",
+          `/skills/tools/long-tasks/status?${params}`
+        );
+        if (!result.ok) {
+          printResult(result);
+          process.exit(1);
+        }
+        lastSnapshot = result.data;
+        const jobData = result.data;
+        lastStatus = jobData?.status ?? jobData?.data?.status ?? void 0;
+        if (isTTY) {
+          const progress = jobData?.progress ?? jobData?.data?.progress;
+          process.stdout.write(
+            `[watch] status=${lastStatus ?? "unknown"} progress=${progress ?? "-"} elapsed=${Math.round((Date.now() - startMs) / 1e3)}s
+`
+          );
+        }
+        if (lastStatus && TERMINAL_STATUSES.has(lastStatus)) {
+          console.log(
+            JSON.stringify(
+              {
+                ok: true,
+                data: {
+                  watch_result: lastStatus === "succeeded" ? "succeeded" : "failed",
+                  job_id: opts.jobId,
+                  conversation_id: conversationId,
+                  elapsed_seconds: Math.round((Date.now() - startMs) / 1e3),
+                  ...jobData ?? {}
+                }
+              },
+              null,
+              2
+            )
+          );
+          process.exit(lastStatus === "succeeded" ? 0 : 2);
+        }
+        await sleep3(intervalMs);
+      }
+    }
+  );
+}
+
 // src/commands/task.ts
 function registerTaskCommands(program2) {
   const task = program2.command("task").description("Task (conversation) management");
@@ -1728,6 +1916,7 @@ function registerTaskCommands(program2) {
   registerTaskCreateCommand(task);
   registerTaskAskCommand(task);
   registerTaskAnswerQuestionCommand(task);
+  registerTaskLongTaskCommand(task);
   task.command("rename").requiredOption("--conversation-id <uuid>", "Conversation ID").requiredOption("--title <title>", "New title").action(async (opts) => {
     const creds = requireCredentials();
     const result = await api(
@@ -1971,16 +2160,67 @@ function registerSkillCommands(program2) {
     );
     printResult(result);
   });
-  skill.command("install").requiredOption("--id <uuid>", "Skill ID to install").action(async (opts) => {
+  skill.command("install").description("Permanently install an official skill by ID or import a GitHub skill URL into the current space").option("--id <uuid>", "Official skill ID to install").option("--github-url <url>", "GitHub skill directory or SKILL.md URL to import and install").action(async (opts) => {
+    if (opts.id && opts.githubUrl) {
+      console.error(JSON.stringify({ ok: false, error: "--id and --github-url are mutually exclusive; provide exactly one" }, null, 2));
+      process.exit(1);
+    }
+    if (!opts.id && !opts.githubUrl) {
+      console.error(JSON.stringify({ ok: false, error: "Either --id or --github-url is required" }, null, 2));
+      process.exit(1);
+    }
     const creds = requireCredentials();
     const spaceId = requireSpaceId(creds);
-    const result = await api(
+    const result = opts.githubUrl ? await api(
+      creds,
+      "POST",
+      "/skills/skills/market/install",
+      {
+        github_url: opts.githubUrl,
+        space_id: spaceId
+      }
+    ) : await api(
       creds,
       "POST",
       `/skills/skills/${opts.id}/add-to-space?spaceId=${spaceId}`
     );
     printResult(result);
   });
+  skill.command("search").description("Paginated keyword search of the official skill catalog").option("-q, --query <query>", "Case-insensitive substring filter on name + description").option("--page <number>", "1-indexed page number (default: 1)", "1").option("--limit <number>", "Page size, 1\u201350 (default: 20)", "20").action(async (opts) => {
+    const creds = requireCredentials();
+    const spaceId = requireSpaceId(creds);
+    const page = Math.max(1, parseInt(opts.page, 10) || 1);
+    const limit = Math.min(50, Math.max(1, parseInt(opts.limit, 10) || 20));
+    const params = new URLSearchParams({
+      spaceId,
+      page: String(page),
+      limit: String(limit)
+    });
+    if (opts.query) {
+      params.set("q", opts.query);
+    }
+    const result = await api(creds, "GET", `/skills/recommended/search?${params.toString()}`);
+    printResult(result);
+  });
+  skill.command("try").description("Session-scoped hydration of an official skill into the current workspace (no space ACL write)").option("--id <uuid>", "Official skill ID (mutually exclusive with --name)").option("--name <name>", "Skill folder or display name (mutually exclusive with --id)").option("--expiration <seconds>", "Presigned URL TTL in seconds, 60\u201386400 (default: 3600)").action(async (opts) => {
+    if (opts.id && opts.name) {
+      console.error(JSON.stringify({ ok: false, error: "--id and --name are mutually exclusive; provide exactly one" }, null, 2));
+      process.exit(1);
+    }
+    if (!opts.id && !opts.name) {
+      console.error(JSON.stringify({ ok: false, error: "Either --id or --name is required" }, null, 2));
+      process.exit(1);
+    }
+    const creds = requireCredentials();
+    const body = {};
+    if (opts.id) body.skill_id = opts.id;
+    if (opts.name) body.skill_name = opts.name;
+    if (opts.expiration) {
+      body.expiration = Math.min(86400, Math.max(60, parseInt(opts.expiration, 10) || 3600));
+    }
+    const result = await api(creds, "POST", "/tools/skills/hydrate-from-catalog", body);
+    printResult(result);
+  });
 }
 
 // src/commands/artifact.ts
@@ -2887,7 +3127,7 @@ function registerImagineCommands(program2) {
   imagine.command("search").description("Search the prompt gallery; results are pre-sorted by like_count.").option("-q, --query <text>", "Free-text search across title and prompts (1-3 keywords work best).").option("-t, --tag <tag>", "Filter by one canonical tag. Run `kollab imagine tags` to list.").option(
     "-l, --lan <code>",
     "Output language (en, zh-CN, zh-TW, ja, ko, fr, de, ru, pt-BR). Defaults to env locale."
-  ).option("--limit <n>", `Max items to return (1-${DEFAULT_LIMIT}, default ${DEFAULT_LIMIT}).`, String(DEFAULT_LIMIT)).option("--cursor <c>", "Pagination cursor from a previous response (advanced).").option("--top", "Print only items[0].prompt text \u2014 useful for piping into gptimg / seedance2.").action(runSearch);
+  ).option("--limit <n>", `Max items to return (1-${DEFAULT_LIMIT}, default ${DEFAULT_LIMIT}).`, String(DEFAULT_LIMIT)).option("--cursor <c>", "Pagination cursor from a previous response (advanced).").option("--top", "Print only items[0].prompt text \u2014 useful for piping into gptimg / seedance2 / klingv3.").action(runSearch);
   imagine.command("tags").description("List the canonical tags currently available in the gallery.").option("-l, --lan <code>", "Output language (only affects how related metadata may surface later).").action(runTags);
 }
 
@@ -2974,7 +3214,7 @@ function resolveCliVersion() {
     }
   } catch {
   }
-  return "0.1.4";
+  return "0.1.5";
 }
 program.name("kollab").description("Kollab workspace CLI").version(resolveCliVersion());
 registerAuthCommands(program);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kollab",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Kollab workspace CLI",
   "bin": {
     "kollab": "dist/index.js"
@@ -22,6 +22,7 @@
     "build": "tsup",
     "dev": "tsup --watch",
     "lint": "eslint .",
+    "test:public-defaults": "node ./scripts/check-public-defaults.mjs",
     "release:canary": "node ./scripts/release-package.mjs --channel canary --publish",
     "release:next": "node ./scripts/release-package.mjs --channel next --publish",
     "release:latest": "node ./scripts/release-package.mjs --channel latest --publish"