executor 1.2.4-beta.6 → 1.2.4-beta.7

package/bin/executor.mjs

@@ -357330,6 +357330,32 @@ var hasSubstringMatch = (value7, queryToken) => {
   return singular !== queryToken && value7.includes(singular);
 };
 var queryTokenWeight = (token) => LOW_SIGNAL_QUERY_TOKENS.has(token) ? 0.25 : 1;
+var namespaceFromPath2 = (path4) => {
+  const [first3, second] = path4.split(".");
+  return second ? `${first3}.${second}` : first3;
+};
+var sortNamespaces = (namespaces) => [...namespaces].sort((left3, right3) => left3.namespace.localeCompare(right3.namespace));
+var loadWorkspaceCatalogNamespaces = (input) => gen2(function* () {
+  const catalogs = yield* input.sourceCatalogStore.loadWorkspaceSourceCatalogs({
+    scopeId: input.scopeId,
+    actorScopeId: input.actorScopeId
+  });
+  const namespaces = new Map;
+  for (const catalog6 of catalogs) {
+    if (!catalog6.source.enabled || catalog6.source.status !== "connected") {
+      continue;
+    }
+    for (const descriptor2 of Object.values(catalog6.projected.toolDescriptors)) {
+      const namespace = namespaceFromPath2(descriptor2.toolPath.join("."));
+      const existing = namespaces.get(namespace);
+      namespaces.set(namespace, {
+        namespace,
+        toolCount: (existing?.toolCount ?? 0) + 1
+      });
+    }
+  }
+  return sortNamespaces(namespaces.values());
+});
 var loadWorkspaceCatalogTools = (input) => map16(input.sourceCatalogStore.loadWorkspaceSourceCatalogToolIndex({
   scopeId: input.scopeId,
   actorScopeId: input.actorScopeId,
@@ -357450,7 +357476,11 @@ var createScopeSourceCatalog = (input) => {
     });
   }));
   return {
-    listNamespaces: ({ limit }) => provideRuntimeLocalScope(flatMap10(createSharedCatalog(false), (catalog6) => catalog6.listNamespaces({ limit })), input.runtimeLocalScope),
+    listNamespaces: ({ limit }) => provideRuntimeLocalScope(provideWorkspaceStorage(map16(loadWorkspaceCatalogNamespaces({
+      scopeId: input.scopeId,
+      actorScopeId: input.actorScopeId,
+      sourceCatalogStore: input.sourceCatalogStore
+    }), (namespaces) => namespaces.slice(0, limit))), input.runtimeLocalScope),
     listTools: ({ namespace, query, limit, includeSchemas = false }) => provideRuntimeLocalScope(flatMap10(createSharedCatalog(includeSchemas), (catalog6) => catalog6.listTools({
       ...namespace !== undefined ? { namespace } : {},
       ...query !== undefined ? { query } : {},
@@ -368329,11 +368359,15 @@ var supportsManagedElicitation = (server2) => {
   return Boolean(capabilities?.elicitation?.form) && Boolean(capabilities?.elicitation?.url);
 };
 var interactionModeForServer = (server2) => supportsManagedElicitation(server2) ? "live_form" : "detach";
-var buildExecuteWorkflowText = (namespaces = []) => [
+var executeDescriptionToolsPerSource = 5;
+var buildExecuteWorkflowText = (sourceToolExamples = []) => [
   "Execute TypeScript in sandbox; call tools via discovery workflow.",
-  ...namespaces.length > 0 ? [
-    "Available namespaces:",
-    ...namespaces.map((namespace) => `- ${namespace}`)
+  ...sourceToolExamples.length > 0 ? [
+    "Available source tool examples:",
+    ...sourceToolExamples.flatMap((source2) => [
+      `${source2.sourceName}:`,
+      ...source2.toolPaths.map((toolPath) => `- ${toolPath}`)
+    ])
   ] : [],
   "Workflow:",
   '1) const matches = await tools.discover({ query: "<intent>", limit: 12 });',
@@ -368347,18 +368381,19 @@ var buildExecuteWorkflowText = (namespaces = []) => [
 `);
 var defaultExecuteDescription = buildExecuteWorkflowText();
 var loadExecuteDescription = (runtime6) => runControlPlane(runtime6, gen2(function* () {
-  const resolveExecutionEnvironment = yield* RuntimeExecutionResolverService;
-  const environment3 = yield* resolveExecutionEnvironment({
+  const sourceCatalogStore = yield* RuntimeSourceCatalogStoreService;
+  const catalogs = yield* sourceCatalogStore.loadWorkspaceSourceCatalogs({
     scopeId: runtime6.localInstallation.scopeId,
-    actorScopeId: runtime6.localInstallation.actorScopeId,
-    executionId: ExecutionIdSchema.make("exec_mcp_help")
+    actorScopeId: runtime6.localInstallation.actorScopeId
   });
-  const catalog6 = environment3.catalog;
-  if (!catalog6) {
+  const sourceToolExamples = catalogs.filter((catalog6) => catalog6.source.enabled && catalog6.source.status === "connected").map((catalog6) => ({
+    sourceName: catalog6.source.name,
+    toolPaths: Object.values(catalog6.projected.toolDescriptors).map((descriptor2) => descriptor2.toolPath.join(".")).filter((toolPath) => toolPath.length > 0).sort((left3, right3) => left3.localeCompare(right3)).slice(0, executeDescriptionToolsPerSource)
+  })).filter((catalog6) => catalog6.toolPaths.length > 0);
+  if (sourceToolExamples.length === 0) {
     return defaultExecuteDescription;
   }
-  const namespaces = yield* catalog6.listNamespaces({ limit: 200 }).pipe(map16((items) => items.length > 0 ? items.map((item) => item.displayName ?? item.namespace) : ["none discovered yet"]), catchAll2(() => succeed8(["none discovered yet"])));
-  return buildExecuteWorkflowText(namespaces);
+  return buildExecuteWorkflowText(sourceToolExamples);
 }).pipe(catchAll2(() => succeed8(defaultExecuteDescription))));
 var summarizeExecution = (execution2) => {
   switch (execution2.status) {

package/package.json

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

package/resources/web/assets/{highlighted-body-TPN3WLV5-DYg1rqdL.js → highlighted-body-TPN3WLV5-dT8t51CG.js}

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