@miphamai/cli 0.62.0 → 0.63.0

package/package.json

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

package/src/agent/effectiveness-tracker.ts

@@ -47,11 +47,7 @@ export class EffectivenessTracker {
     if (eff) eff.decisionId = decisionId
   }
 
-  recordApplication(
-    ruleId: string,
-    success: boolean,
-    opts?: { toolName?: string; error?: string },
-  ): void {
+  recordApplication(ruleId: string, success: boolean, opts?: { error?: string }): void {
     let eff = this.data.get(ruleId)
     if (!eff) {
       eff = {
@@ -69,7 +65,7 @@ export class EffectivenessTracker {
     }
 
     // 可恢复/环境性失败：仍记录，但不进成功率分母（防误降级/误禁用能用的规则）。
-    if (!success && opts?.error && isRecoverableToolFailure(opts.toolName ?? '', opts.error)) {
+    if (!success && opts?.error && isRecoverableToolFailure(opts.error)) {
       eff.recoverableCount = (eff.recoverableCount ?? 0) + 1
       return
     }

package/src/agent/message-bus.ts

@@ -24,6 +24,16 @@ export interface AgentMessage {
   type: AgentMessageType
 }
 
+/**
+ * Format an inbound message for injection into the conversation as a
+ * user-role notice. Collapsed to one line (`Message from @<sender>: <summary>`)
+ * so cross-session peer messages don't bloat the context; the full body stays
+ * in the bus for Ctrl+O expansion.
+ */
+export function formatInboundMessage(msg: AgentMessage): string {
+  return `Message from @${msg.from}: ${msg.summary}`
+}
+
 export class AgentMessageBus {
   private messages: AgentMessage[] = []
   private idCounter = 0

package/src/agent/recoverable-failure.ts

@@ -1,21 +1,27 @@
 /**
- * 判「可恢复/环境性」失败 vs 真缺陷（borrow opencrabs `is_recoverable_tool_failure` 思想）。
+ * 判「可恢复/环境性」失败 vs 真缺陷（borrow openprabs is_recoverable_tool_failure 思想）。
  *
- * 可恢复失败（网络超时、连接拒绝、缺文件、环境权限）不该进成功率分母，否则会把成功率
- * 拉低、诱导 EffectivenessTracker 禁用能用的规则（openprabs #236 的坑：stale-hash 重试
- * 被误判成工具缺陷，把能用的 hashline_edit 禁了）。
+ * 可恢复失败（网络超时、连接拒绝、DNS 解析失败、环境权限）不该进成功率分母，否则会把
+ * 成功率拉低、诱导 EffectivenessTracker 禁用能用的规则（openprabs #236 的坑：stale-hash
+ * 重试被误判成工具缺陷，把能用的 hashline_edit 禁了）。
  *
- * fail-closed：无 error、或非 Bash 工具，一律按真失败算（证不了可恢复就不排除）。
+ * 刻意排除 ENOENT（no such file or directory）：缺文件/路径错更可能是规则本身指错了
+ * 路径（幻觉），而非环境瞬态，须计入分母（2026-08-27 review M1）。
+ *
+ * 不区分工具：这些错误模式（超时/连接/DNS/权限）本身即工具无关的环境信号。旧的
+ * `toolName !== 'Bash'` 守卫漏掉 Write/Grep 规则（2026-08-27 review M2），已移除。
+ *
+ * fail-closed：无 error 一律按真失败算（证不了可恢复就不排除）。
  */
 const RECOVERABLE_PATTERNS: RegExp[] = [
-  /\btimed?\s?out\b/i, // timeout / timed out（网络慢 / 服务死）
-  /(ECONNREFUSED|connection refused|not connected|network unreachable)/i, // 服务未起
-  /(no such file or directory|ENOENT)/i, // 缺资源，非缺陷
+  /\btimed?\s?out\b/i, // timeout / timed out / timedout（网络慢 / 服务慢）
+  /(ECONNREFUSED|ECONNRESET|ETIMEDOUT|connection refused|not connected|network unreachable)/i, // 服务未起 / 网络超时
+  /(could not resolve host|name or service not known|getaddrinfo|ENOTFOUND)/i, // DNS 解析失败
   /(permission denied|EACCES)/i, // 环境权限
 ]
 
-export function isRecoverableToolFailure(toolName: string, error?: string): boolean {
-  if (!error || toolName !== 'Bash') return false
+export function isRecoverableToolFailure(error?: string): boolean {
+  if (!error) return false
   const e = error.toLowerCase()
   return RECOVERABLE_PATTERNS.some((re) => re.test(e))
 }

package/src/agent/sub-agent.ts

@@ -319,6 +319,7 @@ export class SubAgent {
 
     const chunks: string[] = []
     const MAX_TOOL_TURNS = options.maxTurns || 5
+    let hitMaxTurns = false
 
     let currentMessages = messages
     let currentSystemPrompt = systemPrompt
@@ -360,7 +361,7 @@ export class SubAgent {
             })
           }
           if (chunk.type === 'error') {
-            throw new Error(`Sub-agent execution failed: ${chunk.error}`)
+            throw new Error(`Sub-agent execution failed (model ${finalModel}): ${chunk.error}`)
           }
           if (chunk.type === 'stop') {
             break
@@ -501,6 +502,9 @@ export class SubAgent {
 
         // Don't send system prompt on subsequent turns
         currentSystemPrompt = ''
+
+        // On the final permitted turn we still used tools → hit the cap.
+        if (turn === MAX_TOOL_TURNS - 1) hitMaxTurns = true
       }
     } catch (err) {
       if (err instanceof DOMException && err.name === 'AbortError') {
@@ -509,10 +513,18 @@ export class SubAgent {
       if (err instanceof Error && err.message.startsWith('Sub-agent')) {
         throw err
       }
-      throw new Error(`Sub-agent execution failed: ${String(err)}`)
+      throw new Error(`Sub-agent execution failed (model ${finalModel}): ${String(err)}`)
     }
 
-    return chunks.join('')
+    const result = chunks.join('')
+    if (hitMaxTurns) {
+      return (
+        `[partial result — sub-agent reached its ${MAX_TOOL_TURNS}-turn limit; ` +
+        'task may be incomplete. Use SendMessage to continue this sub-agent.]\n\n' +
+        result
+      )
+    }
+    return result
   }
 
   /**

package/src/core/crsi-sandbox.ts

@@ -16,7 +16,7 @@
 
 import { execSync } from 'node:child_process'
 import { mkdirSync, rmSync, existsSync, writeFileSync, readFileSync, readdirSync } from 'node:fs'
-import { join, resolve, sep } from 'node:path'
+import { join, resolve, sep, posix } from 'node:path'
 import { tmpdir, homedir } from 'node:os'
 import { randomUUID } from 'node:crypto'
 
@@ -115,6 +115,12 @@ const PROTECTED_PATHS = [
   'apps/cli/src/core/crsi-sandbox.ts',
   'apps/cli/src/core/crsi-producer.ts',
   'apps/cli/src/core/proposal-guard.ts',
+  // 2026-08-27 review 补齐：运行时执行/评估器，改掉会削弱 grader 或安全边界
+  'apps/cli/src/core/crsi-modify.ts',
+  'apps/cli/src/core/rule-engine.ts',
+  'apps/cli/src/core/red-team.ts',
+  'apps/cli/src/core/error-signature-db.ts',
+  'apps/cli/src/core/preflight-checker.ts',
 ]
 
 /** 是否命中只读边界。前缀匹配，目录条目以 `/` 结尾。 */
@@ -130,13 +136,24 @@ export function isProtectedPath(filePath: string): boolean {
  *
  * 返回错误字符串（拒绝理由），合法时返回 null。
  */
-export function validateBlastRadius(proposal: { blastRadius?: string[] }): string | null {
+export function validateBlastRadius(proposal: {
+  filePath?: string
+  blastRadius?: string[]
+}): string | null {
+  const filePath = proposal.filePath
   if (!proposal.blastRadius || proposal.blastRadius.length === 0) {
     return (
       'blast radius 未声明：自修改必须枚举触及的全部代码路径。' +
       '教训：两条渲染路径只接一条 = 局部正确全局遗漏。'
     )
   }
+  // 2026-08-27 review：blastRadius 不能只自证「非空」，必须覆盖被修改文件本身
+  // （前缀匹配，目录条目以 / 结尾），否则声明形同虚设。
+  if (filePath && !proposal.blastRadius.some((p) => filePath === p || filePath.startsWith(p))) {
+    return (
+      `blast radius 未覆盖目标文件 "${filePath}"：` + '声明必须包含被修改文件本身（前缀匹配）。'
+    )
+  }
   return null
 }
 
@@ -225,7 +242,10 @@ export class CrsiSandbox {
     }
 
     const worktreeRoot = resolve(this.worktreePath)
-    const targetPath = resolve(this.worktreePath, mod.filePath)
+    // Normalize "./" and "subdir/../" so the protected-path guard can't be evaded
+    // by a path that resolves back inside the worktree (raw prefix match would miss it).
+    const normalizedFilePath = posix.normalize(mod.filePath)
+    const targetPath = resolve(this.worktreePath, normalizedFilePath)
 
     // Path traversal guard: reject any target that resolves outside the sandbox worktree
     if (targetPath !== worktreeRoot && !targetPath.startsWith(worktreeRoot + sep)) {
@@ -237,7 +257,7 @@ export class CrsiSandbox {
 
     // Protected-path guard: the self-improvement loop must not modify the
     // constitution, eval harness, or improvement machinery itself.
-    if (isProtectedPath(mod.filePath)) {
+    if (isProtectedPath(normalizedFilePath)) {
       result.error = `Protected path: "${mod.filePath}" is read-only to the self-improvement loop.`
       result.phase = 'failed'
       this.sessionReport.modifications.push(result)
@@ -275,7 +295,7 @@ export class CrsiSandbox {
 
       // Generate diff
       try {
-        result.diff = execSync(`git diff -- "${mod.filePath}"`, {
+        result.diff = execSync(`git diff -- "${normalizedFilePath}"`, {
           cwd: this.worktreePath,
           timeout: 10_000,
           encoding: 'utf-8',

package/src/core/engine.ts

@@ -40,7 +40,12 @@ import { buildRequest, sendInferenceCheck, isInferenceHookEnabled } from './infe
 import { getFileInboxTransport } from '../agent/cross-session/file-inbox'
 import { registerWakeupHandler } from '../tools/scheduling/schedule-wakeup'
 import { accumulateGraftSavings } from '../shared/graft-savings'
-import { getMessageBus, type AgentMessage } from '../agent/message-bus'
+import {
+  getMessageBus,
+  formatInboundMessage,
+  type AgentMessage,
+  type AgentMessageBus,
+} from '../agent/message-bus'
 import { createT } from '../i18n-core/t'
 import enUS from '../i18n-core/locales/en-US.json'
 import zhCN from '../i18n-core/locales/zh-CN.json'
@@ -255,6 +260,28 @@ export class QueryEngine {
     }
   }
 
+  /**
+   * Drain unread inbound messages from the in-memory bus (addressed to this
+   * session or to "main") and inject them into the conversation as user-role
+   * notices. Returns the number of messages injected.
+   *
+   * The bus is the delivery channel for same-process SendMessage ("main",
+   * "bg-*", "sub-agent-*") and the re-post target of pollCrossSessionInbox;
+   * this is the missing "drain" step that surfaces those messages to the model.
+   */
+  drainInboundMessages(bus: AgentMessageBus = getMessageBus()): number {
+    const recipients = [...new Set([this.sessionId, 'main'])]
+    let injected = 0
+    for (const recipient of recipients) {
+      for (const msg of bus.poll(recipient)) {
+        this.context.addMessage({ role: 'user', content: formatInboundMessage(msg) })
+        injected++
+      }
+      bus.markAllRead(recipient)
+    }
+    return injected
+  }
+
   /** Register a hook engine for pre/post tool-use lifecycle events. */
   setHookEngine(hooks: HookEngine): void {
     this.hookEngine = hooks
@@ -474,6 +501,8 @@ export class QueryEngine {
 
     // Poll for cross-session messages before each turn
     await this.pollCrossSessionInbox()
+    // Drain in-memory bus messages (same-process SendMessage + cross-session re-posts)
+    this.drainInboundMessages()
 
     // Fire UserPromptSubmit hooks before processing
     if (this.hookEngine) {
@@ -1204,7 +1233,6 @@ export class QueryEngine {
           const ruleId = match?.[1]
           if (ruleId) {
             tracker.recordApplication(ruleId, result.success, {
-              toolName: name,
               error: result.error,
             })
           }

package/src/core/hooks-executor.ts

@@ -49,7 +49,8 @@ function executeCommand(cfg: HookConfig, ctx: HookContext): HookResult {
     }
 
     // Non-zero exit: check for block signal (exit code 2)
-    const stderr = result.stderr?.toString() || ''
+    // 截断 stderr 防 MB 级 hook 输出溢出会话（对齐 HTTP hook 的 slice(0,2000)）。
+    const stderr = (result.stderr?.toString() || '').slice(0, 2000)
 
     if (result.status === 2) {
       return {

package/src/core/session-name.ts

@@ -0,0 +1,12 @@
+/**
+ * Generate the session name (ID) used for cross-session tracking, inbox routing,
+ * and session persistence.
+ *
+ * Includes milliseconds so two sessions launched in the same second do not
+ * collide on the shared inbox directory / active-session registry. (2026-08-27
+ * review: the old `slice(0, 19)` dropped ms and let same-second launches share
+ * one inbox, leaking / misdelivering cross-session messages.)
+ */
+export function generateSessionName(resume: string | undefined, now: Date = new Date()): string {
+  return resume || `session-${now.toISOString().replace(/[:.]/g, '-')}`
+}

package/src/index.tsx

@@ -25,6 +25,7 @@ import { loadSessionMemories, getMemoryManager } from './core/memory/memory-load
 import { ContextManager } from './core/context'
 import { PrefixCacheTracker } from './core/context-token'
 import { QueryEngine } from './core/engine'
+import { generateSessionName } from './core/session-name'
 import { ExperienceRuleEngine } from './core/rule-engine.js'
 import { SessionLog } from './core/session-log'
 import { SessionStore } from './core/session-store'
@@ -40,6 +41,7 @@ import { mountConstitution, createConstitution } from './core/constitution-seam'
 import { ConstitutionLoader } from './core/constitution-loader'
 import { McpClient } from './mcp/client'
 import { registerMcpServerTools, syncMcpToolsOnChange } from './mcp/registry'
+import { formatMcpConnectFailures, type McpConnectFailure } from './mcp/connect-failures'
 import { AgentRegistry } from './agent/agent-registry'
 import { HookEngine } from './core/hooks'
 import { ArtifactServer } from './artifacts/server'
@@ -202,8 +204,8 @@ function SetupGate(props: SetupGateProps) {
 async function connectMcpServers(
   mcpServers: McpServerConfig[],
   tools: ReturnType<typeof createToolRegistry>,
-): Promise<void> {
-  if (mcpServers.length === 0) return
+): Promise<McpConnectFailure[]> {
+  if (mcpServers.length === 0) return []
   const mcp = McpClient.getInstance()
   // Wire runtime tool-list changes before connect so mid-connect updates land.
   syncMcpToolsOnChange(mcp, tools)
@@ -216,14 +218,17 @@ async function connectMcpServers(
       }
     }),
   )
+  const failures: McpConnectFailure[] = []
   for (let i = 0; i < results.length; i++) {
     const result = results[i]!
     if (result.status === 'rejected') {
-      process.stderr.write(
-        `[mcp] Failed to connect "${mcpServers[i]!.name}": ${String(result.reason)}\n`,
-      )
+      const name = mcpServers[i]!.name
+      const reason = String(result.reason)
+      failures.push({ name, reason })
+      process.stderr.write(`[mcp] Failed to connect "${name}": ${reason}\n`)
     }
   }
+  return failures
 }
 
 export async function runApp(options: RunOptions): Promise<void> {
@@ -325,8 +330,7 @@ export async function runApp(options: RunOptions): Promise<void> {
   const pluginManager = new PluginManager()
 
   // Generate session name for tracking (used by /cd to persist cwd)
-  const sessionName =
-    options.resume || `session-${new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19)}`
+  const sessionName = generateSessionName(options.resume)
 
   // Initialize context — restore saved session if available
   // Read the active model's context window for dynamic max-token sizing.
@@ -498,7 +502,7 @@ export async function runApp(options: RunOptions): Promise<void> {
   // Connect MCP servers lazily in the background: the UI renders immediately,
   // and each server's tools register into the shared registry as it connects.
   // A dead server (e.g. a 15s connect timeout) no longer blocks startup.
-  void connectMcpServers(config.skills?.mcpServers ?? [], tools)
+  const mcpConnectPromise = connectMcpServers(config.skills?.mcpServers ?? [], tools)
 
   // Initialize hook engine — register skill-defined hooks
   const hookEngine = new HookEngine()
@@ -562,6 +566,14 @@ export async function runApp(options: RunOptions): Promise<void> {
 
   // ── Cross-session messaging: register session, heartbeat, shutdown ──
   engine.setSessionId(sessionName)
+
+  // Surface MCP connect failures to the model once they settle, so it knows
+  // those servers' tools are unavailable (rather than silently concluding the
+  // tools don't exist). Injected asynchronously — never blocks first paint.
+  void mcpConnectPromise.then((failures) => {
+    const notice = formatMcpConnectFailures(failures)
+    if (notice) engine.getContext().addMessage({ role: 'user', content: notice })
+  })
   // Human-readable, cross-session-addressable name. Defaults to the cwd basename
   // so `@mipham-code` can address this session; uniqueness is enforced against
   // other live sessions (suffix -2, -3, …). The id stays a stable `session-<ts>`.

package/src/mcp/connect-failures.ts

@@ -0,0 +1,15 @@
+export interface McpConnectFailure {
+  name: string
+  reason: string
+}
+
+/**
+ * Format a startup notice for MCP servers that failed to connect, so the model
+ * knows their tools are unavailable (instead of concluding the tools don't
+ * exist). Empty string when nothing failed.
+ */
+export function formatMcpConnectFailures(failures: McpConnectFailure[]): string {
+  if (failures.length === 0) return ''
+  const list = failures.map((f) => `- ${f.name}: ${f.reason}`).join('\n')
+  return `[MCP] These MCP servers failed to connect — their tools are unavailable:\n${list}`
+}

package/src/plugin/claude-plugin.ts

@@ -26,7 +26,7 @@ export function readClaudeManifest(dir: string): ClaudeManifest | null {
   const path = join(dir, '.claude-plugin', 'plugin.json')
   if (!existsSync(path)) return null
   try {
-    return JSON.parse(readFileSync(path, 'utf-8')) as ClaudeManifest
+    return JSON.parse(readFileSync(path, 'utf-8').replace(/^\uFEFF/, '')) as ClaudeManifest
   } catch {
     return null
   }

package/src/plugin/plugin-validator.ts

@@ -52,7 +52,7 @@ export function validatePlugin(dir: string): PluginValidation {
 
   const errors: string[] = []
   try {
-    const raw = readFileSync(resolved.path, 'utf-8')
+    const raw = readFileSync(resolved.path, 'utf-8').replace(/^\uFEFF/, '')
     const manifest = JSON.parse(raw) as PluginManifest
 
     if (!manifest.name || !/^[a-z0-9-]+$/.test(manifest.name)) {

package/src/shared/package-info.ts

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