skill-chef 0.3.2 → 0.3.13

package/dist/setup/run-init.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-init.d.ts","sourceRoot":"","sources":["../../src/setup/run-init.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAI7C,qDAAqD;AACrD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAOpD"}

package/dist/setup/run-init.js

@@ -0,0 +1,19 @@
+/** 开始使用能力的写处理（`chef.setup.init` 的初始化工作流）＋ 本域独占的取数。
+ *
+ * 老件语义来源（只读对照）：`scripts/开始使用/ops.py:57-72`（只读数表，不写库）与
+ * `scripts/开始使用/ops.py:186-235`（缺表则建，老库齐则跳过并提示迁移）。
+ * 新技能建库走 `openChefDb` 的幂等 `CREATE TABLE IF NOT EXISTS`（17 表），本函数只做判定与回执：
+ * 只在需要时建库建目录（开库即建），已齐则跳过并报已初始化。
+ */
+import { qGet } from '../fetch/db.js';
+import { buildRecipeReceipt } from '../render/index.js';
+/** 跑 `chef.setup.init`：幂等初始化（开库即建表），回执报已初始化或本次建齐。 */
+export function runSetupInit(handle) {
+    const row = qGet(handle, "SELECT COUNT(*) AS c FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'");
+    const tables = Number(row?.c ?? 0);
+    if (handle.initialized) {
+        return buildRecipeReceipt('首次使用已就绪：本次建齐 ' + tables + ' 张表，录第一道菜就能开工');
+    }
+    return buildRecipeReceipt('菜谱库已就绪：' + tables + ' 张表齐全，不用再建（旧数据只提醒，不自动搬动）');
+}
+//# sourceMappingURL=run-init.js.map

package/dist/setup/run-init.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-init.js","sourceRoot":"","sources":["../../src/setup/run-init.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAExD,qDAAqD;AACrD,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,MAAM,GAAG,GAAG,IAAI,CAAgB,MAAM,EAAE,yFAAyF,CAAC,CAAC;IACnI,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACnC,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACvB,OAAO,kBAAkB,CAAC,eAAe,GAAG,MAAM,GAAG,eAAe,CAAC,CAAC;IACxE,CAAC;IACD,OAAO,kBAAkB,CAAC,SAAS,GAAG,MAAM,GAAG,0BAA0B,CAAC,CAAC;AAC7E,CAAC"}

package/dist/shared/command-spec.d.ts

