Skip to content

fix(harness): inherit memory config in subagents #2611

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

Open
steven-ji wants to merge 1 commit into
base: main
Choose a base branch
from
+77 −0
Open

fix(harness): inherit memory config in subagents #2611

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
5 changes: 5 additions & 0 deletions agentscope-harness/src/main/java/io/agentscope/harness/agent/HarnessAgentBuilderSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import io.agentscope.harness.agent.filesystem.remote.store.NamespaceFactory;
import io.agentscope.harness.agent.filesystem.sandbox.SandboxBackedFilesystem;
import io.agentscope.harness.agent.filesystem.spec.LocalFilesystemSpec;
import io.agentscope.harness.agent.memory.MemoryConfig;
import io.agentscope.harness.agent.memory.compaction.CompactionConfig;
import io.agentscope.harness.agent.memory.compaction.ToolResultEvictionConfig;
import io.agentscope.harness.agent.middleware.DynamicSubagentsMiddleware;
Expand Down Expand Up @@ -289,6 +290,7 @@ static SubagentFactory buildGeneralPurposeFactory(
final ExecutionConfig capturedToolExec = b.toolExecutionConfig;
final GenerateOptions capturedGenOpts = b.generateOptions;
final String capturedEnvMemory = b.environmentMemory;
final MemoryConfig capturedMemoryConfig = b.memoryConfig;
final List<Hook> capturedHooks = List.copyOf(b.hooks);
final List<MiddlewareBase> capturedMiddlewares = List.copyOf(b.middlewares);
final List<AgentSkillRepository> capturedSkillRepos = List.copyOf(b.skillRepositories);
Expand Down Expand Up @@ -332,6 +334,7 @@ static SubagentFactory buildGeneralPurposeFactory(
.asLeafSubagent()
.maxIters(capturedMaxIters)
.environmentMemory(capturedEnvMemory)
.memory(capturedMemoryConfig)
.useLegacyXmlWorkspaceContext(capturedUseLegacyXmlWorkspaceContext)
.enableAgentTracingLog(capturedAgentTracingLogEnabled)
.maxContextTokens(capturedMaxContextTokens);
Expand Down Expand Up @@ -389,6 +392,7 @@ static SubagentFactory buildDeclaredFactory(
final List<MiddlewareBase> capturedMiddlewares = List.copyOf(b.middlewares);
final AbstractFilesystem capturedSharedBackend =
sandboxFs != null ? sandboxFs : b.abstractFilesystem;
final MemoryConfig capturedMemoryConfig = b.memoryConfig;
final boolean capturedUseLegacyXmlWorkspaceContext = b.useLegacyXmlWorkspaceContext;
final boolean capturedDisableFilesystemTools = b.disableFilesystemTools;
final boolean capturedDisableShellTool = b.disableShellTool;
Expand Down Expand Up @@ -450,6 +454,7 @@ static SubagentFactory buildDeclaredFactory(
.defaultSessionId(childSessionId)
.maxIters(decl.getSteps())
.asLeafSubagent()
.memory(capturedMemoryConfig)
.useLegacyXmlWorkspaceContext(capturedUseLegacyXmlWorkspaceContext)
.sysPrompt(buildSubagentSysPrompt(sysPromptBase));

Expand Down
72 changes: 72 additions & 0 deletions agentscope-harness/src/test/java/io/agentscope/harness/agent/HarnessAgentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -52,6 +53,7 @@
import io.agentscope.harness.agent.filesystem.local.LocalFilesystem;
import io.agentscope.harness.agent.filesystem.remote.store.InMemoryStore;
import io.agentscope.harness.agent.filesystem.spec.RemoteFilesystemSpec;
import io.agentscope.harness.agent.memory.MemoryConfig;
import io.agentscope.harness.agent.memory.compaction.CompactionConfig;
import io.agentscope.harness.agent.middleware.AgentTraceMiddleware;
import io.agentscope.harness.agent.middleware.SubagentEntry;
Expand Down Expand Up @@ -1109,6 +1111,45 @@ void declaredSubagent_inheritsExecutionConfigsFromParent() throws Exception {
"declared subagent must inherit parent modelExecutionConfig");
}

@Test
void declaredSubagent_honorsParentMemoryConfig() throws Exception {
Files.createDirectories(workspace);
Model model = stubModel("done");
MemoryConfig memoryConfig =
MemoryConfig.builder().flushTrigger(MemoryConfig.FlushTrigger.never()).build();
SubagentDeclaration declaration =
SubagentDeclaration.builder()
.name("memory-worker")
.description("declared worker")
.workspaceMode(WorkspaceMode.ISOLATED)
.inlineAgentsBody("You are a worker subagent.")
.build();

List<SubagentEntry> entries =
HarnessAgent.builder()
.model(model)
.workspace(workspace)
.memory(memoryConfig)
.subagent(declaration)
.buildSubagentEntries(workspace);

HarnessAgent child =
(HarnessAgent)
entries.stream()
.filter(e -> "memory-worker".equals(e.name()))
.findFirst()
.orElseThrow()
.factory()
.create(RuntimeContext.empty());

child.call(
userText("Remember this."),
RuntimeContext.builder().userId("user").sessionId("declared").build())
.block();

verify(model, times(1)).stream(anyList(), any(), any());
}

// =========================================================================
// general-purpose mirroring
// =========================================================================
Expand Down Expand Up @@ -1158,6 +1199,37 @@ void generalPurpose_mirrorCompactionConfig() throws Exception {
assertNotNull(child.getCompactionHook(), "CompactionHook should be mirrored to GP child");
}

@Test
void generalPurpose_honorsParentMemoryConfig() throws Exception {
Files.createDirectories(workspace);
Model model = stubModel("done");
MemoryConfig memoryConfig =
MemoryConfig.builder().flushTrigger(MemoryConfig.FlushTrigger.never()).build();

List<SubagentEntry> entries =
HarnessAgent.builder()
.model(model)
.workspace(workspace)
.memory(memoryConfig)
.buildSubagentEntries(workspace);

HarnessAgent child =
(HarnessAgent)
entries.stream()
.filter(e -> "general-purpose".equals(e.name()))
.findFirst()
.orElseThrow()
.factory()
.create(RuntimeContext.empty());

child.call(
userText("Remember this."),
RuntimeContext.builder().userId("user").sessionId("gp").build())
.block();

verify(model, times(1)).stream(anyList(), any(), any());
}

// =========================================================================
// Multiple declarations → same definition workspace
// =========================================================================
Expand Down
Loading