@web-auto/webauto 0.1.13 → 0.1.14

package/modules/camo-runtime/src/autoscript/action-providers/xhs.mjs

@@ -25,6 +25,39 @@ import { buildOpenDetailScript, buildSubmitSearchScript } from './xhs/search.mjs
 
 const XHS_OPERATION_LOCKS = new Map();
 
+function emitOperationProgress(context, payload = {}) {
+  const emit = context?.emitProgress;
+  if (typeof emit !== 'function') return;
+  emit(payload);
+}
+
+function emitActionTrace(context, actionTrace = [], extra = {}) {
+  if (!Array.isArray(actionTrace) || actionTrace.length === 0) return;
+  for (let i = 0; i < actionTrace.length; i += 1) {
+    const row = actionTrace[i];
+    if (!row || typeof row !== 'object') continue;
+    const kind = String(row.kind || row.action || '').trim().toLowerCase() || 'trace';
+    emitOperationProgress(context, {
+      kind,
+      step: i + 1,
+      ...extra,
+      ...row,
+    });
+  }
+}
+
+function replaceEvaluateResultData(rawData, payload) {
+  if (rawData && typeof rawData === 'object') {
+    if (Object.prototype.hasOwnProperty.call(rawData, 'result')) {
+      return { ...rawData, result: payload };
+    }
+    if (rawData.data && typeof rawData.data === 'object' && Object.prototype.hasOwnProperty.call(rawData.data, 'result')) {
+      return { ...rawData, data: { ...rawData.data, result: payload } };
+    }
+  }
+  return payload;
+}
+
 function toLockKey(text, fallback = '') {
   const value = String(text || '').trim();
   return value || fallback;
@@ -104,19 +137,40 @@ async function saveSharedClaimDoc(filePath, doc) {
   await fsp.writeFile(filePath, `${JSON.stringify(payload, null, 2)}\n`, 'utf8');
 }
 
-async function executeSubmitSearchOperation({ profileId, params = {} }) {
+async function executeSubmitSearchOperation({
+  profileId,
+  params = {},
+  context = {},
+}) {
   const script = buildSubmitSearchScript(params);
   const highlight = params.highlight !== false;
   const lockKey = resolveSearchLockKey(params);
-  return withSerializedLock(lockKey ? `xhs_submit_search:${lockKey}` : '', () => evaluateWithScript({
-    profileId,
-    script,
-    message: 'xhs_submit_search done',
-    highlight,
-  }));
+  return withSerializedLock(lockKey ? `xhs_submit_search:${lockKey}` : '', async () => {
+    const operationResult = await evaluateWithScript({
+      profileId,
+      script,
+      message: 'xhs_submit_search done',
+      highlight,
+    });
+    const payload = extractEvaluateResultData(operationResult.data) || {};
+    const actionTrace = Array.isArray(payload.actionTrace) ? payload.actionTrace : [];
+    if (actionTrace.length > 0) {
+      emitActionTrace(context, actionTrace, { stage: 'xhs_submit_search' });
+      delete payload.actionTrace;
+      return {
+        ...operationResult,
+        data: replaceEvaluateResultData(operationResult.data, payload),
+      };
+    }
+    return operationResult;
+  });
 }
 
-async function executeOpenDetailOperation({ profileId, params = {} }) {
+async function executeOpenDetailOperation({
+  profileId,
+  params = {},
+  context = {},
+}) {
   const highlight = params.highlight !== false;
   const claimPath = resolveSharedClaimPath(params);
   const lockKey = claimPath ? `xhs_open_detail:${claimPath}` : '';
@@ -156,8 +210,15 @@ async function executeOpenDetailOperation({ profileId, params = {} }) {
       highlight,
     });
     const payload = extractEvaluateResultData(operationResult.data) || {};
+    const actionTrace = Array.isArray(payload.actionTrace) ? payload.actionTrace : [];
+    if (actionTrace.length > 0) {
+      emitActionTrace(context, actionTrace, { stage: 'xhs_open_detail' });
+      delete payload.actionTrace;
+    }
     return {
-      operationResult,
+      operationResult: actionTrace.length > 0
+        ? { ...operationResult, data: replaceEvaluateResultData(operationResult.data, payload) }
+        : operationResult,
       payload: payload && typeof payload === 'object' ? payload : {},
     };
   };
@@ -361,7 +422,11 @@ async function handleRaiseError({ params }) {
   return asErrorPayload('OPERATION_FAILED', code || 'AUTOSCRIPT_ABORT');
 }
 
-async function executeCommentsHarvestOperation({ profileId, params = {} }) {
+async function executeCommentsHarvestOperation({
+  profileId,
+  params = {},
+  context = {},
+}) {
   const script = buildCommentsHarvestScript(params);
   const highlight = params.highlight !== false;
   const operationResult = await evaluateWithScript({
@@ -372,6 +437,11 @@ async function executeCommentsHarvestOperation({ profileId, params = {} }) {
   });
 
   const payload = extractEvaluateResultData(operationResult.data) || {};
+  const actionTrace = Array.isArray(payload.actionTrace) ? payload.actionTrace : [];
+  if (actionTrace.length > 0) {
+    emitActionTrace(context, actionTrace, { stage: 'xhs_comments_harvest' });
+    delete payload.actionTrace;
+  }
   const shouldPersistComments = params.persistComments === true || params.persistCollectedComments === true;
   const includeComments = params.includeComments !== false;
   const comments = Array.isArray(payload.comments) ? payload.comments : [];
@@ -379,12 +449,12 @@ async function executeCommentsHarvestOperation({ profileId, params = {} }) {
   if (!shouldPersistComments || !includeComments || comments.length === 0) {
     return {
       ...operationResult,
-      data: {
+      data: replaceEvaluateResultData(operationResult.data, {
         ...payload,
         commentsPath: null,
         commentsAdded: 0,
         commentsTotal: Number(payload.collected || comments.length || 0),
-      },
+      }),
     };
   }
 
@@ -434,10 +504,16 @@ export function isXhsAutoscriptAction(action) {
   return normalized === 'raise_error' || normalized.startsWith('xhs_');
 }
 
-export async function executeXhsAutoscriptOperation({ profileId, action, params = {} }) {
+export async function executeXhsAutoscriptOperation({
+  profileId,
+  action,
+  params = {},
+  operation = null,
+  context = {},
+}) {
   const handler = XHS_ACTION_HANDLERS[action];
   if (!handler) {
     return asErrorPayload('UNSUPPORTED_OPERATION', `Unsupported xhs operation: ${action}`);
   }
-  return handler({ profileId, params });
+  return handler({ profileId, params, operation, context });
 }

package/modules/camo-runtime/src/autoscript/runtime.mjs

@@ -640,6 +640,20 @@ export class AutoscriptRunner {
         attempt,
         maxAttempts,
         runtime: this.runtimeContext,
+        emitProgress: (payload = {}) => {
+          const detail = payload && typeof payload === 'object'
+            ? { ...payload }
+            : { value: payload };
+          const kind = String(detail.kind || '').trim() || 'trace';
+          if (Object.prototype.hasOwnProperty.call(detail, 'kind')) delete detail.kind;
+          this.log('autoscript:operation_progress', {
+            operationId: operation.id,
+            action: operation.action,
+            attempt,
+            kind,
+            ...detail,
+          });
+        },
       };
 
       await this.applyPacingBeforeAttempt(operation, attempt);

package/modules/camo-runtime/src/utils/browser-service.mjs

@@ -1,10 +1,59 @@
 #!/usr/bin/env node
-import { execSync } from 'node:child_process';
+import { execSync, spawnSync } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
 import { BROWSER_SERVICE_URL, loadConfig, setRepoRoot } from './config.mjs';
 
+const requireFromHere = createRequire(import.meta.url);
+const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
+
+function resolveNodeBin() {
+  const explicit = String(process.env.WEBAUTO_NODE_BIN || '').trim();
+  if (explicit) return explicit;
+  const npmNode = String(process.env.npm_node_execpath || '').trim();
+  if (npmNode) return npmNode;
+  return process.execPath;
+}
+
+function resolveCamoCliEntry() {
+  try {
+    const resolved = requireFromHere.resolve('@web-auto/camo/bin/camo.mjs');
+    if (resolved && fs.existsSync(resolved)) return resolved;
+  } catch {
+    return null;
+  }
+  return null;
+}
+
+function runCamoCli(args = [], options = {}) {
+  const entry = resolveCamoCliEntry();
+  if (!entry) {
+    return {
+      ok: false,
+      code: null,
+      stdout: '',
+      stderr: '@web-auto/camo/bin/camo.mjs not found',
+      entry: null,
+    };
+  }
+  const ret = spawnSync(resolveNodeBin(), [entry, ...args], {
+    encoding: 'utf8',
+    windowsHide: true,
+    stdio: options.stdio || 'pipe',
+    env: { ...process.env, ...(options.env || {}) },
+  });
+  return {
+    ok: ret.status === 0,
+    code: ret.status,
+    stdout: String(ret.stdout || ''),
+    stderr: String(ret.stderr || ''),
+    entry,
+  };
+}
+
 export async function callAPI(action, payload = {}) {
   const r = await fetch(`${BROWSER_SERVICE_URL}/command`, {
     method: 'POST',
@@ -320,20 +369,13 @@ function scanCommonRepoRoots() {
 
 export function findRepoRootCandidate() {
   const cfg = loadConfig();
+  const cwdRoot = walkUpForRepoRoot(process.cwd());
+  const moduleRoot = walkUpForRepoRoot(MODULE_DIR);
   const candidates = [
     process.env.WEBAUTO_REPO_ROOT,
-    process.cwd(),
     cfg.repoRoot,
-    path.join('/Volumes', 'extension', 'code', 'webauto'),
-    path.join('/Volumes', 'extension', 'code', 'WebAuto'),
-    path.join(os.homedir(), 'Documents', 'github', 'webauto'),
-    path.join(os.homedir(), 'Documents', 'github', 'WebAuto'),
-    path.join(os.homedir(), 'github', 'webauto'),
-    path.join(os.homedir(), 'github', 'WebAuto'),
-    path.join('C:', 'code', 'webauto'),
-    path.join('C:', 'code', 'WebAuto'),
-    path.join('C:', 'Users', os.userInfo().username, 'code', 'webauto'),
-    path.join('C:', 'Users', os.userInfo().username, 'code', 'WebAuto'),
+    moduleRoot,
+    cwdRoot,
   ].filter(Boolean);
 
   for (const root of candidates) {
@@ -345,22 +387,6 @@ export function findRepoRootCandidate() {
     return resolved;
   }
 
-  const walked = walkUpForRepoRoot(process.cwd());
-  if (walked) {
-    if (cfg.repoRoot !== walked) {
-      setRepoRoot(walked);
-    }
-    return walked;
-  }
-
-  const scanned = scanCommonRepoRoots();
-  if (scanned) {
-    if (cfg.repoRoot !== scanned) {
-      setRepoRoot(scanned);
-    }
-    return scanned;
-  }
-
   return null;
 }
 
@@ -384,12 +410,7 @@ export function detectCamoufoxPath() {
 
 export function ensureCamoufox() {
   if (detectCamoufoxPath()) return;
-  console.log('Camoufox is not found. Installing...');
-  execSync('npx --yes --package=camoufox camoufox fetch', { stdio: 'inherit' });
-  if (!detectCamoufoxPath()) {
-    throw new Error('Camoufox install finished but executable was not detected');
-  }
-  console.log('Camoufox installed.');
+  throw new Error('Camoufox is not installed. Run: webauto xhs install --download-browser');
 }
 
 export async function ensureBrowserService() {
@@ -405,19 +426,20 @@ export async function ensureBrowserService() {
 
   if (provider === 'camo') {
     const repoRoot = findRepoRootCandidate();
-    if (repoRoot) {
-      try {
-        execSync(`npx --yes @web-auto/camo config repo-root ${JSON.stringify(repoRoot)}`, { stdio: 'ignore' });
-      } catch {
-        // best-effort only; init will still try using current config
-      }
+    if (!repoRoot) {
+      throw new Error('WEBAUTO_REPO_ROOT is not set and no valid repo root was found');
+    }
+    const configRet = runCamoCli(['config', 'repo-root', repoRoot], { stdio: 'pipe' });
+    if (!configRet.ok) {
+      throw new Error(
+        `camo config repo-root failed: ${configRet.stderr.trim() || configRet.stdout.trim() || `exit ${configRet.code ?? 'null'}`}`,
+      );
     }
 
-    try {
-      console.log('Starting browser backend via camo init...');
-      execSync('npx --yes @web-auto/camo init', { stdio: 'inherit' });
-    } catch (error) {
-      throw new Error(`camo init failed: ${error?.message || String(error)}`);
+    console.log('Starting browser backend via camo init...');
+    const initRet = runCamoCli(['init'], { stdio: 'inherit' });
+    if (!initRet.ok) {
+      throw new Error(`camo init failed: ${initRet.stderr.trim() || initRet.stdout.trim() || `exit ${initRet.code ?? 'null'}`}`);
     }
 
     for (let i = 0; i < 20; i += 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web-auto/webauto",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "type": "module",
   "bin": {
     "webauto": "bin/webauto.mjs"
@@ -14,6 +14,7 @@
     "services/",
     "apps/desktop-console/dist/",
     "apps/desktop-console/default-settings.json",
+    "apps/desktop-console/package.json",
     "apps/desktop-console/entry/ui-console.mjs",
     "apps/desktop-console/entry/ui-cli.mjs",
     "apps/webauto/",
@@ -60,9 +61,9 @@
     "check:modules": "echo \"Module checks skipped\"",
     "check:ts": "tsc --noEmit -p tsconfig.services.json",
     "test:modules:unit": "npx tsx --test $(find modules -name \"*.test.ts\" -o -name \"*.test.mts\" 2>/dev/null | tr \"\\n\" \" \")",
-    "test:desktop-console:unit": "tsx --test apps/desktop-console/src/main/profile-store.test.mts apps/desktop-console/src/main/index-streaming.test.mts apps/desktop-console/src/main/ui-cli-bridge.test.mts apps/desktop-console/src/main/task-gateway.test.mts apps/desktop-console/src/main/heartbeat-watchdog.test.mts apps/desktop-console/src/main/core-daemon-manager.test.mts apps/desktop-console/src/main/desktop-settings.test.mts apps/desktop-console/src/main/env-check.test.mts",
+    "test:desktop-console:unit": "tsx --test apps/desktop-console/src/main/profile-store.test.mts apps/desktop-console/src/main/index-streaming.test.mts apps/desktop-console/src/main/ui-cli-bridge.test.mts apps/desktop-console/src/main/task-gateway.test.mts apps/desktop-console/src/main/heartbeat-watchdog.test.mts apps/desktop-console/src/main/core-daemon-manager.test.mts apps/desktop-console/src/main/desktop-settings.test.mts apps/desktop-console/src/main/env-check.test.mts apps/desktop-console/src/main/state-bridge.test.mts",
     "test:desktop-console:renderer": "npm --prefix apps/desktop-console run test:renderer",
-    "test:desktop-console:coverage": "c8 --reporter=text --reporter=lcov --all --src apps/desktop-console/src/main --extension .mts --extension .mjs --extension .ts --exclude \"**/*.test.*\" --check-coverage --lines 75 --functions 75 --branches 55 --statements 75 --include \"apps/desktop-console/src/main/profile-store.mts\" --include \"apps/desktop-console/src/main/ui-cli-bridge.mts\" --include \"apps/desktop-console/src/main/task-gateway.mts\" --include \"apps/desktop-console/src/main/heartbeat-watchdog.mts\" --include \"apps/desktop-console/src/main/core-daemon-manager.mts\" --include \"apps/desktop-console/src/main/desktop-settings.mts\" --include \"apps/desktop-console/src/main/env-check.mts\" tsx --test apps/desktop-console/src/main/profile-store.test.mts apps/desktop-console/src/main/index-streaming.test.mts apps/desktop-console/src/main/ui-cli-bridge.test.mts apps/desktop-console/src/main/task-gateway.test.mts apps/desktop-console/src/main/heartbeat-watchdog.test.mts apps/desktop-console/src/main/core-daemon-manager.test.mts apps/desktop-console/src/main/desktop-settings.test.mts apps/desktop-console/src/main/env-check.test.mts",
+    "test:desktop-console:coverage": "c8 --reporter=text --reporter=lcov --all --src apps/desktop-console/src/main --extension .mts --extension .mjs --extension .ts --exclude \"**/*.test.*\" --check-coverage --lines 75 --functions 75 --branches 55 --statements 75 --include \"apps/desktop-console/src/main/profile-store.mts\" --include \"apps/desktop-console/src/main/ui-cli-bridge.mts\" --include \"apps/desktop-console/src/main/task-gateway.mts\" --include \"apps/desktop-console/src/main/heartbeat-watchdog.mts\" --include \"apps/desktop-console/src/main/core-daemon-manager.mts\" --include \"apps/desktop-console/src/main/desktop-settings.mts\" --include \"apps/desktop-console/src/main/env-check.mts\" --include \"apps/desktop-console/src/main/state-bridge.mts\" tsx --test apps/desktop-console/src/main/profile-store.test.mts apps/desktop-console/src/main/index-streaming.test.mts apps/desktop-console/src/main/ui-cli-bridge.test.mts apps/desktop-console/src/main/task-gateway.test.mts apps/desktop-console/src/main/heartbeat-watchdog.test.mts apps/desktop-console/src/main/core-daemon-manager.test.mts apps/desktop-console/src/main/desktop-settings.test.mts apps/desktop-console/src/main/env-check.test.mts",
     "test:webauto:schedule:unit": "node --test tests/unit/webauto/schedule-store.test.mjs tests/unit/webauto/schedule-cli.test.mjs",
     "test:webauto:ui-cli:unit": "node --test tests/unit/webauto/ui-cli-command.test.mjs",
     "test:webauto:install:unit": "node --test tests/unit/webauto/xhs-install.test.mjs",