chore: commit remaining workflow memory changes

Author: rockyshi1993

mcp/memory-server.js

@@ -278,16 +278,33 @@ const PROJECT_NAMESPACE_INPUT_SCHEMA = Object.freeze({
   pattern: PROJECT_NAMESPACE_SCHEMA_PATTERN
 })
 
+const CONTEXT_READ_BINDING_REQUEST_FIELDS = Object.freeze([
+  'schemaVersion',
+  'contextEpoch',
+  'planId',
+  'planContentId',
+  'activeRoot',
+  'project'
+])
+const CONTEXT_READ_BINDING_ROUNDTRIP_FIELDS = Object.freeze([
+  ...CONTEXT_READ_BINDING_REQUEST_FIELDS,
+  'bindingStatus',
+  'verificationMode'
+])
+const CONTEXT_READ_BINDING_ROUNDTRIP_FIELD_SET = new Set(CONTEXT_READ_BINDING_ROUNDTRIP_FIELDS)
+
 const CONTEXT_READ_BINDING_SCHEMA = {
   type: 'object',
-  required: ['schemaVersion', 'contextEpoch', 'planId', 'planContentId', 'activeRoot', 'project'],
+  required: CONTEXT_READ_BINDING_REQUEST_FIELDS,
   properties: {
     schemaVersion: { const: 'ContextReadBindingV1' },
     contextEpoch: { type: 'string', minLength: 1 },
     planId: { type: 'string', minLength: 1 },
     planContentId: { type: 'string', minLength: 1 },
     activeRoot: { type: 'string', minLength: 1 },
-    project: { type: 'string' }
+    project: { type: 'string' },
+    bindingStatus: { type: 'string', enum: ['verified'] },
+    verificationMode: { type: 'string', enum: ['request-bound'] }
   },
   additionalProperties: false
 }
@@ -640,7 +657,7 @@ const TOOLS = [
         limit: { type: 'integer', minimum: 1, maximum: 20, description: '最多返回会话数，默认 1' },
         handoffOnly: { type: 'boolean', description: '仅返回 ContextHandoffCard' },
         maxChars: { type: 'integer', minimum: 1, maximum: 50000, description: '正文总字符预算，默认 12000' },
-        cursor: { type: 'string', minLength: 1, maxLength: 8192, description: '上一页返回的 opaque MemoryCursorV1；必须与同一 tool/target/context/query/source 完全匹配' },
+        cursor: { type: 'string', minLength: 1, maxLength: 8192 },
         contextBinding: CONTEXT_READ_BINDING_SCHEMA
       }
     }
@@ -659,7 +676,7 @@ const TOOLS = [
         status: { type: 'string', enum: ['active', 'completed', 'blocked', 'unresolved', 'all'], description: '默认 active' },
         limit: { type: 'integer', minimum: 1, maximum: 50, description: '最多返回行数，默认 5，最大 50' },
         since: { type: 'string', pattern: '^\\d{4}-\\d{2}-\\d{2}$', description: '只返回该日期及之后的行' },
-        cursor: { type: 'string', minLength: 1, maxLength: 8192, description: '上一页返回的 opaque MemoryCursorV1；必须与同一 tool/target/context/query/source 完全匹配' },
+        cursor: { type: 'string', minLength: 1, maxLength: 8192 },
         contextBinding: CONTEXT_READ_BINDING_SCHEMA
       }
     }
@@ -2158,15 +2175,16 @@ function resolveContextReadBinding(binding, target, sourceId) {
       'CONTEXT_BINDING_INVALID'
     )
   }
-  const allowed = new Set(['schemaVersion', 'contextEpoch', 'planId', 'planContentId', 'activeRoot', 'project'])
-  const unknown = Object.keys(binding).filter(key => !allowed.has(key))
+  const unknown = Object.keys(binding).filter(key => !CONTEXT_READ_BINDING_ROUNDTRIP_FIELD_SET.has(key))
   const requiredStrings = ['contextEpoch', 'planId', 'planContentId', 'activeRoot']
   if (unknown.length || binding.schemaVersion !== 'ContextReadBindingV1' ||
       requiredStrings.some(field => typeof binding[field] !== 'string' || !binding[field].trim()) ||
-      typeof binding.project !== 'string') {
+      typeof binding.project !== 'string' ||
+      (binding.bindingStatus !== undefined && binding.bindingStatus !== 'verified') ||
+      (binding.verificationMode !== undefined && binding.verificationMode !== 'request-bound')) {
     throw memoryQueryError(
       'contextBinding does not match the published ContextReadBindingV1 request schema.',
-      'Pass only schemaVersion/contextEpoch/planId/planContentId/activeRoot/project from the current plan.',
+      'Pass the current ContextReadBindingV1. Verified round-trip metadata is accepted; arbitrary extra fields are not.',
       'CONTEXT_BINDING_INVALID'
     )
   }

