Skip to content

fix: preserve typed RuntimeContext attributes in HarnessAgent #1462

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
wangdy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: preserve typed RuntimeContext attributes in HarnessAgent #1462

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
21 changes: 21 additions & 0 deletions agentscope-core/src/main/java/io/agentscope/core/agent/RuntimeContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,27 @@ public <T> Builder put(Class<T> type, T value) {
return this;
}

/**
* Copies singleton typed attributes from an existing {@link RuntimeContext}.
*
* <p>Only default-keyed typed values exposed via {@link RuntimeContext#get(Class)} are
* copied. Keyed typed entries are intentionally not included because the builder currently
* models singleton typed registrations only.
*/
public Builder typedFrom(RuntimeContext source) {
if (source == null || source.typedAttributes == null) {
return this;
}
for (Map.Entry<Class<?>, ConcurrentMap<String, Object>> e :
source.typedAttributes.entrySet()) {
Object value = e.getValue().get(TYPED_DEFAULT_KEY);
if (value != null) {
this.typedSingletons.put(e.getKey(), value);
}
}
return this;
}

/**
* Nests a {@link ToolExecutionContext} (e.g. agent builder-level tool DI) that will be
* visible at lower priority than runtime attributes in {@link #asToolExecutionContext()}.
Expand Down
15 changes: 15 additions & 0 deletions agentscope-core/src/test/java/io/agentscope/core/agent/RuntimeContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,21 @@ void typedAccess() {
assertNull(ctx.get(PojoA.class));
}

@Test
@DisplayName("builder typedFrom copies singleton typed attributes")
void builderTypedFromCopiesSingletonTypedAttributes() {
PojoA a = new PojoA("a");
PojoB keyed = new PojoB(7);
RuntimeContext source = RuntimeContext.builder().put(PojoA.class, a).build();
source.put("keyed", PojoB.class, keyed);

RuntimeContext copy = RuntimeContext.builder().put("extra", 42).typedFrom(source).build();

assertSame(a, copy.get(PojoA.class));
assertNull(copy.get("keyed", PojoB.class));
assertEquals(Integer.valueOf(42), copy.get("extra"));
}

@Test
@DisplayName("get(Class) for RuntimeContext returns the instance")
void selfTypedAccess() {
Expand Down
26 changes: 14 additions & 12 deletions agentscope-harness/src/main/java/io/agentscope/harness/agent/HarnessAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,25 +322,27 @@ private RuntimeContext ensureSessionDefaults(RuntimeContext ctx) {
sessionKey = SimpleSessionKey.of(delegate.getName());
}
}
SandboxContext callerSandbox = ctx.get(SandboxContext.class);
// Inject default sandbox context if the call doesn't provide one
SandboxContext sandboxCtx =
ctx.get(SandboxContext.class) != null
? ctx.get(SandboxContext.class)
: defaultSandboxContext;
SandboxContext sandboxCtx = callerSandbox != null ? callerSandbox : defaultSandboxContext;

if (session == ctx.getSession()
&& sessionKey == ctx.getSessionKey()
&& sandboxCtx == ctx.get(SandboxContext.class)) {
return ctx;
}
return RuntimeContext.builder()
.sessionId(ctx.getSessionId())
.userId(ctx.getUserId())
.session(session)
.sessionKey(sessionKey)
.putAll(ctx.getExtra())
.put(SandboxContext.class, sandboxCtx)
.build();
RuntimeContext.Builder builder =
RuntimeContext.builder()
.sessionId(ctx.getSessionId())
.userId(ctx.getUserId())
.session(session)
.sessionKey(sessionKey)
.putAll(ctx.getExtra())
.typedFrom(ctx);
if (callerSandbox == null && defaultSandboxContext != null) {
builder.put(SandboxContext.class, defaultSandboxContext);
}
return builder.build();
}

// ==================== Agent interface delegation ====================
Expand Down
45 changes: 45 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 @@ -36,15 +36,18 @@
import io.agentscope.core.session.Session;
import io.agentscope.core.tool.AgentTool;
import io.agentscope.core.tool.Toolkit;
import io.agentscope.harness.agent.example.support.InMemorySandboxFilesystemSpec;
import io.agentscope.harness.agent.filesystem.local.LocalFilesystem;
import io.agentscope.harness.agent.filesystem.spec.RemoteFilesystemSpec;
import io.agentscope.harness.agent.hook.SubagentsHook.SubagentEntry;
import io.agentscope.harness.agent.memory.compaction.CompactionConfig;
import io.agentscope.harness.agent.sandbox.SandboxDistributedOptions;
import io.agentscope.harness.agent.store.InMemoryStore;
import io.agentscope.harness.agent.subagent.AgentSpecLoader;
import io.agentscope.harness.agent.subagent.SubagentDeclaration;
import io.agentscope.harness.agent.subagent.WorkspaceMode;
import io.agentscope.harness.agent.workspace.WorkspaceConstants;
import java.lang.reflect.Method;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
Expand All @@ -63,6 +66,14 @@ class HarnessAgentTest {

@TempDir Path workspace;

private static final class HarnessContext {
final String value;

private HarnessContext(String value) {
this.value = value;
}
}

@Test
void workspaceAgentsMd_readableViaWorkspaceManager() throws Exception {
Files.createDirectories(workspace);
Expand Down Expand Up @@ -339,6 +350,40 @@ void remoteFilesystemSpec_sharesMemoryMdInNonsandboxMode() throws Exception {
store.get(List.of("agents", "agent-a", "users", "_default"), "/MEMORY.md") != null);
}

@Test
void ensureSessionDefaults_preservesTypedAttributesWhenInjectingDefaultSandbox()
throws Exception {
Files.createDirectories(workspace);
HarnessAgent agent =
HarnessAgent.builder()
.name("t")
.model(stubModel("ok"))
.workspace(workspace)
.filesystem(new InMemorySandboxFilesystemSpec())
.session(mock(Session.class))
.sandboxDistributed(
SandboxDistributedOptions.builder()
.requireDistributed(false)
.build())
.build();

HarnessContext typed = new HarnessContext("typed-value");
RuntimeContext input =
RuntimeContext.builder()
.sessionId("sid-typed")
.session(mock(Session.class))
.sessionKey(io.agentscope.core.state.SimpleSessionKey.of("sid-typed"))
.put(HarnessContext.class, typed)
.build();

Method method =
HarnessAgent.class.getDeclaredMethod("ensureSessionDefaults", RuntimeContext.class);
method.setAccessible(true);
RuntimeContext effective = (RuntimeContext) method.invoke(agent, input);

assertEquals("typed-value", effective.get(HarnessContext.class).value);
}

private static Msg userText(String text) {
return Msg.builder()
.role(MsgRole.USER)
Expand Down
Loading