oh-my-opencode 5.0.0-beta.66 → 5.0.0-beta.68

package/dist/cli/index.js

@@ -64,7 +64,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "oh-my-opencode",
-    version: "5.0.0-beta.66",
+    version: "5.0.0-beta.68",
     description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
     main: "./dist/index.js",
     types: "dist/index.d.ts",
@@ -246,7 +246,7 @@ var init_package = __esm(() => {
       zod: "^4.4.3"
     },
     devDependencies: {
-      "@code-yeongyu/senpi": "2026.9.16-2",
+      "@code-yeongyu/senpi": "2026.9.16-3",
       "@oh-my-opencode/agents-md-core": "workspace:*",
       "@oh-my-opencode/ast-grep-mcp": "workspace:*",
       "@oh-my-opencode/boulder-state": "workspace:*",
@@ -285,18 +285,18 @@ var init_package = __esm(() => {
       typescript: "^7.0.2"
     },
     optionalDependencies: {
-      "oh-my-opencode-darwin-arm64": "5.0.0-beta.66",
-      "oh-my-opencode-darwin-x64": "5.0.0-beta.66",
-      "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.66",
-      "oh-my-opencode-linux-arm64": "5.0.0-beta.66",
-      "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.66",
-      "oh-my-opencode-linux-x64": "5.0.0-beta.66",
-      "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.66",
-      "oh-my-opencode-linux-x64-musl": "5.0.0-beta.66",
-      "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.66",
-      "oh-my-opencode-windows-arm64": "5.0.0-beta.66",
-      "oh-my-opencode-windows-x64": "5.0.0-beta.66",
-      "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.66"
+      "oh-my-opencode-darwin-arm64": "5.0.0-beta.68",
+      "oh-my-opencode-darwin-x64": "5.0.0-beta.68",
+      "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.68",
+      "oh-my-opencode-linux-arm64": "5.0.0-beta.68",
+      "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.68",
+      "oh-my-opencode-linux-x64": "5.0.0-beta.68",
+      "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.68",
+      "oh-my-opencode-linux-x64-musl": "5.0.0-beta.68",
+      "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.68",
+      "oh-my-opencode-windows-arm64": "5.0.0-beta.68",
+      "oh-my-opencode-windows-x64": "5.0.0-beta.68",
+      "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.68"
     },
     overrides: {
       "@earendil-works/pi-agent-core": "0.84.2",
@@ -84547,7 +84547,7 @@ var package_default2;
 var init_package2 = __esm(() => {
   package_default2 = {
     name: "@oh-my-opencode/omo-codex",
-    version: "5.0.0-beta.66",
+    version: "5.0.0-beta.68",
     type: "module",
     private: true,
     description: "Codex harness adapter for oh-my-openagent. Vendored Codex plugin namespace (omo) + TypeScript installer + telemetry.",

package/dist/cli-node/index.js

@@ -65,7 +65,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "oh-my-opencode",
-    version: "5.0.0-beta.66",
+    version: "5.0.0-beta.68",
     description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
     main: "./dist/index.js",
     types: "dist/index.d.ts",
@@ -247,7 +247,7 @@ var init_package = __esm(() => {
       zod: "^4.4.3"
     },
     devDependencies: {
-      "@code-yeongyu/senpi": "2026.9.16-2",
+      "@code-yeongyu/senpi": "2026.9.16-3",
       "@oh-my-opencode/agents-md-core": "workspace:*",
       "@oh-my-opencode/ast-grep-mcp": "workspace:*",
       "@oh-my-opencode/boulder-state": "workspace:*",
@@ -286,18 +286,18 @@ var init_package = __esm(() => {
       typescript: "^7.0.2"
     },
     optionalDependencies: {
-      "oh-my-opencode-darwin-arm64": "5.0.0-beta.66",
-      "oh-my-opencode-darwin-x64": "5.0.0-beta.66",
-      "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.66",
-      "oh-my-opencode-linux-arm64": "5.0.0-beta.66",
-      "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.66",
-      "oh-my-opencode-linux-x64": "5.0.0-beta.66",
-      "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.66",
-      "oh-my-opencode-linux-x64-musl": "5.0.0-beta.66",
-      "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.66",
-      "oh-my-opencode-windows-arm64": "5.0.0-beta.66",
-      "oh-my-opencode-windows-x64": "5.0.0-beta.66",
-      "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.66"
+      "oh-my-opencode-darwin-arm64": "5.0.0-beta.68",
+      "oh-my-opencode-darwin-x64": "5.0.0-beta.68",
+      "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.68",
+      "oh-my-opencode-linux-arm64": "5.0.0-beta.68",
+      "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.68",
+      "oh-my-opencode-linux-x64": "5.0.0-beta.68",
+      "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.68",
+      "oh-my-opencode-linux-x64-musl": "5.0.0-beta.68",
+      "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.68",
+      "oh-my-opencode-windows-arm64": "5.0.0-beta.68",
+      "oh-my-opencode-windows-x64": "5.0.0-beta.68",
+      "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.68"
     },
     overrides: {
       "@earendil-works/pi-agent-core": "0.84.2",
@@ -84626,7 +84626,7 @@ var package_default2;
 var init_package2 = __esm(() => {
   package_default2 = {
     name: "@oh-my-opencode/omo-codex",
-    version: "5.0.0-beta.66",
+    version: "5.0.0-beta.68",
     type: "module",
     private: true,
     description: "Codex harness adapter for oh-my-openagent. Vendored Codex plugin namespace (omo) + TypeScript installer + telemetry.",

package/dist/index.js

@@ -96515,7 +96515,7 @@ function getCachedVersion(options = {}) {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "5.0.0-beta.66",
+  version: "5.0.0-beta.68",
   description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   main: "./dist/index.js",
   types: "dist/index.d.ts",
@@ -96697,7 +96697,7 @@ var package_default = {
     zod: "^4.4.3"
   },
   devDependencies: {
-    "@code-yeongyu/senpi": "2026.9.16-2",
+    "@code-yeongyu/senpi": "2026.9.16-3",
     "@oh-my-opencode/agents-md-core": "workspace:*",
     "@oh-my-opencode/ast-grep-mcp": "workspace:*",
     "@oh-my-opencode/boulder-state": "workspace:*",
@@ -96736,18 +96736,18 @@ var package_default = {
     typescript: "^7.0.2"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "5.0.0-beta.66",
-    "oh-my-opencode-darwin-x64": "5.0.0-beta.66",
-    "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.66",
-    "oh-my-opencode-linux-arm64": "5.0.0-beta.66",
-    "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.66",
-    "oh-my-opencode-linux-x64": "5.0.0-beta.66",
-    "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.66",
-    "oh-my-opencode-linux-x64-musl": "5.0.0-beta.66",
-    "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.66",
-    "oh-my-opencode-windows-arm64": "5.0.0-beta.66",
-    "oh-my-opencode-windows-x64": "5.0.0-beta.66",
-    "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.66"
+    "oh-my-opencode-darwin-arm64": "5.0.0-beta.68",
+    "oh-my-opencode-darwin-x64": "5.0.0-beta.68",
+    "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.68",
+    "oh-my-opencode-linux-arm64": "5.0.0-beta.68",
+    "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.68",
+    "oh-my-opencode-linux-x64": "5.0.0-beta.68",
+    "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.68",
+    "oh-my-opencode-linux-x64-musl": "5.0.0-beta.68",
+    "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.68",
+    "oh-my-opencode-windows-arm64": "5.0.0-beta.68",
+    "oh-my-opencode-windows-x64": "5.0.0-beta.68",
+    "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.68"
   },
   overrides: {
     "@earendil-works/pi-agent-core": "0.84.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-opencode",
-  "version": "5.0.0-beta.66",
+  "version": "5.0.0-beta.68",
   "description": "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   "main": "./dist/index.js",
   "types": "dist/index.d.ts",
@@ -182,7 +182,7 @@
     "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@code-yeongyu/senpi": "2026.9.16-2",
+    "@code-yeongyu/senpi": "2026.9.16-3",
     "@oh-my-opencode/agents-md-core": "workspace:*",
     "@oh-my-opencode/ast-grep-mcp": "workspace:*",
     "@oh-my-opencode/boulder-state": "workspace:*",
@@ -221,18 +221,18 @@
     "typescript": "^7.0.2"
   },
   "optionalDependencies": {
-    "oh-my-opencode-darwin-arm64": "5.0.0-beta.66",
-    "oh-my-opencode-darwin-x64": "5.0.0-beta.66",
-    "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.66",
-    "oh-my-opencode-linux-arm64": "5.0.0-beta.66",
-    "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.66",
-    "oh-my-opencode-linux-x64": "5.0.0-beta.66",
-    "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.66",
-    "oh-my-opencode-linux-x64-musl": "5.0.0-beta.66",
-    "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.66",
-    "oh-my-opencode-windows-arm64": "5.0.0-beta.66",
-    "oh-my-opencode-windows-x64": "5.0.0-beta.66",
-    "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.66"
+    "oh-my-opencode-darwin-arm64": "5.0.0-beta.68",
+    "oh-my-opencode-darwin-x64": "5.0.0-beta.68",
+    "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.68",
+    "oh-my-opencode-linux-arm64": "5.0.0-beta.68",
+    "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.68",
+    "oh-my-opencode-linux-x64": "5.0.0-beta.68",
+    "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.68",
+    "oh-my-opencode-linux-x64-musl": "5.0.0-beta.68",
+    "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.68",
+    "oh-my-opencode-windows-arm64": "5.0.0-beta.68",
+    "oh-my-opencode-windows-x64": "5.0.0-beta.68",
+    "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.68"
   },
   "overrides": {
     "@earendil-works/pi-agent-core": "0.84.2",

package/packages/lsp-core/src/lsp/client-diagnostics-concurrency.integration.test.ts

@@ -1,5 +1,7 @@
 import { afterEach, describe, expect, it } from "bun:test";
 
+import { ControlledClock } from "./controlled-clock-test-support.js";
+
 import {
 	createWorkspaceEditTestHarness,
 	diagnostic,
@@ -14,6 +16,12 @@ afterEach(async () => {
 
 describe("LspClient diagnostics concurrency", () => {
 	it("#given concurrent diagnostics on a cold file and an exact didOpen publish #when pull is not advertised #then one didOpen opens the file and both requests receive the current diagnostics", async () => {
+		// The freshness window runs on a controlled clock: this case asserts that the exact-version
+		// didOpen publish satisfies BOTH requests, and the publish is what wakes them. On a real clock
+		// the 500ms window is a second, competing deadline against a real fixture server over a real
+		// pipe, so a starved Windows shard resolved the requests clean before the publish landed and
+		// the case failed with [] (#8323). Frozen, only the publish can settle it.
+		const clock = new ControlledClock();
 		const context = await harness.makeClient(
 			{
 				publishDiagnostics: [
@@ -25,7 +33,7 @@ describe("LspClient diagnostics concurrency", () => {
 					},
 				],
 			},
-			{ diagnosticsFreshnessTimeoutMs: 500, versionlessPublishQuiescenceMs: 5 },
+			{ diagnosticsFreshnessTimeoutMs: 500, versionlessPublishQuiescenceMs: 5, timerProvider: clock },
 		);
 
 		const [first, second] = await Promise.all([

package/packages/lsp-core/src/lsp/client-diagnostics-freshness.integration.test.ts

@@ -18,6 +18,27 @@ afterEach(async () => {
 	await harness.cleanup();
 });
 
+/**
+ * Drives one `diagnostics()` call whose ONLY exit is the freshness window closing: an advertised
+ * pull that comes back "method not found" with no publish behind it.
+ *
+ * That call arms exactly two timers in order - the pull request's own timeout, then the push
+ * fallback wait - and the second can only be armed once the first was cleared by the server's
+ * reply. Waiting on the second SCHEDULE (not on a delay value, which both share) is therefore the
+ * exact signal that the fallback, and not a request timeout, is what the advance closes. On a real
+ * clock the same case resolved from whichever of the two real deadlines a starved Windows shard
+ * happened to reach first (#8323).
+ */
+async function resolveThroughFreshnessWindow<T>(clock: ControlledClock, start: () => Promise<T>): Promise<T> {
+	const scheduledBefore = clock.scheduledDelays.length;
+	const pending = start();
+	await clock.waitForScheduled(scheduledBefore + 2);
+	clock.advanceBy(FRESHNESS_WINDOW_MS);
+	return pending;
+}
+
+const FRESHNESS_WINDOW_MS = 500;
+
 describe("LspClient diagnostics freshness", () => {
 	it("#given a versionless publish that arrives after the current change #when no newer eligible publish arrives before quiescence #then diagnostics wait for that quiescence window and return the versionless payload", async () => {
 		const clock = new ControlledClock();
@@ -159,6 +180,9 @@ describe("LspClient diagnostics freshness", () => {
 	});
 
 	it("#given a pull response overtaken by a later local change #when the stale full report returns first #then diagnostics restart within the same request and resolve from the current version", async () => {
+		// Both pull reports answer this request, so no freshness deadline may fire: a controlled clock
+		// removes the 800ms wall-clock race that a starved shard otherwise wins (#8323).
+		const clock = new ControlledClock();
 		const context = await harness.makeClient(
 			{
 				capabilities: { diagnosticProvider: { interFileDependencies: false, workspaceDiagnostics: false } },
@@ -172,12 +196,12 @@ describe("LspClient diagnostics freshness", () => {
 					},
 				],
 			},
-			{ diagnosticsFreshnessTimeoutMs: 800, versionlessPublishQuiescenceMs: 5 },
+			{ diagnosticsFreshnessTimeoutMs: 800, versionlessPublishQuiescenceMs: 5, timerProvider: clock },
 		);
 		await context.client.openFile(context.source);
 
 		const pending = context.client.diagnostics(context.source);
-		await waitForEventCount(
+		await waitForEventCountBySubscription(
 			context.events,
 			(event) => event.type === "clientRequest" && event.method === "textDocument/diagnostic",
 			1,
@@ -196,6 +220,9 @@ describe("LspClient diagnostics freshness", () => {
 	});
 
 	it("#given a full pull report followed by an unchanged report for the same version and resultId #when diagnostics repeat without a local change #then the cached full items are reused", async () => {
+		// Both requests are answered by the server, so a controlled clock keeps the freshness window
+		// from becoming a second deadline the shard can starve (#8323).
+		const clock = new ControlledClock();
 		const context = await harness.makeClient(
 			{
 				capabilities: { diagnosticProvider: { interFileDependencies: false, workspaceDiagnostics: false } },
@@ -208,7 +235,7 @@ describe("LspClient diagnostics freshness", () => {
 					},
 				],
 			},
-			{ diagnosticsFreshnessTimeoutMs: 500, versionlessPublishQuiescenceMs: 5 },
+			{ diagnosticsFreshnessTimeoutMs: 500, versionlessPublishQuiescenceMs: 5, timerProvider: clock },
 		);
 		await context.client.openFile(context.source);
 
@@ -220,6 +247,9 @@ describe("LspClient diagnostics freshness", () => {
 	});
 
 	it("#given a server that claims pull support but closes instead of answering #when diagnostics run #then the transport failure is not labeled clean", async () => {
+		// Deliberately left on the real clock: the client only notices the dead server when the
+		// in-flight pull request's own timeout aborts it, so a timer must actually fire here. Making
+		// the transport reject pending requests from the child's exit event is a separate change.
 		const context = await harness.makeClient(
 			{
 				capabilities: { diagnosticProvider: { interFileDependencies: false, workspaceDiagnostics: false } },
@@ -233,6 +263,9 @@ describe("LspClient diagnostics freshness", () => {
 	});
 
 	it("#given an advertised pull method that is explicitly unsupported and a matching push publish #when diagnostics run #then the client falls back to push diagnostics", async () => {
+		// The exact-version publish wakes the push-fallback wait, so no deadline may fire; a controlled
+		// clock keeps the 500ms window from winning that race on a starved shard (#8323).
+		const clock = new ControlledClock();
 		const context = await harness.makeClient(
 			{
 				capabilities: { diagnosticProvider: { interFileDependencies: false, workspaceDiagnostics: false } },
@@ -246,7 +279,7 @@ describe("LspClient diagnostics freshness", () => {
 				],
 				diagnosticResponses: [{ error: { code: -32601, message: "Method not found" } }],
 			},
-			{ diagnosticsFreshnessTimeoutMs: 500, versionlessPublishQuiescenceMs: 5 },
+			{ diagnosticsFreshnessTimeoutMs: 500, versionlessPublishQuiescenceMs: 5, timerProvider: clock },
 		);
 
 		const pending = context.client.diagnostics(context.source);
@@ -301,6 +334,7 @@ describe("LspClient diagnostics freshness", () => {
 	});
 
 	it("#given a pull-supported server that cached diagnostics for an older document version #when the file changes and a later pull is rejected as unsupported without any publish #then the fallback resolves empty instead of returning the stale cached diagnostics", async () => {
+		const clock = new ControlledClock();
 		const context = await harness.makeClient(
 			{
 				capabilities: { diagnosticProvider: { interFileDependencies: false, workspaceDiagnostics: false } },
@@ -309,7 +343,7 @@ describe("LspClient diagnostics freshness", () => {
 					{ error: { code: -32601, message: "Method not found" } },
 				],
 			},
-			{ diagnosticsFreshnessTimeoutMs: 500, versionlessPublishQuiescenceMs: 5 },
+			{ diagnosticsFreshnessTimeoutMs: 500, versionlessPublishQuiescenceMs: 5, timerProvider: clock },
 		);
 
 		const first = await context.client.diagnostics(context.source);
@@ -318,12 +352,13 @@ describe("LspClient diagnostics freshness", () => {
 		writeFileSync(context.source, "const changed = 1;\n");
 		await context.client.openFile(context.source);
 
-		const second = await context.client.diagnostics(context.source);
+		const second = await resolveThroughFreshnessWindow(clock, () => context.client.diagnostics(context.source));
 		expect(second.transientError).toBeUndefined();
 		expect(second.items).toEqual([]);
 	});
 
 	it("#given a pull-supported server with a current cached pull report #when a later pull is rejected as unsupported without any publish and the document is unchanged #then the fallback resolves with the current cached diagnostics", async () => {
+		const clock = new ControlledClock();
 		const context = await harness.makeClient(
 			{
 				capabilities: { diagnosticProvider: { interFileDependencies: false, workspaceDiagnostics: false } },
@@ -332,13 +367,13 @@ describe("LspClient diagnostics freshness", () => {
 					{ error: { code: -32601, message: "Method not found" } },
 				],
 			},
-			{ diagnosticsFreshnessTimeoutMs: 500, versionlessPublishQuiescenceMs: 5 },
+			{ diagnosticsFreshnessTimeoutMs: 500, versionlessPublishQuiescenceMs: 5, timerProvider: clock },
 		);
 
 		const first = await context.client.diagnostics(context.source);
 		expect(first.items).toEqual([diagnostic("cached-full")]);
 
-		const second = await context.client.diagnostics(context.source);
+		const second = await resolveThroughFreshnessWindow(clock, () => context.client.diagnostics(context.source));
 		expect(second.transientError).toBeUndefined();
 		expect(second.items).toEqual([diagnostic("cached-full")]);
 	});

package/packages/lsp-core/src/lsp/controlled-clock-test-support.ts

@@ -11,6 +11,11 @@ interface TimerWaiter {
 	readonly resolve: () => void;
 }
 
+interface ScheduleWaiter {
+	readonly count: number;
+	readonly resolve: () => void;
+}
+
 /**
  * Deterministic TimerProvider for tests: timers fire only through advanceBy(),
  * and waitForTimer(delayMs) resolves once a timer with exactly that delay is
@@ -20,6 +25,7 @@ export class ControlledClock implements TimerProvider {
 	private readonly timers: ControlledTimer[] = [];
 	private currentTime = 0;
 	private readonly timerWaiters = new Set<TimerWaiter>();
+	private readonly scheduleWaiters = new Set<ScheduleWaiter>();
 	readonly scheduledDelays: number[] = [];
 
 	readonly now = (): number => this.currentTime;
@@ -33,6 +39,12 @@ export class ControlledClock implements TimerProvider {
 				waiter.resolve();
 			}
 		}
+		for (const waiter of this.scheduleWaiters) {
+			if (this.scheduledDelays.length >= waiter.count) {
+				this.scheduleWaiters.delete(waiter);
+				waiter.resolve();
+			}
+		}
 		return timer as unknown as ReturnType<typeof setTimeout>;
 	};
 	readonly clearTimeout = (handle: ReturnType<typeof setTimeout>): void => {
@@ -49,6 +61,23 @@ export class ControlledClock implements TimerProvider {
 		});
 	}
 
+	/**
+	 * Resolves once this clock has been asked to schedule `count` timers in total.
+	 *
+	 * Timer DELAYS are ambiguous whenever the code under test derives several budgets from the same
+	 * remaining window (an LSP request timeout and the push-fallback wait are both "whatever is left
+	 * of the freshness window"). The schedule ORDER is not ambiguous: a step that only runs after an
+	 * earlier request settled can only arm its timer once that request's own timer was cleared. So a
+	 * test that must fire the LATER timer waits for the later schedule instead of a delay value, and
+	 * never races the earlier one.
+	 */
+	waitForScheduled(count: number): Promise<void> {
+		if (this.scheduledDelays.length >= count) return Promise.resolve();
+		return new Promise((resolve) => {
+			this.scheduleWaiters.add({ count, resolve });
+		});
+	}
+
 	advanceBy(delayMs: number): void {
 		this.currentTime += delayMs;
 		for (;;) {

package/packages/lsp-core/src/lsp/workspace-document-state.ts

@@ -235,6 +235,11 @@ export class WorkspaceDocumentState {
 	waitForDiagnosticsActivity(snapshot: DiagnosticSnapshot, timeoutMs: number): Promise<void> {
 		const state = this.openByUri.get(normalizeDocumentUri(snapshot.uri));
 		if (!state || timeoutMs <= 0) return Promise.resolve();
+		// A publish that landed between the caller's snapshot and this registration already IS the
+		// activity being waited for, and its notifyWaiters ran before this waiter existed. Without
+		// this check that wake-up is lost and the wait can only end at the freshness deadline, which
+		// turns the deadline from a fallback into the poll interval the result depends on (#8323).
+		if (state.publishGeneration !== snapshot.publishGeneration) return Promise.resolve();
 		return new Promise((resolveActivity) => {
 			let settled = false;
 			const finish = () => {

package/packages/lsp-daemon/dist/cli.js

@@ -1770,6 +1770,8 @@ class WorkspaceDocumentState {
     const state = this.openByUri.get(normalizeDocumentUri(snapshot.uri));
     if (!state || timeoutMs <= 0)
       return Promise.resolve();
+    if (state.publishGeneration !== snapshot.publishGeneration)
+      return Promise.resolve();
     return new Promise((resolveActivity) => {
       let settled = false;
       const finish = () => {

package/packages/lsp-daemon/dist/client.js

@@ -2428,6 +2428,8 @@ class WorkspaceDocumentState {
     const state = this.openByUri.get(normalizeDocumentUri(snapshot.uri));
     if (!state || timeoutMs <= 0)
       return Promise.resolve();
+    if (state.publishGeneration !== snapshot.publishGeneration)
+      return Promise.resolve();
     return new Promise((resolveActivity) => {
       let settled = false;
       const finish = () => {

package/packages/lsp-daemon/dist/index.js

@@ -1277,6 +1277,8 @@ class WorkspaceDocumentState {
     const state = this.openByUri.get(normalizeDocumentUri(snapshot.uri));
     if (!state || timeoutMs <= 0)
       return Promise.resolve();
+    if (state.publishGeneration !== snapshot.publishGeneration)
+      return Promise.resolve();
     return new Promise((resolveActivity) => {
       let settled = false;
       const finish = () => {

package/packages/lsp-tools-mcp/dist/cli.js

@@ -1282,6 +1282,8 @@ class WorkspaceDocumentState {
     const state = this.openByUri.get(normalizeDocumentUri(snapshot.uri));
     if (!state || timeoutMs <= 0)
       return Promise.resolve();
+    if (state.publishGeneration !== snapshot.publishGeneration)
+      return Promise.resolve();
     return new Promise((resolveActivity) => {
       let settled = false;
       const finish = () => {

package/packages/lsp-tools-mcp/dist/lsp/manager.js

@@ -1277,6 +1277,8 @@ class WorkspaceDocumentState {
     const state = this.openByUri.get(normalizeDocumentUri(snapshot.uri));
     if (!state || timeoutMs <= 0)
       return Promise.resolve();
+    if (state.publishGeneration !== snapshot.publishGeneration)
+      return Promise.resolve();
     return new Promise((resolveActivity) => {
       let settled = false;
       const finish = () => {

package/packages/lsp-tools-mcp/dist/mcp.js

@@ -1771,6 +1771,8 @@ class WorkspaceDocumentState {
     const state = this.openByUri.get(normalizeDocumentUri(snapshot.uri));
     if (!state || timeoutMs <= 0)
       return Promise.resolve();
+    if (state.publishGeneration !== snapshot.publishGeneration)
+      return Promise.resolve();
     return new Promise((resolveActivity) => {
       let settled = false;
       const finish = () => {

package/packages/lsp-tools-mcp/dist/tools.js

@@ -1459,6 +1459,8 @@ class WorkspaceDocumentState {
     const state = this.openByUri.get(normalizeDocumentUri(snapshot.uri));
     if (!state || timeoutMs <= 0)
       return Promise.resolve();
+    if (state.publishGeneration !== snapshot.publishGeneration)
+      return Promise.resolve();
     return new Promise((resolveActivity) => {
       let settled = false;
       const finish = () => {

package/packages/omo-codex/plugin/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "omo",
-  "version": "5.0.0-beta.66",
+  "version": "5.0.0-beta.68",
   "description": "One Codex plugin namespace for Yeongyu's local Codex components.",
   "author": {
     "name": "Yeongyu Kim",

package/packages/omo-codex/plugin/components/bootstrap/hooks/hooks.json

@@ -8,7 +8,7 @@
 						"command": "node \"${PLUGIN_ROOT}/components/bootstrap/dist/cli.js\" hook session-start",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\bootstrap.ps1\"",
 						"timeout": 30,
-						"statusMessage": "(OmO 5.0.0-beta.66) Checking Bootstrap Provisioning"
+						"statusMessage": "(OmO 5.0.0-beta.68) Checking Bootstrap Provisioning"
 					}
 				]
 			}

package/packages/omo-codex/plugin/components/bootstrap/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sisyphuslabs/codex-bootstrap",
-	"version": "5.0.0-beta.66",
+	"version": "5.0.0-beta.68",
 	"description": "Codex SessionStart bootstrap component that provisions LazyCodex runtime dependencies from a detached worker.",
 	"type": "module",
 	"private": true,

package/packages/omo-codex/plugin/components/comment-checker/hooks/hooks.json

@@ -8,7 +8,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook post-tool-use",
 						"timeout": 30,
-						"statusMessage": "(OmO 5.0.0-beta.66) Checking Comments"
+						"statusMessage": "(OmO 5.0.0-beta.68) Checking Comments"
 					}
 				]
 			}

package/packages/omo-codex/plugin/components/comment-checker/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@code-yeongyu/codex-comment-checker",
-	"version": "5.0.0-beta.66",
+	"version": "5.0.0-beta.68",
 	"description": "Codex plugin that runs comment-checker after edit-like PostToolUse hooks.",
 	"type": "module",
 	"packageManager": "npm@11.12.1",

package/packages/omo-codex/plugin/components/git-bash/hooks/hooks.json

@@ -8,7 +8,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook pre-tool-use",
 						"timeout": 5,
-						"statusMessage": "(OmO 5.0.0-beta.66) Recommending Git Bash MCP"
+						"statusMessage": "(OmO 5.0.0-beta.68) Recommending Git Bash MCP"
 					}
 				]
 			}
@@ -20,7 +20,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook post-compact",
 						"timeout": 5,
-						"statusMessage": "(OmO 5.0.0-beta.66) Resetting Git Bash MCP Reminder"
+						"statusMessage": "(OmO 5.0.0-beta.68) Resetting Git Bash MCP Reminder"
 					}
 				]
 			}

package/packages/omo-codex/plugin/components/git-bash/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sisyphuslabs/codex-git-bash-hook",
-	"version": "5.0.0-beta.66",
+	"version": "5.0.0-beta.68",
 	"description": "Codex hook component that reminds Windows sessions to prefer the OMO git_bash MCP.",
 	"type": "module",
 	"private": true,

package/packages/omo-codex/plugin/components/lazycodex-executor-verify/hooks/hooks.json

@@ -8,7 +8,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/lazycodex-executor-verify/dist/cli.js\" hook subagent-stop",
 						"timeout": 10,
-						"statusMessage": "(OmO 5.0.0-beta.66) Verifying LazyCodex Executor Evidence"
+						"statusMessage": "(OmO 5.0.0-beta.68) Verifying LazyCodex Executor Evidence"
 					}
 				]
 			}

package/packages/omo-codex/plugin/components/lazycodex-executor-verify/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@code-yeongyu/codex-lazycodex-executor-verify",
-	"version": "5.0.0-beta.66",
+	"version": "5.0.0-beta.68",
 	"description": "Codex SubagentStop evidence verifier for LazyCodex executor completions.",
 	"type": "module",
 	"packageManager": "npm@11.12.1",