@c4a/context-cli 0.5.39-beta.1 → 0.5.39-beta.2

package/cli.js

@@ -68516,7 +68516,15 @@ function projectedWorkspaceFileFromInput(ctxDir, filePath, input) {
   }
   return { filePath, relativePath, root: root2 };
 }
-function attachProjectedContainsLists(ctxDir, rendered) {
+function isOwnedOnlyByCurrentCodeSource(node3, sourceIds) {
+  if (node3 === undefined || node3.node.sources.length === 0)
+    return false;
+  return node3.node.sources.every((source2) => sourceIds.has(sourceIdWithoutVersion(source2)));
+}
+async function attachProjectedContainsLists(ctxDir, rendered, sourceIds) {
+  const existingFiles = await readWorkspaceNodeFiles(ctxDir);
+  const existingNodesBySlug = new Map(flattenWorkspaceNodes(existingFiles).map((node3) => [node3.parsed.node.id, node3.parsed]));
+  const existingContainsByParent = new Map(existingFiles.map((file) => [file.root.node.id, file.root.containsList]));
   const containsByParent = new Map;
   for (const [slug, item] of rendered) {
     if (!slug.includes("/"))
@@ -68537,13 +68545,23 @@ function attachProjectedContainsLists(ctxDir, rendered) {
     ]);
   }
   return new Map([...rendered.entries()].map(([slug, item]) => {
-    const entries = containsByParent.get(slug);
-    if (entries === undefined || entries.length === 0)
+    const generatedEntries = containsByParent.get(slug) ?? [];
+    const existingEntries = existingContainsByParent.get(slug) ?? item.input.containsList ?? [];
+    if (existingEntries.length === 0 && generatedEntries.length === 0)
       return [slug, item];
+    const merged = new Map;
+    for (const entry of existingEntries) {
+      const existingNode = existingNodesBySlug.get(entry.slug);
+      if (isOwnedOnlyByCurrentCodeSource(existingNode, sourceIds))
+        continue;
+      merged.set(entry.slug, entry);
+    }
+    for (const entry of generatedEntries)
+      merged.set(entry.slug, entry);
     return [slug, {
       input: {
         ...item.input,
-        containsList: [...entries].sort((left, right) => left.slug.localeCompare(right.slug))
+        containsList: sortContainsEntries([...merged.values()])
       }
     }];
   }));
@@ -68557,7 +68575,7 @@ async function projectedWorkspaceFiles(ctxDir, rendered) {
   return [...byPath.values()];
 }
 async function projectedRenderContext(plan) {
-  const renderedWithContains = attachProjectedContainsLists(plan.state.ctxDir, plan.rendered);
+  const renderedWithContains = await attachProjectedContainsLists(plan.state.ctxDir, plan.rendered, new Set(plan.sources));
   const [files, currentEdges, currentExternals, renderConfig] = await Promise.all([
     projectedWorkspaceFiles(plan.state.ctxDir, renderedWithContains),
     loadKnowledgeGraphEdges(plan.state.ctxDir),
@@ -68622,7 +68640,7 @@ async function renderCodeProjectionPlanFromState(state) {
     state
   };
   const renderContext = await projectedRenderContext(initialPlan);
-  const renderedWithContains = attachProjectedContainsLists(state.ctxDir, rendered);
+  const renderedWithContains = await attachProjectedContainsLists(state.ctxDir, rendered, new Set(initialPlan.sources));
   const nodes = [];
   for (const item of pending) {
     const input = renderedWithContains.get(item.slug)?.input ?? item.input;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c4a/context-cli",
-  "version": "0.5.39-beta.1",
+  "version": "0.5.39-beta.2",
   "type": "module",
   "bin": {
     "context": "./cli.js"