@cloudcli-ai/cloudcli 1.36.3 → 1.37.0

package/server/modules/settings/settings.service.ts

@@ -0,0 +1,186 @@
+import { AppError } from '@/shared/utils.js';
+
+type ApiKeyRow = Record<string, unknown> & { api_key: string };
+type NotificationPreferences = Record<string, unknown> & {
+  channels?: Record<string, unknown> & { webPush?: boolean };
+};
+
+type SettingsDependencies = {
+  apiKeys: {
+    list(userId: number): ApiKeyRow[];
+    create(userId: number, keyName: string): unknown;
+    remove(userId: number, keyId: number): boolean;
+    toggle(userId: number, keyId: number, isActive: boolean): boolean;
+  };
+  credentials: {
+    list(userId: number, credentialType: string | null): unknown[];
+    create(
+      userId: number,
+      name: string,
+      type: string,
+      value: string,
+      description: string | null,
+    ): unknown;
+    remove(userId: number, credentialId: number): boolean;
+    toggle(userId: number, credentialId: number, isActive: boolean): boolean;
+  };
+  notifications: {
+    getPreferences(userId: number): NotificationPreferences | undefined;
+    updatePreferences(userId: number, preferences: NotificationPreferences): unknown;
+    createEnabledEvent(): unknown;
+    notifyUser(userId: number, event: unknown): void | Promise<void>;
+  };
+  pushSubscriptions: {
+    save(userId: number, endpoint: string, p256dh: string, auth: string): void;
+    remove(endpoint: string): void;
+  };
+  getVapidPublicKey(): string | null;
+};
+
+function requiredString(value: unknown, fieldName: string, code: string): string {
+  const normalizedValue = typeof value === 'string' ? value.trim() : '';
+  if (!normalizedValue) {
+    throw new AppError(`${fieldName} is required`, { code, statusCode: 400 });
+  }
+  return normalizedValue;
+}
+
+function assertFound(found: boolean, resourceName: string, code: string): void {
+  if (!found) {
+    throw new AppError(`${resourceName} not found`, { code, statusCode: 404 });
+  }
+}
+
+/** Creates settings workflows with repositories and notification effects injected. */
+export function createSettingsService(dependencies: SettingsDependencies) {
+  return {
+    listApiKeys(userId: number) {
+      const apiKeys = dependencies.apiKeys.list(userId).map((key) => ({
+        ...key,
+        api_key: `${key.api_key.substring(0, 10)}...`,
+      }));
+      return { apiKeys };
+    },
+    createApiKey(userId: number, keyNameInput: unknown) {
+      const keyName = requiredString(keyNameInput, 'Key name', 'API_KEY_NAME_REQUIRED');
+      return { success: true, apiKey: dependencies.apiKeys.create(userId, keyName) };
+    },
+    deleteApiKey(userId: number, keyId: number) {
+      assertFound(dependencies.apiKeys.remove(userId, keyId), 'API key', 'API_KEY_NOT_FOUND');
+      return { success: true };
+    },
+    toggleApiKey(userId: number, keyId: number, isActive: unknown) {
+      if (typeof isActive !== 'boolean') {
+        throw new AppError('isActive must be a boolean', {
+          code: 'INVALID_ACTIVE_STATE',
+          statusCode: 400,
+        });
+      }
+      assertFound(
+        dependencies.apiKeys.toggle(userId, keyId, isActive),
+        'API key',
+        'API_KEY_NOT_FOUND',
+      );
+      return { success: true };
+    },
+    listCredentials(userId: number, credentialType: string | null) {
+      return { credentials: dependencies.credentials.list(userId, credentialType) };
+    },
+    createCredential(userId: number, input: Record<string, unknown>) {
+      const credentialName = requiredString(
+        input.credentialName,
+        'Credential name',
+        'CREDENTIAL_NAME_REQUIRED',
+      );
+      const credentialType = requiredString(
+        input.credentialType,
+        'Credential type',
+        'CREDENTIAL_TYPE_REQUIRED',
+      );
+      const credentialValue = requiredString(
+        input.credentialValue,
+        'Credential value',
+        'CREDENTIAL_VALUE_REQUIRED',
+      );
+      const description = typeof input.description === 'string'
+        ? input.description.trim() || null
+        : null;
+      return {
+        success: true,
+        credential: dependencies.credentials.create(
+          userId,
+          credentialName,
+          credentialType,
+          credentialValue,
+          description,
+        ),
+      };
+    },
+    deleteCredential(userId: number, credentialId: number) {
+      assertFound(
+        dependencies.credentials.remove(userId, credentialId),
+        'Credential',
+        'CREDENTIAL_NOT_FOUND',
+      );
+      return { success: true };
+    },
+    toggleCredential(userId: number, credentialId: number, isActive: unknown) {
+      if (typeof isActive !== 'boolean') {
+        throw new AppError('isActive must be a boolean', {
+          code: 'INVALID_ACTIVE_STATE',
+          statusCode: 400,
+        });
+      }
+      assertFound(
+        dependencies.credentials.toggle(userId, credentialId, isActive),
+        'Credential',
+        'CREDENTIAL_NOT_FOUND',
+      );
+      return { success: true };
+    },
+    getNotificationPreferences(userId: number) {
+      return { success: true, preferences: dependencies.notifications.getPreferences(userId) };
+    },
+    updateNotificationPreferences(userId: number, preferences: NotificationPreferences) {
+      return {
+        success: true,
+        preferences: dependencies.notifications.updatePreferences(userId, preferences),
+      };
+    },
+    getVapidPublicKey() {
+      return { publicKey: dependencies.getVapidPublicKey() };
+    },
+    subscribeToPush(userId: number, input: Record<string, unknown>) {
+      const endpoint = requiredString(input.endpoint, 'Endpoint', 'PUSH_SUBSCRIPTION_REQUIRED');
+      const keys = typeof input.keys === 'object' && input.keys !== null
+        ? input.keys as Record<string, unknown>
+        : {};
+      const p256dh = requiredString(keys.p256dh, 'p256dh', 'PUSH_SUBSCRIPTION_REQUIRED');
+      const auth = requiredString(keys.auth, 'auth', 'PUSH_SUBSCRIPTION_REQUIRED');
+      dependencies.pushSubscriptions.save(userId, endpoint, p256dh, auth);
+
+      const currentPreferences = dependencies.notifications.getPreferences(userId);
+      if (!currentPreferences?.channels?.webPush) {
+        dependencies.notifications.updatePreferences(userId, {
+          ...currentPreferences,
+          channels: { ...currentPreferences?.channels, webPush: true },
+        });
+      }
+      const event = dependencies.notifications.createEnabledEvent();
+      void dependencies.notifications.notifyUser(userId, event);
+      return { success: true };
+    },
+    unsubscribeFromPush(userId: number, endpointInput: unknown) {
+      const endpoint = requiredString(endpointInput, 'Endpoint', 'PUSH_ENDPOINT_REQUIRED');
+      dependencies.pushSubscriptions.remove(endpoint);
+      const currentPreferences = dependencies.notifications.getPreferences(userId);
+      if (currentPreferences?.channels?.webPush) {
+        dependencies.notifications.updatePreferences(userId, {
+          ...currentPreferences,
+          channels: { ...currentPreferences.channels, webPush: false },
+        });
+      }
+      return { success: true };
+    },
+  };
+}

