@docyrus/docyrus 0.0.13 → 0.0.15

package/main.js

@@ -124678,7 +124678,7 @@ function buildInputSchema(args, env2, options2) {
 // package.json
 var package_default = {
   name: "@docyrus/docyrus",
-  version: "0.0.13",
+  version: "0.0.15",
   private: false,
   description: "Docyrus API CLI",
   main: "./main.js",
@@ -125009,6 +125009,54 @@ function createAiCli(dependencies) {
 }
 
 // src/commands/appsCommands.ts
+function normalizeOptional(value) {
+  const trimmed = value?.trim();
+  return trimmed && trimmed.length > 0 ? trimmed : void 0;
+}
+function extractAppRecords(payload) {
+  if (Array.isArray(payload)) {
+    return payload.filter((item) => typeof item === "object" && item !== null);
+  }
+  if (typeof payload === "object" && payload !== null && Array.isArray(payload.data)) {
+    return payload.data.filter((item) => typeof item === "object" && item !== null);
+  }
+  return [];
+}
+function extractString(record2, key) {
+  const value = record2[key];
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+async function resolveAppId(params) {
+  const appId = normalizeOptional(params.appId);
+  const appSlug = normalizeOptional(params.appSlug);
+  if (appId && appSlug) {
+    throw new UserInputError("Provide either --appId or --appSlug, not both.");
+  }
+  if (!appId && !appSlug) {
+    throw new UserInputError("Provide --appId or --appSlug.");
+  }
+  if (appId) {
+    return appId;
+  }
+  const response = await params.apiClient.request({
+    method: "GET",
+    path: "/apps"
+  });
+  const apps = extractAppRecords(response.data);
+  const matches = apps.filter((item) => extractString(item, "slug") === appSlug);
+  if (matches.length === 0) {
+    throw new UserInputError(`App slug '${appSlug}' was not found.`);
+  }
+  if (matches.length > 1) {
+    const matchingIds = matches.map((item) => extractString(item, "id")).filter((value) => Boolean(value));
+    throw new UserInputError(`App slug '${appSlug}' is ambiguous. Matching IDs: ${matchingIds.join(", ")}`);
+  }
+  const resolvedId = extractString(matches[0], "id");
+  if (!resolvedId) {
+    throw new UserInputError(`App slug '${appSlug}' resolved to an invalid item without id.`);
+  }
+  return resolvedId;
+}
 function createAppsCli(dependencies) {
   const appsCli = Cli_exports.create("apps", {
     description: "App commands",
@@ -125036,6 +125084,81 @@ function createAppsCli(dependencies) {
       });
     }
   });
+  appsCli.command("delete", {
+    description: "Archive an app",
+    options: external_exports.object({
+      appId: external_exports.string().optional().describe("App ID"),
+      appSlug: external_exports.string().optional().describe("App slug")
+    }),
+    run: async (context) => {
+      const apiBaseUrl = await dependencies.environmentConfigService.getActiveApiBaseUrl();
+      const apiClient = dependencies.createApiClient(apiBaseUrl);
+      const appId = await resolveAppId({
+        apiClient,
+        appId: context.options.appId,
+        appSlug: context.options.appSlug
+      });
+      const response = await apiClient.request({
+        method: "DELETE",
+        path: `/dev/apps/${appId}`
+      });
+      return await injectContext({
+        apiBaseUrl,
+        authStore: dependencies.authStore,
+        payload: response.data
+      });
+    }
+  });
+  appsCli.command("restore", {
+    description: "Restore an archived app",
+    options: external_exports.object({
+      appId: external_exports.string().optional().describe("App ID"),
+      appSlug: external_exports.string().optional().describe("App slug")
+    }),
+    run: async (context) => {
+      const apiBaseUrl = await dependencies.environmentConfigService.getActiveApiBaseUrl();
+      const apiClient = dependencies.createApiClient(apiBaseUrl);
+      const appId = await resolveAppId({
+        apiClient,
+        appId: context.options.appId,
+        appSlug: context.options.appSlug
+      });
+      const response = await apiClient.request({
+        method: "POST",
+        path: `/dev/apps/${appId}/restore`
+      });
+      return await injectContext({
+        apiBaseUrl,
+        authStore: dependencies.authStore,
+        payload: response.data
+      });
+    }
+  });
+  appsCli.command("permanent-delete", {
+    description: "Permanently delete an app",
+    options: external_exports.object({
+      appId: external_exports.string().optional().describe("App ID"),
+      appSlug: external_exports.string().optional().describe("App slug")
+    }),
+    run: async (context) => {
+      const apiBaseUrl = await dependencies.environmentConfigService.getActiveApiBaseUrl();
+      const apiClient = dependencies.createApiClient(apiBaseUrl);
+      const appId = await resolveAppId({
+        apiClient,
+        appId: context.options.appId,
+        appSlug: context.options.appSlug
+      });
+      const response = await apiClient.request({
+        method: "DELETE",
+        path: `/dev/apps/${appId}/permanent`
+      });
+      return await injectContext({
+        apiBaseUrl,
+        authStore: dependencies.authStore,
+        payload: response.data
+      });
+    }
+  });
   return appsCli;
 }
 
@@ -125214,6 +125337,49 @@ async function resolveTenantIdSelector(params) {
   }
   return selector;
 }
