Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/tool-support-services.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@moonshot-ai/agent-core": patch
"@moonshot-ai/kimi-code": patch
---

Relocate shared tool service typing to the tool support layer.
2 changes: 1 addition & 1 deletion packages/agent-core/src/agent/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import type { EnabledPluginSessionStart } from '#/plugin';
import type { McpConnectionManager } from '../mcp';
import type { PreparedSystemPromptContext, ResolvedAgentProfile } from '../profile';
import type { ModelProvider } from '../session/provider-manager';
import type { ToolServices } from '../runtime-types';
import type { SessionSubagentHost } from '../session/subagent-host';
import type { SkillRegistry } from '../skill';
import { noopTelemetryClient, type TelemetryClient } from '../telemetry';
Expand Down Expand Up @@ -55,6 +54,7 @@ import {
import { UsageRecorder } from './usage';
import { resolveCompletionBudget } from '../utils/completion-budget';
import type { Kaos } from '@moonshot-ai/kaos';
import type { ToolServices } from '../tools/support/services';

export type { AgentRecord, AgentRecordPersistence } from './records';
export type { BuiltinTool, ToolInfo, ToolSource, UserToolRegistration } from './tool';
Expand Down
2 changes: 1 addition & 1 deletion packages/agent-core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export type {
BackgroundTaskKind,
BackgroundTaskStatus,
} from './tools/background/manager';
export type { ToolServices } from './runtime-types';
export type { ToolServices } from './tools/support/services';
export { SingleModelProvider } from './session/provider-manager';
export type {
BearerTokenProvider,
Expand Down
2 changes: 1 addition & 1 deletion packages/agent-core/src/rpc/core-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import {
} from '../config';
import type { Logger } from '../logging/types';
import { resolveSessionMcpConfig, type SessionMcpConfig } from '../mcp';
import type { ToolServices } from '../runtime-types';
import { Session, type SessionMeta, type SessionSkillConfig } from '../session';
import { exportSessionDirectory } from '../session/export';
import {
Expand Down Expand Up @@ -84,6 +83,7 @@ import type { ResumedAgentState, ResumeSessionResult } from './resumed';
import type { SDKRPC } from './sdk-api';
import { proxyWithExtraPayload } from './types';
import { KaosShellNotFoundError, LocalKaos, type Kaos } from '@moonshot-ai/kaos';
import type { ToolServices } from '../tools/support/services';

const KIMI_CODE_PROVIDER_NAME = 'managed:kimi-code';

Expand Down
6 changes: 0 additions & 6 deletions packages/agent-core/src/runtime-types.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/agent-core/src/session/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import {
type ResolvedAgentProfile,
} from '../profile';
import type { ProviderManager } from './provider-manager';
import type { ToolServices } from '../runtime-types';
import {
registerBuiltinSkills,
resolveSkillRoots,
Expand All @@ -39,6 +38,7 @@ import {
} from '../skill';
import { noopTelemetryClient, type TelemetryClient } from '../telemetry';
import { SessionSubagentHost } from './subagent-host';
import type { ToolServices } from '../tools/support/services';

export interface SessionOptions {
readonly kaos: Kaos;
Expand Down
6 changes: 6 additions & 0 deletions packages/agent-core/src/tools/support/services.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import type { UrlFetcher, WebSearchProvider } from '../builtin';

export interface ToolServices {
readonly urlFetcher?: UrlFetcher;
readonly webSearcher?: WebSearchProvider;
}
2 changes: 1 addition & 1 deletion packages/agent-core/test/agent/harness/agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import type { Logger } from '../../../src/logging';
import { ProviderManager } from '../../../src/session/provider-manager';
import type { QuestionResult, RPCCallOptions, SDKAgentRPC } from '../../../src/rpc';
import type { AgentAPI } from '../../../src/rpc/core-api';
import type { ToolServices } from '../../../src/runtime-types';
import type { ToolServices } from '../../../src/tools/support/services';
import type { TelemetryClient } from '../../../src/telemetry';
import type { PromisifyMethods } from '../../../src/utils/types';
import { createFakeKaos } from '../../tools/fixtures/fake-kaos';
Expand Down
Loading