mcp/profile-server.js

@@ -182,9 +182,24 @@ const EXECUTION_OPTIMIZATION_BINDING_SCHEMA = {
   description: 'Copy the exact ExecutionOptimizationPlanBindingV1 returned by the plan.'
 }
 
+const CONTEXT_READ_BINDING_REQUEST_FIELDS = Object.freeze([
+  'schemaVersion',
+  'contextEpoch',
+  'planId',
+  'planContentId',
+  'activeRoot',
+  'project'
+])
+const CONTEXT_READ_BINDING_ROUNDTRIP_FIELDS = Object.freeze([
+  ...CONTEXT_READ_BINDING_REQUEST_FIELDS,
+  'bindingStatus',
+  'verificationMode'
+])
+const CONTEXT_READ_BINDING_ROUNDTRIP_FIELD_SET = new Set(CONTEXT_READ_BINDING_ROUNDTRIP_FIELDS)
+
 const CONTEXT_READ_BINDING_SCHEMA = {
   type: 'object',
-  required: ['schemaVersion', 'contextEpoch', 'planId', 'planContentId', 'activeRoot', 'project'],
+  required: CONTEXT_READ_BINDING_REQUEST_FIELDS,
   properties: {
     schemaVersion: { const: 'ContextReadBindingV1' },
     contextEpoch: { type: 'string', minLength: 1, maxLength: 256 },
@@ -196,7 +211,9 @@ const CONTEXT_READ_BINDING_SCHEMA = {
       minLength: 1,
       maxLength: 255,
       pattern: PROJECT_NAMESPACE_SCHEMA_PATTERN
-    }
+    },
+    bindingStatus: { type: 'string', enum: ['verified'] },
+    verificationMode: { type: 'string', enum: ['request-bound'] }
   },
   additionalProperties: false
 }