+async function resolveClientId(params) {
+  const envClientId = getOptionalEnvValue(params.env, "DOCYRUS_API_CLIENT_ID");
+  const configuredClientId = await params.environmentConfigService.getDefaultClientId();
+  const globalConfiguredClientId = configuredClientId ? void 0 : await params.globalEnvironmentConfigService?.getDefaultClientId();
+  const resolvedClientId = params.requestedClientId || envClientId || configuredClientId || globalConfiguredClientId;
+  return {
+    configuredClientId,
+    globalConfiguredClientId,
+    resolvedClientId,
+    clientId: resolvedClientId || (params.allowManualFallback ? "manual-token" : void 0)
+  };
+}
+async function loginWithManualTokens(params) {
+  const manualAccessToken = params.accessToken.trim();
+  const manualRefreshToken = params.refreshToken?.trim();
+  if (!manualAccessToken) {
+    throw new UserInputError("accessToken is required.");
+  }
+  const resolvedClient = await resolveClientId({
+    requestedClientId: params.clientId,
+    env: params.env,
+    environmentConfigService: params.dependencies.environmentConfigService,
+    globalEnvironmentConfigService: params.dependencies.globalEnvironmentConfigService,
+    allowManualFallback: true
+  });
+  if (!resolvedClient.clientId) {
+    throw new UserInputError(
+      "Client ID is required. Pass --clientId, set DOCYRUS_API_CLIENT_ID, or login once with --clientId to save it."
+    );
+  }
+  const authSessionService = params.dependencies.createAuthSessionService(params.apiBaseUrl);
+  const profile = await authSessionService.loginWithManualTokens({
+    clientId: resolvedClient.clientId,
+    accessToken: manualAccessToken,
+    refreshToken: manualRefreshToken || void 0,
+    scope: params.scope,
+    tokenType: "Bearer"
+  });
+  if (resolvedClient.resolvedClientId) {
+    await params.dependencies.environmentConfigService.setDefaultClientId(resolvedClient.resolvedClientId);
+  }
+  return profile;
+}
 function createAuthCli(dependencies) {
   const authCli = Cli_exports.create("auth", {
     description: "Authentication commands",
@@ -125234,32 +125400,36 @@ function createAuthCli(dependencies) {
       if (manualRefreshToken && !manualAccessToken) {
         throw new UserInputError("refreshToken requires accessToken. Pass --accessToken when using --refreshToken.");
       }
-      const envClientId = getOptionalEnvValue(context.env, "DOCYRUS_API_CLIENT_ID");
-      const configuredClientId = await dependencies.environmentConfigService.getDefaultClientId();
-      const globalConfiguredClientId = configuredClientId ? void 0 : await dependencies.globalEnvironmentConfigService?.getDefaultClientId();
-      const resolvedClientId = context.options.clientId || envClientId || configuredClientId || globalConfiguredClientId;
-      const clientId = resolvedClientId || (manualAccessToken ? "manual-token" : void 0);
+      const resolvedClient = await resolveClientId({
+        requestedClientId: context.options.clientId,
+        env: context.env,
+        environmentConfigService: dependencies.environmentConfigService,
+        globalEnvironmentConfigService: dependencies.globalEnvironmentConfigService,
+        allowManualFallback: Boolean(manualAccessToken)
+      });
+      const clientId = resolvedClient.clientId;
       if (!clientId) {
         throw new UserInputError(
           "Client ID is required. Pass --clientId, set DOCYRUS_API_CLIENT_ID, or login once with --clientId to save it."
         );
       }
-      const authSessionService = dependencies.createAuthSessionService(apiBaseUrl);
-      const profile = manualAccessToken ? await authSessionService.loginWithManualTokens({
-        clientId,
+      const profile = manualAccessToken ? await loginWithManualTokens({
+        apiBaseUrl,
         accessToken: manualAccessToken,
-        refreshToken: manualRefreshToken || void 0,
+        refreshToken: manualRefreshToken,
+        clientId: context.options.clientId,
         scope: context.options.scope,
-        tokenType: "Bearer"
-      }) : await authSessionService.loginWithDeviceFlow({
+        dependencies,
+        env: context.env
+      }) : await dependencies.createAuthSessionService(apiBaseUrl).loginWithDeviceFlow({
         clientId,
         scope: context.options.scope,
         onVerification: (verification) => {
           logVerificationHint(verification, context.agent, dependencies.onMessage);
         }
       });
-      if (resolvedClientId) {
-        await dependencies.environmentConfigService.setDefaultClientId(resolvedClientId);
+      if (!manualAccessToken && resolvedClient.resolvedClientId) {
+        await dependencies.environmentConfigService.setDefaultClientId(resolvedClient.resolvedClientId);
       }
       return await injectContext({
         apiBaseUrl,
@@ -125279,6 +125449,43 @@ function createAuthCli(dependencies) {
       });
     }
   });
+  authCli.command("set-tokens", {
+    description: "Set custom access and refresh tokens for the active environment",
+    options: external_exports.object({
+      clientId: external_exports.string().optional().describe("OAuth2 client id"),
+      scope: external_exports.string().default(DEFAULT_LOGIN_SCOPES).describe("OAuth2 scopes"),
+      accessToken: external_exports.string().min(1).describe("Custom access token"),
+      refreshToken: external_exports.string().optional().describe("Custom refresh token")
+    }),
+    run: async (context) => {
+      const apiBaseUrl = await dependencies.environmentConfigService.getActiveApiBaseUrl();
+      const profile = await loginWithManualTokens({
+        apiBaseUrl,
+        accessToken: context.options.accessToken,
+        refreshToken: context.options.refreshToken,
+        clientId: context.options.clientId,
+        scope: context.options.scope,
+        dependencies,
+        env: context.env
+      });
+      return await injectContext({
+        apiBaseUrl,
+        authStore: dependencies.authStore,
+        payload: {
+          authenticated: true,
+          apiBaseUrl,
+          userId: profile.userId,
+          email: profile.email,
+          tenantId: profile.tenantId,
+          tenantName: profile.tenantName,
+          tenantNo: profile.tenantNo,
+          clientId: profile.clientId,
+          scope: profile.scope,
+          expiresAt: profile.expiresAt
+        }
+      });
+    }
+  });
   const accountsCli = Cli_exports.create("accounts", {
     description: "Account management",
     env: EnvSchema
@@ -126370,7 +126577,7 @@ function normalizeBatchPayload(payload, key) {
 function isRecord4(value) {
   return typeof value === "object" && value !== null;
 }
-function extractString(record2, key) {
+function extractString2(record2, key) {
   const value = record2[key];
   return typeof value === "string" && value.length > 0 ? value : void 0;
 }
@@ -126391,20 +126598,20 @@ function ensureExclusiveSelector(label, idValue, slugValue) {
     throw new UserInputError(`Provide --${label}Id or --${label}Slug.`);
   }
 }
-function normalizeOptional(value) {
+function normalizeOptional2(value) {
   const trimmed = value?.trim();
   return trimmed && trimmed.length > 0 ? trimmed : void 0;
 }
 function resolveBySlug(label, items, slug) {
-  const matches = items.filter((item) => extractString(item, "slug") === slug);
+  const matches = items.filter((item) => extractString2(item, "slug") === slug);
   if (matches.length === 0) {
     throw new UserInputError(`${label} slug '${slug}' was not found.`);
   }
   if (matches.length > 1) {
-    const matchingIds = matches.map((item) => extractString(item, "id")).filter((id) => Boolean(id));
+    const matchingIds = matches.map((item) => extractString2(item, "id")).filter((id) => Boolean(id));
     throw new UserInputError(`${label} slug '${slug}' is ambiguous. Matching IDs: ${matchingIds.join(", ")}`);
   }
-  const matchId = extractString(matches[0], "id");
+  const matchId = extractString2(matches[0], "id");
   if (!matchId) {
     throw new UserInputError(`${label} slug '${slug}' resolved to an invalid item without id.`);
   }
@@ -126418,8 +126625,8 @@ var StudioResolver = class {
   #dataSourcesByAppId = /* @__PURE__ */ new Map();
   #fieldsByAppAndDataSource = /* @__PURE__ */ new Map();
   async resolveAppId(options2) {
-    const appId = normalizeOptional(options2.appId);
-    const appSlug = normalizeOptional(options2.appSlug);
+    const appId = normalizeOptional2(options2.appId);
+    const appSlug = normalizeOptional2(options2.appSlug);
     ensureExclusiveSelector("app", appId, appSlug);
     if (appId) {
       return appId;
@@ -126428,8 +126635,8 @@ var StudioResolver = class {
     return resolveBySlug("App", apps, appSlug);
   }
   async resolveDataSourceId(options2) {
-    const dataSourceId = normalizeOptional(options2.dataSourceId);
-    const dataSourceSlug = normalizeOptional(options2.dataSourceSlug);
+    const dataSourceId = normalizeOptional2(options2.dataSourceId);
+    const dataSourceSlug = normalizeOptional2(options2.dataSourceSlug);
     ensureExclusiveSelector("dataSource", dataSourceId, dataSourceSlug);
     if (dataSourceId) {
       return dataSourceId;
@@ -126438,8 +126645,8 @@ var StudioResolver = class {
     return resolveBySlug("Data source", dataSources, dataSourceSlug);
   }
   async resolveFieldId(options2) {
-    const fieldId = normalizeOptional(options2.fieldId);
-    const fieldSlug = normalizeOptional(options2.fieldSlug);
+    const fieldId = normalizeOptional2(options2.fieldId);
+    const fieldSlug = normalizeOptional2(options2.fieldSlug);
     ensureExclusiveSelector("field", fieldId, fieldSlug);
     if (fieldId) {
       return fieldId;
@@ -126684,7 +126891,7 @@ function createStudioCli(dependencies) {
     }
   });
   studioCli.command("delete-data-source", {
-    description: "Delete a data source",
+    description: "Archive a data source",
     options: external_exports.object({
       appId: external_exports.string().optional().describe("App ID"),
       appSlug: external_exports.string().optional().describe("App slug"),
@@ -126709,6 +126916,46 @@ function createStudioCli(dependencies) {
       return await wrapStudioPayload(studio.apiBaseUrl, dependencies, response.data);
     }
   });
+  studioCli.command("restore-data-source", {
+    description: "Restore an archived data source",
+    options: external_exports.object({
+      appId: external_exports.string().optional().describe("App ID"),
+      appSlug: external_exports.string().optional().describe("App slug"),
+      dataSourceId: external_exports.string().min(1).describe("Data source ID")
+    }),
+    run: async (context) => {
+      const studio = await getStudioRunContext(dependencies);
+      const appId = await studio.resolver.resolveAppId({
+        appId: context.options.appId,
+        appSlug: context.options.appSlug
+      });
+      const response = await studio.apiClient.request({
+        method: "POST",
+        path: `/dev/apps/${appId}/data-sources/${context.options.dataSourceId}/restore`
+      });
+      return await wrapStudioPayload(studio.apiBaseUrl, dependencies, response.data);
+    }
+  });
+  studioCli.command("permanent-delete-data-source", {
+    description: "Permanently delete a data source",
+    options: external_exports.object({
+      appId: external_exports.string().optional().describe("App ID"),
+      appSlug: external_exports.string().optional().describe("App slug"),
+      dataSourceId: external_exports.string().min(1).describe("Data source ID")
+    }),
+    run: async (context) => {
+      const studio = await getStudioRunContext(dependencies);
+      const appId = await studio.resolver.resolveAppId({
+        appId: context.options.appId,
+        appSlug: context.options.appSlug
+      });
+      const response = await studio.apiClient.request({
+        method: "DELETE",
+        path: `/dev/apps/${appId}/data-sources/${context.options.dataSourceId}/permanent`
+      });
+      return await wrapStudioPayload(studio.apiBaseUrl, dependencies, response.data);
+    }
+  });
   studioCli.command("bulk-create-data-sources", {
     description: "Bulk create data sources",
     options: external_exports.object({
@@ -127514,7 +127761,7 @@ function extractRecordValue(record2, keys) {
   }
   return void 0;
 }
-function extractString2(record2, keys) {
+function extractString3(record2, keys) {
   const value = extractRecordValue(record2, keys);
   return typeof value === "string" && value.length > 0 ? value : void 0;
 }
@@ -127821,10 +128068,10 @@ var AuthSessionService = class {
       throw new AuthSessionError("Unable to parse /users/me response.");
     }
     const tenantCandidate = isRecord5(dataCandidate.tenant) ? dataCandidate.tenant : void 0;
-    const userId = extractString2(dataCandidate, ["id", "user_id"]);
-    const email3 = extractString2(dataCandidate, ["email"]);
-    const tenantId = tenantCandidate ? extractString2(tenantCandidate, ["id"]) : extractString2(dataCandidate, ["tenant_id", "tenantId"]);
-    const tenantName = tenantCandidate ? extractString2(tenantCandidate, ["name"]) : extractString2(dataCandidate, ["tenant_name", "tenantName"]);
+    const userId = extractString3(dataCandidate, ["id", "user_id"]);
+    const email3 = extractString3(dataCandidate, ["email"]);
+    const tenantId = tenantCandidate ? extractString3(tenantCandidate, ["id"]) : extractString3(dataCandidate, ["tenant_id", "tenantId"]);
+    const tenantName = tenantCandidate ? extractString3(tenantCandidate, ["name"]) : extractString3(dataCandidate, ["tenant_name", "tenantName"]);
     const tenantNo = tenantCandidate ? extractNumber(tenantCandidate, ["no", "tenant_no"]) : extractNumber(dataCandidate, ["tenant_no", "tenantNo"]);
     if (!userId || !email3 || !tenantId || !tenantName || !tenantNo) {
       throw new AuthSessionError("Incomplete identity data returned from /users/me.");
@@ -127855,8 +128102,8 @@ var AuthSessionService = class {
       if (!isRecord5(item)) {
         continue;
       }
-      const tenantId = extractString2(item, ["id", "tenant_id"]);
-      const tenantName = extractString2(item, ["name"]);
+      const tenantId = extractString3(item, ["id", "tenant_id"]);
+      const tenantName = extractString3(item, ["name"]);
       const tenantNo = extractNumber(item, ["tenant_no", "tenantNo", "no"]);
       const logoValue = extractRecordValue(item, ["logo"]);
       const logo = typeof logoValue === "string" || logoValue === null ? logoValue : void 0;
@@ -128602,6 +128849,7 @@ var ROOT_HELP_COMMANDS = [
   { command: "env", description: "Show active environment and list environments" },
   { command: "env use <id|name>", description: "Switch active environment" },
   { command: "auth login", description: "Authenticate with OAuth2 device flow" },
+  { command: "auth set-tokens --accessToken <token>", description: "Save custom access and refresh tokens" },
   { command: "auth accounts list", description: "List saved user accounts" },
   { command: "auth tenants use <uuid|tenantNo>", description: "Switch active tenant for selected user" },
   { command: 'ai "<prompt>"', description: "Send a prompt to the default Docyrus CLI agent" },
@@ -128613,6 +128861,7 @@ var ROOT_HELP_COMMANDS = [
   { command: "discover search <terms>", description: "Search in endpoint paths and entity names" },
   { command: "ds list <appSlug> <dataSourceSlug>", description: "List data source items" },
   { command: "apps list", description: "List apps" },
+  { command: "apps delete --appId <id>", description: "Archive an app" },
   { command: "studio list-data-sources --appSlug <slug>", description: "List studio data sources" },
   { command: "tui", description: "Launch terminal UI (OpenTUI, requires Bun)" },
   { command: "curl <path>", description: "Send arbitrary API requests" }