@siming-org/core 0.7.3 → 0.8.0

package/dist/index.d.ts

@@ -1294,24 +1294,26 @@ type TaskRepo = Repo<Task> & {
 declare function createTaskRepo(db: Db): TaskRepo;
 
 /**
- * Issue 相关 Schemas（T202609150002 问题池）
- * 小问题轻量跟进：入池 → 整理（合并/拆分）→ 转任务（多对多）。
+ * Issue 相关 Schemas（T202609150002 问题池；T202609200001 直接标记完成 + 审批原话）
+ * 小问题轻量跟进：入池 → 整理（合并/拆分）→ 转任务（多对多）或直接标记完成。
  *
- * 状态语义（PRD 3.2 四态，终态禁止回转）：
- * - pending 待整理 / partial 部分转任务（存在未覆盖遗留）/ converted 已转任务 / cancelled 已取消
+ * 状态语义（PRD 3.2 四态基础上 T202609200001 增 done，终态禁止回转）：
+ * - pending 待整理 / partial 部分转任务（存在未覆盖遗留）/ converted 已转任务 / cancelled 已取消 / done 已直接标记完成
+ * - done：无需转任务、在某个任务/改动中顺带解决时的人工收尾终态（taskLinks 保留——已建立关联时进度可读）
  * - 任务后续演进（完成/取消）不触碰问题状态，进度是读时聚合（taskLinks × tasks.status）
  *
  * 关联模型（D1）：单一真相源在 Issue 侧（taskLinks 嵌入数组），Task 零改动；
  * 多对多，同项目内组合；取消问题时 taskLinks 终止条目拷入 history（D8 结构化追溯）。
  */
-/** 池内状态（终态 = converted / cancelled，状态机保护见 issue.repo） */
-declare const ISSUE_STATUSES: readonly ["pending", "partial", "converted", "cancelled"];
+/** 池内状态（终态 = converted / cancelled / done，状态机保护见 issue.repo） */
+declare const ISSUE_STATUSES: readonly ["pending", "partial", "converted", "cancelled", "done"];
 type IssueStatus = (typeof ISSUE_STATUSES)[number];
 declare const IssueStatusSchema: z.ZodEnum<{
     pending: "pending";
     cancelled: "cancelled";
     partial: "partial";
     converted: "converted";
+    done: "done";
 }>;
 /** 可参与转出/取消的非终态集合（事务内条件更新的并发安全带） */
 declare const ISSUE_ACTIVE_STATUSES: readonly ["pending", "partial"];
@@ -1360,12 +1362,14 @@ declare const IssueHistoryEntrySchema: z.ZodObject<{
         cancelled: "cancelled";
         partial: "partial";
         converted: "converted";
+        done: "done";
     }>>;
     to: z.ZodOptional<z.ZodEnum<{
         pending: "pending";
         cancelled: "cancelled";
         partial: "partial";
         converted: "converted";
+        done: "done";
     }>>;
     taskId: z.ZodOptional<z.ZodString>;
     reason: z.ZodOptional<z.ZodString>;
@@ -1388,7 +1392,9 @@ declare const IssueSchema: z.ZodObject<{
         cancelled: "cancelled";
         partial: "partial";
         converted: "converted";
+        done: "done";
     }>>;
+    approved: z.ZodOptional<z.ZodString>;
     taskLinks: z.ZodDefault<z.ZodArray<z.ZodObject<{
         taskId: z.ZodString;
         mode: z.ZodEnum<{
@@ -1410,12 +1416,14 @@ declare const IssueSchema: z.ZodObject<{
             cancelled: "cancelled";
             partial: "partial";
             converted: "converted";
+            done: "done";
         }>>;
         to: z.ZodOptional<z.ZodEnum<{
             pending: "pending";
             cancelled: "cancelled";
             partial: "partial";
             converted: "converted";
+            done: "done";
         }>>;
         taskId: z.ZodOptional<z.ZodString>;
         reason: z.ZodOptional<z.ZodString>;
@@ -1428,10 +1436,13 @@ type Issue = z.infer<typeof IssueSchema>;
 /**
  * 录入输入：source/projectId 由服务端按通道/项目解析注入，不入客户端 schema
  * （source 是统计信息非权限依据；projectId 缺省按 key=default 解析）。
+ * approved（T202609200001）：人类审批原话逐字（1-500 字）；AI 通道（mcp/cli）强制在 server 路由层
+ * （source 感知），schema 保持通道中立——Web 录入无此字段。
  */
 declare const IssueCreateSchema: z.ZodObject<{
     title: z.ZodString;
     description: z.ZodOptional<z.ZodString>;
+    approved: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 type IssueCreate = z.infer<typeof IssueCreateSchema>;
 /** 编辑输入（独立 object 不派生——Zod4 UpdateSchema 范式；任意状态可编辑，终态无副作用） */
@@ -1473,8 +1484,8 @@ type TaskIssueView = {
 };
 
 /**
- * Issue 仓储（T202609150002）
- * 状态机保护在此层：终态（converted/cancelled）禁止 cancel/convert 关联写入——
+ * Issue 仓储（T202609150002；T202609200001 直接标记完成 done）
+ * 状态机保护在此层：终态（converted/cancelled/done）禁止 cancel/convert/markDone 写入——
  * 条件更新双保险（filter 携带 status ∈ {pending, partial}，命中 0 行即并发终态）。
  * 进度计算两步批查（D2：不用 $lookup——Zod parse 单源 + 一次 $in 往返 + 内存映射）。
  */
@@ -1511,6 +1522,8 @@ type IssueRepo = Repo<Issue> & {
     getByIssueId(issueId: string): Promise<Issue | null>;
     updateIssue(issueId: string, patch: IssueUpdate): Promise<Issue>;
     cancelIssue(issueId: string, reason?: string): Promise<Issue>;
+    /** 直接标记完成（T202609200001）：终态三值互斥；taskLinks 保留（D3），note 落 history reason */
+    markDone(issueId: string, note?: string): Promise<Issue>;
     /** 列表（进度聚合 + view=open 过滤；两支合并 createdAt 降序统一切片） */
     listIssues(filter?: IssueListFilter): Promise<{
         items: IssueWithProgress[];

package/dist/index.js

@@ -157,7 +157,8 @@ var BIZ_CODE_MESSAGES = {
   UPGRADE_DECISION_REQUIRED: "\u672C\u5730\u5DF2\u4FEE\u6539\u7684\u8282\u70B9\u5FC5\u987B\u663E\u5F0F\u51B3\u7B56\uFF08upgrade/keep/skip\uFF09",
   UPGRADE_STALE: "\u6A21\u677F\u72B6\u6001\u4E0E\u5347\u7EA7\u8BA1\u5212\u4E0D\u7B26\uFF08\u8BA1\u5212\u540E\u6A21\u677F\u5DF2\u88AB\u7F16\u8F91\uFF09\uFF0C\u8BF7\u91CD\u65B0\u83B7\u53D6\u5347\u7EA7\u8BA1\u5212",
   FLOW_MANIFEST_INVALID: "\u8282\u70B9\u5E93 manifest \u683C\u5F0F\u6216\u7248\u672C\u4E0D\u652F\u6301",
-  // T202609150002：问题池域（message 由路由层按状态差异化——已转任务携带关联任务标识 / 已取消提示废弃）
+  // T202609150002：问题池域（终态含 done 自身，T202609200001；message 由路由层按状态差异化——
+  // 已转任务携带关联任务标识 / 已取消提示废弃 / done 提示不可再次终态）
   ISSUE_NOT_FOUND: "\u95EE\u9898\u4E0D\u5B58\u5728",
   ISSUE_INVALID_TRANSITION: "\u95EE\u9898\u5DF2\u662F\u7EC8\u6001\uFF0C\u7981\u6B62\u8BE5\u64CD\u4F5C\uFF08\u7EC8\u6001\u65E0\u56DE\u8F6C\uFF09",
   ISSUE_PROJECT_MISMATCH: "\u95EE\u9898\u4E0E\u76EE\u6807\u9879\u76EE\u5F52\u5C5E\u4E0D\u4E00\u81F4\uFF0C\u7981\u6B62\u8DE8\u9879\u76EE\u7EC4\u5408\u8F6C\u51FA",
@@ -2063,7 +2064,7 @@ function generateEntryId(existing) {
 
 // src/schemas/issue.ts
 import { z as z5 } from "zod";
-var ISSUE_STATUSES = ["pending", "partial", "converted", "cancelled"];
+var ISSUE_STATUSES = ["pending", "partial", "converted", "cancelled", "done"];
 var IssueStatusSchema = z5.enum(ISSUE_STATUSES);
 var ISSUE_ACTIVE_STATUSES = ["pending", "partial"];
 var ISSUE_SOURCES = ["mcp", "cli", "web"];
@@ -2095,6 +2096,8 @@ var IssueSchema = z5.object({
   source: IssueSourceSchema,
   projectId: z5.string().regex(OBJECT_ID_HEX, "projectId must be a valid ObjectId hex"),
   status: IssueStatusSchema.default("pending"),
+  /** 人类审批原话（T202609200001：AI 通道 mcp/cli 录入必须携带用户批准时的原文逐字，供事后审计；Web 豁免——人工录入天然即批准） */
+  approved: z5.string().min(1).max(500).optional(),
   taskLinks: z5.array(TaskLinkSchema).default([]),
   history: z5.array(IssueHistoryEntrySchema).default([]),
   createdAt: z5.date().optional(),
@@ -2102,7 +2105,8 @@ var IssueSchema = z5.object({
 });
 var IssueCreateSchema = z5.object({
   title: z5.string().min(1).max(200),
-  description: z5.string().max(1e4).optional()
+  description: z5.string().max(1e4).optional(),
+  approved: z5.string().min(1).max(500).optional()
 });
 var IssueUpdateSchema = z5.object({
   title: z5.string().min(1).max(200).optional(),
@@ -2145,6 +2149,8 @@ function createIssueRepo(db) {
         issueId,
         title: data.title,
         ...data.description !== void 0 ? { description: data.description } : {},
+        // 审批原话（T202609200001）：AI 通道强制已在 server 路由层校验，repo 仅透传落库
+        ...data.approved !== void 0 ? { approved: data.approved } : {},
         source,
         projectId,
         status: "pending",
@@ -2179,7 +2185,7 @@ function createIssueRepo(db) {
       if (!current) {
         throw new NotFoundError("issue", issueId, { bizCode: "ISSUE_NOT_FOUND" });
       }
-      if (current.status === "converted" || current.status === "cancelled") {
+      if (current.status === "converted" || current.status === "cancelled" || current.status === "done") {
         throw new ConflictError("issue", issueId, {
           bizCode: "ISSUE_INVALID_TRANSITION",
           message: `\u95EE\u9898\u5DF2\u662F\u7EC8\u6001\uFF08${String(current.status)}\uFF09\uFF0C\u7981\u6B62\u53D6\u6D88`
@@ -2220,7 +2226,45 @@ function createIssueRepo(db) {
       if (!result) {
         throw new ConflictError("issue", issueId, {
           bizCode: "ISSUE_INVALID_TRANSITION",
-          message: "\u95EE\u9898\u5DF2\u88AB\u5E76\u53D1\u5904\u7406\uFF08\u8F6C\u51FA/\u53D6\u6D88\uFF09\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5"
+          message: "\u95EE\u9898\u5DF2\u88AB\u5E76\u53D1\u5904\u7406\uFF08\u8F6C\u51FA/\u53D6\u6D88/\u5B8C\u6210\uFF09\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5"
+        });
+      }
+      return toEntity(result);
+    },
+    async markDone(issueId, note) {
+      const current = await base._collection.findOne({ issueId });
+      if (!current) {
+        throw new NotFoundError("issue", issueId, { bizCode: "ISSUE_NOT_FOUND" });
+      }
+      if (current.status === "converted" || current.status === "cancelled" || current.status === "done") {
+        throw new ConflictError("issue", issueId, {
+          bizCode: "ISSUE_INVALID_TRANSITION",
+          message: `\u95EE\u9898\u5DF2\u662F\u7EC8\u6001\uFF08${String(current.status)}\uFF09\uFF0C\u7981\u6B62\u6807\u8BB0\u5B8C\u6210`
+        });
+      }
+      const now = /* @__PURE__ */ new Date();
+      const result = await base._collection.findOneAndUpdate(
+        // 并发安全带：读后窗口内外部转出/取消/完成 → 命中 0 行报终态冲突（终态以先到者为准）
+        { issueId, status: { $in: ISSUE_ACTIVE_STATUSES } },
+        {
+          $set: { status: "done", updatedAt: now },
+          $push: {
+            history: {
+              id: generateEntryId([]),
+              action: "status-change",
+              from: current.status,
+              to: "done",
+              ...note !== void 0 ? { reason: note } : {},
+              at: now
+            }
+          }
+        },
+        { returnDocument: "after" }
+      );
+      if (!result) {
+        throw new ConflictError("issue", issueId, {
+          bizCode: "ISSUE_INVALID_TRANSITION",
+          message: "\u95EE\u9898\u5DF2\u88AB\u5E76\u53D1\u5904\u7406\uFF08\u8F6C\u51FA/\u53D6\u6D88/\u5B8C\u6210\uFF09\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5"
         });
       }
       return toEntity(result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@siming-org/core",
-  "version": "0.7.3",
+  "version": "0.8.0",
   "license": "MIT",
   "author": "Wuchao",
   "engines": {