fix: reduce binding mismatch, memory agent ambiguity, and ledger noise

Rebind skill_route trusted context from plan observation when lifecycle lags MCP replan. Prefer runtime-detected agent among multi-client memory roots and pin DEVCODEX_AGENT on managed MCP configs. Demote completed sessions from activeSessionIds, repair corrupted unreleased bullet, and refresh runtime contract digest.

Author: rockyshi1993

changelogs/unreleased.md

@@ -23,8 +23,7 @@
 - **P0-1 Batch2 历史实现（已由统一路由替代）**：`init`/`ensureRuntimeDirs` 写入 DEVCODEX.md 模板（不覆盖）；旧 intent CLI 已退役。
 - **P0-1 ECR 计数同步**：新增 `workspace-skill-author` 后 Skill 规模 84→**85**（82 active + 3 gray）；重生 `skills/portfolio.json`；同步 test-skill-portfolio / docs-surface-inventory / V92/V95 / README / website 规模锚点。
 - **联系邮箱统一为 `rockyshi1993@gmail.com`**：`package.json` author 与 `SECURITY.md` 漏洞报告邮箱一致（唯一可用邮箱）。
-- **npm 包名为未 scope 的 `devcodex`**：安装入口 `npm install -g devcodex` / `npm update -g devcodex`；GitHub 组织仓与 npm 模块身份分离；`package.json` name=`devcodex`；撤销 `devcodex` 误绑。
-pm install|update -g 对齐 devcodex；alidate-profile 识别 scoped 包名；修复正则字面量中 / 截断；managed deployment-manifest package 字段同步。
+- **npm 包名为未 scope 的 `devcodex`**：安装入口 `npm install -g devcodex` / `npm update -g devcodex`；GitHub 组织仓与 npm 模块身份分离；`package.json` name=`devcodex`；撤销 `devcodex` 误绑。文档与命令示例中 `npm install|update -g` 对齐 `devcodex`；`validate-profile` 识别 scoped 包名；修复正则字面量中 `/` 截断；managed deployment-manifest package 字段同步。
 - **目录与包身份统一为 devcodex（本地/公开）**：源码目录与 active-root 由 devcodex-v1 对齐为 devcodex；npm 包 devcodex、仓库 devcodex-labs/devcodex、npmjs public 发布配置与 probe/fixtures/Skill 示例同步；isSourceRepo 识别新包名；历史 releases 台账不回溯改写。
 
 - **维护者站点×清单一致性（Fix-1 分母重冻）**：`docs-surface-inventory` npm scripts 下限 **≥113**、scripts/lib **≥102**；基线 `scripts/fixtures/docs-surface-baseline-20260727.json`；intro 能力证据表补 scripts/lib/validation/delivery-honesty 与五宿主 L0 摘要表。需求：`maintainer-site-docs-consistency`。

hooks/_runtime/host-skill-route-capabilities.v1.json

@@ -13,7 +13,7 @@
       "status": "PASS",
       "testedVersion": "codex-cli 0.145.0",
       "protocol": "MCP 2024-11-05",
-      "runtimeContractDigest": "1c727701a1ae4f3a8699a932066994098402744b99ed81ba2ec32f1929bf5d6a",
+      "runtimeContractDigest": "8e6fd2aa9f8dd4f865ff76b670f3f4a2f61b8ccd4c37546d84579c5d6efd8b41",
       "hostAdapterDigest": "6ba881f7fd7eba6297e1fcb8c55da09abbd5f47a42661fb2269f38d05e014139",
       "evidenceDigest": "ce8fb9c145934bb59f2ce1f5d253a21fb9ba33218a728d4b23b7a0c45fe2cc53",
       "evidenceRef": "E:/Worker/devcodex/.audit-state/content-root-s15-codex-production-20260730.json",

hooks/_runtime/skill-route-tool.cjs

@@ -134,6 +134,95 @@ function readJson (file, fsImpl = fs) {
   }
 }
 
