QwenLM/qwen-code
1
0 Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2026-11-07 06:19:43 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix(managed-agent): repair merge fallout in runtime-broker compilation

Browse Source 
The e5dc52f conflict resolution moved the external-workspace
provisioning checks into RuntimeBindingProvisioning but dropped the
WorkspaceExecutionProfile import, and main's #16542 had tightened
releaseSavedSession to private while RuntimeDrainRelease still calls
it across the class boundary.

- RuntimeBindingProvisioning: restore the missing import
- RuntimeBrokerService: keep releaseSavedSession package-private so
  RuntimeDrainRelease can reach it

Co-authored-by: Qwen-Coder <[email protected]>
This commit is contained in:
yiliang114andQwen-Coder committed 2026-11-08 00:17:23 +08:00
1 parent e5dc52ffeb
commit aede9638ff
2 files changed
+2 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/managed-agent-server/runtime-broker/src/main/java/com/alibaba/qwen/code/runtimebroker/service/RuntimeBindingProvisioning.java
+1
View File
@@ -16,6 +16,7 @@ import com.alibaba.qwen.code.runtimebroker.RuntimeResourceHandle;
import com.alibaba.qwen.code.runtimebroker.RuntimeSessionRepository; import com.alibaba.qwen.code.runtimebroker.RuntimeSessionRepository;
import com.alibaba.qwen.code.runtimebroker.RuntimeTransport; import com.alibaba.qwen.code.runtimebroker.RuntimeTransport;
import com.alibaba.qwen.code.runtimebroker.ToolExecutionRepository; import com.alibaba.qwen.code.runtimebroker.ToolExecutionRepository;
import com.alibaba.qwen.code.runtimebroker.WorkspaceExecutionProfile;
import com.alibaba.qwen.code.runtimebroker.protocol.ExternalRuntimeKinds; import com.alibaba.qwen.code.runtimebroker.protocol.ExternalRuntimeKinds;
import com.alibaba.qwen.code.runtimebroker.service.RuntimeBindingRegistry.BindingContext; import com.alibaba.qwen.code.runtimebroker.service.RuntimeBindingRegistry.BindingContext;
import com.alibaba.qwen.code.runtimebroker.service.RuntimeBrokerService.BindingRenewal; import com.alibaba.qwen.code.runtimebroker.service.RuntimeBrokerService.BindingRenewal;
packages/managed-agent-server/runtime-broker/src/main/java/com/alibaba/qwen/code/runtimebroker/service/RuntimeBrokerService.java
+1 -1
View File
@@ -792,7 +792,7 @@ public final class RuntimeBrokerService implements AutoCloseable, RuntimeBrokerO
}).thenCompose(stage -> stage); }).thenCompose(stage -> stage);
} }
private CompletionStage<Void> releaseSavedSession(RuntimeBindingRecord binding, RuntimeSessionRecord record, CompletionStage<Void> releaseSavedSession(RuntimeBindingRecord binding, RuntimeSessionRecord record,
BindingRenewal renewal) { BindingRenewal renewal) {
return releaseSavedSession(binding, record, renewal, true); return releaseSavedSession(binding, record, renewal, true);
} }