@topolo/cli 0.2.3 → 0.2.4

package/dist/index.js

@@ -78,6 +78,7 @@ var APP_API_URLS = {
   bugfix: "https://bugfix.topolo.app",
   bytes: "https://bytes.topolo.app",
   calendar: "https://calendar.topolo.app",
+  campaigns: "https://campaigns.topolo.app",
   capacity: "https://capacity.topolo.app",
   chat: "https://chat.topolo.app",
   commerce: "https://commerce.topolo.app",
@@ -336,6 +337,38 @@ var APPLICATIONS = {
       }
     ]
   },
+  "campaigns": {
+    "id": "campaigns",
+    "appDir": "TopoloCampaigns",
+    "name": "topolo-campaigns",
+    "packageName": "topolo-campaigns",
+    "productionUrl": "https://campaigns.topolo.app",
+    "services": [
+      "campaigns"
+    ],
+    "deployTargets": [
+      {
+        "name": "topolo-campaigns",
+        "kind": "worker",
+        "apiUrl": "https://campaigns.topolo.app",
+        "domains": [
+          "campaigns.topolo.app"
+        ],
+        "routes": [
+          "campaigns.topolo.app"
+        ],
+        "appId": "campaigns"
+      },
+      {
+        "name": "topolo-campaigns-api",
+        "kind": "worker",
+        "apiUrl": null,
+        "domains": [],
+        "routes": [],
+        "appId": null
+      }
+    ]
+  },
   "capacity": {
     "id": "capacity",
     "appDir": "TopoloCapacity",
@@ -2511,6 +2544,20 @@ var TopoloClient = class _TopoloClient {
   }
   async callAction(action, input2 = {}, options = {}) {
     const entry = await this.getAction(action);
+    return this.executeResolvedAction(entry, input2, options);
+  }
+  async readAction(action, input2 = {}, options = {}) {
+    const entry = await this.getAction(action);
+    const agentAccess = entry.agentAccess ?? (entry.destructive ? "off" : entry.readOnly && !entry.requiresConfirmation ? "auto" : "confirm");
+    if (entry.method !== "GET" || !entry.readOnly || entry.destructive || entry.requiresConfirmation || agentAccess !== "auto") {
+      throw new TopoloPermissionError(
+        `Topolo action "${entry.actionId}" is not an automatic read-only action.`,
+        entry.requiredPermission ? [entry.requiredPermission] : []
+      );
+    }
+    return this.executeResolvedAction(entry, input2, options);
+  }
+  async executeResolvedAction(entry, input2, options) {
     const agentAccess = entry.agentAccess ?? (entry.destructive ? "off" : entry.readOnly && !entry.requiresConfirmation ? "auto" : "confirm");
     if (agentAccess === "off") {
       throw new TopoloPermissionError(
@@ -3070,6 +3117,7 @@ var APP_API_URLS2 = {
   bugfix: "https://bugfix.topolo.app",
   bytes: "https://bytes.topolo.app",
   calendar: "https://calendar.topolo.app",
+  campaigns: "https://campaigns.topolo.app",
   capacity: "https://capacity.topolo.app",
   chat: "https://chat.topolo.app",
   commerce: "https://commerce.topolo.app",
@@ -3394,6 +3442,46 @@ async function refreshCredentialIfNeeded(environment = selectedEnvironment(), op
     return cred;
   }
 }
+async function refreshContextCredentialIfNeeded(environment, key, options = {}) {
+  const config = await readConfig();
+  const profile = profileForEnvironment(config, environment);
+  const context = profile.contexts?.[key];
+  const credential = context?.credential;
+  if (!credential || credential.kind !== "access_token") return credential ?? null;
+  const oauthClientId = context.oauthClientId ?? profile.oauthClientId;
+  if (!credential.refreshToken || !credential.expiresAt || !oauthClientId) return credential;
+  const now = Math.floor(Date.now() / 1e3);
+  if (!options.force && credential.expiresAt - REFRESH_SKEW_SECONDS > now) return credential;
+  try {
+    const oauth = new TopoloOAuth2({
+      serviceUrls: resolveServiceUrls(profile.serviceUrls, environment)
+    });
+    const tokens = await oauth.refreshToken({
+      clientId: oauthClientId,
+      refreshToken: credential.refreshToken
+    });
+    const refreshed = {
+      kind: "access_token",
+      accessToken: tokens.access_token,
+      ...tokens.refresh_token ? { refreshToken: tokens.refresh_token } : { refreshToken: credential.refreshToken },
+      expiresAt: Math.floor(Date.now() / 1e3) + tokens.expires_in
+    };
+    await writeConfig(writeProfileConfig(config, environment, {
+      ...profile.activeContext === key ? { credential: refreshed } : {},
+      contexts: {
+        ...profile.contexts ?? {},
+        [key]: {
+          ...context,
+          credential: refreshed,
+          oauthClientId
+        }
+      }
+    }));
+    return refreshed;
+  } catch {
+    return credential;
+  }
+}
 function resolveAgentName(configAgentName) {
   return process.env.TOPOLO_AGENT_NAME ?? configAgentName;
 }
@@ -10714,11 +10802,25 @@ function registerContextCommand(program2) {
       }
       const wantPersonal = /^(personal|me)$/i.test(target.trim());
       let resolved;
-      if (wantPersonal) {
+      let exchangeCredential = cred;
+      const needle = target.trim().toLowerCase();
+      const storedEntry = Object.entries(profile.contexts ?? {}).find(([, candidate]) => {
+        if (wantPersonal) return candidate.contextType === "personal";
+        return candidate.contextType === "organization" && (candidate.organizationId === target || candidate.organizationSlug?.toLowerCase() === needle || candidate.organizationName?.toLowerCase() === needle);
+      });
+      const storedContext = storedEntry?.[1];
+      if (storedEntry && storedContext?.credential) {
+        exchangeCredential = await refreshContextCredentialIfNeeded(environment, storedEntry[0]) ?? storedContext.credential;
+        resolved = {
+          contextType: storedContext.contextType,
+          organizationId: storedContext.organizationId,
+          organizationSlug: storedContext.organizationSlug,
+          organizationName: storedContext.organizationName
+        };
+      } else if (wantPersonal) {
         resolved = { contextType: "personal" };
       } else {
         const me = await fetchMe(cred, serviceUrls);
-        const needle = target.trim().toLowerCase();
         const match = me.memberships.find(
           (m) => m.id === target || m.slug?.toLowerCase() === needle || m.name?.toLowerCase() === needle
         );
@@ -10737,13 +10839,13 @@ function registerContextCommand(program2) {
       }
       const key = contextKey(resolved.contextType, resolved.organizationId);
       const existing = profile.contexts?.[key];
-      const newCredential = await exchangeForContext(cred, serviceUrls, {
+      const newCredential = await exchangeForContext(exchangeCredential, serviceUrls, {
         type: resolved.contextType,
         id: resolved.organizationId
       });
       resolved.credential = newCredential;
       resolved.oauthClientId = existing?.oauthClientId ?? profile.oauthClientId;
-      const updated = writeContextCredential(config, environment, resolved, true);
+      const updated = writeContextCredential(await readConfig(), environment, resolved, true);
       await writeConfig(updated);
       emit(
         { environment, active: key, context: { type: resolved.contextType, label: labelFor(resolved) } },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@topolo/cli",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Command-line interface for Topolo developers, operators, and agents, with internal first-party scaffolding available under the topolo platform namespace.",
   "type": "module",
   "bin": {