+function writeJsonAtomic (file, value, fsImpl = fs) {
+  const dir = path.dirname(file)
+  fsImpl.mkdirSync(dir, { recursive: true })
+  const tmp = `${file}.tmp.${process.pid}.${Date.now()}`
+  fsImpl.writeFileSync(tmp, `${JSON.stringify(value, null, 2)}\n`, 'utf8')
+  fsImpl.renameSync(tmp, file)
+}
+
+/**
+ * When MCP plan observation advanced but Hook PostToolUse never installed the
+ * plan into lifecycle-state, skill_route would see MISMATCH/stale against the
+ * caller's contextBinding. Rebind from the exact observation when identities match.
+ */
+function tryRebindLifecycleFromPlanObservation (binding, target, lifecycle, options = {}) {
+  const fsImpl = options.fs || fs
+  const acquisition = lifecycle?.contextAcquisition
+  if (!acquisition || typeof acquisition !== 'object') return { rebound: false, lifecycle }
+
+  const plan = acquisition.plan
+  const receipt = acquisition.receipt
+  const identityMatches = !!(
+    plan &&
+    receipt &&
+    binding.contextEpoch === acquisition.contextEpoch &&
+    binding.contextEpoch === plan.identity?.contextEpoch &&
+    binding.planId === plan.planId &&
+    binding.planContentId === plan.planContentId &&
+    path.resolve(binding.activeRoot) === path.resolve(target.activeRoot) &&
+    binding.project === target.project &&
+    receipt.contextEpoch === binding.contextEpoch &&
+    receipt.planId === binding.planId &&
+    receipt.planContentId === binding.planContentId
+  )
+  if (identityMatches && ACCEPTED_CONTEXT_RECEIPT_STATUSES.has(receipt.status)) {
+    return { rebound: false, lifecycle }
+  }
+
+  let readContextPlanObservation
+  let createContextReadReceipt
+  let validateContextReadPlan
+  try {
+    ;({ readContextPlanObservation } = require('./context-plan-observation.cjs'))
+    ;({ createContextReadReceipt, validateContextReadPlan } = require('./context-read-contract.cjs'))
+  } catch {
+    return { rebound: false, lifecycle }
+  }
+
+  const observed = readContextPlanObservation({
+    activeRoot: target.activeRoot,
+    project: target.project,
+    contextEpoch: binding.contextEpoch
+  })
+  if (observed.status !== 'fresh' || !observed.plan) return { rebound: false, lifecycle }
+  if (observed.plan.planId !== binding.planId || observed.plan.planContentId !== binding.planContentId) {
+    return { rebound: false, lifecycle }
+  }
+  const validation = validateContextReadPlan(observed.plan)
+  if (!validation.valid) return { rebound: false, lifecycle }
+
+  const priorReceipt = acquisition.receipt
+  const nextReceipt = createContextReadReceipt(observed.plan, {
+    verificationMode: 'structured-plan',
+    planObserved: true,
+    hostSessionId: acquisition.hostSessionId
+  })
+  if (priorReceipt && Number.isFinite(Number(priorReceipt.replanCount))) {
+    nextReceipt.replanCount = Number(priorReceipt.replanCount)
+  }
+
+  acquisition.plan = observed.plan
+  acquisition.receipt = nextReceipt
+  acquisition.contextEpoch = binding.contextEpoch
+  acquisition.activeRoot = path.resolve(target.activeRoot).replace(/\\/g, '/')
+  acquisition.project = target.project
+  acquisition.targetResolved = true
+  acquisition.fallbackActive = false
+  acquisition.lastError = null
+  acquisition.verificationMode = 'structured-plan'
+
+  lifecycle.contextAcquisition = acquisition
+  const statePath = lifecycleStatePath(target)
+  try {
+    writeJsonAtomic(statePath, lifecycle, fsImpl)
+  } catch {
+    // Still use in-memory rebinding for this call even if persist fails.
+  }
+  return { rebound: true, lifecycle }
+}
+
 function validateTrustedContextBinding (binding, target, options = {}) {
   if (options.trustedContext) return options.trustedContext
   if (!binding ||
@@ -152,7 +241,14 @@ function validateTrustedContextBinding (binding, target, options = {}) {
     throw error
   }
   const statePath = lifecycleStatePath(target)
-  const lifecycle = readJson(statePath, options.fs || fs)
+  let lifecycle = readJson(statePath, options.fs || fs)
+  if (!lifecycle || typeof lifecycle !== 'object') lifecycle = {}
+  if (!lifecycle.contextAcquisition || typeof lifecycle.contextAcquisition !== 'object') {
+    lifecycle.contextAcquisition = {}
+  }
+
+  const rebound = tryRebindLifecycleFromPlanObservation(binding, target, lifecycle, options)
+  lifecycle = rebound.lifecycle
   const acquisition = lifecycle?.contextAcquisition
   const plan = acquisition?.plan
   const receipt = acquisition?.receipt
@@ -199,7 +295,8 @@ function validateTrustedContextBinding (binding, target, options = {}) {
     receiptId: receipt.receiptId,
     receiptStatus: receipt.status,
     hostSessionId: String(acquisition.hostSessionId || ''),
-    statePath: portable(statePath)
+    statePath: portable(statePath),
+    reboundFromObservation: rebound.rebound === true
   }
   value.bindingDigest = sha256(value)
   return value

mcp/memory-server.js

@@ -881,6 +881,12 @@ function resolveMemoryAgent(agent, activeRoot) {
     }
     if (candidates.length === 1) return candidates[0]
     if (candidates.length > 1) {
+      // Prefer runtime-detected host when multi-client dirs exist (common in monorepos).
+      // Only fail closed when inference is unknown or not among candidates.
+      const inferred = normalizeAgent(DEFAULT_AGENT) || detectRuntimeAgent()
+      if (inferred && inferred !== 'unknown-agent' && candidates.includes(inferred)) {
+        return inferred
+      }
       throw memoryQueryError(
         `memory agent is ambiguous; available clients: ${candidates.join(', ')}.`,
         'Pass the current actual host in agent.',

scripts/lib/global-host-config.js

@@ -240,45 +240,64 @@ function copilotHookDocument(runtimeFile) {
   }
 }
 
-function buildMcpServers(runtimeRoot) {
+/**
+ * Map global host id → memory/profile agent identity (VALID_AGENTS).
+ * Claude host root is `.claude` but agent id is `claude-code`.
+ */
+function hostToRuntimeAgent (host) {
+  const normalized = String(host || '').trim().toLowerCase()
+  if (normalized === 'claude') return 'claude-code'
+  if (normalized === 'copilot' || normalized === 'codex' || normalized === 'grok') return normalized
+  // gemini / unknown: leave unset so detectRuntimeAgent can still apply
+  return ''
+}
+
+function buildMcpServers(runtimeRoot, options = {}) {
+  const agent = hostToRuntimeAgent(options.agent || options.host)
+  const env = agent ? { DEVCODEX_AGENT: agent } : undefined
+  const base = {
+    type: 'stdio',
+    command: 'node'
+  }
   return {
     'devcodex-memory': {
-      type: 'stdio',
-      command: 'node',
-      args: [portable(path.join(runtimeRoot, 'mcp', 'memory-server.js')), '.']
+      ...base,
+      args: [portable(path.join(runtimeRoot, 'mcp', 'memory-server.js')), '.'],
+      ...(env ? { env } : {})
     },
     'devcodex-profile': {
-      type: 'stdio',
-      command: 'node',
-      args: [portable(path.join(runtimeRoot, 'mcp', 'profile-server.js')), '.']
+      ...base,
+      args: [portable(path.join(runtimeRoot, 'mcp', 'profile-server.js')), '.'],
+      ...(env ? { env } : {})
     }
   }
 }
 
-function buildCopilotMcpServers(runtimeRoot) {
+function buildCopilotMcpServers(runtimeRoot, options = {}) {
   return Object.fromEntries(
-    Object.entries(buildMcpServers(runtimeRoot)).map(([name, server]) => [
+    Object.entries(buildMcpServers(runtimeRoot, options)).map(([name, server]) => [
       name,
       {
         type: 'local',
         command: server.command,
         args: server.args,
-        env: {},
+        env: server.env && typeof server.env === 'object' ? { ...server.env } : {},
         tools: ['*']
       }
     ])
   )
 }
 
 /** VS Code user mcp.json "servers" entries (stdio). */
-function buildVscodeMcpServers (runtimeRoot) {
+function buildVscodeMcpServers (runtimeRoot, options = {}) {
   return Object.fromEntries(
-    Object.entries(buildMcpServers(runtimeRoot)).map(([name, server]) => [
+    Object.entries(buildMcpServers(runtimeRoot, { agent: options.agent || options.host || 'copilot' })).map(([name, server]) => [
       name,
       {
         type: 'stdio',
         command: server.command,
-        args: server.args
+        args: server.args,
+        ...(server.env ? { env: server.env } : {})
       }
     ])
   )
@@ -287,7 +306,7 @@ function buildVscodeMcpServers (runtimeRoot) {
 /**
  * Merge DevCodex servers into VS Code User mcp.json without wiping inputs / other servers.
  */
-function mergeVscodeUserMcpContent (existingText, runtimeRoot) {
+function mergeVscodeUserMcpContent (existingText, runtimeRoot, options = {}) {
   let doc = {}
   try {
     doc = parseJsonObject(existingText, 'VS Code user mcp.json')
@@ -297,7 +316,7 @@ function mergeVscodeUserMcpContent (existingText, runtimeRoot) {
   if (!doc.servers || typeof doc.servers !== 'object' || Array.isArray(doc.servers)) {
     doc.servers = {}
   }
-  const managed = buildVscodeMcpServers(runtimeRoot)
+  const managed = buildVscodeMcpServers(runtimeRoot, options)
   for (const [name, server] of Object.entries(managed)) {
     doc.servers[name] = server
   }
@@ -332,17 +351,21 @@ function codexMcpTableNames () {
 }
 
 function codexTomlBlock(target) {
-  const servers = buildMcpServers(target.runtimeRoot)
+  const servers = buildMcpServers(target.runtimeRoot, { host: target.host || 'codex' })
+  const agent = hostToRuntimeAgent(target.host || 'codex')
+  const envLine = agent ? `env = { DEVCODEX_AGENT = ${quoteToml(agent)} }` : null
   const lines = [
     '# Managed by npm install/update -g devcodex.',
     '[mcp_servers.devcodex-memory]',
     'command = "node"',
     `args = [${servers['devcodex-memory'].args.map(quoteToml).join(', ')}]`,
+    ...(envLine ? [envLine] : []),
     'startup_timeout_sec = 30',
     '',
     '[mcp_servers.devcodex-profile]',
     'command = "node"',
     `args = [${servers['devcodex-profile'].args.map(quoteToml).join(', ')}]`,
+    ...(envLine ? [envLine] : []),
     'startup_timeout_sec = 30'
   ]
   for (const [server, tools] of Object.entries(CODEX_MCP_APPROVED_TOOLS)) {
@@ -393,7 +416,7 @@ function addCopilotPlan(operations, target, packageRoot, fsImpl) {
     'json',
     `${JSON.stringify(hooks, null, 2)}\n`
   )
-  const mcp = { mcpServers: buildCopilotMcpServers(target.runtimeRoot) }
+  const mcp = { mcpServers: buildCopilotMcpServers(target.runtimeRoot, { host: 'copilot' }) }
   addFileOperation(
     operations,
     target.host,
@@ -416,7 +439,7 @@ function addCopilotPlan(operations, target, packageRoot, fsImpl) {
     if (seenVscode.has(key)) continue
     seenVscode.add(key)
     const existing = readText(vscodeMcpPath, fsImpl)
-    const merged = mergeVscodeUserMcpContent(existing, target.runtimeRoot)
+    const merged = mergeVscodeUserMcpContent(existing, target.runtimeRoot, { host: 'copilot' })
     addFileOperation(
       operations,
       target.host,
@@ -464,11 +487,11 @@ function addClaudePlan(operations, target, packageRoot, fsImpl) {
     target.files.mcp,
     mergeHostJsonContent(
       readText(target.files.mcp, fsImpl),
-      { mcpServers: buildMcpServers(target.runtimeRoot) },
+      { mcpServers: buildMcpServers(target.runtimeRoot, { host: 'claude' }) },
       'Claude user MCP'
     ),
     'json',
-    `${JSON.stringify({ mcpServers: buildMcpServers(target.runtimeRoot) }, null, 2)}\n`
+    `${JSON.stringify({ mcpServers: buildMcpServers(target.runtimeRoot, { host: 'claude' }) }, null, 2)}\n`
   )
 }
 
@@ -531,7 +554,7 @@ function addGeminiPlan(operations, target, packageRoot, fsImpl) {
     managedInstruction('', source, 'gemini')
   )
   const settings = transformedHookTemplate(packageRoot, target, path.join('gemini', 'settings.json'), 'gemini', fsImpl)
-  settings.mcpServers = buildMcpServers(target.runtimeRoot)
+  settings.mcpServers = buildMcpServers(target.runtimeRoot, { host: 'gemini' })
   addFileOperation(
     operations,
     target.host,
@@ -584,7 +607,7 @@ function addGrokPlan(operations, target, packageRoot, fsImpl) {
     operations,
     target.host,
     path.join(target.files.plugin, '.mcp.json'),
-    `${JSON.stringify({ mcpServers: buildMcpServers(target.runtimeRoot) }, null, 2)}\n`,
+    `${JSON.stringify({ mcpServers: buildMcpServers(target.runtimeRoot, { host: 'grok' }) }, null, 2)}\n`,
     'json'
   )
 
@@ -1628,6 +1651,7 @@ module.exports = {
   buildCopilotMcpServers,
   buildMcpServers,
   buildVscodeMcpServers,
+  hostToRuntimeAgent,
   mergeVscodeUserMcpContent,
   copilotHookDocument,
   digestPlan,

scripts/lib/memory-index.js

@@ -146,9 +146,17 @@ function summaryConflicts(rows) {
 }
 
 function latestUniqueActiveSessionIds(rows) {
+  // Prefer completed truth for the same day#sessionId so a later ✅ row
+  // does not leave a stale 🔄 row forever in activeSessionIds.
+  const completedKeys = new Set(
+    rows
+      .filter(row => row.state === 'completed' && row.sessionIdCanonical)
+      .map(row => `${row.day}#${row.sessionId}`)
+  )
   return [...new Set(rows.slice().reverse()
     .filter(row => row.state === 'active' && row.sessionIdCanonical)
-    .map(row => `${row.day}#${row.sessionId}`))]
+    .map(row => `${row.day}#${row.sessionId}`)
+    .filter(key => !completedKeys.has(key)))]
 }
 
 function buildSummaryPartitions(document, parsed) {

scripts/test-global-host-config.js

@@ -330,12 +330,14 @@ for (const name of ['devcodex-memory', 'devcodex-profile']) {
   assert.strictEqual(copilotMcp.mcpServers[name].type, 'local')
   assert.deepStrictEqual(copilotMcp.mcpServers[name].tools, ['*'])
   assert.ok(copilotMcp.mcpServers[name].args.some(value => /mcp\/(?:memory|profile)-server\.js$/i.test(value)))
+  assert.strictEqual(copilotMcp.mcpServers[name].env?.DEVCODEX_AGENT, 'copilot')
 }
 
 const geminiTarget = targets.find(target => target.host === 'gemini')
 const geminiSettings = JSON.parse(fs.readFileSync(geminiTarget.files.settings, 'utf8'))
 for (const name of ['devcodex-memory', 'devcodex-profile']) {
   assert.strictEqual(geminiSettings.mcpServers[name].command, 'node')
+  // gemini has no VALID_AGENTS mapping; do not inject DEVCODEX_AGENT
   assert.deepStrictEqual(
     Object.keys(geminiSettings.mcpServers[name]).sort(),
     ['args', 'command', 'type']
@@ -357,6 +359,7 @@ assert.ok(!JSON.stringify(claudeSettings.hooks).includes('.claude/hooks/_runtime
 const codexConfig = fs.readFileSync(path.join(home, '.codex', 'config.toml'), 'utf8')
 assert.ok(codexConfig.includes('model = "user-choice"'))
 assert.ok(codexConfig.includes('BEGIN DEVCODEX MANAGED: global-codex-mcp'))
+assert.ok(codexConfig.includes('DEVCODEX_AGENT') && codexConfig.includes('codex'))
 assert.ok(codexConfig.includes('[mcp_servers.user-keep]'))
 assert.ok(!codexConfig.includes('old-runtime.js'))
 assert.ok(!codexConfig.includes('BEGIN DEVCODEX-MCP-MANAGED'))