@aiworker/web 1.22.0 → 1.23.0

package/server/lib/opencode/openchamber-routes.js

@@ -5,10 +5,10 @@ function resolveSystemdServiceUnit(environment) {
     return null;
   }
 
-  const configuredUnit = typeof environment.OPENCHAMBER_SYSTEMD_UNIT === 'string'
-    ? environment.OPENCHAMBER_SYSTEMD_UNIT.trim()
+  const configuredUnit = typeof environment.AIWORKER_SYSTEMD_UNIT === 'string'
+    ? environment.AIWORKER_SYSTEMD_UNIT.trim()
     : '';
-  const unit = configuredUnit || 'openchamber.service';
+  const unit = configuredUnit || 'aiworker.service';
   return SYSTEMD_SERVICE_UNIT_PATTERN.test(unit) ? unit : null;
 }
 
@@ -16,24 +16,26 @@ function quotePosixShell(value) {
   return `'${String(value).replace(/'/g, "'\\''")}'`;
 }
 
-export const registerOpenChamberRoutes = (app, dependencies) => {
+export const registerAiWorkerRoutes = (app, dependencies) => {
   const {
     fs,
     path,
     process,
     server,
     __dirname,
-    openchamberDataDir,
+    aiworkerDataDir,
     modelsDevApiUrl,
     modelsMetadataCacheTtl,
     readSettingsFromDiskMigrated,
     fetchFreeZenModels,
     getCachedZenModels,
+    desktopUpdater,
   } = dependencies;
 
+  let desktopRestartError = null;
+
   app.get('/api/openchamber/update-check', async (req, res) => {
     try {
-      const { checkForUpdates } = await import('../package-manager.js');
       const parseString = (value) => (typeof value === 'string' && value.trim().length > 0 ? value.trim() : undefined);
       const parseReportUsage = (value) => {
         if (typeof value !== 'string') return true;
@@ -49,8 +51,7 @@ export const registerOpenChamberRoutes = (app, dependencies) => {
         return 'desktop';
       };
       const userAgent = typeof req.headers['user-agent'] === 'string' ? req.headers['user-agent'] : '';
-
-      const updateInfo = await checkForUpdates({
+      const updateRequest = {
         appType: parseString(req.query.appType),
         deviceClass: parseString(req.query.deviceClass) || inferDeviceClass(userAgent),
         platform: parseString(req.query.platform),
@@ -59,7 +60,31 @@ export const registerOpenChamberRoutes = (app, dependencies) => {
         currentVersion: parseString(req.query.currentVersion),
         installId: parseString(req.query.installId),
         reportUsage: parseReportUsage(parseString(req.query.reportUsage)),
-      });
+      };
+      let updateInfo;
+      if (process.env.AIWORKER_RUNTIME === 'desktop' && updateRequest.appType === 'web') {
+        if (desktopRestartError && req.query.updateStatus === 'true') {
+          return res.status(503).json({
+            code: 'DESKTOP_UPDATE_RESTART_FAILED',
+            error: desktopRestartError,
+          });
+        }
+        if (typeof desktopUpdater?.check !== 'function') {
+          return res.status(503).json({
+            available: false,
+            code: 'DESKTOP_UPDATER_UNAVAILABLE',
+            error: 'The desktop updater is not available.',
+          });
+        }
+        updateInfo = {
+          ...await desktopUpdater.check(),
+          packageManager: 'electron',
+          updateOwner: 'electron-updater',
+        };
+      } else {
+        const { checkForUpdates } = await import('../package-manager.js');
+        updateInfo = await checkForUpdates(updateRequest);
+      }
       res.json(updateInfo);
     } catch (error) {
       console.error('Failed to check for updates:', error);
@@ -72,6 +97,41 @@ export const registerOpenChamberRoutes = (app, dependencies) => {
 
   app.post('/api/openchamber/update-install', async (_req, res) => {
     try {
+      if (process.env.AIWORKER_RUNTIME === 'desktop') {
+        if (typeof desktopUpdater?.install !== 'function' || typeof desktopUpdater?.restart !== 'function') {
+          return res.status(503).json({
+            code: 'DESKTOP_UPDATER_UNAVAILABLE',
+            error: 'The desktop updater is not available.',
+          });
+        }
+
+        desktopRestartError = null;
+        const updateInfo = await desktopUpdater.install();
+        if (!updateInfo?.available) {
+          return res.status(400).json({ error: 'No update available' });
+        }
+
+        res.json({
+          success: true,
+          message: 'Desktop update downloaded, host will restart shortly',
+          version: updateInfo.version,
+          packageManager: 'electron',
+          updateOwner: 'electron-updater',
+          autoRestart: true,
+          restartManager: 'electron-updater',
+        });
+
+        setImmediate(() => {
+          Promise.resolve()
+            .then(() => desktopUpdater.restart())
+            .catch((error) => {
+              desktopRestartError = error instanceof Error ? error.message : 'Failed to restart after desktop update';
+              console.error('Failed to restart after desktop update:', error);
+            });
+        });
+        return;
+      }
+
       const { spawn: spawnChild, spawnSync } = await import('child_process');
       const {
         checkForUpdates,
@@ -119,7 +179,7 @@ export const registerOpenChamberRoutes = (app, dependencies) => {
       }
 
       const currentPort = server.address()?.port || 3000;
-      const instanceFilePath = path.join(openchamberDataDir, 'run', `openchamber-${currentPort}.json`);
+      const instanceFilePath = path.join(aiworkerDataDir, 'run', `openchamber-${currentPort}.json`);
       let storedOptions = { port: currentPort, daemon: true };
       try {
         const content = await fs.promises.readFile(instanceFilePath, 'utf8');
@@ -133,7 +193,7 @@ export const registerOpenChamberRoutes = (app, dependencies) => {
       if (isForegroundService) {
         if (!systemdServiceUnit) {
           return res.status(409).json({
-            error: 'Foreground servers must be updated by their service manager. Set OPENCHAMBER_SYSTEMD_UNIT when running under systemd, or run openchamber update and restart the service.',
+            error: 'Foreground servers must be updated by their service manager. Set AIWORKER_SYSTEMD_UNIT when running under systemd, or run aiworker update and restart the service.',
           });
         }
 
@@ -168,7 +228,7 @@ export const registerOpenChamberRoutes = (app, dependencies) => {
 
         return res.json({
           success: true,
-          message: 'Update queued; OpenChamber will restart after installation completes',
+          message: 'Update queued; AiWorker will restart after installation completes',
           version: updateInfo.version,
           packageManager: pm,
           autoRestart: true,
@@ -194,7 +254,7 @@ export const registerOpenChamberRoutes = (app, dependencies) => {
         String(storedOptions.port),
       ];
       let restartCmdPrimary = restartParts.join(' ');
-      let restartCmdFallback = `openchamber serve --port ${storedOptions.port}`;
+      let restartCmdFallback = `aiworker serve --port ${storedOptions.port}`;
       if (storedOptions.host) {
         if (isWindows) {
           const escapedHost = storedOptions.host.replace(/"/g, '""');
@@ -222,10 +282,10 @@ export const registerOpenChamberRoutes = (app, dependencies) => {
         restartCmdFallback += ' --api-only';
       }
       const restartCmd = isForegroundService ? '' : `(${restartCmdPrimary}) || (${restartCmdFallback})`;
-      const updateLogPath = path.join(openchamberDataDir, 'update-install.log');
+      const updateLogPath = path.join(aiworkerDataDir, 'update-install.log');
       const logPreamble = [
         '',
-        `=== OpenChamber update ${new Date().toISOString()} ===`,
+        `=== AiWorker update ${new Date().toISOString()} ===`,
         `currentVersion=${updateInfo.currentVersion || 'unknown'}`,
         `targetVersion=${updateInfo.version || 'unknown'}`,
         `packageManager=${pm}`,
@@ -262,8 +322,8 @@ export const registerOpenChamberRoutes = (app, dependencies) => {
             timeout /t 2 /nobreak >nul
             ${updateCmd}
             if %ERRORLEVEL% EQU 0 (
-              echo Update successful, restarting OpenChamber...
-              ${restartCmd || 'echo Service manager will restart OpenChamber.'}
+              echo Update successful, restarting AiWorker...
+              ${restartCmd || 'echo Service manager will restart AiWorker.'}
             ) else (
               echo Update failed
               exit /b 1
@@ -274,8 +334,8 @@ export const registerOpenChamberRoutes = (app, dependencies) => {
             sleep 2
             ${updateCmd}
             if [ $? -eq 0 ]; then
-              echo "Update successful, restarting OpenChamber..."
-              ${restartCmd || 'echo "Service manager will restart OpenChamber."'}
+              echo "Update successful, restarting AiWorker..."
+              ${restartCmd || 'echo "Service manager will restart AiWorker."'}
             else
               echo "Update failed"
               exit 1

package/server/lib/opencode/openchamber-routes.test.js

@@ -16,9 +16,9 @@ vi.mock('../package-manager.js', () => ({
 
 const childProcess = await import('child_process');
 const packageManager = await import('../package-manager.js');
-const { registerOpenChamberRoutes } = await import('./openchamber-routes.js');
+const { registerAiWorkerRoutes } = await import('./openchamber-routes.js');
 
-const createApp = ({ environment = {}, storedOptions = {} } = {}) => {
+const createApp = ({ environment = {}, storedOptions = {}, desktopUpdater } = {}) => {
   const app = express();
   const dependencies = {
     fs: {
@@ -41,15 +41,16 @@ const createApp = ({ environment = {}, storedOptions = {} } = {}) => {
       address: () => ({ port: 7897 }),
     },
     __dirname: '/opt/openchamber/server',
-    openchamberDataDir: '/tmp/openchamber',
+    aiworkerDataDir: '/tmp/openchamber',
     modelsDevApiUrl: 'https://models.example.test',
     modelsMetadataCacheTtl: 0,
     readSettingsFromDiskMigrated: vi.fn(),
     fetchFreeZenModels: vi.fn(),
     getCachedZenModels: vi.fn(),
+    desktopUpdater,
   };
 
-  registerOpenChamberRoutes(app, dependencies);
+  registerAiWorkerRoutes(app, dependencies);
   return { app, dependencies };
 };
 
@@ -61,7 +62,7 @@ beforeEach(() => {
   packageManager.detectPackageManagerDetails.mockReturnValue({
     packageManager: 'npm',
   });
-  packageManager.getUpdateCommand.mockReturnValue('npm install -g @openchamber/web@latest');
+  packageManager.getUpdateCommand.mockReturnValue('npm install -g @aiworker/web@latest');
 });
 
 afterEach(() => {
@@ -69,14 +70,140 @@ afterEach(() => {
   vi.clearAllMocks();
 });
 
-describe('OpenChamber foreground update route', () => {
+describe('AiWorker desktop host update route', () => {
+  it('reports a restart rejection until the user retries installation', async () => {
+    const desktopUpdater = {
+      check: vi.fn(async () => ({ available: true, currentVersion: '1.17.0', version: '1.17.1' })),
+      install: vi.fn(async () => ({ available: true, version: '1.17.1' })),
+      restart: vi.fn().mockRejectedValueOnce(new Error('Signature rejected')).mockResolvedValue(undefined),
+    };
+    const { app } = createApp({ environment: { AIWORKER_RUNTIME: 'desktop' }, desktopUpdater });
+    const logError = vi.spyOn(console, 'error').mockImplementation(() => {});
+
+    await request(app).post('/api/openchamber/update-install').expect(200);
+    await new Promise(resolve => setImmediate(resolve));
+    await request(app).get('/api/openchamber/update-check?appType=web&reportUsage=false&updateStatus=true').expect(503, {
+      code: 'DESKTOP_UPDATE_RESTART_FAILED', error: 'Signature rejected',
+    });
+    expect(desktopUpdater.check).not.toHaveBeenCalled();
+    expect(logError).toHaveBeenCalledOnce();
+    // Availability remains reachable after a browser reload, so users can retry.
+    await request(app).get('/api/openchamber/update-check?appType=web&reportUsage=false').expect(200);
+
+    await request(app).post('/api/openchamber/update-install').expect(200);
+    await new Promise(resolve => setImmediate(resolve));
+    const response = await request(app).get('/api/openchamber/update-check?appType=web&reportUsage=false').expect(200);
+    expect(response.body.currentVersion).toBe('1.17.0');
+    expect(response.body.updateOwner).toBe('electron-updater');
+    expect(packageManager.checkForUpdates).not.toHaveBeenCalled();
+  });
+
+  it('rejects native checks without a bridge and preserves explicit non-web checks', async () => {
+    const { app } = createApp({ environment: { AIWORKER_RUNTIME: 'desktop' } });
+    await request(app).get('/api/openchamber/update-check?appType=web').expect(503, {
+      available: false, code: 'DESKTOP_UPDATER_UNAVAILABLE', error: 'The desktop updater is not available.',
+    });
+    expect(packageManager.checkForUpdates).not.toHaveBeenCalled();
+    await request(app).get('/api/openchamber/update-check?appType=desktop-electron').expect(200);
+    expect(packageManager.checkForUpdates).toHaveBeenCalledOnce();
+  });
+
+  it('uses electron-updater to check for Web client updates', async () => {
+    const desktopUpdater = {
+      check: vi.fn(async () => ({
+        available: true,
+        currentVersion: '1.17.0',
+        version: '1.17.1',
+      })),
+      install: vi.fn(),
+      restart: vi.fn(),
+    };
+    const { app } = createApp({
+      environment: {
+        AIWORKER_RUNTIME: 'desktop',
+      },
+      desktopUpdater,
+    });
+
+    await request(app)
+      .get('/api/openchamber/update-check?appType=web&reportUsage=false')
+      .expect(200, {
+        available: true,
+        currentVersion: '1.17.0',
+        version: '1.17.1',
+        packageManager: 'electron',
+        updateOwner: 'electron-updater',
+      });
+
+    expect(desktopUpdater.check).toHaveBeenCalledOnce();
+    expect(packageManager.checkForUpdates).not.toHaveBeenCalled();
+  });
+
+  it('installs through electron-updater and restarts after responding', async () => {
+    const desktopUpdater = {
+      check: vi.fn(),
+      install: vi.fn(async () => ({
+        available: true,
+        version: '1.17.1',
+      })),
+      restart: vi.fn(),
+    };
+    const { app } = createApp({
+      environment: {
+        AIWORKER_RUNTIME: 'desktop',
+      },
+      desktopUpdater,
+    });
+
+    await request(app)
+      .post('/api/openchamber/update-install')
+      .expect(200, {
+        success: true,
+        message: 'Desktop update downloaded, host will restart shortly',
+        version: '1.17.1',
+        packageManager: 'electron',
+        updateOwner: 'electron-updater',
+        autoRestart: true,
+        restartManager: 'electron-updater',
+      });
+    await new Promise((resolve) => setImmediate(resolve));
+
+    expect(desktopUpdater.install).toHaveBeenCalledOnce();
+    expect(desktopUpdater.restart).toHaveBeenCalledOnce();
+    expect(packageManager.checkForUpdates).not.toHaveBeenCalled();
+    expect(packageManager.detectPackageManagerDetails).not.toHaveBeenCalled();
+    expect(packageManager.getUpdateCommand).not.toHaveBeenCalled();
+    expect(childProcess.spawn).not.toHaveBeenCalled();
+    expect(childProcess.spawnSync).not.toHaveBeenCalled();
+  });
+
+  it('fails safely when the Electron updater bridge is unavailable', async () => {
+    const { app } = createApp({
+      environment: {
+        AIWORKER_RUNTIME: 'desktop',
+      },
+    });
+
+    await request(app)
+      .post('/api/openchamber/update-install')
+      .expect(503, {
+        code: 'DESKTOP_UPDATER_UNAVAILABLE',
+        error: 'The desktop updater is not available.',
+      });
+
+    expect(packageManager.checkForUpdates).not.toHaveBeenCalled();
+    expect(childProcess.spawn).not.toHaveBeenCalled();
+  });
+});
+
+describe('AiWorker foreground update route', () => {
   it('rejects a foreground update when the server is not owned by systemd', async () => {
     const { app } = createApp();
 
     await request(app)
       .post('/api/openchamber/update-install')
       .expect(409, {
-        error: 'Foreground servers must be updated by their service manager. Set OPENCHAMBER_SYSTEMD_UNIT when running under systemd, or run openchamber update and restart the service.',
+        error: 'Foreground servers must be updated by their service manager. Set AIWORKER_SYSTEMD_UNIT when running under systemd, or run aiworker update and restart the service.',
       });
 
     expect(childProcess.spawnSync).not.toHaveBeenCalled();
@@ -86,14 +213,14 @@ describe('OpenChamber foreground update route', () => {
     const { app } = createApp({
       environment: {
         INVOCATION_ID: 'systemd-invocation',
-        OPENCHAMBER_SYSTEMD_UNIT: 'openchamber.service; rm -rf /',
+        AIWORKER_SYSTEMD_UNIT: 'aiworker.service; rm -rf /',
       },
     });
 
     await request(app)
       .post('/api/openchamber/update-install')
       .expect(409, {
-        error: 'Foreground servers must be updated by their service manager. Set OPENCHAMBER_SYSTEMD_UNIT when running under systemd, or run openchamber update and restart the service.',
+        error: 'Foreground servers must be updated by their service manager. Set AIWORKER_SYSTEMD_UNIT when running under systemd, or run aiworker update and restart the service.',
       });
 
     expect(childProcess.spawnSync).not.toHaveBeenCalled();
@@ -105,7 +232,7 @@ describe('OpenChamber foreground update route', () => {
     const { app } = createApp({
       environment: {
         INVOCATION_ID: 'systemd-invocation',
-        OPENCHAMBER_SYSTEMD_UNIT: 'openchamber@wsl.service',
+        AIWORKER_SYSTEMD_UNIT: 'aiworker@wsl.service',
         PATH: '/home/syu/.npm-global/bin:/usr/bin:/bin',
       },
     });
@@ -114,7 +241,7 @@ describe('OpenChamber foreground update route', () => {
       .post('/api/openchamber/update-install')
       .expect(200, {
         success: true,
-        message: 'Update queued; OpenChamber will restart after installation completes',
+        message: 'Update queued; AiWorker will restart after installation completes',
         version: '1.17.1',
         packageManager: 'npm',
         autoRestart: true,
@@ -131,7 +258,7 @@ describe('OpenChamber foreground update route', () => {
       '--setenv=PATH=/home/syu/.npm-global/bin:/usr/bin:/bin',
       '/bin/sh',
       '-c',
-      "set -eu\nnpm install -g @openchamber/web@latest\nsystemctl --user restart 'openchamber@wsl.service'",
+      "set -eu\nnpm install -g @aiworker/web@latest\nsystemctl --user restart 'aiworker@wsl.service'",
     ], {
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'pipe'],

package/server/lib/opencode/plugins.js

@@ -1,8 +1,8 @@
 import fs from 'fs';
-import os from 'os';
 import path from 'path';
 import {
   AGENT_SCOPE,
+  OPENCODE_CONFIG_DIR,
   readConfigFile,
   readConfigLayer,
   writeConfig,
@@ -71,7 +71,7 @@ function getActiveOpencodeConfigDir() {
   if (customConfigPath) {
     return path.dirname(path.resolve(customConfigPath));
   }
-  return path.join(os.homedir(), '.config', 'opencode');
+  return OPENCODE_CONFIG_DIR;
 }
 
 function getActiveUserConfigPaths() {

package/server/lib/opencode/plugins.test.js

@@ -136,7 +136,7 @@ describe('opencode plugins data layer', () => {
 
     expect(plugins.listPluginEntries(projectDir).map((entry) => entry.spec)).toEqual(['user-plugin']);
     expect(fs.readFileSync(projectFile, 'utf8')).toBe(partialProject);
-    expect(fs.existsSync(`${projectFile}.openchamber.backup`)).toBe(false);
+    expect(fs.existsSync(`${projectFile}.aiworker.backup`)).toBe(false);
   });
 
   test('lists entries from user and project layers with scopes and parsed kinds', () => {

package/server/lib/opencode/project-icon-routes.js

@@ -3,7 +3,7 @@ export const registerProjectIconRoutes = (app, dependencies) => {
     fsPromises,
     path,
     crypto,
-    openchamberDataDir,
+    aiworkerDataDir,
     sanitizeProjects,
     readSettingsFromDiskMigrated,
     persistSettings,
@@ -12,7 +12,7 @@ export const registerProjectIconRoutes = (app, dependencies) => {
     resolveGitBinaryForSpawn,
   } = dependencies;
 
-  const projectIconsDirPath = path.join(openchamberDataDir, 'project-icons');
+  const projectIconsDirPath = path.join(aiworkerDataDir, 'project-icons');
   const projectIconMimeToExtension = {
     'image/png': 'png',
     'image/jpeg': 'jpg',

package/server/lib/opencode/project-icon-routes.test.js

@@ -79,7 +79,7 @@ describe('project icon routes', () => {
       fsPromises,
       path,
       crypto,
-      openchamberDataDir: '/tmp/openchamber-test',
+      aiworkerDataDir: '/tmp/openchamber-test',
       sanitizeProjects: (projects) => projects,
       readSettingsFromDiskMigrated: async () => ({
         projects: [{

package/server/lib/opencode/providers.js

@@ -152,6 +152,37 @@ function validateCustomProviderConfig(providerId, config, options = {}) {
   return { ok: true, value: { providerId, config: normalized } };
 }
 
+function mergeCustomProviderConfig(existingValue, normalizedConfig) {
+  const existing = isPlainObject(existingValue) ? existingValue : {};
+  const existingOptions = isPlainObject(existing.options) ? existing.options : {};
+  const normalizedOptions = isPlainObject(normalizedConfig.options) ? normalizedConfig.options : {};
+  const mergedOptions = { ...existingOptions, ...normalizedOptions };
+  if (!Object.prototype.hasOwnProperty.call(normalizedOptions, 'headers')) {
+    delete mergedOptions.headers;
+  }
+
+  const existingModels = isPlainObject(existing.models) ? existing.models : {};
+  const normalizedModels = isPlainObject(normalizedConfig.models) ? normalizedConfig.models : {};
+  const mergedModels = Object.fromEntries(
+    Object.entries(normalizedModels).map(([modelId, normalizedModel]) => {
+      const existingModel = isPlainObject(existingModels[modelId]) ? existingModels[modelId] : {};
+      const nextModel = isPlainObject(normalizedModel) ? normalizedModel : {};
+      return [modelId, { ...existingModel, ...nextModel }];
+    }),
+  );
+
+  const merged = {
+    ...existing,
+    ...normalizedConfig,
+    options: mergedOptions,
+    models: mergedModels,
+  };
+  if (!Object.prototype.hasOwnProperty.call(normalizedConfig, 'env')) {
+    delete merged.env;
+  }
+  return merged;
+}
+
 /**
  * Persist (create or update) a custom provider block in OpenCode user/project/custom config.
  * Does not write secrets — API keys remain in auth.json via the OpenCode auth API.
@@ -183,8 +214,19 @@ function upsertProviderConfig(providerId, config, workingDirectory, scope = 'use
 
   const targetConfig = getConfigForPath(layers, targetPath);
   const providerConfig = isPlainObject(targetConfig.provider) ? { ...targetConfig.provider } : {};
-  providerConfig[validated.value.providerId] = validated.value.config;
+  const providersAlias = isPlainObject(targetConfig.providers) ? { ...targetConfig.providers } : {};
+  const existingProvider = providerConfig[validated.value.providerId] ?? providersAlias[validated.value.providerId];
+  const mergedConfig = mergeCustomProviderConfig(existingProvider, validated.value.config);
+  providerConfig[validated.value.providerId] = mergedConfig;
   targetConfig.provider = providerConfig;
+  if (Object.prototype.hasOwnProperty.call(providersAlias, validated.value.providerId)) {
+    delete providersAlias[validated.value.providerId];
+    if (Object.keys(providersAlias).length === 0) {
+      delete targetConfig.providers;
+    } else {
+      targetConfig.providers = providersAlias;
+    }
+  }
 
   if (Array.isArray(targetConfig.disabled_providers)) {
     targetConfig.disabled_providers = targetConfig.disabled_providers.filter(
@@ -198,7 +240,7 @@ function upsertProviderConfig(providerId, config, workingDirectory, scope = 'use
   return {
     providerId: validated.value.providerId,
     path: writePath,
-    config: validated.value.config,
+    config: mergedConfig,
   };
 }