@madewithremy/admin 0.1.52 → 0.1.54

package/dist/index.js

@@ -59,13 +59,6 @@ function loadWorkspaceAppId(workspaceDir = WORKSPACE_DIR) {
   return result.value.appId;
 }
 
-// src/ops/agent.ts
-var agent_exports = {};
-__export(agent_exports, {
-  threadsGet: () => threadsGet,
-  threadsList: () => threadsList
-});
-
 // src/errors.ts
 var AdminApiError = class extends Error {
   constructor(method, path3, status2, body) {
@@ -180,7 +173,51 @@ async function tryCall(ctx, method, apiPath) {
   return { ok: res.ok, status: res.status, body: await readBody(res) };
 }
 
+// src/runningMethod.ts
+var AGENT_SDK = "@mindstudio-ai/agent";
+var agentSdk;
+var loadAgentSdk = () => agentSdk ??= import(AGENT_SDK).then(
+  (mod) => mod,
+  () => null
+);
+var appIds = /* @__PURE__ */ new Map();
+var MAX_REMEMBERED = 500;
+function appIdOf(token, baseUrl) {
+  let known = appIds.get(token);
+  if (!known) {
+    known = call(
+      { apiKey: token, appId: "", baseUrl },
+      "GET",
+      "/_internal/v2/execution/identity"
+    ).then((identity) => identity.appId);
+    known.catch(() => appIds.delete(token));
+    if (appIds.size >= MAX_REMEMBERED) {
+      appIds.delete(appIds.keys().next().value);
+    }
+    appIds.set(token, known);
+  }
+  return known;
+}
+async function runningMethodContext(options) {
+  const sdk = await loadAgentSdk();
+  const run3 = sdk?.getRequestContext?.();
+  if (!run3?.callbackToken) {
+    return null;
+  }
+  const baseUrl = (options.baseUrl ?? run3.remoteHostname ?? process.env["MINDSTUDIO_BASE_URL"] ?? DEFAULT_BASE_URL).replace(/\/+$/, "");
+  return {
+    apiKey: run3.callbackToken,
+    appId: options.appId ?? await appIdOf(run3.callbackToken, baseUrl),
+    baseUrl
+  };
+}
+
 // src/ops/agent.ts
+var agent_exports = {};
+__export(agent_exports, {
+  threadsGet: () => threadsGet,
+  threadsList: () => threadsList
+});
 function threadsList(ctx, params = {}) {
   return call(
     ctx,
@@ -1743,7 +1780,7 @@ async function primaryUrl(ctx) {
   return dashboard.primaryUrl;
 }
 function summarizeRelease(release) {
-  const summary2 = {
+  const summary3 = {
     releaseId: release.id,
     commitSha: release.commitSha,
     branch: release.branch ?? null,
@@ -1755,16 +1792,16 @@ function summarizeRelease(release) {
   };
   const readers = (release.dataSources ?? []).filter((d) => d.reader);
   if (readers.length > 0 && release.status === "live") {
-    summary2.readers = readers.map((d) => ({
+    summary3.readers = readers.map((d) => ({
       slug: d.slug,
       unread: d.readerUnread ?? 0
     }));
   }
   if (release.status !== "failed") {
-    return summary2;
+    return summary3;
   }
   return {
-    ...summary2,
+    ...summary3,
     error: release.failureReason ?? "Build failed (no error entry in the build log)",
     ...release.failureKind ? { failureKind: release.failureKind } : {},
     ...release.failurePhase ? { failurePhase: release.failurePhase } : {}
@@ -3028,6 +3065,19 @@ function updateSettings(ctx, partial) {
   ).then((res) => res.settings ?? {});
 }
 
+// src/ops/usage.ts
+var usage_exports = {};
+__export(usage_exports, {
+  summary: () => summary2
+});
+function summary2(ctx, params) {
+  return call(
+    ctx,
+    "GET",
+    `/_internal/v2/apps/${ctx.appId}/usage/summary${qs(params)}`
+  );
+}
+
 // src/ops/users.ts
 var users_exports = {};
 __export(users_exports, {
@@ -3183,11 +3233,11 @@ function settingsSet(ctx, params) {
 }
 
 // src/client.ts
-function bindOps(ops, ctx) {
+function bindOps(ops, source) {
   const bound = {};
   for (const [name, value] of Object.entries(ops)) {
     if (typeof value === "function") {
-      bound[name] = (...args) => value(ctx, ...args);
+      bound[name] = async (...args) => value(await source(), ...args);
     }
   }
   return bound;
@@ -3207,71 +3257,103 @@ function resolveOptions(options) {
     baseUrl: options.baseUrl ?? process.env["MINDSTUDIO_BASE_URL"] ?? DEFAULT_BASE_URL
   };
 }
-function buildClient(ctx) {
+function retarget(ctx, appId) {
+  return {
+    ...ctx,
+    appId,
+    originAppId: appId === ctx.appId ? ctx.originAppId : ctx.originAppId ?? ctx.appId
+  };
+}
+function buildClient(source, context) {
   return {
-    /** The resolved context this client is bound to. */
-    context: ctx,
+    /**
+     * The context the client uses outside a running method: its options, or
+     * the environment. Null when neither names a key, as in a method, where
+     * each call takes the run's own.
+     */
+    context,
     /**
      * A sibling client for another app, sharing credentials.
      *
      * The app we came from becomes the origin, so a write through the returned
      * client records which app acted — the same rule the CLI's `--app` follows.
      * Chaining `forApp` twice keeps the FIRST app as the origin, since that is
-     * the one whose workspace this code is running in.
+     * the one whose workspace this code is running in. A method's own
+     * credential acts on its own app only, so from a method this needs a key.
      */
     forApp(appId) {
-      return buildClient({
-        ...ctx,
-        appId,
-        originAppId: appId === ctx.appId ? ctx.originAppId : ctx.originAppId ?? ctx.appId
-      });
+      return buildClient(
+        async () => retarget(await source(), appId),
+        context && retarget(context, appId)
+      );
     },
-    agent: bindOps(agent_exports, ctx),
-    tasks: bindOps(tasks_exports, ctx),
-    analytics: bindOps(analytics_exports, ctx),
-    apps: bindOps(apps_exports, ctx),
-    events: bindOps(events_exports, ctx),
-    crashes: bindOps(crashes_exports, ctx),
-    cron: bindOps(cron_exports, ctx),
-    feedback: bindOps(feedback_exports, ctx),
-    data: bindOps(data_exports, ctx),
-    dataSources: bindOps(dataSources_exports, ctx),
-    dataSourceJobs: bindOps(dataSourceJobs_exports, ctx),
-    dataSourceConnectors: bindOps(dataSourceConnectors_exports, ctx),
-    dataSourceEvals: bindOps(dataSourceEvals_exports, ctx),
-    dataSourceMappers: bindOps(dataSourceMappers_exports, ctx),
-    db: bindOps(db_exports, ctx),
-    diagnostics: bindOps(diagnostics_exports, ctx),
-    domains: bindOps(domains_exports, ctx),
+    agent: bindOps(agent_exports, source),
+    tasks: bindOps(tasks_exports, source),
+    analytics: bindOps(analytics_exports, source),
+    apps: bindOps(apps_exports, source),
+    events: bindOps(events_exports, source),
+    crashes: bindOps(crashes_exports, source),
+    cron: bindOps(cron_exports, source),
+    feedback: bindOps(feedback_exports, source),
+    data: bindOps(data_exports, source),
+    dataSources: bindOps(dataSources_exports, source),
+    dataSourceJobs: bindOps(dataSourceJobs_exports, source),
+    dataSourceConnectors: bindOps(dataSourceConnectors_exports, source),
+    dataSourceEvals: bindOps(dataSourceEvals_exports, source),
+    dataSourceMappers: bindOps(dataSourceMappers_exports, source),
+    db: bindOps(db_exports, source),
+    diagnostics: bindOps(diagnostics_exports, source),
+    domains: bindOps(domains_exports, source),
     email: {
-      ...bindOps(email_exports, ctx),
+      ...bindOps(email_exports, source),
       // Hand-bound: these are generic over the direction ('sending' |
       // 'inbound') and bindOps' mapped type would erase the generic,
       // collapsing every result to the cross-direction union.
-      listDomains: (direction) => listDomains(ctx, direction),
-      checkDomain: (direction, domain) => checkDomain(ctx, direction, domain),
-      addDomain: (direction, domain) => addDomain(ctx, direction, domain),
-      verifyDomain: (direction, domain) => verifyDomain(ctx, direction, domain),
-      removeDomain: (direction, domain) => removeDomain(ctx, direction, domain)
+      listDomains: async (direction) => listDomains(await source(), direction),
+      checkDomain: async (direction, domain) => checkDomain(await source(), direction, domain),
+      addDomain: async (direction, domain) => addDomain(await source(), direction, domain),
+      verifyDomain: async (direction, domain) => verifyDomain(await source(), direction, domain),
+      removeDomain: async (direction, domain) => removeDomain(await source(), direction, domain)
     },
-    files: bindOps(files_exports, ctx),
-    infra: bindOps(infra_exports, ctx),
-    issues: bindOps(issues_exports, ctx),
-    jewels: bindOps(jewels_exports, ctx),
-    methods: bindOps(methods_exports, ctx),
-    prerender: bindOps(prerender_exports, ctx),
-    previews: bindOps(previews_exports, ctx),
-    qaRecordings: bindOps(qaRecordings_exports, ctx),
-    releases: bindOps(releases_exports, ctx),
-    requests: bindOps(requests_exports, ctx),
-    secrets: bindOps(secrets_exports, ctx),
-    settings: bindOps(settings_exports, ctx),
-    users: bindOps(users_exports, ctx),
-    voice: bindOps(voice_exports, ctx)
+    files: bindOps(files_exports, source),
+    infra: bindOps(infra_exports, source),
+    issues: bindOps(issues_exports, source),
+    jewels: bindOps(jewels_exports, source),
+    methods: bindOps(methods_exports, source),
+    prerender: bindOps(prerender_exports, source),
+    previews: bindOps(previews_exports, source),
+    qaRecordings: bindOps(qaRecordings_exports, source),
+    releases: bindOps(releases_exports, source),
+    requests: bindOps(requests_exports, source),
+    secrets: bindOps(secrets_exports, source),
+    settings: bindOps(settings_exports, source),
+    usage: bindOps(usage_exports, source),
+    users: bindOps(users_exports, source),
+    voice: bindOps(voice_exports, source)
   };
 }
 function createAdminClient(options = {}) {
-  return buildClient(resolveOptions(options));
+  if (options.apiKey) {
+    const context2 = resolveOptions(options);
+    return buildClient(async () => context2, context2);
+  }
+  let context = null;
+  let unresolved = null;
+  try {
+    context = resolveOptions(options);
+  } catch (err) {
+    unresolved = err;
+  }
+  return buildClient(async () => {
+    const running = await runningMethodContext(options);
+    if (running) {
+      return running;
+    }
+    if (!context) {
+      throw unresolved;
+    }
+    return context;
+  }, context);
 }
 
 // src/index.ts