executor 1.3.0-beta.4 → 1.3.0-beta.5

package/bin/executor.mjs

@@ -325915,6 +325915,8 @@ var sourceInspectOps = {
   tool: operationErrors("sources.inspect.tool"),
   discover: operationErrors("sources.inspect.discover")
 };
+var PRETTY_JSON_SECTION_MAX_CHARS = 20000;
+var MAX_CODE_SECTION_CHARS = 1e5;
 var tokenize3 = (value7) => value7.trim().toLowerCase().split(/[^a-z0-9]+/).filter(Boolean);
 var canInspectSourceWithoutCatalog = (source2) => source2.status === "draft" || source2.status === "probing" || source2.status === "auth_required";
 var loadSourceForMissingCatalog = (input) => gen2(function* () {
@@ -325988,12 +325990,31 @@ var persistedToolSummaryFromTool = (tool) => {
   };
 };
 var nativeEncodingLanguage = (encoding) => encoding === "graphql" || encoding === "yaml" || encoding === "json" || encoding === "text" ? encoding : "json";
-var jsonSection = (title, value7) => value7 === null || value7 === undefined ? null : {
+var truncatedCodeBody = (input) => input.body.length <= MAX_CODE_SECTION_CHARS ? input.body : [
+  `[${input.title} truncated for inspection UI: ${String(input.body.length)} chars total, showing first ${String(MAX_CODE_SECTION_CHARS)}]`,
+  input.body.slice(0, MAX_CODE_SECTION_CHARS)
+].join(`
+`);
+var serializedJsonSectionBody = (title, value7) => {
+  const compact4 = JSON.stringify(value7);
+  if (compact4.length <= PRETTY_JSON_SECTION_MAX_CHARS) {
+    return JSON.stringify(value7, null, 2);
+  }
+  return truncatedCodeBody({
+    title,
+    body: compact4
+  });
+};
+var codeSection = (title, language, body) => ({
   kind: "code",
   title,
-  language: "json",
-  body: JSON.stringify(value7, null, 2)
-};
+  language,
+  body: truncatedCodeBody({
+    title,
+    body
+  })
+});
+var jsonSection = (title, value7) => value7 === null || value7 === undefined ? null : codeSection(title, "json", serializedJsonSectionBody(title, value7));
 var inspectionToolDetailFromTool = (tool) => gen2(function* () {
   const summary6 = persistedToolSummaryFromTool(tool);
   const details = executableDetails(tool);
@@ -326012,18 +326033,14 @@ var inspectionToolDetailFromTool = (tool) => gen2(function* () {
     { label: "Response set", value: contract.responseSetId, mono: true }
   ];
   const nativeSections = [
-    ...(tool.capability.native ?? []).map((blob, index) => ({
-      kind: "code",
-      title: `Capability native ${String(index + 1)}: ${blob.kind}`,
-      language: nativeEncodingLanguage(blob.encoding),
-      body: typeof blob.value === "string" ? blob.value : JSON.stringify(blob.value ?? null, null, 2)
-    })),
-    ...(tool.executable.native ?? []).map((blob, index) => ({
-      kind: "code",
-      title: `Executable native ${String(index + 1)}: ${blob.kind}`,
-      language: nativeEncodingLanguage(blob.encoding),
-      body: typeof blob.value === "string" ? blob.value : JSON.stringify(blob.value ?? null, null, 2)
-    }))
+    ...(tool.capability.native ?? []).map((blob, index) => {
+      const title = `Capability native ${String(index + 1)}: ${blob.kind}`;
+      return codeSection(title, nativeEncodingLanguage(blob.encoding), typeof blob.value === "string" ? blob.value : serializedJsonSectionBody(title, blob.value ?? null));
+    }),
+    ...(tool.executable.native ?? []).map((blob, index) => {
+      const title = `Executable native ${String(index + 1)}: ${blob.kind}`;
+      return codeSection(title, nativeEncodingLanguage(blob.encoding), typeof blob.value === "string" ? blob.value : serializedJsonSectionBody(title, blob.value ?? null));
+    })
   ];
   const sections = [
     {
@@ -354804,6 +354821,16 @@ var resolveMcpEndpoint = (input) => {
   return url3.toString();
 };
 
+// plugins/mcp/sdk/executable-binding.ts
+var McpExecutableBindingSchema = Struct({
+  toolId: String$,
+  toolName: String$
+});
+var mcpExecutableBindingFromProviderData = (input) => ({
+  toolId: input.toolId,
+  toolName: input.toolName
+});
+
 // plugins/mcp/sdk/catalog.ts
 var mcpResumeSupport = (execution2) => execution2?.taskSupport === "optional" || execution2?.taskSupport === "required";
 var mcpSemanticsForOperation = (input) => {
@@ -354873,7 +354900,7 @@ var createMcpCapability = (input) => {
     scopeId: input.serviceScopeId,
     pluginKey: "mcp",
     bindingVersion: EXECUTABLE_BINDING_VERSION,
-    binding: input.operation.providerData,
+    binding: mcpExecutableBindingFromProviderData(input.operation.providerData),
     projection: {
       responseSetId,
       callShapeId,
@@ -357336,19 +357363,6 @@ var McpCompleteOAuthInputSchema = Struct({
   error: optional(String$),
   errorDescription: optional(String$)
 });
-var McpExecutableBindingSchema = Struct({
-  toolId: String$,
-  toolName: String$,
-  displayTitle: String$,
-  title: NullOr(String$),
-  description: NullOr(String$),
-  annotations: NullOr(Unknown),
-  execution: NullOr(Unknown),
-  icons: NullOr(Unknown),
-  meta: NullOr(Unknown),
-  rawTool: NullOr(Unknown),
-  server: NullOr(Unknown)
-});
 var decodeProviderData3 = decodeUnknownSync(McpExecutableBindingSchema);
 var McpExecutorAddInputSchema = Struct({
   kind: optional(Literal2("mcp")),
@@ -357773,19 +357787,11 @@ var mcpSdkPlugin = (options7) => defineExecutorSourcePlugin({
         });
         const manifest = {
           version: 2,
-          server: providerData.server,
           tools: [
             {
               toolId: providerData.toolId,
               toolName: providerData.toolName,
-              displayTitle: providerData.displayTitle,
-              title: providerData.title,
-              description: providerData.description,
-              annotations: providerData.annotations,
-              execution: providerData.execution,
-              icons: providerData.icons,
-              meta: providerData.meta,
-              rawTool: providerData.rawTool,
+              description: input.descriptor.description ?? null,
               inputSchema: input.descriptor.contract?.inputSchema,
               outputSchema: input.descriptor.contract?.outputSchema
             }
@@ -358885,7 +358891,14 @@ var createHttpCapabilityFromOpenApi = (input) => {
     })(),
     pluginKey: "openapi",
     bindingVersion: EXECUTABLE_BINDING_VERSION,
-    binding: input.operation.providerData,
+    binding: {
+      kind: "openapi",
+      toolId: input.operation.providerData.toolId,
+      ...input.operation.providerData.operationId ? { operationId: input.operation.providerData.operationId } : {},
+      invocation: input.operation.providerData.invocation,
+      ...input.operation.providerData.documentServers ? { documentServers: input.operation.providerData.documentServers } : {},
+      ...input.operation.providerData.servers ? { servers: input.operation.providerData.servers } : {}
+    },
     projection: {
       responseSetId,
       callShapeId
@@ -359143,6 +359156,14 @@ var OpenApiToolProviderDataSchema = Struct({
   documentServers: optional(Array$(OpenApiServerSchema)),
   servers: optional(Array$(OpenApiServerSchema))
 });
+var OpenApiExecutableBindingSchema = Struct({
+  kind: Literal2("openapi"),
+  toolId: String$,
+  operationId: optional(String$),
+  invocation: OpenApiInvocationPayloadSchema,
+  documentServers: optional(Array$(OpenApiServerSchema)),
+  servers: optional(Array$(OpenApiServerSchema))
+});
 
 // plugins/openapi/sdk/extraction.ts
 var asObject3 = (value7) => value7 !== null && typeof value7 === "object" && !Array.isArray(value7) ? value7 : {};
@@ -359248,13 +359269,20 @@ var loadDereferencedOpenApiDocument = async (input) => {
     return next;
   };
   const dereference = async (inputValue) => {
-    const { value: value7, currentDocument, currentDocumentUrl, activeRefs } = inputValue;
+    const {
+      value: value7,
+      currentDocument,
+      currentDocumentUrl,
+      activeRefs,
+      preserveLocalRefs
+    } = inputValue;
     if (Array.isArray(value7)) {
       return Promise.all(value7.map((entry) => dereference({
         value: entry,
         currentDocument,
         currentDocumentUrl,
-        activeRefs
+        activeRefs,
+        preserveLocalRefs
       })));
     }
     if (value7 === null || typeof value7 !== "object") {
@@ -359267,6 +359295,23 @@ var loadDereferencedOpenApiDocument = async (input) => {
       if (!target?.documentUrl && !ref.startsWith("#")) {
         return value7;
       }
+      const isLocalRef = ref.startsWith("#") && (target?.documentUrl === undefined || target.documentUrl === currentDocumentUrl);
+      if (isLocalRef && preserveLocalRefs) {
+        const siblingEntries2 = Object.fromEntries(await Promise.all(Object.entries(object4).filter(([key]) => key !== "$ref").map(async ([key, entry]) => [
+          key,
+          await dereference({
+            value: entry,
+            currentDocument,
+            currentDocumentUrl,
+            activeRefs,
+            preserveLocalRefs
+          })
+        ])));
+        return Object.keys(siblingEntries2).length > 0 ? {
+          $ref: ref,
+          ...siblingEntries2
+        } : value7;
+      }
       const activeKey = `${target?.documentUrl ?? currentDocumentUrl ?? "root"}|${target?.pointer ?? ref}`;
       if (activeRefs.has(activeKey)) {
         return value7;
@@ -359282,7 +359327,8 @@ var loadDereferencedOpenApiDocument = async (input) => {
         value: targetValue,
         currentDocument: targetDocument,
         currentDocumentUrl: target?.documentUrl ?? currentDocumentUrl,
-        activeRefs: nextActiveRefs
+        activeRefs: nextActiveRefs,
+        preserveLocalRefs: target?.documentUrl ? false : preserveLocalRefs
       });
       const siblingEntries = Object.fromEntries(await Promise.all(Object.entries(object4).filter(([key]) => key !== "$ref").map(async ([key, entry]) => [
         key,
@@ -359290,7 +359336,8 @@ var loadDereferencedOpenApiDocument = async (input) => {
           value: entry,
           currentDocument,
           currentDocumentUrl,
-          activeRefs: nextActiveRefs
+          activeRefs: nextActiveRefs,
+          preserveLocalRefs
         })
       ])));
       const resolvedObject = asObject3(resolvedValue);
@@ -359302,7 +359349,8 @@ var loadDereferencedOpenApiDocument = async (input) => {
         value: entry,
         currentDocument,
         currentDocumentUrl,
-        activeRefs
+        activeRefs,
+        preserveLocalRefs
       })
     ])));
   };
@@ -359310,7 +359358,8 @@ var loadDereferencedOpenApiDocument = async (input) => {
     value: input.document,
     currentDocument: input.document,
     currentDocumentUrl: input.documentUrl,
-    activeRefs: new Set
+    activeRefs: new Set,
+    preserveLocalRefs: true
   });
 };
 var preferredContentEntry = (content) => {
@@ -360399,7 +360448,7 @@ var openApiStoredSourceDataFromLocalConfig = (input) => {
   }
   throw new Error("Unsupported OpenAPI local source config.");
 };
-var decodeProviderData4 = decodeUnknownSync(OpenApiToolProviderDataSchema);
+var decodeExecutableBinding = decodeUnknownSync(OpenApiExecutableBindingSchema);
 var asRecord11 = (value7) => typeof value7 === "object" && value7 !== null && !Array.isArray(value7) ? value7 : {};
 var parameterContainerKeys = {
   path: ["path", "pathParams", "params"],
@@ -360685,7 +360734,7 @@ var openApiSdkPlugin = (options7) => defineExecutorSourcePlugin({
           return yield* runtimeEffectError("plugins/openapi/sdk", `OpenAPI source storage missing for ${input.source.id}`);
         }
         const normalizedStored = normalizeStoredSourceData3(input.stored);
-        const providerData = decodeProviderData4(input.executable.binding);
+        const providerData = decodeExecutableBinding(input.executable.binding);
         const args2 = asRecord11(input.args);
         const resolvedPath = replacePathTemplate(providerData.invocation.pathTemplate, args2, providerData.invocation);
         const headers = {
@@ -360745,7 +360794,7 @@ var openApiSdkPlugin = (options7) => defineExecutorSourcePlugin({
         }
         const response = yield* tryPromise2({
           try: () => fetch(finalUrl.toString(), {
-            method: providerData.method.toUpperCase(),
+            method: providerData.invocation.method.toUpperCase(),
             headers: requestHeaders,
             ...body !== undefined ? {
               body: typeof body === "string" ? body : new Uint8Array(body).buffer

package/package.json

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

package/resources/web/assets/{highlighted-body-TPN3WLV5-DWag2KgW.js → highlighted-body-TPN3WLV5-46YyTVIj.js}

@@ -1 +1 @@
-import{r,R as c,M as p,B as x}from"./mermaid-O7DHMXV3-Dhg9dniF.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-C705YdCO.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};