fix: resolve rebase conflict markers

src/agents/tools/image-tool.ts

@@ -14,7 +14,6 @@ import {
 import {
   applyImageModelConfigDefaults,
   buildTextToolResult,
-  resolveMediaToolLocalRoots,
   resolveModelFromRegistry,
   resolveModelRuntimeApiKey,
   resolvePromptAndModelOverride,
@@ -298,7 +297,6 @@ export function createImageTool(options?: {
     ? "Analyze one or more images with a vision model. Use image for a single path/URL, or images for multiple (up to 20). Only use this tool when images were NOT already provided in the user's message. Images mentioned in the prompt are automatically visible to you."
     : "Analyze one or more images with the configured image model (agents.defaults.imageModel). Use image for a single path/URL, or images for multiple (up to 20). Provide a prompt describing what to analyze.";
 
-<<<<<<< HEAD
   const localRoots = (() => {
     const workspaceDir = normalizeWorkspaceDir(options?.workspaceDir);
     if (options?.fsPolicy?.workspaceOnly) {
@@ -310,18 +308,6 @@ export function createImageTool(options?: {
     }
     return Array.from(new Set([...roots, workspaceDir]));
   })();
-||||||| parent of 4a741746c (refactor: dedupe agent and reply runtimes)
-  const localRoots = (() => {
-    const roots = getDefaultLocalRoots();
-    const workspaceDir = normalizeWorkspaceDir(options?.workspaceDir);
-    if (!workspaceDir) {
-      return roots;
-    }
-    return Array.from(new Set([...roots, workspaceDir]));
-  })();
-=======
-  const localRoots = resolveMediaToolLocalRoots(options?.workspaceDir);
->>>>>>> 4a741746c (refactor: dedupe agent and reply runtimes)
 
   return {
     label: "Image",

src/agents/tools/pdf-tool.ts

@@ -12,7 +12,6 @@ import {
 import {
   applyImageModelConfigDefaults,
   buildTextToolResult,
-  resolveMediaToolLocalRoots,
   resolveModelFromRegistry,
   resolveModelRuntimeApiKey,
   resolvePromptAndModelOverride,
@@ -327,7 +326,6 @@ export function createPdfTool(options?: {
       ? Math.floor(maxPagesDefault)
       : DEFAULT_MAX_PAGES;
 
-<<<<<<< HEAD
   const localRoots = (() => {
     const workspaceDir = normalizeWorkspaceDir(options?.workspaceDir);
     if (options?.fsPolicy?.workspaceOnly) {
@@ -339,18 +337,6 @@ export function createPdfTool(options?: {
     }
     return Array.from(new Set([...roots, workspaceDir]));
   })();
-||||||| parent of 4a741746c (refactor: dedupe agent and reply runtimes)
-  const localRoots = (() => {
-    const roots = getDefaultLocalRoots();
-    const workspaceDir = normalizeWorkspaceDir(options?.workspaceDir);
-    if (!workspaceDir) {
-      return roots;
-    }
-    return Array.from(new Set([...roots, workspaceDir]));
-  })();
-=======
-  const localRoots = resolveMediaToolLocalRoots(options?.workspaceDir);
->>>>>>> 4a741746c (refactor: dedupe agent and reply runtimes)
 
   const description =
     "Analyze one or more PDF documents with a model. Supports native PDF analysis for Anthropic and Google models, with text/image extraction fallback for other providers. Use pdf for a single path/URL, or pdfs for multiple (up to 10). Provide a prompt describing what to analyze.";

src/logging/console-settings.test.ts

@@ -1,9 +1,5 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
-import {
-  captureConsoleSnapshot,
-  type ConsoleSnapshot,
-  restoreConsoleSnapshot,
-} from "./test-helpers/console-snapshot.js";
+import { captureConsoleSnapshot, type ConsoleSnapshot } from "./test-helpers/console-snapshot.js";
 
 vi.mock("./config.js", () => ({
   readLoggingConfig: () => undefined,
@@ -42,7 +38,6 @@ beforeEach(() => {
 });
 
 afterEach(() => {
-<<<<<<< HEAD
   console.log = snapshot.log;
   console.info = snapshot.info;
   console.warn = snapshot.warn;
@@ -54,16 +49,6 @@ afterEach(() => {
   } else {
     process.env.OPENCLAW_TEST_CONSOLE = originalOpenClawTestConsole;
   }
-||||||| parent of 4a741746c (refactor: dedupe agent and reply runtimes)
-  console.log = snapshot.log;
-  console.info = snapshot.info;
-  console.warn = snapshot.warn;
-  console.error = snapshot.error;
-  console.debug = snapshot.debug;
-  console.trace = snapshot.trace;
-=======
-  restoreConsoleSnapshot(snapshot);
->>>>>>> 4a741746c (refactor: dedupe agent and reply runtimes)
   Object.defineProperty(process.stdout, "isTTY", { value: originalIsTty, configurable: true });
   logging.setConsoleConfigLoaderForTests();
   vi.restoreAllMocks();