package/server/modules/settings/tests/settings.service.test.ts

@@ -0,0 +1,54 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { createSettingsService } from '../settings.service.js';
+
+type Dependencies = Parameters<typeof createSettingsService>[0];
+
+function dependencies(overrides: Partial<Dependencies> = {}): Dependencies {
+  return {
+    apiKeys: { list: () => [], create: () => ({}), remove: () => false, toggle: () => false },
+    credentials: { list: () => [], create: () => ({}), remove: () => false, toggle: () => false },
+    notifications: {
+      getPreferences: () => undefined,
+      updatePreferences: () => ({}),
+      createEnabledEvent: () => ({}),
+      notifyUser: () => undefined,
+    },
+    pushSubscriptions: { save: () => undefined, remove: () => undefined },
+    getVapidPublicKey: () => null,
+    ...overrides,
+  };
+}
+
+test('listApiKeys redacts secret values through the service boundary', () => {
+  const service = createSettingsService(dependencies({
+    apiKeys: {
+      list: () => [{ id: 1, api_key: '1234567890-secret' }],
+      create: () => ({}), remove: () => false, toggle: () => false,
+    },
+  }));
+  assert.equal(service.listApiKeys(1).apiKeys[0]?.api_key, '1234567890...');
+});
+
+test('subscribeToPush persists the subscription and enables Web Push', () => {
+  const operations: string[] = [];
+  const service = createSettingsService(dependencies({
+    pushSubscriptions: {
+      save: (_id, endpoint) => operations.push(`save:${endpoint}`),
+      remove: () => undefined,
+    },
+    notifications: {
+      getPreferences: () => ({ channels: { webPush: false } }),
+      updatePreferences: () => { operations.push('preferences'); return {}; },
+      createEnabledEvent: () => ({ code: 'push.enabled' }),
+      notifyUser: () => { operations.push('notify'); },
+    },
+  }));
+
+  service.subscribeToPush(1, {
+    endpoint: 'https://push.example.test',
+    keys: { p256dh: 'key', auth: 'auth' },
+  });
+  assert.deepEqual(operations, ['save:https://push.example.test', 'preferences', 'notify']);
+});

