executor 1.2.2 → 1.2.3

package/bin/executor.mjs

@@ -382321,13 +382321,47 @@ var googleDiscoveryCatalogOperationFromDefinition = (input) => {
     providerData: presentation.providerData
   };
 };
+var computeMaximalScopes = (manifest) => {
+  const topLevelScopes = Object.keys(manifest.oauthScopes ?? {});
+  if (topLevelScopes.length === 0)
+    return [];
+  const scopeToMethods = new Map;
+  for (const scope4 of topLevelScopes) {
+    scopeToMethods.set(scope4, new Set);
+  }
+  for (const method of manifest.methods) {
+    for (const scope4 of method.scopes) {
+      scopeToMethods.get(scope4)?.add(method.methodId);
+    }
+  }
+  const maximal = topLevelScopes.filter((scope4) => {
+    const methods = scopeToMethods.get(scope4);
+    if (!methods || methods.size === 0)
+      return true;
+    return !topLevelScopes.some((other) => {
+      if (other === scope4)
+        return false;
+      const otherMethods = scopeToMethods.get(other);
+      if (!otherMethods || otherMethods.size <= methods.size)
+        return false;
+      for (const m of methods) {
+        if (!otherMethods.has(m))
+          return false;
+      }
+      return true;
+    });
+  });
+  return maximal;
+};
 var googleDiscoveryOauth2SetupConfig = (source2) => gen2(function* () {
   const bindingConfig = yield* googleDiscoveryBindingConfigFromSource(source2);
   const configuredScopes = bindingConfig.scopes ?? [];
-  const scopes = configuredScopes.length > 0 ? configuredScopes : yield* fetchGoogleDiscoveryDocumentWithHeaders({
+  const manifest = yield* fetchGoogleDiscoveryDocumentWithHeaders({
     url: bindingConfig.discoveryUrl,
     headers: bindingConfig.defaultHeaders ?? undefined
-  }).pipe(flatMap10((document2) => extractGoogleDiscoveryManifest(source2.name, document2)), map16((manifest) => Object.keys(manifest.oauthScopes ?? {})));
+  }).pipe(flatMap10((document2) => extractGoogleDiscoveryManifest(source2.name, document2)), catchAll2(() => succeed8(null)));
+  const discoveryScopes = manifest ? computeMaximalScopes(manifest) : [];
+  const scopes = discoveryScopes.length > 0 ? [...new Set([...discoveryScopes, ...configuredScopes])] : configuredScopes;
   if (scopes.length === 0) {
     return null;
   }
@@ -412649,6 +412683,9 @@ var refreshOAuth2AccessToken = (input) => gen2(function* () {
   if (input.clientAuthentication === "client_secret_post" && input.clientSecret) {
     body2.set("client_secret", input.clientSecret);
   }
+  if (input.scopes && input.scopes.length > 0) {
+    body2.set("scope", input.scopes.join(" "));
+  }
   return yield* postFormToOAuth2TokenEndpoint({
     tokenEndpoint: input.tokenEndpoint,
     body: body2
@@ -412784,7 +412821,8 @@ var refreshProviderGrantRefArtifact = (input) => gen2(function* () {
     clientId: oauthClient.clientId,
     clientAuthentication: grant.clientAuthentication,
     clientSecret,
-    refreshToken
+    refreshToken,
+    scopes: config3.requiredScopes.length > 0 ? config3.requiredScopes : null
   });
   const storeSecretMaterial = createDefaultSecretMaterialStorer({
     rows: input.rows

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "executor",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Local AI executor with a CLI, local API server, and web UI.",
   "keywords": [
     "executor",

package/resources/web/assets/{highlighted-body-TPN3WLV5-C5w_3Mk1.js → highlighted-body-TPN3WLV5-BU4VAH4d.js}

@@ -1 +1 @@
-import{r,R as c,M as p,B as x}from"./mermaid-O7DHMXV3--BgdD7JQ.js";import{j as d}from"./index-CRuElBS1.js";var R=({code:i,language:e,raw:t,className:g,startLine:u,...m})=>{let{shikiTheme:o}=r.useContext(c),a=p(),[n,s]=r.useState(t);return r.useEffect(()=>{if(!a){s(t);return}let l=a.highlight({code:i,language:e,themes:o},h=>{s(h)});l&&s(l)},[i,e,o,a,t]),d.jsx(x,{className:g,language:e,result:n,startLine:u,...m})};export{R as HighlightedCodeBlockBody};
+import{r,R as c,M as p,B as x}from"./mermaid-O7DHMXV3-Bjib29xY.js";import{j as d}from"./index-CRuElBS1.js";var R=({code:i,language:e,raw:t,className:g,startLine:u,...m})=>{let{shikiTheme:o}=r.useContext(c),a=p(),[n,s]=r.useState(t);return r.useEffect(()=>{if(!a){s(t);return}let l=a.highlight({code:i,language:e,themes:o},h=>{s(h)});l&&s(l)},[i,e,o,a,t]),d.jsx(x,{className:g,language:e,result:n,startLine:u,...m})};export{R as HighlightedCodeBlockBody};