Merge remote-tracking branch 'origin/main' into claude/generative-ui-mcp-apps-BG4vy

# Conflicts:
#	apps/local/executor.config.ts

Author: RhysSullivan

.github/workflows/publish-desktop.yml

@@ -170,10 +170,18 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          find artifacts -type f \
+          set -euo pipefail
+          while IFS= read -r file; do
+            echo "Uploading: $file"
+            gh release upload "$RELEASE_TAG" "$file" --repo "$GITHUB_REPOSITORY" --clobber
+          done < <(find artifacts -type f \
             \( -name "*.dmg" -o -name "*.zip" -o -name "*.exe" \
             -o -name "*.AppImage" -o -name "*.deb" -o -name "*.rpm" \
-            -o -name "latest*.yml" \) | while read file; do
-            echo "Uploading: $file"
-            gh release upload "$RELEASE_TAG" "$file" --repo "$GITHUB_REPOSITORY" --clobber || true
-          done
+            -o -name "latest*.yml" \))
+
+      # Flip draft → published only after every desktop asset is uploaded —
+      # this is the atomic point where the new tag becomes "latest".
+      - name: Promote release (draft → published)
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh release edit "$RELEASE_TAG" --draft=false --repo "$GITHUB_REPOSITORY"

apps/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "executor",
-  "version": "1.4.25",
+  "version": "1.4.28",
   "private": true,
   "bin": {
     "executor": "./bin/executor.ts"

apps/cli/release-notes/next.md

@@ -14,3 +14,7 @@ Downloads land on each [GitHub release](https://github.com/RhysSullivan/executor
 ## UI
 
 - Sidebar now shows a "Beta" pill next to the executor wordmark.
+
+## Fixes
+
+- Source configuration is no longer replayed from or written back to `executor.jsonc`; local source state stays in the shared Executor database while `executor.jsonc` continues to load plugin entries.

apps/cli/src/release.ts

@@ -200,6 +200,9 @@ const syncGitHubRelease = async (input: {
   const notesPath = resolve(cliRoot, "release-notes", "next.md");
   const notesFile = existsSync(notesPath) ? notesPath : null;
 
+  // Draft until publish-desktop.yml finishes uploading installers and flips
+  // it; otherwise /releases/latest/download/<desktop-asset> 404s during the
+  // ~15-20 min desktop build window.
   const args = [
     "release",
     "create",
@@ -211,12 +214,11 @@ const syncGitHubRelease = async (input: {
     input.tag,
     ...(notesFile ? ["--notes-file", notesFile] : ["--generate-notes"]),
     "--verify-tag",
+    "--draft",
   ];
 
   if (input.channel === "beta") {
     args.push("--prerelease");
-  } else {
-    args.push("--latest");
   }
 
   await runCommand({

apps/cloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@executor-js/cloud",
-  "version": "1.4.11",
+  "version": "1.4.14",
   "private": true,
   "type": "module",
   "scripts": {

apps/desktop/electron-builder.config.ts

@@ -26,10 +26,12 @@ const config: Configuration = {
   ],
   mac: {
     category: "public.app-category.developer-tools",
-    target: [
-      { target: "dmg", arch: ["arm64", "x64"] },
-      { target: "zip", arch: ["arm64", "x64"] },
-    ],
+    // Do NOT pin `arch:` inside the target objects. The publish workflow's
+    // matrix passes `--arm64` / `--x64` per leg; a config-level arch list
+    // would override that flag and force every leg to build both archs from
+    // a single per-leg sidecar binary, shipping mismatched-arch DMGs (errno
+    // -86 / EBADARCH on Apple Silicon). The CLI flag is the source of truth.
+    target: ["dmg", "zip"],
     hardenedRuntime: true,
     gatekeeperAssess: false,
     // electron-builder reads CSC_LINK / CSC_KEY_PASSWORD for the signing

apps/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@executor-js/desktop",
-  "version": "1.4.25",
+  "version": "1.4.28",
   "private": true,
   "homepage": "https://github.com/RhysSullivan/executor",
   "license": "MIT",

apps/desktop/scripts/smoke-sidecar.ts

@@ -7,16 +7,16 @@
  *
  * Flow:
  *   1. Spin up a tiny local OpenAPI server (one operation, returns 42).
- *   2. Write a temp executor.jsonc that points at it as a source.
- *   3. Spawn the compiled `executor-sidecar` binary with EXECUTOR_PORT=0
+ *   2. Spawn the compiled `executor-sidecar` binary with EXECUTOR_PORT=0
  *      and parse the `EXECUTOR_READY:<port>` sentinel.
- *   4. Connect via MCP streamable HTTP, call the `execute` tool with code
- *      that invokes the OpenAPI tool, assert the answer round-trips as 42.
+ *   3. Connect via MCP streamable HTTP, call the `execute` tool with code
+ *      that registers and invokes the OpenAPI tool, assert the answer
+ *      round-trips as 42.
  *
  * Run after `bun ./scripts/build-sidecar.ts`. Exits non-zero on any
  * deviation so it can gate CI.
  */
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join, resolve } from "node:path";
 import { spawn, type Subprocess } from "bun";
@@ -127,8 +127,10 @@ const startOpenApiServer = () => {
 };
 
 const waitForReadyPort = (proc: Subprocess<"ignore", "pipe", "pipe">): Promise<number> =>
+  // oxlint-disable-next-line executor/no-promise-reject -- boundary: standalone build-time smoke harness, no Effect runtime
   new Promise((resolveReady, rejectReady) => {
     const deadline = setTimeout(() => {
+      // oxlint-disable-next-line executor/no-promise-reject, executor/no-error-constructor -- boundary: standalone smoke harness reporting a build-time timeout
       rejectReady(new Error(`sidecar did not announce ready within ${READY_TIMEOUT_MS}ms`));
     }, READY_TIMEOUT_MS);
 
@@ -150,6 +152,7 @@ const waitForReadyPort = (proc: Subprocess<"ignore", "pipe", "pipe">): Promise<n
         const { value, done } = await reader.read();
         if (done) {
           clearTimeout(deadline);
+          // oxlint-disable-next-line executor/no-promise-reject, executor/no-error-constructor -- boundary: standalone smoke harness, stdout-closed surfaced as rejection
           rejectReady(new Error("sidecar stdout closed before ready"));
           return;
         }
@@ -179,18 +182,6 @@ const main = async () => {
   console.log(`[smoke-sidecar] scope:   ${scopeDir}`);
   console.log(`[smoke-sidecar] openapi: ${openapi.origin}`);
 
-  const config = {
-    sources: [
-      {
-        kind: "openapi",
-        spec: `${openapi.origin}/openapi.json`,
-        baseUrl: openapi.origin,
-        namespace: "petstore",
-      },
-    ],
-  };
-  await writeFile(join(scopeDir, "executor.jsonc"), JSON.stringify(config, null, 2));
-
   const proc = spawn({
     cmd: [BINARY],
     env: {
@@ -217,9 +208,11 @@ const main = async () => {
       if (exitCode === null) proc.kill("SIGKILL");
     }
     openapi.server.stop(true);
+    // oxlint-disable-next-line executor/no-promise-catch -- boundary: best-effort tempdir cleanup in a standalone smoke harness
     await rm(scopeDir, { recursive: true, force: true }).catch(() => {});
   };
 
+  // oxlint-disable-next-line executor/no-try-catch-or-throw -- boundary: standalone smoke harness needs a finally to tear down the spawned binary + http server
   try {
     const port = await waitForReadyPort(proc);
     const mcpUrl = new URL(`http://127.0.0.1:${port}/mcp`);
@@ -236,9 +229,16 @@ const main = async () => {
     if (!hasExecute) fail(`MCP tools/list missing "execute": ${JSON.stringify(tools.tools)}`);
 
     // Drive the running OpenAPI server through a multi-step orchestration
-    // in one execute. Covers: array list response, path param dispatch, and
-    // object responses — all going out over real HTTP from inside QuickJS.
+    // in one execute. Covers: source registration, array list response, path
+    // param dispatch, and object responses — all going out over real HTTP from
+    // inside QuickJS.
     const code = `
+await tools.executor.openapi.addSource({
+  scope: ${JSON.stringify(scopeDir)},
+  spec: ${JSON.stringify(`${openapi.origin}/openapi.json`)},
+  baseUrl: ${JSON.stringify(openapi.origin)},
+  namespace: "petstore",
+});
 const list = await tools.petstore.pets.listPets({});
 const fetched = await tools.petstore.pets.getPet({ petId: list[1].id });
 return {

apps/desktop/src/main/index.ts

@@ -28,9 +28,9 @@ import { SERVER_SETTINGS_USERNAME, type DesktopServerSettings } from "../shared/
 
 // Pin userData to a friendly app-name-scoped dir BEFORE app.ready so every
 // Electron-side consumer (electron-store, electron-log, window-state) lands
-// at a predictable spot. User-mutable executor state (executor.jsonc,
-// data.db) is pinned separately to ~/.executor in main/sidecar.ts — that
-// path matches the CLI's default.
+// at a predictable spot. User-mutable executor state (data.db and the optional
+// executor.jsonc plugin manifest) is pinned separately to ~/.executor in
+// main/sidecar.ts — that path matches the CLI's default.
 app.setName("Executor");
 app.setPath("userData", join(app.getPath("appData"), "Executor"));
 
@@ -302,6 +302,11 @@ const promptInstallUpdate = async (version: string) => {
   }
 };
 
+// Re-check periodically so a long-running session picks up releases
+// without requiring a quit + relaunch. The boot-time check still runs;
+// this interval is purely a self-heal for idle apps.
+const UPDATE_POLL_INTERVAL_MS = 4 * 60 * 60 * 1000; // 4 hours
+
 const setupAutoUpdater = () => {
   if (!app.isPackaged) return;
   autoUpdater.logger = log;
@@ -315,6 +320,11 @@ const setupAutoUpdater = () => {
   autoUpdater.on("error", (err: Error) => {
     log.warn("[updater] error", err);
   });
+
+  setInterval(() => {
+    if (downloadedUpdateVersion) return; // already staged; waiting on the user
+    void runUpdateCheck({ alertOnFail: false });
+  }, UPDATE_POLL_INTERVAL_MS);
 };
 
 interface UpdateCheckOptions {

apps/desktop/src/main/sidecar.ts

@@ -74,13 +74,14 @@ export async function startSidecar(options: StartOptions = {}): Promise<SidecarC
     );
   }
 
-  // executor.jsonc and data.db go to ~/.executor — the same path the CLI's
-  // `executor web` uses. Desktop and CLI share state on the same machine so
-  // sources/secrets/policies set up in one show up in the other, and
-  // user-facing commands like `executor mcp --scope ~/.executor` stay
-  // copy-paste-friendly. Electron's userData (set in main/index.ts) is
-  // still used for electron-store, electron-log, and window-state — those
-  // stay app-scoped to avoid colliding with anything else under HOME.
+  // data.db and the optional executor.jsonc plugin manifest live under
+  // ~/.executor — the same path the CLI's `executor web` uses. Desktop and CLI
+  // share state on the same machine so sources/secrets/policies set up in one
+  // show up in the other, and user-facing commands like
+  // `executor mcp --scope ~/.executor` stay copy-paste-friendly. Electron's
+  // userData (set in main/index.ts) is still used for electron-store,
+  // electron-log, and window-state — those stay app-scoped to avoid colliding
+  // with anything else under HOME.
   const scopeDir = join(homedir(), ".executor");
   mkdirSync(scopeDir, { recursive: true });