fix: reconciled merged sources with current main APIs

- restored capability reset import in agent-session refreshSkills
- fixed renamed credential entry reference in auth-storage org fields
- aligned xai web-search fetch mock and refresh-race test with current typings

packages/ai/src/auth-storage.ts

@@ -2852,8 +2852,8 @@ export class AuthStorage {
 			email: next.email,
 			enterpriseUrl: next.enterpriseUrl,
 			apiEndpoint: next.apiEndpoint,
-			orgId: next.orgId ?? existing.orgId,
-			orgName: next.orgName ?? existing.orgName,
+			orgId: next.orgId ?? entry.credential.orgId,
+			orgName: next.orgName ?? entry.credential.orgName,
 		});
 	}
 

packages/ai/test/auth-storage-oauth-refresh-race.test.ts

@@ -409,7 +409,7 @@ describe("AuthStorage OAuth refresh race", () => {
 			forceRefresh: true,
 			credentialFromRow: credential => credential,
 			async refresh(current) {
-				store.updateAuthCredential(credentialId, {
+				store!.updateAuthCredential(credentialId, {
 					...current,
 					access: "access-from-peer",
 					refresh: "refresh-from-peer",

packages/coding-agent/src/session/agent-session.ts

@@ -170,6 +170,7 @@ import {
 } from "../advisor";
 import { type AsyncJob, type AsyncJobDeliveryState, AsyncJobManager } from "../async";
 import { classifyDifficulty } from "../auto-thinking/classifier";
+import { reset as resetCapabilities } from "../capability";
 import type { Rule } from "../capability/rule";
 import { shouldEnableAppendOnlyContext } from "../config/append-only-context-mode";
 import type { ModelRegistry } from "../config/model-registry";

packages/coding-agent/test/tools/web-search-xai.test.ts

@@ -212,7 +212,7 @@ describe("xAI web search provider", () => {
 			authStorage,
 		} as unknown as ModelRegistry;
 		const originalFetch = globalThis.fetch;
-		globalThis.fetch = capture.fetchMock;
+		globalThis.fetch = Object.assign(capture.fetchMock, { preconnect: originalFetch.preconnect });
 		try {
 			const result = await runSearchQuery(
 				{ query: "registry search", provider: "xai" },