oomi-ai 0.2.28 → 0.2.38

package/lib/personaRuntimeProcess.js

@@ -1,152 +1,409 @@
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import { spawn } from 'node:child_process';
-
-function resolveNpmCommand() {
-  return process.platform === 'win32' ? 'npm.cmd' : 'npm';
+import fs from 'node:fs';
+import path from 'node:path';
+import { spawn, spawnSync } from 'node:child_process';
+
+import { resolveOpenclawPersonasDir } from './openclawPaths.js';
+
+function resolveNpmCommand() {
+  return process.platform === 'win32' ? 'npm.cmd' : 'npm';
+}
+
+function ensureDir(dirPath) {
+  fs.mkdirSync(dirPath, { recursive: true });
+}
+
+function quoteWindowsCommandPart(value) {
+  const text = String(value);
+  if (!/[\s"]/u.test(text)) {
+    return text;
+  }
+  return `"${text.replace(/"/g, '""')}"`;
+}
+
+function buildWindowsCommandLine(command, args) {
+  const quotedCommand = quoteWindowsCommandPart(command);
+  const quotedArgs = args.map((value) => quoteWindowsCommandPart(value)).join(' ');
+  return `${quotedCommand}${quotedArgs ? ` ${quotedArgs}` : ''}`;
+}
+
+function normalizePositiveInteger(value) {
+  const parsed = Number(value);
+  if (!Number.isFinite(parsed) || parsed <= 0) {
+    return null;
+  }
+  return Math.floor(parsed);
 }
 
-function ensureDir(dirPath) {
-  fs.mkdirSync(dirPath, { recursive: true });
+function resolvePersonaBindHost() {
+  const value = String(process.env.OOMI_PERSONA_BIND_HOST || '').trim();
+  return value || '127.0.0.1';
 }
 
-function wait(ms) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, ms);
-  });
+function trimString(value) {
+  return typeof value === 'string' ? value.trim() : '';
 }
 