@@ -1586,12 +1603,13 @@ function resolveContextReadAuthorization(binding, target, requested = {}) {
   if (typeof binding !== 'object' || Array.isArray(binding)) {
     throw contextBindingError('CONTEXT_BINDING_INVALID', 'contextBinding must be an object.')
   }
-  const allowed = new Set(['schemaVersion', 'contextEpoch', 'planId', 'planContentId', 'activeRoot', 'project'])
-  const unknown = Object.keys(binding).filter(key => !allowed.has(key))
+  const unknown = Object.keys(binding).filter(key => !CONTEXT_READ_BINDING_ROUNDTRIP_FIELD_SET.has(key))
   const requiredStrings = ['contextEpoch', 'planId', 'planContentId', 'activeRoot']
   if (unknown.length || binding.schemaVersion !== 'ContextReadBindingV1' ||
       requiredStrings.some(field => typeof binding[field] !== 'string' || !binding[field].trim()) ||
-      typeof binding.project !== 'string') {
+      typeof binding.project !== 'string' ||
+      (binding.bindingStatus !== undefined && binding.bindingStatus !== 'verified') ||
+      (binding.verificationMode !== undefined && binding.verificationMode !== 'request-bound')) {
     throw contextBindingError('CONTEXT_BINDING_INVALID', 'contextBinding does not match the published ContextReadBindingV1 request schema.')
   }
   if (comparableActiveRoot(binding.activeRoot) !== comparableActiveRoot(target.activeRoot) ||

scripts/lib/memory-index.js

@@ -12,6 +12,7 @@ const {
 const {
   currentActiveSessionIds,
   foldSummaryRows,
+  isCurrentProjectableRow,
   rowsByCurrentState,
   summaryStateConflicts
 } = require('./memory-summary-state.js')
@@ -164,7 +165,9 @@ function buildSummaryPartitions(document, parsed) {
     latestRows: rows.slice(-STATUS_WINDOW),
     activeSessionIds: currentActiveSessionIds(rows).slice(0, STATUS_LIST_SENTINEL),
     conflicts: summaryStateConflicts(rows).slice(0, STATUS_LIST_SENTINEL),
-    nonCanonicalActiveCount: foldSummaryRows(rows).filter(row => row.state === 'active' && !row.sessionIdCanonical).length,
+    nonCanonicalActiveCount: foldSummaryRows(rows).filter(row =>
+      row.state === 'active' && !isCurrentProjectableRow(row)
+    ).length,
     warnings
   }
   const months = new Map()

scripts/lib/memory-summary-state.js

@@ -1,10 +1,26 @@
 'use strict'
 
+let SUMMARY_TYPE_CANON = null
+try {
+  SUMMARY_TYPE_CANON = require('./summary-type-canon.js')
+} catch {
+  SUMMARY_TYPE_CANON = null
+}
+
 function summarySessionKey(row) {
   if (!row || !row.day || !row.sessionId || row.sessionIdCanonical !== true) return null
   return `${row.day}#${row.sessionId}`
 }
 
+function isCanonicalSummaryType(row) {
+  if (!SUMMARY_TYPE_CANON?.validateSummaryType) return true
+  return SUMMARY_TYPE_CANON.validateSummaryType(row?.type).ok === true
+}
+
+function isCurrentProjectableRow(row) {
+  return Boolean(summarySessionKey(row)) && isCanonicalSummaryType(row)
+}
+
 function foldSummaryRows(rows = []) {
   const current = new Map()
   for (const row of Array.isArray(rows) ? rows : []) {
@@ -18,7 +34,7 @@ function foldSummaryRows(rows = []) {
 
 function rowsByCurrentState(rows = [], state = 'all') {
   if (state === 'all') return Array.isArray(rows) ? rows : []
-  const current = foldSummaryRows(rows)
+  const current = foldSummaryRows((Array.isArray(rows) ? rows : []).filter(isCurrentProjectableRow))
   if (state === 'unresolved') return current.filter(row => row.state === 'active' || row.state === 'blocked')
   return current.filter(row => row.state === state)
 }
@@ -48,16 +64,17 @@ function summaryStateConflicts(rows = []) {
 }
 
 function currentActiveSessionIds(rows = []) {
-  return foldSummaryRows(rows)
+  return foldSummaryRows((Array.isArray(rows) ? rows : []).filter(isCurrentProjectableRow))
     .slice()
     .reverse()
-    .filter(row => row.state === 'active' && row.sessionIdCanonical === true)
+    .filter(row => row.state === 'active')
     .map(row => summarySessionKey(row))
 }
 
 module.exports = {
   currentActiveSessionIds,
   foldSummaryRows,
+  isCurrentProjectableRow,
   rowsByCurrentState,
   summarySessionKey,
   summaryStateConflicts

scripts/test-mcp-servers.js

@@ -158,7 +158,8 @@ function runServer(script, requests, cwd = ROOT, env = {}, followToolPages = tru
     cwd: ROOT,
     input,
     encoding: 'utf8',
-    env: mergedEnv
+    env: mergedEnv,
+    maxBuffer: 64 * 1024 * 1024
   })
 
   if (result.status !== 0) {
@@ -4701,6 +4702,11 @@ function testContextReadBindingContract() {
     activeRoot: plan.identity.activeRoot,
     project: plan.identity.project
   }
+  const roundTripBinding = {
+    ...binding,
+    bindingStatus: 'verified',
+    verificationMode: 'request-bound'
+  }
 
   const profileResponses = runServer('mcp/profile-server.js', [
     rpcRequest(2, 'tools/list'),
@@ -4723,6 +4729,17 @@ function testContextReadBindingContract() {
     rpcRequest(7, 'tools/call', {
       name: 'skill_route',
       arguments: { op: 'catalog' }
+    }),
+    rpcRequest(8, 'tools/call', {
+      name: 'profile_load',
+      arguments: { files: ['01-项目信息.md'], contextBinding: roundTripBinding }
+    }),
+    rpcRequest(9, 'tools/call', {
+      name: 'profile_load',
+      arguments: {
+        files: ['01-项目信息.md'],
+        contextBinding: { ...binding, bindingStatus: 'pending' }
+      }
     })
   ], TEMP_ROOT)
   const listedResult = resultById(profileResponses, 2)
@@ -4823,6 +4840,10 @@ function testContextReadBindingContract() {
   )
   assert.strictEqual(resultById(profileResponses, 6).isError, true)
   assert.strictEqual(unboundProfile.errorCode, 'CONTEXT_BINDING_REQUIRED')
+  assert.strictEqual(resultById(profileResponses, 8).isError, undefined)
+  const invalidProfileRoundTrip = toolJson(resultById(profileResponses, 9))
+  assert.strictEqual(resultById(profileResponses, 9).isError, true)
+  assert.strictEqual(invalidProfileRoundTrip.errorCode, 'CONTEXT_BINDING_INVALID')
 
   const skillRouteTracePath = path.join(TEMP_ROOT, 'skill-route-call-trace.ndjson')
   runServer('mcp/profile-server.js', [
@@ -4861,6 +4882,14 @@ function testContextReadBindingContract() {
     rpcRequest(11, 'tools/call', {
       name: 'memory_status',
       arguments: { contextBinding: { ...binding, unsupported: true } }
+    }),
+    rpcRequest(12, 'tools/call', {
+      name: 'memory_status',
+      arguments: { contextBinding: roundTripBinding }
+    }),
+    rpcRequest(13, 'tools/call', {
+      name: 'memory_status',
+      arguments: { contextBinding: { ...binding, verificationMode: 'legacy' } }
     })
   ], TEMP_ROOT)
   assert.ok(resultById(memoryResponses, 7).tools
@@ -4880,6 +4909,12 @@ function testContextReadBindingContract() {
   const invalidMemory = toolJson(resultById(memoryResponses, 11))
   assert.strictEqual(resultById(memoryResponses, 11).isError, true)
   assert.strictEqual(invalidMemory.errorCode, 'CONTEXT_BINDING_INVALID')
+  const roundTripMemory = toolJson(resultById(memoryResponses, 12))
+  assert.strictEqual(roundTripMemory.contextBinding.bindingStatus, 'verified')
+  assert.strictEqual(roundTripMemory.contextBinding.verificationMode, 'request-bound')
+  const invalidMemoryRoundTrip = toolJson(resultById(memoryResponses, 13))
+  assert.strictEqual(resultById(memoryResponses, 13).isError, true)
+  assert.strictEqual(invalidMemoryRoundTrip.errorCode, 'CONTEXT_BINDING_INVALID')
 }
 
 function testContextReadAuthorizationNegativePaths() {

scripts/test-memory-index.js

@@ -91,7 +91,9 @@ const summaryRows = [
   row('2026-07-22', '02', 'active', 5),
   row('2026-07-23', '02', 'blocked', 6),
   row('2026-07-23', '03', 'active', 7),
-  row('2026-07-23', '03', 'completed', 8)
+  row('2026-07-23', '03', 'completed', 8),
+  { ...row('2026-07-24', '04', 'active', 9), type: '04' },
+  { ...row('2026-07-24', '2026-07-24', 'active', 10), sessionIdCanonical: false }
 ]
 const summaryRefresh = refreshSummaryIndex({
   target,
@@ -106,6 +108,8 @@ assert.equal(status.status, 'fresh')
 assert.equal(status.latestRows.length, 2)
 assert.equal(status.activeSessionIds[0], '2026-07-22#02')
 assert.ok(!status.activeSessionIds.includes('2026-07-23#03'))
+assert.ok(!status.activeSessionIds.includes('2026-07-24#04'))
+assert.equal(status.nonCanonicalActiveCount, 2)
 assert.deepEqual(status.conflicts, [])
 assert.equal(status.warnings[0], 'fixture-warning')
 assert.deepEqual(
@@ -142,6 +146,18 @@ const currentActive = querySummaryIndex({
   limit: 10
 })
 assert.deepEqual(currentActive.rows.map(item => `${item.day}#${item.sessionId}`), ['2026-07-22#02'])
+assert.equal(currentActive.totalMatched, 1)
+
+const allSummary = querySummaryIndex({
+  target,
+  sourcePath: summaryPath,
+  status: 'all',
+  limit: 20
+})
+assert.ok(
+  allSummary.rows.some(item => item.type === '04'),
+  'non-canonical historical rows remain readable in all-history queries'
+)
 
 const since = querySummaryIndex({
   target,