weaver-work-cli 0.1.39 → 0.1.42

package/dist/chunks/{chunk-F2EQXUEE.js → chunk-3KTFS4IA.js}

@@ -24,7 +24,7 @@ import {
   createFetchTimingSink,
   hasXiaoEEnv,
   runWithFetchTiming
-} from "./chunk-XXJOSZTQ.js";
+} from "./chunk-FOAA27U5.js";
 
 // src/shortcuts/workflow/operations/form.ts
 import { randomUUID } from "node:crypto";
@@ -5140,6 +5140,10 @@ var READONLY_COMPONENTS = /* @__PURE__ */ new Set([
   "subtablecontrol",
   "mobileinteraction"
 ]);
+function isBrowserLikeComponentKey(componentKey) {
+  const normalized = String(componentKey ?? "").toLowerCase();
+  return normalized === "einvoicecomponent" || normalized === "filecomponent";
+}
 var SYSTEM_FIELD_KEYS = {
   REQUEST_NAMEL: "\u6D41\u7A0B\u6807\u9898",
   REQUEST_LEVEL: "\u7D27\u6025\u7A0B\u5EA6",
@@ -6519,6 +6523,7 @@ async function buildCreateFormData(workflowId, env, options = {}) {
     for (const key of ["isBrowser", "isSelect", "isMultiple", "browserType", "browserModule"]) {
       if (field[key]) item[key] = field[key];
     }
+    if (!item.isBrowser && isBrowserLikeComponentKey(field.componentKey)) item.isBrowser = true;
     if (String(field.componentKey ?? "").toLowerCase() === "employeescope") item.isEmployeeScope = true;
     if (String(field.componentKey ?? "").toLowerCase() === "einvoicecomponent") item.isEinvoice = true;
     if (String(field.componentKey ?? "").toLowerCase() === "filecomponent") {
@@ -8311,7 +8316,7 @@ function xiaoECustomParams(preview, fields) {
   const browserFieldIds = /* @__PURE__ */ new Set();
   for (const field of toArray(fields)) {
     const id = String(field?.id ?? "").trim();
-    if (id && field?.isBrowser) browserFieldIds.add(id);
+    if (id && (field?.isBrowser || isBrowserLikeComponentKey(field?.componentKey))) browserFieldIds.add(id);
   }
   for (const item of toArray(preview)) {
     const fieldId = String(item?.fieldId ?? "").trim();
@@ -9963,6 +9968,7 @@ var STAGE_VALUES = [
   "smartGroup",
   "summaryContext",
   "summary",
+  "subGroup",
   "groupSummaryContext",
   "groupSummary",
   "aggregate"
@@ -10077,6 +10083,7 @@ var ALLOWED_INPUT_KEYS = [
   "aiGroupSummaries",
   "withDetailContext",
   "withGroupSummaryContext",
+  "withSubGroup",
   "detailPrefetch",
   "maxCharsPerBatch",
   "maxItemsPerBatch",
@@ -10094,6 +10101,7 @@ var ALLOWED_INPUT_KEYS = [
   "tabid",
   "tabName",
   "subCategory",
+  "isremarks",
   "workflow",
   "creator",
   "requestName",
@@ -10394,8 +10402,8 @@ function promptTagOf(prompt) {
   return String(prompt ?? "").trim();
 }
 function entryMatches(entry, maxChars, pk, dv) {
-  if (maxChars !== void 0 && (entry.maxChars ?? 50) !== maxChars) return false;
-  if (pk !== void 0 && (entry.pk ?? "") !== pk) return false;
+  if (pk !== void 0 && entry.pk !== pk) return false;
+  if (maxChars !== void 0 && entry.maxChars !== void 0 && entry.maxChars !== maxChars) return false;
   if (entry.dv !== void 0 && entry.dv !== dv) return false;
   return true;
 }
@@ -10405,7 +10413,7 @@ function normalizeSummaryEntry(raw) {
   if (typeof entry.summary !== "string" || !entry.summary.trim()) return null;
   if (typeof entry.cachedAt !== "number" || !Number.isFinite(entry.cachedAt)) return null;
   const maxChars = typeof entry.maxChars === "number" && Number.isFinite(entry.maxChars) ? entry.maxChars : void 0;
-  const pk = typeof entry.pk === "string" && entry.pk !== "" ? entry.pk : void 0;
+  const pk = typeof entry.pk === "string" ? entry.pk : void 0;
   const dv = typeof entry.dv === "string" && entry.dv !== "" ? entry.dv : void 0;
   return {
     summary: entry.summary,
@@ -10471,7 +10479,8 @@ async function openSummaryCache(ctx) {
         summary: text,
         cachedAt: Date.now(),
         ...maxChars === void 0 ? {} : { maxChars },
-        ...pk === void 0 || pk === "" ? {} : { pk },
+        // 空串同样落库（见 entryMatches 注释）：空口径与「缺 pk」必须能区分开。
+        ...pk === void 0 ? {} : { pk },
         ...dv === void 0 || dv === "" ? {} : { dv }
       });
       dirty = true;
@@ -10576,6 +10585,39 @@ function validateRuleFile(raw) {
     errors.push("rules \u5FC5\u987B\u662F\u6570\u7EC4");
     return errors;
   }
+  if (file.generalRules !== void 0) {
+    if (!file.generalRules || typeof file.generalRules !== "object" || Array.isArray(file.generalRules)) {
+      errors.push("generalRules \u5FC5\u987B\u662F\u5BF9\u8C61");
+    } else {
+      const identity = file.generalRules.identityFilter;
+      if (identity !== void 0) {
+        if (!identity || typeof identity !== "object" || Array.isArray(identity)) {
+          errors.push("generalRules.identityFilter \u5FC5\u987B\u662F\u5BF9\u8C61");
+        } else if (identity.defaultIsremarks !== void 0 && !/^\d+(,\d+)*$/.test(String(identity.defaultIsremarks).trim())) {
+          errors.push("generalRules.identityFilter.defaultIsremarks \u5FC5\u987B\u662F\u300C\u6570\u5B57\u9017\u53F7\u62FC\u63A5\u300D\u683C\u5F0F\uFF0C\u5982 0,1,2");
+        }
+        if (identity?.excludedCodes !== void 0 && (!Array.isArray(identity.excludedCodes) || identity.excludedCodes.some((c) => !/^\d+$/.test(String(c))))) {
+          errors.push("generalRules.identityFilter.excludedCodes \u5FC5\u987B\u662F\u6570\u5B57\u7801\u6570\u7EC4");
+        }
+      }
+      const priority = file.generalRules.priorityGroup;
+      if (priority !== void 0) {
+        if (!priority || typeof priority !== "object" || Array.isArray(priority)) {
+          errors.push("generalRules.priorityGroup \u5FC5\u987B\u662F\u5BF9\u8C61");
+        } else {
+          if (priority.title !== void 0 && (typeof priority.title !== "string" || !priority.title.trim())) {
+            errors.push("generalRules.priorityGroup.title \u5FC5\u987B\u662F\u975E\u7A7A\u5B57\u7B26\u4E32");
+          }
+          if (priority.rules !== void 0) {
+            const KNOWN_PRIORITY_RULES = ["overdue", "levelFallback"];
+            if (!Array.isArray(priority.rules) || priority.rules.length === 0 || priority.rules.some((r) => !KNOWN_PRIORITY_RULES.includes(String(r)))) {
+              errors.push(`generalRules.priorityGroup.rules \u53EA\u652F\u6301 ${KNOWN_PRIORITY_RULES.join("\u3001")}`);
+            }
+          }
+        }
+      }
+    }
+  }
   const defaultsExclude = validateExcludeFields(
     file.defaults?.excludeOriginFormDataFields,
     "defaults.excludeOriginFormDataFields"
@@ -10701,7 +10743,13 @@ function loadRules(options = {}) {
     }
   }
   return {
-    file: { schemaVersion: base.file.schemaVersion, defaults: { ...FALLBACK_DEFAULTS, ...base.file.defaults }, rules },
+    file: {
+      schemaVersion: base.file.schemaVersion,
+      defaults: { ...FALLBACK_DEFAULTS, ...base.file.defaults },
+      rules,
+      // 通用规则区（2026-11-03）：仅取 default.json 的定义；用户意图文件不参与通用规则
+      ...base.file.generalRules ? { generalRules: base.file.generalRules } : {}
+    },
     warnings,
     dir
   };
@@ -10874,6 +10922,9 @@ function activeRuleFor(workflowName) {
   if (!name) return null;
   return resolveRule(activeRules(), name)?.rule ?? null;
 }
+function generalRules() {
+  return activeRules().generalRules ?? null;
+}
 function resetActiveRules() {
   activeFile = null;
   activeDir = null;
@@ -10888,6 +10939,11 @@ function excludeTagFor(workflowName) {
   return excludeTagOf(excludeFieldsFor(workflowName));
 }
 
+// src/shortcuts/workflow/operations/todoSmartConvert/todoSmartConvert.collect.ts
+import { writeFileSync } from "node:fs";
+import { tmpdir as tmpdir2 } from "node:os";
+import { join as join3 } from "node:path";
+
 // src/shortcuts/workflow/operations/todoSmartConvert/todoListRows.ts
 var DISPLAY_ROW_FIELDS = [
   // 定位键
@@ -10951,18 +11007,15 @@ function projectDisplayRows(response) {
 var DETAIL_CACHE_FILE_NAME = "todo-detail-cache.json";
 var DETAIL_CACHE_TTL_MS = SUMMARY_CACHE_TTL_MS;
 var DETAIL_CACHE_PRUNE_INTERVAL_MS = SUMMARY_CACHE_PRUNE_INTERVAL_MS;
-var DETAIL_CACHE_ENTRY_VERSION = 3;
+var DETAIL_CACHE_ENTRY_VERSION = 4;
 function detailCacheKey(requestId, lastFeedBackDateTime) {
   const stamp = String(lastFeedBackDateTime ?? "").trim();
   return `${requestId}__${stamp}`;
 }
 function detailMaterialTagOf(entry) {
-  const basic = entry.basicInfo ?? {};
-  const basicKeys = Object.keys(basic).sort();
-  const material = JSON.stringify([
-    basicKeys.map((key) => [key, basic[key]]),
+  const material = JSON.stringify(
     (entry.fields ?? []).map((field) => [field.fieldName, field.value])
-  ]);
+  );
   let hash = 5381;
   for (let i = 0; i < material.length; i += 1) hash = (hash << 5) + hash + material.charCodeAt(i) >>> 0;
   return hash.toString(16);
@@ -10973,17 +11026,12 @@ function normalizeEntry(raw) {
   if (value.v !== DETAIL_CACHE_ENTRY_VERSION) return null;
   if (typeof value.cachedAt !== "number" || !Number.isFinite(value.cachedAt)) return null;
   if (typeof value.excludeTag !== "string") return null;
-  const basicInfo = {};
-  if (value.basicInfo && typeof value.basicInfo === "object") {
-    for (const [key, item] of Object.entries(value.basicInfo)) {
-      if (typeof item === "string") basicInfo[key] = item;
-    }
-  }
+  const workflowName = typeof value.workflowName === "string" ? value.workflowName : "";
   const fields = Array.isArray(value.fields) ? value.fields.filter((item) => Boolean(item) && typeof item.fieldName === "string" && typeof item.value === "string").map((item) => ({ fieldName: item.fieldName, value: item.value })) : [];
   const metrics = value.metrics && typeof value.metrics === "object" ? value.metrics : {};
   return {
     v: DETAIL_CACHE_ENTRY_VERSION,
-    basicInfo,
+    workflowName,
     fields,
     metrics,
     excludeTag: value.excludeTag,
@@ -11076,13 +11124,13 @@ function pickInternalMessageContentField(fields) {
   const content = named.find((item) => item.name === "\u5185\u5BB9" || item.name.endsWith("\u5185\u5BB9"));
   return content?.field;
 }
-function pickInternalMessageFieldPairs(fields, basicInfo = {}) {
+function pickInternalMessageFieldPairs(fields, basicInfo = {}, fallbackCreatorName) {
   const content = pickInternalMessageContentField(fields);
   const contentValue = String(content?.value ?? "").trim();
   if (!contentValue) return [];
   const name = normalizeDetailFieldName(content?.fieldName) || INTERNAL_MESSAGE_CONTENT_LABEL;
   const pairs = [{ fieldName: name, value: contentValue }];
-  const creatorName = String(basicInfo.creatorName ?? "").trim();
+  const creatorName = String(basicInfo.creatorName ?? fallbackCreatorName ?? "").trim();
   if (creatorName) pairs.push({ fieldName: INTERNAL_MESSAGE_INITIATOR_LABEL, value: creatorName });
   const createdAt = String(basicInfo.createdAt ?? "").trim();
   if (createdAt) pairs.push({ fieldName: INTERNAL_MESSAGE_TIME_LABEL, value: createdAt });
@@ -11335,6 +11383,11 @@ function isRetryable(error) {
   if (structured?.type === "network") return true;
   return structured?.retryable === true && structured?.type !== "authentication";
 }
+function userIdToCreatorName(options, requestId) {
+  const name = options.rowMeta?.get(requestId)?.createrName;
+  const text = String(name ?? "").trim();
+  return text === "" ? void 0 : text;
+}
 async function fetchOneDetail(env, requestId, userId, options) {
   const body = {
     requestId,
@@ -11355,28 +11408,26 @@ async function fetchOneDetail(env, requestId, userId, options) {
   const normalized = normalizeDetailResponse(response);
   const base = normalized?.basicInfo ?? {};
   const rawFields = Array.isArray(normalized?.formData?.fields) ? normalized.formData.fields : [];
-  const basicInfo = Object.fromEntries(
-    Object.entries(base).filter(([key]) => key !== "requestTitle" && key !== "flowName")
-  );
+  const workflowName = String(base.workflowName ?? "").trim();
   const usableFields = dropDistributionDetailFields(rawFields);
   const internalMessage = isInternalMessageDetail(
-    base.workflowName,
+    workflowName,
     usableFields.map((field) => field?.fieldName)
   );
   const cleanedFields = usableFields.map((field) => ({
     ...field,
     value: cleanFieldText(String(field?.value ?? ""))
   }));
-  const excludeFields = excludeFieldsFor(base.workflowName);
+  const excludeFields = excludeFieldsFor(workflowName);
   const excludeSet = new Set(excludeFields.map((name) => normalizeDetailFieldName(name)));
-  const picked = (internalMessage ? pickInternalMessageFieldPairs(cleanedFields, base) : cleanedFields.filter((field) => !excludeSet.has(normalizeDetailFieldName(field?.fieldName)))).slice(0, DETAIL_MATERIAL_FIELD_LIMIT).map((field) => ({
+  const picked = (internalMessage ? pickInternalMessageFieldPairs(cleanedFields, {}, userIdToCreatorName(options, requestId)) : cleanedFields.filter((field) => !excludeSet.has(normalizeDetailFieldName(field?.fieldName)))).slice(0, DETAIL_MATERIAL_FIELD_LIMIT).map((field) => ({
     fieldName: String(field?.fieldName ?? "").trim(),
     value: String(field?.value ?? "").slice(0, DETAIL_MATERIAL_VALUE_LIMIT)
   })).filter((field) => field.fieldName && field.value);
   const metrics = extractRowMetrics(usableFields);
   return {
     requestId,
-    basicInfo,
+    workflowName,
     formFields: picked,
     contextAvailable: picked.length > 0,
     excludeTag: excludeTagOf(excludeFields),
@@ -11431,7 +11482,7 @@ async function fetchRequestDetailsBatch(env, requestIds, options = {}) {
         failures.push({ requestId, error: reason });
         details.set(requestId, {
           requestId,
-          basicInfo: {},
+          workflowName: "",
           formFields: [],
           contextAvailable: false,
           excludeTag: "",
@@ -11459,9 +11510,7 @@ async function fetchRequestDetailsBatch(env, requestIds, options = {}) {
 
 // src/shortcuts/workflow/operations/todoSmartConvert/todoSmartConvert.detail.ts
 function contextOfDetail(detail) {
-  const basicLines = Object.entries(detail.basicInfo ?? {}).filter(([, value]) => String(value ?? "").trim() !== "").map(([key, value]) => `${key}:${String(value).trim()}`);
-  const fieldLines = (detail.formFields ?? []).map((field) => `${field.fieldName}:${field.value}`);
-  return [...basicLines, ...fieldLines].join("\n");
+  return (detail.formFields ?? []).map((field) => `${field.fieldName}:${field.value}`).join("\n");
 }
 var EMPTY_DETAIL_STATS = {
   requested: 0,
@@ -11487,7 +11536,7 @@ function stampsOfRows(rows) {
 function materialFieldsOf(detail) {
   return detail.formFields.map((field) => ({ fieldName: field.fieldName, value: field.value }));
 }
-async function fetchDetailFacts(env, requestIds, args, stamps) {
+async function fetchDetailFacts(env, requestIds, args, stamps, names, createrNames) {
   const unique = [...new Set(requestIds.filter(Boolean))];
   const facts = /* @__PURE__ */ new Map();
   const warnings = [];
@@ -11499,15 +11548,16 @@ async function fetchDetailFacts(env, requestIds, args, stamps) {
   const missing = [];
   for (const requestId of unique) {
     const hit = cache.get(requestId, stamps?.get(requestId));
-    if (!hit || hit.excludeTag !== excludeTagFor(hit.basicInfo.workflowName ?? "")) {
+    if (!hit || hit.excludeTag !== excludeTagFor(hit.workflowName ?? names?.get(requestId) ?? "")) {
       missing.push(requestId);
       continue;
     }
     facts.set(requestId, {
-      context: contextOfDetail({ basicInfo: hit.basicInfo, formFields: hit.fields }),
+      context: contextOfDetail({ formFields: hit.fields }),
       contextAvailable: hit.fields.length > 0,
       metrics: hit.metrics,
-      fields: hit.fields
+      fields: hit.fields,
+      workflowName: hit.workflowName || (names?.get(requestId) ?? "")
     });
     stats.cacheHit += 1;
   }
@@ -11516,7 +11566,8 @@ async function fetchDetailFacts(env, requestIds, args, stamps) {
     try {
       const { details, stats: fetchStats } = await fetchRequestDetailsBatch(env, missing, {
         concurrency: readBoundedInt(args.detailConcurrency, "detailConcurrency", 10, 1, 32),
-        timeoutMs: readBoundedInt(args.detailTimeoutMs, "detailTimeoutMs", 1e4, 1e3, 6e4)
+        timeoutMs: readBoundedInt(args.detailTimeoutMs, "detailTimeoutMs", 1e4, 1e3, 6e4),
+        ...createrNames ? { rowMeta: createrNames } : {}
       });
       stats.failed = fetchStats.failed;
       stats.concurrency = fetchStats.concurrency;
@@ -11525,7 +11576,8 @@ async function fetchDetailFacts(env, requestIds, args, stamps) {
           context: contextOfDetail(detail),
           contextAvailable: detail.formFields.length > 0,
           metrics: detail.metrics ?? {},
-          fields: materialFieldsOf(detail)
+          fields: materialFieldsOf(detail),
+          workflowName: detail.workflowName || (names?.get(requestId) ?? "")
         };
         facts.set(requestId, fact);
         stats.fetched += 1;
@@ -11533,7 +11585,7 @@ async function fetchDetailFacts(env, requestIds, args, stamps) {
         else stats.contextEmpty += 1;
         if (cache.set(requestId, stamps?.get(requestId), {
           v: DETAIL_CACHE_ENTRY_VERSION,
-          basicInfo: detail.basicInfo,
+          workflowName: fact.workflowName,
           metrics: fact.metrics,
           fields: fact.fields,
           excludeTag: detail.excludeTag
@@ -11638,18 +11690,19 @@ function isExpiringTodayRow(row, now = Date.now()) {
   if (row.overTime) return false;
   return isExpiringTodayUserOverTime(row.userOverTime, now);
 }
-function selectPriorityRows(rows) {
+function selectPriorityRows(rows, enabledRules) {
+  const rules = enabledRules ?? /* @__PURE__ */ new Set(["overdue", "levelFallback"]);
   let maxLevel = 0;
   for (const row of rows) {
     if (row.requestLevel > maxLevel) maxLevel = row.requestLevel;
   }
-  const targetLevel = maxLevel >= 2 ? 2 : maxLevel >= 1 ? 1 : void 0;
+  const targetLevel = rules.has("levelFallback") && maxLevel >= 2 ? 2 : rules.has("levelFallback") && maxLevel >= 1 ? 1 : void 0;
   const selected = [];
   let overdueCount = 0;
   let levelCount = 0;
   let bothCount = 0;
   for (const row of rows) {
-    const overdue = isOverdueRow(row);
+    const overdue = rules.has("overdue") && isOverdueRow(row);
     const byLevel = targetLevel !== void 0 && row.requestLevel >= targetLevel;
     if (overdue) overdueCount += 1;
     if (byLevel) levelCount += 1;
@@ -11779,11 +11832,8 @@ function runGroup(args) {
   const { rawCount, rows, duplicateCount, unreadableCount } = readItems(args.items);
   const groupBy = readGroupBy(args.groupBy);
   const topN = readTopN(args.topN);
-  const priority = selectPriorityRows(rows);
-  const priorityRows = sortPriorityRows(priority.rows);
-  const restRows = rows;
   const buckets = /* @__PURE__ */ new Map();
-  for (const row of restRows) {
+  for (const row of rows) {
     const key = groupKeyOf(row, groupBy);
     let bucket = buckets.get(key);
     if (!bucket) {
@@ -11806,16 +11856,8 @@ function runGroup(args) {
     stats: statsOf(bucket.rows),
     ...bucket.ids.length > 1 ? { workflowIds: bucket.ids } : {}
   }));
-  const groups = priorityRows.length > 0 && groupBy === "workflow" ? [{
-    id: PRIORITY_GROUP_ID,
-    topPriority: true,
-    title: PRIORITY_GROUP_TITLE,
-    count: priorityRows.length,
-    requestDatas: priorityRows.map((row) => toRequestData(row)),
-    stats: statsOf(priorityRows)
-  }, ...workflowGroups] : workflowGroups;
-  const displayedWorkflow = workflowGroups.slice(0, topN);
-  const displayed = priorityRows.length > 0 && groupBy === "workflow" ? [groups[0], ...displayedWorkflow] : displayedWorkflow;
+  const groups = workflowGroups;
+  const displayed = workflowGroups.slice(0, topN);
   const rest = workflowGroups.slice(topN);
   const restCount = rest.reduce((sum, group) => sum + group.count, 0);
   const overall = statsOf(rows);
@@ -11832,16 +11874,6 @@ function runGroup(args) {
       groupBy === "workflow" ? `\u6709 ${unknownGroupCount} \u6761\u7F3A\u5C11\u5DE5\u4F5C\u6D41\u540D\u79F0\uFF0C\u5DF2\u5F52\u5165\u300C${UNKNOWN_GROUP}\u300D` : `\u6709 ${unknownGroupCount} \u6761\u7F3A\u5C11\u5206\u7EC4\u5B57\u6BB5\uFF0C\u5DF2\u5F52\u5165\u300C${UNKNOWN_GROUP}\u300D`
     );
   }
-  if (priorityRows.length > 0 && groupBy === "workflow") {
-    const levelText = priority.targetLevel === 2 ? "\u7D27\u6025\uFF08requestLevel=2\uFF09" : priority.targetLevel === 1 ? "\u91CD\u8981\uFF08requestLevel=1\uFF1B\u672C\u6B21\u65E0 2 \u7EA7\u6570\u636E\uFF0C\u5DF2\u6309\u89C4\u5219\u964D\u7EA7\u53D6 1\uFF0C0 \u7EA7\u4E0D\u53D6\uFF09" : "\u65E0\u7B49\u7EA7\uFF08\u672C\u6B21\u6574\u6279\u6CA1\u6709 \u22651 \u7EA7\u7684\u6761\u76EE\uFF0C\u53EA\u6309\u8D85\u65F6\u7B5B\uFF09";
-    warnings.push(
-      `\u300C${PRIORITY_GROUP_TITLE}\u300D\u7B5B\u51FA ${priorityRows.length} \u6761\uFF1A\u8D85\u65F6 ${priority.overdueCount} \u6761 / \u7B49\u7EA7\u547D\u4E2D ${priority.levelCount} \u6761\uFF08\u4E24\u8005\u90FD\u6EE1\u8DB3 ${priority.bothCount} \u6761\uFF09\uFF0C\u7B49\u7EA7\u53E3\u5F84=${levelText}\uFF1B\u8FD9 ${priorityRows.length} \u6761\u540C\u65F6\u4FDD\u7559\u5728\u5404\u81EA\u5DE5\u4F5C\u6D41\u5206\u7EC4\u4E2D\uFF08\u53E0\u52A0\u89C6\u56FE\uFF1A\u03A3count \u4F1A\u5927\u4E8E totalCount\uFF0CtotalCount \u6309\u53BB\u91CD\u6761\u6570\u8BA1 = ${rows.length}\uFF09`
-    );
-  } else if (priorityRows.length === 0 && groupBy === "workflow") {
-    warnings.push(
-      `\u672C\u6B21\u6CA1\u6709\u8D85\u65F6\u6761\u76EE\uFF0C\u4E5F\u6CA1\u6709 requestLevel\u22651 \u7684\u6761\u76EE\uFF0C\u6545\u4E0D\u8F93\u51FA\u300C${PRIORITY_GROUP_TITLE}\u300D\u5206\u7EC4`
-    );
-  }
   if (rest.length > 0) {
     warnings.push(`markdown \u53EA\u5C55\u793A\u524D ${topN} \u4E2A\u5DE5\u4F5C\u6D41\u5206\u7EC4\uFF0C\u5176\u4F59 ${rest.length} \u7EC4\u5171 ${restCount} \u6761\u4ECD\u5728 wfIdGroup \u4E2D\uFF08\u672A\u622A\u65AD\uFF09`);
   }
@@ -11877,7 +11909,7 @@ function runGroup(args) {
     },
     wfIdGroup: groups,
     /** 第二部分（非优先组）的总条数与组数，前端折叠/分页直接用它，不用自己减 */
-    restTotal: restRows.length,
+    restTotal: rows.length,
     restGroupCount: workflowGroups.length,
     restGroups: rest.length > 0 ? { groupCount: rest.length, count: restCount } : null,
     warnings,
@@ -11900,7 +11932,7 @@ async function collectRawTodos(args, env) {
   const plannedPages = Math.max(1, Math.min(Math.ceil(limit / pageSize), MAX_FETCH_PAGES));
   const listEnv = guardListOnlyHost(env);
   const searchArgs = { category };
-  for (const key of ["tabid", "tabName", "subCategory", "workflow", "creator", "requestName", "receiveTime", "requestLevel"]) {
+  for (const key of ["tabid", "tabName", "subCategory", "isremarks", "workflow", "creator", "requestName", "receiveTime", "requestLevel"]) {
     const value = args[key];
     if (value !== void 0 && value !== null && value !== "") searchArgs[key] = value;
   }
@@ -11909,6 +11941,13 @@ async function collectRawTodos(args, env) {
   );
   if (!explicitTab) searchArgs.tabid = DEFAULT_TABID2;
   const warnings = [];
+  if (searchArgs.isremarks === void 0) {
+    const defaultIsremarks = generalRules()?.identityFilter?.defaultIsremarks?.trim();
+    if (defaultIsremarks) {
+      searchArgs.isremarks = defaultIsremarks;
+      warnings.push(`\u5DF2\u6309\u901A\u7528\u89C4\u5219\u9ED8\u8BA4\u6392\u9664\u6284\u9001\u7C7B\u8EAB\u4EFD\uFF08isremarks=${defaultIsremarks}\uFF09\uFF1B\u5982\u9700\u5305\u542B\u6284\u9001\uFF0C\u8BF7\u5728\u63D0\u793A\u8BCD\u4E2D\u8BF4\u660E`);
+    }
+  }
   if (cappedFrom !== void 0) {
     warnings.push(
       `\u5355\u6B21\u6700\u591A\u53EA\u80FD\u53D6 ${MAX_FETCH_LIMIT} \u6761\uFF08${MAX_FETCH_PAGES} \u6B21\u8BF7\u6C42 \xD7 ${FETCH_PAGE_SIZE} \u6761\uFF09\uFF0C\u4F60\u8981\u6C42\u7684 ${cappedFrom} \u6761\u5DF2\u6309\u4E0A\u9650 ${MAX_FETCH_LIMIT} \u6761\u5904\u7406\uFF1B\u5982\u9700\u8986\u76D6\u66F4\u591A\uFF0C\u8BF7\u7F29\u5C0F\u7B5B\u9009\u6761\u4EF6\uFF08\u5982\u6309\u5DE5\u4F5C\u6D41\u3001\u65F6\u95F4\u8303\u56F4\u5206\u6279\uFF09\u540E\u518D\u6C47\u603B`
@@ -11933,6 +11972,19 @@ async function collectRawTodos(args, env) {
       { ...searchArgs, current: pageNo, pageSize },
       "list"
     );
+    const isremarks = String(searchArgs.isremarks ?? "").trim();
+    if (isremarks !== "") {
+      query.params = { ...query.params || {}, isremarks };
+    }
+    if (process.env.WEAVER_WORK_CLI_DUMP_LIST_BODY) {
+      try {
+        writeFileSync(
+          join3(tmpdir2(), `weaver-list-body-page${pageNo}.json`),
+          JSON.stringify({ path: listPath, body: query }, null, 2)
+        );
+      } catch {
+      }
+    }
     const response = await listEnv.host.workflowRequest({
       method: "POST",
       path: listPath,
@@ -11972,6 +12024,46 @@ async function collectRawTodos(args, env) {
     if (items.length >= limit) break;
     if (pageRows.length < pageSize) break;
   }
+  const workflowNames = /* @__PURE__ */ new Map();
+  const createrNames = /* @__PURE__ */ new Map();
+  for (const row of items) {
+    if (!row.requestId) continue;
+    const name = String(row.workflowName ?? "").trim();
+    if (name) workflowNames.set(row.requestId, name);
+    if (row.createrName) createrNames.set(row.requestId, { createrName: row.createrName });
+  }
+  const detailBackfill = { requested: 0, cacheHit: 0, fetched: 0, failed: 0, nameFilled: 0 };
+  let allFacts = /* @__PURE__ */ new Map();
+  if (items.length > 0) {
+    const detailIds = [...new Set(items.map((row) => row.requestId).filter(Boolean))];
+    const { facts, stats } = await fetchDetailFacts(
+      env,
+      detailIds,
+      args,
+      stampsOfRows(items),
+      workflowNames,
+      createrNames
+    );
+    allFacts = facts;
+    detailBackfill.requested = stats.requested;
+    detailBackfill.cacheHit = stats.cacheHit;
+    detailBackfill.fetched = stats.fetched;
+    detailBackfill.failed = stats.failed;
+    for (const row of items) {
+      const fact = facts.get(row.requestId);
+      if (!fact) continue;
+      if (!String(row.workflowName ?? "").trim() && fact.workflowName) {
+        row.workflowName = fact.workflowName;
+        workflowNames.set(row.requestId, fact.workflowName);
+        detailBackfill.nameFilled += 1;
+      }
+    }
+    if (detailBackfill.nameFilled > 0) {
+      warnings.push(
+        `\u6709 ${detailBackfill.nameFilled} \u6761\u5217\u8868\u6570\u636E\u7F3A\u5C11\u5DE5\u4F5C\u6D41\u540D\u79F0\uFF0C\u5DF2\u7528\u6D41\u7A0B\u8BE6\u60C5\u6570\u636E\uFF08basic.workflowName\uFF09\u56DE\u586B`
+      );
+    }
+  }
   await saveSearchIndex(
     {
       items: items.map((row, index) => ({
@@ -12048,8 +12140,9 @@ async function collectRawTodos(args, env) {
       cachedSummaryIds.add(row.requestId);
     }
     detailStats = {
-      deferred: true,
-      note: "\u8BE6\u60C5\u4E0D\u9884\u53D6\uFF1AsmartGroup / summaryContext \u4F1A\u5728\u9700\u8981\u65F6\u73B0\u573A\u62C9\u53D6\uFF08\u8BE6\u60C5\u7F13\u5B58\u4F18\u5148\uFF09",
+      deferred: false,
+      note: "\u8BE6\u60C5\u5DF2\u5728 collect \u9636\u6BB5\u5168\u91CF\u56DE\u586B\uFF08\u7F13\u5B58\u4F18\u5148\uFF09\uFF1A\u4EC5 basic.workflowName \u4FDD\u7559\uFF0C\u5176\u4F59 basic \u5B57\u6BB5\u4E0E\u7D20\u6750\u65E0\u5173",
+      detailBackfill,
       summaryCached: cachedSummaryIds.size,
       summaryCacheFile: summaryCache.file,
       summaryCachePruned: summaryCache.pruned
@@ -12060,15 +12153,15 @@ async function collectRawTodos(args, env) {
       const targetRows = wfIdGroup.filter((group) => !group.topPriority && activeRuleFor(group.title)?.aiGroup?.groupRule.aiContext === "\u6D41\u7A0B\u8BE6\u60C5").flatMap((group) => group.requestDatas ?? []);
       const targetIds = [...new Set(targetRows.map((row) => row.requestId).filter(Boolean))];
       if (targetIds.length > 0) {
-        const { facts, stats } = await fetchDetailFacts(env, targetIds, args, stampsOfRows(targetRows));
-        for (const [requestId, fact] of facts) {
-          if (fact.fields.length > 0) fieldsById.set(requestId, fact.fields);
+        for (const requestId of targetIds) {
+          const fact = allFacts.get(requestId);
+          if (fact && fact.fields.length > 0) fieldsById.set(requestId, fact.fields);
         }
         detailStats.groupingMaterial = {
           requested: targetIds.length,
-          cacheHit: stats.cacheHit,
-          fetched: stats.fetched,
-          failed: stats.failed,
+          cacheHit: detailBackfill.cacheHit,
+          fetched: detailBackfill.fetched,
+          failed: detailBackfill.failed,
           withFields: fieldsById.size
         };
       }
@@ -12240,7 +12333,17 @@ function inferStage(args) {
   if (!Array.isArray(args.wfIdGroup)) return "auto";
   if (Array.isArray(args.aiGroupSummaries)) return "groupSummary";
   if (Array.isArray(args.aiSummaries)) return "summary";
-  return hasAnyRequestSummary(args.wfIdGroup) ? "groupSummaryContext" : "summaryContext";
+  if (hasAnyRequestSummary(args.wfIdGroup)) {
+    return hasAnySubGroup(args.wfIdGroup) ? "groupSummaryContext" : "subGroup";
+  }
+  return "summaryContext";
+}
+function hasAnySubGroup(groups) {
+  for (const raw of groups) {
+    const items = raw?.displayItems;
+    if (Array.isArray(items) && items.some((item) => item?.type === "group")) return true;
+  }
+  return false;
 }
 function rowsOfRawGroup(group) {
   if (!group) return [];
@@ -12275,6 +12378,34 @@ function rowsOfGroup(group) {
 function groupItemsOf(group) {
   return group.displayItems.filter((item) => item.type === "group");
 }
+function assemblePriorityGroup(groups) {
+  const base = (groups ?? []).filter((group) => group.id !== PRIORITY_GROUP_ID && group.topPriority !== true);
+  const pgConfig = generalRules()?.priorityGroup ?? null;
+  const title = pgConfig?.title?.trim() || PRIORITY_GROUP_TITLE;
+  const rules = new Set(pgConfig?.rules ?? ["overdue", "levelFallback"]);
+  const rows = base.flatMap((group) => rowsOfGroup(group));
+  if (rows.length === 0) return { groups: base };
+  const selection = selectPriorityRows(rows, rules);
+  const selected = sortPriorityRows(selection.rows);
+  if (selected.length === 0) {
+    return { groups: base, warning: `\u672C\u6B21\u6CA1\u6709\u8D85\u65F6\u6761\u76EE\uFF0C\u4E5F\u6CA1\u6709 requestLevel\u22651 \u7684\u6761\u76EE\uFF0C\u6545\u4E0D\u8F93\u51FA\u300C${title}\u300D\u5206\u7EC4` };
+  }
+  const levelText = selection.targetLevel === 2 ? "\u7D27\u6025\uFF08requestLevel=2\uFF09" : selection.targetLevel === 1 ? "\u91CD\u8981\uFF08requestLevel=1\uFF1B\u672C\u6B21\u65E0 2 \u7EA7\u6570\u636E\uFF0C\u5DF2\u6309\u89C4\u5219\u964D\u7EA7\u53D6 1\uFF0C0 \u7EA7\u4E0D\u53D6\uFF09" : "\u65E0\u7B49\u7EA7\uFF08\u672C\u6B21\u6574\u6279\u6CA1\u6709 \u22651 \u7EA7\u7684\u6761\u76EE\uFF0C\u53EA\u6309\u8D85\u65F6\u7B5B\uFF09";
+  const priorityGroup = {
+    id: PRIORITY_GROUP_ID,
+    topPriority: true,
+    title,
+    count: selected.length,
+    // 大分组（含优先组）默认展开；只有汇总项收缩
+    defaultExpanded: true,
+    // 复制一份：优先组是独立视图，确保两边互不影响
+    displayItems: requestItemsOf(selected.map((row) => ({ ...row })))
+  };
+  return {
+    groups: [priorityGroup, ...base],
+    warning: `\u300C${title}\u300D\u7B5B\u51FA ${selected.length} \u6761\uFF1A\u8D85\u65F6 ${selection.overdueCount} \u6761 / \u7B49\u7EA7\u547D\u4E2D ${selection.levelCount} \u6761\uFF08\u4E24\u8005\u90FD\u6EE1\u8DB3 ${selection.bothCount} \u6761\uFF09\uFF0C\u7B49\u7EA7\u53E3\u5F84=${levelText}\uFF1B\u8FD9 ${selected.length} \u6761\u540C\u65F6\u4FDD\u7559\u5728\u5404\u81EA\u5DE5\u4F5C\u6D41\u5206\u7EC4\u4E2D\uFF08\u53E0\u52A0\u89C6\u56FE\uFF1A\u03A3count \u4F1A\u5927\u4E8E totalCount\uFF0CtotalCount \u6309\u53BB\u91CD\u6761\u6570\u8BA1\uFF09`
+  };
+}
 function readAiGroups(value) {
   if (!Array.isArray(value)) {
     throw workflowValidationError(
@@ -12290,14 +12421,15 @@ function readAiGroups(value) {
     if (!record) {
       throw workflowValidationError("ai_groups_invalid", `${label} \u5FC5\u987B\u662F\u5BF9\u8C61 { groupId, title, requestIds }`, { retryAllowed: false });
     }
-    const unknownKeys = Object.keys(record).filter((key) => !["groupId", "title", "requestIds"].includes(key));
+    const unknownKeys = Object.keys(record).filter((key) => !["groupId", "title", "requestIds", "summary"].includes(key));
     if (unknownKeys.length > 0) {
       throw workflowValidationError(
         "ai_groups_invalid",
-        `${label} \u4E0D\u63A5\u53D7\u5B57\u6BB5\uFF1A${unknownKeys.join(", ")}\uFF1B\u53EA\u652F\u6301 groupId / title / requestIds`,
+        `${label} \u4E0D\u63A5\u53D7\u5B57\u6BB5\uFF1A${unknownKeys.join(", ")}\uFF1B\u53EA\u652F\u6301 groupId / title / requestIds / summary`,
         { retryAllowed: false, details: { unknownKeys } }
       );
     }
+    const planSummary = typeof record.summary === "string" ? record.summary.trim() : "";
     const groupId = typeof record.groupId === "string" ? record.groupId.trim() : "";
     if (!groupId) {
       throw workflowValidationError(
@@ -12335,7 +12467,12 @@ function readAiGroups(value) {
       ids.push(id);
     }
     const bucket = map.get(groupId) ?? [];
-    bucket.push({ groupId, title, requestIds: [...new Set(ids)] });
+    bucket.push({
+      groupId,
+      title,
+      requestIds: [...new Set(ids)],
+      ...planSummary ? { summary: planSummary } : {}
+    });
     map.set(groupId, bucket);
   });
   return map;
@@ -12391,44 +12528,21 @@ function rowKeyForCount(row) {
   if (id) return `id:${id}`;
   return `tx:${row.requestNameTitle ?? ""}|${row.creater ?? ""}|${row.nodeId ?? ""}`;
 }
-async function runSmartGroup(args, env, options = {}) {
-  const base = runGroup(args);
-  const groups = base.wfIdGroup ?? [];
-  const plans = args.aiGroups === void 0 || args.aiGroups === null ? void 0 : readAiGroups(args.aiGroups);
-  const groupFocus = typeof args.groupFocus === "string" ? args.groupFocus.trim() : "";
-  const hasFocus = groupFocus.length > 0;
-  const summaryMaxChars = readBoundedInt(
-    args.summaryMaxChars,
-    "summaryMaxChars",
-    DEFAULT_REQUEST_SUMMARY_MAX2,
-    10,
-    500
-  );
-  const skipDetail = args.withDetailContext === false;
-  const summaryCache = await openSummaryCache(env.ctx);
-  const detailCacheForTag = skipDetail ? null : await openDetailCache(env.ctx);
-  const materialTagOfRow = (requestId, stamp) => {
-    const entry = detailCacheForTag?.get(requestId, stamp);
-    return entry ? detailMaterialTagOf(entry) : void 0;
-  };
-  const cachedIds = /* @__PURE__ */ new Set();
-  const allRows = [];
-  for (const group of groups) {
-    for (const row of group.requestDatas ?? []) {
-      allRows.push(row);
-      if (summaryCache.get(
-        row.requestId,
-        row.lastFeedBackDateTime,
-        summaryMaxChars,
-        promptTagOf(activeRuleFor(group.title)?.requestSummaryPrompt ?? ""),
-        materialTagOfRow(row.requestId, row.lastFeedBackDateTime)
-      )) cachedIds.add(row.requestId);
-    }
-  }
-  const detailIds = [...new Set(allRows.map((row) => row.requestId).filter(Boolean))];
-  const stamps = stampsOfRows(allRows);
-  const facts = skipDetail ? /* @__PURE__ */ new Map() : options.facts ?? (await fetchDetailFacts(env, detailIds, args, stamps)).facts;
-  const metrics = skipDetail ? void 0 : options.metrics ?? metricsOfFacts(facts);
+function flattenFinalGroups(groups) {
+  return groups.map((group) => ({
+    id: group.id,
+    topPriority: group.id === PRIORITY_GROUP_ID,
+    title: group.title,
+    count: group.count,
+    defaultExpanded: true,
+    displayItems: requestItemsOf(group.requestDatas)
+  }));
+}
+function applySubGroups(groups, options) {
+  const plans = options.plans;
+  const facts = options.facts;
+  const metrics = options.metrics;
+  const warnings = options.warnings;
   const knownGroupIds = new Set(groups.map((group) => group.id));
   for (const groupId of plans?.keys() ?? []) {
     if (!knownGroupIds.has(groupId)) {
@@ -12446,15 +12560,6 @@ async function runSmartGroup(args, env, options = {}) {
       );
     }
   }
-  const warnings = (base.warnings ?? []).filter((text) => !text.startsWith("markdown \u53EA\u5C55\u793A\u524D"));
-  warnings.push(...primeRules(env.ctx).warnings);
-  if (skipDetail) {
-    warnings.push("withDetailContext=false\uFF1A\u672C\u6B21\u672A\u62C9\u53D6\u4EFB\u4F55\u8BE6\u60C5\u2014\u2014\u8BF7\u5047/\u8D22\u52A1\u9608\u503C\u6539\u4E3A\u6309\u6807\u9898\u8BC6\u522B\u3001\u8DF3\u8FC7\u6574\u7EC4\u7A7A\u5224\u5B9A\uFF0C\u4E5F\u4E0D\u4EA7 summaryBatches");
-  } else if (cachedIds.size > 0) {
-    warnings.push(
-      `\u6709 ${cachedIds.size} \u6761\u547D\u4E2D\u672C\u5730\u6458\u8981\u7F13\u5B58\uFF08\u8FD9\u4E9B\u6761\u76EE\u4E0D\u7528\u518D\u8C03 AI\uFF09\uFF1B\u8BE6\u60C5\u4ECD\u6309\u7F13\u5B58\u4F18\u5148\u53D6\u4E00\u6B21\u2014\u2014\u9608\u503C\u6307\u6807\u53EA\u8BA4\u6D41\u7A0B\u8BE6\u60C5\u6570\u636E\uFF0C\u8DF3\u8FC7\u8BE6\u60C5\u4F1A\u8BA9\u9608\u503C\u5206\u7EC4\u5931\u6548`
-    );
-  }
   const finalGroups = groups.map((group) => {
     if (group.id === PRIORITY_GROUP_ID) {
       return {
@@ -12580,7 +12685,11 @@ async function runSmartGroup(args, env, options = {}) {
           }
           groupRows = kept2;
         }
-        subGroups.push({ title: plan.title, requestDatas: groupRows });
+        subGroups.push({
+          title: plan.title,
+          requestDatas: groupRows,
+          ...plan.summary ? { summary: plan.summary } : {}
+        });
       }
       const kept = subGroups.filter((sub) => sub.requestDatas.length >= 2);
       const dissolved = subGroups.length - kept.length;
@@ -12612,6 +12721,7 @@ async function runSmartGroup(args, env, options = {}) {
       }
     }
     const renderSubGroupSummary = (sub) => {
+      if ((sub.summary ?? "").trim()) return sub.summary;
       const groupSummary = rule.aiGroup?.groupSummary;
       if (!groupSummary || groupSummary.needAI || !groupSummary.template) return "";
       if (groupRule.groupTitle && sub.title !== groupRule.groupTitle) return "";
@@ -12653,9 +12763,57 @@ async function runSmartGroup(args, env, options = {}) {
       displayItems: [...groupItems, ...requestItemsOf(singles)]
     };
   });
-  const orderedGroups = finalGroups;
-  if (plans === void 0) {
-    warnings.push("smartGroup \u672A\u6536\u5230 aiGroups\uFF1A\u5DF2\u6309\u4E1A\u52A1\u7C7B\u578B\u6267\u884C\u786E\u5B9A\u6027\u5206\u7EC4\uFF1B\u9700\u8981\u8BED\u4E49\u4FA7\u91CD\u70B9\u65F6\u518D\u4F20\u5165\u672C\u8F6E aiGroups");
+  return finalGroups;
+}
+async function runSmartGroup(args, env, options = {}) {
+  const base = runGroup(args);
+  const groups = base.wfIdGroup ?? [];
+  const plans = args.aiGroups === void 0 || args.aiGroups === null ? void 0 : readAiGroups(args.aiGroups);
+  const groupFocus = typeof args.groupFocus === "string" ? args.groupFocus.trim() : "";
+  const hasFocus = groupFocus.length > 0;
+  const summaryMaxChars = readBoundedInt(
+    args.summaryMaxChars,
+    "summaryMaxChars",
+    DEFAULT_REQUEST_SUMMARY_MAX2,
+    10,
+    500
+  );
+  const skipDetail = args.withDetailContext === false;
+  const summaryCache = await openSummaryCache(env.ctx);
+  const detailCacheForTag = skipDetail ? null : await openDetailCache(env.ctx);
+  const materialTagOfRow = (requestId, stamp) => {
+    const entry = detailCacheForTag?.get(requestId, stamp);
+    return entry ? detailMaterialTagOf(entry) : void 0;
+  };
+  const cachedIds = /* @__PURE__ */ new Set();
+  const allRows = [];
+  for (const group of groups) {
+    for (const row of group.requestDatas ?? []) {
+      allRows.push(row);
+      if (summaryCache.get(
+        row.requestId,
+        row.lastFeedBackDateTime,
+        summaryMaxChars,
+        promptTagOf(activeRuleFor(group.title)?.requestSummaryPrompt ?? ""),
+        materialTagOfRow(row.requestId, row.lastFeedBackDateTime)
+      )) cachedIds.add(row.requestId);
+    }
+  }
+  const detailIds = [...new Set(allRows.map((row) => row.requestId).filter(Boolean))];
+  const stamps = stampsOfRows(allRows);
+  const facts = skipDetail ? /* @__PURE__ */ new Map() : options.facts ?? (await fetchDetailFacts(env, detailIds, args, stamps)).facts;
+  const warnings = (base.warnings ?? []).filter((text) => !text.startsWith("markdown \u53EA\u5C55\u793A\u524D"));
+  warnings.push(...primeRules(env.ctx).warnings);
+  if (skipDetail) {
+    warnings.push("withDetailContext=false\uFF1A\u672C\u6B21\u672A\u62C9\u53D6\u4EFB\u4F55\u8BE6\u60C5\u2014\u2014\u8BF7\u5047/\u8D22\u52A1\u9608\u503C\u6539\u4E3A\u6309\u6807\u9898\u8BC6\u522B\u3001\u8DF3\u8FC7\u6574\u7EC4\u7A7A\u5224\u5B9A\uFF0C\u4E5F\u4E0D\u4EA7 summaryBatches");
+  } else if (cachedIds.size > 0) {
+    warnings.push(
+      `\u6709 ${cachedIds.size} \u6761\u547D\u4E2D\u672C\u5730\u6458\u8981\u7F13\u5B58\uFF08\u8FD9\u4E9B\u6761\u76EE\u4E0D\u7528\u518D\u8C03 AI\uFF09\uFF1B\u8BE6\u60C5\u4ECD\u6309\u7F13\u5B58\u4F18\u5148\u53D6\u4E00\u6B21\u2014\u2014\u9608\u503C\u6307\u6807\u53EA\u8BA4\u6D41\u7A0B\u8BE6\u60C5\u6570\u636E\uFF0C\u8DF3\u8FC7\u8BE6\u60C5\u4F1A\u8BA9\u9608\u503C\u5206\u7EC4\u5931\u6548`
+    );
+  }
+  const orderedGroups = flattenFinalGroups(groups);
+  if (plans !== void 0) {
+    warnings.push("aiGroups \u5DF2\u6536\u5230\uFF0C\u4F46\u672C\u9636\u6BB5\u4E0D\u505A\u4E8C\u6B21\u5206\u7EC4\uFF1A\u7559\u5230 stage=subGroup \u5E94\u7528");
   }
   return {
     data: {
@@ -12681,6 +12839,11 @@ function requestMaxCharsFor(args, workflowName) {
     500
   );
 }
+function explicitMaxCharsFor(args, workflowName) {
+  const explicit = args.summaryMaxChars;
+  if (explicit === void 0 || explicit === null || String(explicit).trim() === "") return void 0;
+  return requestMaxCharsFor(args, workflowName);
+}
 function requestPromptFor(workflowName) {
   return (activeRuleFor(workflowName)?.requestSummaryPrompt ?? "").trim();
 }
@@ -12827,7 +12990,7 @@ function collectSummaryUnits(groups) {
       continue;
     }
     const kind = detectBusinessKind(group.title);
-    if (!needsRequestSummary(kind)) continue;
+    if (!needAiSummary(group.title) || !needsRequestSummary(kind)) continue;
     for (const item of group.displayItems) {
       if (item.type === "group") {
         units.push({
@@ -12867,11 +13030,11 @@ async function runSummaryContext(args, env, prefetched) {
   const prefilledIds = /* @__PURE__ */ new Set();
   const needsDetail = [];
   const workflowTitleByRequest = /* @__PURE__ */ new Map();
-  for (const unit of units) {
-    if (unit.groupId === "priority") continue;
-    for (const row of unit.rows) {
+  for (const group of groups) {
+    if (group.topPriority) continue;
+    for (const row of rowsOfGroup(group)) {
       if (row.requestId && !workflowTitleByRequest.has(row.requestId)) {
-        workflowTitleByRequest.set(row.requestId, unit.groupTitle);
+        workflowTitleByRequest.set(row.requestId, group.title);
       }
     }
   }
@@ -12879,10 +13042,11 @@ async function runSummaryContext(args, env, prefetched) {
   for (const unit of units) {
     for (const row of unit.rows) {
       const name = ruleNameForRow(unit, row);
+      if (!needAiSummary(name)) continue;
       const cached = summaryCache.get(
         row.requestId,
         row.lastFeedBackDateTime,
-        requestMaxCharsFor(args, name),
+        explicitMaxCharsFor(args, name),
         promptTagOf(requestPromptFor(name)),
         materialTagOfRow(row.requestId, row.lastFeedBackDateTime)
       );
@@ -12934,6 +13098,13 @@ async function runSummaryContext(args, env, prefetched) {
     };
     for (const row of unit.rows) {
       if (prefilledIds.has(row.requestId)) continue;
+      if (!needAiSummary(ruleNameForRow(unit, row))) {
+        if (!(row.summary ?? "").trim()) {
+          row.summary = row.requestNameTitle ?? "";
+          if ((row.summary ?? "").trim()) titleCopied += 1;
+        }
+        continue;
+      }
       const { context, contextAvailable: available } = provider.get(row.requestId);
       if (!available) {
         const firstSeen = !row.requestId || !claimed.has(row.requestId);
@@ -13087,21 +13258,19 @@ async function runSummary(args, env) {
   }
   const ruleNameForGroup = (group, row) => group.topPriority ? wfTitleByRequest.get(row?.requestId ?? "") ?? group.title : group.title;
   for (const group of groups) {
-    if (!needAiSummary(group.title)) {
-      for (const row of rowsOfGroup(group)) {
-        if ((row.summary ?? "").trim()) continue;
+    for (const row of rowsOfGroup(group)) {
+      if ((row.summary ?? "").trim()) continue;
+      const name = ruleNameForGroup(group, row);
+      if (!needAiSummary(name)) {
         row.summary = row.requestNameTitle ?? "";
         if ((row.summary ?? "").trim()) titleSummary += 1;
+        continue;
       }
-      continue;
-    }
-    for (const row of rowsOfGroup(group)) {
-      if (!row?.requestId || (row.summary ?? "").trim()) continue;
-      const name = ruleNameForGroup(group, row);
+      if (!row?.requestId) continue;
       const cached = summaryCache.get(
         row.requestId,
         row.lastFeedBackDateTime,
-        maxCharsFor(name),
+        explicitMaxCharsFor(args, name),
         promptTagOf(requestPromptFor(name)),
         materialTagOfRow(row.requestId, row.lastFeedBackDateTime)
       );
@@ -13230,6 +13399,41 @@ async function runSummary(args, env) {
   };
 }
 
+// src/shortcuts/workflow/operations/todoSmartConvert/todoSmartConvert.subGroup.ts
+async function runSubGroup(args, env) {
+  const groups = await readFinalGroups(args, env);
+  const warnings = [];
+  const wfGroups = groups.filter((group) => !group.topPriority).map((group) => ({
+    id: group.id,
+    title: group.title,
+    count: group.count,
+    requestDatas: rowsOfGroup(group)
+  }));
+  const plans = args.aiGroups === void 0 || args.aiGroups === null ? void 0 : readAiGroups(args.aiGroups);
+  const rows = wfGroups.flatMap((group) => group.requestDatas);
+  const detailIds = [...new Set(rows.map((row) => row.requestId).filter(Boolean))];
+  const facts = /* @__PURE__ */ new Map();
+  let metrics;
+  if (args.withDetailContext !== false && detailIds.length > 0) {
+    const result = await fetchDetailFacts(env, detailIds, args, stampsOfRows(rows));
+    for (const [requestId, fact] of result.facts) facts.set(requestId, fact);
+    metrics = metricsOfFacts(facts);
+    warnings.push(...result.warnings);
+  }
+  const finalGroups = applySubGroups(wfGroups, { plans, facts, metrics, warnings });
+  return {
+    data: {
+      smartSummaryTitle: readSmartSummaryTitle(
+        args,
+        `\u60A8\u5F53\u524D\u6709 ${totalTodoCount(groups)} \u6761\u5F85\u529E\uFF0C\u6E05\u5355\u5982\u4E0B\uFF1A`
+      ),
+      totalCount: totalTodoCount(groups),
+      wfIdGroup: finalGroups
+    },
+    warnings
+  };
+}
+
 // src/shortcuts/workflow/operations/todoSmartConvert/todoSmartConvert.groupSummary.ts
 var INTERNAL_MESSAGE_SUMMARY_HINT2 = "\u5185\u90E8\u7559\u8A00\uFF1A\u53EA\u6309\u539F\u6587\u76F4\u63A5\u6982\u62EC\u300C\u8C01\u8BF4\u4E86\u4EC0\u4E48\u300D\uFF0C\u4E0D\u8981\u8FC7\u5EA6\u89E3\u8BFB\u3001\u4E0D\u8981\u63A8\u6D4B\u52A8\u673A\u6216\u5F71\u54CD\uFF0C\u4E25\u683C\u6309\u672C\u6279 suggestedMaxChars \u63A7\u5236\u5B57\u6570";
 var GROUP_SUMMARY_TAIL = GROUP_SUMMARY_TAIL_TEXT;
@@ -13274,7 +13478,7 @@ function collectGroupSummaryBatches(groups, isCtxEmpty, maxCharsFor = () => DEFA
     if (group.topPriority) continue;
     const kind = detectBusinessKind(group.title);
     for (const sub of groupItemsOf(group)) {
-      if (isDeterministicGroupKind(kind) && (sub.summary ?? "").trim() !== "") continue;
+      if ((sub.summary ?? "").trim() !== "") continue;
       const allRows = Array.isArray(sub.requestDatas) ? sub.requestDatas : [];
       const rows = isCtxEmpty ? allRows.filter((row) => !isCtxEmpty(row.requestId)) : allRows;
       const emptySkipped = allRows.length - rows.length;
@@ -13579,6 +13783,7 @@ var inputSchema = schemaOf({
     }
   },
   withDetailContext: { type: "boolean", description: "smartGroup \u662F\u5426\u540C\u8FDB\u7A0B\u751F\u6210\u5355\u6761\u6458\u8981\u4E0A\u4E0B\u6587\u3002" },
+  withSubGroup: { type: "boolean", description: "summary \u56DE\u586B\u540E\u662F\u5426\u540C\u8FDB\u7A0B\u63A5\u7740\u505A ai \u4E8C\u6B21\u5206\u7EC4\uFF08stage=subGroup \u7B49\u4EF7\uFF09\u3002" },
   withGroupSummaryContext: { type: "boolean", description: "summary \u662F\u5426\u540C\u8FDB\u7A0B\u751F\u6210\u7EC4\u6458\u8981\u4E0A\u4E0B\u6587\u3002" },
   detailPrefetch: { type: "boolean", description: "\u5E9F\u5F03\u517C\u5BB9\u53C2\u6570\uFF0C\u5DF2\u5FFD\u7565\uFF1Bcollect \u53EA\u5728\u7ED9\u4E86 groupFocus \u4E14\u610F\u56FE\u9002\u7528\u4E8E\u672C\u7EC4\u65F6\u6309\u9700\u9884\u53D6\u5206\u7EC4\u5B57\u6BB5\uFF08\u8D70\u8BE6\u60C5\u7F13\u5B58\uFF09\u3002" },
   groupBy: { type: "string", enum: [...GROUP_BY_VALUES], default: "workflow" },
@@ -13601,6 +13806,7 @@ var inputSchema = schemaOf({
   tabid: { type: "string" },
   tabName: { type: "string" },
   subCategory: { type: "string" },
+  isremarks: { type: "string", description: "\u5907\u6CE8\u7B5B\u9009\uFF08getTodoListData params.isremarks\uFF09\uFF0C\u591A\u4E2A\u6570\u5B57\u7528\u82F1\u6587\u9017\u53F7\u62FC\u63A5\uFF0C\u4EC5\u4F5C\u7528\u4E8E\u672C\u6C47\u603B\u53D6\u6570" },
   workflow: { type: "array", items: { type: "string" } },
   creator: { type: "string" },
   requestName: { type: "string" },
@@ -13658,6 +13864,14 @@ var workflowTodoSmartConvertOperations = [{
     const stage = args.stage === void 0 || args.stage === null || args.stage === "" ? inferStage(args) : readStage(args.stage);
     const hasItems = Array.isArray(args.items);
     const resumed = stage === "collect" && hasItems;
+    const withPriorityView = (data, extraWarnings) => {
+      if ((args.groupBy ?? "workflow") !== "workflow") return { data, warnings: extraWarnings };
+      const { groups, warning } = assemblePriorityGroup(data.wfIdGroup ?? []);
+      return {
+        data: { ...data, wfIdGroup: groups },
+        warnings: warning ? [...extraWarnings, warning] : extraWarnings
+      };
+    };
     if ((stage === "group" || stage === "smartGroup" || stage === "aggregate") && !hasItems) {
       throw workflowValidationError(
         "items_required",
@@ -13711,39 +13925,62 @@ var workflowTodoSmartConvertOperations = [{
         );
       }
       const result = await runSummary(args, env);
+      let baseData = result.data;
+      let baseWarnings = result.warnings;
+      let subGrouped = false;
+      if (args.withSubGroup === true) {
+        const sub = await runSubGroup({ ...args, wfIdGroup: baseData.wfIdGroup }, env);
+        baseData = { ...baseData, wfIdGroup: sub.data.wfIdGroup };
+        baseWarnings = [...baseWarnings, ...sub.warnings];
+        subGrouped = true;
+      }
+      const final = withPriorityView(baseData, baseWarnings);
       if (args.withGroupSummaryContext === true) {
         const context = await runGroupSummaryContext({
-          wfIdGroup: result.data.wfIdGroup,
-          smartSummaryTitle: result.data.smartSummaryTitle,
-          totalCount: result.data.totalCount
+          wfIdGroup: final.data.wfIdGroup,
+          smartSummaryTitle: final.data.smartSummaryTitle,
+          totalCount: final.data.totalCount
         }, env);
         if (Array.isArray(context.data.groupSummaryBatches) && context.data.groupSummaryBatches.length === 0) {
-          return finish(env, args, startedAt, stage, result.data, {
+          return finish(env, args, startedAt, stage, final.data, {
             branch: "todo-smart-convert",
             stage,
             aiSummarized: true,
+            subGrouped,
             withGroupSummaryContext: true,
             ...result.meta
-          }, result.warnings);
+          }, final.warnings);
         }
         return finish(env, args, startedAt, stage, {
-          ...result.data,
+          ...final.data,
           groupSummaryBatches: context.data.groupSummaryBatches,
           groupSummaryStats: context.data.groupSummaryStats
         }, {
           branch: "todo-smart-convert",
           stage,
           aiSummarized: true,
+          subGrouped,
           withGroupSummaryContext: true,
           ...result.meta
-        }, [...result.warnings, ...context.warnings]);
+        }, [...final.warnings, ...context.warnings]);
       }
-      return finish(env, args, startedAt, stage, result.data, {
+      return finish(env, args, startedAt, stage, final.data, {
         branch: "todo-smart-convert",
         stage,
         aiSummarized: true,
+        subGrouped,
         ...result.meta
-      }, result.warnings);
+      }, final.warnings);
+    }
+    if (stage === "subGroup") {
+      const result = await runSubGroup(args, env);
+      const final = withPriorityView(result.data, result.warnings);
+      return finish(env, args, startedAt, stage, final.data, {
+        branch: "todo-smart-convert",
+        stage,
+        aiGrouped: Array.isArray(args.aiGroups),
+        subGrouped: true
+      }, final.warnings);
     }
     if (stage === "groupSummaryContext") {
       const result = await runGroupSummaryContext(args, env);
@@ -13762,12 +13999,13 @@ var workflowTodoSmartConvertOperations = [{
         );
       }
       const result = await runGroupSummary(args, env);
-      return finish(env, args, startedAt, stage, result.data, {
+      const final = withPriorityView(result.data, result.warnings);
+      return finish(env, args, startedAt, stage, final.data, {
         branch: "todo-smart-convert",
         stage,
         aiSummarized: true,
         ...result.meta
-      }, result.warnings);
+      }, final.warnings);
     }
     if (stage === "group" || resumed) {
       return finish(env, args, startedAt, "group", runGroup(args), {