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