oasis_test_v2 2.2.124 → 2.2.125

package/dist/index.js

@@ -1674,10 +1674,14 @@ function overlapSimilarity(a5, b6) {
   return shared / Math.sqrt(a5.size * b6.size);
 }
 function overlapScore(query, title, body2) {
-  const byTitle = overlapSimilarity(query, overlapTokens(title));
+  const titleTokens = overlapTokens(title);
+  const byTitle = overlapSimilarity(query, titleTokens);
   const byAll = body2 ? overlapSimilarity(query, overlapTokens(`${title}
 ${body2}`)) : byTitle;
-  return Math.round(Math.max(byTitle, byAll) * 1e3) / 1e3;
+  let shared = 0;
+  for (const t of titleTokens) if (query.has(t)) shared++;
+  const cover = shared >= COVER_MIN_SHARED ? COVER_WEIGHT * shared / titleTokens.size : 0;
+  return Math.round(Math.max(byTitle, byAll, cover) * 1e3) / 1e3;
 }
 function monthDay(dayOrIso, timeZone) {
   let day = dayOrIso.slice(0, 10);
@@ -1721,7 +1725,7 @@ function formatOverlapLines(r5, timeZone) {
   if (all2.length === 0) return [];
   return [OVERLAP_HEADING, ...all2.map((c5) => formatOverlapCandidate(c5, timeZone)), OVERLAP_LOOKUP_HINT, OVERLAP_HANDLING_HINT];
 }
-var OVERLAP_ACTIONS, STOP_TOKENS, isCjk, OVERLAP_HEADING, OVERLAP_LOOKUP_HINT, OVERLAP_HANDLING_HINT, who;
+var OVERLAP_ACTIONS, STOP_TOKENS, isCjk, COVER_MIN_SHARED, COVER_WEIGHT, OVERLAP_HEADING, OVERLAP_LOOKUP_HINT, OVERLAP_HANDLING_HINT, who;
 var init_overlap = __esm({
   "../contract/src/overlap.ts"() {
     "use strict";
@@ -1786,6 +1790,8 @@ var init_overlap = __esm({
       "task"
     ]);
     isCjk = (ch) => /[㐀-鿿豈-﫿]/u.test(ch);
+    COVER_MIN_SHARED = 3;
+    COVER_WEIGHT = 0.9;
     OVERLAP_HEADING = "\u76F8\u8FD1\u7684\u4E8B\u9879\uFF08\u7CFB\u7EDF\u7C97\u7B5B\uFF0C\u672A\u786E\u8BA4\uFF0C\u8BF7\u7528 id \u67E5\u8BE6\u60C5\u540E\u5224\u65AD\uFF09\uFF1A";
     OVERLAP_LOOKUP_HINT = "\u67E5\u8BE6\u60C5\uFF1A\u5F85\u529E oasis todo show <\u5F85\u529Eid>\uFF1B\u5DE5\u5355 oasis workorder <\u5DE5\u5355id>\uFF1B\u59D4\u6D3E oasis delegate --status <\u59D4\u6D3Eid>\uFF08\u522B\u4EBA\u5BF9\u8BDD\u91CC\u6D3E\u7684\u4E5F\u80FD\u67E5\u6458\u8981\uFF09";
     OVERLAP_HANDLING_HINT = "\u600E\u4E48\u7528\uFF1A\u9010\u6761\u67E5\u5B8C\u518D\u5224\u65AD\u662F\u4E0D\u662F\u540C\u4E00\u4EF6\u4E8B\uFF1B\u786E\u5B9E\u76F8\u5173\u624D\u544A\u8BC9\u7528\u6237\uFF0C\u4E0D\u76F8\u5173\u4E00\u4E2A\u5B57\u4E0D\u63D0\u3002\u5728\u505A\u7684\u5EFA\u8BAE\u7528\u6237\u5148\u95EE\u95EE\u5BF9\u65B9\uFF0C\u770B\u5408\u5E76\u8FD8\u662F\u5206\u5DE5\uFF1B\u505A\u5B8C\u7684\u628A\u7ED3\u679C\u7ED9\u7528\u6237\uFF0C\u95EE\u80FD\u4E0D\u80FD\u76F4\u63A5\u7528\u3002\u4E0D\u66FF\u7528\u6237\u5408\u5E76\u3001\u53D6\u6D88\u6216\u6539\u6D3E\u3002";
@@ -330036,6 +330042,7 @@ function createTodoRuntime(options) {
       value2 = options.store(id).then((store) => new TodoService({
         store,
         timeZone: () => options.timeZone(id),
+        ...options.now ? { now: options.now } : {},
         ...options.people ? { people: () => options.people(id) } : {},
         ...options.runOf ? { runOf: options.runOf } : {},
         // 派给别人的待办的告知（ADR 0640）：与到期提醒同一条路——直接 insert 进台账 `todo` 类，新写的推送 + 刷铃铛。
@@ -330334,7 +330341,7 @@ function createOverlapRuntime(options) {
       const people = await options.people(companyId).catch(() => []);
       for (const p4 of people) if (ids2.includes(p4.actorId)) out[p4.actorId] = p4.name;
       for (const id of ids2) {
-        if (out[id] || isHumanActorId(id)) continue;
+        if (out[id]) continue;
         const name = await options.actorName(companyId, id).catch(() => void 0);
         if (name) out[id] = name;
       }
@@ -342713,7 +342720,7 @@ var COMMAND_DECLS = {
   delegate: {
     group: "\u59D4\u6D3E\u4E13\u5BB6",
     usage: 'oasis delegate --to <role|actorId> --task "<\u4EFB\u52A1\u4E66>" [--as <\u77ED\u540D>] [--file <\u8DEF\u5F84>]... [--json true]\n      oasis delegate --follow-up <\u5F15\u7528> --text "<...>" [--file <\u8DEF\u5F84>]...\n      oasis delegate --status <\u5F15\u7528|\u59D4\u6D3Eid> [--json true]\n      oasis delegate --list [--all] [--json true]',
-    description: "\u628A\u4E00\u4EF6\u4E8B\u4EA4\u7ED9\u7EC4\u7EC7\u91CC\u5BF9\u53E3\u7684\u4E13\u5BB6\u53BB\u505A\uFF08\u5F02\u6B65\uFF09\u3002\u547D\u4EE4\u7ACB\u5373\u8FD4\u56DE\uFF0C\u4E13\u5BB6\u5E72\u5B8C\u4E86\u7ED3\u679C\u81EA\u5DF1\u56DE\u5230\u8FD9\u6761\u5BF9\u8BDD\u2014\u2014**\u4E0D\u8981\u5728\u8FD9\u91CC\u7B49**\u3002\u6210\u529F\u540E\u5982\u679C\u672C\u516C\u53F8\u6709\u4EBA\u5728\u505A\u6216\u505A\u8FC7\u76F8\u8FD1\u7684\u4E8B\uFF0C\u8F93\u51FA\u672B\u5C3E\u4F1A\u591A\u4E00\u6BB5\u300C\u76F8\u8FD1\u7684\u4E8B\u9879\uFF08\u7CFB\u7EDF\u7C97\u7B5B\uFF0C\u672A\u786E\u8BA4\uFF0C\u8BF7\u7528 id \u67E5\u8BE6\u60C5\u540E\u5224\u65AD\uFF09\u300D\uFF0C\u6BCF\u6761\u5E26 id\uFF1A\u7528 id \u9010\u6761\u67E5\u8BE6\u60C5\uFF08\u5F85\u529E oasis todo show\u3001\u5DE5\u5355 oasis workorder\u3001\u59D4\u6D3E oasis delegate --status\uFF09\uFF0C\u5224\u65AD\u662F\u4E0D\u662F\u540C\u4E00\u4EF6\u4E8B\uFF1B\u786E\u5B9E\u76F8\u5173\u624D\u544A\u8BC9\u7528\u6237\uFF0C\u4E0D\u76F8\u5173\u4E00\u4E2A\u5B57\u90FD\u4E0D\u63D0\uFF1B\u5728\u505A\u7684\u5EFA\u8BAE\u7528\u6237\u5148\u95EE\u95EE\u5BF9\u65B9\uFF0C\u770B\u5408\u5E76\u8FD8\u662F\u5206\u5DE5\uFF1B\u505A\u5B8C\u7684\u628A\u7ED3\u679C\u7ED9\u7528\u6237\uFF0C\u95EE\u80FD\u4E0D\u80FD\u76F4\u63A5\u7528\uFF1B\u4E0D\u66FF\u7528\u6237\u505C\u6389\u8FD9\u6B21\u59D4\u6D3E\u3001\u5408\u5E76\u3001\u53D6\u6D88\u6216\u6539\u6D3E\u3002\u6CA1\u6709\u8FD9\u4E00\u6BB5\u5C31\u662F\u6CA1\u6BD4\u51FA\u6765\uFF0C\u6BD4\u5BF9\u51FA\u4E86\u95EE\u9898\u4E5F\u53EA\u662F\u6CA1\u6709\u8FD9\u4E00\u6BB5\uFF0C\u547D\u4EE4\u7167\u6837\u7B97\u6210\u529F\u3002",
+    description: "\u628A\u4E00\u4EF6\u4E8B\u4EA4\u7ED9\u7EC4\u7EC7\u91CC\u5BF9\u53E3\u7684\u4E13\u5BB6\u53BB\u505A\uFF08\u5F02\u6B65\uFF09\u3002\u547D\u4EE4\u7ACB\u5373\u8FD4\u56DE\uFF0C\u4E13\u5BB6\u5E72\u5B8C\u4E86\u7ED3\u679C\u81EA\u5DF1\u56DE\u5230\u8FD9\u6761\u5BF9\u8BDD\u2014\u2014**\u4E0D\u8981\u5728\u8FD9\u91CC\u7B49**\u3002\u6210\u529F\u540E\u5982\u679C\u672C\u516C\u53F8\u6709\u4EBA\u5728\u505A\u6216\u505A\u8FC7\u76F8\u8FD1\u7684\u4E8B\uFF0C\u8F93\u51FA\u672B\u5C3E\u4F1A\u591A\u4E00\u6BB5\u300C\u76F8\u8FD1\u7684\u4E8B\u9879\uFF08\u7CFB\u7EDF\u7C97\u7B5B\uFF0C\u672A\u786E\u8BA4\uFF0C\u8BF7\u7528 id \u67E5\u8BE6\u60C5\u540E\u5224\u65AD\uFF09\u300D\uFF08--json \u65F6\u5728 overlap \u5B57\u6BB5\u91CC\uFF0C\u540C\u6837\u51E0\u884C\uFF09\uFF0C\u6BCF\u6761\u5E26 id\uFF1A\u7528 id \u9010\u6761\u67E5\u8BE6\u60C5\uFF08\u5F85\u529E oasis todo show\u3001\u5DE5\u5355 oasis workorder\u3001\u59D4\u6D3E oasis delegate --status\uFF09\uFF0C\u5224\u65AD\u662F\u4E0D\u662F\u540C\u4E00\u4EF6\u4E8B\uFF1B\u786E\u5B9E\u76F8\u5173\u624D\u544A\u8BC9\u7528\u6237\uFF0C\u4E0D\u76F8\u5173\u4E00\u4E2A\u5B57\u90FD\u4E0D\u63D0\uFF1B\u5728\u505A\u7684\u5EFA\u8BAE\u7528\u6237\u5148\u95EE\u95EE\u5BF9\u65B9\uFF0C\u770B\u5408\u5E76\u8FD8\u662F\u5206\u5DE5\uFF1B\u505A\u5B8C\u7684\u628A\u7ED3\u679C\u7ED9\u7528\u6237\uFF0C\u95EE\u80FD\u4E0D\u80FD\u76F4\u63A5\u7528\uFF1B\u4E0D\u66FF\u7528\u6237\u505C\u6389\u8FD9\u6B21\u59D4\u6D3E\u3001\u5408\u5E76\u3001\u53D6\u6D88\u6216\u6539\u6D3E\u3002\u6CA1\u6709\u8FD9\u4E00\u6BB5\u5C31\u662F\u6CA1\u6BD4\u51FA\u6765\uFF0C\u6BD4\u5BF9\u51FA\u4E86\u95EE\u9898\u4E5F\u53EA\u662F\u6CA1\u6709\u8FD9\u4E00\u6BB5\uFF0C\u547D\u4EE4\u7167\u6837\u7B97\u6210\u529F\u3002",
     flags: [
       { name: "to", desc: "\u6D3E\u7ED9\u8C01\uFF1A\u5C97\u4F4D\u540D\u6216 actorId\uFF08\u5C97\u4F4D 0 \u4EBA\u5728\u5C97 / \u7ED1\u5B9A\u4E0D\u53EF\u7528\u4F1A\u5F53\u573A\u62A5\u9519\uFF0C\u90A3\u65F6\u81EA\u5DF1\u505A\uFF09" },
       { name: "task", desc: "\u4EFB\u52A1\u4E66\u5168\u6587\u2014\u2014\u4E13\u5BB6**\u552F\u4E00**\u7684\u4E0A\u4E0B\u6587\u6765\u6E90\uFF0C\u5199\u5168\uFF1B\u4E0D\u8BBE\u957F\u5EA6\u4E0A\u9650\u3001\u4E0D\u622A\u65AD" },
@@ -345908,7 +345915,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback2) {
     }
   }
 }
-var CLI_VERSION = "2.2.124" ? "2.2.124" : "dev";
+var CLI_VERSION = "2.2.125" ? "2.2.125" : "dev";
 function apiHeaders(token2, company) {
   const headers = {
     authorization: `Bearer ${token2}`,
@@ -346539,8 +346546,8 @@ async function runCli(argv, println = console.log, progressln = console.error) {
     if (!graph) return;
     for (const line2 of renderGraphLines(graph)) println(line2);
   };
-  const printOverlap = async (action, text7, subjectId) => {
-    if (!text7.trim()) return;
+  const overlapLines = async (action, text7, subjectId) => {
+    if (!text7.trim()) return [];
     try {
       const chatSessionId = process.env["OASIS_CHAT_SESSION_ID"];
       const r5 = await api.request("POST", "/api/overlap/candidates", {
@@ -346549,11 +346556,14 @@ async function runCli(argv, println = console.log, progressln = console.error) {
         ...subjectId ? { subjectId } : {},
         ...chatSessionId ? { chatSessionId } : {}
       }, { timeoutMs: OVERLAP_TIMEOUT_MS });
-      if (!r5?.enabled) return;
-      for (const line2 of formatOverlapLines(r5, r5.timeZone)) println(line2);
+      return r5?.enabled ? formatOverlapLines(r5, r5.timeZone) : [];
     } catch {
+      return [];
     }
   };
+  const printOverlap = async (action, text7, subjectId) => {
+    for (const line2 of await overlapLines(action, text7, subjectId)) println(line2);
+  };
   if (process.env["OASIS_STAGE"] === "1" && STAGE_COMMANDS.has(command6)) {
     const op2 = buildStageOp(command6, flags, positional, readFileArg);
     const editWs = flags.get("workspace") ?? process.env["OASIS_WORKSPACE"];
@@ -346711,7 +346721,8 @@ ${round.text}`);
         { to, task, ...flags.get("as") ? { as: flags.get("as") } : {}, ...fileArgs.length ? { files: fileArgs } : {} }
       );
       if (asJson2) {
-        println(JSON.stringify(started, null, 2));
+        const overlap = await overlapLines("delegate", task, started.delegationId);
+        println(JSON.stringify({ ...started, ...overlap.length ? { overlap } : {} }, null, 2));
         break;
       }
       println(`\u5DF2\u4EA4\u7ED9 ${to} \u53BB\u505A\uFF08\u5F02\u6B65\uFF0C\u4E0D\u7528\u7B49\uFF09\u3002`);
@@ -350217,7 +350228,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.124" : "dev";
+var PKG_VERSION = true ? "2.2.125" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test_v2",
-  "version": "2.2.124",
+  "version": "2.2.125",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"
@@ -26,6 +26,6 @@
     "node": ">=20"
   },
   "oasisRelease": {
-    "sourceHead": "c5710727b3d2947957d7afbf0e9ed4392d7589ec"
+    "sourceHead": "4bdfa5ddf253053a7ea8d8d6de7444f09b743c96"
   }
 }