executor 1.2.4-beta.5 → 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) {
@@ -370351,7 +370386,6 @@ var waitForReachability = (baseUrl2, expected) => gen2(function* () {
   }
   return yield* failReachabilityTimeout({ baseUrl: baseUrl2, expected });
 });
-var renderDenoSandboxDetail = (denoVersion) => denoVersion !== null ? `deno ${denoVersion}` : "deno not found (run `executor sandbox` to install)";
 var getServerStatus = (baseUrl2) => gen2(function* () {
   const pidRecord = yield* readPidRecord();
   const reachable = yield* isServerReachable(baseUrl2);
@@ -370362,7 +370396,6 @@ var getServerStatus = (baseUrl2) => gen2(function* () {
   const pid = typeof pidRecord?.pid === "number" ? pidRecord.pid : null;
   const pidRunning = pid !== null ? isPidRunning(pid) : false;
   const logFile = pidRecord?.logFile ?? DEFAULT_SERVER_LOG_FILE;
-  const denoVersion = yield* getDenoVersion();
   return {
     baseUrl: baseUrl2,
     reachable,
@@ -370372,8 +370405,7 @@ var getServerStatus = (baseUrl2) => gen2(function* () {
     logFile,
     localDataDir: DEFAULT_LOCAL_DATA_DIR,
     webAssetsDir: resolveRuntimeWebAssetsDir(),
-    installation,
-    denoVersion
+    installation
   };
 });
 var renderStatus = (status2) => [
@@ -370385,8 +370417,21 @@ var renderStatus = (status2) => [
   `logFile: ${status2.logFile}`,
   `localDataDir: ${status2.localDataDir}`,
   `webAssetsDir: ${status2.webAssetsDir ?? "missing"}`,
-  `workspaceId: ${status2.installation?.workspaceId ?? "unavailable"}`,
-  `denoSandbox: ${renderDenoSandboxDetail(status2.denoVersion)}`
+  `workspaceId: ${status2.installation?.workspaceId ?? "unavailable"}`
+].join(`
+`);
+var appendUrlPath = (baseUrl2, pathname) => new URL(pathname, baseUrl2.endsWith("/") ? baseUrl2 : `${baseUrl2}/`).toString();
+var renderUpSummary = (input) => [
+  input.started ? "Executor is ready." : "Executor is already running.",
+  `API: ${input.status.baseUrl}`,
+  `MCP: ${appendUrlPath(input.status.baseUrl, "mcp")}`,
+  `OpenAPI: ${appendUrlPath(input.status.baseUrl, "v1/openapi.json")}`,
+  `Workspace: ${input.status.installation?.workspaceId ?? "unavailable"}`,
+  "",
+  "Try next:",
+  `  ${CLI_NAME} call 'return 1 + 1'`,
+  `  ${CLI_NAME} status`,
+  `  ${CLI_NAME} down`
 ].join(`
 `);
 var getDoctorReport = (baseUrl2) => getServerStatus(baseUrl2).pipe(map16((status2) => {
@@ -370414,10 +370459,6 @@ var getDoctorReport = (baseUrl2) => getServerStatus(baseUrl2).pipe(map16((status
     installation: {
       ok: status2.installation !== null,
       detail: status2.installation ? `workspace ${status2.installation.workspaceId}` : "local installation unavailable"
-    },
-    denoSandbox: {
-      ok: status2.denoVersion !== null,
-      detail: renderDenoSandboxDetail(status2.denoVersion)
     }
   };
   return {
@@ -370456,12 +370497,17 @@ var stopServer = (baseUrl2) => gen2(function* () {
 var ensureServer = (baseUrl2 = DEFAULT_SERVER_BASE_URL) => gen2(function* () {
   const reachable = yield* isServerReachable(baseUrl2);
   if (reachable) {
-    return;
+    return {
+      started: false
+    };
   }
   const url3 = new URL(baseUrl2);
   const port2 = Number(url3.port || DEFAULT_SERVER_PORT);
   yield* startServerInBackground(port2);
   yield* waitForReachability(baseUrl2, true);
+  return {
+    started: true
+  };
 });
 var isRecord9 = (value7) => typeof value7 === "object" && value7 !== null && !Array.isArray(value7);
 var getPromptFields = (requestedSchema) => {
@@ -370769,7 +370815,7 @@ var serverStartCommand = exports_Command2.make("start", {
 var serverCommand = exports_Command2.make("server").pipe(exports_Command2.withSubcommands([serverStartCommand]), exports_Command2.withDescription("Local server commands"));
 var upCommand = exports_Command2.make("up", {
   baseUrl: exports_Options.text("base-url").pipe(exports_Options.withDefault(DEFAULT_SERVER_BASE_URL))
-}, ({ baseUrl: baseUrl2 }) => ensureServer(baseUrl2).pipe(zipRight3(getServerStatus(baseUrl2)), flatMap10((status2) => printText(renderStatus(status2))))).pipe(exports_Command2.withDescription("Ensure the local executor server is running"));
+}, ({ baseUrl: baseUrl2 }) => ensureServer(baseUrl2).pipe(flatMap10(({ started }) => getServerStatus(baseUrl2).pipe(flatMap10((status2) => printText(renderUpSummary({ started, status: status2 }))))))).pipe(exports_Command2.withDescription("Start the local executor server if needed and show how to use it"));
 var downCommand = exports_Command2.make("down", {
   baseUrl: exports_Options.text("base-url").pipe(exports_Options.withDefault(DEFAULT_SERVER_BASE_URL))
 }, ({ baseUrl: baseUrl2 }) => stopServer(baseUrl2).pipe(flatMap10((stopped) => printText(stopped ? "Stopped local executor server." : "Local executor server is not running.")))).pipe(exports_Command2.withDescription("Stop the local executor server"));
@@ -370785,55 +370831,6 @@ var doctorCommand = exports_Command2.make("doctor", {
   ...Object.entries(report.checks).map(([name, check3]) => `${name}: ${check3.ok ? "ok" : "fail"} - ${check3.detail}`)
 ].join(`
 `))))).pipe(exports_Command2.withDescription("Check local executor install and daemon health"));
-var getDenoVersion = () => gen2(function* () {
-  const fs3 = yield* exports_FileSystem.FileSystem;
-  const configuredDenoExecutable = process.env.DENO_BIN?.trim();
-  const bundledDenoExecutable = process.env.HOME?.trim() ? `${process.env.HOME.trim()}/.deno/bin/deno` : null;
-  const bundledDenoExists = bundledDenoExecutable === null ? false : yield* fs3.exists(bundledDenoExecutable).pipe(catchAll2(() => succeed8(false)));
-  const denoExecutable = configuredDenoExecutable || (bundledDenoExists ? bundledDenoExecutable : null) || "deno";
-  return yield* tryPromise2({
-    try: () => new Promise((resolveVersion) => {
-      const child = spawn4(denoExecutable, ["--version"], {
-        stdio: ["ignore", "pipe", "ignore"],
-        timeout: 5000
-      });
-      let stdout = "";
-      child.stdout?.setEncoding("utf8");
-      child.stdout?.on("data", (chunk4) => {
-        stdout += chunk4;
-      });
-      child.once("error", () => resolveVersion(null));
-      child.once("close", (code2) => {
-        if (code2 !== 0) {
-          resolveVersion(null);
-          return;
-        }
-        const match18 = /deno\s+(\S+)/i.exec(stdout);
-        resolveVersion(match18 ? match18[1] : null);
-      });
-    }),
-    catch: () => null
-  }).pipe(catchAll2(() => succeed8(null)));
-}).pipe(catchAll2(() => succeed8(null)));
-var sandboxCommand = exports_Command2.make("sandbox", {}, () => gen2(function* () {
-  const version2 = yield* getDenoVersion();
-  if (version2 !== null) {
-    yield* printText(`Deno sandbox is ready (deno ${version2}).`);
-    return;
-  }
-  yield* printText([
-    "Deno is not installed.",
-    "",
-    "The executor sandbox requires Deno to run code in a secure, isolated subprocess.",
-    "",
-    "Install Deno:",
-    "  curl -fsSL https://deno.land/install.sh | sh",
-    "",
-    "Or see: https://docs.deno.com/runtime/getting_started/installation/"
-  ].join(`
-`));
-  process.exitCode = 1;
-})).pipe(exports_Command2.withDescription("Check whether the Deno sandbox runtime is available"));
 var callCommand = exports_Command2.make("call", {
   code: exports_Args.text({ name: "code" }).pipe(exports_Args.withDescription("Inline code to execute."), exports_Args.optional),
   file: exports_Options.text("file").pipe(exports_Options.optional),
@@ -370922,7 +370919,6 @@ var root = exports_Command2.make("executor").pipe(exports_Command2.withSubcomman
   downCommand,
   statusCommand,
   doctorCommand,
-  sandboxCommand,
   callCommand,
   resumeCommand,
   devCommand

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "executor",
-  "version": "1.2.4-beta.5",
+  "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-BgXTsZ30.js → highlighted-body-TPN3WLV5-dT8t51CG.js}

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