fix: remove merge conflict marker in runtime.py (#186)

yhjun1026 · web-flow · commit b547023e6f32 · 2026-03-30T20:05:19.000+08:00
diff --git a/packages/derisk-core/src/derisk/agent/core_v2/integration/runtime.py b/packages/derisk-core/src/derisk/agent/core_v2/integration/runtime.py
@@ -736,7 +736,6 @@ async def _execute_stream(
                     f"[_execute_stream] Injected interaction gateway into agent"
                 )
 
-<<<<<<< HEAD
             # 注入 GptsMemory（用于VIS推送）- backup in case _get_or_create_agent missed it
             if self.gpts_memory and hasattr(agent, "set_gpts_memory"):
                 if not getattr(agent, "_gpts_memory", None):

Original file line number	Diff line number	Diff line change
`@@ -736,7 +736,6 @@ async def _execute_stream(`
`736`	`736`	`f"[_execute_stream] Injected interaction gateway into agent"`
`737`	`737`	`)`
`738`	`738`
`739`		`-<<<<<<< HEAD`
`740`	`739`	`# 注入 GptsMemory（用于VIS推送）- backup in case _get_or_create_agent missed it`
`741`	`740`	`if self.gpts_memory and hasattr(agent, "set_gpts_memory"):`
`742`	`741`	`if not getattr(agent, "_gpts_memory", None):`