@web-auto/camo 0.1.14 → 0.1.16

package/README.md

@@ -302,7 +302,6 @@ camo container list [profileId]
 ### Autoscript
 
 ```bash
-camo autoscript scaffold xhs-unified [--output <file>] [options]
 camo autoscript validate <file>
 camo autoscript explain <file>
 camo autoscript snapshot <jsonl-file> [--out <snapshot-file>]
@@ -375,55 +374,38 @@ camo container watch xiaohongshu-batch-1 --throttle 500
 ### Autoscript Mode (Subscription + Operations)
 
 ```bash
-# Generate xiaohongshu unified-harvest migration script from webauto phase-unified-harvest
-camo autoscript scaffold xhs-unified \
-  --output ./autoscripts/xiaohongshu/unified-harvest.autoscript.json \
-  --profile xiaohongshu-batch-1 \
-  --keyword "手机膜" \
-  --tab-count 4 \
-  --note-interval 900 \
-  --do-comments \
-  --do-likes \
-  --max-notes 30
-
 # Validate + explain + run
-camo autoscript validate ./autoscripts/xiaohongshu/unified-harvest.autoscript.json
-camo autoscript explain ./autoscripts/xiaohongshu/unified-harvest.autoscript.json
-camo autoscript run ./autoscripts/xiaohongshu/unified-harvest.autoscript.json \
-  --profile xiaohongshu-batch-1 \
-  --jsonl-file ./runs/xhs-unified/run.jsonl \
-  --summary-file ./runs/xhs-unified/run.summary.json
+camo autoscript validate ./autoscripts/my-flow.autoscript.json
+camo autoscript explain ./autoscripts/my-flow.autoscript.json
+camo autoscript run ./autoscripts/my-flow.autoscript.json \
+  --profile my-profile \
+  --jsonl-file ./runs/my-flow/run.jsonl \
+  --summary-file ./runs/my-flow/run.summary.json
 
 # Build snapshot + replay summary from existing JSONL
-camo autoscript snapshot ./runs/xhs-unified/run.jsonl \
-  --out ./runs/xhs-unified/run.snapshot.json
-camo autoscript replay ./runs/xhs-unified/run.jsonl \
-  --summary-file ./runs/xhs-unified/replay.summary.json
+camo autoscript snapshot ./runs/my-flow/run.jsonl \
+  --out ./runs/my-flow/run.snapshot.json
+camo autoscript replay ./runs/my-flow/run.jsonl \
+  --summary-file ./runs/my-flow/replay.summary.json
 
 # Resume from a snapshot (optionally force rerun from a node)
-camo autoscript resume ./autoscripts/xiaohongshu/unified-harvest.autoscript.json \
-  --snapshot ./runs/xhs-unified/run.snapshot.json \
-  --from-node comments_harvest \
-  --profile xiaohongshu-batch-1
+camo autoscript resume ./autoscripts/my-flow.autoscript.json \
+  --snapshot ./runs/my-flow/run.snapshot.json \
+  --from-node some_operation \
+  --profile my-profile
 
 # Mock replay mode for deterministic local debugging
