diff --git a/src/ai/tools/file-system-tools.ts b/src/ai/tools/file-system-tools.ts
index 1186eb8..66922c8 100644
--- a/src/ai/tools/file-system-tools.ts
+++ b/src/ai/tools/file-system-tools.ts
@@ -5,7 +5,7 @@ import { globbySync } from "globby";
 import path from "path";
 import { z } from "zod";
 
-import { createTool, resolveWithinWorkDir, setToolProgressMessageInfo } from "./utils.js";
+import { createTool, resolveWithinWorkDir } from "./utils.js";
 
 function listDirectory({ directory = "." }: { directory: string }, config?: RunnableConfig): string
 {
@@ -14,8 +14,6 @@ function listDirectory({ directory = "." }: { directory: string }, config?: Runn
         const resolvedPath = resolveWithinWorkDir(directory, config?.metadata?.["workDir"]);
         const combinedPath = path.join(resolvedPath, "*");
 
-        setToolProgressMessageInfo({ config, fileName: directory });
-
         const files = globbySync(combinedPath, {
             dot: true,
             onlyFiles: false,
@@ -47,8 +45,6 @@ function readFile({ fileName, maxLength }: { fileName: string; maxLength?: numbe
     {
         const resolvedPath = resolveWithinWorkDir(fileName, config?.metadata?.["workDir"]);
 
-        setToolProgressMessageInfo({ config, fileName });
-
         const content = readFileSync(resolvedPath).toString().slice(0, maxLength);
 
         return content || `The file "${fileName}" is empty.`;
@@ -65,8 +61,6 @@ function writeFile({ fileName, fileData }: { fileName: string; fileData: string
     {
         const resolvedPath = resolveWithinWorkDir(fileName, config?.metadata?.["workDir"]);
 
-        setToolProgressMessageInfo({ config, fileName });
-
         mkdirSync(path.dirname(resolvedPath), { recursive: true });
 
         writeFileSync(resolvedPath, fileData);
@@ -86,8 +80,6 @@ function moveFile({ sourceFileName, destinationFileName }: { sourceFileName: str
         const resolvedSourcePath = resolveWithinWorkDir(sourceFileName, config?.metadata?.["workDir"]);
         const resolvedDestinationPath = resolveWithinWorkDir(destinationFileName, config?.metadata?.["workDir"]);
 
-        setToolProgressMessageInfo({ config, description: `Rename ${sourceFileName} to ${destinationFileName}` });
-
         renameSync(resolvedSourcePath, resolvedDestinationPath);
 
         return `${sourceFileName} moved to ${destinationFileName}.`;
@@ -104,8 +96,6 @@ function deleteFile({ fileName }: { fileName: string }, config: RunnableConfig):
     {
         const resolvedPath = resolveWithinWorkDir(fileName, config?.metadata?.["workDir"]);
 
-        setToolProgressMessageInfo({ config, fileName });
-
         unlinkSync(resolvedPath);
 
         return `${fileName} deleted.`;
@@ -122,8 +112,6 @@ function createDirectory({ fileName }: { fileName: string }, config: RunnableCon
     {
         const resolvedPath = resolveWithinWorkDir(fileName, config?.metadata?.["workDir"]);
 
-        setToolProgressMessageInfo({ config, fileName });
-
         mkdirSync(resolvedPath, { recursive: true });
 
         return `${fileName} created.`;
@@ -141,8 +129,6 @@ function findFiles({ pattern, directory = "." }: { pattern: string; directory?:
         const resolvedPath = resolveWithinWorkDir(directory, config?.metadata?.["workDir"]);
         const combinedPattern = path.join(resolvedPath, pattern);
 
-        setToolProgressMessageInfo({ config, fileName: path.join(directory, pattern) });
-
         const files = globbySync(combinedPattern, {
             dot: true,
             onlyFiles: true,
@@ -178,8 +164,6 @@ function searchInFiles({ pattern, glob: globPattern, directory = ".", isCaseSens
         const resolvedPath = resolveWithinWorkDir(directory, workDir);
         const combinedGlob = path.join(resolvedPath, globPattern);
 
-        setToolProgressMessageInfo({ config, description: `Search for ${pattern} in ${path.join(directory, globPattern)}` });
-
         const files = globbySync(combinedGlob, {
             dot: true,
             onlyFiles: true,
diff --git a/src/ai/tools/utils.ts b/src/ai/tools/utils.ts
index 236a617..8e7d530 100644
--- a/src/ai/tools/utils.ts
+++ b/src/ai/tools/utils.ts
@@ -3,7 +3,6 @@ import { tool } from "@langchain/core/tools";
 import { realpathSync } from "fs";
 import path from "path";
 
-import { ToolProgressMessage } from "../custom-messages.js";
 
 export function resolveWithinWorkDir(userPath: string, workDir?: unknown): string
 {
@@ -47,14 +46,3 @@ export function formatEmptyToolOutput(f: Function)
 {
     return `Tool \`${funcName(f)}\` produced no output.`;
 }
-
-export function setToolProgressMessageInfo(props: { config?: RunnableConfig; description?: string; fileName?: string; })
-{
-    const toolProgressMessage = props?.config?.metadata?.["toolProgressMessage"] as (ToolProgressMessage | undefined);
-
-    if (toolProgressMessage)
-    {
-        toolProgressMessage.info.description = props.description;
-        toolProgressMessage.info.fileName = props.fileName;
-    }
-}
diff --git a/src/ai/work.ts b/src/ai/work.ts
index 1eb756e..4664e9e 100644
--- a/src/ai/work.ts
+++ b/src/ai/work.ts
@@ -152,7 +152,6 @@ async function workTools(props: Pick<WorkProps, "session" | "chatService" | "sig
         const { result, error } = await tryCatch<ToolMessage>(selectedTool.invoke(toolCall, {
             metadata: {
                 workDir: session.workDir,
-                toolProgressMessage,
             },
         }));