Skip to content

refactor(agent-core-v2): introduce agent-domain model/effect architecture and migrate todo/usage/token-counting #3103

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
sailist merged 1 commit into from
Aug 20, 2026
Merged

refactor(agent-core-v2): introduce agent-domain model/effect architecture and migrate todo/usage/token-counting #3103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 0 additions & 14 deletions apps/kimi-inspect/src/panels.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ import { IAgentPlanService } from '@moonshot-ai/agent-core-v2/features/plan/plan
import { IAgentProfileService } from '@moonshot-ai/agent-core-v2/agent/profile/profile';
import { IAgentSwarmService } from '@moonshot-ai/agent-core-v2/features/swarm/agent/swarm';
import { IAgentTaskService } from '@moonshot-ai/agent-core-v2/agent/task/task';
import { IAgentTokenCountingService } from '@moonshot-ai/agent-core-v2/agent/tokenCounting/tokenCounting';
import { IAgentToolRegistryService } from '@moonshot-ai/agent-core-v2/agent/toolRegistry/toolRegistry';
import { IAgentUsageService } from '@moonshot-ai/agent-core-v2/agent/usage/usage';
import { IAuthSummaryService } from '@moonshot-ai/agent-core-v2/app/auth/auth';
import { IConfigService } from '@moonshot-ai/agent-core-v2/app/config/config';
import { IFlagService } from '@moonshot-ai/agent-core-v2/app/flag/flag';
Expand Down Expand Up @@ -171,18 +169,6 @@ export const AGENT_PANELS: readonly ServicePanelDef[] = [
{ label: 'Refresh system prompt', run: (svc) => call(svc, 'refreshSystemPrompt') },
],
},
{
id: String(IAgentUsageService),
label: 'AgentUsageService',
scope: 'agent',
fetch: (svc) => call(svc, 'status'),
},
{
id: String(IAgentTokenCountingService),
label: 'AgentTokenCountingService',
scope: 'agent',
fetch: (svc) => call(svc, 'get'),
},
{
id: String(IAgentPermissionModeService),
label: 'AgentPermissionModeService',
Expand Down
4 changes: 3 additions & 1 deletion packages/acp-server/test/e2e-turn.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,18 +506,20 @@ describe('acp-server real prompt turn (scripted LLM)', () => {
const wireId = (create.params as { update?: { toolCallId?: string } }).update?.toolCallId;
const turnId = Number(wireId?.split(':')[0]);
const session = getLiveSessionById(c.server.core.accessor, created.sessionId);
const agentHandle = session?.accessor.get(IAgentLifecycleService).get('main');
const agentHandle = session?.accessor.get(IAgentLifecycleService).findAgentHandle('main');
const bus = agentHandle?.accessor.get(IEventBus);
expect(bus).toBeDefined();
bus!.publish(
new ToolProgress({
agentId: 'main',
turnId,
toolCallId: 'call_1',
update: { kind: 'stdout', text: 'raw-stdout-bytes' },
}),
);
bus!.publish(
new ToolProgress({
agentId: 'main',
turnId,
toolCallId: 'call_1',
update: { kind: 'status', text: 'Still working…' },
Expand Down
47 changes: 4 additions & 43 deletions packages/agent-core-v2/docs/state-manifest.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
// references become '(circular)', and class instances collapse to a '(ClassName)'
// marker — the wire shape of an entry is the JSON projection of the type here.
//
// Index (App: 0 keys · Workspace: 6 keys · Session: 17 keys · Agent: 99 keys)
// Index (App: 0 keys · Workspace: 6 keys · Session: 17 keys · Agent: 94 keys)
// App
// Workspace
// workspaceDirs.ephemeralDirs src/workspace/workspaceDirs/workspaceDirsService.ts
Expand Down Expand Up @@ -135,8 +135,6 @@
// task.ghosts src/agent/task/taskService.ts
// task.notificationDelivery src/agent/task/taskService.ts
// task.scheduledNotificationKeys src/agent/task/taskService.ts
// todo src/session/todo/todoOps.ts
// tokenCounting src/agent/tokenCounting/tokenCountingOps.ts
// toolDedupe.activeStep src/agent/toolDedupe/toolDedupeService.ts
// toolDedupe.activeTurnId src/agent/toolDedupe/toolDedupeService.ts
// toolDedupe.callKeyByCallId src/agent/toolDedupe/toolDedupeService.ts
Expand All @@ -150,9 +148,6 @@
// toolSelect.pendingLoaded src/agent/toolSelect/toolSelectService.ts
// tower src/features/tower/towerOps.ts
// turn src/agent/loop/turnOps.ts
// usage src/agent/usage/usageOps.ts
// usage.currentTurn src/agent/usage/usageService.ts
// usage.currentTurnId src/agent/usage/usageService.ts
// userTool src/agent/userTool/userToolOps.ts

/** App-scope keys registered into IAppStateService. */
Expand Down Expand Up @@ -1331,10 +1326,10 @@ export interface AgentStateSnapshot {
// src/agent/media/mediaToolsRegistrar.ts
'media.registeredKey': string | undefined;
// src/agent/permissionMode/injection/permissionModeInjection.ts
'permissionMode.lastMode': 'manual' | 'yolo' | 'auto' | undefined;
'permissionMode.lastMode': 'manual' | 'auto' | 'yolo' | undefined;
// src/agent/permissionMode/permissionModeOps.ts
// replayable · durable — folds: PermissionSetMode
'permissionMode': /* PermissionMode — packages/agent-core-v2/src/agent/permissionPolicy/types.ts */ 'manual' | 'yolo' | 'auto';
'permissionMode': /* PermissionMode — packages/agent-core-v2/src/agent/permissionPolicy/types.ts */ 'manual' | 'auto' | 'yolo';
// replayable · durable — folds: PermissionSetMode
'permissionMode.configured': boolean;
// src/agent/permissionRules/permissionRulesOps.ts
Expand Down Expand Up @@ -1508,16 +1503,6 @@ export interface AgentStateSnapshot {
// replayable · durable · undoable — folds: ContextAppendMessage, TaskWaitDelivered
'task.notificationDelivery': readonly string[];
'task.scheduledNotificationKeys': Set<string>;
// src/agent/tokenCounting/tokenCountingOps.ts
// replayable · durable — folds: TokenCountingMeasured, TokenCountingTruncated, TokenCountingRebased, TokenCountingTurnRecorded
'tokenCounting': /* TokenCountingState — packages/agent-core-v2/src/agent/tokenCounting/tokenCountingOps.ts */ {
readonly anchors: readonly /* TokenAnchor — packages/agent-core-v2/src/agent/tokenCounting/tokenCountingOps.ts */ {
readonly length: number;
readonly tokens: number;
readonly measured: boolean;
}[];
readonly tokens: number;
};
// src/agent/toolDedupe/toolDedupeService.ts
'toolDedupe.activeStep': number;
'toolDedupe.activeTurnId': number | undefined;
Expand All @@ -1532,24 +1517,6 @@ export interface AgentStateSnapshot {
'toolExecutor.toolCallDupTypes': Map<string, /* ToolCallDupType — packages/agent-core-v2/src/agent/toolExecutor/toolExecutor.ts */ 'same_step' | 'cross_step'>;
// src/agent/toolSelect/toolSelectService.ts
'toolSelect.pendingLoaded': Set<string>;
// src/agent/usage/usageOps.ts
// replayable · durable — folds: UsageRecord
'usage': /* UsageModelState — packages/agent-core-v2/src/agent/usage/usageOps.ts */ {
readonly byModel: Record<string, /* TokenUsage — packages/agent-core-v2/src/kosong/contract/usage.ts */ {
inputOther: number;
output: number;
inputCacheRead: number;
inputCacheCreation: number;
}>;
};
// src/agent/usage/usageService.ts
'usage.currentTurn': /* TokenUsage — packages/agent-core-v2/src/kosong/contract/usage.ts */ {
inputOther: number;
output: number;
inputCacheRead: number;
inputCacheCreation: number;
} | undefined;
'usage.currentTurnId': number | undefined;
// src/agent/userTool/userToolOps.ts
// replayable · durable — folds: ToolsRegisterUserTool, ToolsUnregisterUserTool
'userTool': /* UserToolModelState — packages/agent-core-v2/src/agent/userTool/userToolOps.ts */ Map<string, /* UserToolRegistration — packages/agent-core-v2/src/agent/userTool/userTool.ts */ {
Expand Down Expand Up @@ -1601,17 +1568,11 @@ export interface AgentStateSnapshot {
readonly id: string;
readonly kind: /* InteractionKind — packages/agent-core-v2/src/session/interaction/interaction.ts */ 'approval' | 'question' | 'user_tool';
readonly toolCallId?: string;
readonly agentId?: string;
readonly agentId: string;
readonly request: unknown;
readonly resolved: boolean;
readonly response?: unknown;
}>;
// src/session/todo/todoOps.ts
// replayable · durable · undoable — folds: ToolsUpdateStore
'todo': readonly /* TodoItem — packages/agent-core-v2/src/session/todo/todoItem.ts */ {
readonly title: string;
readonly status: /* TodoStatus — packages/agent-core-v2/src/session/todo/todoItem.ts */ 'pending' | 'in_progress' | 'done';
}[];
}

export type AgentStateKey = keyof AgentStateSnapshot;
Loading
Loading