@erdoai/cli 0.50.0 → 0.52.0

package/dist/index.js

@@ -103,6 +103,10 @@ function resolveOrgId(account, override) {
 }
 
 // src/client.ts
+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 POLL_STOP_STATUSES = /* @__PURE__ */ new Set([...TERMINAL_RUN_STATUSES, "awaiting_approval"]);
 var ErdoApiError = class extends Error {
@@ -745,6 +749,19 @@ var ErdoClient = class {
   listIntegrations() {
     return this.request("GET", "/v1/integrations");
   }
+  getConnectionScope(integrationId) {
+    return this.request(
+      "GET",
+      `/v1/integrations/${encodeURIComponent(integrationId)}/connection-scope`
+    );
+  }
+  setConnectionScope(integrationId, accountId) {
+    return this.request(
+      "POST",
+      `/v1/integrations/${encodeURIComponent(integrationId)}/connection-scope`,
+      { account_id: accountId }
+    );
+  }
   searchIntegrationApps(query) {
     const qs = query ? `?query=${encodeURIComponent(query)}` : "";
     return this.request("GET", `/v1/integration-apps${qs}`);
@@ -929,6 +946,7 @@ var ErdoClient = class {
     if (opts.status) params.set("status", opts.status);
     if (opts.applicability) params.set("applicability", opts.applicability);
     if (opts.outcome) params.set("outcome", opts.outcome);
+    if (opts.approval_id) params.set("approval_id", opts.approval_id);
     if (opts.limit) params.set("limit", String(opts.limit));
     if (opts.offset) params.set("offset", String(opts.offset));
     const qs = params.toString();
@@ -1441,7 +1459,8 @@ program.command("logout [account]").description("Log out an account (default: th
 program.command("whoami").description("Show the active account and org").action(async () => {
   try {
     const me = await new ErdoClient().me();
-    console.log(`${me.email || me.user_id} \u2014 org: ${me.organization_name || me.organization_id}`);
+    const org2 = formatOrg(me.organization_name, me.organization_slug) || me.organization_id;
+    console.log(`${me.email || me.user_id} \u2014 org: ${org2}`);
   } catch (e) {
     fail(e);
   }
@@ -2498,7 +2517,10 @@ decisionsCmd.command("list").description("List decisions, newest first").option(
 ).option("--class <class>", "decision class, e.g. paid_media.ad_group.pause").option("--subject-kind <kind>", "only decisions about this kind of subject").option("--subject-ref <id>", "only decisions about this exact subject").option(
   "--status <status>",
   "proposed | authorized | executing | effective | measuring | settled | rejected | failed | censored"
-).option("--applicability <kind>", "standing | one_shot").option("--outcome <outcome>", "only decisions with a settled effect that came back met | not_met | inconclusive").option("-l, --limit <n>", "max rows (default 50, max 200)", (v) => parseInt(v, 10)).option("--offset <n>", "pagination offset", (v) => parseInt(v, 10)).option("--json", "output raw JSON").action(
+).option("--applicability <kind>", "standing | one_shot").option("--outcome <outcome>", "only decisions with a settled effect that came back met | not_met | inconclusive").option(
+  "--approval <id>",
+  "only the decisions produced by answering this approval (approvals are referenced by id, not slug)"
+).option("-l, --limit <n>", "max rows (default 50, max 200)", (v) => parseInt(v, 10)).option("--offset <n>", "pagination offset", (v) => parseInt(v, 10)).option("--json", "output raw JSON").action(
   async (opts) => {
     try {
       const res = await new ErdoClient().listDecisions({
@@ -2510,6 +2532,7 @@ decisionsCmd.command("list").description("List decisions, newest first").option(
         status: opts.status,
         applicability: opts.applicability,
         outcome: opts.outcome,
+        approval_id: opts.approval,
         limit: opts.limit,
         offset: opts.offset
       });
@@ -3604,10 +3627,14 @@ integrationsCmd.command("connect <app>").description("Connect an app \u2014 pass
     }
     const res = await new ErdoClient().connectIntegration({ app, name: opts.name, credentials });
     print(res);
+    const notes = [];
+    const org2 = formatOrg(res.organization_name, res.organization_slug);
+    if (org2) notes.push(`This connection belongs to ${org2}.`);
     if (res.connect_url) {
-      console.error(`
-Open this URL in a browser to authorize, then run: erdo integrations status ${app}`);
+      notes.push(`Open this URL in a browser to authorize, then run: erdo integrations status ${app}`);
     }
+    if (notes.length) console.error(`
+${notes.join("\n")}`);
   } catch (e) {
     fail(e);
   }
@@ -3619,6 +3646,46 @@ integrationsCmd.command("status <app>").description("Check whether an app is con
     fail(e);
   }
 });
+var accountCmd = integrationsCmd.command("account").description("Read or set which provider account a connection operates");
+accountCmd.command("show <integration-id>").description("Show which account a connection operates, and which it could (see: erdo integrations list)").action(async (integrationId) => {
+  try {
+    const scope = await new ErdoClient().getConnectionScope(integrationId);
+    if (!scope.has_connection_scope) {
+      console.log("This integration does not choose a provider account per connection.");
+      return;
+    }
+    console.log(scope.description);
+    const selected = new Set(scope.selected.map((a) => a.id));
+    for (const account of scope.options) {
+      const marker = selected.has(account.id) ? "*" : " ";
+      const owner = account.parent ? `	${account.parent}` : "";
+      console.log(`${marker} ${account.id}	${account.name}	${account.type}${owner}`);
+    }
+    if (scope.options.length === 0) {
+      console.error(
+        `
+This login reaches no account yet. Set one here once it exists:
+  erdo integrations account set ${integrationId} <account-id>`
+      );
+    } else if (selected.size === 0) {
+      console.error(
+        `
+No account chosen yet${scope.required ? " \u2014 this connection cannot resolve one until you set it" : ""}.
+Set it with: erdo integrations account set ${integrationId} <account-id>`
+      );
+    }
+  } catch (e) {
+    fail(e);
+  }
+});
+accountCmd.command("set <integration-id> <account-id>").description("Record which account this connection operates \u2014 every dataset, sync, and agent action it serves runs against this account").action(async (integrationId, accountId) => {
+  try {
+    const scope = await new ErdoClient().setConnectionScope(integrationId, accountId);
+    print(scope);
+  } catch (e) {
+    fail(e);
+  }
+});
 integrationsCmd.command("tables <app> [schema]").description("List a connected database integration's schemas, or a schema's tables with columns").action(async (app, schema) => {
   try {
     const res = await new ErdoClient().discoverIntegrationTables(app, schema);
@@ -3645,10 +3712,12 @@ connectLinksCmd.command("create <app>").description("Mint a shareable connect li
       integration_id: opts.integrationId
     });
     print(res);
+    const linkOrg = formatOrg(res.organization_name, res.organization_slug);
     process.stderr.write(
       `
 Share link_url with the person who holds the credentials. It expires ${res.expires_at} and completes once. Treat it as a secret \u2014 anyone with it can finish the connection.
-`
+` + (linkOrg ? `The connection they make will belong to ${linkOrg}.
+` : "")
     );
   } catch (e) {
     fail(e);

package/package.json

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