package/server/modules/system/index.ts

@@ -0,0 +1,2 @@
+// createSystemModule: used by the server entrypoint to mount protected system update routes.
+export { createSystemModule } from './system.module.js';

package/server/modules/system/system.module.ts

@@ -0,0 +1,62 @@
+import os from 'node:os';
+
+import spawn from 'cross-spawn';
+import type { Router } from 'express';
+
+import { createSystemRouter } from './system.routes.js';
+import { createSystemUpdateService } from './system.service.js';
+
+type SystemModuleOptions = {
+  appRoot: string;
+  installMode: 'git' | 'npm';
+  isPlatform: boolean;
+};
+
+function runShellCommand(
+  command: string,
+  workingDirectory: string,
+  environment: NodeJS.ProcessEnv,
+  onOutput: (output: string) => void,
+  onErrorOutput: (errorOutput: string) => void,
+): Promise<{ exitCode: number | null; output: string; errorOutput: string }> {
+  return new Promise((resolve, reject) => {
+    const childProcess = spawn('sh', ['-c', command], {
+      cwd: workingDirectory,
+      env: environment,
+    });
+    let output = '';
+    let errorOutput = '';
+
+    childProcess.stdout?.on('data', (data: Buffer) => {
+      const text = data.toString();
+      output += text;
+      onOutput(text);
+    });
+    childProcess.stderr?.on('data', (data: Buffer) => {
+      const text = data.toString();
+      errorOutput += text;
+      onErrorOutput(text);
+    });
+    childProcess.once('error', reject);
+    childProcess.once('close', (exitCode) => {
+      resolve({ exitCode, output, errorOutput });
+    });
+  });
+}
+
+/**
+ * Builds the authenticated system router for the server entrypoint using the
+ * installation details it already resolves for health and startup metadata.
+ */
+export function createSystemModule(options: SystemModuleOptions): Router {
+  const systemUpdateService = createSystemUpdateService({
+    ...options,
+    homeDirectory: os.homedir(),
+    environment: process.env,
+    runShellCommand,
+    logInfo: (message, detail) => console.log(message, detail ?? ''),
+    logError: (message, detail) => console.error(message, detail ?? ''),
+  });
+
+  return createSystemRouter(systemUpdateService);
+}

package/server/modules/system/system.routes.ts

