bump version

Author: RhysSullivan

executor/README.md

@@ -83,7 +83,7 @@ executor web
 Uninstall:
 
 ```bash
-bash executor/uninstall --yes
+executor uninstall --yes
 ```
 
 Default managed-runtime ports:

executor/apps/web/src/components/tools/view.tsx

@@ -164,7 +164,7 @@ export function ToolsView({
               {debug ? (
                 <div className="space-y-0.5">
                   <p className="text-[10px] font-mono text-muted-foreground/90">
-                    debug mode={debug.mode} · cacheHit={String(debug.cacheHit)} · cacheFresh={String(debug.cacheFresh)} · duration={debug.durationMs}ms · sources={debug.normalizedSourceCount}/{debug.sourceCount}
+                    debug mode={debug.mode} · cacheHit={String(debug.cacheHit)} · cacheFresh={String(debug.cacheFresh)} · skipCacheRead={String(debug.skipCacheRead)} · duration={debug.durationMs}ms · sources={debug.normalizedSourceCount}/{debug.sourceCount}
                     {debug.timedOutSources.length > 0 ? ` · timedOut=${debug.timedOutSources.join(",")}` : " · timedOut=none"}
                   </p>
                   <p className="text-[10px] font-mono text-muted-foreground/80 truncate" title={debug.trace.join(" | ")}>

executor/apps/web/src/hooks/use-workspace-tools.ts

@@ -23,6 +23,7 @@ interface WorkspaceToolsQueryResult {
     mode: "cache-fresh" | "cache-stale" | "rebuild";
     includeDts: boolean;
     sourceTimeoutMs: number | null;
+    skipCacheRead: boolean;
     sourceCount: number;
     normalizedSourceCount: number;
     cacheHit: boolean;
@@ -96,6 +97,7 @@ export function useWorkspaceTools(context: WorkspaceContext | null) {
       durationMs: inventoryData.debug.durationMs,
       cacheHit: inventoryData.debug.cacheHit,
       cacheFresh: inventoryData.debug.cacheFresh,
+      skipCacheRead: inventoryData.debug.skipCacheRead,
       sourceCount: inventoryData.debug.sourceCount,
       normalizedSourceCount: inventoryData.debug.normalizedSourceCount,
       timedOutSources: inventoryData.debug.timedOutSources,

executor/executor.ts

@@ -1,6 +1,8 @@
 #!/usr/bin/env bun
 
 import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
 import { managedRuntimeDiagnostics, runManagedBackend, runManagedWeb } from "./packages/core/src/managed-runtime";
 
 function printHelp(): void {
@@ -11,12 +13,14 @@ Usage:
   executor up [backend-args]
   executor backend <args>
   executor web [--port <number>]
+  executor uninstall [--yes]
 
 Commands:
   doctor        Bootstrap and verify managed Convex backend runtime
   up            Run managed backend and auto-bootstrap Convex functions
   backend       Pass through arguments to managed convex-local-backend binary
   web           Run packaged web UI (default port: 5312)
+  uninstall     Remove local managed runtime install
 `);
 }
 
@@ -61,6 +65,73 @@ async function checkHttp(url: string): Promise<boolean> {
   }
 }
 
+async function runUninstall(args: string[]): Promise<number> {
+  let assumeYes = false;
+  let index = 0;
+
+  while (index < args.length) {
+    const arg = args[index];
+    if (arg === "-y" || arg === "--yes") {
+      assumeYes = true;
+      index += 1;
+      continue;
+    }
+
+    if (arg === "-h" || arg === "--help") {
+      console.log(`Usage:
+  executor uninstall [--yes]
+
+Options:
+  -y, --yes     Skip confirmation prompt
+  -h, --help    Show this help`);
+      return 0;
+    }
+
+    console.log(`Unknown option: ${arg}`);
+    return 1;
+  }
+
+  const installDir = Bun.env.EXECUTOR_INSTALL_DIR ?? path.join(os.homedir(), ".executor", "bin");
+  const runtimeDir = Bun.env.EXECUTOR_RUNTIME_DIR ?? path.join(os.homedir(), ".executor", "runtime");
+  const homeDir = Bun.env.EXECUTOR_HOME_DIR ?? path.join(os.homedir(), ".executor");
+
+  if (!assumeYes) {
+    console.log("This will remove:");
+    console.log(`  - ${installDir}/executor`);
+    console.log(`  - ${runtimeDir}`);
+    const response = prompt("Continue? [y/N] ");
+    if (response === null || response.toLowerCase() !== "y") {
+      console.log("Cancelled.");
+      return 0;
+    }
+  }
+
+  await fs.rm(path.join(installDir, "executor"), { force: true });
+  await fs.rm(runtimeDir, { recursive: true, force: true });
+
+  if (await pathExists(installDir)) {
+    try {
+      await fs.rmdir(installDir);
+    } catch {
+      // keep if it is not empty
+    }
+  }
+
+  if (await pathExists(homeDir)) {
+    try {
+      await fs.rmdir(homeDir);
+    } catch {
+      // keep if other files remain
+    }
+  }
+
+  console.log("Executor uninstall complete.");
+  console.log("");
+  console.log("If you previously added PATH manually, remove this line from your shell rc:");
+  console.log(`  export PATH=${installDir}:$PATH`);
+  return 0;
+}
+
 async function run(): Promise<void> {
   const [command, ...rest] = process.argv.slice(2);
 
@@ -110,6 +181,11 @@ async function run(): Promise<void> {
     process.exit(exitCode);
   }
 
+  if (command === "uninstall") {
+    const exitCode = await runUninstall(rest);
+    process.exit(exitCode);
+  }
+
   throw new Error(`Unknown command: ${command}`);
 }
 

executor/install

@@ -269,6 +269,7 @@ echo "  executor up"
 echo "  executor web       # defaults to http://localhost:5312"
 echo ""
 echo "To uninstall later:"
+echo "  executor uninstall --yes"
 echo "  bash executor/uninstall --yes"
 echo ""
 show_star_prompt

executor/packages/convex/executorNode.ts

@@ -48,7 +48,7 @@ export const listToolsWithWarnings = action({
       workspaceId: args.workspaceId,
       actorId: canonicalActorId,
       clientId: args.clientId,
-    }, { includeDts: false, sourceTimeoutMs: 2_500, allowStaleOnMismatch: true });
+    }, { includeDts: false, sourceTimeoutMs: 2_500, allowStaleOnMismatch: true, skipCacheRead: true });
 
     if (inventory.warnings.some((warning) => warning.includes("showing previous results while refreshing"))) {
       try {

executor/packages/convex/runtime/workspace_tools.ts

@@ -39,6 +39,7 @@ export interface WorkspaceToolsDebug {
   mode: "cache-fresh" | "cache-stale" | "rebuild";
   includeDts: boolean;
   sourceTimeoutMs: number | null;
+  skipCacheRead: boolean;
   sourceCount: number;
   normalizedSourceCount: number;
   cacheHit: boolean;
@@ -52,6 +53,7 @@ interface GetWorkspaceToolsOptions {
   includeDts?: boolean;
   sourceTimeoutMs?: number;
   allowStaleOnMismatch?: boolean;
+  skipCacheRead?: boolean;
 }
 
 export interface WorkspaceToolInventory {
@@ -133,6 +135,7 @@ export async function getWorkspaceTools(
   const includeDts = options.includeDts ?? false;
   const sourceTimeoutMs = options.sourceTimeoutMs;
   const allowStaleOnMismatch = options.allowStaleOnMismatch ?? false;
+  const skipCacheRead = options.skipCacheRead ?? false;
   const sources = (await ctx.runQuery(internal.database.listToolSources, { workspaceId }))
     .filter((source: { enabled: boolean }) => source.enabled);
   traceStep("listToolSources", listSourcesStartedAt);
@@ -141,10 +144,12 @@ export async function getWorkspaceTools(
   const debugBase: Omit<WorkspaceToolsDebug, "mode" | "normalizedSourceCount" | "cacheHit" | "cacheFresh" | "timedOutSources" | "durationMs" | "trace"> = {
     includeDts,
     sourceTimeoutMs: sourceTimeoutMs ?? null,
+    skipCacheRead,
     sourceCount: sources.length,
   };
 
-  try {
+  if (!skipCacheRead) {
+    try {
     const cacheReadStartedAt = Date.now();
     const cacheEntry = await ctx.runQuery(internal.workspaceToolCache.getEntry, {
       workspaceId,
@@ -202,9 +207,12 @@ export async function getWorkspaceTools(
         }
       }
     }
-  } catch (error) {
-    const msg = error instanceof Error ? error.message : String(error);
-    console.warn(`[executor] workspace tool cache read failed for '${workspaceId}': ${msg}`);
+    } catch (error) {
+      const msg = error instanceof Error ? error.message : String(error);
+      console.warn(`[executor] workspace tool cache read failed for '${workspaceId}': ${msg}`);
+    }
+  } else {
+    trace.push("cacheEntryLookup=skipped");
   }
 
   const configs: ExternalToolSourceConfig[] = [];
@@ -364,13 +372,24 @@ export async function getWorkspaceTools(
 export async function loadWorkspaceToolInventoryForContext(
   ctx: ActionCtx,
   context: { workspaceId: Id<"workspaces">; actorId?: string; clientId?: string },
-  options: { includeDts?: boolean; sourceTimeoutMs?: number; allowStaleOnMismatch?: boolean } = {},
+  options: {
+    includeDts?: boolean;
+    sourceTimeoutMs?: number;
+    allowStaleOnMismatch?: boolean;
+    skipCacheRead?: boolean;
+  } = {},
 ): Promise<WorkspaceToolInventory> {
   const includeDts = options.includeDts ?? false;
   const sourceTimeoutMs = options.sourceTimeoutMs;
   const allowStaleOnMismatch = options.allowStaleOnMismatch;
+  const skipCacheRead = options.skipCacheRead;
   const [result, policies] = await Promise.all([
-    getWorkspaceTools(ctx, context.workspaceId, { includeDts, sourceTimeoutMs, allowStaleOnMismatch }),
+    getWorkspaceTools(ctx, context.workspaceId, {
+      includeDts,
+      sourceTimeoutMs,
+      allowStaleOnMismatch,
+      skipCacheRead,
+    }),
     ctx.runQuery(internal.database.listAccessPolicies, { workspaceId: context.workspaceId }),
   ]);
   const typedPolicies = policies as AccessPolicyRecord[];
@@ -405,7 +424,12 @@ export async function loadWorkspaceToolInventoryForContext(
 export async function listToolsForContext(
   ctx: ActionCtx,
   context: { workspaceId: Id<"workspaces">; actorId?: string; clientId?: string },
-  options: { includeDts?: boolean; sourceTimeoutMs?: number; allowStaleOnMismatch?: boolean } = {},
+  options: {
+    includeDts?: boolean;
+    sourceTimeoutMs?: number;
+    allowStaleOnMismatch?: boolean;
+    skipCacheRead?: boolean;
+  } = {},
 ): Promise<ToolDescriptor[]> {
   const inventory = await loadWorkspaceToolInventoryForContext(ctx, context, options);
   return inventory.tools;
@@ -414,7 +438,12 @@ export async function listToolsForContext(
 export async function listToolsWithWarningsForContext(
   ctx: ActionCtx,
   context: { workspaceId: Id<"workspaces">; actorId?: string; clientId?: string },
-  options: { includeDts?: boolean; sourceTimeoutMs?: number; allowStaleOnMismatch?: boolean } = {},
+  options: {
+    includeDts?: boolean;
+    sourceTimeoutMs?: number;
+    allowStaleOnMismatch?: boolean;
+    skipCacheRead?: boolean;
+  } = {},
 ): Promise<{
   tools: ToolDescriptor[];
   warnings: string[];

executor/packages/core/src/managed-runtime-bootstrap.ts

@@ -33,6 +33,67 @@ async function generateSelfHostedAdminKey(info: ManagedRuntimeInfo): Promise<str
   return parsed.adminKey;
 }
 
+async function hasAnyPath(paths: string[]): Promise<boolean> {
+  for (const candidate of paths) {
+    if (await pathExists(candidate)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function getConfigCandidates(baseDir: string): string[] {
+  return [
+    path.join(baseDir, "convex.config.ts"),
+    path.join(baseDir, "convex.config.js"),
+    path.join(baseDir, "convex.config.mts"),
+    path.join(baseDir, "convex.config.mjs"),
+    path.join(baseDir, "convex.config.cts"),
+    path.join(baseDir, "convex.config.cjs"),
+  ];
+}
+
+async function getConfiguredFunctionsPath(candidate: string): Promise<string | null> {
+  try {
+    const raw = await fs.readFile(path.join(candidate, "convex.json"), "utf8");
+    const parsed = JSON.parse(raw) as { functions?: unknown };
+    if (typeof parsed.functions !== "string") {
+      return null;
+    }
+    const value = parsed.functions.trim();
+    return value.length > 0 ? value : null;
+  } catch {
+    return null;
+  }
+}
+
+async function hasConvexProjectConfig(candidate: string): Promise<boolean> {
+  const convexJson = path.join(candidate, "convex.json");
+  if (!(await pathExists(convexJson))) {
+    return false;
+  }
+
+  const legacyDir = path.join(candidate, "convex");
+  const legacyMatches = await hasAnyPath(getConfigCandidates(legacyDir));
+  if (legacyMatches) {
+    return true;
+  }
+
+  if (await hasAnyPath(getConfigCandidates(candidate))) {
+    return true;
+  }
+
+  const configuredFunctionsPath = await getConfiguredFunctionsPath(candidate);
+  if (!configuredFunctionsPath) {
+    return false;
+  }
+
+  const resolvedFunctionsPath = path.isAbsolute(configuredFunctionsPath)
+    ? configuredFunctionsPath
+    : path.resolve(candidate, configuredFunctionsPath);
+  return await hasAnyPath(getConfigCandidates(resolvedFunctionsPath));
+}
+
 async function findProjectDir(): Promise<string | null> {
   const roots = [
     Bun.env.EXECUTOR_PROJECT_DIR,
@@ -47,10 +108,7 @@ async function findProjectDir(): Promise<string | null> {
   }
 
   for (const candidate of candidates) {
-    const convexDir = path.join(candidate, "convex");
-    const convexConfig = path.join(convexDir, "convex.config.ts");
-    const convexJson = path.join(candidate, "convex.json");
-    if ((await pathExists(convexDir)) && (await pathExists(convexConfig)) && (await pathExists(convexJson))) {
+    if (await hasConvexProjectConfig(candidate)) {
       return candidate;
     }
   }