fix: address CodeRabbit review feedback

- CRITICAL: Pass bridge bearer token to MCP sidecar env (init.ts)
- Add missing action types to WebviewActionType union (actions.ts)
- Track and clean up injected env keys in opencodeClient (env pollution)
- Use workflow.removeListener instead of removeAllListeners (orchestrator)
- Use fileURLToPath for cross-platform URI conversion (fileTracker, batchReviewHandlers)
- Track inflight reads to prevent cache race condition (fileTracker)
- Validate parsed YAML document before dereferencing (config.ts)
- Use existing fileUriToPath utility (handleFileResponse)
- Re-add rehypeSanitize for HTML sanitization (ReceivedMessage)
- Use nullish coalescing for empty string handling (ResourceBlock)
- Replace deprecated word-break: break-word (ChatPage.css)
- Fix useEffect boolean dependency (AgentFileReview)
- Remove redundant ternary expression (AgentFileReview)
- Use semantic button element for accessibility (ResourceLink)
- Remove unsafe 'as any' casts in type guards (messages.ts)
- Add graceful error handling for agent restart (handlers.ts)
- Use deep comparison for provider disambiguation (providerConfigGenerator)

Author: OpenClaw

vscode/core/src/client/opencodeClient.ts

@@ -334,9 +334,7 @@ export class OpencodeAgentClient extends EventEmitter implements AgentClient {
         this.server = null;
       }
       this.client = null;
-      for (const key of this.injectedEnvKeys) {
-        delete process.env[key];
-      }
+      for (const key of this.injectedEnvKeys) { delete process.env[key]; }
       this.injectedEnvKeys = [];
 
       const error = err instanceof Error ? err : new Error(String(err));
