@miphamai/cli 0.60.1 → 0.61.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miphamai/cli",
-  "version": "0.60.1",
+  "version": "0.61.0",
   "description": "Mipham Code — Multi-model open-core intelligent coding terminal by MiphamAI",
   "keywords": [
     "ai",

package/src/core/crsi-modify.ts

@@ -13,7 +13,7 @@
  */
 
 import { randomUUID } from 'node:crypto'
-import { CrsiSandbox } from './crsi-sandbox'
+import { CrsiSandbox, validateBlastRadius } from './crsi-sandbox'
 import type { CrsiModificationResult } from './crsi-sandbox'
 import { runEval, appendEvalScore, getLastEvalScore } from './eval-harness'
 
@@ -28,6 +28,13 @@ export interface CrsiProposal {
   originalContent?: string
   /** 触发此改动的 CRSI insight id */
   crsiInsightId?: string
+  /**
+   * 完整覆盖（blast radius）：此改动触及的**所有**代码路径（文件列表）。
+   *
+   * 源于 2026-08-26 教训：修「思考转储」只接实时指示器、漏历史行冲刷路径——
+   * 局部正确、全局遗漏。自修改前必须摸清并声明全部受影响路径，否则 fail-closed 拒绝。
+   */
+  blastRadius?: string[]
 }
 
 // ── Pending proposal registry (两阶段闸门) ──
@@ -42,6 +49,25 @@ export function runCrsiModification(
   proposal: CrsiProposal,
   sandbox: CrsiSandbox = new CrsiSandbox(),
 ): CrsiModificationResult {
+  // 完整覆盖闸：自修改必须声明 blastRadius，否则 fail-closed（在 worktree 之前，零副作用）。
+  const blastRadiusError = validateBlastRadius(proposal)
+  if (blastRadiusError) {
+    return {
+      modification: {
+        id: 'crsi-mod-rejected-blast-radius',
+        description: proposal.description,
+        filePath: proposal.filePath,
+        newContent: proposal.newContent,
+        originalContent: proposal.originalContent ?? '',
+        crsiInsightId: proposal.crsiInsightId,
+        timestamp: new Date().toISOString(),
+      },
+      applied: false,
+      phase: 'failed',
+      error: blastRadiusError,
+    }
+  }
+
   sandbox.createWorktree()
 
   const applied = sandbox.applyModification({

package/src/core/crsi-producer.ts

@@ -127,7 +127,13 @@ export function produceCrsiProposal(
   metaRules: MetaRule[],
   currentLessons: string,
   timestamp: string,
-): { description: string; filePath: string; newContent: string; originalContent: string } | null {
+): {
+  description: string
+  filePath: string
+  newContent: string
+  originalContent: string
+  blastRadius: string[]
+} | null {
   const signal = selectCrsiSignal(insights, metaRules)
   if (!signal) return null
 
@@ -142,6 +148,7 @@ export function produceCrsiProposal(
     filePath: LESSONS_FILE,
     newContent,
     originalContent: currentLessons,
+    blastRadius: [LESSONS_FILE],
   }
 }
 
@@ -215,7 +222,13 @@ export function renderManagedRuleSource(signal: CrsiSignal): string | null {
 export function produceRuleProposal(
   signal: CrsiSignal,
   currentManagedRules: string,
-): { description: string; filePath: string; newContent: string; originalContent: string } | null {
+): {
+  description: string
+  filePath: string
+  newContent: string
+  originalContent: string
+  blastRadius: string[]
+} | null {
   const ruleSource = renderManagedRuleSource(signal)
   if (!ruleSource) return null
 
@@ -232,6 +245,7 @@ export function produceRuleProposal(
     filePath: MANAGED_RULES_FILE,
     newContent,
     originalContent: currentManagedRules,
+    blastRadius: [MANAGED_RULES_FILE],
   }
 }
 

package/src/core/crsi-sandbox.ts

@@ -122,6 +122,24 @@ export function isProtectedPath(filePath: string): boolean {
   return PROTECTED_PATHS.some((p) => filePath === p || filePath.startsWith(p))
 }
 
+/**
+ * 完整覆盖闸（blast radius）：自修改 proposal 必须声明非空 blastRadius，否则拒绝。
+ *
+ * 源于 2026-08-26 教训：修「思考转储」只接实时指示器、漏历史行冲刷路径——
+ * 局部正确、全局遗漏。自修改前必须摸清并声明全部受影响路径，fail-closed。
+ *
+ * 返回错误字符串（拒绝理由），合法时返回 null。
+ */
+export function validateBlastRadius(proposal: { blastRadius?: string[] }): string | null {
+  if (!proposal.blastRadius || proposal.blastRadius.length === 0) {
+    return (
+      'blast radius 未声明：自修改必须枚举触及的全部代码路径。' +
+      '教训：两条渲染路径只接一条 = 局部正确全局遗漏。'
+    )
+  }
+  return null
+}
+
 // ── Sandbox ──
 
 export class CrsiSandbox {

package/src/core/eval-harness.ts

@@ -19,7 +19,7 @@ import { ConstitutionLoader, DEFAULT_CONSTITUTION } from './constitution-loader'
 import { ErrorSignatureDB } from './error-signature-db'
 import { PreFlightChecker } from './preflight-checker'
 import { RedTeam } from './red-team'
-import { isProtectedPath } from './crsi-sandbox'
+import { isProtectedPath, validateBlastRadius } from './crsi-sandbox'
 import { produceRuleProposal, MANAGED_RULES_FILE } from './crsi-producer'
 import type { CrsiSignal } from './crsi-producer'
 import { loadBehaviorTasks, judgeBehaviorTask } from './behavior-tasks'
@@ -167,6 +167,16 @@ export function runEval(): EvalReport {
     results.push({ id, description: `受保护路径被拒: ${path}`, passed: isProtectedPath(path) })
   }
 
+  // ── 完整覆盖闸（ground truth：未声明 blast radius 的 proposal 被 fail-closed 拒绝） ──
+  results.push({
+    id: 'blast-radius-gate',
+    description: '自修改 proposal 未声明 blast radius 被拒，声明后放行',
+    passed:
+      validateBlastRadius({ blastRadius: undefined }) !== null &&
+      validateBlastRadius({ blastRadius: [] }) !== null &&
+      validateBlastRadius({ blastRadius: ['apps/cli/src/foo.ts'] }) === null,
+  })
+
   // ── 安全（ground truth：16 攻击零漏过） ──
   const redTeam = new RedTeam().run(constitution, preflight, errorDB)
   results.push({

package/src/core/instructions.ts

@@ -1,5 +1,5 @@
 import { readFileSync, existsSync } from 'node:fs'
-import { join } from 'node:path'
+import { join, resolve, relative, sep, isAbsolute } from 'node:path'
 import { execSync } from 'node:child_process'
 import { parse as parseYaml } from 'yaml'
 import type { InstructionFile } from '../shared/index.ts'
@@ -59,32 +59,78 @@ export function parsePromptExclude(value: unknown): string[] {
   return []
 }
 
+/** 定位仓库根（git rev-parse --show-toplevel），非 git 目录回退 cwd。 */
+export function gitRoot(cwd: string): string {
+  try {
+    return execSync('git rev-parse --show-toplevel', {
+      cwd,
+      timeout: 5000,
+      encoding: 'utf-8',
+    }).trim()
+  } catch {
+    return cwd
+  }
+}
+
+/** 从仓库根到 cwd 的目录链（含两端），就近（cwd）在最后。cwd 不在 root 下时退化为 [cwd]。 */
+export function discoverDirectories(root: string, cwd: string): string[] {
+  const absRoot = resolve(root)
+  const absCwd = resolve(cwd)
+  if (absCwd === absRoot) return [absRoot]
+
+  const rel = relative(absRoot, absCwd)
+  if (rel.startsWith('..') || isAbsolute(rel)) return [absCwd]
+
+  const dirs = [absRoot]
+  let cur = absRoot
+  for (const seg of rel.split(sep)) {
+    cur = join(cur, seg)
+    dirs.push(cur)
+  }
+  return dirs
+}
+
+/**
+ * 每目录内指令文件的读取顺序（后加载 = 更高优先级）。
+ * AGENTS.md（行业标准基线）→ AGENTS.override.md（Codex 覆盖层）→
+ * MIPHAM.md（Mipham 品牌）→ CLAUDE.md（Claude Code 兼容）。
+ * MIPHAM→CLAUDE 相对顺序保持现状不变，仅前置 AGENTS 两条，避免行为回归。
+ */
+export const INSTRUCTION_FILENAMES = [
+  'AGENTS.md',
+  'AGENTS.override.md',
+  'MIPHAM.md',
+  'CLAUDE.md',
+] as const
+
 export class InstructionsLoader {
   private instructions: InstructionFile[] = []
   private crsiLessonSummaries: CrsiLessonSummary[] = []
 
   loadAll(cwd: string): void {
     this.instructions = []
+    const root = gitRoot(cwd)
+
+    // Tier 1: 集团/公司策略（锚定仓库根，从任意子目录启动都正确；不读 AGENTS.md）
+    this.tryLoad(join(root, '..', '..', 'CLAUDE.md'), 'group') // Rismed_Ronxin_Capital
+    this.tryLoad(join(root, '..', 'CLAUDE.md'), 'company') // One_Mipham_Corporation
+    this.tryLoad(join(root, '..', 'MIPHAM.md'), 'group')
+
+    // Tier 2: 递归项目层 — git 根 → cwd，逐目录读，就近（cwd）最后 = 优先级最高
+    const dirs = discoverDirectories(root, cwd)
+    dirs.forEach((dir, i) => {
+      const level: InstructionFile['level'] = i === dirs.length - 1 ? 'project' : 'directory'
+      for (const name of INSTRUCTION_FILENAMES) {
+        this.tryLoad(join(dir, name), level)
+      }
+    })
 
-    // Tier 1: Ancestor-level CLAUDE.md (for Claude Code compatibility)
-    // ../../ = Rismed_Ronxin_Capital
-    this.tryLoad(join(cwd, '..', '..', 'CLAUDE.md'), 'group')
-    // ../ = One_Mipham_Corporation
-    this.tryLoad(join(cwd, '..', 'CLAUDE.md'), 'company')
-
-    // Tier 1b: Group-level MIPHAM.md — One_Mipham_Corporation is the root
-    this.tryLoad(join(cwd, '..', 'MIPHAM.md'), 'group')
-
-    // Tier 2: Project-level (CLAUDE.md + MIPHAM.md at cwd)
-    this.tryLoad(join(cwd, 'MIPHAM.md'), 'project')
-    this.tryLoad(join(cwd, 'CLAUDE.md'), 'project')
-
-    // Tier 3: User-level ~/.mipham/USER.md
+    // Tier 3: 用户层 ~/.mipham/USER.md
     const home = process.env.HOME || '~'
     this.tryLoad(join(home, '.mipham', 'USER.md'), 'user')
 
     // CRSI 教训召回：读 crsi-lessons.md 提取精华，注入系统提示（只写不读 → 写后召回）
-    this.crsiLessonSummaries = this.loadCrsiLessons(cwd)
+    this.crsiLessonSummaries = this.loadCrsiLessons(root)
   }
 
   buildSystemPrompt(permissionMode?: string): string {
@@ -235,17 +281,7 @@ Never omit it or present the work as purely human-authored.`)
   }
 
   /** 读 crsi-lessons.md（按仓库根定位）提取教训精华。读不到则返回空。 */
-  private loadCrsiLessons(cwd: string): CrsiLessonSummary[] {
-    let root = cwd
-    try {
-      root = execSync('git rev-parse --show-toplevel', {
-        cwd,
-        timeout: 5000,
-        encoding: 'utf-8',
-      }).trim()
-    } catch {
-      // 非 git 目录 → 回退 cwd
-    }
+  private loadCrsiLessons(root: string): CrsiLessonSummary[] {
     try {
       const content = readFileSync(join(root, LESSONS_FILE), 'utf-8')
       return extractCrsiLessonSummaries(content)

package/src/shared/package-info.ts

@@ -9,7 +9,7 @@
 export const PACKAGE_NAME = '@miphamai/cli' as const
 
 /** 当前发布版本 */
-export const PACKAGE_VERSION = '0.60.1' as const
+export const PACKAGE_VERSION = '0.61.0' as const
 
 /** npm install 全局安装命令 */
 export const NPM_INSTALL_COMMAND = `npm install -g ${PACKAGE_NAME}` as const