diff --git a/packages/agent-core-v2/scripts/check-domain-layers.mjs b/packages/agent-core-v2/scripts/check-domain-layers.mjs index 2a6644c08..16fd40202 100644 --- a/packages/agent-core-v2/scripts/check-domain-layers.mjs +++ b/packages/agent-core-v2/scripts/check-domain-layers.mjs @@ -147,7 +147,6 @@ const DOMAIN_LAYER = new Map([ ['microCompaction', 4], ['loop', 4], ['media', 4], - ['fileTools', 4], ['shellTools', 4], ['llmRequester', 4], ['profile', 4], diff --git a/packages/agent-core-v2/src/agent/fileTools/index.ts b/packages/agent-core-v2/src/agent/fileTools/index.ts deleted file mode 100644 index a20558d10..000000000 --- a/packages/agent-core-v2/src/agent/fileTools/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -/** - * `fileTools` domain barrel — re-exports the built-in file tools (Read / Write - * / Edit / Grep / Glob) and the shared line-ending helpers. Each tool - * self-registers via `registerTool(...)` at module load, so importing this - * barrel is what wires them into every Agent-scope tool registry. - */ - -export * from '#/agent/fileTools/tools/edit'; -export * from '#/agent/fileTools/tools/glob'; -export * from '#/agent/fileTools/tools/grep'; -export * from '#/agent/fileTools/tools/line-endings'; -export * from '#/agent/fileTools/tools/read'; -export * from '#/agent/fileTools/tools/write'; diff --git a/packages/agent-core-v2/src/index.ts b/packages/agent-core-v2/src/index.ts index 902024095..bbd2f4880 100644 --- a/packages/agent-core-v2/src/index.ts +++ b/packages/agent-core-v2/src/index.ts @@ -115,5 +115,4 @@ export type { ToolContribution, ToolContributionOptions } from '#/agent/toolRegi export * from '#/agent/toolState'; export * from '#/agent/userTool'; export * from '#/agent/wireRecord'; -export * from '#/agent/fileTools'; export * from '#/agent/shellTools'; diff --git a/packages/agent-core-v2/src/os/backends/node-local/index.ts b/packages/agent-core-v2/src/os/backends/node-local/index.ts index 824202c9f..f8122da60 100644 --- a/packages/agent-core-v2/src/os/backends/node-local/index.ts +++ b/packages/agent-core-v2/src/os/backends/node-local/index.ts @@ -2,3 +2,4 @@ export * from './hostEnvironmentService'; export * from './hostFsService'; export * from './hostProcessService'; export * from './hostTerminalService'; +export * from './tools/index'; diff --git a/packages/agent-core-v2/src/agent/fileTools/tools/edit.md b/packages/agent-core-v2/src/os/backends/node-local/tools/edit.md similarity index 100% rename from packages/agent-core-v2/src/agent/fileTools/tools/edit.md rename to packages/agent-core-v2/src/os/backends/node-local/tools/edit.md diff --git a/packages/agent-core-v2/src/agent/fileTools/tools/edit.ts b/packages/agent-core-v2/src/os/backends/node-local/tools/edit.ts similarity index 99% rename from packages/agent-core-v2/src/agent/fileTools/tools/edit.ts rename to packages/agent-core-v2/src/os/backends/node-local/tools/edit.ts index 1cbf11104..bc7d86cc2 100644 --- a/packages/agent-core-v2/src/agent/fileTools/tools/edit.ts +++ b/packages/agent-core-v2/src/os/backends/node-local/tools/edit.ts @@ -28,7 +28,7 @@ import { literalRulePattern, matchesPathRuleSubject } from '#/_base/tools/suppor import type { WorkspaceConfig } from '#/_base/tools/support/workspace'; import { renderPrompt } from '#/_base/utils/render-prompt'; import { ISessionAgentFileSystem } from '#/session/agentFs'; -import { IHostEnvironment } from '#/app/hostEnvironment'; +import { IHostEnvironment } from '#/os/interface/hostEnvironment'; import { ISessionWorkspaceContext } from '#/session/workspaceContext'; import { ToolAccesses } from '#/agent/tool'; import type { BuiltinTool, ExecutableToolResult, ToolExecution } from '#/agent/tool'; diff --git a/packages/agent-core-v2/src/agent/fileTools/tools/glob.md b/packages/agent-core-v2/src/os/backends/node-local/tools/glob.md similarity index 100% rename from packages/agent-core-v2/src/agent/fileTools/tools/glob.md rename to packages/agent-core-v2/src/os/backends/node-local/tools/glob.md diff --git a/packages/agent-core-v2/src/agent/fileTools/tools/glob.ts b/packages/agent-core-v2/src/os/backends/node-local/tools/glob.ts similarity index 99% rename from packages/agent-core-v2/src/agent/fileTools/tools/glob.ts rename to packages/agent-core-v2/src/os/backends/node-local/tools/glob.ts index 1f1a8c3cf..8e47ac12c 100644 --- a/packages/agent-core-v2/src/agent/fileTools/tools/glob.ts +++ b/packages/agent-core-v2/src/os/backends/node-local/tools/glob.ts @@ -56,7 +56,7 @@ import { runRgOnce, shouldRetryRipgrepEagain, } from '#/session/agentFs/runRg'; -import { IHostEnvironment } from '#/app/hostEnvironment'; +import { IHostEnvironment } from '#/os/interface/hostEnvironment'; import { ISessionWorkspaceContext } from '#/session/workspaceContext'; import { ISessionProcessRunner } from '#/session/process'; import { ITelemetryService } from '#/app/telemetry'; diff --git a/packages/agent-core-v2/src/agent/fileTools/tools/grep.md b/packages/agent-core-v2/src/os/backends/node-local/tools/grep.md similarity index 100% rename from packages/agent-core-v2/src/agent/fileTools/tools/grep.md rename to packages/agent-core-v2/src/os/backends/node-local/tools/grep.md diff --git a/packages/agent-core-v2/src/agent/fileTools/tools/grep.ts b/packages/agent-core-v2/src/os/backends/node-local/tools/grep.ts similarity index 99% rename from packages/agent-core-v2/src/agent/fileTools/tools/grep.ts rename to packages/agent-core-v2/src/os/backends/node-local/tools/grep.ts index 9b811a8c4..a6263ef20 100644 --- a/packages/agent-core-v2/src/agent/fileTools/tools/grep.ts +++ b/packages/agent-core-v2/src/os/backends/node-local/tools/grep.ts @@ -29,7 +29,7 @@ import { z } from 'zod'; import { ISessionFsService } from '#/session/agentFs'; import { ErrorCodes, isKimiError } from '#/errors'; -import { IHostEnvironment } from '#/app/hostEnvironment'; +import { IHostEnvironment } from '#/os/interface/hostEnvironment'; import { ISessionWorkspaceContext } from '#/session/workspaceContext'; import { ToolAccesses } from '#/agent/tool'; import type { BuiltinTool, ExecutableToolResult, ToolExecution } from '#/agent/tool'; diff --git a/packages/agent-core-v2/src/os/backends/node-local/tools/index.ts b/packages/agent-core-v2/src/os/backends/node-local/tools/index.ts new file mode 100644 index 000000000..c655c0a22 --- /dev/null +++ b/packages/agent-core-v2/src/os/backends/node-local/tools/index.ts @@ -0,0 +1,6 @@ +export * from './edit'; +export * from './glob'; +export * from './grep'; +export * from './line-endings'; +export * from './read'; +export * from './write'; diff --git a/packages/agent-core-v2/src/agent/fileTools/tools/line-endings.ts b/packages/agent-core-v2/src/os/backends/node-local/tools/line-endings.ts similarity index 100% rename from packages/agent-core-v2/src/agent/fileTools/tools/line-endings.ts rename to packages/agent-core-v2/src/os/backends/node-local/tools/line-endings.ts diff --git a/packages/agent-core-v2/src/agent/fileTools/tools/read.md b/packages/agent-core-v2/src/os/backends/node-local/tools/read.md similarity index 100% rename from packages/agent-core-v2/src/agent/fileTools/tools/read.md rename to packages/agent-core-v2/src/os/backends/node-local/tools/read.md diff --git a/packages/agent-core-v2/src/agent/fileTools/tools/read.ts b/packages/agent-core-v2/src/os/backends/node-local/tools/read.ts similarity index 99% rename from packages/agent-core-v2/src/agent/fileTools/tools/read.ts rename to packages/agent-core-v2/src/os/backends/node-local/tools/read.ts index 995d0935a..0b334f1df 100644 --- a/packages/agent-core-v2/src/agent/fileTools/tools/read.ts +++ b/packages/agent-core-v2/src/os/backends/node-local/tools/read.ts @@ -25,7 +25,7 @@ import { z } from 'zod'; import { ISessionAgentFileSystem } from '#/session/agentFs'; -import { IHostEnvironment } from '#/app/hostEnvironment'; +import { IHostEnvironment } from '#/os/interface/hostEnvironment'; import { ISessionWorkspaceContext } from '#/session/workspaceContext'; import { ToolAccesses } from '#/agent/tool'; import type { BuiltinTool, ExecutableToolResult, ToolExecution } from '#/agent/tool'; diff --git a/packages/agent-core-v2/src/agent/fileTools/tools/write.md b/packages/agent-core-v2/src/os/backends/node-local/tools/write.md similarity index 100% rename from packages/agent-core-v2/src/agent/fileTools/tools/write.md rename to packages/agent-core-v2/src/os/backends/node-local/tools/write.md diff --git a/packages/agent-core-v2/src/agent/fileTools/tools/write.ts b/packages/agent-core-v2/src/os/backends/node-local/tools/write.ts similarity index 99% rename from packages/agent-core-v2/src/agent/fileTools/tools/write.ts rename to packages/agent-core-v2/src/os/backends/node-local/tools/write.ts index a3c7ba824..1224aefc7 100644 --- a/packages/agent-core-v2/src/agent/fileTools/tools/write.ts +++ b/packages/agent-core-v2/src/os/backends/node-local/tools/write.ts @@ -21,7 +21,7 @@ import { z } from 'zod'; import { ISessionAgentFileSystem } from '#/session/agentFs'; import type { AgentFileStat } from '#/session/agentFs'; -import { IHostEnvironment } from '#/app/hostEnvironment'; +import { IHostEnvironment } from '#/os/interface/hostEnvironment'; import { ISessionWorkspaceContext } from '#/session/workspaceContext'; import { ToolAccesses } from '#/agent/tool'; import type { BuiltinTool, ExecutableToolResult, ToolExecution } from '#/agent/tool'; diff --git a/packages/agent-core-v2/test/fileTools/edit.test.ts b/packages/agent-core-v2/test/fileTools/edit.test.ts index b09811db9..39604f305 100644 --- a/packages/agent-core-v2/test/fileTools/edit.test.ts +++ b/packages/agent-core-v2/test/fileTools/edit.test.ts @@ -13,8 +13,8 @@ import { describe, expect, it, vi } from 'vitest'; import { PathSecurityError } from '../../src/_base/tools/policies/path-access'; import { stubWorkspaceContext } from './stub-workspace-context'; import type { ISessionAgentFileSystem } from '#/session/agentFs'; -import { type EditInput, EditInputSchema, EditTool } from '#/agent/fileTools/tools/edit'; -import type { IHostEnvironment } from '#/app/hostEnvironment'; +import { type EditInput, EditInputSchema, EditTool } from '#/os/backends/node-local/tools/edit'; +import type { IHostEnvironment } from '#/os/interface/hostEnvironment'; import type { ExecutableToolContext, ExecutableToolResult, ToolExecution } from '#/agent/tool'; const signal = new AbortController().signal; diff --git a/packages/agent-core-v2/test/fileTools/glob.test.ts b/packages/agent-core-v2/test/fileTools/glob.test.ts index 7f09f985c..a82ef93e2 100644 --- a/packages/agent-core-v2/test/fileTools/glob.test.ts +++ b/packages/agent-core-v2/test/fileTools/glob.test.ts @@ -29,8 +29,8 @@ import { GlobTool, MAX_MATCHES, splitCompletePaths, -} from '#/agent/fileTools/tools/glob'; -import type { IHostEnvironment } from '#/app/hostEnvironment'; +} from '#/os/backends/node-local/tools/glob'; +import type { IHostEnvironment } from '#/os/interface/hostEnvironment'; import { probeHostEnvironmentFromNode } from '#/_base/execEnv'; import { createExecContext } from '#/session/execContext'; import { SessionProcessRunner } from '#/session/process/processRunnerService'; diff --git a/packages/agent-core-v2/test/fileTools/grep.test.ts b/packages/agent-core-v2/test/fileTools/grep.test.ts index f3d77184a..e6c474bf6 100644 --- a/packages/agent-core-v2/test/fileTools/grep.test.ts +++ b/packages/agent-core-v2/test/fileTools/grep.test.ts @@ -19,8 +19,8 @@ import { type GrepInput, GrepInputSchema, GrepTool, -} from '#/agent/fileTools/tools/grep'; -import type { IHostEnvironment } from '#/app/hostEnvironment'; +} from '#/os/backends/node-local/tools/grep'; +import type { IHostEnvironment } from '#/os/interface/hostEnvironment'; import type { ExecutableToolContext, ExecutableToolResult, ToolExecution } from '#/agent/tool'; const signal = new AbortController().signal; diff --git a/packages/agent-core-v2/test/fileTools/read.test.ts b/packages/agent-core-v2/test/fileTools/read.test.ts index f5053bac7..88ebd3cd9 100644 --- a/packages/agent-core-v2/test/fileTools/read.test.ts +++ b/packages/agent-core-v2/test/fileTools/read.test.ts @@ -25,8 +25,8 @@ import { type ReadInput, ReadInputSchema, ReadTool, -} from '#/agent/fileTools/tools/read'; -import type { IHostEnvironment } from '#/app/hostEnvironment'; +} from '#/os/backends/node-local/tools/read'; +import type { IHostEnvironment } from '#/os/interface/hostEnvironment'; import type { ExecutableToolContext, ExecutableToolResult, ToolExecution } from '#/agent/tool'; const signal = new AbortController().signal; diff --git a/packages/agent-core-v2/test/fileTools/write.test.ts b/packages/agent-core-v2/test/fileTools/write.test.ts index c4d33db3a..f1683e374 100644 --- a/packages/agent-core-v2/test/fileTools/write.test.ts +++ b/packages/agent-core-v2/test/fileTools/write.test.ts @@ -17,8 +17,8 @@ import { describe, expect, it, vi } from 'vitest'; import { PathSecurityError } from '../../src/_base/tools/policies/path-access'; import type { AgentFileStat, ISessionAgentFileSystem } from '#/session/agentFs'; import { stubWorkspaceContext } from './stub-workspace-context'; -import { type WriteInput, WriteInputSchema, WriteTool } from '#/agent/fileTools/tools/write'; -import type { IHostEnvironment } from '#/app/hostEnvironment'; +import { type WriteInput, WriteInputSchema, WriteTool } from '#/os/backends/node-local/tools/write'; +import type { IHostEnvironment } from '#/os/interface/hostEnvironment'; import type { ExecutableToolContext, ExecutableToolResult, ToolExecution } from '#/agent/tool'; const signal = new AbortController().signal;