-camo autoscript mock-run ./autoscripts/xiaohongshu/unified-harvest.autoscript.json \
-  --fixture ./autoscripts/xiaohongshu/fixtures/mock-run.json \
-  --summary-file ./runs/xhs-unified/mock.summary.json
+camo autoscript mock-run ./autoscripts/my-flow.autoscript.json \
+  --fixture ./autoscripts/fixtures/mock-run.json \
+  --summary-file ./runs/my-flow/mock.summary.json
 ```
 
-The xhs-unified scaffold includes anti-risk defaults:
-- operation pacing (`operationMinIntervalMs`, `eventCooldownMs`, `jitterMs`)
-- navigation/tab switch cooldown (`navigationMinIntervalMs`)
-- per-operation timeout budget (`timeoutMs`)
-- multi-tab rotation (`ensure_tab_pool`, `tab_pool_switch_next`)
-
 Example script:
 
 ```json
 {
-  "name": "xhs-login-flow",
-  "profileId": "xiaohongshu-batch-1",
+  "name": "generic-login-flow",
+  "profileId": "my-profile",
   "throttle": 500,
   "subscriptions": [
     { "id": "login_input", "selector": "#login-input" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web-auto/camo",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Camoufox Browser CLI - Cross-platform browser automation",
   "type": "module",
   "bin": {

package/src/autoscript/action-providers/index.mjs

@@ -1,9 +1,6 @@
-import { executeXhsAutoscriptOperation, isXhsAutoscriptAction } from './xhs.mjs';
-
 export async function executeAutoscriptAction({ profileId, action, params = {} }) {
-  if (isXhsAutoscriptAction(action)) {
-    return executeXhsAutoscriptOperation({ profileId, action, params });
-  }
+  void profileId;
+  void action;
+  void params;
   return null;
 }
-

package/src/autoscript/runtime.mjs

@@ -339,15 +339,6 @@ export class AutoscriptRunner {
       'tab_pool_switch_slot',
       'sync_window_viewport',
       'verify_subscriptions',
-      'xhs_submit_search',
-      'xhs_open_detail',
-      'xhs_detail_harvest',
-      'xhs_expand_replies',
-      'xhs_comments_harvest',
-      'xhs_comment_match',
-      'xhs_comment_like',
-      'xhs_comment_reply',
-      'xhs_close_detail',
     ].includes(action)) {
       return 45_000;
     }
@@ -363,6 +354,14 @@ export class AutoscriptRunner {
     return this.getDefaultTimeoutMs(operation);
   }
 
+  resolvePlatform(operation) {
+    const candidate = operation?.params?.platform
+      ?? operation?.platform
+      ?? this.script?.defaults?.platform
+      ?? 'generic';
+    return String(candidate || 'generic').trim().toLowerCase() || 'generic';
+  }
+
   buildTriggerKey(operation, event) {
     const trigger = operation?.trigger || { type: 'startup' };
     if (trigger.type === 'startup') return 'startup';
@@ -477,13 +476,14 @@ export class AutoscriptRunner {
         data: { phase },
       };
     }
+    const platform = this.resolvePlatform(operation);
     const validation = operation.validation || {};
     return validateOperation({
       profileId: this.profileId,
       validationSpec: validation,
       phase,
       context,
-      platform: 'xiaohongshu',
+      platform,
     });
   }
 
@@ -567,11 +567,12 @@ export class AutoscriptRunner {
       return { ok: false, code: 'RECOVERY_NOT_CONFIGURED', message: 'recovery not configured' };
     }
 
+    const platform = this.resolvePlatform(operation);
     const checkpointDoc = await captureCheckpoint({
       profileId: this.profileId,
       containerId: checkpoint.containerId || null,
       selector: operation.params?.selector || null,
-      platform: 'xiaohongshu',
+      platform,
     });
     const baseCheckpoint = checkpointDoc?.data || {};
 
@@ -585,7 +586,7 @@ export class AutoscriptRunner {
           containerId: checkpoint.containerId || null,
           selector: operation.params?.selector || null,
           targetCheckpoint: checkpoint.targetCheckpoint || null,
-          platform: 'xiaohongshu',
+          platform,
         });
         this.log('autoscript:recovery_action', {
           operationId: operation.id,
@@ -969,6 +970,7 @@ export class AutoscriptRunner {
         profileId: this.profileId,
         subscriptions: this.script.subscriptions,
         throttle: this.script.throttle,
+        filterMode: this.script?.defaults?.filterMode || 'strict',
         onEvent: async (event) => {
           this.log('autoscript:event', {
             type: event.type,

package/src/autoscript/schema.mjs

@@ -127,9 +127,14 @@ function normalizeSubscription(item, index, defaults) {
   const selector = toTrimmedString(item.selector);
   if (!selector) return null;
   const events = toArray(item.events).map((name) => toTrimmedString(name)).filter(Boolean);
+  const pageUrlIncludes = toArray(item.pageUrlIncludes).map((token) => toTrimmedString(token)).filter(Boolean);
+  const pageUrlExcludes = toArray(item.pageUrlExcludes).map((token) => toTrimmedString(token)).filter(Boolean);
   return {
     id,
     selector,
+    visible: item.visible !== false,
+    pageUrlIncludes,
+    pageUrlExcludes,
     events: events.length > 0 ? events : ['appear', 'exist', 'disappear', 'change'],
     dependsOn: toArray(item.dependsOn).map((x) => toTrimmedString(x)).filter(Boolean),
     retry: normalizeRetry(item.retry, defaults.retry),
@@ -243,6 +248,7 @@ export function normalizeAutoscript(raw, sourcePath = null) {
       retry: normalizeRetry(defaults.retry, {}),
       impact: toTrimmedString(defaults.impact || 'op') || 'op',
       onFailure: toTrimmedString(defaults.onFailure || 'chain_stop') || 'chain_stop',
+      filterMode: toTrimmedString(defaults.filterMode || 'strict') || 'strict',
       validationMode: toTrimmedString(defaults.validationMode || 'none') || 'none',
       recovery: normalizeRecovery(defaults.recovery, {}),
       pacing: normalizePacing(defaults.pacing, {}),

package/src/cli.mjs

@@ -160,7 +160,11 @@ async function handleConfigCommand(args) {
 }
 
 async function main() {
-  const args = process.argv.slice(2);
+  const rawArgs = process.argv.slice(2);
+  const jsEnabled = rawArgs.includes('--js');
+  if (jsEnabled) process.env.CAMO_ALLOW_JS = '1';
+  else delete process.env.CAMO_ALLOW_JS;
+  const args = rawArgs.filter((arg) => arg !== '--js');
   const cmd = args[0];
 
   if (!cmd) {

package/src/commands/autoscript.mjs

@@ -1,9 +1,8 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { getDefaultProfile } from '../utils/config.mjs';
+import { getDefaultProfile, listProfiles } from '../utils/config.mjs';
 import { explainAutoscript, loadAndValidateAutoscript } from '../autoscript/schema.mjs';
 import { AutoscriptRunner } from '../autoscript/runtime.mjs';
-import { buildXhsUnifiedAutoscript } from '../autoscript/xhs-unified-template.mjs';
 import { safeAppendProgressEvent } from '../events/progress-log.mjs';
 
 function readFlagValue(args, names) {
@@ -31,20 +30,16 @@ function collectPositionals(args, startIndex = 2, valueFlags = new Set(['--profi
   return out;
 }
 
-function readToggleFlag(args, name, fallback) {
-  const on = `--${name}`;
-  const off = `--no-${name}`;
-  if (args.includes(off)) return false;
-  if (args.includes(on)) return true;
-  return fallback;
-}
-
-function readIntegerFlag(args, names, fallback, min = 1) {
-  const raw = readFlagValue(args, names);
-  if (raw === null || raw === undefined || raw === '') return fallback;
-  const num = Number(raw);
-  if (!Number.isFinite(num)) return fallback;
-  return Math.max(min, Math.floor(num));
+function assertExistingProfile(profileId) {
+  const id = String(profileId || '').trim();
+  if (!id) {
+    throw new Error('profileId is required');
+  }
+  const known = new Set(listProfiles());
+  if (!known.has(id)) {
+    throw new Error(`profile not found: ${id}. create it first with "camo profile create ${id}"`);
+  }
+  return id;
 }
 
 function appendJsonLine(filePath, payload) {
@@ -593,89 +588,6 @@ function createMockOperationExecutor(fixture) {
   };
 }
 
-async function handleScaffold(args) {
-  const valueFlags = new Set([
-    '--profile', '-p',
-    '--keyword', '-k',
-    '--env',
-    '--output', '-o',
-    '--output-root',
-    '--throttle',
-    '--tab-count',
-    '--note-interval',
-    '--max-notes',
-    '--max-likes',
-    '--match-mode',
-    '--match-min-hits',
-    '--match-keywords',
-    '--like-keywords',
-    '--reply-text',
-    '--jsonl-file',
-    '--jsonl',
-  ]);
-  const positionals = collectPositionals(args, 2, valueFlags);
-  const template = positionals[0];
-  if (template !== 'xhs-unified') {
-    throw new Error('Usage: camo autoscript scaffold xhs-unified [--output <file>] [options]');
-  }
-
-  const outputPath = readFlagValue(args, ['--output', '-o'])
-    || path.resolve('autoscripts/xiaohongshu/unified-harvest.autoscript.json');
-  const profileId = readFlagValue(args, ['--profile', '-p']) || getDefaultProfile() || 'xiaohongshu-batch-1';
-  const keyword = readFlagValue(args, ['--keyword', '-k']) || '手机膜';
-  const env = readFlagValue(args, ['--env']) || 'debug';
-  const outputRoot = readFlagValue(args, ['--output-root']) || '';
-  const throttle = readIntegerFlag(args, ['--throttle'], 500, 100);
-  const tabCount = readIntegerFlag(args, ['--tab-count'], 4, 1);
-  const noteIntervalMs = readIntegerFlag(args, ['--note-interval'], 900, 200);
-  const maxNotes = readIntegerFlag(args, ['--max-notes'], 30, 1);
-  const maxLikesPerRound = readIntegerFlag(args, ['--max-likes'], 2, 1);
-  const matchMinHits = readIntegerFlag(args, ['--match-min-hits'], 1, 1);
-  const matchMode = readFlagValue(args, ['--match-mode']) || 'any';
-  const matchKeywords = readFlagValue(args, ['--match-keywords']) || keyword;
-  const likeKeywords = readFlagValue(args, ['--like-keywords']) || '';
-  const replyText = readFlagValue(args, ['--reply-text']) || '感谢分享，已关注';
-
-  const script = buildXhsUnifiedAutoscript({
-    profileId,
-    keyword,
-    env,
-    outputRoot,
-    throttle,
-    tabCount,
-    noteIntervalMs,
-    maxNotes,
-    maxLikesPerRound,
-    matchMode,
-    matchMinHits,
-    matchKeywords,
-    likeKeywords,
-    replyText,
-    doHomepage: readToggleFlag(args, 'do-homepage', true),
-    doImages: readToggleFlag(args, 'do-images', false),
-    doComments: readToggleFlag(args, 'do-comments', true),
-    doLikes: readToggleFlag(args, 'do-likes', false),
-    doReply: readToggleFlag(args, 'do-reply', false),
-    doOcr: readToggleFlag(args, 'do-ocr', false),
-    persistComments: readToggleFlag(args, 'persist-comments', true),
-  });
-
-  const resolvedPath = path.resolve(outputPath);
-  fs.mkdirSync(path.dirname(resolvedPath), { recursive: true });
-  fs.writeFileSync(resolvedPath, `${JSON.stringify(script, null, 2)}\n`, 'utf8');
-
-  console.log(JSON.stringify({
-    ok: true,
-    command: 'autoscript.scaffold',
-    template,
-    file: resolvedPath,
-    profileId: script.profileId,
-    operationCount: script.operations.length,
-    subscriptionCount: script.subscriptions.length,
-    hint: `Run: camo autoscript validate ${resolvedPath}`,
-  }, null, 2));
-}
-
 async function handleValidate(args) {
   const filePath = collectPositionals(args)[0];
   if (!filePath) {
@@ -883,6 +795,7 @@ async function handleRun(args) {
   if (!profileId) {
     throw new Error('profileId is required. Set in script or pass --profile <id>');
   }
+  assertExistingProfile(profileId);
 
   await executeAutoscriptRuntime({
     commandName: 'autoscript.run',
@@ -996,6 +909,7 @@ async function handleResume(args) {
   if (!profileId) {
     throw new Error('profileId is required. Set in script or pass --profile <id>');
   }
+  assertExistingProfile(profileId);
   const resumeState = buildResumeStateFromSnapshot(script, snapshot, fromNode || null);
   await executeAutoscriptRuntime({
     commandName: 'autoscript.resume',
@@ -1067,8 +981,6 @@ async function handleMockRun(args) {
 export async function handleAutoscriptCommand(args) {
   const sub = args[1];
   switch (sub) {
-    case 'scaffold':
-      return handleScaffold(args);
     case 'validate':
       return handleValidate(args);
     case 'explain':
@@ -1084,10 +996,9 @@ export async function handleAutoscriptCommand(args) {
     case 'mock-run':
       return handleMockRun(args);
     default:
-      console.log(`Usage: camo autoscript <scaffold|validate|explain|snapshot|replay|run|resume|mock-run> [args]
+      console.log(`Usage: camo autoscript <validate|explain|snapshot|replay|run|resume|mock-run> [args]
 
 Commands:
-  scaffold xhs-unified [--output <file>] [options]          Generate xiaohongshu unified-harvest autoscript
   validate <file>                                   Validate autoscript schema and references
   explain <file>                                    Print normalized graph and defaults
   snapshot <jsonl-file> [--out <snapshot-file>]     Build resumable snapshot from run JSONL