@erdoai/cli 0.84.0 → 0.85.1

package/dist/index.js

@@ -1225,10 +1225,11 @@ var ErdoClient = class {
       `/v1/integrations/${encodeURIComponent(integrationId)}`
     );
   }
-  getConnectionScope(integrationId) {
+  getConnectionScope(integrationId, params = {}) {
+    const query = params.include_options === void 0 ? "" : `?include_options=${params.include_options}`;
     return this.request(
       "GET",
-      `/v1/integrations/${encodeURIComponent(integrationId)}/connection-scope`
+      `/v1/integrations/${encodeURIComponent(integrationId)}/connection-scope${query}`
     );
   }
   setConnectionScope(integrationId, accountId) {
@@ -1737,6 +1738,12 @@ async function resolveSecretInput(options) {
   return void 0;
 }
 
+// src/integrations.ts
+function formatIntegrationListRow(i) {
+  const provided = i.provided_by_organization_slug ? `	provided by ${i.provided_by_organization_slug}` : "";
+  return `${i.app}	${i.status}	${i.auth_type}	${i.name}	${i.id}${provided}`;
+}
+
 // src/scope.ts
 import { Option } from "commander";
 var ORG_ENV = "ERDO_ORG";
@@ -6029,13 +6036,10 @@ filterCmd.command("list <slug>").description("List the default filters on a data
   }
 });
 var integrationsCmd = program.command("integrations").description("Connect and inspect integrations");
-integrationsCmd.command("list").description("List connected integrations").action(async () => {
+integrationsCmd.command("list").description("List connected integrations \u2014 app, status, auth type, name, then the connection's id (what --from-connection takes)").action(async () => {
   try {
     const { integrations } = await new ErdoClient().listIntegrations();
-    for (const i of integrations) {
-      const provided = i.provided_by_organization_slug ? `	provided by ${i.provided_by_organization_slug}` : "";
-      console.log(`${i.app}	${i.status}	${i.auth_type}	${i.name}${provided}`);
-    }
+    for (const i of integrations) console.log(formatIntegrationListRow(i));
   } catch (e) {
     fail(e);
   }
@@ -6051,8 +6055,21 @@ integrationsCmd.command("apps [query]").description("Search connectable apps (na
 integrationsCmd.command("connect <app>").description("Connect an app \u2014 pass its API key or other credentials with -c, or omit them to get a browser connect URL for OAuth apps").option("-c, --credential <key=value...>", "credential field, e.g. -c api_key=\u2026 (repeatable); rejected by OAuth apps, which have no credential to pass", (v, acc) => acc.concat(v), []).option("-n, --name <name>", "display name for the connection").option("--rotate", "replace the credentials of the app's existing connection instead of adding a second one \u2014 for a key that was rotated at the provider; requires -c").option("--share", "share the connection with the whole organization instead of keeping it private to you \u2014 for org-level credentials teammates and agents should see").option(
   "--provide-to-managed",
   "let the organizations you manage use this connection as if it were their own \u2014 for a vendor key your agency pays for. Key-authenticated native integrations only, connected in a manager organization"
+).option(
+  "--from-connection <integration-id>",
+  "reuse a credential you verifiably supplied \u2014 find its connection id in column 5 of `erdo integrations list --org <that-org>`. The credential is copied inside Erdo and never shown. Legacy keys without supplier records require an authenticated credential update"
 ).action(async (app, opts) => {
   try {
+    if (opts.fromConnection && opts.credential.length) {
+      fail(new Error("pass either -c or --from-connection, not both \u2014 otherwise the connection would hold a credential you did not choose"));
+    }
+    if (opts.fromConnection && opts.rotate) {
+      fail(
+        new Error(
+          "--from-connection creates a new connection from a credential you already hold, so it cannot be combined with --rotate, which replaces the credential on an existing one"
+        )
+      );
+    }
     let credentials;
     if (opts.credential.length) {
       credentials = {};
@@ -6068,7 +6085,8 @@ integrationsCmd.command("connect <app>").description("Connect an app \u2014 pass
       credentials,
       rotate_credentials: opts.rotate || void 0,
       share_with_org: opts.share || void 0,
-      managed_access: opts.provideToManaged ? "managed_organizations" : void 0
+      managed_access: opts.provideToManaged ? "managed_organizations" : void 0,
+      credentials_from_integration_id: opts.fromConnection || void 0
     });
     print(res);
     const notes = [];
@@ -6130,20 +6148,24 @@ integrationsCmd.command("status <app>").description("Check whether an app is con
   }
 });
 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) => {
+accountCmd.command("show <integration-id>").description("Show which account a connection operates, and which it could (see: erdo integrations list)").option("--no-options", "Read the stored account without contacting the provider").action(async (integrationId, opts) => {
   try {
-    const scope = await new ErdoClient().getConnectionScope(integrationId);
+    const scope = await new ErdoClient().getConnectionScope(integrationId, { include_options: opts.options });
     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) {
+    for (const account of opts.options ? scope.options : scope.selected) {
       const marker = selected.has(account.id) ? "*" : " ";
       const owner = account.parent ? `	${account.parent}` : "";
       console.log(`${marker} ${account.id}	${account.name}	${account.type}${owner}`);
     }
+    if (!opts.options) {
+      if (scope.selected.length === 0) console.error("No account recorded on this connection.");
+      return;
+    }
     if (scope.options.length === 0) {
       console.error(
         `

package/package.json

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