genesis-compiler 1.2.21 → 1.2.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genesis-compiler",
-  "version": "1.2.21",
+  "version": "1.2.22",
   "type": "module",
   "description": "An agent-independent prompt, multi-language code-index, cleanup, and verification companion with optional Codex hooks.",
   "repository": {

package/plugins/genesis/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "genesis",
-  "version": "1.2.21",
+  "version": "1.2.22",
   "description": "Makes Codex aware of optional Genesis adoption for existing projects.",
   "author": {
     "name": "Mobily Enterprises"

package/src/index/codex-hooks.js

@@ -214,6 +214,13 @@ function zeroPaths(buffer) {
   return normalizedPaths(buffer.toString('utf8').split('\0'));
 }
 
+function projectPathStates(projectRoot, files) {
+  return Promise.all(files.map(async (file) => ({
+    path: file,
+    state: await pathState(path.join(projectRoot, file)),
+  })));
+}
+
 async function repositorySnapshot(projectRoot) {
   const head = await runGitText(projectRoot, ['rev-parse', '--verify', 'HEAD']).catch(() => null);
   const results = await Promise.all([
@@ -227,10 +234,7 @@ async function repositorySnapshot(projectRoot) {
     .sort();
   return {
     head,
-    dirty: await Promise.all(dirty.map(async (file) => ({
-      path: file,
-      state: await pathState(path.join(projectRoot, file)),
-    }))),
+    dirty: await projectPathStates(projectRoot, dirty),
   };
 }
 
@@ -423,19 +427,27 @@ function changedPathLines(changedPaths) {
 }
 
 function changedRepositoryLines(repositories) {
-  return repositories.flatMap(({ projectRoot, changedPaths }) => [
+  return repositories.flatMap(({ projectRoot, changedPaths, driftedPaths = [] }) => [
     `## Repository: \`${projectRoot}\``,
     '',
     ...changedPathLines(changedPaths),
+    ...(driftedPaths.length > 0 ? [
+      '',
+      '### Concurrent changes excluded from cleanup',
+      '',
+      'These paths changed after the implementation scope was frozen. Report them, but do not edit them:',
+      '',
+      ...changedPathLines(driftedPaths),
+    ] : []),
     '',
   ]);
 }
 
-async function changedRepositories(repositories) {
+async function changedRepositories(repositories, { snapshotField = 'snapshot' } = {}) {
   return (await Promise.all(repositories.map(async (repository) => {
     const currentPaths = await changedProjectPaths(
       repository.projectRoot,
-      repository.snapshot,
+      repository[snapshotField] || repository.snapshot,
       await repositorySnapshot(repository.projectRoot),
     );
     const changedPaths = normalizedPaths([
@@ -446,6 +458,47 @@ async function changedRepositories(repositories) {
   }))).filter(Boolean);
 }
 
+async function freezeChangedRepositories(repositories, { startPostChange = false } = {}) {
+  return Promise.all(repositories.map(async (repository) => {
+    const changedPaths = normalizedPaths(repository.changedPaths || []).sort();
+    const [pathStates, phaseSnapshot] = await Promise.all([
+      projectPathStates(repository.projectRoot, changedPaths),
+      startPostChange ? repositorySnapshot(repository.projectRoot) : null,
+    ]);
+    const frozen = {
+      ...repository,
+      changedPaths,
+      pathStates,
+    };
+    delete frozen.driftedPaths;
+    delete frozen.phaseSnapshot;
+    if (phaseSnapshot) frozen.phaseSnapshot = phaseSnapshot;
+    return frozen;
+  }));
+}
+
+async function cleanupScopeRepositories(repositories) {
+  return (await Promise.all(repositories.map(async (repository) => {
+    const ownedPaths = normalizedPaths(repository.changedPaths || []).sort();
+    if (ownedPaths.length === 0) return null;
+    const expected = new Map((repository.pathStates || [])
+      .map(({ path: file, state }) => [file, state]));
+    const changedPaths = [];
+    const driftedPaths = [];
+    for (const { path: file, state } of await projectPathStates(repository.projectRoot, ownedPaths)) {
+      const destination = expected.has(file) && stableJson(expected.get(file)) !== stableJson(state)
+        ? driftedPaths
+        : changedPaths;
+      destination.push(file);
+    }
+    return {
+      ...repository,
+      changedPaths,
+      driftedPaths,
+    };
+  }))).filter(Boolean);
+}
+
 async function repositoryContexts(repositories) {
   return Promise.all(repositories.map(async (repository) => {
     const [stack, engineering] = await Promise.all([
@@ -572,13 +625,14 @@ export async function completeCodexTurn({ input, projectRoot } = {}) {
       await removeTurnState(statePath, input);
       return {};
     }
-    const repositories = await changedRepositories(registeredRepositories(state, root));
-    if (repositories.length === 0) {
+    const changed = await changedRepositories(registeredRepositories(state, root));
+    if (changed.length === 0) {
       await removeTurnState(statePath, input);
       return {};
     }
-    const contexts = await repositoryContexts(repositories);
+    const contexts = await repositoryContexts(changed);
     const postChange = contexts.some(({ stack }) => Boolean(stack?.postChange?.trim()));
+    const repositories = await freezeChangedRepositories(changed, { startPostChange: postChange });
     await writeTurnState(statePath, {
       ...state,
       phase: postChange ? 'post-change' : 'reconcile',
@@ -598,11 +652,14 @@ export async function completeCodexTurn({ input, projectRoot } = {}) {
   }
 
   if (state.phase === 'post-change') {
-    const repositories = await changedRepositories(registeredRepositories(state, root));
-    if (repositories.length === 0) {
+    const changed = await changedRepositories(registeredRepositories(state, root), {
+      snapshotField: 'phaseSnapshot',
+    });
+    if (changed.length === 0) {
       await removeTurnState(statePath, input);
       return {};
     }
+    const repositories = await freezeChangedRepositories(changed);
     await writeTurnState(statePath, {
       ...state,
       phase: 'reconcile',
@@ -616,7 +673,7 @@ export async function completeCodexTurn({ input, projectRoot } = {}) {
 
   if (state.phase === 'reconcile') {
     const registered = registeredRepositories(state, root);
-    const repositories = await changedRepositories(registered);
+    const repositories = await cleanupScopeRepositories(registered);
     if (repositories.length === 0) {
       await refreshProjectIndexes(registered);
       await removeTurnState(statePath, input);