add-coder 0.3.34 → 0.3.35

package/templates/core/governance/session-start-guard.ts

@@ -3,10 +3,12 @@
 //
 // 设计范式: OOP 守卫类（状态恢复/模板索引/代办/HITL 四职责聚合）。
 
-import { existsSync, readdirSync, statSync } from "node:fs"
+import { existsSync, readdirSync, readFileSync, statSync } from "node:fs"
 import { join } from "node:path"
 import { detectActiveAdd, tryResolveMagicDir } from "./common.js"
 import { PreloadTemplates } from "./preload-templates.js"
+import { L1_SNAPSHOT_FILE, L1_SNAPSHOT_TTL_MS, MEMORY_DIR_NAME, memoryMaxTokens, recallMode } from "../scripts/mcp-server/shared/memory/switches.js"
+import { estimateTokens } from "../scripts/mcp-server/shared/memory/retrieval/context-builder.js"
 
 /**
  * SessionStart 守卫（① 状态恢复 → ② 模板索引 → ③ 代办 → ④ HITL 待审批检测）:
@@ -41,6 +43,9 @@ export class SessionStartGuard {
     // ── ④ §HITL 待审批检测（扩展点: adapter 可 override 关闭）──
     this.emitHitlPending()
 
+    // ── ⑤ Memory L1 快照注入（Spec §10；fail-open，读预计算快照，无 DB）──
+    this.emitMemoryL1()
+
     return 0
   }
 
@@ -96,4 +101,46 @@ export class SessionStartGuard {
       }
     }
   }
+
+  /**
+   * ⑤ Memory L1 快照注入（ADD_MEMORY_RECALL_MODE 三态）:
+   *   off    → 不输出
+   *   shadow → 仅提示快照存在（召回可执行并落审计，但不注入上下文）
+   *   inject → 读预计算快照注入（新鲜度 ≤7 天，token 预算截断，带来源边界标签）
+   * 同步 Hook ≤200ms 约束：只读文件，任何异常 fail-open 静默跳过。
+   */
+  protected emitMemoryL1(): void {
+    try {
+      const mode = recallMode()
+      if (mode === "off" || !this.magicDir) return
+      const file = join(this.projectDir, this.magicDir, MEMORY_DIR_NAME, L1_SNAPSHOT_FILE)
+      if (!existsSync(file)) return
+      if (mode === "shadow") {
+        process.stdout.write(`[Memory] L1 快照已生成（shadow 模式未注入）。需要时调用 recall_memory 显式召回: ${file}\n`)
+        return
+      }
+      // inject：过期快照不注入
+      if (Date.now() - statSync(file).mtimeMs > L1_SNAPSHOT_TTL_MS) return
+      const text = readFileSync(file, "utf-8")
+      const budget = memoryMaxTokens()
+      if (estimateTokens(text) <= budget) {
+        process.stdout.write(text)
+        return
+      }
+      // 超预算：按行截断，不静默吞掉——追加显式截断标记
+      const lines = text.split("\n")
+      const kept: string[] = []
+      let used = 0
+      for (const line of lines) {
+        const t = estimateTokens(line)
+        if (used + t > budget) break
+        kept.push(line)
+        used += t
+      }
+      kept.push(`[Memory L1] ⚠️ 超出预算 ${budget} tokens，已截断（完整快照: ${file}）`)
+      process.stdout.write(kept.join("\n") + "\n")
+    } catch {
+      /* fail-open：记忆子系统故障不阻断 session-start（Plan §9.3） */
+    }
+  }
 }

package/templates/core/governance/stop-router.ts

@@ -12,11 +12,6 @@ import {
   hasDevAction,
 } from "./common.js"
 import { buildStopContext } from "./context-inject.js"
