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
14 changes: 14 additions & 0 deletions packages/core/src/agents/agent-transcript.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import type {
AgentBootstrapRecordPayload,
ChatRecord,
} from '../services/chatRecordingService.js';
import type { SandboxConfig } from '../config/config.js';
import { createDebugLogger } from '../utils/debugLogger.js';
import { _recoverObjectsFromLine } from '../utils/jsonl-utils.js';
import type { FunctionDeclaration, Content } from '@google/genai';
Expand Down Expand Up @@ -108,6 +109,8 @@ export interface AgentMeta {
lastUpdatedAt?: string;
/** Resolved approval mode used when the agent was launched. */
resolvedApprovalMode?: string;
/** Launch-time CLI/runtime flags that should survive process restart. */
persistedCliFlags?: AgentPersistedCliFlags;
/** Canonical subagent config name used to recreate this agent. */
subagentName?: string;
/** UI hint preserved for resumed task rows. */
Expand All @@ -118,6 +121,17 @@ export interface AgentMeta {
lastError?: string;
}

export interface AgentPersistedCliFlags {
/** Mirrors resolvedApprovalMode; kept here so the restored flag set is explicit. */
approvalMode?: string;
bare?: boolean;
sandbox?: SandboxConfig | null;
screenReader?: boolean;
model?: string;
maxSessionTurns?: number;
maxToolCalls?: number;
}

/**
* Best-effort — a failed sidecar write must not break the agent launch path.
*/
Expand Down
93 changes: 93 additions & 0 deletions packages/core/src/agents/background-agent-resume.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ describe('BackgroundAgentResumeService', () => {
getHookSystem: () => hookSystem,
getStopHookBlockingCap: () => options.stopHookBlockingCap ?? 8,
getApprovalMode: () => 'default',
getModel: () => 'parent-model',
getBareMode: () => false,
getSandbox: () => undefined,
getScreenReader: () => false,
getMaxSessionTurns: () => -1,
getMaxToolCalls: () => -1,
isTrustedFolder: () => true,
getProjectRoot: () => tempDir,
getCliVersion: () => 'test-version',
Expand Down Expand Up @@ -843,6 +849,93 @@ describe('BackgroundAgentResumeService', () => {
expect(overriddenConfig.getApprovalMode()).toBe('default');
}, 20000);

it('restores persisted launch flags while resuming an agent', async () => {
const sessionId = 'session-cli-flags';
const agentId = 'agent-cli-flags';
const metaPath = getAgentMetaPath(tempDir, sessionId, agentId);
const outputFile = getAgentJsonlPath(tempDir, sessionId, agentId);

writeAgentMeta(metaPath, {
agentId,
agentType: 'researcher',
description: 'Resume with launch flags',
parentSessionId: sessionId,
parentAgentId: null,
createdAt: '2026-04-20T00:00:00.000Z',
status: 'running',
subagentName: 'researcher',
resolvedApprovalMode: 'auto-edit',
persistedCliFlags: {
approvalMode: 'auto-edit',
bare: true,
sandbox: { command: 'docker', image: 'qwen-code-sandbox' },
screenReader: true,
model: 'agent-model',
maxSessionTurns: 7,
maxToolCalls: 11,
},
});
fs.writeFileSync(
outputFile,
JSON.stringify({
uuid: 'u1',
parentUuid: null,
sessionId,
timestamp: '2026-04-20T00:00:00.000Z',
type: 'user',
message: { role: 'user', parts: [{ text: 'Resume with flags' }] },
}) + '\n',
'utf8',
);

registry.register({
agentId,
description: 'Resume with launch flags',
subagentType: 'researcher',
status: 'paused',
startTime: Date.now(),
abortController: new AbortController(),
prompt: 'Resume with launch flags',
outputFile,
metaPath,
isBackgrounded: true,
});

const createAgentHeadless = vi.fn().mockResolvedValue({
subagent: {
execute: vi.fn(async () => undefined),
setExternalMessageProvider: vi.fn(),
getCore: () => ({ getEventEmitter: () => new AgentEventEmitter() }),
getExecutionSummary: () => ({
totalTokens: 0,
totalDurationMs: 0,
}),
getTerminateMode: () => AgentTerminateMode.GOAL,
getFinalText: () => 'done',
},
dispose: vi.fn().mockResolvedValue(undefined),
});

const { service, subagentManager } = createService();
subagentManager.createAgentHeadless = createAgentHeadless;

const resumed = await service.resumeBackgroundAgent(agentId, 'continue');

expect(resumed).toBeDefined();
expect(createAgentHeadless).toHaveBeenCalledTimes(1);
const [, overriddenConfig] = createAgentHeadless.mock.calls[0]!;
expect(overriddenConfig.getApprovalMode()).toBe('auto-edit');
expect(overriddenConfig.getBareMode()).toBe(true);
expect(overriddenConfig.getSandbox()).toEqual({
command: 'docker',
image: 'qwen-code-sandbox',
});
expect(overriddenConfig.getScreenReader()).toBe(true);
expect(overriddenConfig.getModel()).toBe('agent-model');
expect(overriddenConfig.getMaxSessionTurns()).toBe(7);
expect(overriddenConfig.getMaxToolCalls()).toBe(11);
}, 20000);

it('coalesces concurrent resume calls into a single running agent', async () => {
const sessionId = 'session-double';
const agentId = 'agent-double';
Expand Down
6 changes: 5 additions & 1 deletion packages/core/src/agents/background-agent-resume.ts
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,10 @@ export class BackgroundAgentResumeService {
'default',
);
const resolvedApprovalMode = reconcileResumedApprovalMode(
normalizeApprovalMode(meta.resolvedApprovalMode, parentApprovalMode),
normalizeApprovalMode(
meta.resolvedApprovalMode ?? meta.persistedCliFlags?.approvalMode,
parentApprovalMode,
),
parentApprovalMode,
this.config.isTrustedFolder(),
);
Expand All @@ -576,6 +579,7 @@ export class BackgroundAgentResumeService {
await createApprovalModeOverride(
this.config,
resolvedApprovalMode as ApprovalMode,
{ persistedCliFlags: meta.persistedCliFlags },
);
// Mirror the launch path's permission-bubbling gate (agent.ts): an
// agent whose definition uses `approvalMode: bubble` surfaces
Expand Down
36 changes: 36 additions & 0 deletions packages/core/src/tools/agent/agent-override.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,42 @@ describe('createApprovalModeOverride bound-tool isolation', () => {
expect((childNonBareWrite as any).config).toBe(childNonBare);
});

it('applies persisted launch flags before rebuilding the child registry', async () => {
const parent = new Config({ ...baseParams, bareMode: false });
const parentRegistry = await parent.createToolRegistry(undefined, {
skipDiscovery: true,
});
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(parent as any).toolRegistry = parentRegistry;

const { config: child } = await createApprovalModeOverride(
parent,
ApprovalMode.AUTO_EDIT,
{
persistedCliFlags: {
bare: true,
sandbox: null,
screenReader: true,
model: 'agent-model',
maxSessionTurns: 7,
maxToolCalls: 11,
},
},
);

expect(child.getBareMode()).toBe(true);
expect(child.getSandbox()).toBeUndefined();
expect(child.getScreenReader()).toBe(true);
expect(child.getModel()).toBe('agent-model');
expect(child.getMaxSessionTurns()).toBe(7);
expect(child.getMaxToolCalls()).toBe(11);

await child.getToolRegistry().warmAll();
expect(child.getToolRegistry().getAllToolNames()).not.toContain(
ToolNames.WRITE_FILE,
);
});

describe('TOOL_REGISTRY_REBUILT marker propagation', () => {
// Reviewer raised a concern that
// `Object.prototype.hasOwnProperty.call(base, 'getToolRegistry')`
Expand Down
20 changes: 17 additions & 3 deletions packages/core/src/tools/agent/agent.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,12 @@ describe('AgentTool', () => {
getTeamManager: vi.fn().mockReturnValue(undefined),
isAgentTeamEnabled: vi.fn().mockReturnValue(false),
getApprovalMode: vi.fn().mockReturnValue('default'),
getModel: vi.fn().mockReturnValue('parent-model'),
getBareMode: vi.fn().mockReturnValue(false),
getSandbox: vi.fn().mockReturnValue(undefined),
getScreenReader: vi.fn().mockReturnValue(false),
getMaxSessionTurns: vi.fn().mockReturnValue(-1),
getMaxToolCalls: vi.fn().mockReturnValue(-1),
isTrustedFolder: vi.fn().mockReturnValue(true),
isInteractive: vi.fn().mockReturnValue(false),
isForkSubagentEnabled: vi.fn().mockReturnValue(false),
Expand Down Expand Up @@ -2758,6 +2764,15 @@ describe('AgentTool', () => {
status: 'running',
agentType: 'file-search',
description: 'Search files',
persistedCliFlags: expect.objectContaining({
approvalMode: 'auto-edit',
bare: false,
sandbox: null,
screenReader: false,
model: 'parent-model',
maxSessionTurns: -1,
maxToolCalls: -1,
}),
}),
);
// Finally block patches the sidecar to the terminal status —
Expand Down Expand Up @@ -2895,9 +2910,8 @@ describe('AgentTool', () => {

await invocation.execute();

const createCalls = vi.mocked(
mockSubagentManager.createAgentHeadless,
).mock.calls;
const createCalls = vi.mocked(mockSubagentManager.createAgentHeadless)
.mock.calls;
const createdConfig = createCalls[createCalls.length - 1][1] as Config;
expect(createdConfig.getShouldAvoidPermissionPrompts()).toBe(true);
});
Expand Down
62 changes: 62 additions & 0 deletions packages/core/src/tools/agent/agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ import {
attachJsonlTranscriptWriter,
patchAgentMeta,
writeAgentMeta,
type AgentPersistedCliFlags,
} from '../../agents/agent-transcript.js';
import { getGitBranch } from '../../utils/gitUtils.js';

Expand Down Expand Up @@ -379,6 +380,57 @@ export interface ApprovalModeOverrideHandle {
cleanup: () => void;
}

export interface ApprovalModeOverrideOptions {
persistedCliFlags?: AgentPersistedCliFlags;
}

function hasOwn(value: object, key: PropertyKey): boolean {
return Object.prototype.hasOwnProperty.call(value, key);
}

function applyPersistedCliFlagOverrides(
override: Config,
flags: AgentPersistedCliFlags | undefined,
): void {
if (!flags) return;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const ov = override as any;
if (flags.bare !== undefined) {
ov.getBareMode = () => flags.bare;
}
if (hasOwn(flags, 'sandbox')) {
const sandbox = flags.sandbox ?? undefined;
ov.getSandbox = () => sandbox;
}
if (flags.screenReader !== undefined) {
ov.getScreenReader = () => flags.screenReader;
}
if (flags.model !== undefined) {
ov.getModel = () => flags.model;
}
if (flags.maxSessionTurns !== undefined) {
ov.getMaxSessionTurns = () => flags.maxSessionTurns;
}
if (flags.maxToolCalls !== undefined) {
ov.getMaxToolCalls = () => flags.maxToolCalls;
}
}

function capturePersistedCliFlags(
config: Config,
resolvedApprovalMode: ApprovalMode,
): AgentPersistedCliFlags {
return {
approvalMode: resolvedApprovalMode,
bare: config.getBareMode(),
sandbox: config.getSandbox() ?? null,
screenReader: config.getScreenReader(),
model: config.getModel(),
maxSessionTurns: config.getMaxSessionTurns(),
maxToolCalls: config.getMaxToolCalls(),
};
}

/**
* Creates a Config override with a different approval mode.
*
Expand Down Expand Up @@ -411,10 +463,12 @@ export interface ApprovalModeOverrideHandle {
export async function createApprovalModeOverride(
base: Config,
mode: ApprovalMode,
options: ApprovalModeOverrideOptions = {},
): Promise<ApprovalModeOverrideHandle> {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const override = Object.create(base) as any;
override.getApprovalMode = (): ApprovalMode => mode;
applyPersistedCliFlagOverrides(override as Config, options.persistedCliFlags);
await rebuildToolRegistryOnOverride(override as Config, base);

let cleanup: () => void = () => {};
Expand Down Expand Up @@ -2306,6 +2360,10 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
status: 'running',
lastUpdatedAt: new Date().toISOString(),
resolvedApprovalMode,
persistedCliFlags: capturePersistedCliFlags(
this.config,
resolvedApprovalMode,
),
subagentName: subagentConfig.name,
agentColor: subagentConfig.color,
resumeCount: 0,
Expand Down Expand Up @@ -2854,6 +2912,10 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
status: 'running',
lastUpdatedAt: new Date().toISOString(),
resolvedApprovalMode,
persistedCliFlags: capturePersistedCliFlags(
this.config,
resolvedApprovalMode,
),
subagentName: subagentConfig.name,
agentColor: subagentConfig.color,
resumeCount: 0,
Expand Down
Loading