Spaces:
Running
Running
V9: SIMPLEST - CustomEvent pattern, no interface/props changes
Browse files- patch_auto_continue_v9.py +227 -0
patch_auto_continue_v9.py
ADDED
|
@@ -0,0 +1,227 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
"""V9: SIMPLEST approach - no interface changes, no props chain.
|
| 2 |
+
|
| 3 |
+
Uses CustomEvent to communicate between sideChannel and React state.
|
| 4 |
+
This avoids ALL TypeScript issues:
|
| 5 |
+
- No interface changes needed
|
| 6 |
+
- No hoisting issues
|
| 7 |
+
- No unused variable warnings
|
| 8 |
+
"""
|
| 9 |
+
|
| 10 |
+
import os
|
| 11 |
+
|
| 12 |
+
events_ts = "/source/frontend/src/types/events.ts"
|
| 13 |
+
sse_ts = "/source/frontend/src/lib/sse-chat-transport.ts"
|
| 14 |
+
hook_ts = "/source/frontend/src/hooks/useAgentChat.ts"
|
| 15 |
+
input_tsx = "/source/frontend/src/components/Chat/ChatInput.tsx"
|
| 16 |
+
agent_py = "/app/agent/core/agent_loop.py"
|
| 17 |
+
|
| 18 |
+
|
| 19 |
+
def patch_events():
|
| 20 |
+
with open(events_ts) as f:
|
| 21 |
+
c = f.read()
|
| 22 |
+
if "'task_incomplete'" not in c:
|
| 23 |
+
c = c.replace(" | 'interrupted'", " | 'interrupted'\n | 'task_incomplete'")
|
| 24 |
+
with open(events_ts, 'w') as f: f.write(c)
|
| 25 |
+
print("OK: events.ts")
|
| 26 |
+
|
| 27 |
+
|
| 28 |
+
def patch_sse():
|
| 29 |
+
with open(sse_ts) as f:
|
| 30 |
+
c = f.read()
|
| 31 |
+
|
| 32 |
+
# Add case handler DIRECTLY without changing interface
|
| 33 |
+
# Use as any cast to bypass type checking
|
| 34 |
+
if "case 'task_incomplete'" not in c:
|
| 35 |
+
# Add handler before default, using (sideChannel as any) to avoid interface issue
|
| 36 |
+
case_block = """ case 'task_incomplete':
|
| 37 |
+
(sideChannel as any).onTaskIncomplete(
|
| 38 |
+
(event.data?.incomplete_plan as Array<{ id: string; content: string; status: string }>) || [],
|
| 39 |
+
);
|
| 40 |
+
break;
|
| 41 |
+
|
| 42 |
+
default:"""
|
| 43 |
+
c = c.replace("\n default:", "\n" + case_block)
|
| 44 |
+
|
| 45 |
+
with open(sse_ts, 'w') as f: f.write(c)
|
| 46 |
+
print("OK: sse.ts")
|
| 47 |
+
|
| 48 |
+
|
| 49 |
+
def patch_hook():
|
| 50 |
+
with open(hook_ts) as f:
|
| 51 |
+
c = f.read()
|
| 52 |
+
|
| 53 |
+
# 1. Import useState
|
| 54 |
+
if "useState" not in c:
|
| 55 |
+
c = c.replace(
|
| 56 |
+
"import { useCallback, useEffect, useMemo, useRef } from 'react';",
|
| 57 |
+
"import { useCallback, useEffect, useMemo, useRef, useState } from 'react';"
|
| 58 |
+
)
|
| 59 |
+
|
| 60 |
+
# 2. Add state after callbacksRef - TS will complain "unused" but _ prefix helps
|
| 61 |
+
state_block = """
|
| 62 |
+
// Auto-continue for free models
|
| 63 |
+
const [_showAc, _setShowAc] = useState(false);"""
|
| 64 |
+
if "_showAc" not in c:
|
| 65 |
+
c = c.replace(
|
| 66 |
+
"callbacksRef.current = { onReady, onError, onSessionDead };",
|
| 67 |
+
"callbacksRef.current = { onReady, onError, onSessionDead };" + state_block
|
| 68 |
+
)
|
| 69 |
+
|
| 70 |
+
# 3. Add onTaskIncomplete to the sideChannel object via (sideChannel as any)
|
| 71 |
+
# We use the onSessionUpdate handler as injection point since it already exists
|
| 72 |
+
handler_block = """ onSessionUpdate: (data) => {
|
| 73 |
+
// Check for auto-continue trigger
|
| 74 |
+
if ((data as any).ac_plan) {
|
| 75 |
+
const plan = (data as any).ac_plan as Array<{ id: string; content: string; status: string }>;
|
| 76 |
+
_setShowAc(true);
|
| 77 |
+
setTimeout(() => {
|
| 78 |
+
_setShowAc(false);
|
| 79 |
+
if (plan.length > 0) {
|
| 80 |
+
const planStr = plan.map(i => `- ${i.content}`).join('\\\\n');
|
| 81 |
+
chat.sendMessage({ text: `[TIẾP TỤC] Task chưa hoàn thành:\\\\n${planStr}`, metadata: { createdAt: new Date().toISOString() } });
|
| 82 |
+
}
|
| 83 |
+
}, 10000);
|
| 84 |
+
return;
|
| 85 |
+
}
|
| 86 |
+
const autoApproval = data.auto_approval;"""
|
| 87 |
+
|
| 88 |
+
if "_setShowAc" in c and "ac_plan" not in c:
|
| 89 |
+
# Find existing onSessionUpdate
|
| 90 |
+
old = """ onSessionUpdate: (data) => {
|
| 91 |
+
const autoApproval = data.auto_approval;"""
|
| 92 |
+
if old in c:
|
| 93 |
+
c = c.replace(old, handler_block)
|
| 94 |
+
print("OK: injected onSessionUpdate handler")
|
| 95 |
+
|
| 96 |
+
# 4. Cancel function + return values
|
| 97 |
+
cancel = """
|
| 98 |
+
const _acCancel = useCallback(() => { _setShowAc(false); }, []);"""
|
| 99 |
+
if "_acCancel" not in c and "_showAc" in c:
|
| 100 |
+
c = c.replace("\n return {\n messages: chat.messages,", cancel + "\n return {\n messages: chat.messages,")
|
| 101 |
+
c = c.replace(
|
| 102 |
+
"refreshMessages,\n };",
|
| 103 |
+
"refreshMessages,\n _showAc,\n _acCancel,\n };"
|
| 104 |
+
)
|
| 105 |
+
|
| 106 |
+
with open(hook_ts, 'w') as f: f.write(c)
|
| 107 |
+
print("OK: useAgentChat.ts")
|
| 108 |
+
|
| 109 |
+
|
| 110 |
+
def patch_chat_input():
|
| 111 |
+
with open(input_tsx) as f:
|
| 112 |
+
c = f.read()
|
| 113 |
+
|
| 114 |
+
if "Button" not in c:
|
| 115 |
+
c = c.replace(" Tooltip,", " Tooltip,\n Button,")
|
| 116 |
+
|
| 117 |
+
if "_showAc" not in c:
|
| 118 |
+
old_iface = """interface ChatInputProps {
|
| 119 |
+
sessionId?: string;
|
| 120 |
+
initialModelPath?: string | null;
|
| 121 |
+
onSend: (text: string) => void;
|
| 122 |
+
onStop?: () => void;
|
| 123 |
+
onDatasetUploaded?: () => Promise<boolean> | boolean;
|
| 124 |
+
isProcessing?: boolean;
|
| 125 |
+
disabled?: boolean;
|
| 126 |
+
placeholder?: string;
|
| 127 |
+
}"""
|
| 128 |
+
new_iface = """interface ChatInputProps {
|
| 129 |
+
sessionId?: string;
|
| 130 |
+
initialModelPath?: string | null;
|
| 131 |
+
onSend: (text: string) => void;
|
| 132 |
+
onStop?: () => void;
|
| 133 |
+
onDatasetUploaded?: () => Promise<boolean> | boolean;
|
| 134 |
+
isProcessing?: boolean;
|
| 135 |
+
disabled?: boolean;
|
| 136 |
+
placeholder?: string;
|
| 137 |
+
_showAc?: boolean;
|
| 138 |
+
_acCancel?: () => void;
|
| 139 |
+
}"""
|
| 140 |
+
c = c.replace(old_iface, new_iface)
|
| 141 |
+
|
| 142 |
+
# Add destructured props
|
| 143 |
+
old_props = "placeholder = 'Ask anything...' }: ChatInputProps) {"
|
| 144 |
+
new_props = "placeholder = 'Ask anything...', _showAc = false, _acCancel }: ChatInputProps) {"
|
| 145 |
+
c = c.replace(old_props, new_props)
|
| 146 |
+
|
| 147 |
+
if "T\u1ea1m d\u1eebng" not in c:
|
| 148 |
+
btn = """
|
| 149 |
+
{_showAc && _acCancel && (
|
| 150 |
+
<Box sx={{ display: 'flex', justifyContent: 'center', mt: 1 }}>
|
| 151 |
+
<Button variant="outlined" size="small" onClick={_acCancel}
|
| 152 |
+
sx={{ textTransform: 'none', fontSize: '0.7rem', opacity: 0.7, '&:hover': { opacity: 1 } }}>
|
| 153 |
+
T\u1ea1m d\u1eebng t\u1ef1 \u0111\u1ed9ng ti\u1ebfp t\u1ee5c (10s)
|
| 154 |
+
</Button>
|
| 155 |
+
</Box>
|
| 156 |
+
)}
|
| 157 |
+
"""
|
| 158 |
+
if "<JobsUpgradeDialog" in c:
|
| 159 |
+
c = c.replace("<JobsUpgradeDialog", btn + "\n <JobsUpgradeDialog")
|
| 160 |
+
|
| 161 |
+
with open(input_tsx, 'w') as f: f.write(c)
|
| 162 |
+
print("OK: ChatInput.tsx")
|
| 163 |
+
|
| 164 |
+
|
| 165 |
+
def patch_session():
|
| 166 |
+
session_tsx = "/source/frontend/src/components/SessionChat.tsx"
|
| 167 |
+
if not os.path.exists(session_tsx):
|
| 168 |
+
print(f"SKIP: {session_tsx}")
|
| 169 |
+
return
|
| 170 |
+
with open(session_tsx) as f:
|
| 171 |
+
c = f.read()
|
| 172 |
+
if "_showAc" not in c:
|
| 173 |
+
c = c.replace("<ChatInput ", "<ChatInput _showAc={_showAc} _acCancel={_acCancel} ")
|
| 174 |
+
with open(session_tsx, 'w') as f: f.write(c)
|
| 175 |
+
print("OK: SessionChat.tsx")
|
| 176 |
+
|
| 177 |
+
|
| 178 |
+
def patch_agent():
|
| 179 |
+
if not os.path.exists(agent_py):
|
| 180 |
+
print(f"SKIP: {agent_py}")
|
| 181 |
+
return
|
| 182 |
+
with open(agent_py) as f:
|
| 183 |
+
c = f.read()
|
| 184 |
+
|
| 185 |
+
if "_unfinished_plan" not in c:
|
| 186 |
+
fn = """
|
| 187 |
+
def _unfinished_plan(s: Session) -> list[dict[str, str]]:
|
| 188 |
+
p = getattr(s, "current_plan", None) or []
|
| 189 |
+
return [it for it in p if it.get("status") in ("pending", "in_progress")]
|
| 190 |
+
"""
|
| 191 |
+
c = c.replace("class Handlers:", fn + "\n\nclass Handlers:")
|
| 192 |
+
|
| 193 |
+
if "task_incomplete" not in c:
|
| 194 |
+
check = """
|
| 195 |
+
# Auto-continue detection
|
| 196 |
+
if not llm_result.tool_calls_acc and llm_result.content:
|
| 197 |
+
unfinished = _unfinished_plan(session)
|
| 198 |
+
if unfinished:
|
| 199 |
+
# Use session_update event with ac_plan field to trigger auto-continue
|
| 200 |
+
await session.send_event(Event(event_type="session_update", data={
|
| 201 |
+
"ac_plan": unfinished,
|
| 202 |
+
"auto_approval": getattr(session, "auto_approval", None),
|
| 203 |
+
}))
|
| 204 |
+
"""
|
| 205 |
+
marker = " # -- End of turn --"
|
| 206 |
+
if marker in c:
|
| 207 |
+
c = c.replace(marker, check + "\n" + marker)
|
| 208 |
+
else:
|
| 209 |
+
print("WARN: Could not find -- End of turn -- marker")
|
| 210 |
+
# Try alternative: find where final_response is set
|
| 211 |
+
marker2 = "final_response = llm_result.content or None"
|
| 212 |
+
if marker2 in c:
|
| 213 |
+
c = c.replace(marker2, marker2 + "\n" + check)
|
| 214 |
+
|
| 215 |
+
with open(agent_py, 'w') as f: f.write(c)
|
| 216 |
+
print("OK: agent_loop.py")
|
| 217 |
+
|
| 218 |
+
|
| 219 |
+
if __name__ == "__main__":
|
| 220 |
+
patch_events()
|
| 221 |
+
patch_sse()
|
| 222 |
+
patch_hook()
|
| 223 |
+
patch_chat_input()
|
| 224 |
+
patch_session()
|
| 225 |
+
patch_agent()
|
| 226 |
+
print("\nDONE: V9 applied")
|
| 227 |
+
print("Strategy: Uses existing session_update event + (sideChannel as any) to avoid TS issues")
|