@@ -0,0 +1,21 @@
+import express from 'express';
+
+import type { createSystemUpdateService } from './system.service.js';
+
+/** Creates thin system routes that delegate update execution to the service. */
+export function createSystemRouter(
+  systemUpdateService: ReturnType<typeof createSystemUpdateService>,
+): express.Router {
+  const router = express.Router();
+
+  router.post('/update', async (_request, response, next) => {
+    try {
+      const result = await systemUpdateService.updateSystem();
+      response.status(result.success ? 200 : 500).json(result);
+    } catch (error) {
+      next(error);
+    }
+  });
+
+  return router;
+}

package/server/modules/system/system.service.ts

@@ -0,0 +1,76 @@
+type SystemUpdateCommandResult = {
+  exitCode: number | null;
+  output: string;
+  errorOutput: string;
+};
+
+type SystemUpdateDependencies = {
+  appRoot: string;
+  homeDirectory: string;
+  installMode: 'git' | 'npm';
+  isPlatform: boolean;
+  environment: NodeJS.ProcessEnv;
+  runShellCommand(
+    command: string,
+    workingDirectory: string,
+    environment: NodeJS.ProcessEnv,
+    onOutput: (output: string) => void,
+    onErrorOutput: (errorOutput: string) => void,
+  ): Promise<SystemUpdateCommandResult>;
+  logInfo(message: string, detail?: string): void;
+  logError(message: string, detail?: string): void;
+};
+
+/**
+ * Creates the update workflow used by the system module and its focused tests.
+ * Runtime-specific process spawning stays behind the injected command adapter.
+ */
+export function createSystemUpdateService(dependencies: SystemUpdateDependencies) {
+  return {
+    /** Selects and executes the correct update workflow for this installation. */
+    async updateSystem() {
+      const updateCommand = dependencies.isPlatform
+        ? 'npm run update:platform'
+        : dependencies.installMode === 'git'
+          ? 'git checkout main && git pull && npm install'
+          : 'npm install -g @cloudcli-ai/cloudcli@latest';
+      const workingDirectory = dependencies.isPlatform || dependencies.installMode === 'git'
+        ? dependencies.appRoot
+        : dependencies.homeDirectory;
+
+      dependencies.logInfo('Starting system update from directory:', workingDirectory);
+
+      try {
+        const result = await dependencies.runShellCommand(
+          updateCommand,
+          workingDirectory,
+          dependencies.environment,
+          (output) => dependencies.logInfo('Update output:', output),
+          (errorOutput) => dependencies.logError('Update error:', errorOutput),
+        );
+
+        if (result.exitCode === 0) {
+          return {
+            success: true as const,
+            output: result.output || 'Update completed successfully',
+            message: 'Update completed. Please restart the server to apply changes.',
+          };
+        }
+
+        return {
+          success: false as const,
+          error: 'Update command failed',
+          output: result.output,
+          errorOutput: result.errorOutput,
+        };
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        dependencies.logError('Update process error:', message);
+        return {
+          success: false as const,
+          error: message,
+        };
+      }
+    },
+  };
+}

package/server/modules/system/tests/system.service.test.ts

