fix: avoid stale workspace metadata reuse

shakkernerd · shakkernerd · commit 193bfd3a4d6f · 2026-05-17T01:55:16.000+01:00
diff --git a/src/plugins/manifest-model-id-normalization.test.ts b/src/plugins/manifest-model-id-normalization.test.ts
@@ -220,6 +220,19 @@ describe("manifest model id normalization", () => {
     expect(normalizeDemoModel()).toBe("bravo/demo-model");
   });
 
+  it("does not reuse workspace-scoped current metadata without a workspace context", () => {
+    setCurrentPluginMetadataSnapshot(
+      createCurrentSnapshot({
+        manifestHash: "alpha",
+        prefix: "alpha",
+        workspaceDir: "/workspace/a",
+      }),
+      { config: {}, env: process.env },
+    );
+
+    expect(normalizeDemoModel()).toBeUndefined();
+  });
+
   it("reflects manifest edits and state-dir changes on the next lookup", () => {
     const stateDirA = makeTempDir();
     const pluginDirA = path.join(stateDirA, "extensions", "normalizer");
diff --git a/src/plugins/manifest-model-id-normalization.ts b/src/plugins/manifest-model-id-normalization.ts
@@ -46,7 +46,7 @@ function resolveMetadataSnapshotForPolicies(
   const current = getCurrentPluginMetadataSnapshot({
     config: params.config,
     env,
-    ...(workspaceDir !== undefined ? { workspaceDir } : { allowWorkspaceScopedSnapshot: true }),
+    workspaceDir,
   });
   if (current) {
     return { snapshot: current, cacheable: true };
diff --git a/src/plugins/setup-registry.runtime.test.ts b/src/plugins/setup-registry.runtime.test.ts
@@ -225,6 +225,38 @@ describe("setup-registry runtime fallback", () => {
     expect(loadPluginMetadataSnapshotMock).not.toHaveBeenCalled();
   });
 
+  it("does not reuse workspace-scoped current metadata without a workspace context", async () => {
+    loadPluginMetadataSnapshotMock.mockReturnValue({
+      index: {
+        diagnostics: [],
+        plugins: [],
+      },
+      plugins: [],
+    });
+
+    const { __testing, resolvePluginSetupCliBackendRuntime } =
+      await import("./setup-registry.runtime.js");
+    __testing.resetRuntimeState();
+    __testing.setRuntimeModuleForTest(null);
+
+    setCurrentPluginMetadataSnapshot(
+      createCurrentSnapshot({
+        manifestHash: "alpha",
+        cliBackends: ["Codex-CLI"],
+        workspaceDir: "/workspace/a",
+      }),
+      { config: {}, env: process.env },
+    );
+
+    expect(
+      resolvePluginSetupCliBackendRuntime({ backend: "codex-cli", config: {} }),
+    ).toBeUndefined();
+    expect(loadPluginMetadataSnapshotMock).toHaveBeenCalledWith({
+      config: {},
+      env: process.env,
+    });
+  });
+
   it("preserves fail-closed setup lookup when the runtime module explicitly declines to resolve", async () => {
     loadPluginMetadataSnapshotMock.mockReturnValue({
       index: {
diff --git a/src/plugins/setup-registry.runtime.ts b/src/plugins/setup-registry.runtime.ts
@@ -60,7 +60,7 @@ function resolveMetadataSnapshotForSetupCliBackends(
   const current = getCurrentPluginMetadataSnapshot({
     config: params.config,
     env,
-    ...(workspaceDir !== undefined ? { workspaceDir } : { allowWorkspaceScopedSnapshot: true }),
+    workspaceDir,
   });
   if (current) {
     return { snapshot: current, cacheable: true };
