@xqyz/xq-cli 0.3.7 → 0.3.8

package/CHANGELOG.md

@@ -10,6 +10,15 @@
 
 ## [Unreleased]
 
+## [0.3.8 / WorkBuddy Plugin 0.10.21 / SkillHub 1.0.5] - 2026-08-25
+
+### 规划模式卡住保护
+
+- 解析唤醒后的 `success=2` 只允许在 30 秒内等待后台一致性同步；状态没有推进时返回可诊断的 `TASK_PARSE_NOT_ADVANCED`，不再继续等待到 10/30 分钟超时。
+- WorkBuddy Plugin 固定依赖 `@xqyz/xq-cli@0.3.8`，并把最低版本校验同步提升，避免旧 CLI 重新进入不完整链路。
+- SkillHub 安装说明明确要求重启后核对实际加载的 Plugin/CLI 版本；旧 MCP 进程仍在运行时不得宣称已更新。
+- 新增回归覆盖：`multiBiddingChoice` 延迟推进、持续 `success=2` 快速失败，以及旧版本运行时拒绝。
+
 ## [0.3.7 / WorkBuddy Plugin 0.10.20 / SkillHub 1.0.4] - 2026-08-25
 
 ### 规划模式解析唤醒修复

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xqyz/xq-cli",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "CLI for xique bid-book task workflows",
   "type": "module",
   "scripts": {

package/src/cli.mjs

@@ -5,7 +5,7 @@ import http from 'http';
 import https from 'https';
 import os from 'os';
 import path from 'path';
-import readline from 'readline/promises';
+import readline from 'node:readline/promises';
 import { spawn } from 'child_process';
 import { randomUUID } from 'crypto';
 import axios from 'axios';
@@ -35,6 +35,12 @@ const DEFAULT_BASE_URL = 'https://ai.bidfile.qianlima.com/api';
 const DEFAULT_PARSE_INTERVAL_MS = 10_000;
 const DEFAULT_TASK_INTERVAL_MS = 10_000;
 const DEFAULT_TIMEOUT_MS = 10 * 60 * 1000;
+// multiBiddingChoice acknowledges the request before the extraction service
+// necessarily updates getFileAsyncResult. Give that short async hand-off a
+// bounded window, then fail with diagnostics instead of entering the long
+// outline polling timeout.
+const DEFAULT_PARSER_WAKEUP_TIMEOUT_MS = 30_000;
+const PARSER_WAKEUP_INTERVAL_MS = 2_000;
 const DEFAULT_SOURCE_FROM = 'xique';
 const DEFAULT_LOGIN_TIMEOUT_MS = 5 * 60 * 1000;
 const DEFAULT_EXPORT_TEMPLATE_INDEX = 1;
@@ -1409,8 +1415,8 @@ async function handleOutlineUnlocked(args, state) {
 
     const planningMode = Number(params.planMode) === 1;
     const triggerMode = planningMode
-        ? await preparePlanningAnalysis(client, outlineSnapshot, params)
-        : await triggerOutlineGeneration(client, outlineSnapshot, params);
+        ? await preparePlanningAnalysis(client, state, outlineSnapshot, params, effectiveArgs)
+        : await triggerOutlineGeneration(client, state, outlineSnapshot, params, effectiveArgs);
     saveTaskSnapshot(state, cid, {
         ...outlineSnapshot,
         ...pickTaskSnapshot(params),
@@ -2056,7 +2062,7 @@ function buildOutlineParams(snapshot, args) {
     });
 }
 
-async function triggerOutlineGeneration(client, snapshot, params) {
+async function triggerOutlineGeneration(client, state, snapshot, params, args = {}) {
     // The web flow has two deliberately different paths:
     //
     // * legacy tasks (task_status === 0) already contain the parsed
@@ -2080,10 +2086,11 @@ async function triggerOutlineGeneration(client, snapshot, params) {
         multiBidId: params.multiBidId ?? snapshot.multiBidId,
         epcEngineerType: normalizeEpcEngineerTypeForProxy(params.epcEngineerType ?? snapshot.epcEngineerType),
     }));
+    await verifyParserWakeUp(client, state, snapshot.cid, snapshot.uuid, params, false, args);
     return 'multiBiddingChoice';
 }
 
-async function preparePlanningAnalysis(client, snapshot, params) {
+async function preparePlanningAnalysis(client, state, snapshot, params, args = {}) {
     // Planning mode pauses before outline generation, but new tasks still need
     // the same parser wake-up as quick mode. Without multiBiddingChoice,
     // autoGenerateDirectoryJobHandler never fills requirement/rating/plan and
@@ -2100,9 +2107,78 @@ async function preparePlanningAnalysis(client, snapshot, params) {
         multiBidId: params.multiBidId ?? snapshot.multiBidId,
         epcEngineerType: normalizeEpcEngineerTypeForProxy(params.epcEngineerType ?? snapshot.epcEngineerType),
     }));
+    await verifyParserWakeUp(client, state, snapshot.cid, snapshot.uuid, params, true, args);
     return 'planningAnalysisPrepared';
 }
 
