fix: build app bundler

Author: ycjcl868

apps/omega/forge.config.ts

@@ -21,14 +21,16 @@ const projectRoot = path.resolve(__dirname, '.');
 const keepModules = new Set([
   ...Object.keys(pkg.dependencies),
   '@mixmark-io/domino',
+  '@modelcontextprotocol/sdk',
 ]);
-const needSubDependencies = [...Object.values(keepModules)];
+const needSubDependencies = ['@modelcontextprotocol/sdk'];
 const keepLanguages = new Set(['en', 'en_GB', 'en-US', 'en_US']);
 const ignorePattern = new RegExp(
   `^/node_modules/(?!${[...keepModules].join('|')})`,
 );
 
 console.log('keepModules', keepModules);
+console.log('needSubDependencies', needSubDependencies);
 console.log('ignorePattern', ignorePattern);
 
 const enableOsxSign =
@@ -111,23 +113,24 @@ async function cleanSources(
     needSubDependencies,
     projectRoot,
   );
+  console.log('subDependencies', subDependencies);
   await Promise.all(
-    Array.from(subDependencies.values()).map((subDependency) => {
-      if (
-        fs.existsSync(path.join(buildPath, 'node_modules', subDependency.name))
-      ) {
-        return;
-      }
-
-      if (fs.existsSync(subDependency.path)) {
-        console.log('copy_current_node_modules', subDependency.path);
-        return cp(
-          subDependency.path,
-          path.join(buildPath, 'node_modules', subDependency.name),
-          {
-            recursive: true,
-          },
-        );
+    subDependencies.map((subDependency) => {
+      console.log(
+        'target_dir',
+        path.join(buildPath, 'node_modules', subDependency.name),
+      );
+      const targetDir = path.join(
+        buildPath,
+        'node_modules',
+        subDependency.name,
+      );
+      const sourceDir = subDependency.path;
+      if (!fs.existsSync(targetDir) && fs.existsSync(sourceDir)) {
+        console.log('copy_current_node_modules', sourceDir);
+        return cp(sourceDir, targetDir, {
+          recursive: true,
+        });
       }
       return;
     }),

apps/omega/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-tars-app",
-  "version": "1.0.0",
+  "version": "1.0.0-beta.1",
   "description": "An Electron application with React and TypeScript",
   "main": "./dist/main/index.js",
   "author": "example.com",
@@ -14,7 +14,7 @@
     "start": "electron-vite preview",
     "dev": "electron-vite dev",
     "package": "electron-forge package",
-    "build": "npm run typecheck && npm run build:reporter && electron-vite build && electron-forge make",
+    "build": "rimraf dist out && npm run typecheck && npm run build:reporter && electron-vite build && electron-forge make",
     "test": "vitest run",
     "publish:mac": "electron-vite build && electron-forge publish --arch=universal --platform=darwin",
     "build:reporter": "vite build"
@@ -74,6 +74,7 @@
     "@types/node": "^22.13.4",
     "@types/fs-extra": "11.0.4",
     "@vitejs/plugin-react": "^4.3.4",
+    "rimraf": "^6.0.1",
     "autoprefixer": "10.4.20",
     "electron": "34.1.1",
     "electron-packager-languages": "0.6.0",

apps/omega/src/main/llmProvider/providers/AzureOpenAIProvider.ts

@@ -16,8 +16,10 @@ export class AzureOpenAIProvider extends BaseProvider {
     super(config);
 
     // Use environment variables or defaults
-    const apiKey = config.apiKey || process.env.AZURE_OPENAI_API_KEY;
-    const endpoint = config.baseURL || process.env.AZURE_OPENAI_ENDPOINT;
+    const apiKey =
+      config.apiKey || process.env.AZURE_OPENAI_API_KEY || 'your-api-key';
+    const endpoint =
+      config.baseURL || process.env.AZURE_OPENAI_ENDPOINT || 'your-endpoint';
     const apiVersion =
       config.apiVersion ||
       process.env.AZURE_OPENAI_API_VERSION ||

packages/common/electron-build/rslib.config.ts

@@ -9,6 +9,6 @@ export default defineConfig({
   ...rslibConfig,
   output: {
     ...rslibConfig.output,
-    target: 'web',
+    target: 'node',
   },
 });

packages/common/electron-build/src/findUp.ts

@@ -0,0 +1,85 @@
+/**
+ * The following code is modified based on
+ * https://github.com/sindresorhus/find-up-simple/blob/main/index.js
+ *
+ * MIT License
+ * Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+ * https://github.com/sindresorhus/find-up-simple/blob/main/license
+ */
+
+import process from 'node:process';
+import fsPromises from 'node:fs/promises';
+import { fileURLToPath } from 'node:url';
+import fs from 'node:fs';
+import path from 'node:path';
+
+const toPath = (urlOrPath: string | URL) =>
+  urlOrPath instanceof URL ? fileURLToPath(urlOrPath) : urlOrPath;
+
+export async function findUp(
+  name: string,
+  {
+    cwd = process.cwd(),
+    type = 'file',
+    stopAt,
+  }: {
+    cwd?: string | URL;
+    type?: string;
+    stopAt?: string | URL;
+  } = {},
+) {
+  let directory = path.resolve(toPath(cwd) ?? '');
+  const { root } = path.parse(directory);
+  stopAt = path.resolve(directory, toPath(stopAt ?? root));
+  const isAbsoluteName = path.isAbsolute(name);
+
+  while (directory) {
+    const filePath = isAbsoluteName ? name : path.join(directory, name);
+    try {
+      const stats = await fsPromises.stat(filePath); // eslint-disable-line no-await-in-loop
+      if (
+        (type === 'file' && stats.isFile()) ||
+        (type === 'directory' && stats.isDirectory())
+      ) {
+        return filePath;
+      }
+    } catch {}
+
+    if (directory === stopAt || directory === root) {
+      break;
+    }
+
+    directory = path.dirname(directory);
+  }
+}
+
+export function findUpSync(
+  name: string,
+  // @ts-ignore
+  { cwd = process.cwd(), type = 'file', stopAt } = {},
+) {
+  let directory = path.resolve(toPath(cwd) ?? '');
+  const { root } = path.parse(directory);
+  stopAt = path.resolve(directory, toPath(stopAt) ?? root);
+  const isAbsoluteName = path.isAbsolute(name);
+
+  while (directory) {
+    const filePath = isAbsoluteName ? name : path.join(directory, name);
+
+    try {
+      const stats = fs.statSync(filePath, { throwIfNoEntry: false });
+      if (
+        (type === 'file' && stats?.isFile()) ||
+        (type === 'directory' && stats?.isDirectory())
+      ) {
+        return filePath;
+      }
+    } catch {}
+
+    if (directory === stopAt || directory === root) {
+      break;
+    }
+
+    directory = path.dirname(directory);
+  }
+}

packages/common/electron-build/src/getPackageDependencies.ts

@@ -8,13 +8,49 @@
  */
 import { Walker, DepType } from 'flora-colossus';
 import { dirname } from 'path';
+import { findUpSync } from './findUp';
 
 export const getModuleRoot = (cwd: string, pkgName: string): string => {
-  const moduleRoot = dirname(
+  const moduleEntryPath = dirname(
     require.resolve(`${pkgName}/package.json`, {
       paths: [cwd || process.cwd()],
     }),
   );
+
+  let pkgPath = findUpSync('package.json', {
+    cwd: moduleEntryPath,
+  });
+
+  if (!pkgPath) {
+    return '';
+  }
+
+  let currentDir = dirname(pkgPath);
+  let isMatched = false;
+
+  while (pkgPath && !isMatched) {
+    try {
+      const pkg = require(pkgPath);
+      if (pkg.name === pkgName) {
+        isMatched = true;
+        break;
+      }
+
+      currentDir = dirname(currentDir);
+      pkgPath = findUpSync('package.json', {
+        cwd: currentDir,
+      });
+    } catch (err) {
+      console.warn('Failed to read package.json:', err);
+      break;
+    }
+  }
+
+  if (!isMatched || !pkgPath) {
+    return '';
+  }
+
+  const moduleRoot = dirname(pkgPath);
   return moduleRoot;
 };
 
@@ -27,14 +63,15 @@ export async function getExternalPkgsDependencies(
     path: string;
   }[]
 > {
-  const dependencies = new Set<{
-    name: string;
-    path: string;
-  }>(pkgNames.map((name) => ({ name, path: getModuleRoot(cwd, name) })));
+  const dependenciesMap = new Map<string, { name: string; path: string }>();
+  pkgNames.forEach((name) => {
+    dependenciesMap.set(name, { name, path: getModuleRoot(cwd, name) });
+  });
 
   for (const pkgName of pkgNames) {
     try {
       const moduleRoot = getModuleRoot(cwd, pkgName);
+      console.log('moduleRoot', moduleRoot);
 
       const walker = new Walker(moduleRoot);
       // These are private so it's quite nasty!
@@ -46,18 +83,18 @@ export async function getExternalPkgsDependencies(
       walker.modules
         .filter((dep: any) => dep.nativeModuleType === DepType.PROD)
         .forEach((dep: any) =>
-          dependencies.add({
+          dependenciesMap.set(dep.name, {
             name: dep.name,
             path: dep.path,
           }),
         );
 
       // @ts-ignore
-      console.log('walker.modules', walker.modules);
+      // console.log('walker.modules', walker.modules);
     } catch (error) {
       console.warn('error', error);
     }
   }
 
-  return Array.from(dependencies.values());
+  return Array.from(dependenciesMap.values());
 }