@@ -373,9 +371,7 @@ export class OpencodeAgentClient extends EventEmitter implements AgentClient {
     this.client = null;
     this.sessionId = null;
     this.promptActive = false;
-    for (const key of this.injectedEnvKeys) {
-      delete process.env[key];
-    }
+    for (const key of this.injectedEnvKeys) { delete process.env[key]; }
     this.injectedEnvKeys = [];
     this.setState("stopped");
     this.logger.info("OpencodeAgentClient: stopped");

vscode/core/src/features/agent/agentOrchestrator.ts

@@ -366,8 +366,7 @@ export class AgentOrchestrator {
       this.state.currentQueueManager = undefined;
       this.state.pendingInteractionsMap = undefined;
       this.state.resolvePendingInteraction = undefined;
-      // Remove workflow listeners — safe here since workflow is complete
-      workflow.removeAllListeners();
+      workflow.removeListener("workflowMessage", onWorkflowMessage);
       this.cleanup();
       if (disposeClient) {
         agentClient.dispose();

vscode/core/src/features/agent/batchReviewHandlers.ts

@@ -1,5 +1,6 @@
 import * as vscode from "vscode";
 import { join, isAbsolute } from "path";
+import { fileURLToPath } from "url";
 import type { ExtensionState } from "../../extensionState";
 import type winston from "winston";
 import { handleFileResponse } from "../../utilities/ModifiedFiles/handleFileResponse";
@@ -16,7 +17,7 @@ function resolveAbsolutePath(filePath: string, state: ExtensionState): string {
   }
   let wsRoot = state.data.workspaceRoot;
   if (wsRoot.startsWith("file://")) {
-    wsRoot = new URL(wsRoot).pathname;
+    wsRoot = fileURLToPath(wsRoot);
   }
   return join(wsRoot, filePath);
 }

vscode/core/src/features/agent/fileTracker.ts

@@ -13,8 +13,8 @@
 
 import * as fs from "fs/promises";
 import * as path from "path";
-import { execFile } from "child_process";
 import { fileURLToPath } from "url";
+import { execFile } from "child_process";
 import type winston from "winston";
 
 export interface TrackedFileChange {
@@ -110,28 +110,25 @@ export class AgentFileTracker {
       this.pendingToolFiles.set(callId, absPath);
     }
 
-    if (this.originalContentCache.has(absPath)) {
+    if (this.originalContentCache.has(absPath) || this.inflightReads.has(absPath)) {
       return;
     }
 
-    // Track the in-flight read so scanners can await it before comparing
-    if (!this.inflightReads.has(absPath)) {
-      const readPromise = fs
-        .readFile(absPath, "utf-8")
-        .then((content) => {
-          if (!this.originalContentCache.has(absPath)) {
-            this.originalContentCache.set(absPath, content);
-            this.logger.debug("Cached original for tool-targeted file", { path: absPath });
-          }
-        })
-        .catch(() => {
-          // File may not exist yet (new file) — that's fine
-        })
-        .finally(() => {
-          this.inflightReads.delete(absPath);
-        });
-      this.inflightReads.set(absPath, readPromise);
-    }
+    const readPromise = fs.readFile(absPath, "utf-8")
+      .then((content) => {
+        if (!this.originalContentCache.has(absPath)) {
+          this.originalContentCache.set(absPath, content);
+          this.logger.debug("Cached original for tool-targeted file", { path: absPath });
+        }
+      })
+      .catch(() => {
+        // File may not exist yet (new file) — that's fine
+      })
+      .finally(() => {
+        this.inflightReads.delete(absPath);
+      });
+
+    this.inflightReads.set(absPath, readPromise);
   }
 
   /**
@@ -155,7 +152,7 @@ export class AgentFileTracker {
   }
 
   private async doScan(): Promise<TrackedFileChange[]> {
-    // Wait for any in-flight reads to complete before comparing
+    // Wait for any inflight reads to complete before comparing
     if (this.inflightReads.size > 0) {
       await Promise.allSettled(this.inflightReads.values());
     }
@@ -187,8 +184,10 @@ export class AgentFileTracker {
 
   /** Mark a file as already routed to batch review. */
   markAsRouted(absPath: string): void {
-    if (absPath.startsWith("file://") || absPath.startsWith("file:")) {
+    if (absPath.startsWith("file://")) {
       absPath = fileURLToPath(absPath);
+    } else if (absPath.startsWith("file:")) {
+      absPath = absPath.slice("file:".length);
     }
     this.routedFiles.add(absPath);
   }
@@ -201,8 +200,10 @@ export class AgentFileTracker {
    */
   async getOriginalContent(absPath: string, workspaceRoot?: string): Promise<string | undefined> {
     // Normalize absPath — it may arrive as a file: or file:// URI
-    if (absPath.startsWith("file://") || absPath.startsWith("file:")) {
+    if (absPath.startsWith("file://")) {
       absPath = fileURLToPath(absPath);
+    } else if (absPath.startsWith("file:")) {
+      absPath = absPath.slice("file:".length);
     }
 
     const cached = this.originalContentCache.get(absPath);
@@ -212,8 +213,10 @@ export class AgentFileTracker {
 
     // Normalize workspaceRoot — it may arrive as a file:// URI
     let normalizedRoot = workspaceRoot;
-    if (normalizedRoot?.startsWith("file://") || normalizedRoot?.startsWith("file:")) {
-      normalizedRoot = fileURLToPath(normalizedRoot);
+    if (normalizedRoot?.startsWith("file://")) {
+      normalizedRoot = new URL(normalizedRoot).pathname;
+    } else if (normalizedRoot?.startsWith("file:")) {
+      normalizedRoot = normalizedRoot.slice("file:".length);
     }
 
     // Fall back to git for files not in the cache
@@ -306,13 +309,12 @@ export class AgentFileTracker {
     this.originalContentCache.clear();
     this.routedFiles.clear();
     this.pendingToolFiles.clear();
-    this.inflightReads.clear();
     this.scanPromise = null;
   }
 
   private uriToAbsolute(uri: string, workspaceRoot: string): string | undefined {
     try {
-      if (uri.startsWith("file://") || uri.startsWith("file:")) {
+      if (uri.startsWith("file://")) {
         return fileURLToPath(uri);
       }
       if (path.isAbsolute(uri)) {

vscode/core/src/modelProvider/providerConfigGenerator.ts

@@ -47,6 +47,23 @@ const PROVIDER_MAP: Record<string, ProviderMapping> = {
   },
 };
 
+function isSubset(expected: unknown, actual: unknown): boolean {
+  if (expected === actual) return true;
+  if (
+    expected &&
+    actual &&
+    typeof expected === "object" &&
+    typeof actual === "object" &&
+    !Array.isArray(expected) &&
+    !Array.isArray(actual)
+  ) {
+    return Object.entries(expected as Record<string, unknown>).every(([k, v]) =>
+      isSubset(v, (actual as Record<string, unknown>)[k]),
+    );
+  }
+  return false;
+}
+
 export function langchainProviderToUiId(
   langchainProvider: string,
   args?: Record<string, unknown>,
@@ -62,11 +79,8 @@ export function langchainProviderToUiId(
   }
   // Disambiguate duplicate LangChain names (e.g. ChatOpenAI → openai vs groq)
   for (const [uiId, m] of matches) {
-    if (m.extraArgs && args) {
-      const extraKey = Object.keys(m.extraArgs)[0];
-      if (extraKey && JSON.stringify(args[extraKey]) === JSON.stringify(m.extraArgs[extraKey])) {
-        return uiId;
-      }
+    if (m.extraArgs && args && isSubset(m.extraArgs, args)) {
+      return uiId;
     }
   }
   // Fall back to the entry without extraArgs (the "plain" one)

vscode/core/src/utilities/ModifiedFiles/handleFileResponse.ts

@@ -1,5 +1,6 @@
 import { ExtensionState } from "../../extensionState";
 import * as vscode from "vscode";
+import { fileUriToPath } from "../pathUtils";
 import { ChatMessageType, ModifiedFileMessageValue } from "@editor-extensions/shared";
 import { executeExtensionCommand } from "../../commands";
 import { runPartialAnalysis } from "../../analysis/runAnalysis";