-import { protocol } from "./rules.js"
-import { createHash } from "node:crypto"
-import { existsSync, readFileSync, writeFileSync } from "node:fs"
-import { tmpdir } from "node:os"
-import { join } from "node:path"
 
 /**
  * Stop 四象限分流路由（Q0-Q4，与 bash stop-check.sh 同语义）:
@@ -70,20 +65,14 @@ export class StopRouter {
   // ─────────────────────────── 扩展点 ───────────────────────────
 
   /**
- * Q4 验收决策（双维度组合——2026-08-14 Task 9.4.4④ 上提，回流: I2）:
- *   维度 0（新增，临时方案）: 弹框频控——同项目同 Plan 窗口内达上限 → 降级放行
- *   维度 1（前置）: DB 任务进度（step = done/total，数值且 done<total → 未完成阻断提示）
- *   维度 2: checklist 质量（checkAddCompleteness 未闭环 → 阻断）
- *   互补非替代——codex 原 DB 进度分流语义上提 core，core checklist 质量语义保留。
- */
-protected q4Check(plan: string, rounds: string, step: string, handoff: string, addRoute: string): number {
+   * Q4 验收决策（双维度组合——2026-08-14 Task 9.4.4④ 上提，回流: I2）:
+   *   维度 1（前置）: DB 任务进度（step = done/total，数值且 done<total → 未完成阻断提示）
+   *   维度 2: checklist 质量（checkAddCompleteness 未闭环 → 阻断）
+   *   互补非替代——codex 原 DB 进度分流语义上提 core，core checklist 质量语义保留。
+   */
+  protected q4Check(plan: string, rounds: string, step: string, handoff: string, addRoute: string): number {
+    void plan
     void rounds
-    // 维度 0: 弹框频控（达上限 → 放行，防 Stop 阻断刷屏死循环）
-    const limited = this.stopPromptLimited(plan)
-    if (limited) {
-        process.stderr.write(`[ADD Stop] 已达本 Plan 弹框上限(${this.stopPromptMax()})，本次放行。请在后续实施中完成验收闭环（devlog + handoff）后停止。\n`)
-        return 0
-    }
     // 维度 1: DB 任务进度（step 格式 done/total，如 11/64）
     const [donePart, totalPart] = step.split("/")
     if (
@@ -108,89 +97,6 @@ protected q4Check(plan: string, rounds: string, step: string, handoff: string, a
     return this.emitQ4Pass()
   }
 
-  // ── 弹框频控（临时方案，规则真源: hook-protocol-rules.toml [protocol.stop]）──
-  // 计数隔离: 文件级 = PROJECT_DIR md5（跨项目不互扰）；key 级 = planName（同项目跨 Plan 不互扰）
-  // 故障降级: 哨兵读/写异常 → fail-open 放行（不阻塞主流程）
-
-  /** 哨兵记录：同一项目同一 Plan 的弹框计数 */
-  protected stopPromptMax(): number {
-    const cfg = protocol.stop as { max_prompt_per_context?: number } | undefined
-    return cfg?.max_prompt_per_context ?? 3
-  }
-
-  /** 哨兵窗口（毫秒） */
-  protected stopPromptWindowMs(): number {
-    const cfg = protocol.stop as { window_minutes?: number } | undefined
-    return (cfg?.window_minutes ?? 30) * 60_000
-  }
-
-  /** 哨兵文件路径（项目隔离：PROJECT_DIR md5） */
-  protected stopSentinelPath(): string {
-    const projectDir =
-      process.env.PROJECT_DIR ||
-      process.env.QODER_PROJECT_DIR ||
-      process.env.QODERCN_PROJECT_DIR ||
-      process.env.CLAUDE_PROJECT_DIR ||
-      process.cwd()
-    const md5 = createHash("md5").update(projectDir).digest("hex").slice(0, 8)
-    return join(tmpdir(), `add_stop_${md5}.json`)
-  }
-
-  /** 写哨兵（失败静默，fail-open） */
-  protected writeStopPromptSentinel(data: Record<string, { count: number; lastPromptAt: number }>): void {
-    try {
-      writeFileSync(this.stopSentinelPath(), JSON.stringify(data), "utf-8")
-    } catch {
-      // 静默：哨兵写失败不影响主流程
-    }
-  }
-
-  /**
-   * 频控判定：返回 true = 已达上限应放行（不弹框）
-   * 生成态缺失 protocol.stop（TOML 未同步）→ 跳过频控保持既有行为（生成链幂等校验兜底）
-   */
-  protected stopPromptLimited(plan: string): boolean {
-    try {
-      const stopCfg = protocol.stop as
-        | { max_prompt_per_context?: number; window_minutes?: number }
-        | undefined
-      if (!stopCfg) return false // 生成态缺失 → 跳过频控
-      const max = this.stopPromptMax()
-      const windowMs = this.stopPromptWindowMs()
-      const path = this.stopSentinelPath()
-      let data: Record<string, { count: number; lastPromptAt: number }> = {}
-      if (existsSync(path)) {
-        try {
-          data = JSON.parse(readFileSync(path, "utf-8")) ?? {}
-        } catch {
-          return true // 哨兵损坏 → fail-open 放行
-        }
-      }
-      const now = Date.now()
-      const entry = data[plan]
-      if (!entry) {
-        // 首次触发：计数 1，正常弹框
-        data[plan] = { count: 1, lastPromptAt: now }
-        this.writeStopPromptSentinel(data)
-        return false
-      }
-      if (now - entry.lastPromptAt > windowMs) {
-        // 窗口过期：重置计数 1，正常弹框（新窗口）
-        data[plan] = { count: 1, lastPromptAt: now }
-        this.writeStopPromptSentinel(data)
-        return false
-      }
-      if (entry.count >= max) {
-        return true // 窗口内已达上限 → 放行（不写回，保持计数）
-      }
-      data[plan] = { count: entry.count + 1, lastPromptAt: now }
-      this.writeStopPromptSentinel(data)
-      return false
-    } catch {
-      return true // 自身故障 → fail-open 放行
-    }
-  }
-
   /** Q0: DB 不可用（core: stderr + 2） */
   protected emitQ0(reason: string): number {
     process.stderr.write(

package/templates/core/prisma/add.prisma

@@ -216,3 +216,206 @@ model CollaborationPlanBinding {
   @@unique([contractId, projectKey, adapterKey, planName])
   @@index([projectKey, adapterKey, planName])
 }
+
+// ===== Agent Memory 知识治理层（Plan: add-coder-agent-memory-plan-v2） =====
+// 数据约束（Plan §4.4）：
+// - ACTIVE 必须至少关联一条 Evidence；approve 时 approvedBy/approvedAt 必填
+// - SUPERSEDED 必须设置 supersededById，且新旧 repository/scope 兼容
+// - validUntil <= now() 不得进入默认召回；HYPOTHESIS 不得作为 Gate 强约束
+// - importance/confidence ∈ [0,1]；contentHash = sha256(规范化文本)，幂等含 repository+scope
+// - ORGANIZATION scope 首版禁用（枚举保留，写入拒绝，§17-7 定案）
+
+enum MemoryKind {
+  DECISION
+  CONSTRAINT
+  PITFALL
+  FAILURE
+  LESSON
+  PATTERN
+  CONVENTION
+  FACT
+  HANDOFF_DIGEST
+  HYPOTHESIS
+}
+
+enum MemoryStatus {
+  CANDIDATE
+  PENDING
+  ACTIVE
+  STALE
+  SUPERSEDED
+  REJECTED
+  ARCHIVED
+}
+
+enum MemoryScopeType {
+  ORGANIZATION
+  REPOSITORY
+  BRANCH
+  MODULE
+  PATH
+  SYMBOL
+  PLAN
+  SPEC
+}
+
+enum MemorySourceType {
+  PLAN
+  SPEC
+  DPS_GATE
+  DEV_OPERATION
+  RAHS_GATE
+  HANDOFF
+  MANUAL
+  IMPORT
+}
+
+enum EmbeddingState {
+  DISABLED
+  PENDING
+  READY
+  FAILED
+  STALE
+}
+
+enum RecallOutcome {
+  UNKNOWN
+  USED
+  USEFUL
+  IRRELEVANT
+  OUTDATED
+  CONTRADICTED
+  HARMFUL
+}
+
+model AddMemory {
+  id              String          @id @default(cuid())
+  kind            MemoryKind
+  status          MemoryStatus    @default(CANDIDATE)
+  topic           String
+  content         String
+  summary         String?
+
+  scopeType       MemoryScopeType
+  scopeValue      String
+  repositoryRef   String
+
+  importance      Float           @default(0.5)
+  confidence      Float           @default(0.5)
+  validFrom       DateTime        @default(now())
+  validUntil      DateTime?
+
+  supersededById  String?
+  supersededBy    AddMemory?      @relation("MemorySupersession", fields: [supersededById], references: [id])
+  supersedes      AddMemory[]     @relation("MemorySupersession")
+
+  contentHash     String
+  embeddingModel  String?
+  embeddingDim    Int?
+  embeddingState  EmbeddingState  @default(DISABLED)
+
+  createdBy       String?
+  approvedBy      String?
+  approvedAt      DateTime?
+  metadata        Json?
+  createdAt       DateTime        @default(now())
+  updatedAt       DateTime        @updatedAt
+
+  evidenceLinks   AddMemoryEvidenceLink[]
+  recalls         AddMemoryRecallItem[]
+
+  @@index([repositoryRef, status, kind])
+  @@index([scopeType, scopeValue])
+  @@index([supersededById])
+  @@index([status, validUntil])
+  @@unique([repositoryRef, contentHash, scopeType, scopeValue])
+}
+
+model AddMemoryEvidence {
+  id            String           @id @default(cuid())
+  repositoryRef String
+  sourceType    MemorySourceType
+  sourceRef     String
+  planKeyword   String?
+  excerpt       String
+  contentHash   String
+  occurredAt    DateTime?
+  metadata      Json?
+  createdAt     DateTime         @default(now())
+
+  memoryLinks   AddMemoryEvidenceLink[]
+
+  @@index([repositoryRef, sourceType, sourceRef])
+  @@index([planKeyword])
+  @@unique([repositoryRef, sourceType, sourceRef, contentHash])
+}
+
+model AddMemoryEvidenceLink {
+  memoryId    String
+  evidenceId  String
+  relation    String?
+  createdAt   DateTime          @default(now())
+
+  memory      AddMemory         @relation(fields: [memoryId], references: [id])
+  evidence    AddMemoryEvidence @relation(fields: [evidenceId], references: [id])
+
+  @@id([memoryId, evidenceId])
+}
+
+// sourceRef 约定：必须包含当次运行标识（格式 {gate}:{planKeyword}:{runId}），
+// 同一 Gate 对同一来源的重复测量由 runId 区分（Review P1 #2 回流）
+model AddMetricSnapshot {
+  id            String   @id @default(cuid())
+  repositoryRef String
+  metricType    String
+  value         Float
+  baseline      Float?
+  delta         Float?
+  unit          String?
+  planKeyword   String?
+  specRef       String?
+  commitSha     String?
+  sourceRef     String
+  metadata      Json?
+  measuredAt    DateTime @default(now())
+
+  @@index([repositoryRef, metricType, measuredAt])
+  @@unique([repositoryRef, metricType, sourceRef])
+}
+
+model AddMemoryRecall {
+  id               String          @id @default(cuid())
+  repositoryRef    String
+  query            String
+  stage            String
+  consumerRef      String?
+  scopeContext     Json
+  candidateIds     Json
+  selectedIds      Json
+  scoreBreakdown   Json
+  exclusionReasons Json?
+  rankingVersion   String
+  tokenBudget      Int
+  injectedTokens   Int
+  latencyMs        Int?
+  degradedMode     String?
+  createdAt        DateTime        @default(now())
+  items            AddMemoryRecallItem[]
+
+  @@index([repositoryRef, stage, createdAt])
+}
+
+model AddMemoryRecallItem {
+  recallId   String
+  memoryId   String
+  selected   Boolean
+  rank       Int?
+  outcome    RecallOutcome @default(UNKNOWN)
+  feedback   String?
+  updatedAt  DateTime      @updatedAt
+
+  recall     AddMemoryRecall @relation(fields: [recallId], references: [id])
+  memory     AddMemory       @relation(fields: [memoryId], references: [id])
+
+  @@id([recallId, memoryId])
+}

package/templates/core/scripts/db-ensure.sh

@@ -123,14 +123,54 @@ build_target() {
     [ -n "$tables" ] && EXCLUDE_ARGS=(--exclude "$tables")
     echo ">>> Atlas 同步（共库模式: 仅 ADD 治理表，其余 $(echo "$tables" | tr ',' '\n' | wc -l) 张表排除）..."
   fi
+  # Atlas 自身的版本记录 schema 不属于期望态，必须排除，否则 diff 会生成 DROP SCHEMA ... CASCADE
+  EXCLUDE_ARGS+=(--exclude atlas_schema_revisions)
   TARGET_URL="${TARGET_URL}?sslmode=disable"
 }
 
-# ④ baseline 生成（同源：Prisma schema SQL，过滤 Prisma 7 ◇ 提示）
+# ③.5 raw 对象登记（schema 表达不了的对象：trgm 索引 / 向量层；单一事实源）
+#   期望态必须能表达这些对象，否则 diff 把「raw 对象」判成多余并生成 DROP（review 发现 #2）。
+#   约束：Atlas dev-url 必须是干净库且具备同名扩展（否则 gin_trgm_ops / vector 类型无法解析）；
+#   本项目的 dev 库是一次性沙箱 → 每次 diff 前从 template1 重建（见 prepare_atlas_dev_db）。
+RAW_OBJECTS_SQL="prisma/raw-objects.sql"
+RAW_OBJECTS_VECTOR_SQL="prisma/raw-objects-vector.sql"
+
+# dev 沙箱库准备：DROP + CREATE TEMPLATE template1（template1 内已装 pg_trgm/vector）
+prepare_atlas_dev_db() {
+  local c="${PROJECT_NAME:-add-project}-dev" u="${ATLAS_DEV_USER:-admin}" d="${ATLAS_DEV_DB:-add-project-dev}"
+  podman exec "$c" true >/dev/null 2>&1 || { echo ">>> [dev-url] 容器 $c 不可达，跳过重建（依赖现有 dev 库）"; return 0; }
+  if [ "${ADD_DB_KEEP_DEV:-}" = "yes" ]; then
+    echo ">>> [dev-url] ADD_DB_KEEP_DEV=yes：沿用现有 dev 库"
+    return 0
+  fi
+  podman exec "$c" psql -U "$u" -d postgres -tAc "DROP DATABASE IF EXISTS \"$d\";" >/dev/null 2>&1 || true
+  if podman exec "$c" psql -U "$u" -d postgres -tAc "CREATE DATABASE \"$d\" TEMPLATE template1;" >/dev/null 2>&1; then
+    echo ">>> [dev-url] 已从 template1 重建沙箱库 $d（干净 + 扩展齐备）"
+  else
+    echo ">>> [dev-url] 重建 $d 失败，沿用现有库（若解析报错请检查 template1 扩展）"
+  fi
+}
+
+# 目标库是否具备 pgvector（决定是否把向量段并入期望态）
+has_pgvector_in_target() {
+  local c="${PROJECT_NAME:-add-project}-postgres" u="${DATABASE_USER:-admin}" d="${PROJECT_NAME:-add-project}" has
+  has="$(podman exec "$c" psql -U "$u" -d "$d" -tAc "SELECT 1 FROM pg_available_extensions WHERE name='vector' LIMIT 1;" 2>/dev/null || true)"
+  [ "$has" = "1" ]
+}
+
+# ④ baseline 生成（同源：Prisma schema SQL + raw 对象登记段，过滤 Prisma 7 ◇ 提示）
 generate_baseline() {
   BASELINE_SQL="$(mktemp /tmp/atlas-target.XXXXXX.sql)"
   trap 'rm -f "$BASELINE_SQL"' EXIT
   npx prisma migrate diff --from-empty --to-schema "$SCHEMA_TARGET" --script 2>/dev/null | sed '/^◇/d' > "$BASELINE_SQL"
+  if [ -f "$RAW_OBJECTS_SQL" ]; then
+    printf '\n-- ===== raw objects registry =====\n' >> "$BASELINE_SQL"
+    cat "$RAW_OBJECTS_SQL" >> "$BASELINE_SQL"
+  fi
+  if has_pgvector_in_target && [ -f "$RAW_OBJECTS_VECTOR_SQL" ]; then
+    printf '\n-- ===== raw objects registry (vector) =====\n' >> "$BASELINE_SQL"
+    cat "$RAW_OBJECTS_VECTOR_SQL" >> "$BASELINE_SQL"
+  fi
 }
 
 # ⑤ diff 检测（SQL 语句特征判定：Atlas 无变更时输出 "Schemas are synced..." 非空，不算变更）
@@ -140,10 +180,28 @@ run_atlas_diff() {
   echo "$DIFF_SQL" | grep -qE "^(CREATE|ALTER|DROP|COMMENT|-- *(Create|Modify|Drop))"
 }
 
-# ⑥ apply（确认门槛：交互输出 SQL → 确认 → apply；拒绝则跳过）
+# ⑥ apply（双门槛：DROP 守卫 → 交互确认 → apply；任一不通过则跳过）
+#   DROP 守卫（Plan 轮 3 前置 / runtime review 发现 #2）：破坏性语句一律拒绝——
+#   raw SQL 对象（如 pg_trgm GIN 索引、pgvector 列/索引）无法被 Prisma schema 表达，
+#   diff 会误判为「多余对象」并生成 DROP；若放行，索引会被静默删除且不报错。
+#   显式放行需人工设 ADD_DB_ALLOW_DROP=yes，并在迁移评审中登记（禁止默认自动放行）。
 apply_atlas_diff() {
   echo "=== 待应用 diff SQL（前 60 行）==="
   echo "$DIFF_SQL" | head -60
+  local drops
+  drops="$(printf '%s\n' "$DIFF_SQL" | grep -nE '^DROP |DROP COLUMN|DROP CONSTRAINT|DROP INDEX|DROP TABLE|DROP TYPE|DROP SCHEMA' || true)"
+  if [ -n "$drops" ]; then
+    echo "!!! 检测到破坏性语句（DROP），已拒绝应用："
+    printf '%s\n' "$drops" | sed 's/^/    /'
+    echo "    处置建议："
+    echo "      ① 若是无法被 schema 表达的 raw SQL 对象（索引/扩展/向量列）→ 核对登记清单 prisma/raw-objects.sql、prisma/raw-objects-vector.sql；"
+    echo "      ② 确需删除时人工执行，并在迁移评审中登记（能力矩阵 §六 已登记同类缺口）。"
+    if [ "${ADD_DB_ALLOW_DROP:-}" != "yes" ]; then
+      echo "    （如需在评审后放行：ADD_DB_ALLOW_DROP=yes 重新执行）"
+      return 1
+    fi
+    echo "    ⚠️ ADD_DB_ALLOW_DROP=yes 已设置：放行破坏性变更（确认已完成迁移评审）"
+  fi
   read -rp "应用以上 schema 变更？[y/N] " ANS
   if [ "$ANS" = "y" ] || [ "$ANS" = "yes" ]; then
     atlas_cmd schema apply --url "$TARGET_URL" --to "file://$BASELINE_SQL" --dev-url "$ATLAS_DEV_URL" "${EXCLUDE_ARGS[@]}"
@@ -173,6 +231,7 @@ atlas_sync() {
     echo "!!! ATLAS_DEV_URL 未配置。请运行 add-coder init（分库引导自动创建 {project}-add-dev 常驻容器并登记）或手动配置"
     return 1
   fi
+  prepare_atlas_dev_db
   build_target
   generate_baseline
   if run_atlas_diff; then

package/templates/core/scripts/mcp-server/shared/db-types.ts

@@ -138,6 +138,118 @@ export const CollabContractRowSchema = z.looseObject({
   updatedAt: z.date(),
 })
 
+// ===== Agent Memory 行 schema（对齐 prisma/add.prisma，Plan: add-coder-agent-memory-plan-v2） =====
+
+export const MemoryKindSchema = z.enum([
+  "DECISION", "CONSTRAINT", "PITFALL", "FAILURE", "LESSON",
+  "PATTERN", "CONVENTION", "FACT", "HANDOFF_DIGEST", "HYPOTHESIS",
+])
+export const MemoryStatusSchema = z.enum([
+  "CANDIDATE", "PENDING", "ACTIVE", "STALE", "SUPERSEDED", "REJECTED", "ARCHIVED",
+])
+export const MemoryScopeTypeSchema = z.enum([
+  "ORGANIZATION", "REPOSITORY", "BRANCH", "MODULE", "PATH", "SYMBOL", "PLAN", "SPEC",
+])
+export const MemorySourceTypeSchema = z.enum([
+  "PLAN", "SPEC", "DPS_GATE", "DEV_OPERATION", "RAHS_GATE", "HANDOFF", "MANUAL", "IMPORT",
+])
+export const EmbeddingStateSchema = z.enum(["DISABLED", "PENDING", "READY", "FAILED", "STALE"])
+export const RecallOutcomeSchema = z.enum([
+  "UNKNOWN", "USED", "USEFUL", "IRRELEVANT", "OUTDATED", "CONTRADICTED", "HARMFUL",
+])
+
+export const AddMemoryRowSchema = z.looseObject({
+  id: z.string(),
+  kind: MemoryKindSchema,
+  status: MemoryStatusSchema,
+  topic: z.string(),
+  content: z.string(),
+  summary: z.string().nullable(),
+  scopeType: MemoryScopeTypeSchema,
+  scopeValue: z.string(),
+  repositoryRef: z.string(),
+  importance: z.number(),
+  confidence: z.number(),
+  validFrom: z.date(),
+  validUntil: z.date().nullable(),
+  supersededById: z.string().nullable(),
+  contentHash: z.string(),
+  embeddingModel: z.string().nullable(),
+  embeddingDim: z.number().nullable(),
+  embeddingState: EmbeddingStateSchema,
+  createdBy: z.string().nullable(),
+  approvedBy: z.string().nullable(),
+  approvedAt: z.date().nullable(),
+  metadata: z.unknown().nullable(),
+  createdAt: z.date(),
+  updatedAt: z.date(),
+})
+
+export const AddMemoryEvidenceRowSchema = z.looseObject({
+  id: z.string(),
+  repositoryRef: z.string(),
+  sourceType: MemorySourceTypeSchema,
+  sourceRef: z.string(),
+  planKeyword: z.string().nullable(),
+  excerpt: z.string(),
+  contentHash: z.string(),
+  occurredAt: z.date().nullable(),
+  metadata: z.unknown().nullable(),
+  createdAt: z.date(),
+})
+
+export const AddMemoryEvidenceLinkRowSchema = z.looseObject({
+  memoryId: z.string(),
+  evidenceId: z.string(),
+  relation: z.string().nullable(),
+  createdAt: z.date(),
+})
+
+export const AddMetricSnapshotRowSchema = z.looseObject({
+  id: z.string(),
+  repositoryRef: z.string(),
+  metricType: z.string(),
+  value: z.number(),
+  baseline: z.number().nullable(),
+  delta: z.number().nullable(),
+  unit: z.string().nullable(),
+  planKeyword: z.string().nullable(),
+  specRef: z.string().nullable(),
+  commitSha: z.string().nullable(),
+  sourceRef: z.string(),
+  metadata: z.unknown().nullable(),
+  measuredAt: z.date(),
+})
+
+export const AddMemoryRecallRowSchema = z.looseObject({
+  id: z.string(),
+  repositoryRef: z.string(),
+  query: z.string(),
+  stage: z.string(),
+  consumerRef: z.string().nullable(),
+  scopeContext: z.unknown(),
+  candidateIds: z.unknown(),
+  selectedIds: z.unknown(),
+  scoreBreakdown: z.unknown(),
+  exclusionReasons: z.unknown().nullable(),
+  rankingVersion: z.string(),
+  tokenBudget: z.number(),
+  injectedTokens: z.number(),
+  latencyMs: z.number().nullable(),
+  degradedMode: z.string().nullable(),
+  createdAt: z.date(),
+})
+
+export const AddMemoryRecallItemRowSchema = z.looseObject({
+  recallId: z.string(),
+  memoryId: z.string(),
+  selected: z.boolean(),
+  rank: z.number().nullable(),
+  outcome: RecallOutcomeSchema,
+  feedback: z.string().nullable(),
+  updatedAt: z.date(),
+})
+
 // ===== 类型派生（单一真源：schema → 类型） =====
 
 export type PlanRow = z.infer<typeof PlanRowSchema>
@@ -147,6 +259,12 @@ export type AuditLogRow = z.infer<typeof AuditLogRowSchema>
 export type DevOperationRow = z.infer<typeof DevOperationRowSchema>
 export type AddUserRow = z.infer<typeof AddUserRowSchema>
 export type CollabContractRow = z.infer<typeof CollabContractRowSchema>
+export type AddMemoryRow = z.infer<typeof AddMemoryRowSchema>
+export type AddMemoryEvidenceRow = z.infer<typeof AddMemoryEvidenceRowSchema>
+export type AddMemoryEvidenceLinkRow = z.infer<typeof AddMemoryEvidenceLinkRowSchema>
+export type AddMetricSnapshotRow = z.infer<typeof AddMetricSnapshotRowSchema>
+export type AddMemoryRecallRow = z.infer<typeof AddMemoryRecallRowSchema>
+export type AddMemoryRecallItemRow = z.infer<typeof AddMemoryRecallItemRowSchema>
 
 // ===== 查询参数（Prisma 最常用子集，结构化约束 + 运算符支持） =====
 
@@ -159,6 +277,7 @@ export interface QueryArgs<T> {
   orderBy?: { [K in keyof T]?: OrderDirection }
   take?: number
   skip?: number
+  cursor?: Record<string, unknown>
   include?: Record<string, unknown>
 }
 

package/templates/core/scripts/mcp-server/shared/hitl-create-policy.ts

@@ -0,0 +1,27 @@
+/*
+ * create_hitl 的交互裁决（手写模块；**不要放进 hitl-interaction.strategy.ts**——
+ * 那是 `hitl-interaction-rules.toml` 的生成产物，任何手写逻辑都会被 generate 覆盖）。
+ *
+ * 背景（2026-09-14 修复 Codex 空转）：
+ * 客户端按安装环境裁决交互方式：Qoder=genui、Codex=mcpApps、其余=inputRequired。
+ * `update_hitl` 早已有 `mcpApps` 分支（引导走 core widget），但 `create_hitl` **漏了这一支**，
+ * 于是 Codex 下走 elicitation 弹框 → 客户端不展示 → 一直"还在要输入" →
+ * 连续 8 轮后以 `inputRequired.maxRounds` 失败（实测报 `still required input after 8 rounds`）。
+ */
+
+/**
+ * create_hitl 是否需要跳过"创建确认弹框"：
+ * - `_fallback` / `_use_genui`：调用方显式声明的无弹框路径（既有语义）；
+ * - **`mcpApps`（Codex）**：审批交互在 core widget（`render_hitl_approval`）里完成，
+ *   此处直接产出 DRAFT 提案，再由 widget 供用户拍板。
+ */
+export function shouldSkipHitlCreateDialog(
+  mode: string, // 运行期取 toml 裁决值，收窄到 string 边界
+  flags: { fallback?: boolean; useGenui?: boolean; mcpApps?: boolean } = {},
+): boolean {
+  /*
+   * `_mcp_apps` 显式开关（2026-09-14 自 farm-agent 回灌）：环境裁决之外再给调用方一个强制入口——
+   * 适配其它客户端/build、或需要确定性地走 widget 流程时不必依赖 toml 探测结果。
+   */
+  return Boolean(flags.useGenui || flags.fallback || flags.mcpApps) || mode === "mcpApps"
+}