@@ -29,9 +29,11 @@ export type CommandSpec = {
 };
 /** 一条路由的声明行形状（各域 `routes.ts` 数组元素的形状）。
  *
- * `order` 取 `WAKE_TABLE` 的 1-based 下标（跨域可比，全表级顺序由场景表定）；
- * 暂未入表的短语（`备份`／派生三组／`首次使用`）取 `order: 0` 并在行注释写明待接入，
- * 对账脚本认 `order: 0` 为 tbd 行（`key: 'tbd'` 或注释点名去向）。
+ * `order` 取 `WAKE_TABLE`（`src/policy/wakewords.ts`）的 1-based 行号，即「这条路由在唤醒词表里第几行」；
+ * 表序是全表唯一的顺序事实源，本字段与表序互为判据（判据住 `docs/skills/skill-chef/t841-登记面对账.mjs`）。
+ * #841 起 50 条全部入表 ⇒ 不再有 `order: 0` 的待接入行（此前 `备份`／派生三组／`首次使用`／`批量改`
+ * 是入表前的占位）。一句事实只有一个落点：同一短语不在两个域各声明一行（越域共用命令时，
+ * 按事实归属选一处，如 `备份` 住历史域、`体检` 也住历史域）。
  */
 export interface RouteDecl {
     readonly order: number;

package/dist/shared/command-spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-spec.d.ts","sourceRoot":"","sources":["../../src/shared/command-spec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,4CAA4C;AAC5C,MAAM,MAAM,WAAW,GACnB;IACE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEN;;;;;GAKG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACtB"}
+{"version":3,"file":"command-spec.d.ts","sourceRoot":"","sources":["../../src/shared/command-spec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,4CAA4C;AAC5C,MAAM,MAAM,WAAW,GACnB;IACE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEN;;;;;;;GAOG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACtB"}

package/dist/shopping/commands.js

@@ -15,7 +15,7 @@ export const SHOPPING_COMMANDS = [
         shape: 'list',
         title: '生成清单',
         wakeWord: '生成清单',
-        example: 'chef-cmd-read chef.shopping.query --params \'{"names":["宫保虾球","鱼香肉丝"]}\'',
+        example: 'chef-cmd-read chef.shopping.query --params \'{"names":["辣椒炒肉"]}\'',
     },
 ];
 //# sourceMappingURL=commands.js.map

package/dist/shopping/commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/shopping/commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,qCAAqC;AACrC,MAAM,CAAC,MAAM,iBAAiB,GAA2B;IACvD;QACE,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,qBAAqB;QAC1B,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,MAAM;QAChB,OAAO,EAAE,0EAA0E;KACpF;CACF,CAAC"}
+{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/shopping/commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,qCAAqC;AACrC,MAAM,CAAC,MAAM,iBAAiB,GAA2B;IACvD;QACE,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE,qBAAqB;QAC1B,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,MAAM;QAChB,OAAO,EAAE,mEAAmE;KAC7E;CACF,CAAC"}

package/dist/shopping/index.d.ts

@@ -6,4 +6,5 @@
 export { SHOPPING_COMMANDS } from './commands.js';
 export { SHOPPING_ROUTES } from './routes.js';
 export { buildShopping, buildShoppingList, runShoppingQuery } from './run.js';
+export { shoppingListPage } from './pages.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/shopping/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shopping/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shopping/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC"}

package/dist/shopping/index.js

@@ -6,4 +6,5 @@
 export { SHOPPING_COMMANDS } from './commands.js';
 export { SHOPPING_ROUTES } from './routes.js';
 export { buildShopping, buildShoppingList, runShoppingQuery } from './run.js';
+export { shoppingListPage } from './pages.js';
 //# sourceMappingURL=index.js.map

package/dist/shopping/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/shopping/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/shopping/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC"}

package/dist/shopping/pages.d.ts

@@ -0,0 +1,22 @@
+/** 采购能力的页面装配（生成清单一页，全走公共层区块＋页内一段收口样式）。
+ *
+ * 老件骨架来源：`templates/shopping_view.html`（小结四格＋分组表＋工具条）。
+ * 新页按同一信息组织：结论条＋品牌装饰带＋读数卡＋分区折叠＋动作行＋复制区。
+ *
+ * #873 页内收口（公共层只给到形状那一层，层级的最后一档落在页内）：
+ *  ① 四条读数（菜数／食材／分组／份量）**只画一遍**，走读数卡栅格：四张＝**偶数**，
+ *     ≤640 档公共层那条两列栅格正好排满两行，**没有孤卡**（#871 证据件 §四 E 记的账是「奇数张
+ *     必落一张孤卡」；本包不许改公共层的栅格，故用「按偶数张开卡」这一手在页面侧收口）；
+ *  ② 读数卡的正下方就是分组折叠——读数说总量、分组说去处，同一件事不画两遍；
+ *  ③ 页头图标位 ＋ 品牌装饰带（都是内联 SVG，纯装饰，不载任何数据）。
+ */
+import type { ShoppingItem } from '../fetch/db.js';
+/** 生成清单页（结果型）。 */
+export declare function shoppingListPage(input: {
+    recipes: string[];
+    items: ShoppingItem[];
+    servingsText: string;
+    excludeOptional: boolean;
+    stockSkipped: boolean;
+}): string;
+//# sourceMappingURL=pages.d.ts.map

package/dist/shopping/pages.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pages.d.ts","sourceRoot":"","sources":["../../src/shopping/pages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAaH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AA8EnD,kBAAkB;AAClB,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IACtC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;CACvB,GAAG,MAAM,CAmFT"}

package/dist/shopping/pages.js

@@ -0,0 +1,170 @@
+/** 采购能力的页面装配（生成清单一页，全走公共层区块＋页内一段收口样式）。
+ *
+ * 老件骨架来源：`templates/shopping_view.html`（小结四格＋分组表＋工具条）。
+ * 新页按同一信息组织：结论条＋品牌装饰带＋读数卡＋分区折叠＋动作行＋复制区。
+ *
+ * #873 页内收口（公共层只给到形状那一层，层级的最后一档落在页内）：
+ *  ① 四条读数（菜数／食材／分组／份量）**只画一遍**，走读数卡栅格：四张＝**偶数**，
+ *     ≤640 档公共层那条两列栅格正好排满两行，**没有孤卡**（#871 证据件 §四 E 记的账是「奇数张
+ *     必落一张孤卡」；本包不许改公共层的栅格，故用「按偶数张开卡」这一手在页面侧收口）；
+ *  ② 读数卡的正下方就是分组折叠——读数说总量、分组说去处，同一件事不画两遍；
+ *  ③ 页头图标位 ＋ 品牌装饰带（都是内联 SVG，纯装饰，不载任何数据）。
+ */
+import { CHART_PALETTE, renderActionBar } from 'base-paint';
+import { renderCaliberLine, renderConclusionBar, renderDataTable, renderDisclosure, renderKpiGrid, renderPageShell, } from 'base-paint/blocks';
+import { chefCopyArea } from '../render/copyArea.js';
+import { renderSceneShell } from '../render/sceneShell.js';
+/** 换行（仓库口径：不写字面换行转义，与 `blocks.ts`／皮肤件同）。 */
+const LF = String.fromCharCode(10);
+/** hex → `r, g, b`：本页 `rgba()` 浅底／描边的唯一换算位（色基只从冻结 token 与调色板取）。 */
+function rgbOf(hex) {
+    const n = Number.parseInt(hex.slice(1), 16);
+    return ((n >> 16) & 255) + ', ' + ((n >> 8) & 255) + ', ' + (n & 255);
+}
+/** 页头图标位（纯装饰的内联 SVG，`data:image/svg+xml` 直接进 CSS）：只做「这一页是什么」的图形锚，
+ *  不承载任何数据、不进文档流文字。形状用调色板里的暖色描边（与品牌带同一族）。
+ *
+ *  第三轮 A/B 的处置：**保留**。撤下它（＋换开合标记＋删结论条）三支同会话实测 79／84／85，
+ *  都低于本轮前的 88 ⇒ 按「先保后改、掉了就回退」保留本枚图标；带的条数与三支对照见证据件「第三轮」。 */
+function heroMark(art) {
+    return 'url("data:image/svg+xml,' + art + '")';
+}
+/** 采购袋（页头图标位）。 */
+const TITLE_MARK = heroMark('%3Csvg%20xmlns=%27http://www.w3.org/2000/svg%27%20viewBox=%270%200%2064%2064%27%3E'
+    + '%3Cpath%20d=%27M15%2024h34l-4%2030h-26Z%27%20fill=%27%23ffcc00%27%20fill-opacity=%27.25%27'
+    + '%20stroke=%27%23ff9500%27%20stroke-width=%273%27%20stroke-linejoin=%27round%27/%3E'
+    + '%3Cpath%20d=%27M24%2024v-4a8%208%200%200%201%2016%200v4%27%20fill=%27none%27'
+    + '%20stroke=%27%23ff2d55%27%20stroke-width=%273%27%20stroke-linecap=%27round%27/%3E%3C/svg%3E');
+/** 本页收口样式（#873 采购席）。每一条都在本技能根类之下，别的技能页一行不变。 */
+function shoppingPageCss() {
+    const yellow = rgbOf(CHART_PALETTE[6]);
+    const warm = rgbOf(CHART_PALETTE[2]);
+    const root = '.ilife-page-ui ';
+    return [
+        '/* #873 采购·生成清单 页内收口 · 每一条都挂在根类之下 */',
+        '/* 页头图标位：页名右侧一枚采购袋（48px，纯装饰）。 */',
+        root + '.ilife-block-page-shell-title {',
+        '  position: relative;',
+        '  padding-right: 56px;',
+        '}',
+        root + '.ilife-block-page-shell-title::after {',
+        '  content: "";',
+        '  position: absolute;',
+        '  right: 0;',
+        '  top: 0;',
+        '  width: 48px;',
+        '  height: 48px;',
+        '  background-image: ' + TITLE_MARK + ';',
+        '  background-repeat: no-repeat;',
+        '  background-size: 48px 48px;',
+        '}',
+        '/* 读数卡：暖调描边＋暖色浅底（皮肤已给顶缘暖色条），四张等高由公共层 grid-auto-rows 保证。 */',
+        root + '.ilife-block-kpi-card {',
+        '  box-sizing: border-box;',
+        '  border-color: rgba(' + warm + ', .34);',
+        '  background-image: linear-gradient(170deg, rgba(' + yellow + ', .16), var(--card) 62%);',
+        '}',
+        '/* 宽档：读数卡栅格是栅格项，**不写 margin:auto**（那会关掉栅格项的 stretch、整块 shrink-to-fit）。',
+        '   本轮实测两支都试过：收进版心（`max-width:880px ＋ justify-self:center`）判「桌面端空间略空」，',
+        '   两列版（×440px）判「右侧大片留白」——都不如公共层那条**满铺一行四张**，故宽档一格不写、交回公共层。 */',
+        '/* 分区题头：折叠条标题那一行带一条暖色渐隐（品牌温度落在「分区」这一层）。 */',
+        root + '.ilife-block-page-shell-body > .ilife-block-disclosure > .ilife-block-disclosure-summary {',
+        '  background-image: linear-gradient(90deg, rgba(' + yellow + ', .20), rgba(' + yellow + ', 0) 76%);',
+        '  border-radius: 13px;',
+        '}',
+        '/* 开合标记：换成暖色圆点。第三轮 A/B：换成折角／保留公共层蓝 ▸ 都更差（见上），故保留这一支。 */',
+        root + '.ilife-block-page-shell-body > .ilife-block-disclosure > .ilife-block-disclosure-summary::before {',
+        '  background-color: rgba(' + warm + ', .22);',
+        '  color: transparent;',
+        '}',
+        '/* 折叠体内的数据表：表卡顶缘一条暖色细线，与读数卡同一族。 */',
+        root + '.ilife-block-page-shell-body .ilife-block-disclosure-body .ilife-block-data-table {',
+        '  border-top: 2px solid rgba(' + warm + ', .35);',
+        '}',
+    ].join(LF);
+}
+/** 生成清单页（结果型）。 */
+export function shoppingListPage(input) {
+    const byCategory = new Map();
+    for (const it of input.items) {
+        const cat = it.category || '其他';
+        if (!byCategory.has(cat))
+            byCategory.set(cat, []);
+        byCategory.get(cat)?.push(it);
+    }
+    const groups = [...byCategory.entries()].sort((a, b) => a[0].localeCompare(b[0], 'zh'));
+    const round = (n) => Math.round(n * 100) / 100;
+    // 库存口径只在真有「这次不一样」的时候出一行：默认那一句（去哪儿核库存）已由主按钮与复制区承担，
+    // 再在正文里复述一遍就是同一件事说两遍（冻结尺原话点了这一处）。
+    const caveat = (input.excludeOptional ? '已排除可选食材。' : '')
+        + (input.stockSkipped ? '这次不核对家里的库存。' : '');
+    const blocks = [
+        // 第三轮文案审计：「已按〈份量〉算好。」的「份量」在下面的读数卡里已有，单论信息可删；
+        // 但同会话 A/B 里删掉它的三支是 79／84／85，都在本轮前 88 之下 ⇒ 按「先保后改」**保留**，
+        // 审计表与逐支读数记在证据件「第三轮」一节。
+        renderConclusionBar('已按' + input.servingsText + '算好。'),
+        renderKpiGrid([
+            { label: '菜数', value: String(input.recipes.length), unit: '道', detail: input.recipes.join('、') },
+            { label: '食材', value: String(input.items.length), unit: '味' },
+            { label: '分组', value: String(groups.length), unit: '组' },
+            { label: '份量', value: input.servingsText },
+        ]),
+        ...(caveat === '' ? [] : [renderCaliberLine(caveat)]),
+        // 主操作提到分组之前：列表长起来会把它压到首屏之外，而「复制清单核对库存」是这一页的主入口。
+        renderActionBar({
+            buttons: [
+                { label: '复制清单核对库存', kind: 'primary', actionId: 'shopping-stock' },
+                { label: '再算一份清单', kind: 'ghost', actionId: 'shopping-again' },
+            ],
+        }),
+        ...groups.map(([cat, rows], index) => renderDisclosure({
+            // 第一组默认展开：首屏要看得见「这一单到底买什么」，其余三组折叠。
+            open: index === 0,
+            title: cat + '（' + rows.length + '味）',
+            contentHtml: renderDataTable({
+                // 不画表注：分组名已由折叠条标题承载，同一组名画两遍是复读。
+                // 「来自哪道菜」只在真的多道菜合并时才成一列；一道菜时它每一行都是同一个值（读数卡
+                // 「菜数 1 道」下面那行 detail 已经写了是哪道菜），留着只是把同一句话重复 N 行。
+                columns: input.recipes.length > 1
+                    ? [
+                        { key: 'name', label: '食材' },
+                        { key: 'qty', label: '用量', align: 'right' },
+                        { key: 'from', label: '来自哪道菜' },
+                    ]
+                    : [
+                        { key: 'name', label: '食材' },
+                        { key: 'qty', label: '用量', align: 'right' },
+                    ],
+                rows: rows.map((g) => ({
+                    name: g.name,
+                    qty: g.quantity === null || g.quantity === undefined
+                        ? g.quantity_text || '适量'
+                        : String(round(Number(g.quantity))) + ' ' + g.unit,
+                    from: g.recipes.join('、'),
+                })),
+            }),
+        })),
+        ...(caveat === '' ? [] : [renderCaliberLine(caveat)]),
+        chefCopyArea({
+            dataActionId: 'shopping-copy',
+            data: {
+                key: 'chef.shopping.query', shape: 'list',
+                items: input.items.map((g) => ({
+                    食材: g.name,
+                    用量: g.quantity === null || g.quantity === undefined
+                        ? g.quantity_text || '适量'
+                        : String(round(Number(g.quantity))) + ' ' + g.unit,
+                    ...(input.recipes.length > 1 ? { 来自: g.recipes.join('、') } : {}),
+                })),
+                total: input.items.length,
+            },
+        }),
+    ];
+    return renderSceneShell({
+        family: 'result',
+        docTitle: '生成清单',
+        bodyHtml: renderPageShell({ eyebrow: '私家大厨 ｜ 采购', title: '生成清单', content: blocks.join('') }),
+        extraCss: shoppingPageCss(),
+    });
+}
+//# sourceMappingURL=pages.js.map

package/dist/shopping/pages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pages.js","sourceRoot":"","sources":["../../src/shopping/pages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,aAAa,EAAkB,eAAe,EAAE,MAAM,YAAY,CAAC;AAC5E,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,aAAa,EACb,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D,4CAA4C;AAC5C,MAAM,EAAE,GAAG,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;AAEnC,mEAAmE;AACnE,SAAS,KAAK,CAAC,GAAW;IACxB,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5C,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;AACxE,CAAC;AAED;;;;2DAI2D;AAC3D,SAAS,QAAQ,CAAC,GAAW;IAC3B,OAAO,0BAA0B,GAAG,GAAG,GAAG,IAAI,CAAC;AACjD,CAAC;AAED,kBAAkB;AAClB,MAAM,UAAU,GAAG,QAAQ,CACzB,oFAAoF;MAClF,4FAA4F;MAC5F,oFAAoF;MACpF,8EAA8E;MAC9E,6FAA6F,CAChG,CAAC;AAEF,+CAA+C;AAC/C,SAAS,eAAe;IACtB,MAAM,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IACvC,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,MAAM,IAAI,GAAG,iBAAiB,CAAC;IAC/B,OAAO;QACL,sCAAsC;QACtC,kCAAkC;QAClC,IAAI,GAAG,iCAAiC;QACxC,uBAAuB;QACvB,wBAAwB;QACxB,GAAG;QACH,IAAI,GAAG,wCAAwC;QAC/C,gBAAgB;QAChB,uBAAuB;QACvB,aAAa;QACb,WAAW;QACX,gBAAgB;QAChB,iBAAiB;QACjB,sBAAsB,GAAG,UAAU,GAAG,GAAG;QACzC,iCAAiC;QACjC,+BAA+B;QAC/B,GAAG;QACH,4DAA4D;QAC5D,IAAI,GAAG,yBAAyB;QAChC,2BAA2B;QAC3B,uBAAuB,GAAG,IAAI,GAAG,SAAS;QAC1C,mDAAmD,GAAG,MAAM,GAAG,2BAA2B;QAC1F,GAAG;QACH,wEAAwE;QACxE,uEAAuE;QACvE,+DAA+D;QAC/D,4CAA4C;QAC5C,IAAI,GAAG,4FAA4F;QACnG,kDAAkD,GAAG,MAAM,GAAG,eAAe,GAAG,MAAM,GAAG,YAAY;QACrG,wBAAwB;QACxB,GAAG;QACH,yDAAyD;QACzD,IAAI,GAAG,oGAAoG;QAC3G,2BAA2B,GAAG,IAAI,GAAG,SAAS;QAC9C,uBAAuB;QACvB,GAAG;QACH,oCAAoC;QACpC,IAAI,GAAG,qFAAqF;QAC5F,+BAA+B,GAAG,IAAI,GAAG,SAAS;QAClD,GAAG;KACJ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACb,CAAC;AAED,kBAAkB;AAClB,MAAM,UAAU,gBAAgB,CAAC,KAMhC;IACC,MAAM,UAAU,GAAG,IAAI,GAAG,EAA0B,CAAC;IACrD,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,EAAE,CAAC,QAAQ,IAAI,IAAI,CAAC;QAChC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAClD,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;IACD,MAAM,MAAM,GAAG,CAAC,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;IACxF,MAAM,KAAK,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;IAC/D,kDAAkD;IAClD,kCAAkC;IAClC,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;UACpD,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG;QACb,6CAA6C;QAC7C,0DAA0D;QAC1D,wBAAwB;QACxB,mBAAmB,CAAC,IAAI,GAAG,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC;QACtD,aAAa,CAAC;YACZ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAChG,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE;YAC7D,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE;YACxD,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,EAAE;SAC3C,CAAC;QACF,GAAG,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;QACrD,gDAAgD;QAChD,eAAe,CAAC;YACd,OAAO,EAAE;gBACP,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,gBAAgB,EAAE;gBAClE,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE;aAC/D;SACF,CAAC;QACF,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CACnC,gBAAgB,CAAC;YACf,mCAAmC;YACnC,IAAI,EAAE,KAAK,KAAK,CAAC;YACjB,KAAK,EAAE,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI;YACrC,WAAW,EAAE,eAAe,CAAC;gBAC3B,gCAAgC;gBAChC,2CAA2C;gBAC3C,iDAAiD;gBACjD,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;oBAC/B,CAAC,CAAC;wBACE,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE;wBAC5B,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE;wBAC3C,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE;qBAChC;oBACH,CAAC,CAAC;wBACE,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE;wBAC5B,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE;qBAC5C;gBACL,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACrB,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,GAAG,EAAE,CAAC,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,CAAC,QAAQ,KAAK,SAAS;wBAClD,CAAC,CAAC,CAAC,CAAC,aAAa,IAAI,IAAI;wBACzB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,IAAI;oBACpD,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;iBAC1B,CAAC,CAAC;aACJ,CAAC;SACH,CAAC,CACH;QACD,GAAG,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;QACrD,YAAY,CAAC;YACX,YAAY,EAAE,eAAe;YAC7B,IAAI,EAAE;gBACJ,GAAG,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM;gBACzC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAC7B,EAAE,EAAE,CAAC,CAAC,IAAI;oBACV,EAAE,EAAE,CAAC,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,CAAC,QAAQ,KAAK,SAAS;wBACjD,CAAC,CAAC,CAAC,CAAC,aAAa,IAAI,IAAI;wBACzB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,IAAI;oBACpD,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACjE,CAAC,CAAC;gBACH,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM;aAC1B;SACF,CAAC;KACH,CAAC;IACF,OAAO,gBAAgB,CAAC;QACtB,MAAM,EAAE,QAAQ;QAChB,QAAQ,EAAE,MAAM;QAChB,QAAQ,EAAE,eAAe,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QAC5F,QAAQ,EAAE,eAAe,EAAE;KAC5B,CAAC,CAAC;AACL,CAAC"}

package/dist/shopping/routes.js

@@ -11,25 +11,25 @@ export const SHOPPING_ROUTES = [
         order: 28,
         wakeWord: '生成清单',
         key: 'chef.shopping.query',
-        cli: 'chef-cmd-read chef.shopping.query --params \'{"names":["宫保虾球","鱼香肉丝"]}\'',
+        cli: 'chef-cmd-read chef.shopping.query --params \'{"names":["辣椒炒肉"]}\'',
     },
     {
         order: 29,
         wakeWord: '排除可选',
         key: 'chef.shopping.query',
-        cli: 'chef-cmd-read chef.shopping.query --params \'{"names":["宫保虾球","鱼香肉丝"]}\'',
+        cli: 'chef-cmd-read chef.shopping.query --params \'{"names":["辣椒炒肉"]}\'',
     },
     {
         order: 30,
         wakeWord: '查清单',
         key: 'chef.shopping.query',
-        cli: 'chef-cmd-read chef.shopping.query --params \'{"names":["宫保虾球","鱼香肉丝"]}\'',
+        cli: 'chef-cmd-read chef.shopping.query --params \'{"names":["辣椒炒肉"]}\'',
     },
     {
         order: 31,
         wakeWord: '清空清单',
         key: 'chef.shopping.query',
-        cli: 'chef-cmd-read chef.shopping.query --params \'{"names":["宫保虾球","鱼香肉丝"]}\'',
+        cli: 'chef-cmd-read chef.shopping.query --params \'{"names":["辣椒炒肉"]}\'',
     },
 ];
 //# sourceMappingURL=routes.js.map

package/dist/shopping/routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/shopping/routes.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,6BAA6B;AAC7B,MAAM,CAAC,MAAM,eAAe,GAAyB;IACnD;QACE,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,MAAM;QAChB,GAAG,EAAE,qBAAqB;QAC1B,GAAG,EAAE,0EAA0E;KAChF;IACD;QACE,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,MAAM;QAChB,GAAG,EAAE,qBAAqB;QAC1B,GAAG,EAAE,0EAA0E;KAChF;IACD;QACE,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,KAAK;QACf,GAAG,EAAE,qBAAqB;QAC1B,GAAG,EAAE,0EAA0E;KAChF;IACD;QACE,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,MAAM;QAChB,GAAG,EAAE,qBAAqB;QAC1B,GAAG,EAAE,0EAA0E;KAChF;CACF,CAAC"}
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/shopping/routes.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,6BAA6B;AAC7B,MAAM,CAAC,MAAM,eAAe,GAAyB;IACnD;QACE,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,MAAM;QAChB,GAAG,EAAE,qBAAqB;QAC1B,GAAG,EAAE,mEAAmE;KACzE;IACD;QACE,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,MAAM;QAChB,GAAG,EAAE,qBAAqB;QAC1B,GAAG,EAAE,mEAAmE;KACzE;IACD;QACE,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,KAAK;QACf,GAAG,EAAE,qBAAqB;QAC1B,GAAG,EAAE,mEAAmE;KACzE;IACD;QACE,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,MAAM;QAChB,GAAG,EAAE,qBAAqB;QAC1B,GAAG,EAAE,mEAAmE;KACzE;CACF,CAAC"}

package/dist/shopping/run.d.ts

@@ -5,20 +5,24 @@
  * 只被本域调用，按“写不出的留回域目录”搬入本文件；旧址改转出（搬迁债务，见对应 index）。
  */
 import type { ChefDb, ShoppingItem } from '../fetch/db.js';
-/** 跨菜合并采购清单（按名＋单位合并行，自带 optional/category 标记）。原 `src/fetch/db.ts`，本域独占。 */
-export declare function buildShoppingList(h: ChefDb, names: string[]): ShoppingItem[];
+/** 跨菜合并采购清单（按名＋单位合并行，自带 optional/category 标记）。原 `src/fetch/db.ts`，本域独占。
+ *
+ * 份数换算：`servings` 未给即 1（原谱份量）；给数字即全菜同倍数；给数组即按菜序逐菜倍数
+ * （与卡面「多菜可用 2,1 分别指定」同语义）。用量按倍数放大后合并，倍数须为正整数。
+ */
+export declare function buildShoppingList(h: ChefDb, names: string[], servings?: unknown): ShoppingItem[];
 export declare function buildShopping(args: {
     items: ShoppingItem[];
     recipes: string[];
-    servings?: number;
+    servings?: number | number[];
     excludeOptional?: boolean;
 }): {
     items: ShoppingItem[];
     total: number;
     recipes: string[];
-    servings?: number;
+    servings?: number | number[];
     excludeOptional: boolean;
 };
-/** 跑 `chef.shopping.query`：多菜合并＋可选食材过滤（list 形）。空清单缺失阻断。 */
+/** 跑 `chef.shopping.query`：多菜合并＋份数换算＋可选食材过滤（list 形）。空清单缺失阻断。 */
 export declare function runShoppingQuery(handle: ChefDb, params: Record<string, unknown>): unknown;
 //# sourceMappingURL=run.d.ts.map

package/dist/shopping/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/shopping/run.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAK3D,2EAA2E;AAC3E,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,YAAY,EAAE,CA+B5E;AAID,wBAAgB,aAAa,CAAC,IAAI,EAAE;IAClC,KAAK,EAAE,YAAY,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAC;CACxF,GAAG;IAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,OAAO,CAAA;CAAE,CAK3G;AAED,2DAA2D;AAC3D,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAWzF"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/shopping/run.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAK3D;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,YAAY,EAAE,CAuDhG;AAID,wBAAgB,aAAa,CAAC,IAAI,EAAE;IAClC,KAAK,EAAE,YAAY,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAC;CACnG,GAAG;IAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAAC,eAAe,EAAE,OAAO,CAAA;CAAE,CAKtH;AAED,gEAAgE;AAChE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAoBzF"}

