@xqyz/xq-cli 0.3.3 → 0.3.5

package/CHANGELOG.md

@@ -8,6 +8,44 @@
 
 发布日期以 npm 官方仓库记录为准。发布前必须先更新本文件，再执行版本发布。
 
+## [Unreleased]
+
+## [0.3.5 / WorkBuddy Plugin 0.10.11] - 2026-08-20（待发布）
+
+### 文件解析与多标包统一配置
+
+- 修复 `xq-cli init --wait` 未识别 Web 端 `success=2`（解析完成、进入标书设置）的错误，避免 WorkBuddy 在文件已经解析完成后仍反复查询并最终超时。
+- WorkBuddy 新任务改为先调用一次 `xique_prepare_source`，解析完成后在同一配置页展示后台真实返回的多标包 / EPC 选项和全部普通配置。
+- 用户提交配置后复用原 `runId`、`cid` 和 `uuid` 启动大纲，不再重复上传文件、重复创建任务或二次选择标包。
+- 普通文件不显示多标包 / EPC 占位字段；提交的标包和 EPC 值必须来自本次解析结果，禁止手工构造 ID。
+
+### 暗标生成方式
+
+- xq-cli 新增 `--blind-generation-mode normal|blind`，并保留 `--anonymous-bid` 兼容别名。
+- WorkBuddy 配置页新增“按通用方式生成 / 按暗标生成”，默认通用方式；选择会真实写入大纲请求的 `blindBidConfirm`，不再只停留在界面字段。
+- 新增回归测试覆盖 `success=2`、真实多标包统一配置、同一任务复用、重复提交拦截和暗标请求体。
+
+### 导出格式二次设置
+
+- xq-cli 导出新增 `imageSizeConfig`，支持横向/纵向图片宽度和最大高度四项厘米参数，并与页边距一起写入 `/c/downWithStyle`。
+- WorkBuddy 新增 `xique_export_configuration` 二次导出设置卡：正文完成后可视化设置标题/正文编号、字体、对齐、起始编号、页边距和图片尺寸，再经确认重新下载，不会重新生成任务。
+- 模板5不再在 WorkBuddy 中禁用；编号设置由卡片生成结构化 `customNumbering`，不要求用户填写高级样式 JSON。
+
+## [0.3.4 / WorkBuddy Plugin 0.10.10] - 2026-08-19
+
+### 快速模式新任务生成链路修复
+
+- 对齐喜鹊 Web：新任务先调用 `/task/preSet` 保存用户配置，其中 `requirement`、`rating`、`plan` 允许为空；随后调用 `/proxy/multiBiddingChoice` 触发后台解析流程。
+- 禁止新任务由 xq-cli 直接调用 `/task/generateByRequirement`，避免抢在 `autoGenerateDirectoryJobHandler` 补齐解析结果之前提交空字段，造成任务停留在大纲解析阶段。
+- 保留历史任务兼容逻辑：仅 `task_status=0` 继续直接调用 `/task/generateByRequirement`。
+- 新增新任务与历史任务两条回归测试。
+
+### WorkBuddy 响应依据完整预览
+
+- “选择大纲依据”卡片改为三个页签：融合响应、仅格式要求、仅评分要求。
+- 页签切换只读取后端返回的完整候选目录树，不会提交 `referenceType` 或改变任务状态。
+- 用户只有点击“按当前思路生成大纲”才会调用既有单次提交链路；仍保留重复提交拦截。
+
 ## [0.3.3 / WorkBuddy Plugin 0.10.9] - 2026-08-19
 
 ### WorkBuddy 响应依据阶段化选择

package/package.json

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

package/src/cli.mjs

@@ -127,6 +127,12 @@ const DEFAULT_PAGE_MARGIN_SETTING = {
     leftMargin: 3.18,
     rightMargin: 3.18,
 };
