@erdoai/cli 0.119.0 → 0.119.1

package/dist/index.js

@@ -135,7 +135,7 @@ function formatOrg(name, slug) {
   if (name && slug) return `${name} (${slug})`;
   return name || slug || "";
 }
-var TERMINAL_RUN_STATUSES = /* @__PURE__ */ new Set(["completed", "failed", "cancelled", "error"]);
+var TERMINAL_RUN_STATUSES = /* @__PURE__ */ new Set(["completed", "failed", "cancelled", "declined", "error"]);
 var POLL_STOP_STATUSES = /* @__PURE__ */ new Set([...TERMINAL_RUN_STATUSES, "awaiting_approval"]);
 var ErdoApiError = class extends Error {
   constructor(status, message) {
@@ -162,13 +162,13 @@ function networkErrorFor(method, path, err) {
   return new ErdoNetworkError(`${method} ${path} failed: ${detail}`, cause);
 }
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-async function rawRequest(baseURL, token, orgId, projectId, method, path, body) {
+async function rawRequest(baseURL, token, orgId, projectId, method, path, body, retryNetworkFailures = true) {
   const headers = { Authorization: `Bearer ${token}` };
   if (orgId) headers["X-Organization-ID"] = orgId;
   if (projectId) headers["X-Project-ID"] = projectId;
   if (body !== void 0) headers["Content-Type"] = "application/json";
   const upper = method.toUpperCase();
-  const maxRetries = upper === "GET" || upper === "HEAD" ? 2 : 1;
+  const maxRetries = retryNetworkFailures ? upper === "GET" || upper === "HEAD" ? 2 : 1 : 0;
   let attempt = 0;
   while (true) {
     let res;
@@ -185,6 +185,9 @@ async function rawRequest(baseURL, token, orgId, projectId, method, path, body)
         attempt++;
         continue;
       }
+      if (!retryNetworkFailures) {
+        throw new ErdoNetworkError(`${netErr.message}. The launch may have started; inspect agent runs before retrying.`, netErr);
+      }
       throw netErr;
     }
     const text = await res.text();
@@ -260,7 +263,7 @@ var ErdoClient = class {
       process.stderr.write("org: token default (no org resolved \u2014 pass --org to pin)\n");
     }
   }
-  request(method, path, body) {
+  request(method, path, body, retryNetworkFailures = true) {
     this.announceOrgOnce(method);
     return rawRequest(
       this.baseURL,
@@ -269,7 +272,8 @@ var ErdoClient = class {
       this.projectId,
       method,
       path,
-      body
+      body,
+      retryNetworkFailures
     );
   }
   me() {
@@ -1058,7 +1062,7 @@ var ErdoClient = class {
   }
   // --- agents ---
   ask(input) {
-    return this.request("POST", "/v1/ask", input);
+    return this.request("POST", "/v1/ask", input, !input.saved_ask_id);
   }
   createThread(input) {
     return this.request(
@@ -4044,6 +4048,65 @@ agentCmd.command("wait <threadId>").description("Re-attach to a thread's latest
     fail(e);
   }
 });
+var shortcutCmd = program.command("shortcut").description("Inspect and run saved Shortcuts with their stored agent and context");
+shortcutCmd.command("get <id>").description("Read the complete saved Ask, including its config and linked Knowledge").action(async (id) => {
+  try {
+    const response = await new ErdoClient().getKnowledge(id);
+    if (response.object.type !== "ask" || ["archived", "deleted"].includes(response.object.status)) {
+      throw new Error("Shortcut not found or inactive");
+    }
+    print(response);
+  } catch (e) {
+    fail(e);
+  }
+});
+shortcutCmd.command("run <id>").description("Run the current saved prompt, agent, datasets and linked skills").option("--parameters <json>", "flat invocation data as JSON or @path; does not override saved configuration").option("--sync", "hold one HTTP request until completion; long runs can exceed proxy limits").option("--no-wait", "print the startup acknowledgement without waiting for the terminal run").action(async (id, opts) => {
+  try {
+    if (opts.sync && opts.wait === false) throw new Error("--sync cannot be combined with --no-wait");
+    let parameters;
+    if (opts.parameters !== void 0) {
+      const value = JSON.parse(readMaybeFile(opts.parameters) ?? "");
+      if (value === null || typeof value !== "object" || Array.isArray(value)) {
+        throw new Error("Invocation parameters must be a plain object");
+      }
+      for (const [key, field] of Object.entries(value)) {
+        if (!/^[A-Za-z_][A-Za-z0-9_]{0,63}$/.test(key)) throw new Error(`Invalid invocation parameter key: ${key}`);
+        if (field !== null && typeof field !== "string" && typeof field !== "boolean" && (typeof field !== "number" || !Number.isFinite(field))) {
+          throw new Error(`Invalid invocation parameter value for "${key}"`);
+        }
+      }
+      if (JSON.stringify(value).length > 4096) throw new Error("Invocation parameters exceed the 4096-character limit");
+      parameters = value;
+    }
+    const client = new ErdoClient();
+    const response = await client.ask({ saved_ask_id: id, parameters, async: !opts.sync });
+    if (typeof response.thread_id !== "string" || !response.thread_id.trim() || !opts.sync && response.status !== "running") throw new Error("Saved Shortcut did not start");
+    if (opts.wait === false) {
+      print({ thread_id: response.thread_id, message_id: response.message_id, status: response.status });
+      return;
+    }
+    if (opts.sync) {
+      if (response.status !== "completed" && response.status !== "success") throw new Error(`Saved Shortcut did not complete (status: ${response.status}; thread: ${response.thread_id})`);
+      console.log(response.answer || `(status: ${response.status})`);
+      console.log(`
+thread: ${response.thread_id}`);
+      return;
+    }
+    process.stderr.write(`thread: ${response.thread_id}
+running\u2026`);
+    const run = await client.waitForThreadRun(response.thread_id, { onTick: () => process.stderr.write(".") });
+    process.stderr.write("\n");
+    if (!run) throw new Error(timedOutMessage(response.thread_id));
+    if (run.status === "awaiting_approval") throw new Error(awaitingApprovalMessage(response.thread_id));
+    if (run.error) throw new Error(run.error);
+    if (run.status !== "completed") throw new Error(`Saved Shortcut did not complete (status: ${run.status})`);
+    console.log(run.output || `(status: ${run.status})`);
+    console.log(`
+thread: ${response.thread_id}`);
+  } catch (e) {
+    fail(e);
+  }
+});
 agentCmd.command("thread").description("Create a thread; prints its id").option("-n, --name <name>", "thread name").option("-d, --datasets <csv>", "dataset UUIDs to attach").option("--hidden", "keep the thread out of the organization's thread list (for diagnostic or scripted threads)").action(async (opts) => {
   try {
     const res = await new ErdoClient().createThread({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@erdoai/cli",
-  "version": "0.119.0",
+  "version": "0.119.1",
   "description": "Erdo CLI — drive datasets, pages, and evals from the terminal or CI",
   "type": "module",
   "bin": {