-function runProcess({ command, args, cwd }) {
-  return new Promise((resolve, reject) => {
-    const child = spawn(command, args, {
-      cwd,
-      stdio: 'inherit',
-      shell: false,
-      windowsHide: true,
-    });
-
-    child.on('error', reject);
-    child.on('exit', (code) => {
-      if (code === 0) {
-        resolve();
-        return;
+function readProcessCommandLine(pid) {
+  const safePid = normalizePositiveInteger(pid);
+  if (!safePid) {
+    return '';
+  }
+
+  if (process.platform === 'linux') {
+    const procPath = `/proc/${safePid}/cmdline`;
+    if (fs.existsSync(procPath)) {
+      try {
+        return fs.readFileSync(procPath).toString().replace(/\u0000/g, ' ').trim();
+      } catch {
+        return '';
       }
-      reject(new Error(`${command} ${args.join(' ')} failed with exit code ${code ?? 'unknown'}.`));
-    });
-  });
-}
+    }
+  }
 
-export async function installPersonaWorkspace({
-  workspacePath,
-}) {
-  if (!workspacePath) {
-    throw new Error('Workspace path is required.');
+  if (process.platform === 'win32') {
+    const result = spawnSync(
+      'powershell',
+      [
+        '-NoProfile',
+        '-Command',
+        `(Get-CimInstance Win32_Process -Filter "ProcessId = ${safePid}").CommandLine`,
+      ],
+      {
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'pipe'],
+      }
+    );
+    return trimString(result.stdout || '');
   }
 
-  await runProcess({
-    command: resolveNpmCommand(),
-    args: ['install'],
-    cwd: workspacePath,
+  const result = spawnSync('ps', ['-o', 'command=', '-p', String(safePid)], {
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'pipe'],
   });
+  return trimString(result.stdout || '');
 }
 
-export function startPersonaWorkspace({
-  workspacePath,
-  logFilePath,
-  env = {},
-}) {
-  if (!workspacePath) {
-    throw new Error('Workspace path is required.');
+export function matchesPersonaRuntimeCommand(commandLine, options = {}) {
+  const text = trimString(commandLine);
+  if (!text) {
+    return false;
   }
 
-  const resolvedLogFilePath =
-    logFilePath ||
-    path.join(workspacePath, '.oomi', 'runtime.log');
-  ensureDir(path.dirname(resolvedLogFilePath));
-
-  const output = fs.openSync(resolvedLogFilePath, 'a');
-  const child = spawn(resolveNpmCommand(), ['run', 'dev'], {
-    cwd: workspacePath,
-    detached: true,
-    stdio: ['ignore', output, output],
-    shell: false,
-    windowsHide: true,
-    env: {
-      ...process.env,
-      ...env,
-    },
-  });
-
-  child.unref();
-
-  return {
-    pid: child.pid,
-    logFilePath: resolvedLogFilePath,
-  };
-}
-
-async function fetchHealth(url) {
-  const response = await fetch(url, {
-    method: 'GET',
-    headers: {
-      Accept: 'application/json',
-    },
-  });
+  const workspacePath = trimString(options.workspacePath);
+  const command = trimString(options.expectedCommand?.command);
+  const args = Array.isArray(options.expectedCommand?.args) ? options.expectedCommand.args : [];
+  const firstArg = trimString(args[0]);
+  const localPort = normalizePositiveInteger(options.localPort);
 
-  if (!response.ok) {
-    throw new Error(`Healthcheck returned ${response.status}.`);
+  if (firstArg && !text.includes(firstArg)) {
+    return false;
   }
 
-  return response;
-}
+  if (workspacePath && !text.includes(workspacePath)) {
+    return false;
+  }
 
-export async function waitForPersonaRuntime({
-  healthcheckUrl,
-  timeoutMs = 45000,
-  intervalMs = 1000,
-}) {
-  if (!healthcheckUrl) {
-    throw new Error('Healthcheck URL is required.');
+  if (localPort) {
+    const strictPortArg = `--port ${localPort}`;
+    if (!text.includes(strictPortArg) && !text.includes(`:${localPort}`)) {
+      return false;
+    }
   }
 
-  const startedAt = Date.now();
-  let lastError = null;
-  while (Date.now() - startedAt <= timeoutMs) {
-    try {
-      await fetchHealth(healthcheckUrl);
-      return;
-    } catch (error) {
-      lastError = error;
-      await wait(intervalMs);
+  if (command) {
+    const commandBase = path.basename(command);
+    if (!text.includes(command) && !text.includes(commandBase)) {
+      return false;
     }
   }
 
-  const message =
-    lastError instanceof Error
-      ? lastError.message
-      : 'Timed out waiting for persona runtime healthcheck.';
-  throw new Error(`Timed out waiting for persona runtime healthcheck: ${message}`);
+  return true;
 }
 
-export function buildLocalPersonaRuntime({
-  localPort,
-  healthPath,
-}) {
-  const port = Number(localPort);
-  if (!Number.isFinite(port) || port <= 0) {
-    throw new Error('Local port is required.');
+function resolveDirectViteCommand({ workspacePath, localPort }) {
+  if (!workspacePath) {
+    return null;
+  }
+
+  const viteScriptPath = path.join(workspacePath, 'node_modules', 'vite', 'bin', 'vite.js');
+  if (!fs.existsSync(viteScriptPath)) {
+    return null;
+  }
+
+  const port = normalizePositiveInteger(localPort);
+  const args = [viteScriptPath, '--host', resolvePersonaBindHost()];
+  if (port) {
+    args.push('--port', String(port), '--strictPort');
   }
+
+  return {
+    command: process.execPath,
+    args,
+  };
+}
+
+function wait(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+
+function runProcess({ command, args, cwd }) {
+  return new Promise((resolve, reject) => {
+    const child =
+      process.platform === 'win32'
+        ? spawn(process.env.ComSpec || 'cmd.exe', ['/d', '/s', '/c', buildWindowsCommandLine(command, args)], {
+            cwd,
+            stdio: 'inherit',
+            shell: false,
+            windowsHide: true,
+          })
+        : spawn(command, args, {
+            cwd,
+            stdio: 'inherit',
+            shell: false,
+            windowsHide: true,
+          });
+
+    child.on('error', reject);
+    child.on('exit', (code) => {
+      if (code === 0) {
+        resolve();
+        return;
+      }
+      reject(new Error(`${command} ${args.join(' ')} failed with exit code ${code ?? 'unknown'}.`));
+    });
+  });
+}
+
+export async function installPersonaWorkspace({
+  workspacePath,
+}) {
+  if (!workspacePath) {
+    throw new Error('Workspace path is required.');
+  }
+
+  await runProcess({
+    command: resolveNpmCommand(),
+    args: ['install', '--silent', '--no-fund', '--no-audit'],
+    cwd: workspacePath,
+  });
+}
+
+export function resolvePersonaDevCommand({
+  workspacePath,
+  localPort,
+}) {
+  const directCommand = resolveDirectViteCommand({ workspacePath, localPort });
+  if (directCommand) {
+    return directCommand;
+  }
 
-  const endpoint = `http://127.0.0.1:${port}`;
+  const port = normalizePositiveInteger(localPort);
+  const args = ['run', 'dev'];
+  if (port) {
+    args.push('--', '--host', resolvePersonaBindHost(), '--port', String(port), '--strictPort');
+  }
   return {
-    transport: 'local',
-    endpoint,
-    localPort: port,
-    healthcheckUrl: `${endpoint}${healthPath}`,
-  };
-}
+    command: resolveNpmCommand(),
+    args,
+  };
+}
+
+export function startPersonaWorkspace({
+  workspacePath,
+  logFilePath,
+  env = {},
+  localPort,
+}) {
+  if (!workspacePath) {
+    throw new Error('Workspace path is required.');
+  }
+
+  const resolvedLogFilePath =
+    logFilePath ||
+    path.join(workspacePath, '.oomi', 'runtime.log');
+  ensureDir(path.dirname(resolvedLogFilePath));
+
+  const output = fs.openSync(resolvedLogFilePath, 'a');
+  const devCommand = resolvePersonaDevCommand({ workspacePath, localPort });
+  const needsWindowsShellWrapper =
+    process.platform === 'win32' && /\.cmd$/iu.test(path.basename(devCommand.command));
+
+  if (needsWindowsShellWrapper) {
+    fs.closeSync(output);
+    const shellCommand = `${buildWindowsCommandLine(
+      devCommand.command,
+      devCommand.args
+    )} >> "${resolvedLogFilePath.replace(/"/g, '""')}" 2>&1`;
+    const child = spawn(process.env.ComSpec || 'cmd.exe', ['/d', '/s', '/c', shellCommand], {
+      cwd: workspacePath,
+      detached: true,
+      stdio: 'ignore',
+      shell: false,
+      windowsHide: true,
+      env: {
+        ...process.env,
+        ...env,
+      },
+    });
+
+    child.unref();
+
+    const pid = normalizePositiveInteger(child.pid);
+    if (!pid) {
+      throw new Error('Failed to determine persona workspace process id on Windows.');
+    }
+
+    return {
+      pid,
+      logFilePath: resolvedLogFilePath,
+    };
+  }
+
+  let child;
+  try {
+    child = spawn(devCommand.command, devCommand.args, {
+      cwd: workspacePath,
+      detached: true,
+      stdio: ['ignore', output, output],
+      shell: false,
+      windowsHide: true,
+      env: {
+        ...process.env,
+        ...env,
+      },
+    });
+  } finally {
+    fs.closeSync(output);
+  }
+
+  child.unref();
+
+  return {
+    pid: child.pid,
+    logFilePath: resolvedLogFilePath,
+  };
+}
+
+export function isPersonaWorkspaceProcessRunning(pid, options = {}) {
+  const safePid = normalizePositiveInteger(pid);
+  if (!safePid) {
+    return false;
+  }
 
-export function defaultPersonaWorkspaceRoot() {
-  return path.join(os.homedir(), '.openclaw', 'personas');
+  try {
+    process.kill(safePid, 0);
+    const hasExpectations =
+      trimString(options.workspacePath) ||
+      trimString(options.expectedCommand?.command) ||
+      normalizePositiveInteger(options.localPort);
+    if (!hasExpectations) {
+      return true;
+    }
+
+    const commandLine = readProcessCommandLine(safePid);
+    return matchesPersonaRuntimeCommand(commandLine, options);
+
+    return true;
+  } catch {
+    return false;
+  }
 }
+
+export async function stopPersonaWorkspace({
+  pid,
+  waitMs = 4000,
+}) {
+  const safePid = normalizePositiveInteger(pid);
+  if (!safePid || !isPersonaWorkspaceProcessRunning(safePid)) {
+    return false;
+  }
+
+  try {
+    process.kill(safePid, 'SIGTERM');
+  } catch {
+    return false;
+  }
+
+  const startedAt = Date.now();
+  while (Date.now() - startedAt <= waitMs) {
+    if (!isPersonaWorkspaceProcessRunning(safePid)) {
+      return true;
+    }
+    await wait(200);
+  }
+
+  try {
+    process.kill(safePid, 'SIGKILL');
+  } catch {
+    return !isPersonaWorkspaceProcessRunning(safePid);
+  }
+
+  return !isPersonaWorkspaceProcessRunning(safePid);
+}
+
+async function fetchHealth(url) {
+  const response = await fetch(url, {
+    method: 'GET',
+    headers: {
+      Accept: 'application/json',
+    },
+  });
+
+  if (!response.ok) {
+    throw new Error(`Healthcheck returned ${response.status}.`);
+  }
+
+  return response;
+}
+
+export async function waitForPersonaRuntime({
+  healthcheckUrl,
+  timeoutMs = 45000,
+  intervalMs = 1000,
+}) {
+  if (!healthcheckUrl) {
+    throw new Error('Healthcheck URL is required.');
+  }
+
+  const startedAt = Date.now();
+  let lastError = null;
+  while (Date.now() - startedAt <= timeoutMs) {
+    try {
+      await fetchHealth(healthcheckUrl);
+      return;
+    } catch (error) {
+      lastError = error;
+      await wait(intervalMs);
+    }
+  }
+
+  const message =
+    lastError instanceof Error
+      ? lastError.message
+      : 'Timed out waiting for persona runtime healthcheck.';
+  throw new Error(`Timed out waiting for persona runtime healthcheck: ${message}`);
+}
+
+export function buildLocalPersonaRuntime({
+  localPort,
+  healthPath,
+}) {
+  const port = Number(localPort);
+  if (!Number.isFinite(port) || port <= 0) {
+    throw new Error('Local port is required.');
+  }
+
+  const endpoint = `http://127.0.0.1:${port}`;
+  return {
+    transport: 'local',
+    endpoint,
+    localPort: port,
+    healthcheckUrl: `${endpoint}${healthPath}`,
+  };
+}
+
+export function defaultPersonaWorkspaceRoot() {
+  return resolveOpenclawPersonasDir();
+}

package/lib/personaRuntimeRegistry.js

@@ -0,0 +1,67 @@
+import fs from 'node:fs';
+import path from 'node:path';
+
+function ensureDir(dirPath) {
+  fs.mkdirSync(dirPath, { recursive: true });
+}
+
+function readJsonSafe(filePath) {
+  if (!fs.existsSync(filePath)) {
+    return null;
+  }
+
+  try {
+    return JSON.parse(fs.readFileSync(filePath, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+function trimString(value) {
+  return typeof value === 'string' ? value.trim() : '';
+}
+
+export function resolvePersonaWorkspacePath({ workspaceRoot, slug }) {
+  const safeRoot = trimString(workspaceRoot);
+  const safeSlug = trimString(slug);
+  if (!safeRoot) {
+    throw new Error('Workspace root is required.');
+  }
+  if (!safeSlug) {
+    throw new Error('Persona slug is required.');
+  }
+
+  return path.resolve(safeRoot, safeSlug);
+}
+
+export function resolvePersonaRuntimeDir(workspacePath) {
+  return path.join(workspacePath, '.oomi');
+}
+
+export function resolvePersonaRuntimeStatePath(workspacePath) {
+  return path.join(resolvePersonaRuntimeDir(workspacePath), 'runtime.json');
+}
+
+export function resolvePersonaRuntimeLogPath(workspacePath) {
+  return path.join(resolvePersonaRuntimeDir(workspacePath), 'runtime.log');
+}
+
+export function readPersonaRuntimeState(workspacePath) {
+  return readJsonSafe(resolvePersonaRuntimeStatePath(workspacePath)) || {};
+}
+
+export function writePersonaRuntimeState(workspacePath, state) {
+  const runtimeDir = resolvePersonaRuntimeDir(workspacePath);
+  const statePath = resolvePersonaRuntimeStatePath(workspacePath);
+  ensureDir(runtimeDir);
+  fs.writeFileSync(statePath, JSON.stringify(state, null, 2) + '\n', 'utf8');
+  return state;
+}
+
+export function updatePersonaRuntimeState(workspacePath, partial) {
+  const current = readPersonaRuntimeState(workspacePath);
+  return writePersonaRuntimeState(workspacePath, {
+    ...current,
+    ...partial,
+  });
+}