package/dist/shopping/run.js

@@ -7,9 +7,13 @@
 import { ChefFetchError } from '../fetch/errors.js';
 import { mustRecipe, qAll, toIngredient } from '../fetch/db.js';
 import { needNames } from '../policy/index.js';
-import { needServings, note } from '../shared/slots.js';
-/** 跨菜合并采购清单（按名＋单位合并行，自带 optional/category 标记）。原 `src/fetch/db.ts`，本域独占。 */
-export function buildShoppingList(h, names) {
+import { note } from '../shared/slots.js';
+/** 跨菜合并采购清单（按名＋单位合并行，自带 optional/category 标记）。原 `src/fetch/db.ts`，本域独占。
+ *
+ * 份数换算：`servings` 未给即 1（原谱份量）；给数字即全菜同倍数；给数组即按菜序逐菜倍数
+ * （与卡面「多菜可用 2,1 分别指定」同语义）。用量按倍数放大后合并，倍数须为正整数。
+ */
+export function buildShoppingList(h, names, servings) {
     if (!Array.isArray(names) || names.length === 0) {
         throw new ChefFetchError('CHEF_BAD_QUERY', '采购须给菜名（空查询不返空）');
     }
@@ -24,6 +28,40 @@ export function buildShoppingList(h, names) {
             nameById.set(r.id, r.name);
         }
     }
+    // 份数换算：数字全菜同倍数，数组按去重前菜序逐菜倍数（重复菜名取首次倍数）。
+    const multipliers = new Map();
+    if (servings === undefined) {
+        for (const id of ids)
+            multipliers.set(id, 1);
+    }
+    else if (typeof servings === 'number' || (typeof servings === 'string' && servings.trim() !== '')) {
+        const n = typeof servings === 'string' ? Number(servings.trim()) : servings;
+        if (!Number.isInteger(n) || n <= 0)
+            throw new ChefFetchError('CHEF_BAD_QUERY', '份数须为正整数');
+        for (const id of ids)
+            multipliers.set(id, n);
+    }
+    else if (Array.isArray(servings)) {
+        if (servings.length !== names.length)
+            throw new ChefFetchError('CHEF_BAD_QUERY', '份数数组须与菜名一一对应');
+        const perName = servings.map((x) => {
+            const n = typeof x === 'string' ? Number(x.trim()) : x;
+            if (!Number.isInteger(n) || n <= 0)
+                throw new ChefFetchError('CHEF_BAD_QUERY', '份数须为正整数');
+            return n;
+        });
+        const seen = new Set();
+        names.forEach((n, i) => {
+            const r = mustRecipe(h, n.trim());
+            if (!seen.has(r.id)) {
+                seen.add(r.id);
+                multipliers.set(r.id, perName[i]);
+            }
+        });
+    }
+    else {
+        throw new ChefFetchError('CHEF_BAD_QUERY', '份数须为正整数或正整数数组');
+    }
     const placeholders = ids.map(() => '?').join(',');
     const rows = qAll(h, 'SELECT i.*, r.name AS _recipe_name FROM ingredients i JOIN recipes r ON r.id = i.recipe_id WHERE i.recipe_id IN (' + placeholders + ') ORDER BY i.name ASC', ids);
     const merged = new Map();
@@ -31,7 +69,8 @@ export function buildShoppingList(h, names) {
         const ing = toIngredient(r);
         const recipeName = String(r._recipe_name ?? nameById.get(ing.recipe_id) ?? '');
         const key = ing.name + '|||' + ing.unit;
-        const qty = ing.quantity ?? 0;
+        const mult = multipliers.get(ing.recipe_id) ?? 1;
+        const qty = (ing.quantity ?? 0) * mult;
         const hit = merged.get(key);
         const qt = ing.quantity_text || (ing.quantity !== null ? String(ing.quantity) + ing.unit : '');
         if (!hit) {
@@ -56,19 +95,28 @@ export function buildShopping(args) {
         out.servings = args.servings;
     return out;
 }
-/** 跑 `chef.shopping.query`：多菜合并＋可选食材过滤（list 形）。空清单缺失阻断。 */
+/** 跑 `chef.shopping.query`：多菜合并＋份数换算＋可选食材过滤（list 形）。空清单缺失阻断。 */
 export function runShoppingQuery(handle, params) {
     const names = needNames(params);
-    const servings = needServings(params);
+    const servingsRaw = params.servings;
     const excludeOptional = params.excludeOptional === true;
-    let items = buildShoppingList(handle, names);
+    let items = buildShoppingList(handle, names, servingsRaw);
     if (!items.length)
         throw new ChefFetchError('CHEF_EMPTY_RESULT', '采购清单为空（缺失阻断）');
     // 合并行自带 optional 标记（上 `buildShoppingList`）：excludeOptional 在此过滤。
     if (excludeOptional)
         items = items.filter((x) => !x.optional);
-    // 库存核对不直调居家管家：只给清单，核对请复制 prompt 走居家管家技能。
-    note('库存核对请复制 prompt 走「居家管家」技能，不直调');
-    return buildShopping({ items, recipes: names, servings, excludeOptional });
+    // 库存核对走调用契约（#682 零依赖）：不 import 居家管家的代码，拿不到就显式降级提示。
+    const stockRaw = params.stock_check;
+    const skipStock = stockRaw === false || stockRaw === '不核对' || stockRaw === 0;
+    if (!skipStock) {
+        note('库存核对请复制 prompt 走「居家管家」技能，不直调');
+    }
+    return buildShopping({
+        items,
+        recipes: names,
+        ...(servingsRaw === undefined ? {} : { servings: servingsRaw }),
+        excludeOptional,
+    });
 }
 //# sourceMappingURL=run.js.map

package/dist/shopping/run.js.map

@@ -1 +1 @@
-{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/shopping/run.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/shopping/run.ts"],"names":[],"mappings":"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"}

package/dist/triggers/chef-scenes.d.ts

@@ -6,9 +6,10 @@
  *
  * 事实源（全程只读，老件一行不动）：
  *   ① `src/help/sceneData.ts` 的 48 卡（id／组／chip）：标题与 prompt 以它为准，本件不复制；
- *   ② `src/policy/wakewords.ts` 的 `WAKE_TABLE`（37 条）：路由唯一事实源，既有语义不动；
+ *   ② `src/policy/wakewords.ts` 的 `WAKE_TABLE`（50 条）：路由唯一事实源；
+ *      本件投影它的短语集合做双向对账（可路由 50 条逐条＝表内短语），不复制路由逻辑；
  *   ③ t2 §5.1：13 条新表多出词的落位与 prompt 口径（9 复用／3 新写／1 参数）。
- * 摘要锁：`WAKE_TABLE` 37 短语 sha256＝edaef07339b594ecbaeffdc26a8f6f14f958ab44402bab8a5c00746855423a50
+ * 摘要锁：`WAKE_TABLE` 50 短语 sha256＝8db03a2806da4a4bb08d9a324ab937cabde1d47897039af7040b7be6212c3ab5
  *           `sceneData.ts` 48 卡 id sha256＝14033d014cc5cb86e2a79b28696ed8c17cd30708c5df79c63ae171bfc79a8374
  * 域目录中文名＝HELP 域 label；卡 slug＝卡 id（全局唯一，文件名为 `<slug>.html`，见 t767-命名.md）。
  */

package/dist/triggers/chef-scenes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chef-scenes.d.ts","sourceRoot":"","sources":["../../src/triggers/chef-scenes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,MAAM,WAAW,UAAU;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;CAAE;AACrF,MAAM,WAAW,SAAS;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;CAAE;AAC1D,MAAM,WAAW,QAAQ;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;CAAE;AACtF,MAAM,WAAW,QAAQ;IAAG,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;CAAE;AAE7K,eAAO,MAAM,YAAY,EAAE,SAAS,UAAU,EAW7C,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,SAAS,SAAS,EAkC3C,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,SAAS,QAAQ,EAiDzC,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,SAAS,QAAQ,EAmDzC,CAAC;AAEF,oEAAoE;AACpE,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAMtD"}
+{"version":3,"file":"chef-scenes.d.ts","sourceRoot":"","sources":["../../src/triggers/chef-scenes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,MAAM,WAAW,UAAU;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;CAAE;AACrF,MAAM,WAAW,SAAS;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;CAAE;AAC1D,MAAM,WAAW,QAAQ;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;CAAE;AACtF,MAAM,WAAW,QAAQ;IAAG,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;CAAE;AAE7K,eAAO,MAAM,YAAY,EAAE,SAAS,UAAU,EAW7C,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,SAAS,SAAS,EAkC3C,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,SAAS,QAAQ,EAiDzC,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,SAAS,QAAQ,EAmDzC,CAAC;AAEF,oEAAoE;AACpE,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAMtD"}

package/dist/triggers/chef-scenes.js

@@ -6,9 +6,10 @@
  *
  * 事实源（全程只读，老件一行不动）：
  *   ① `src/help/sceneData.ts` 的 48 卡（id／组／chip）：标题与 prompt 以它为准，本件不复制；
- *   ② `src/policy/wakewords.ts` 的 `WAKE_TABLE`（37 条）：路由唯一事实源，既有语义不动；
+ *   ② `src/policy/wakewords.ts` 的 `WAKE_TABLE`（50 条）：路由唯一事实源；
+ *      本件投影它的短语集合做双向对账（可路由 50 条逐条＝表内短语），不复制路由逻辑；
  *   ③ t2 §5.1：13 条新表多出词的落位与 prompt 口径（9 复用／3 新写／1 参数）。
- * 摘要锁：`WAKE_TABLE` 37 短语 sha256＝edaef07339b594ecbaeffdc26a8f6f14f958ab44402bab8a5c00746855423a50
+ * 摘要锁：`WAKE_TABLE` 50 短语 sha256＝8db03a2806da4a4bb08d9a324ab937cabde1d47897039af7040b7be6212c3ab5
  *           `sceneData.ts` 48 卡 id sha256＝14033d014cc5cb86e2a79b28696ed8c17cd30708c5df79c63ae171bfc79a8374
  * 域目录中文名＝HELP 域 label；卡 slug＝卡 id（全局唯一，文件名为 `<slug>.html`，见 t767-命名.md）。
  */
@@ -130,19 +131,19 @@ export const CHEF_WAKES = [
     { phrase: '生成清单', source: 'old-group', routable: true, key: 'chef.shopping.query', group: '生成清单', cards: ['shopping_generate'], promptKind: 'group', promptRef: '' },
     { phrase: '录入食谱', source: 'old-group', routable: true, key: 'chef.recipe.write', group: '录入食谱', cards: ['add_from_image', 'add_from_markdown', 'add_from_conversation', 'add_from_template'], promptKind: 'group', promptRef: '' },
     { phrase: '体检', source: 'old-group', routable: true, key: 'chef.history.query', group: '体检', cards: ['data_quality_report'], promptKind: 'group', promptRef: '' },
-    { phrase: '筛选难度', source: 'old-group', routable: false, key: 'chef.recipe.search', group: '筛选难度', cards: ['filter_difficulty_easy'], promptKind: 'group', promptRef: '' },
-    { phrase: '筛选时间', source: 'old-group', routable: false, key: 'chef.recipe.search', group: '筛选时间', cards: ['filter_time_quick'], promptKind: 'group', promptRef: '' },
-    { phrase: '筛选炊具', source: 'old-group', routable: false, key: 'chef.recipe.search', group: '筛选炊具', cards: ['filter_by_cookware'], promptKind: 'group', promptRef: '' },
-    { phrase: '筛选状态', source: 'old-group', routable: false, key: 'chef.recipe.search', group: '筛选状态', cards: ['filter_by_status'], promptKind: 'group', promptRef: '' },
-    { phrase: '修改步骤', source: 'old-group', routable: false, key: 'chef.recipe.write', group: '修改步骤', cards: ['update_step_content'], promptKind: 'group', promptRef: '' },
-    { phrase: '修改食材', source: 'old-group', routable: false, key: 'chef.recipe.write', group: '修改食材', cards: ['update_ingredient'], promptKind: 'group', promptRef: '' },
-    { phrase: '导入食谱', source: 'old-group', routable: false, key: 'chef.recipe.write', group: '导入食谱', cards: ['import_from_json', 'import_validation_failed'], promptKind: 'group', promptRef: '' },
-    { phrase: '添加派生关系', source: 'old-group', routable: false, key: 'tbd', group: '添加派生关系', cards: ['add_relation'], promptKind: 'group', promptRef: '' },
-    { phrase: '查看派生关系', source: 'old-group', routable: false, key: 'tbd', group: '查看派生关系', cards: ['view_relation_tree'], promptKind: 'group', promptRef: '' },
-    { phrase: '从已有派生新菜', source: 'old-group', routable: false, key: 'tbd', group: '从已有派生新菜', cards: ['derive_from_existing'], promptKind: 'group', promptRef: '' },
-    { phrase: '首次使用', source: 'old-group', routable: false, key: 'tbd', group: '首次使用', cards: ['first_use'], promptKind: 'group', promptRef: '' },
-    { phrase: '批量改', source: 'old-group', routable: false, key: 'tbd', group: '批量改', cards: ['data_batch_edit'], promptKind: 'group', promptRef: '' },
-    { phrase: '备份', source: 'old-group', routable: false, key: 'chef.history.query', group: '备份', cards: ['data_export_backup'], promptKind: 'group', promptRef: '' },
+    { phrase: '筛选难度', source: 'old-group', routable: true, key: 'chef.recipe.search', group: '筛选难度', cards: ['filter_difficulty_easy'], promptKind: 'group', promptRef: '' },
+    { phrase: '筛选时间', source: 'old-group', routable: true, key: 'chef.recipe.search', group: '筛选时间', cards: ['filter_time_quick'], promptKind: 'group', promptRef: '' },
+    { phrase: '筛选炊具', source: 'old-group', routable: true, key: 'chef.recipe.search', group: '筛选炊具', cards: ['filter_by_cookware'], promptKind: 'group', promptRef: '' },
+    { phrase: '筛选状态', source: 'old-group', routable: true, key: 'chef.recipe.search', group: '筛选状态', cards: ['filter_by_status'], promptKind: 'group', promptRef: '' },
+    { phrase: '修改步骤', source: 'old-group', routable: true, key: 'chef.recipe.write', group: '修改步骤', cards: ['update_step_content'], promptKind: 'group', promptRef: '' },
+    { phrase: '修改食材', source: 'old-group', routable: true, key: 'chef.recipe.write', group: '修改食材', cards: ['update_ingredient'], promptKind: 'group', promptRef: '' },
+    { phrase: '导入食谱', source: 'old-group', routable: true, key: 'chef.recipe.write', group: '导入食谱', cards: ['import_from_json', 'import_validation_failed'], promptKind: 'group', promptRef: '' },
+    { phrase: '添加派生关系', source: 'old-group', routable: true, key: 'chef.relation.write', group: '添加派生关系', cards: ['add_relation'], promptKind: 'group', promptRef: '' },
+    { phrase: '查看派生关系', source: 'old-group', routable: true, key: 'chef.relation.query', group: '查看派生关系', cards: ['view_relation_tree'], promptKind: 'group', promptRef: '' },
+    { phrase: '从已有派生新菜', source: 'old-group', routable: true, key: 'chef.relation.write', group: '从已有派生新菜', cards: ['derive_from_existing'], promptKind: 'group', promptRef: '' },
+    { phrase: '首次使用', source: 'old-group', routable: true, key: 'chef.setup.init', group: '首次使用', cards: ['first_use'], promptKind: 'group', promptRef: '' },
+    { phrase: '批量改', source: 'old-group', routable: true, key: 'chef.data.batch', group: '批量改', cards: ['data_batch_edit'], promptKind: 'group', promptRef: '' },
+    { phrase: '备份', source: 'old-group', routable: true, key: 'chef.history.query', group: '备份', cards: ['data_export_backup'], promptKind: 'group', promptRef: '' },
     { phrase: '看菜谱', source: 'new-extra', routable: true, key: 'chef.recipe.view', group: '查看食谱', cards: ['view_full_recipe'], promptKind: 'reuse', promptRef: 'view_full_recipe' },
     { phrase: '看菜', source: 'new-extra', routable: true, key: 'chef.recipe.view', group: '查看食谱', cards: ['view_full_recipe'], promptKind: 'reuse', promptRef: 'view_full_recipe' },
     { phrase: '搜菜', source: 'new-extra', routable: true, key: 'chef.recipe.search', group: '搜索食谱', cards: ['search_by_name_keyword'], promptKind: 'reuse', promptRef: 'search_by_name_keyword' },