+async function verifyParserWakeUp(client, state, cid, uuid, params, planningMode, args = {}) {
+    const expectedMultiBidId = String(params.multiBidId || '').trim();
+    const requestedTimeoutMs = secondsToMs(
+        numberOption(args, 'timeoutSec', DEFAULT_TIMEOUT_MS / 1000),
+    );
+    const timeoutMs = Math.min(DEFAULT_PARSER_WAKEUP_TIMEOUT_MS, requestedTimeoutMs);
+    const deadline = Date.now() + timeoutMs;
+    let latest = null;
+
+    // `multiBiddingChoice` returns HTTP 200 before the extraction record is
+    // necessarily visible to the next read. Allow a short consistency window,
+    // but never fall back to the long generation poll while the backend still
+    // advertises "waiting for package selection" (success=2).
+    for (let attempt = 0; ; attempt += 1) {
+        const [taskResponse, parseStatus] = await Promise.all([
+            getJson(client, `/task/getTaskDetail/${encodeURIComponent(cid)}`, {}, { retries: DEFAULT_RETRY_COUNT }),
+            fetchParseStatus(client, state, cid, uuid),
+        ]);
+        const taskDetail = taskResponse?.data || {};
+        const parseSuccess = Number(parseStatus.success);
+        const selectedMultiBidId = String(
+            parseStatus.choiceMultiBiddingId
+            || taskDetail.choiceMultiBiddingId
+            || taskDetail.multiBidId
+            || '',
+        ).trim();
+        const savedPlanMode = normalizePlanModeValue(taskDetail.planMode);
+        latest = {
+            taskDetail,
+            parseStatus,
+            parseSuccess,
+            selectedMultiBidId,
+            savedPlanMode,
+        };
+        saveTaskSnapshot(state, cid, pickTaskSnapshot({
+            ...taskDetail,
+            ...parseStatus,
+            cid,
+            uuid,
+            choiceMultiBiddingId: selectedMultiBidId,
+        }));
+
+        const selectionRequired = expectedMultiBidId && expectedMultiBidId !== 'notMultiBid';
+        const selectionMatches = !selectionRequired || selectedMultiBidId === expectedMultiBidId;
+        const parseAdvanced = [1, 3, 4].includes(parseSuccess);
+        const planModeMatches = !planningMode || savedPlanMode === 1;
+        if (parseAdvanced && selectionMatches && planModeMatches) {
+            return latest;
+        }
+
+        const remainingMs = deadline - Date.now();
+        if (remainingMs <= 0) {
+            break;
+        }
+        await sleep(Math.min(PARSER_WAKEUP_INTERVAL_MS, remainingMs));
+    }
+
+    const selected = latest?.selectedMultiBidId || '-';
+    const expected = expectedMultiBidId || '-';
+    const success = latest?.parseSuccess ?? '-';
+    const savedPlanMode = latest?.savedPlanMode ?? '-';
+    throw new Error(
+        `[TASK_PARSE_NOT_ADVANCED] 标包/规划配置提交后后端状态没有推进，已停止等待。` +
+        `期望标包=${expected}，后端标包=${selected}，解析状态 success=${success}，` +
+        `后端 planMode=${savedPlanMode}。请不要重复提交同一任务；先查询任务状态或重新安装最新版 WorkBuddy 插件。`,
+    );
+}
+
 async function setPlanModePhase(client, cid, planModePhase) {
     const response = await postJson(client, '/task/setPlanModePhase', { cid, planModePhase });
     const returned = normalizePlanModePhase(response?.data?.planModePhase);
@@ -2620,6 +2696,11 @@ async function waitForPlanningAnalysisReady(client, state, cid, uuid, args) {
             ? await fetchParseStatus(client, state, cid, uuid)
             : { success: 1 };
         const parseSuccess = Number(parseStatus.success);
+        if (parseSuccess === 2) {
+            throw new Error(
+                '[TASK_PARSE_NOT_ADVANCED] 规划模式仍处于等待标包/EPC选择（success=2），未进入解析阶段，已停止等待。',
+            );
+        }
         const issues = collectParseIssues(parseStatus);
         if (parseSuccess === 4 && issues.length > 0) {
             const autoIgnore = resolveAutoIgnoreIssue(issues, args, uuid, handledIssues);
@@ -4925,6 +5006,7 @@ function pickTaskSnapshot(source) {
         blindGenerationMode: source.blindGenerationMode || source.blindBidConfirm?.blindGenerationMode,
         multiBidId: source.multiBidId,
         multiBidType: source.multiBidType,
+        choiceMultiBiddingId: source.choiceMultiBiddingId,
         epcEngineerType: source.epcEngineerType,
         outlineReferenceType: source.outlineReferenceType,
         referenceStatus: source.referenceStatus,