crewx 0.8.1 → 0.8.2-rc.2

package/dist-electron/main.js

@@ -1,157 +1,194 @@
-import { ipcMain as u, desktopCapturer as R, app as c, globalShortcut as j, nativeImage as I, BrowserWindow as y, screen as T } from "electron";
-import a from "path";
-import k from "fs";
-import { spawn as g } from "child_process";
-import { fileURLToPath as C } from "url";
-const U = C(import.meta.url), m = a.dirname(U), D = a.join(m, "..");
-let i = null, e = null, h = 0, n = null;
-async function L() {
-  return new Promise((r, t) => {
-    var b, P;
-    const o = a.join(m, ".."), d = a.join(o, "dist-server", "src", "server", "main.js"), x = a.join(o, "src", "server", "main.ts"), S = !k.existsSync(d), v = S ? x : d, f = {
-      ...process.env,
-      PORT: "0",
-      // Random port
-      ELECTRON_MODE: "true",
-      // Enable static file serving
-      SERVE_STATIC: "true"
-    };
-    if (S) {
-      const s = process.platform === "win32", l = `node --import @swc-node/register/esm-register "${v}"`;
-      if (s)
-        n = g("cmd.exe", ["/c", l], {
-          cwd: o,
-          env: f,
-          stdio: ["pipe", "pipe", "pipe"]
-        });
-      else {
-        const p = process.env.SHELL || "/bin/zsh";
-        n = g(p, ["-i", "-c", l], {
-          cwd: o,
-          env: f,
-          stdio: ["pipe", "pipe", "pipe"]
-        });
+import { ipcMain, desktopCapturer, app, globalShortcut, nativeImage, BrowserWindow, screen } from "electron";
+import path from "path";
+import { spawn } from "child_process";
+import { fileURLToPath } from "url";
+const __filename$1 = fileURLToPath(import.meta.url);
+const __dirname$1 = path.dirname(__filename$1);
+const projectRoot = path.join(__dirname$1, "..");
+let mainWindow = null;
+let overlayWindow = null;
+let serverPort = 0;
+let serverProcess = null;
+async function startNestServer() {
+  return new Promise((resolve, reject) => {
+    var _a, _b;
+    const isDev = process.env.NODE_ENV !== "production";
+    const projectRoot2 = path.join(__dirname$1, "..");
+    const serverScript = isDev ? path.join(projectRoot2, "src", "server", "main.ts") : path.join(projectRoot2, "dist-server", "main.js");
+    const nodeCmd = isDev ? `node --import @swc-node/register/esm-register "${serverScript}"` : `node "${serverScript}"`;
+    const shell = process.env.SHELL || "/bin/zsh";
+    serverProcess = spawn(shell, ["-i", "-c", nodeCmd], {
+      cwd: projectRoot2,
+      env: {
+        ...process.env,
+        PORT: "0",
+        // Random port
+        ELECTRON_MODE: "true"
+        // Enable static file serving
+      },
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    (_a = serverProcess.stdout) == null ? void 0 : _a.on("data", (data) => {
+      const output = data.toString();
+      console.log("[Server]", output);
+      const portMatch = output.match(/localhost:(\d+)|port\s*:?\s*(\d+)/i);
+      if (portMatch) {
+        const port = parseInt(portMatch[1] || portMatch[2], 10);
+        if (port > 0) {
+          serverPort = port;
+          resolve(port);
+        }
       }
-    } else
-      n = g(process.execPath, [v], {
-        cwd: o,
-        env: f,
-        stdio: ["pipe", "pipe", "pipe"]
-      });
-    (b = n.stdout) == null || b.on("data", (s) => {
-      const l = s.toString();
-      console.log("[Server]", l);
-      const p = l.match(/localhost:(\d+)|port\s*:?\s*(\d+)/i);
-      if (p) {
-        const w = parseInt(p[1] || p[2], 10);
-        w > 0 && (h = w, r(w));
+    });
+    (_b = serverProcess.stderr) == null ? void 0 : _b.on("data", (data) => {
+      console.error("[Server Error]", data.toString());
+    });
+    serverProcess.on("error", (err) => {
+      console.error("Failed to start server:", err);
+      reject(err);
+    });
+    serverProcess.on("exit", (code) => {
+      console.log(`Server process exited with code ${code}`);
+    });
+    setTimeout(() => {
+      if (serverPort === 0) {
+        reject(new Error("Server startup timeout"));
       }
-    }), (P = n.stderr) == null || P.on("data", (s) => {
-      console.error("[Server Error]", s.toString());
-    }), n.on("error", (s) => {
-      console.error("Failed to start server:", s), t(s);
-    }), n.on("exit", (s) => {
-      console.log(`Server process exited with code ${s}`);
-    }), setTimeout(() => {
-      h === 0 && t(new Error("Server startup timeout"));
     }, 3e4);
   });
 }
-function E() {
-  i = new y({
+function createWindow() {
+  mainWindow = new BrowserWindow({
     width: 1200,
     height: 800,
     minWidth: 1e3,
     minHeight: 700,
-    icon: a.join(D, "public", "assets", "crewx-icon-256.png"),
+    icon: path.join(projectRoot, "public", "assets", "crewx-icon-256.png"),
     webPreferences: {
-      nodeIntegration: !1,
-      contextIsolation: !0,
-      preload: a.join(m, "preload.mjs")
+      nodeIntegration: false,
+      contextIsolation: true,
+      preload: path.join(__dirname$1, "preload.mjs")
     },
     titleBarStyle: "hiddenInset",
     backgroundColor: "#F9FAFB",
-    show: !1
-  }), i.loadURL(`http://localhost:${h}`), i.once("ready-to-show", () => {
-    i == null || i.show();
-  }), i.on("closed", () => {
-    i = null;
+    show: false
+  });
+  mainWindow.loadURL(`http://localhost:${serverPort}`);
+  mainWindow.once("ready-to-show", () => {
+    mainWindow == null ? void 0 : mainWindow.show();
+  });
+  mainWindow.on("closed", () => {
+    mainWindow = null;
   });
 }
-function _() {
-  const { width: r } = T.getPrimaryDisplay().workAreaSize, t = 400, o = Math.round((r - t) / 2);
-  e = new y({
-    width: t,
+function createOverlayWindow() {
+  const { width: screenWidth } = screen.getPrimaryDisplay().workAreaSize;
+  const winWidth = 400;
+  const x = Math.round((screenWidth - winWidth) / 2);
+  overlayWindow = new BrowserWindow({
+    width: winWidth,
     height: 60,
-    x: o,
+    x,
     y: 40,
-    transparent: !0,
-    alwaysOnTop: !0,
-    frame: !1,
-    hasShadow: !1,
-    skipTaskbar: !0,
-    resizable: !1,
+    transparent: true,
+    alwaysOnTop: true,
+    frame: false,
+    hasShadow: false,
+    skipTaskbar: true,
+    resizable: false,
     webPreferences: {
-      nodeIntegration: !1,
-      contextIsolation: !0,
-      preload: a.join(m, "preload.mjs")
+      nodeIntegration: false,
+      contextIsolation: true,
+      preload: path.join(__dirname$1, "preload.mjs")
     },
     backgroundColor: "#00000000",
-    show: !1
-  }), e.loadURL(`http://localhost:${h}/overlay.html`), e.once("ready-to-show", () => {
-    e == null || e.show();
-  }), e.on("closed", () => {
-    e = null;
-  }), j.register("CommandOrControl+Shift+Space", () => {
-    e && (e.isVisible() ? e.hide() : (e.show(), e.focus()));
+    show: false
+  });
+  overlayWindow.loadURL(`http://localhost:${serverPort}/overlay.html`);
+  overlayWindow.once("ready-to-show", () => {
+    overlayWindow == null ? void 0 : overlayWindow.show();
+  });
+  overlayWindow.on("closed", () => {
+    overlayWindow = null;
+  });
+  globalShortcut.register("CommandOrControl+Shift+Space", () => {
+    if (!overlayWindow) return;
+    if (overlayWindow.isVisible()) {
+      overlayWindow.hide();
+    } else {
+      overlayWindow.show();
+      overlayWindow.focus();
+    }
   });
 }
-u.on("overlay:toggle", () => {
-  e && (e.isVisible() ? e.hide() : (e.show(), e.focus()));
+ipcMain.on("overlay:toggle", () => {
+  if (!overlayWindow) return;
+  if (overlayWindow.isVisible()) {
+    overlayWindow.hide();
+  } else {
+    overlayWindow.show();
+    overlayWindow.focus();
+  }
 });
-u.on("overlay:close", () => {
-  e == null || e.hide();
+ipcMain.on("overlay:close", () => {
+  overlayWindow == null ? void 0 : overlayWindow.hide();
 });
-u.on("overlay:move", (r, { x: t, y: o }) => {
-  e == null || e.setPosition(Math.round(t), Math.round(o));
+ipcMain.on("overlay:move", (_event, { x, y }) => {
+  overlayWindow == null ? void 0 : overlayWindow.setPosition(Math.round(x), Math.round(y));
 });
-u.handle("capture-screen", async () => {
-  const r = (e == null ? void 0 : e.isVisible()) ?? !1;
+ipcMain.handle("capture-screen", async () => {
+  const wasVisible = (overlayWindow == null ? void 0 : overlayWindow.isVisible()) ?? false;
   try {
-    r && (e == null || e.hide()), await new Promise((d) => setTimeout(d, 150));
-    const t = await R.getSources({
+    if (wasVisible) overlayWindow == null ? void 0 : overlayWindow.hide();
+    await new Promise((resolve) => setTimeout(resolve, 150));
+    const sources = await desktopCapturer.getSources({
       types: ["screen"],
       thumbnailSize: { width: 1920, height: 1080 }
     });
-    return t.length === 0 ? { success: !1, imageDataUrl: "", timestamp: Date.now() } : { success: !0, imageDataUrl: t[0].thumbnail.toDataURL(), timestamp: Date.now() };
-  } catch (t) {
-    return console.error("[capture-screen] Error:", t), { success: !1, imageDataUrl: "", timestamp: Date.now() };
+    if (sources.length === 0) {
+      return { success: false, imageDataUrl: "", timestamp: Date.now() };
+    }
+    const imageDataUrl = sources[0].thumbnail.toDataURL();
+    return { success: true, imageDataUrl, timestamp: Date.now() };
+  } catch (error) {
+    console.error("[capture-screen] Error:", error);
+    return { success: false, imageDataUrl: "", timestamp: Date.now() };
   } finally {
-    r && (e == null || e.show());
+    if (wasVisible) overlayWindow == null ? void 0 : overlayWindow.show();
   }
 });
-async function F() {
-  var r;
+async function bootstrap() {
   try {
     if (process.platform === "darwin") {
-      const t = a.join(D, "public", "assets", "crewx-icon-512.png"), o = I.createFromPath(t);
-      o.isEmpty() || (r = c.dock) == null || r.setIcon(o);
+      const iconPath = path.join(projectRoot, "public", "assets", "crewx-icon-512.png");
+      const icon = nativeImage.createFromPath(iconPath);
+      if (!icon.isEmpty()) app.dock.setIcon(icon);
     }
-    h = await L(), E(), _();
-  } catch (t) {
-    console.error("Failed to start application:", t), c.quit();
+    serverPort = await startNestServer();
+    createWindow();
+    createOverlayWindow();
+  } catch (error) {
+    console.error("Failed to start application:", error);
+    app.quit();
   }
 }
-c.whenReady().then(F);
-c.on("window-all-closed", () => {
-  process.platform !== "darwin" && c.quit();
+app.whenReady().then(bootstrap);
+app.on("window-all-closed", () => {
+  if (process.platform !== "darwin") {
+    app.quit();
+  }
 });
-c.on("will-quit", () => {
-  j.unregisterAll();
+app.on("will-quit", () => {
+  globalShortcut.unregisterAll();
 });
-c.on("before-quit", () => {
-  n && (n.kill(), n = null);
+app.on("before-quit", () => {
+  if (serverProcess) {
+    serverProcess.kill();
+    serverProcess = null;
+  }
 });
-c.on("activate", () => {
-  i === null && E();
+app.on("activate", () => {
+  if (mainWindow === null) {
+    createWindow();
+  }
 });

package/dist-electron/overlay.js

@@ -1,92 +1,129 @@
-import { app as t, ipcMain as u, screen as b, BrowserWindow as E } from "electron";
-import l from "path";
-import { spawn as P } from "child_process";
-import { fileURLToPath as _ } from "url";
-const j = _(import.meta.url), w = l.dirname(j);
-process.platform === "darwin" && t.disableHardwareAcceleration();
-let e = null, c = 0, r = null;
-async function M() {
-  return new Promise((n, s) => {
-    var m, f;
-    const i = process.env.NODE_ENV !== "production", a = l.join(w, ".."), h = i ? l.join(a, "src", "server", "main.ts") : l.join(a, "dist-server", "main.js"), g = i ? `node --import @swc-node/register/esm-register "${h}"` : `node "${h}"`, S = process.env.SHELL || "/bin/zsh";
-    r = P(S, ["-i", "-c", g], {
-      cwd: a,
+import { app, ipcMain, screen, BrowserWindow } from "electron";
+import path from "path";
+import { spawn } from "child_process";
+import { fileURLToPath } from "url";
+const __filename$1 = fileURLToPath(import.meta.url);
+const __dirname$1 = path.dirname(__filename$1);
+if (process.platform === "darwin") {
+  app.disableHardwareAcceleration();
+}
+let overlayWindow = null;
+let serverPort = 0;
+let serverProcess = null;
+async function startNestServer() {
+  return new Promise((resolve, reject) => {
+    var _a, _b;
+    const isDev = process.env.NODE_ENV !== "production";
+    const projectRoot = path.join(__dirname$1, "..");
+    const serverScript = isDev ? path.join(projectRoot, "src", "server", "main.ts") : path.join(projectRoot, "dist-server", "main.js");
+    const nodeCmd = isDev ? `node --import @swc-node/register/esm-register "${serverScript}"` : `node "${serverScript}"`;
+    const shell = process.env.SHELL || "/bin/zsh";
+    serverProcess = spawn(shell, ["-i", "-c", nodeCmd], {
+      cwd: projectRoot,
       env: {
         ...process.env,
         PORT: "0",
         ELECTRON_MODE: "true"
       },
       stdio: ["pipe", "pipe", "pipe"]
-    }), (m = r.stdout) == null || m.on("data", (o) => {
-      const v = o.toString();
-      console.log("[Server]", v);
-      const d = v.match(/localhost:(\d+)|port\s*:?\s*(\d+)/i);
-      if (d) {
-        const p = parseInt(d[1] || d[2], 10);
-        p > 0 && (c = p, n(p));
+    });
+    (_a = serverProcess.stdout) == null ? void 0 : _a.on("data", (data) => {
+      const output = data.toString();
+      console.log("[Server]", output);
+      const portMatch = output.match(/localhost:(\d+)|port\s*:?\s*(\d+)/i);
+      if (portMatch) {
+        const port = parseInt(portMatch[1] || portMatch[2], 10);
+        if (port > 0) {
+          serverPort = port;
+          resolve(port);
+        }
+      }
+    });
+    (_b = serverProcess.stderr) == null ? void 0 : _b.on("data", (data) => {
+      console.error("[Server Error]", data.toString());
+    });
+    serverProcess.on("error", (err) => {
+      console.error("Failed to start server:", err);
+      reject(err);
+    });
+    serverProcess.on("exit", (code) => {
+      console.log(`Server process exited with code ${code}`);
+    });
+    setTimeout(() => {
+      if (serverPort === 0) {
+        reject(new Error("Server startup timeout"));
       }
-    }), (f = r.stderr) == null || f.on("data", (o) => {
-      console.error("[Server Error]", o.toString());
-    }), r.on("error", (o) => {
-      console.error("Failed to start server:", o), s(o);
-    }), r.on("exit", (o) => {
-      console.log(`Server process exited with code ${o}`);
-    }), setTimeout(() => {
-      c === 0 && s(new Error("Server startup timeout"));
     }, 3e4);
   });
 }
-function y() {
-  const { width: n } = b.getPrimaryDisplay().workAreaSize, s = 400, i = Math.round((n - s) / 2);
-  e = new E({
-    width: s,
+function createOverlay() {
+  const { width: screenWidth } = screen.getPrimaryDisplay().workAreaSize;
+  const winWidth = 400;
+  const x = Math.round((screenWidth - winWidth) / 2);
+  overlayWindow = new BrowserWindow({
+    width: winWidth,
     height: 60,
-    x: i,
+    x,
     y: 40,
-    transparent: !0,
-    alwaysOnTop: !0,
-    frame: !1,
-    hasShadow: !1,
-    skipTaskbar: !0,
-    resizable: !1,
+    transparent: true,
+    alwaysOnTop: true,
+    frame: false,
+    hasShadow: false,
+    skipTaskbar: true,
+    resizable: false,
     webPreferences: {
-      nodeIntegration: !1,
-      contextIsolation: !0,
-      preload: l.join(w, "preload.mjs")
+      nodeIntegration: false,
+      contextIsolation: true,
+      preload: path.join(__dirname$1, "preload.mjs")
     },
     backgroundColor: "#00000000",
-    show: !1
+    show: false
+  });
+  const overlayUrl = `http://localhost:${serverPort}/overlay.html`;
+  overlayWindow.loadURL(overlayUrl);
+  overlayWindow.once("ready-to-show", () => {
+    overlayWindow == null ? void 0 : overlayWindow.show();
   });
-  const a = `http://localhost:${c}/overlay.html`;
-  e.loadURL(a), e.once("ready-to-show", () => {
-    e == null || e.show();
-  }), e.on("closed", () => {
-    e = null;
+  overlayWindow.on("closed", () => {
+    overlayWindow = null;
   });
 }
-u.on("overlay:toggle", () => {
-  e && (e.isVisible() ? e.hide() : (e.show(), e.focus()));
+ipcMain.on("overlay:toggle", () => {
+  if (!overlayWindow) return;
+  if (overlayWindow.isVisible()) {
+    overlayWindow.hide();
+  } else {
+    overlayWindow.show();
+    overlayWindow.focus();
+  }
 });
-u.on("overlay:close", () => {
-  t.quit();
+ipcMain.on("overlay:close", () => {
+  app.quit();
 });
-u.on("overlay:move", (n, { x: s, y: i }) => {
-  e == null || e.setPosition(Math.round(s), Math.round(i));
+ipcMain.on("overlay:move", (_event, { x, y }) => {
+  overlayWindow == null ? void 0 : overlayWindow.setPosition(Math.round(x), Math.round(y));
 });
-async function O() {
+async function bootstrap() {
   try {
-    c = await M(), y();
-  } catch (n) {
-    console.error("Failed to start overlay:", n), t.quit();
+    serverPort = await startNestServer();
+    createOverlay();
+  } catch (error) {
+    console.error("Failed to start overlay:", error);
+    app.quit();
   }
 }
-t.whenReady().then(O);
-t.on("window-all-closed", () => {
-  t.quit();
+app.whenReady().then(bootstrap);
+app.on("window-all-closed", () => {
+  app.quit();
 });
-t.on("before-quit", () => {
-  r && (r.kill(), r = null);
+app.on("before-quit", () => {
+  if (serverProcess) {
+    serverProcess.kill();
+    serverProcess = null;
+  }
 });
-t.on("activate", () => {
-  e === null && c > 0 && y();
+app.on("activate", () => {
+  if (overlayWindow === null && serverPort > 0) {
+    createOverlay();
+  }
 });

package/dist-electron/package.json

@@ -0,0 +1 @@
+{"type":"module","main":"main.js"}

package/dist-electron/preload.js

@@ -1,12 +1,12 @@
-import { contextBridge as o, ipcRenderer as e } from "electron";
-o.exposeInMainWorld("electron", {
+import { contextBridge, ipcRenderer } from "electron";
+contextBridge.exposeInMainWorld("electron", {
   platform: process.platform
 });
-o.exposeInMainWorld("electronOverlay", {
-  move: (r, n) => e.send("overlay:move", { x: r, y: n }),
-  close: () => e.send("overlay:close"),
-  toggle: () => e.send("overlay:toggle")
+contextBridge.exposeInMainWorld("electronOverlay", {
+  move: (x, y) => ipcRenderer.send("overlay:move", { x, y }),
+  close: () => ipcRenderer.send("overlay:close"),
+  toggle: () => ipcRenderer.send("overlay:toggle")
 });
-o.exposeInMainWorld("electronAPI", {
-  captureScreen: () => e.invoke("capture-screen")
+contextBridge.exposeInMainWorld("electronAPI", {
+  captureScreen: () => ipcRenderer.invoke("capture-screen")
 });

package/dist-server/bootstrap/crewx-server.js

@@ -25,22 +25,31 @@ const SERVER_VERSION = '0.1.0';
  * workspaceRoot used by FileLoggerPlugin: directory of the yaml when present,
  * otherwise process.cwd() so logs land in the launch directory.
  */
-async function createServerCrewx(configPath = process.env.CREWX_CONFIG ?? 'crewx.yaml') {
-    const absConfigPath = (0, path_1.resolve)(configPath);
-    const isExplicitConfig = Boolean(process.env.CREWX_CONFIG);
-    const fileExists = (0, fs_1.existsSync)(absConfigPath);
+async function createServerCrewx(configPath) {
     let yamlPath;
     let workspaceRoot;
-    if (fileExists) {
+    if (configPath !== undefined) {
+        // Caller explicitly provided a path — trust it directly without existsSync
+        const absConfigPath = (0, path_1.resolve)(configPath);
         yamlPath = absConfigPath;
         workspaceRoot = (0, path_1.dirname)(absConfigPath);
     }
-    else if (isExplicitConfig) {
-        throw new Error(`[crewx] Config file not found: ${absConfigPath} (set via CREWX_CONFIG)`);
-    }
     else {
-        yamlPath = undefined;
-        workspaceRoot = process.cwd();
+        // No explicit path — use env/default with existsSync fallback
+        const defaultPath = (0, path_1.resolve)(process.env.CREWX_CONFIG ?? 'crewx.yaml');
+        const isExplicitConfig = Boolean(process.env.CREWX_CONFIG);
+        const fileExists = (0, fs_1.existsSync)(defaultPath);
+        if (fileExists) {
+            yamlPath = defaultPath;
+            workspaceRoot = (0, path_1.dirname)(defaultPath);
+        }
+        else if (isExplicitConfig) {
+            throw new Error(`[crewx] Config file not found: ${defaultPath} (set via CREWX_CONFIG)`);
+        }
+        else {
+            yamlPath = undefined;
+            workspaceRoot = process.cwd();
+        }
     }
     const crewx = await sdk_1.Crewx.loadYaml(yamlPath, {
         remoteFactory: createServerCrewx,

package/dist-server/domain/agent/agent.service.js

@@ -150,6 +150,9 @@ let AgentService = AgentService_1 = class AgentService {
                 existing.inline = inline;
             }
         }
+        if (dto.skills !== undefined) {
+            existing.skills = { include: dto.skills.include };
+        }
         agents[idx] = existing;
         config.agents = agents;
         this.saveConfig(configPath, config, raw);
@@ -261,6 +264,9 @@ let AgentService = AgentService_1 = class AgentService {
                 providerLocation = String(matched.location);
             }
         }
+        const skills = a.skills !== null && a.skills !== undefined && Array.isArray(a.skills.include)
+            ? { include: a.skills.include }
+            : undefined;
         return {
             id: String(a.id || ''),
             name: String(a.name || a.id || ''),
@@ -271,6 +277,7 @@ let AgentService = AgentService_1 = class AgentService {
             model: resolvedModel !== undefined ? String(resolvedModel) : undefined,
             providerLocation,
             prompt: resolvedPrompt,
+            ...(skills !== undefined && { skills }),
         };
     }
     toAgentInfo(a, providers = []) {
@@ -290,6 +297,10 @@ let AgentService = AgentService_1 = class AgentService {
                 providerLocation = String(matched.location);
             }
         }
+        const rawSkills = a.skills;
+        const skills = rawSkills !== null && rawSkills !== undefined && Array.isArray(rawSkills.include)
+            ? { include: rawSkills.include }
+            : undefined;
         return {
             id: String(a.id || ''),
             name: String(a.name || a.id || ''),
@@ -300,6 +311,7 @@ let AgentService = AgentService_1 = class AgentService {
             model: resolvedModel !== undefined ? String(resolvedModel) : undefined,
             providerLocation,
             prompt: resolvedPrompt,
+            ...(skills !== undefined && { skills }),
         };
     }
     normalizePrompt(prompt) {