+const DEFAULT_IMAGE_SIZE_CONFIG = {
+    landscapeWidth: 10.58,
+    landscapeMaxHeight: 8,
+    portraitWidth: 5.5,
+    portraitMaxHeight: 8,
+};
 const OUTLINE_REFERENCE_OPTIONS = [
     {
         value: 0,
@@ -205,6 +211,10 @@ const PLAN_MODE_OPTIONS = [
     { value: 0, label: 'quick', description: 'quick mode', aliases: ['0', 'quick'] },
     { value: 1, label: 'planning', description: 'planning mode', aliases: ['1', 'planning', 'plan'] },
 ];
+const BLIND_GENERATION_MODE_OPTIONS = [
+    { value: 'normal', label: 'normal', description: 'general bid generation', aliases: ['normal', 'general', '0', 'open'] },
+    { value: 'blind', label: 'blind', description: 'blind-bid protected generation', aliases: ['blind', 'anonymous', '1'] },
+];
 const PLAN_MODE_PHASE_LABELS = {
     0: 'analysis',
     1: 'outline',
@@ -238,6 +248,12 @@ const PAGE_MARGIN_FIELDS = [
     { key: 'leftMargin', optionKeys: ['leftMargin', 'marginLeft'] },
     { key: 'rightMargin', optionKeys: ['rightMargin', 'marginRight'] },
 ];
+const IMAGE_SIZE_FIELDS = [
+    { key: 'landscapeWidth', optionKeys: ['landscapeWidth', 'imageLandscapeWidth'] },
+    { key: 'landscapeMaxHeight', optionKeys: ['landscapeMaxHeight', 'imageLandscapeMaxHeight'] },
+    { key: 'portraitWidth', optionKeys: ['portraitWidth', 'imagePortraitWidth'] },
+    { key: 'portraitMaxHeight', optionKeys: ['portraitMaxHeight', 'imagePortraitMaxHeight'] },
+];
 const EXPORT_TEMPLATE_OPTIONS = templateData.map((template, index) => ({
     value: index + 1,
     label: `template-${index + 1}`,
@@ -514,13 +530,16 @@ Outline config
   --knowledge-img <0|1>       knowledge-base image toggle
   --mermaid-style <1|2|3|4|5|6|gray|purple|blue|green|orange|red>
   --plan-mode <0|1|quick|planning>
+  --blind-generation-mode <normal|blind>  Bid body generation mode; default normal
+  --anonymous-bid <0|1>      Deprecated alias of --blind-generation-mode
   --multi-bid-id <id>         override the selected bid package when needed
   --multi-bid-type <text>     persist the selected bid package type
   --epc-engineer-type <text>  accepts raw backend value or aliases: all, construction, design, not-epc
 
 Export style
   --template <1-${templateData.length}>       Same template order as the frontend download drawer
-  --style-json <file>         Advanced export style JSON with startIndex/directorySettings/contentSettings
+  --style-json <file>         Export style JSON file (CLI/automation compatibility)
+  --style-json-data <json>     Structured export style payload (automation; no user file required)
   --start-index <n>           Override the template heading numbering start index
   --auto-number <0|1>         Toggle Word auto numbering
   --add-mark <0|1>            Add suggest-modify marks
@@ -529,6 +548,10 @@ Export style
   --bottom-margin <cm>        Page bottom margin
   --left-margin <cm>          Page left margin
   --right-margin <cm>         Page right margin
+  --landscape-width <cm>      Landscape image fixed width
+  --landscape-max-height <cm> Landscape image maximum height
+  --portrait-width <cm>       Portrait image fixed width
+  --portrait-max-height <cm>  Portrait image maximum height
   --skeleton-color <hex>      Alias of --table-bolder-color-of-skeleton
   --img-title-color <hex>
   --heading4-color <hex>
@@ -1816,6 +1839,7 @@ async function handleExport(args, state) {
     const tableStyle = enumOption(effectiveArgs, 'tableStyle', TABLE_STYLE_OPTIONS, snapshot.tableStyle ?? DEFAULT_TABLE_STYLE);
     const themeStyleSetting = buildThemeStyleSetting(snapshot, effectiveArgs);
     const pageMarginSetting = buildPageMarginSetting(snapshot, effectiveArgs);
+    const imageSizeConfig = buildImageSizeConfig(snapshot, effectiveArgs);
     const templatePostData = buildTemplatePostData(template, effectiveArgs);
     const requestData = {
         cid,
@@ -1829,6 +1853,7 @@ async function handleExport(args, state) {
         },
         themeStyleSetting,
         pageMarginSetting,
+        imageSizeConfig,
         t: Date.now(),
         ...templatePostData,
     };
@@ -1840,6 +1865,7 @@ async function handleExport(args, state) {
         tableStyle,
         themeStyleSetting,
         pageMarginSetting,
+        imageSizeConfig,
     });
     const exportConfig = pickExportConfig(requestData, templateIndex);
 
@@ -1887,6 +1913,12 @@ function buildOutlineParams(snapshot, args) {
     const plan = stringOption(args, 'plan', snapshot.plan || '');
     const requirement = stringOption(args, 'requirement', snapshot.requirement || '');
     const rating = stringOption(args, 'rating', snapshot.rating || '');
+    const blindGenerationMode = enumOption(
+        args,
+        ['blindGenerationMode', 'anonymousBid'],
+        BLIND_GENERATION_MODE_OPTIONS,
+        snapshot.blindGenerationMode ?? snapshot.blindBidConfirm?.blindGenerationMode ?? 'normal',
+    );
 
     if (!uuid) {
         throw new Error('Missing uuid for outline generation. Run init first or make sure the task snapshot contains uuid.');
@@ -1924,32 +1956,39 @@ function buildOutlineParams(snapshot, args) {
         multiBidType: stringOption(args, 'multiBidType', snapshot.multiBidType),
         planMode: enumOption(args, 'planMode', PLAN_MODE_OPTIONS, snapshot.planMode ?? 0),
         epcEngineerType: normalizeEpcEngineerType(stringOption(args, 'epcEngineerType', snapshot.epcEngineerType)),
+        blindBidConfirm: {
+            blindGenerationMode,
+            reviewMode: blindGenerationMode === 'blind' ? 'blind_review' : 'open_review',
+            rules: [],
+        },
     });
 }
 
 async function triggerOutlineGeneration(client, snapshot, params) {
-    await postJson(client, '/task/preSet', params);
-
-    // task_status=6 means "file parsing" in the Xique backend. It is not a
-    // signal that this is a multi-bid/EPC task. Only route through the
-    // special-selection endpoint when the caller actually supplied a
-    // multi-bid or EPC selection; ordinary tasks must use the normal
-    // generation endpoint even while the task is transitioning from parse.
-    const hasSpecialSelection = Boolean(
-        String(params.multiBidId ?? snapshot.multiBidId ?? '').trim()
-        || String(params.epcEngineerType ?? snapshot.epcEngineerType ?? '').trim()
-    );
-    if (hasSpecialSelection) {
-        await getJson(client, '/proxy/multiBiddingChoice', compactObject({
-            uuid: snapshot.uuid,
-            multiBidId: params.multiBidId ?? snapshot.multiBidId,
-            epcEngineerType: normalizeEpcEngineerTypeForProxy(params.epcEngineerType ?? snapshot.epcEngineerType),
-        }));
-        return 'multiBiddingChoice';
+    // The web flow has two deliberately different paths:
+    //
+    // * legacy tasks (task_status === 0) already contain the parsed
+    //   requirement/rating/plan fields, so they go straight to
+    //   generateByRequirement;
+    // * newly parsed tasks must only persist the user's configuration with
+    //   preSet, then call multiBiddingChoice. That endpoint wakes the async
+    //   parser, and autoGenerateDirectoryJobHandler later fills the three
+    //   parsed fields before it invokes generateByRequirement.
+    //
+    // Calling generateByRequirement here for a new task races that job and
+    // sends empty parsed fields, which leaves the web task stuck in parsing.
+    if (Number(snapshot.task_status) === 0) {
+        await postJson(client, '/task/generateByRequirement', params);
+        return 'generateByRequirement';
     }
 
-    await postJson(client, '/task/generateByRequirement', params);
-    return 'generateByRequirement';
+    await postJson(client, '/task/preSet', params);
+    await getJson(client, '/proxy/multiBiddingChoice', compactObject({
+        uuid: snapshot.uuid,
+        multiBidId: params.multiBidId ?? snapshot.multiBidId,
+        epcEngineerType: normalizeEpcEngineerTypeForProxy(params.epcEngineerType ?? snapshot.epcEngineerType),
+    }));
+    return 'multiBiddingChoice';
 }
 
 async function preparePlanningAnalysis(client, params) {
@@ -2280,7 +2319,10 @@ async function ensurePeriodReady(client, state, cid, args) {
 
 function isParseReadyForNextStep(success) {
     const parsed = Number(success);
-    return parsed === 1 || parsed === 4;
+    // The web client treats 2 as the completed parse state that opens the
+    // bid-settings page. Waiting past it keeps WorkBuddy polling forever even
+    // though multi-bid/EPC results are already available.
+    return parsed === 1 || parsed === 2 || parsed === 4;
 }
 
 async function pollTaskUntil(client, state, cid, args, isDone, formatProgress) {
@@ -3058,6 +3100,7 @@ function buildChoicesPayload(scope) {
             imageToggles: ['infoImg', 'sceneImg', 'onlineImg', 'mermaidImg', 'knowledgeImg'],
             mermaidStyle: MERMAID_STYLE_OPTIONS,
             planMode: PLAN_MODE_OPTIONS,
+            blindGenerationMode: BLIND_GENERATION_MODE_OPTIONS,
             multiBid: ['--multi-bid-id', '--multi-bid-type'],
             epcEngineerType: {
                 option: '--epc-engineer-type',
@@ -3075,9 +3118,11 @@ function buildChoicesPayload(scope) {
             tableStyle: TABLE_STYLE_OPTIONS,
             advancedStyle: {
                 option: '--style-json',
+                automationOption: '--style-json-data',
                 fields: ['startIndex', 'directorySettings', 'contentSettings'],
             },
             pageMargins: PAGE_MARGIN_FIELDS.map(field => `--${toKebabCase(field.optionKeys[0])}`),
+            imageSize: IMAGE_SIZE_FIELDS.map(field => `--${toKebabCase(field.optionKeys[0])}`),
             themeColors: THEME_STYLE_SETTING_FIELDS.map(field => field.optionKeys.map(key => `--${toKebabCase(key)}`).join('/')),
         };
     }
@@ -3098,6 +3143,7 @@ function renderChoicesLines(payload) {
         lines.push(`  table-style: ${formatChoiceOptions(TABLE_STYLE_OPTIONS)}`);
         lines.push(`  mermaid-style: ${formatChoiceOptions(MERMAID_STYLE_OPTIONS)}`);
         lines.push(`  plan-mode: ${formatChoiceOptions(PLAN_MODE_OPTIONS)}`);
+        lines.push(`  blind-generation-mode: ${formatChoiceOptions(BLIND_GENERATION_MODE_OPTIONS)}`);
         lines.push('  image toggles: --info-img, --scene-img, --online-img, --mermaid-img, --knowledge-img (0|1)');
         lines.push('  multi-bid override: --multi-bid-id <id>, --multi-bid-type <text>');
         lines.push(`  epc-engineer-type: --epc-engineer-type <text>; aliases=${Object.keys(EPC_ENGINEER_TYPE_ALIAS_MAP).join(', ')}`);
@@ -3109,8 +3155,9 @@ function renderChoicesLines(payload) {
         lines.push(`  table-color: ${formatChoiceOptions(TABLE_COLOR_OPTIONS)}`);
         lines.push(`  table-style: ${formatChoiceOptions(TABLE_STYLE_OPTIONS)}`);
         lines.push('  binary toggles: --auto-number, --add-mark (0|1)');
-        lines.push('  advanced style: --style-json <file> with startIndex, directorySettings, contentSettings');
+        lines.push('  custom numbering: --style-json-data <json> (automation) or --style-json <file> (compatibility) with startIndex, directorySettings, contentSettings');
         lines.push(`  margins: ${PAGE_MARGIN_FIELDS.map(field => `--${toKebabCase(field.optionKeys[0])}`).join(', ')}`);
+        lines.push(`  image sizes (cm): ${IMAGE_SIZE_FIELDS.map(field => `--${toKebabCase(field.optionKeys[0])}`).join(', ')}`);
         lines.push(`  theme colors: ${THEME_STYLE_SETTING_FIELDS.map(field => field.optionKeys.map(key => `--${toKebabCase(key)}`).join('/')).join(', ')}`);
     }
     return lines;
@@ -3391,6 +3438,22 @@ async function collectExportInteractiveArgs(args, snapshot, context = null, opti
             }
         }
 
+        const customizeImageSize = await promptYesNo(
+            promptContext,
+            '是否要自定义图片尺寸',
+            hasAnyOption(args, IMAGE_SIZE_FIELDS.flatMap(field => field.optionKeys)),
+        );
+        if (customizeImageSize) {
+            for (const field of IMAGE_SIZE_FIELDS) {
+                nextArgs[field.optionKeys[0]] = await promptNumber(promptContext, {
+                    title: `图片尺寸: ${field.key}`,
+                    question: `请输入 ${field.key} (单位 cm)`,
+                    defaultValue: numberOptionAny(args, field.optionKeys, defaults.imageSizeConfig?.[field.key] ?? DEFAULT_IMAGE_SIZE_CONFIG[field.key]),
+                    min: 0.1,
+                });
+            }
+        }
+
         const useStyleJson = await promptYesNo(
             promptContext,
             '\u662F\u5426\u8981\u6302\u8F7D\u9AD8\u7EA7\u6837\u5F0F JSON',
@@ -3440,6 +3503,7 @@ function buildInteractiveSnapshotDefaults(source = {}) {
         multiBidType: source.multiBidType ?? '',
         epcEngineerType: source.epcEngineerType ?? '',
         pageMarginSetting: source.pageMarginSetting ?? DEFAULT_PAGE_MARGIN_SETTING,
+        imageSizeConfig: source.imageSizeConfig ?? DEFAULT_IMAGE_SIZE_CONFIG,
         themeStyleSetting: source.themeStyleSetting ?? DEFAULT_THEME_STYLE_SETTING,
     };
 }
@@ -4411,19 +4475,48 @@ function buildPageMarginSetting(snapshot, args) {
     return pageMarginSetting;
 }
 
+function buildImageSizeConfig(snapshot, args) {
+    const imageSizeConfig = {
+        ...DEFAULT_IMAGE_SIZE_CONFIG,
+        ...(snapshot.imageSizeConfig || {}),
+    };
+    for (const field of IMAGE_SIZE_FIELDS) {
+        const value = numberOptionAny(args, field.optionKeys);
+        if (value === undefined) {
+            continue;
+        }
+        if (!Number.isFinite(value) || value <= 0 || value > 50) {
+            throw new Error(`Option --${toKebabCase(field.optionKeys[0])} expects a number greater than 0 and no greater than 50 cm.`);
+        }
+        imageSizeConfig[field.key] = value;
+    }
+    return imageSizeConfig;
+}
+
 function buildTemplatePostData(template, args) {
     const styleJsonPath = stringOption(args, 'styleJson');
     let styleJson = {};
+    const styleJsonData = stringOption(args, 'styleJsonData');
+    if (styleJsonData) {
+        try {
+            styleJson = JSON.parse(styleJsonData);
+        } catch {
+            throw new Error('Option --style-json-data expects a valid JSON object.');
+        }
+    }
     if (styleJsonPath) {
         const resolvedPath = path.resolve(styleJsonPath);
         ensureFileExists(resolvedPath);
         try {
-            styleJson = JSON.parse(fs.readFileSync(resolvedPath, 'utf8'));
+            styleJson = {
+                ...styleJson,
+                ...JSON.parse(fs.readFileSync(resolvedPath, 'utf8')),
+            };
         } catch (error) {
             throw new Error(`Failed to parse style JSON: ${resolvedPath}`);
         }
         if (!styleJson || Array.isArray(styleJson) || typeof styleJson !== 'object') {
-            throw new Error('Option --style-json expects a JSON object.');
+            throw new Error('Export style expects a JSON object.');
         }
         if (styleJson.directorySettings !== undefined && !Array.isArray(styleJson.directorySettings)) {
             throw new Error('Option --style-json expects directorySettings to be an array.');
@@ -4432,6 +4525,15 @@ function buildTemplatePostData(template, args) {
             throw new Error('Option --style-json expects contentSettings to be an object.');
         }
     }
+    if (!styleJson || Array.isArray(styleJson) || typeof styleJson !== 'object') {
+        throw new Error('Export style expects a JSON object.');
+    }
+    if (styleJson.directorySettings !== undefined && !Array.isArray(styleJson.directorySettings)) {
+        throw new Error('Export style expects directorySettings to be an array.');
+    }
+    if (styleJson.contentSettings !== undefined && (Array.isArray(styleJson.contentSettings) || typeof styleJson.contentSettings !== 'object' || styleJson.contentSettings === null)) {
+        throw new Error('Export style expects contentSettings to be an object.');
+    }
     const startIndex = numberOption(args, 'startIndex', styleJson.startIndex ?? template.postData.startIndex ?? 1);
     if (!Number.isInteger(startIndex) || startIndex < 1) {
         throw new Error('Option --start-index expects an integer greater than or equal to 1.');
@@ -4482,6 +4584,7 @@ function pickOutlineConfig(params) {
         knowledgeImg: params.knowledgeImg,
         mermaidStyle: params.mermaidStyle,
         planMode: params.planMode,
+        blindBidConfirm: params.blindBidConfirm,
         multiBidId: params.multiBidId,
         multiBidType: params.multiBidType,
         epcEngineerType: params.epcEngineerType,
@@ -4497,6 +4600,9 @@ function buildOutlineConfigSummary(params) {
         params.tableColor !== undefined ? `tableColor=${describeEnumValue(TABLE_COLOR_OPTIONS, params.tableColor)}` : null,
         params.tableStyle !== undefined ? `tableStyle=${describeEnumValue(TABLE_STYLE_OPTIONS, params.tableStyle)}` : null,
         `planMode=${describeEnumValue(PLAN_MODE_OPTIONS, params.planMode)}`,
+        params.blindBidConfirm?.blindGenerationMode
+            ? `blindGenerationMode=${params.blindBidConfirm.blindGenerationMode}`
+            : null,
     ].filter(Boolean).join(', ');
 }
 
@@ -4512,6 +4618,7 @@ function pickExportConfig(requestData, templateIndex) {
         directorySettings: requestData.directorySettings,
         contentSettings: requestData.contentSettings,
         pageMarginSetting: requestData.pageMarginSetting,
+        imageSizeConfig: requestData.imageSizeConfig,
         themeStyleSetting: requestData.themeStyleSetting,
     };
 }
@@ -4527,6 +4634,7 @@ function buildExportConfigSummary(config) {
         `autoNumber=${config.autoNumber}`,
         `addMark=${config.addMark}`,
         `margins=${margins.topMargin}/${margins.bottomMargin}/${margins.leftMargin}/${margins.rightMargin}`,
+        `images=${config.imageSizeConfig.landscapeWidth}/${config.imageSizeConfig.landscapeMaxHeight}/${config.imageSizeConfig.portraitWidth}/${config.imageSizeConfig.portraitMaxHeight}`,
     ].join(', ');
 }
 
@@ -4650,6 +4758,8 @@ function pickTaskSnapshot(source) {
         tableStyle: source.tableStyle,
         tableQuantity: source.tableQuantity,
         planMode: source.planMode,
+        blindBidConfirm: source.blindBidConfirm,
+        blindGenerationMode: source.blindGenerationMode || source.blindBidConfirm?.blindGenerationMode,
         multiBidId: source.multiBidId,
         multiBidType: source.multiBidType,
         epcEngineerType: source.epcEngineerType,
@@ -4657,6 +4767,7 @@ function pickTaskSnapshot(source) {
         referenceStatus: source.referenceStatus,
         themeStyleSetting: source.themeStyleSetting,
         pageMarginSetting: source.pageMarginSetting,
+        imageSizeConfig: source.imageSizeConfig,
         outlineTriggeredAt: source.outlineTriggeredAt,
         triggerMode: source.triggerMode,
         writeTriggeredAt: source.writeTriggeredAt,