Skip to content

chore: cleanup set progress info #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janole merged 2 commits into from
Sep 24, 2025
Merged

chore: cleanup set progress info #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45664fd
refactor: remove setToolProgressMessageInfo usage and related code fr…
janole Sep 24, 2025
46848ad
fix: remove unused toolProgressMessage from metadata in workTools fun…
janole Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions src/ai/tools/file-system-tools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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,
Expand Down Expand Up @@ -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.`;
Expand All @@ -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);
Expand All @@ -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}.`;
Expand All @@ -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.`;
Expand All @@ -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.`;
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
12 changes: 0 additions & 12 deletions src/ai/tools/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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;
}
}
1 change: 0 additions & 1 deletion src/ai/work.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
}));

Expand Down