@cloudcli-ai/cloudcli 1.35.0 → 1.36.0

package/dist-server/server/modules/websocket/services/desktop-agent-websocket.service.js

@@ -1,39 +0,0 @@
-import { desktopAgentRelay } from '../../../modules/computer-use/index.js';
-import { parseIncomingJsonObject } from '../../../shared/utils.js';
-/**
- * Handles the `/desktop-agent` websocket — the inbound side of the cloud
- * Computer Use relay. A linked CloudCLI desktop app connects here and registers
- * itself as the executor for this hosted environment. The server then forwards
- * `computer_*` actions via `desktopAgentRelay`, and the agent returns results as
- * `computer_relay_result` frames correlated by `id`.
- */
-export function handleDesktopAgentConnection(ws, request) {
-    let registered = false;
-    ws.on('message', (rawMessage) => {
-        const data = parseIncomingJsonObject(rawMessage);
-        if (!data) {
-            return;
-        }
-        const kind = typeof data.kind === 'string' ? data.kind : typeof data.type === 'string' ? data.type : '';
-        if (kind === 'register' && !registered) {
-            const label = typeof data.label === 'string' && data.label.trim()
-                ? data.label.trim()
-                : request.user?.username
-                    ? `desktop:${request.user.username}`
-                    : 'desktop-agent';
-            registered = true;
-            console.log('[INFO] Desktop agent websocket registered:', label);
-            desktopAgentRelay.register(ws, label);
-            return;
-        }
-        if (kind === 'computer_relay_result' && typeof data.id === 'string') {
-            desktopAgentRelay.handleResult(data.id, data.result, typeof data.error === 'string'
-                ? data.error
-                : undefined);
-        }
-    });
-    ws.on('close', () => {
-        console.log('[INFO] Desktop agent websocket disconnected');
-    });
-}
-//# sourceMappingURL=desktop-agent-websocket.service.js.map

package/dist-server/server/modules/websocket/services/desktop-agent-websocket.service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"desktop-agent-websocket.service.js","sourceRoot":"","sources":["../../../../../server/modules/websocket/services/desktop-agent-websocket.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAE5D;;;;;;GAMG;AACH,MAAM,UAAU,4BAA4B,CAC1C,EAAa,EACb,OAAsC;IAEtC,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,EAAE;QAC9B,MAAM,IAAI,GAAG,uBAAuB,CAAC,UAAU,CAAC,CAAC;QACjD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACxG,IAAI,IAAI,KAAK,UAAU,IAAI,CAAC,UAAU,EAAE,CAAC;YACvC,MAAM,KAAK,GAAG,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;gBAC/D,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;gBACnB,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ;oBACtB,CAAC,CAAC,WAAW,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE;oBACpC,CAAC,CAAC,eAAe,CAAC;YACtB,UAAU,GAAG,IAAI,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,4CAA4C,EAAE,KAAK,CAAC,CAAC;YACjE,iBAAiB,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YACtC,OAAO;QACT,CAAC;QACD,IAAI,IAAI,KAAK,uBAAuB,IAAI,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;YACpE,iBAAiB,CAAC,YAAY,CAC5B,IAAI,CAAC,EAAE,EACN,IAAgC,CAAC,MAAM,EACxC,OAAQ,IAAgC,CAAC,KAAK,KAAK,QAAQ;gBACzD,CAAC,CAAG,IAAgC,CAAC,KAAgB;gBACrD,CAAC,CAAC,SAAS,CACd,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QAClB,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;AACL,CAAC"}

package/electron/computerAgent.js

