@desplega.ai/agent-swarm 1.166.0 → 1.168.0

package/dist/{cli-x3x0qwky.js → cli-bxqez1p0.js}

@@ -15,12 +15,12 @@ import {
   require_proper_lockfile,
   resolveConfigValueOrThrow,
   resolveHeadersOrThrow
-} from "./cli-krqm5f11.js";
+} from "./cli-xezn9nkh.js";
 import {
   APP_NAME,
   VERSION,
   getAgentDir
-} from "./cli-cwxhbf43.js";
+} from "./cli-5t5my0h8.js";
 import {
   oauthErrorHtml,
   oauthSuccessHtml
@@ -328,19 +328,20 @@ function parseWwwAuthenticate(header) {
     errorDescription: field(header, "error_description")
   };
 }
-async function fetchMetadata(url, fetch, protocolVersion) {
+async function fetchMetadata(url, fetch, protocolVersion, signal) {
   return fetch(url, {
-    headers: { Accept: "application/json", "MCP-Protocol-Version": protocolVersion }
+    headers: { Accept: "application/json", "MCP-Protocol-Version": protocolVersion },
+    signal
   });
 }
 async function discoverProtectedResourceMetadata(serverUrl, options = {}) {
   const server = new URL(serverUrl);
   const fetch = options.fetch ?? globalThis.fetch;
   const version = options.protocolVersion ?? LATEST_PROTOCOL_VERSION;
-  let response = await fetchMetadata(options.resourceMetadataUrl ? new URL(options.resourceMetadataUrl) : new URL(`/.well-known/oauth-protected-resource${pathSuffix(server.pathname)}`, server.origin), fetch, version);
+  let response = await fetchMetadata(options.resourceMetadataUrl ? new URL(options.resourceMetadataUrl) : new URL(`/.well-known/oauth-protected-resource${pathSuffix(server.pathname)}`, server.origin), fetch, version, options.signal);
   if (!options.resourceMetadataUrl && server.pathname !== "/" && isDiscoveryMiss(response.status)) {
     discard(response);
-    response = await fetchMetadata(new URL("/.well-known/oauth-protected-resource", server.origin), fetch, version);
+    response = await fetchMetadata(new URL("/.well-known/oauth-protected-resource", server.origin), fetch, version, options.signal);
   }
   if (!response.ok) {
     discard(response);
@@ -362,7 +363,7 @@ function buildAuthorizationServerDiscoveryUrls(authorizationServerUrl) {
 async function discoverAuthorizationServerMetadata(authorizationServerUrl, options = {}) {
   const fetch = options.fetch ?? globalThis.fetch;
   for (const { url } of buildAuthorizationServerDiscoveryUrls(authorizationServerUrl)) {
-    const response = await fetchMetadata(url, fetch, options.protocolVersion ?? LATEST_PROTOCOL_VERSION);
+    const response = await fetchMetadata(url, fetch, options.protocolVersion ?? LATEST_PROTOCOL_VERSION, options.signal);
     if (!response.ok) {
       discard(response);
       if (isDiscoveryMiss(response.status))
@@ -385,7 +386,8 @@ async function discoverOAuthServerInfo(serverUrl, options = {}) {
   try {
     resourceMetadata = await discoverProtectedResourceMetadata(serverUrl, {
       resourceMetadataUrl: options.resourceMetadataUrl,
-      fetch: options.fetch
+      fetch: options.fetch,
+      signal: options.signal
     });
   } catch (error) {
     if (error instanceof TypeError)
@@ -393,7 +395,7 @@ async function discoverOAuthServerInfo(serverUrl, options = {}) {
   }
   if (options.authorizationServerMetadataUrl) {
     const url = options.authorizationServerMetadataUrl;
-    const response = await fetchMetadata(url, options.fetch ?? globalThis.fetch, LATEST_PROTOCOL_VERSION);
+    const response = await fetchMetadata(url, options.fetch ?? globalThis.fetch, LATEST_PROTOCOL_VERSION, options.signal);
     if (!response.ok) {
       discard(response);
       throw new Error(`HTTP ${response.status} loading authorization server metadata from ${url}`);
@@ -406,7 +408,8 @@ async function discoverOAuthServerInfo(serverUrl, options = {}) {
     authorizationServerUrl,
     authorizationServerMetadata: await discoverAuthorizationServerMetadata(authorizationServerUrl, {
       fetch: options.fetch,
-      skipIssuerValidation: options.skipIssuerValidation
+      skipIssuerValidation: options.skipIssuerValidation,
+      signal: options.signal
     }),
     resourceMetadata
   };
@@ -517,7 +520,12 @@ async function tokenRequest(authorizationServerUrl, options, params) {
   } else {
     applyClientAuthentication(selectClientAuthMethod(options.clientInformation, options.metadata?.token_endpoint_auth_methods_supported ?? []), options.clientInformation, headers, params);
   }
-  const response = await (options.fetch ?? globalThis.fetch)(url, { method: "POST", headers, body: params });
+  const response = await (options.fetch ?? globalThis.fetch)(url, {
+    method: "POST",
+    headers,
+    body: params,
+    signal: options.signal
+  });
   const text = await response.text();
   let value;
   try {
@@ -541,7 +549,8 @@ async function registerClient(authorizationServerUrl, options) {
       ...options.clientMetadata,
       application_type: options.clientMetadata.application_type ?? applicationType(options.clientMetadata.redirect_uris),
       ...options.scope ? { scope: options.scope } : {}
-    })
+    }),
+    signal: options.signal
   });
   if (!response.ok)
     throw new OAuthRegistrationError(response.status, await response.text());
@@ -575,14 +584,16 @@ async function runFlow(provider, options) {
     authorizationServerUrl: cached.authorizationServerUrl,
     authorizationServerMetadata: cached.authorizationServerMetadata ?? await discoverAuthorizationServerMetadata(cached.authorizationServerUrl, {
       fetch: options.fetch,
-      skipIssuerValidation: options.skipIssuerValidation
+      skipIssuerValidation: options.skipIssuerValidation,
+      signal: options.signal
     }),
     resourceMetadata: cached.resourceMetadata
   } : await discoverOAuthServerInfo(options.serverUrl, {
     resourceMetadataUrl: options.resourceMetadataUrl,
     authorizationServerMetadataUrl: metadataUrl,
     fetch: options.fetch,
-    skipIssuerValidation: options.skipIssuerValidation
+    skipIssuerValidation: options.skipIssuerValidation,
+    signal: options.signal
   });
   if (!metadataUrl) {
     await provider.saveDiscoveryState?.({
@@ -610,7 +621,8 @@ async function runFlow(provider, options) {
       metadata,
       clientMetadata: provider.clientMetadata,
       scope,
-      fetch: options.fetch
+      fetch: options.fetch,
+      signal: options.signal
     });
     await provider.saveClientInformation(client);
   }
@@ -620,7 +632,8 @@ async function runFlow(provider, options) {
     clientInformation: client,
     resource,
     addClientAuthentication: provider.addClientAuthentication,
-    fetch: options.fetch
+    fetch: options.fetch,
+    signal: options.signal
   };
   if (options.authorizationCode) {
     const iss = options.iss;
@@ -647,7 +660,7 @@ async function runFlow(provider, options) {
       await provider.saveTokens(withScope(tokens, existing.scope));
       return "AUTHORIZED";
     } catch (error) {
-      if (error instanceof OAuthInsecureEndpointError)
+      if (options.signal?.aborted || error instanceof OAuthInsecureEndpointError)
         throw error;
       if (error instanceof OAuthError && error.code !== "server_error")
         throw error;
@@ -806,7 +819,7 @@ var CALLBACK_PATH = "/callback";
 var CLIENT_METADATA_BASE_URL = "https://pi.dev/oauth";
 var FALLBACK_REDIRECT_URL = `http://${CALLBACK_HOST}${CALLBACK_PATH}`;
 var REFRESH_SKEW_MS = 30000;
-var REFRESH_REQUEST_TIMEOUT_MS = 15000;
+var OAUTH_REQUEST_TIMEOUT_MS = 15000;
 var REFRESH_LOCK_STALE_MS = 20000;
 var REFRESH_LOCK_WAIT_MS = 25000;
 var REFRESH_LOCK_RETRY_MS = 100;
@@ -920,6 +933,12 @@ class McpOAuthCredentialStore {
     });
   }
 }
+function timedFetch(fetch = globalThis.fetch) {
+  return (input, init) => {
+    const timeout = AbortSignal.timeout(OAUTH_REQUEST_TIMEOUT_MS);
+    return fetch(input, { ...init, signal: init?.signal ? AbortSignal.any([init.signal, timeout]) : timeout });
+  };
+}
 function registeredRedirectUrls(client) {
   return client && "redirect_uris" in client ? client.redirect_uris : [];
 }
@@ -970,7 +989,7 @@ function createMcpAuthProvider(options) {
         resourceMetadataUrl: challenge?.resourceMetadataUrl,
         authorizationServerMetadataUrl: settings.authServerMetadataUrl,
         scope: challenge?.scope,
-        fetch: (input, init) => fetch(input, { ...init, signal: AbortSignal.timeout(REFRESH_REQUEST_TIMEOUT_MS) })
+        fetch: timedFetch(fetch)
       });
       if (result === "REDIRECT")
         throw new McpOAuthAuthorizationRequiredError;
@@ -1035,10 +1054,11 @@ function responseFromRedirectUrl(input, state, redirectUrl) {
     throw new Error("The redirect URL does not contain an authorization code");
   return { code, iss: url.searchParams.get("iss") ?? undefined };
 }
-async function waitForAuthorizationResponse(callback, state, redirectUrl, prompt) {
+async function waitForAuthorizationResponse(callback, state, redirectUrl, prompt, signal) {
   const controller = new AbortController;
+  const promptSignal = signal ? AbortSignal.any([controller.signal, signal]) : controller.signal;
   const fromBrowser = callback.waitForCallback(state, redirectUrl.pathname);
-  const fromUser = prompt.promptForRedirectUrl(controller.signal).then((input) => {
+  const fromUser = prompt.promptForRedirectUrl(promptSignal).then((input) => {
     if (!input?.trim())
       throw new McpSignInCancelledError;
     return responseFromRedirectUrl(input, state, redirectUrl);
@@ -1072,7 +1092,9 @@ async function listenForCallback(settings, extraPaths, port, required) {
   }
 }
 async function signInMcpServer(options) {
-  const { serverUrl, store, settings } = options;
+  const { serverUrl, store, settings, signal } = options;
+  if (signal?.aborted)
+    throw new McpSignInCancelledError;
   const stored = await store.load();
   const stepUp = options.challenge?.error === "insufficient_scope";
   const callbackOptions = callbackSettings(settings);
@@ -1099,6 +1121,8 @@ async function signInMcpServer(options) {
     });
     const flow = {
       serverUrl,
+      fetch: timedFetch(),
+      signal,
       resourceMetadataUrl: options.challenge?.resourceMetadataUrl,
       authorizationServerMetadataUrl: settings.authServerMetadataUrl,
       scope: mergeScopes(settings.scope, stepUp ? stepUpScope(stored?.tokens?.scope, options.challenge?.scope) : options.challenge?.scope)
@@ -1111,8 +1135,12 @@ async function signInMcpServer(options) {
     const state = await provider.state();
     const authorizationRedirectUrl = new URL(authorizationUrl.searchParams.get("redirect_uri") ?? redirectUrl);
     options.prompt.showAuthorizationUrl(authorizationUrl);
-    const { code, iss } = await waitForAuthorizationResponse(callback, state, authorizationRedirectUrl, options.prompt);
+    const { code, iss } = await waitForAuthorizationResponse(callback, state, authorizationRedirectUrl, options.prompt, signal);
     await authorizeMcp(provider, { ...flow, authorizationCode: code, iss });
+  } catch (error) {
+    if (signal?.aborted)
+      throw new McpSignInCancelledError;
+    throw error;
   } finally {
     await callback.close();
   }

package/dist/{cli-ng97fjq7.js → cli-cmxkbzzs.js}

@@ -32,7 +32,7 @@ import {
   getJsonSchemaToolParameters,
   resolveJsonSchemaStrictSampling,
   transformMessages
-} from "./cli-8kt0bmgx.js";
+} from "./cli-xf713zz0.js";
 import {
   sanitizeSurrogates
 } from "./cli-y2apkfe2.js";
@@ -46,7 +46,7 @@ import {
   getInitialSystemMessage,
   getSystemMessageText,
   withoutInitialSystemMessage
-} from "./cli-nexwh8zg.js";
+} from "./cli-g7k7zbcz.js";
 import {
   getProviderEnvValue
 } from "./cli-btbzvq95.js";
@@ -56,7 +56,7 @@ import {
 import {
   AssistantMessageEventStream,
   appendAssistantMessageDiagnostic
-} from "./cli-bzr0ftht.js";
+} from "./cli-wnb9b2g3.js";
 import {
   exports_supports_color,
   init_supports_color
@@ -6489,15 +6489,15 @@ function getModelMatchCandidates(modelId, modelName) {
 }
 function supportsAdaptiveThinking(modelId, modelName) {
   const candidates = getModelMatchCandidates(modelId, modelName);
-  return candidates.some((s) => s.includes("opus-4-6") || s.includes("opus-4-7") || s.includes("opus-4-8") || s.includes("opus-5") || s.includes("sonnet-4-6") || s.includes("sonnet-5") || s.includes("fable-5"));
+  return candidates.some((s) => s.includes("opus-4-6") || s.includes("opus-4-7") || s.includes("opus-4-8") || s.includes("opus-5") || s.includes("sonnet-4-6") || s.includes("sonnet-5") || s.includes("haiku-5") || s.includes("fable-5"));
 }
 function supportsNativeXhighEffort(model) {
   const candidates = getModelMatchCandidates(model.id, model.name);
-  return candidates.some((s) => s.includes("opus-4-7") || s.includes("opus-4-8") || s.includes("opus-5") || s.includes("sonnet-5") || s.includes("fable-5"));
+  return candidates.some((s) => s.includes("opus-4-7") || s.includes("opus-4-8") || s.includes("opus-5") || s.includes("sonnet-5") || s.includes("haiku-5") || s.includes("fable-5"));
 }
 function supportsThinkingBlockBinding(model) {
   const candidates = getModelMatchCandidates(model.id, model.name);
-  return candidates.some((s) => s.includes("opus-4-7") || s.includes("opus-4-8") || s.includes("opus-5") || s.includes("sonnet-5") || s.includes("fable-5"));
+  return candidates.some((s) => s.includes("opus-4-7") || s.includes("opus-4-8") || s.includes("opus-5") || s.includes("sonnet-5") || s.includes("haiku-5") || s.includes("fable-5"));
 }
 function mapThinkingLevelToEffort(model, level) {
   if (level === "xhigh" && supportsNativeXhighEffort(model))
@@ -6539,7 +6539,7 @@ function supportsPromptCaching(model, env) {
       return true;
     return false;
   }
-  if (candidates.some((s) => s.includes("fable-5") || s.includes("opus-5") || s.includes("sonnet-5")))
+  if (candidates.some((s) => s.includes("fable-5") || s.includes("opus-5") || s.includes("sonnet-5") || s.includes("haiku-5")))
     return true;
   if (candidates.some((s) => s.includes("-4-")))
     return true;
@@ -6865,8 +6865,34 @@ function buildAdditionalModelRequestFields(model, options) {
     }
     return result;
   }
+  const candidates = getModelMatchCandidates(model.id, model.name);
+  if (candidates.some((s) => s.includes("gpt-oss"))) {
+    return { reasoning_effort: OPENAI_GPT_OSS_EFFORT[options.reasoning] };
+  }
+  if (candidates.some((s) => s.includes("gpt-"))) {
+    const mapped = model.thinkingLevelMap?.[options.reasoning];
+    return {
+      reasoning: { effort: typeof mapped === "string" ? mapped : OPENAI_GPT_EFFORT[options.reasoning] }
+    };
+  }
   return;
 }
+var OPENAI_GPT_EFFORT = {
+  minimal: "low",
+  low: "low",
+  medium: "medium",
+  high: "high",
+  xhigh: "xhigh",
+  max: "max"
+};
+var OPENAI_GPT_OSS_EFFORT = {
+  minimal: "low",
+  low: "low",
+  medium: "medium",
+  high: "high",
+  xhigh: "high",
+  max: "high"
+};
 function createImageBlock(mimeType, data) {
   let format;
   switch (mimeType) {