@@ -0,0 +1,118 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { createSystemUpdateService } from '../system.service.js';
+
+type SystemUpdateDependencies = Parameters<typeof createSystemUpdateService>[0];
+
+function createDependencies(
+  overrides: Partial<SystemUpdateDependencies> = {},
+): SystemUpdateDependencies {
+  return {
+    appRoot: '/app/cloudcli',
+    homeDirectory: '/home/cloudcli',
+    installMode: 'git',
+    isPlatform: false,
+    environment: { TEST_ENVIRONMENT: 'true' },
+    runShellCommand: async () => ({ exitCode: 0, output: 'updated', errorOutput: '' }),
+    logInfo: () => undefined,
+    logError: () => undefined,
+    ...overrides,
+  };
+}
+
+test('git installations update from the application root', async () => {
+  const calls: unknown[][] = [];
+  const dependencies = createDependencies({
+    runShellCommand: async (command, workingDirectory, environment) => {
+      calls.push([command, workingDirectory, environment]);
+      return { exitCode: 0, output: 'git update complete', errorOutput: '' };
+    },
+  });
+  const service = createSystemUpdateService(dependencies);
+
+  const result = await service.updateSystem();
+
+  assert.deepEqual(calls, [[
+    'git checkout main && git pull && npm install',
+    '/app/cloudcli',
+    dependencies.environment,
+  ]]);
+  assert.deepEqual(result, {
+    success: true,
+    output: 'git update complete',
+    message: 'Update completed. Please restart the server to apply changes.',
+  });
+});
+
+test('global npm installations update from the user home directory', async () => {
+  const calls: unknown[][] = [];
+  const dependencies = createDependencies({
+    installMode: 'npm',
+    runShellCommand: async (command, workingDirectory, environment) => {
+      calls.push([command, workingDirectory, environment]);
+      return { exitCode: 0, output: '', errorOutput: '' };
+    },
+  });
+  const service = createSystemUpdateService(dependencies);
+
+  const result = await service.updateSystem();
+
+  assert.deepEqual(calls, [[
+    'npm install -g @cloudcli-ai/cloudcli@latest',
+    '/home/cloudcli',
+    dependencies.environment,
+  ]]);
+  assert.equal(result.output, 'Update completed successfully');
+});
+
+test('platform installations use the platform workflow regardless of install mode', async () => {
+  const calls: unknown[][] = [];
+  const dependencies = createDependencies({
+    installMode: 'npm',
+    isPlatform: true,
+    runShellCommand: async (command, workingDirectory, environment) => {
+      calls.push([command, workingDirectory, environment]);
+      return { exitCode: 0, output: 'platform update complete', errorOutput: '' };
+    },
+  });
+  const service = createSystemUpdateService(dependencies);
+
+  await service.updateSystem();
+
+  assert.deepEqual(calls, [[
+    'npm run update:platform',
+    '/app/cloudcli',
+    dependencies.environment,
+  ]]);
+});
+
+test('failed update commands retain stdout and stderr for the existing API contract', async () => {
+  const service = createSystemUpdateService(createDependencies({
+    runShellCommand: async () => ({
+      exitCode: 1,
+      output: 'installing',
+      errorOutput: 'npm failed',
+    }),
+  }));
+
+  assert.deepEqual(await service.updateSystem(), {
+    success: false,
+    error: 'Update command failed',
+    output: 'installing',
+    errorOutput: 'npm failed',
+  });
+});
+
+test('process startup errors retain their message for the existing API contract', async () => {
+  const service = createSystemUpdateService(createDependencies({
+    runShellCommand: async () => {
+      throw new Error('spawn sh failed');
+    },
+  }));
+
+  assert.deepEqual(await service.updateSystem(), {
+    success: false,
+    error: 'spawn sh failed',
+  });
+});

package/server/modules/taskmaster/index.ts

@@ -0,0 +1,2 @@
+// taskmasterRoutes: used by the server entrypoint to mount protected Taskmaster endpoints.
+export { taskmasterRoutes } from './taskmaster.module.js';

package/server/modules/taskmaster/taskmaster.module.ts

@@ -0,0 +1,24 @@
+import fs from 'node:fs';
+import * as fsPromises from 'node:fs/promises';
+import os from 'node:os';
+
+import spawn from 'cross-spawn';
+
+import { projectsDb } from '@/modules/database/index.js';
+
+import { createTaskmasterRouter } from './taskmaster.routes.js';
+import { createTaskmasterService } from './taskmaster.service.js';
+
+const taskmasterService = createTaskmasterService({
+  readTextFile: (filePath) => fsPromises.readFile(filePath, 'utf8'),
+  getHomeDirectory: os.homedir,
+});
+
+/** Used by the server entrypoint to mount authenticated TaskMaster endpoints. */
+export const taskmasterRoutes = createTaskmasterRouter({
+  fileSystem: fs,
+  fileSystemPromises: fsPromises,
+  spawnProcess: spawn,
+  resolveProjectPathById: (projectId) => projectsDb.getProjectPathById(projectId),
+  taskmasterService,
+});