1414const fs = require ( 'fs' )
1515const path = require ( 'path' )
1616const crypto = require ( 'crypto' )
17+ const {
18+ collectWorkspaceProjectNamespaces,
19+ findLayoutInfo,
20+ inferProjectFromCwd
21+ } = require ( './workspace-layout.cjs' )
1722
1823const CONTEXT_ROOT = process . cwd ( )
1924const PAYLOAD_PREVIEW_LIMIT = 160
@@ -105,56 +110,19 @@ function mergeConfig(baseConfig, overlayConfig) {
105110 return merged
106111}
107112
108- function findLayoutInfo ( startDir ) {
109- let current = path . resolve ( startDir )
110- while ( true ) {
111- const markerPath = path . join ( current , '.devcodex' , 'layout.json' )
112- const marker = readJsonFile ( markerPath )
113- if ( marker && String ( marker . mode || '' ) . trim ( ) === 'workspace-namespace' ) {
114- return {
115- enabled : true ,
116- mode : 'workspace-namespace' ,
117- workspaceRoot : current ,
118- markerPath
119- }
120- }
121- const parent = path . dirname ( current )
122- if ( parent === current ) break
123- current = parent
124- }
125- return {
126- enabled : false ,
127- mode : 'legacy-project-root' ,
128- workspaceRoot : path . resolve ( startDir ) ,
129- markerPath : null
130- }
131- }
132-
133113const LAYOUT = findLayoutInfo ( CONTEXT_ROOT )
134114const WORKSPACE_ROOT = LAYOUT . workspaceRoot
135115
136116function inferContextProject ( ) {
137- if ( ! LAYOUT . enabled ) return ''
138- const relative = path . relative ( WORKSPACE_ROOT , CONTEXT_ROOT )
139- if ( ! relative || relative . startsWith ( '..' ) || path . isAbsolute ( relative ) ) return ''
140- const parts = relative . split ( path . sep ) . filter ( Boolean )
141- if ( ! parts . length ) return ''
142- const first = parts [ 0 ]
143- if ( first === '.devcodex' || first === 'workspace' ) return ''
144- return first
117+ return inferProjectFromCwd ( CONTEXT_ROOT , LAYOUT )
145118}
146119
147120const CONTEXT_PROJECT = inferContextProject ( )
148121const DEFAULT_SCOPE = LAYOUT . enabled ? ( CONTEXT_PROJECT ? 'project' : 'workspace' ) : 'project'
149- const STATE_SCOPE_KEY = LAYOUT . enabled ? ( CONTEXT_PROJECT || 'workspace' ) : 'legacy'
150122const ACTIVE_RUNTIME_ROOT = LAYOUT . enabled
151123 ? path . join ( WORKSPACE_ROOT , '.devcodex' , CONTEXT_PROJECT || 'workspace' )
152124 : path . join ( WORKSPACE_ROOT , '.devcodex' )
153- const STATE_DIR = path . join ( ACTIVE_RUNTIME_ROOT , '.memory' , 'hooks' , STATE_SCOPE_KEY )
154- const STATE_FILE = path . join ( STATE_DIR , 'lifecycle-state.json' )
155- const FINAL_PAYLOAD_FLAG = path . join ( STATE_DIR , 'capture-final-payload.flag' )
156- const FINAL_PAYLOAD_LOG = path . join ( STATE_DIR , 'captured-final-payloads.ndjson' )
157- const INTERCEPTION_LOG = path . join ( STATE_DIR , 'interceptions.jsonl' )
125+ const META_STATE_SCOPE_KEY = LAYOUT . enabled ? 'workspace' : 'legacy'
158126const INTERCEPTION_ACTION = {
159127 FORBID : 'forbid' ,
160128 REQUIRE_COMPLETION : 'require_completion' ,
@@ -193,6 +161,41 @@ function getProjectNamespaceRoot(projectName) {
193161 return path . join ( WORKSPACE_ROOT , '.devcodex' , resolveProjectName ( projectName ) )
194162}
195163
164+ function buildStatePaths ( namespaceRoot , scopeKey ) {
165+ const dir = path . join ( namespaceRoot , '.memory' , 'hooks' , scopeKey )
166+ return {
167+ dir,
168+ file : path . join ( dir , 'lifecycle-state.json' ) ,
169+ finalPayloadFlag : path . join ( dir , 'capture-final-payload.flag' ) ,
170+ finalPayloadLog : path . join ( dir , 'captured-final-payloads.ndjson' ) ,
171+ interceptionLog : path . join ( dir , 'interceptions.jsonl' )
172+ }
173+ }
174+
175+ function getMetaStatePaths ( ) {
176+ const namespaceRoot = LAYOUT . enabled ? getWorkspaceNamespaceRoot ( ) : path . join ( WORKSPACE_ROOT , '.devcodex' )
177+ return buildStatePaths ( namespaceRoot , META_STATE_SCOPE_KEY )
178+ }
179+
180+ function getStatePathsFor ( projectName , scope ) {
181+ if ( ! LAYOUT . enabled ) return getMetaStatePaths ( )
182+ if ( scope === 'workspace' || ! projectName ) return getMetaStatePaths ( )
183+ return buildStatePaths ( getProjectNamespaceRoot ( projectName ) , projectName )
184+ }
185+
186+ function getStatePaths ( state , explicitProject , explicitScope ) {
187+ const scope = explicitScope || state ?. activeScope || DEFAULT_SCOPE
188+ const projectName = resolveProjectName ( explicitProject || state ?. activeProject || '' )
189+ return getStatePathsFor ( projectName , scope )
190+ }
191+
192+ const META_STATE_PATHS = getMetaStatePaths ( )
193+ const STATE_DIR = META_STATE_PATHS . dir
194+ const STATE_FILE = META_STATE_PATHS . file
195+ const FINAL_PAYLOAD_FLAG = META_STATE_PATHS . finalPayloadFlag
196+ const FINAL_PAYLOAD_LOG = META_STATE_PATHS . finalPayloadLog
197+ const INTERCEPTION_LOG = META_STATE_PATHS . interceptionLog
198+
196199function getActiveScope ( state ) {
197200 return state ?. activeScope || DEFAULT_SCOPE
198201}
@@ -461,8 +464,12 @@ function appendInterception(state, entry) {
461464 enforcementMode : ENFORCEMENT_MODE ,
462465 activeProject : state ?. activeProject || ''
463466 }
464- fs . mkdirSync ( STATE_DIR , { recursive : true } )
465- fs . appendFileSync ( INTERCEPTION_LOG , `${ JSON . stringify ( record ) } \n` )
467+ const targets = [ getStatePaths ( state ) ]
468+ if ( LAYOUT . enabled && targets [ 0 ] . file !== META_STATE_PATHS . file ) targets . push ( META_STATE_PATHS )
469+ for ( const target of targets ) {
470+ fs . mkdirSync ( target . dir , { recursive : true } )
471+ fs . appendFileSync ( target . interceptionLog , `${ JSON . stringify ( record ) } \n` )
472+ }
466473}
467474
468475function recordInterception ( state , eventName , platform , action , code , reason , nextStep , effective ) {
@@ -488,6 +495,9 @@ function buildInterceptionOutput(state, platform, eventName, action, code, reaso
488495
489496// ─── Multi-project workspace detection (v1.9.8+) ──────────────────────────────
490497function listWorkspaceProjects ( ) {
498+ if ( LAYOUT . enabled ) {
499+ return collectWorkspaceProjectNamespaces ( WORKSPACE_ROOT )
500+ }
491501 let entries
492502 try { entries = fs . readdirSync ( WORKSPACE_ROOT ) } catch { return [ ] }
493503 const projects = [ ]
@@ -499,8 +509,7 @@ function listWorkspaceProjects() {
499509 if ( ! stat . isDirectory ( ) ) continue
500510 const hasPkg = fs . existsSync ( path . join ( dir , 'package.json' ) )
501511 const hasProfile = fs . existsSync ( path . join ( dir , '.devcodex' , 'profile' ) )
502- const hasNamespaceProfile = LAYOUT . enabled && fs . existsSync ( path . join ( WORKSPACE_ROOT , '.devcodex' , name , 'profile' ) )
503- if ( hasPkg || hasProfile || hasNamespaceProfile ) {
512+ if ( hasPkg || hasProfile ) {
504513 projects . push ( name )
505514 }
506515 }
@@ -616,6 +625,7 @@ function getValidStickyProject(previousState, payload) {
616625 if ( ! updatedAtMs || now - updatedAtMs > STICKY_PROJECT_TTL_MS ) return null
617626 const currentSessionKey = getPayloadSessionKey ( payload )
618627 const stickySessionKey = String ( sticky . sessionKey || '' ) . trim ( )
628+ if ( ! currentSessionKey || ! stickySessionKey ) return null
619629 if ( currentSessionKey && stickySessionKey && currentSessionKey !== stickySessionKey ) return null
620630 return { project, source : sticky . source || 'sticky' , sessionKey : stickySessionKey }
621631}
@@ -976,23 +986,47 @@ function buildDefaultState(mode) {
976986}
977987
978988function loadState ( modeHint ) {
979- const saved = readJsonFile ( STATE_FILE )
980- const mode = modeHint || readProfileMode ( saved || null )
989+ const metaState = readJsonFile ( META_STATE_PATHS . file )
990+ let saved = metaState
991+ if ( LAYOUT . enabled ) {
992+ const preferredProject = String ( metaState ?. activeProject || CONTEXT_PROJECT || '' ) . trim ( )
993+ const preferredScope = metaState ?. activeScope || ( preferredProject ? 'project' : DEFAULT_SCOPE )
994+ const activeState = readJsonFile ( getStatePathsFor ( preferredProject , preferredScope ) . file )
995+ if ( activeState && typeof activeState === 'object' ) {
996+ saved = activeState
997+ } else if ( CONTEXT_PROJECT ) {
998+ const contextState = readJsonFile ( getStatePathsFor ( CONTEXT_PROJECT , 'project' ) . file )
999+ if ( contextState && typeof contextState === 'object' ) saved = contextState
1000+ }
1001+ }
1002+ const mode = modeHint || readProfileMode ( saved || metaState || null , saved ?. activeProject || metaState ?. activeProject || '' )
9811003 const current = buildDefaultState ( mode )
9821004 if ( ! saved || typeof saved !== 'object' ) return current
9831005 return {
9841006 ...current , ...saved , mode,
9851007 bootstrap : { ...current . bootstrap , ...( saved . bootstrap || { } ) } ,
9861008 visible : { ...current . visible , ...( saved . visible || { } ) } ,
987- stickyProject : { ...current . stickyProject , ...( saved . stickyProject || { } ) } ,
1009+ stickyProject : { ...current . stickyProject , ...( saved . stickyProject || { } ) , ... ( metaState ?. stickyProject || { } ) } ,
9881010 dangerousApprovals : { ...current . dangerousApprovals , ...( saved . dangerousApprovals || { } ) }
9891011 }
9901012}
9911013
9921014function saveState ( state ) {
993- fs . mkdirSync ( STATE_DIR , { recursive : true } )
9941015 state . updatedAt = new Date ( ) . toISOString ( )
995- fs . writeFileSync ( STATE_FILE , JSON . stringify ( state , null , 2 ) )
1016+ const activePaths = getStatePaths ( state )
1017+ fs . mkdirSync ( activePaths . dir , { recursive : true } )
1018+ fs . writeFileSync ( activePaths . file , JSON . stringify ( state , null , 2 ) )
1019+ if ( LAYOUT . enabled && activePaths . file !== META_STATE_PATHS . file ) {
1020+ const metaState = {
1021+ ...state ,
1022+ bootstrap : { ...( state . bootstrap || { } ) } ,
1023+ visible : { ...( state . visible || { } ) } ,
1024+ stickyProject : { ...( state . stickyProject || { } ) } ,
1025+ dangerousApprovals : { ...( state . dangerousApprovals || { } ) }
1026+ }
1027+ fs . mkdirSync ( META_STATE_PATHS . dir , { recursive : true } )
1028+ fs . writeFileSync ( META_STATE_PATHS . file , JSON . stringify ( metaState , null , 2 ) )
1029+ }
9961030}
9971031
9981032function resetState ( mode , previousState ) {
@@ -1684,17 +1718,18 @@ function updateVisibleReplyState(state, payload, eventName) {
16841718}
16851719
16861720function captureFinalPayloadSample ( payload , eventName , state ) {
1687- if ( ( eventName !== 'PreCompact' && eventName !== 'Stop' ) || ! fs . existsSync ( FINAL_PAYLOAD_FLAG ) ) return
1688- fs . mkdirSync ( STATE_DIR , { recursive : true } )
1721+ const statePaths = getStatePaths ( state )
1722+ if ( ( eventName !== 'PreCompact' && eventName !== 'Stop' ) || ! fs . existsSync ( statePaths . finalPayloadFlag ) ) return
1723+ fs . mkdirSync ( statePaths . dir , { recursive : true } )
16891724 const snap = {
16901725 capturedAt : new Date ( ) . toISOString ( ) , eventName,
16911726 payloadKeys : Object . keys ( payload ) . sort ( ) ,
16921727 visiblePayloadDetected : hasVisibleReplyPayload ( payload ) ,
16931728 interestingStrings : collectInterestingStrings ( payload ) ,
16941729 state : { mode : state . mode , executionMode : state . executionMode , phase : state . phase , mutated : state . mutated }
16951730 }
1696- fs . appendFileSync ( FINAL_PAYLOAD_LOG , `${ JSON . stringify ( snap ) } \n` )
1697- if ( eventName === 'Stop' ) fs . unlinkSync ( FINAL_PAYLOAD_FLAG )
1731+ fs . appendFileSync ( statePaths . finalPayloadLog , `${ JSON . stringify ( snap ) } \n` )
1732+ if ( eventName === 'Stop' ) fs . unlinkSync ( statePaths . finalPayloadFlag )
16981733}
16991734
17001735// ─── Closure reminder ─────────────────────────────────────────────────────────
@@ -1712,7 +1747,7 @@ function buildClosureReminder(state, eventName) {
17121747 if ( eventName === 'Stop' && precheckStatus === 'verified-missing' ) {
17131748 items . push ( 'entry check block 未输出(S07/C18:首条用户可见回复必须含 PC0~PC7 入口检查块)' )
17141749 } else if ( eventName === 'Stop' && precheckStatus === 'unverified' ) {
1715- items . push ( `无法验证最终用户可见回复是否包含入口检查块(Stop/PreCompact 未提供可解析 assistant 内容;如需取证请创建 ${ FINAL_PAYLOAD_FLAG } 后重试)` )
1750+ items . push ( `无法验证最终用户可见回复是否包含入口检查块(Stop/PreCompact 未提供可解析 assistant 内容;如需取证请创建 ${ getStatePaths ( state ) . finalPayloadFlag } 后重试)` )
17161751 }
17171752 if ( eventName === 'Stop' && state . mode === 'dev' && state . reportTouched && state . visible && ! state . visible . compliance ) {
17181753 items . push ( '合规检查状态块未输出(17-compliance:dev 模式非 chat 回复末尾必须含 🛡️ DEV 模式 | 合规检查 状态块)' )
0 commit comments