@@ -1,290 +0,0 @@
-import { spawn } from 'node:child_process';
-import fs from 'node:fs/promises';
-import path from 'node:path';
-
-const IPC_PREFIX = '@@CUAGENT@@';
-const TARGET_STATUS_TIMEOUT_MS = 5000;
-
-function getDesktopPath() {
-  const currentPath = process.env.PATH || '';
-  const commonPaths = process.platform === 'win32'
-    ? []
-    : ['/opt/homebrew/bin', '/usr/local/bin', '/usr/bin', '/bin', '/usr/sbin', '/sbin'];
-  return [...commonPaths, currentPath].filter(Boolean).join(path.delimiter);
-}
-
-function getNodeRuntime(isPackaged) {
-  if (isPackaged && process.versions.electron) {
-    return { command: process.execPath, env: { ELECTRON_RUN_AS_NODE: '1' } };
-  }
-  if (process.env.npm_node_execpath) {
-    return { command: process.env.npm_node_execpath, env: {} };
-  }
-  return { command: 'node', env: {} };
-}
-
-function toAgentWsUrl(httpUrl) {
-  try {
-    const parsed = new URL(httpUrl);
-    parsed.protocol = parsed.protocol === 'http:' ? 'ws:' : 'wss:';
-    parsed.pathname = '/desktop-agent';
-    parsed.search = '';
-    parsed.hash = '';
-    return parsed.toString();
-  } catch {
-    return null;
-  }
-}
-
-async function isComputerUseEnabledTarget(httpUrl, apiKey) {
-  let statusUrl;
-  try {
-    statusUrl = new URL('/api/computer-use/status', httpUrl).toString();
-  } catch {
-    return false;
-  }
-
-  const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), TARGET_STATUS_TIMEOUT_MS);
-  try {
-    const response = await fetch(statusUrl, {
-      signal: controller.signal,
-      headers: apiKey ? { 'X-API-Key': apiKey } : undefined,
-    });
-    const body = await response.json().catch(() => null);
-    return response.ok && body?.success !== false && body?.data?.enabled === true;
-  } catch {
-    return false;
-  } finally {
-    clearTimeout(timeout);
-  }
-}
-
-async function filterEnabledComputerUseTargets(targets, apiKey) {
-  const checks = await Promise.all(targets.map(async (target) => ({
-    target,
-    enabled: await isComputerUseEnabledTarget(target, apiKey),
-  })));
-  return checks.filter((item) => item.enabled).map((item) => item.target);
-}
-
-/**
- * Keeps a Computer Use desktop agent connected to running cloud environments
- * while desktop access is enabled.
- */
-export class ComputerAgentController {
-  constructor({ appRoot, settingsPath, isPackaged = false, getRunningEnvironmentUrls, getApiKey, promptConsent, onChange }) {
-    this.appRoot = appRoot;
-    this.settingsPath = settingsPath;
-    this.isPackaged = isPackaged;
-    this.getRunningEnvironmentUrls = getRunningEnvironmentUrls;
-    this.getApiKey = getApiKey;
-    this.promptConsent = promptConsent;
-    this.onChange = onChange;
-    this.settings = { enabled: false, consentMode: 'ask' };
-    this.child = null;
-    this.connectedUrls = new Set();
-    this.currentTargets = [];
-    this.stdoutBuffer = '';
-    this.lastEvent = null;
-    this.lastError = null;
-  }
-
-  getSettings() {
-    return { ...this.settings };
-  }
-
-  getState() {
-    return {
-      enabled: this.settings.enabled,
-      consentMode: this.settings.consentMode,
-      running: Boolean(this.child),
-      connectedCount: this.connectedUrls.size,
-      targetCount: this.currentTargets.length,
-      targetUrls: [...this.currentTargets],
-      lastEvent: this.lastEvent,
-      lastError: this.lastError,
-    };
-  }
-
-  async loadSettings() {
-    try {
-      const raw = await fs.readFile(this.settingsPath, 'utf8');
-      const stored = JSON.parse(raw);
-      this.settings = {
-        enabled: Boolean(stored.enabled),
-        consentMode: stored.consentMode === 'auto' ? 'auto' : 'ask',
-      };
-    } catch {
-      this.settings = { enabled: false, consentMode: 'ask' };
-    }
-    return this.settings;
-  }
-
-  async saveSettings(next) {
-    this.settings = {
-      enabled: Boolean(next.enabled),
-      consentMode: next.consentMode === 'auto' ? 'auto' : 'ask',
-    };
-    await fs.mkdir(path.dirname(this.settingsPath), { recursive: true });
-    await fs.writeFile(this.settingsPath, JSON.stringify(this.settings, null, 2), 'utf8');
-    await this.sync();
-    this.onChange?.();
-    return this.settings;
-  }
-
-  async sync() {
-    const targets = this.settings.enabled ? (this.getRunningEnvironmentUrls?.() || []) : [];
-    const enabledTargets = this.settings.enabled ? await filterEnabledComputerUseTargets(targets, this.getApiKey?.() || '') : [];
-    const wsTargets = enabledTargets.map(toAgentWsUrl).filter(Boolean);
-
-    const sameTargets =
-      wsTargets.length === this.currentTargets.length &&
-      wsTargets.every((url) => this.currentTargets.includes(url));
-
-    if (!this.settings.enabled || wsTargets.length === 0) {
-      this.stop();
-      this.currentTargets = [];
-      this.lastEvent = this.settings.enabled ? 'no-targets' : 'disabled';
-      return;
-    }
-
-    if (this.child && sameTargets) {
-      return;
-    }
-
-    this.currentTargets = wsTargets;
-    this.lastEvent = 'restarting';
-    this.lastError = null;
-    this.restart(wsTargets);
-  }
-
-  restart(wsTargets) {
-    this.stop();
-
-    const agentEntry = process.env.CLOUDCLI_COMPUTER_AGENT_ENTRY
-      || path.join(this.appRoot, 'dist-server', 'server', 'computer-use-agent.js');
-    const runtime = getNodeRuntime(this.isPackaged);
-
-    this.child = spawn(runtime.command, [agentEntry], {
-      cwd: this.appRoot,
-      env: {
-        ...process.env,
-        ...runtime.env,
-        PATH: getDesktopPath(),
-        CLOUDCLI_DESKTOP_AGENT_URLS: wsTargets.join(','),
-        CLOUDCLI_DESKTOP_AGENT_API_KEY: this.getApiKey?.() || '',
-        CLOUDCLI_COMPUTER_USE_CONSENT_MODE: this.settings.consentMode,
-      },
-      stdio: ['pipe', 'pipe', 'pipe'],
-      windowsHide: true,
-    });
-
-    this.connectedUrls = new Set();
-
-    this.child.once('error', (error) => {
-      console.error('[ComputerAgent] failed to start:', error.message);
-      this.lastEvent = 'start-error';
-      this.lastError = error.message;
-      this.child = null;
-      this.onChange?.();
-    });
-
-    this.child.stdout?.on('data', (chunk) => this.handleStdout(String(chunk)));
-    this.child.stderr?.on('data', (chunk) => {
-      for (const line of String(chunk).split(/\r?\n/)) {
-        if (line.trim()) {
-          this.lastError = line.trim();
-          console.error('[ComputerAgent]', line);
-        }
-      }
-    });
-
-    this.child.once('exit', (code) => {
-      console.log(`[ComputerAgent] exited (code ${code ?? 'null'})`);
-      this.lastEvent = `exit:${code ?? 'null'}`;
-      this.child = null;
-      this.connectedUrls = new Set();
-      this.onChange?.();
-    });
-
-    this.onChange?.();
-  }
-
-  handleStdout(chunk) {
-    this.stdoutBuffer += chunk;
-    const lines = this.stdoutBuffer.split('\n');
-    this.stdoutBuffer = lines.pop() || '';
-    for (const line of lines) {
-      const trimmed = line.trim();
-      if (!trimmed.startsWith(IPC_PREFIX)) {
-        if (trimmed) console.log('[ComputerAgent]', trimmed);
-        continue;
-      }
-      let payload;
-      try {
-        payload = JSON.parse(trimmed.slice(IPC_PREFIX.length).trim());
-      } catch {
-        continue;
-      }
-      void this.handleAgentEvent(payload);
-    }
-  }
-
-  async handleAgentEvent(payload) {
-    switch (payload.type) {
-      case 'connected':
-        this.connectedUrls.add(payload.url);
-        this.lastEvent = 'connected';
-        this.lastError = null;
-        this.onChange?.();
-        break;
-      case 'disconnected':
-        this.connectedUrls.delete(payload.url);
-        this.lastEvent = 'disconnected';
-        this.onChange?.();
-        if (payload.reason && /computer use.*disabled/i.test(payload.reason)) {
-          void this.sync().catch((error) => {
-            this.lastError = error instanceof Error ? error.message : 'Failed to sync Computer Use targets.';
-            this.onChange?.();
-          });
-        }
-        break;
-      case 'starting':
-        this.lastEvent = 'starting';
-        this.lastError = null;
-        this.onChange?.();
-        break;
-      case 'error':
-        this.lastEvent = 'error';
-        this.lastError = payload.message || 'Computer agent error.';
-        this.onChange?.();
-        break;
-      case 'consent-request': {
-        const allow = await this.promptConsent?.(payload.sessionId);
-        this.sendToChild({ type: 'consent-response', sessionId: payload.sessionId, allow: Boolean(allow) });
-        break;
-      }
-      default:
-        break;
-    }
-  }
-
-  sendToChild(message) {
-    if (this.child?.stdin?.writable) {
-      this.child.stdin.write(`${IPC_PREFIX} ${JSON.stringify(message)}\n`);
-    }
-  }
-
-  revokeSession(sessionId) {
-    this.sendToChild({ type: 'revoke-session', sessionId });
-  }
-
-  stop() {
-    if (!this.child) return;
-    const child = this.child;
-    this.child = null;
-    this.connectedUrls = new Set();
-    try { child.kill('SIGTERM'); } catch { /* noop */ }
-  }
-}

