@web-auto/webauto 0.1.8 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web-auto/webauto",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "type": "module",
   "bin": {
     "webauto": "bin/webauto.mjs"
@@ -59,9 +59,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/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",
     "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/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/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\" 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",
@@ -69,6 +69,9 @@
     "test:ci": "npm test && npm --prefix apps/desktop-console run test:renderer",
     "coverage:ci": "node scripts/test/run-coverage.mjs",
     "build:release": "node bin/webauto.mjs build:release",
+    "version:bump": "node scripts/bump-version.mjs patch",
+    "version:bump:minor": "node scripts/bump-version.mjs minor",
+    "version:bump:major": "node scripts/bump-version.mjs major",
     "test": "npm run check:modules && npm run check:ts && npm run test:modules:unit && npm run test:webauto:schedule:unit && npm run test:webauto:ui-cli:unit && npm run test:webauto:install:unit && npm run test:desktop-console:unit && npm run test:services:unit",
     "cli:session-manager": "tsx modules/session-manager/src/cli.ts",
     "cli:logging": "tsx modules/logging/src/cli.ts",

package/scripts/bump-version.mjs

@@ -0,0 +1,120 @@
+#!/usr/bin/env node
+import { readFileSync, writeFileSync, existsSync } from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const ROOT = path.resolve(__dirname, '..');
+const ROOT_PACKAGE = path.join(ROOT, 'package.json');
+const DESKTOP_PACKAGE = path.join(ROOT, 'apps', 'desktop-console', 'package.json');
+const ROOT_LOCK = path.join(ROOT, 'package-lock.json');
+
+function usage(exitCode = 0) {
+  console.log(`Usage:
+  node scripts/bump-version.mjs [patch|minor|major] [--json]
+
+Examples:
+  node scripts/bump-version.mjs
+  node scripts/bump-version.mjs patch
+  node scripts/bump-version.mjs minor --json`);
+  process.exit(exitCode);
+}
+
+function readJson(filePath) {
+  return JSON.parse(readFileSync(filePath, 'utf8'));
+}
+
+function writeJson(filePath, json) {
+  writeFileSync(filePath, `${JSON.stringify(json, null, 2)}\n`, 'utf8');
+}
+
+function bumpSemver(version, kind) {
+  const match = String(version || '').trim().match(/^(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$/);
+  if (!match) {
+    throw new Error(`invalid semver: ${version}`);
+  }
+  let major = Number(match[1]);
+  let minor = Number(match[2]);
+  let patch = Number(match[3]);
+  if (kind === 'major') {
+    major += 1;
+    minor = 0;
+    patch = 0;
+  } else if (kind === 'minor') {
+    minor += 1;
+    patch = 0;
+  } else {
+    patch += 1;
+  }
+  return `${major}.${minor}.${patch}`;
+}
+
+function updatePackageVersion(filePath, nextVersion) {
+  const json = readJson(filePath);
+  const prev = String(json.version || '').trim();
+  if (!prev) throw new Error(`missing version in ${filePath}`);
+  json.version = nextVersion;
+  writeJson(filePath, json);
+  return prev;
+}
+
+function updateRootLockVersion(filePath, nextVersion) {
+  if (!existsSync(filePath)) return false;
+  const lock = readJson(filePath);
+  lock.version = nextVersion;
+  if (lock.packages && lock.packages['']) {
+    lock.packages[''].version = nextVersion;
+  }
+  writeJson(filePath, lock);
+  return true;
+}
+
+function main() {
+  const argv = process.argv.slice(2);
+  if (argv.includes('--help') || argv.includes('-h')) usage(0);
+
+  const jsonMode = argv.includes('--json');
+  const kindArg = argv.find((arg) => !arg.startsWith('-')) || 'patch';
+  const kind = String(kindArg || 'patch').trim().toLowerCase();
+  if (!['patch', 'minor', 'major'].includes(kind)) {
+    console.error(`[version] unsupported bump type: ${kind}`);
+    usage(2);
+  }
+
+  const rootPkg = readJson(ROOT_PACKAGE);
+  const prevRootVersion = String(rootPkg.version || '').trim();
+  if (!prevRootVersion) {
+    throw new Error(`missing version in ${ROOT_PACKAGE}`);
+  }
+  const nextVersion = bumpSemver(prevRootVersion, kind);
+
+  const prevDesktopVersion = updatePackageVersion(DESKTOP_PACKAGE, nextVersion);
+  const prevVersion = updatePackageVersion(ROOT_PACKAGE, nextVersion);
+  const lockUpdated = updateRootLockVersion(ROOT_LOCK, nextVersion);
+
+  const result = {
+    ok: true,
+    kind,
+    previous: prevVersion,
+    next: nextVersion,
+    desktopPrevious: prevDesktopVersion,
+    desktopNext: nextVersion,
+    lockUpdated,
+    files: [
+      ROOT_PACKAGE,
+      DESKTOP_PACKAGE,
+      ...(lockUpdated ? [ROOT_LOCK] : []),
+    ],
+  };
+
+  if (jsonMode) {
+    console.log(JSON.stringify(result, null, 2));
+    return;
+  }
+  console.log(`[version] bump ${kind}: ${prevVersion} -> ${nextVersion}`);
+  console.log(`[version] updated: ${ROOT_PACKAGE}`);
+  console.log(`[version] updated: ${DESKTOP_PACKAGE}`);
+  if (lockUpdated) console.log(`[version] updated: ${ROOT_LOCK}`);
+}
+
+main();

package/services/unified-api/server.ts

@@ -296,11 +296,13 @@ class UnifiedApiServer {
           if (existing) return existing;
           const profileId = String(seed?.profileId || 'unknown').trim() || 'unknown';
           const keyword = String(seed?.keyword || '').trim();
+          const uiTriggerId = String(seed?.uiTriggerId || seed?.triggerId || '').trim();
           const phase = normalizeTaskPhase(seed?.phase);
           return this.taskRegistry.createTask({
             runId: normalizedRunId,
             profileId,
             keyword,
+            uiTriggerId,
             phase,
           });
         };
@@ -311,11 +313,13 @@ class UnifiedApiServer {
           const phase = normalizeTaskPhase(payload?.phase);
           const profileId = String(payload?.profileId || '').trim();
           const keyword = String(payload?.keyword || '').trim();
+          const uiTriggerId = String(payload?.uiTriggerId || payload?.triggerId || '').trim();
           const details = payload?.details && typeof payload.details === 'object' ? payload.details : undefined;
           const patch: any = {};
           if (phase !== 'unknown') patch.phase = phase;
           if (profileId) patch.profileId = profileId;
           if (keyword) patch.keyword = keyword;
+          if (uiTriggerId) patch.uiTriggerId = uiTriggerId;
           if (details) patch.details = details;
           if (Object.keys(patch).length > 0) {
             this.taskRegistry.updateTask(normalizedRunId, patch);

package/services/unified-api/task-state.ts

@@ -37,10 +37,12 @@ export interface TaskState {
   runId: string;
   profileId: string;
   keyword: string;
+  uiTriggerId?: string;
   phase: TaskPhase;
   status: TaskStatus;
   progress: TaskProgress;
   stats: TaskStats;
+  createdAt: number;
   startedAt: number;
   updatedAt: number;
   completedAt?: number;
@@ -71,6 +73,7 @@ class TaskStateRegistry {
     runId: string;
     profileId: string;
     keyword: string;
+    uiTriggerId?: string;
     phase?: TaskPhase;
   }): TaskState {
     const now = Date.now();
@@ -78,6 +81,7 @@ class TaskStateRegistry {
       runId: partial.runId,
       profileId: partial.profileId,
       keyword: partial.keyword,
+      uiTriggerId: partial.uiTriggerId ? String(partial.uiTriggerId).trim() : undefined,
       phase: partial.phase || 'unknown',
       status: 'starting',
       progress: { total: 0, processed: 0, failed: 0 },
@@ -89,6 +93,7 @@ class TaskStateRegistry {
         imagesDownloaded: 0,
         ocrProcessed: 0,
       },
+      createdAt: now,
       startedAt: now,
       updatedAt: now,
       details: {