fix: ignore optional self base discovery

packages/config-extends/src/resolve.test.ts

@@ -382,6 +382,40 @@ describe("resolve", () => {
     });
   });
 
+  it("returns the document as-is when optional autoExtend discovers the document itself", async () => {
+    const fs = createMemFs({
+      "/workspace/review.yaml": "title: Document"
+    });
+
+    await expect(
+      resolve(
+        [
+          {
+            source: "document",
+            filePath: "/workspace/review.yaml",
+            content: "title: Document"
+          },
+          {
+            source: "base",
+            path: "/workspace"
+          }
+        ],
+        {
+          fs,
+          autoExtend: true
+        }
+      )
+    ).resolves.toEqual({
+      data: {
+        title: "Document"
+      },
+      sources: {
+        title: "document"
+      },
+      chain: ["/workspace/review.yaml"]
+    });
+  });
+
   it("does not auto-resolve when the document explicitly disables extends", async () => {
     const fs = createMemFs({
       "/bases/review.yaml": "prompt: Base prompt"

packages/config-extends/src/resolve.ts

@@ -135,6 +135,10 @@ async function resolveBaseChain({
   }
 
   if (visited.has(discoveredBase.filePath)) {
+    if (optional) {
+      return undefined;
+    }
+
     throw new Error(
       `Circular extends detected.\nVisited files:\n- ${[...visited, discoveredBase.filePath].join("\n- ")}`
     );

packages/poe-code-config/src/poe-code-config.test.ts

@@ -1215,6 +1215,26 @@ describe("store", () => {
     });
   });
 
+  it("uses only the global document when project config resolves to the global path", async () => {
+    const fs = createMockFs(
+      {
+        "~/.poe-code/config.json": `${JSON.stringify(
+          {
+            extends: true,
+            core: { apiKey: "global-key" }
+          },
+          null,
+          2
+        )}\n`
+      },
+      homeDir
+    );
+
+    await expect(readMergedDocument(fs, configPath, configPath)).resolves.toEqual({
+      core: { apiKey: "global-key" }
+    });
+  });
+
   it("resolves the project config path from the current working directory", () => {
     expect(resolveProjectConfigPath("/workspace/app")).toBe("/workspace/app/.poe-code/config.json");
   });

packages/poe-code-config/src/store.ts

@@ -32,7 +32,7 @@ export async function readMergedDocument(
   projectPath?: string
 ): Promise<ConfigDocument> {
   const globalDocument = await readStoredDocument(fs, globalPath);
-  if (!projectPath) {
+  if (!projectPath || projectPath === globalPath) {
     return globalDocument.data;
   }