package/scripts/build-computer-semantics.mjs

@@ -1,133 +0,0 @@
-#!/usr/bin/env node
-import { spawn } from 'node:child_process';
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const rootDir = path.resolve(__dirname, '..');
-const platform = process.env.CLOUDCLI_SEMANTICS_PLATFORM || process.platform;
-const arch = process.env.CLOUDCLI_SEMANTICS_ARCH || process.arch;
-const platformArch = `${platform}-${arch}`;
-const semanticsRoot = path.join(rootDir, 'server', 'modules', 'computer-use', 'semantics');
-const outDir = path.join(semanticsRoot, 'bin', platformArch);
-const requireBuild = process.env.CLOUDCLI_SEMANTICS_BUILD_REQUIRED === '1';
-
-function run(command, args, options = {}) {
-  return new Promise((resolve, reject) => {
-    const child = spawn(command, args, {
-      stdio: 'inherit',
-      shell: process.platform === 'win32',
-      ...options,
-    });
-    child.once('error', reject);
-    child.once('exit', (code) => {
-      if (code === 0) resolve();
-      else reject(new Error(`${command} ${args.join(' ')} exited with code ${code}`));
-    });
-  });
-}
-
-function commandExists(command) {
-  return new Promise((resolve) => {
-    const child = spawn(command, ['--version'], {
-      stdio: 'ignore',
-      shell: process.platform === 'win32',
-    });
-    child.once('error', () => resolve(false));
-    child.once('exit', (code) => resolve(code === 0));
-  });
-}
-
-async function pathExists(filePath) {
-  try {
-    await fs.access(filePath);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-async function isUpToDate(output, inputs) {
-  if (!(await pathExists(output))) {
-    return false;
-  }
-
-  const outputStat = await fs.stat(output);
-  for (const input of inputs) {
-    const inputStat = await fs.stat(input);
-    if (inputStat.mtimeMs > outputStat.mtimeMs) {
-      return false;
-    }
-  }
-  return true;
-}
-
-async function ensureCommand(command, helpText) {
-  if (await commandExists(command)) {
-    return true;
-  }
-
-  const message = `${command} was not found. ${helpText}`;
-  if (requireBuild) {
-    throw new Error(message);
-  }
-  console.log(`Skipping semantic helper build: ${message}`);
-  return false;
-}
-
-if (platform === 'darwin') {
-  const source = path.join(semanticsRoot, 'helpers', 'macos', 'CloudCLISemantics.swift');
-  const output = path.join(outDir, 'CloudCLISemantics');
-
-  if (!(await ensureCommand('swiftc', 'Install Xcode Command Line Tools to compile the macOS helper.'))) {
-    process.exit(0);
-  }
-  if (await isUpToDate(output, [source])) {
-    console.log(`Semantic helper is up to date: ${path.relative(rootDir, output)}`);
-    process.exit(0);
-  }
-
-  await fs.mkdir(outDir, { recursive: true });
-  await run('swiftc', [
-    source,
-    '-o',
-    output,
-    '-framework',
-    'AppKit',
-    '-framework',
-    'ApplicationServices',
-  ]);
-  await fs.chmod(output, 0o755);
-  console.log(`Built ${path.relative(rootDir, output)}`);
-} else if (platform === 'win32') {
-  const project = path.join(semanticsRoot, 'helpers', 'windows', 'CloudCLISemantics.csproj');
-  const source = path.join(semanticsRoot, 'helpers', 'windows', 'Program.cs');
-  const output = path.join(outDir, 'CloudCLISemantics.exe');
-
-  if (!(await ensureCommand('dotnet', '.NET SDK is required to compile the Windows helper.'))) {
-    process.exit(0);
-  }
-  if (await isUpToDate(output, [project, source])) {
-    console.log(`Semantic helper is up to date: ${path.relative(rootDir, output)}`);
-    process.exit(0);
-  }
-
-  await fs.mkdir(outDir, { recursive: true });
-  await run('dotnet', [
-    'publish',
-    project,
-    '-c',
-    'Release',
-    '-r',
-    arch === 'arm64' ? 'win-arm64' : 'win-x64',
-    '--self-contained',
-    'false',
-    '-p:PublishSingleFile=true',
-    '-o',
-    outDir,
-  ]);
-  console.log(`Built ${path.relative(rootDir, output)}`);
-} else {
-  console.log(`Semantic helper build is not supported for ${platform}-${arch}.`);
-}

package/scripts/copy-computer-semantics-bin.mjs

@@ -1,24 +0,0 @@
-#!/usr/bin/env node
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const rootDir = path.resolve(__dirname, '..');
-const sourceDir = path.join(rootDir, 'server', 'modules', 'computer-use', 'semantics', 'bin');
-const targetDir = path.join(rootDir, 'dist-server', 'server', 'modules', 'computer-use', 'semantics', 'bin');
-
-async function pathExists(filePath) {
-  try {
-    await fs.access(filePath);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-if (await pathExists(sourceDir)) {
-  await fs.mkdir(path.dirname(targetDir), { recursive: true });
-  await fs.cp(sourceDir, targetDir, { recursive: true });
-  console.log(`Copied Computer Use semantic helpers to ${path.relative(rootDir, targetDir)}`);
-}