vrr/kimi-code
2
0
Fork 0
mirror of https://github.com/MoonshotAI/kimi-code.git synced 2026-08-25 00:27:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(flow): reject a flow activation while another run is active

Browse source 
Review round 37: activating /flow:<id> during an active run delivered
the new blueprint whose recovery instruction then collides with the
running flow (FlowStart reports the active run). Both activation
entry points now reject the request up front with a clear message to
finish or abort the current run first.
This commit is contained in:
Kaiyi 2026-08-19 13:18:52 +08:00
parent 912ee18183
commit afe78a26d4
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
packages/agent-core-v2/src/agent/skill/skillService.ts
View file

@ -29,6 +29,8 @@ import {
} from './skill';
import { SkillActivate, skillKey } from './skillOps';
import { ISkillActivationDataService } from './skillActivationData';
import { IFlagService } from '#/app/flag/flag';
import { FLOW_FLAG_ID, IAgentFlowService } from '#/features/flow/flow';
import { ISessionSkillCatalog } from '#/session/sessionSkillCatalog/skillCatalog';
import { IEventService } from '#/app/event/event';
import { IAgentScopeContext } from '#/agent/scopeContext/scopeContext';
@ -51,6 +53,8 @@ export class AgentSkillService extends Service implements IAgentSkillService {
@IAgentScopeContext private readonly scopeContext: IAgentScopeContext,
@IAgentStateService agentState: IAgentStateService,
@ISkillActivationDataService private readonly activationData: ISkillActivationDataService,
@IFlagService private readonly flags: IFlagService,
@IAgentFlowService private readonly flow: IAgentFlowService,
) {
super();
agentState.contributeState(skillKey);
@ -74,6 +78,7 @@ export class AgentSkillService extends Service implements IAgentSkillService {
`Flow skill "${skill.name}" can only be activated on the main agent`,
);
}
this.rejectWhileFlowRunActive(skill.metadata.type);
const skillArgs = input.args ?? '';
const skillContent = this.renderSkillPrompt(skill, skillArgs);
@ -147,6 +152,7 @@ export class AgentSkillService extends Service implements IAgentSkillService {
'Flow skills can only be activated on the main agent',
);
}
if (flowActivations.length > 0) this.rejectWhileFlowRunActive('flow');
if (this.scopeContext.agentId === MAIN_AGENT_ID) {
await applyPromptMetadataUpdate(
{
@ -245,6 +251,16 @@ export class AgentSkillService extends Service implements IAgentSkillService {
};
}
private rejectWhileFlowRunActive(skillType: string | undefined): void {
if (skillType !== 'flow') return;
if (!this.flags.enabled(FLOW_FLAG_ID)) return;
if (!this.flow.run().active) return;
throw new Error2(
ErrorCodes.REQUEST_INVALID,
'A flow run is already active in this session. Finish or abort it (FlowAbort) before starting another flow.',
);
}
private async recordActivation(
origin: SkillActivationOrigin,
input?: readonly ContentPart[],