@brandon_9527/tcode 1.0.2 → 1.0.3

package/dist/python-src/src/stream/handler_with_tracker.py

@@ -59,17 +59,17 @@ async def astream_handler(stream,emitter,tracker,debug=False):
 			else:A=B
 			if F:Y=type(A).__name__;print(f"[DEBUG] Event: {Y}")
 			if isinstance(A,(AIMessageChunk,AIMessage)):
-				for C in bp(A,E,J,S):
+				for C in bn(A,E,J,S):
 					if C.type==_J:R+=C.data.get(_C,'')
 					if F:print(f"[DEBUG] Yielding: {C.type}")
 					yield C.data
 				if hasattr(A,_Y)and A.tool_calls:
-					for C in bq(A.tool_calls,E,J):
+					for C in bo(A.tool_calls,E,J):
 						if F:print(f"[DEBUG] Yielding from tool_calls: {C.type} took call: {A.tool_calls}")
 						yield C.data
 			elif hasattr(A,_B)and A.type=='tool':
 				if F:I=getattr(A,_A,_L);print(f"[DEBUG] Processing tool result: {I}")
-				for C in bn(A,E,J):
+				for C in bp(A,E,J):
 					if F:print(f"[DEBUG] Yielding: {C.type}")
 					yield C.data
 		elif K==_Z:
@@ -99,17 +99,17 @@ def stream_handler(stream,emitter,tracker,debug=False):
 			else:A=B
 			if F:Y=type(A).__name__;print(f"[DEBUG] Event: {Y}")
 			if isinstance(A,(AIMessageChunk,AIMessage)):
-				for C in bp(A,E,J,S):
+				for C in bn(A,E,J,S):
 					if C.type==_J:R+=C.data.get(_C,'')
 					if F:print(f"[DEBUG] Yielding: {C.type}")
 					yield C.data
 				if hasattr(A,_Y)and A.tool_calls:
-					for C in bq(A.tool_calls,E,J):
+					for C in bo(A.tool_calls,E,J):
 						if F:print(f"[DEBUG] Yielding from tool_calls: {C.type}")
 						yield C.data
 			elif hasattr(A,_B)and A.type=='tool':
 				if F:I=getattr(A,_A,_L);print(f"[DEBUG] Processing tool result: {I}")
-				for C in bn(A,E,J):
+				for C in bp(A,E,J):
 					if F:print(f"[DEBUG] Yielding: {C.type}")
 					yield C.data
 		elif K==_Z:
@@ -117,7 +117,7 @@ def stream_handler(stream,emitter,tracker,debug=False):
 			if O==_N:yield E.tool_call(I,Z,Q,P)
 			elif O==_e:yield E.tool_result(I,a,b,Q,P)
 		if F:print(_f)
-def bp(chunk,emitter,tracker,stream_parser):
+def bn(chunk,emitter,tracker,stream_parser):
 	U='index';T='tool_use';S='reasoning';R='thinking';L='write_file';K=stream_parser;J=chunk;I=emitter;E=tracker;C=J.content
 	if isinstance(C,str):
 		if C:yield I.text(C);return
@@ -160,19 +160,19 @@ def bp(chunk,emitter,tracker,stream_parser):
 				E.append_json_delta(H,A.get(U,0))
 				if D==L:K.feed(H)
 			if D==L and H=='':K.reset()
-def bo(block,emitter,tracker):
+def bq(block,emitter,tracker):
 	C=tracker;B=block;A=B.get(_K,'')
 	if A:
 		D=B.get(_A,'');E=B.get('input',{});F=E if isinstance(E,dict)else{};C.update(A,name=D,args=F)
 		if C.is_ready(A):C.mark_emitted(A);yield emitter.tool_call(D,F,A)
-def bq(tool_calls,emitter,tracker):
+def bo(tool_calls,emitter,tracker):
 	B=tracker
 	for C in tool_calls:
 		A=C.get(_K,'')
 		if A:
 			D=C.get(_A,'');E=C.get(_F,{});F=E if isinstance(E,dict)else{};B.update(A,name=D,args_complete=True)
 			if B.is_ready(A):B.mark_emitted(A);yield emitter.tool_call(D,F,A)
-def bn(chunk,emitter,tracker):
+def bp(chunk,emitter,tracker):
 	E=tracker;D=emitter;A=chunk;E.finalize_all()
 	for B in E.get_all():yield D.tool_call(B.name,B.args,B.id)
 	G=getattr(A,_A,_L);F=str(getattr(A,_C,''));I=getattr(A,'tool_call_id','');J=getattr(A,_M,'success');C=F[:DisplayLimits.TOOL_RESULT_MAX]

package/dist/python-src/src/tools/web.py

@@ -8,11 +8,12 @@ import os
 import requests
 from bs4 import BeautifulSoup
 from ddgs import DDGS
-from ddgs.exceptions import DDGSException
 from langchain.tools import tool, ToolRuntime
 from pydantic import BaseModel
 
 sys.path.append(os.getcwd())
+import logging
+logging.getLogger("ddgs").setLevel(logging.ERROR)
 
 
 
@@ -46,7 +47,9 @@ def web_search(query: str, max_results: int = 3, runtime: ToolRuntime = None) ->
 
         max_results = max(1, min(max_results, 10))  # Clamp between 1 and 10
 
+        # ddgs = DDGS()
         ddgs = DDGS()
+        
         results_list = list(ddgs.text(query, max_results=max_results))
 
         if not results_list:
@@ -61,8 +64,6 @@ def web_search(query: str, max_results: int = 3, runtime: ToolRuntime = None) ->
 
         return "\n\n".join(results)
 
-    except DDGSException as e:
-        return f"Search failed: {str(e)}"
     except Exception as e:
         return f"Search error: {str(e)}"
 
@@ -148,10 +149,10 @@ if __name__ == "__main__":
     search_result = web_search.invoke({"query": "LangChain v1.0 documentation", "max_results": 5})
     print(search_result)
 
-    # 示例2：调用网页内容获取工具
-    fetch_result = web_fetch.invoke({
-        "url": "https://python.langchain.com/docs/get_started/introduction",
-        "prompt": "Extract key features of LangChain v1.0"
-    })
-    print(fetch_result)
+    # # 示例2：调用网页内容获取工具
+    # fetch_result = web_fetch.invoke({
+    #     "url": "https://python.langchain.com/docs/get_started/introduction",
+    #     "prompt": "Extract key features of LangChain v1.0"
+    # })
+    # print(fetch_result)
     # pass

package/dist/python-src/src/tui/chatui.py

@@ -1,11 +1,12 @@
-_K='custom'
-_J='updates'
-_I='thread_id'
-_H='configurable'
-_G='class:status'
-_F='messages'
-_E='class:footer'
-_D='auto'
+_L='custom'
+_K='updates'
+_J='thread_id'
+_I='configurable'
+_H='class:status'
+_G='messages'
+_F='class:footer'
+_E='auto'
+_D='description'
 _C=False
 _B=True
 _A=None
@@ -23,6 +24,7 @@ from prompt_toolkit.layout.dimension import D
 from prompt_toolkit.document import Document
 from prompt_toolkit.styles import Style
 from prompt_toolkit import Application
+from prompt_toolkit.output import create_output
 from rich.markdown import Markdown
 from rich.columns import Columns
 from rich.markup import render
@@ -40,12 +42,12 @@ from src.tui.utils.trender import display_tool_call,display_tool_result,display_
 from langchain_core.messages import HumanMessage
 from langgraph.types import Command
 from dotenv import find_dotenv,load_dotenv
-c=load_dotenv(find_dotenv())
+b=load_dotenv(find_dotenv())
 class LiveChatUI:
-	def __init__(A,agent=_A,saver=_A,workspace=_A,**E):B='#afafff';A.agent=agent;A.saver=saver;A.kwargs=E;A.workspace=re.sub('^(\\/Users\\/[^/]+|\\/home\\/[^/]+)','~',workspace);A.thread_id=1;A.token_count=0;A.mode=_D;A.context=E.get('context',_A);A.spinner=Spinner('block');A.max_input_lines=10;A.cancel_event=_A;A.logo_label=Label(LOGO.format(A.workspace),style='class:logo');A.begin_items=[A.logo_label];A.begin_area=HSplit([*A.begin_items],padding=1);A.log_control=ScrollableFormattedLogControl();A.output_area=Window(content=A.log_control,wrap_lines=_B,always_hide_cursor=_C,height=D(weight=1));A.status_label=FormattedTextControl(text=[(_G,' 状态: 等待输入 | Tokens: 0 （⌥ + ⏎ 换行  Esc 中断 ctrl + c 退出）')]);F=FormattedTextControl(text=[('class:spinner',f"{A.spinner.current_frame()}")],show_cursor=_C);G=FormattedTextControl(text=[(_E,f"mode: {A.mode}")]);A.status_bar=VSplit([Window(F,width=D(weight=5),dont_extend_width=_B,dont_extend_height=_B,height=D(weight=1)),Window(A.status_label,width=D(weight=85),height=D(weight=1)),Window(G,width=D(weight=10),dont_extend_width=_B,dont_extend_height=_B,height=D(weight=1))],width=D(weight=100));A.input_box=TextArea(height=1,prompt='> ',multiline=_B,wrap_lines=_B,scrollbar=_B,style='class:input_box');A.input_box.buffer.on_text_changed+=lambda _:A.update_input_area_height(c);A.kb=KeyBindings();A.a();H=Frame(body=A.input_box,style='class:frame');A.input_items=[A.status_bar,H];A.input_area=HSplit([*A.input_items],padding=0);A.interact_items=[];A.interact_area=HSplit([*A.interact_items],padding=1);C=_E;A.footer=VSplit([Window(FormattedTextControl([(C,f"{A.workspace} (main) ")]),width=D(weight=50)),Window(FormattedTextControl([(C,f"MCP: (0/0) ")]),width=D(weight=20)),Window(FormattedTextControl([(C,'Env: (local) ')]),width=D(weight=20)),Window(FormattedTextControl([(C,f"Model: kimi-k2-0711-preview ")]),wrap_lines=_B,dont_extend_width=_C,always_hide_cursor=_B,width=D(weight=10))],width=D(weight=100),height=1);A.suggest_items=[A.footer];A.suggest_area=HSplit([*A.suggest_items],padding=0);A.logo_area=DynamicContainer(lambda:A.begin_area);A.display_container=DynamicContainer(lambda:A.output_area);A.input_container=DynamicContainer(lambda:A.input_area);A.status_area=DynamicContainer(lambda:A.suggest_area);A.layout=Layout(HSplit([A.logo_area,A.output_area,A.interact_area,A.input_container,A.status_area],padding=0),focused_element=A.input_box);A.style=Style.from_dict({'logo':B,'output':B,'input_box':B,'status':B,'frame.border':B,'suggestions':B,'footer':B,'suggestion.label':B,'suggestion.desc':'#5f5f5f','spinner':B,'suggestion.selected':'bold #00afff'});A.app=Application(layout=A.layout,key_bindings=A.kb,style=A.style,full_screen=_C,mouse_support=_B);A.app.input_area=A.input_box;A.app.kb=A.kb;A.interrupt_tools=['bash','read_file','write_file','glob','grep','edit','list_dir','web_search','web_fetch'];A.toolcall_mode='manul'
-	def d(A,role='user',spinner='●',status='',tokens=0):A.status_label.text=[(_G,f" 状态: {status} | ({role}) | Tokens: {tokens} (esc + ⏎ 换行 按两次 esc 中断 ctrl + c 退出）")];A.app.invalidate()
-	def b(A,workspace=_A,mcp_status=_A,sandbox_status=_A,model_status=_A):
-		F=model_status;E=sandbox_status;D=mcp_status;C=workspace;B=_E
+	def __init__(A,agent=_A,saver=_A,workspace=_A,**C):B='#afafff';A.agent=agent;A.saver=saver;A.kwargs=C;A.workspace=re.sub('^(\\/Users\\/[^/]+|\\/home\\/[^/]+)','~',workspace);A.thread_id=1;A.token_count=0;A.mode=_E;A.context=C.get('context',_A);A.instruction_manager=C.get('instruction_manager',_A);A.spinner=Spinner('block');A.max_input_lines=10;A.cancel_event=_A;A.logo_label=Label(LOGO.format(A.workspace),style='class:logo');A.begin_items=[A.logo_label];A.begin_area=HSplit([*A.begin_items],padding=1);A.log_control=ScrollableFormattedLogControl();A.output_area=Window(content=A.log_control,wrap_lines=_B,always_hide_cursor=_C,height=D(weight=1));A.status_label=FormattedTextControl(text=[(_H,' 状态: 等待输入 | Tokens: 0 （⌥ + ⏎ 换行  Esc 中断 ctrl + c 退出）')]);F=FormattedTextControl(text=[('class:spinner',f"{A.spinner.current_frame()}")],show_cursor=_C);G=FormattedTextControl(text=[(_F,f"mode: {A.mode}")]);A.status_bar=VSplit([Window(F,width=D(weight=5),dont_extend_width=_B,dont_extend_height=_B,height=D(weight=1)),Window(A.status_label,width=D(weight=85),height=D(weight=1)),Window(G,width=D(weight=10),dont_extend_width=_B,dont_extend_height=_B,height=D(weight=1))],width=D(weight=100));A.input_box=TextArea(height=1,prompt='> ',multiline=_B,wrap_lines=_B,scrollbar=_B,style='class:input_box');A.input_box.buffer.on_text_changed+=lambda _:A.update_input_area_height(b);A.kb=KeyBindings();A.a();H=Frame(body=A.input_box,style='class:frame');A.input_items=[A.status_bar,H];A.input_area=HSplit([*A.input_items],padding=0);A.interact_items=[];A.interact_area=HSplit([*A.interact_items],padding=1);E=_F;A.footer=VSplit([Window(FormattedTextControl([(E,f"{A.workspace} (main) ")]),width=D(weight=50)),Window(FormattedTextControl([(E,f"MCP: (0/0) ")]),width=D(weight=20)),Window(FormattedTextControl([(E,'Env: (local) ')]),width=D(weight=20)),Window(FormattedTextControl([(E,f"Model: kimi-k2-0711-preview ")]),wrap_lines=_B,dont_extend_width=_C,always_hide_cursor=_B,width=D(weight=10))],width=D(weight=100),height=1);A.suggest_items=[A.footer];A.suggest_area=HSplit([*A.suggest_items],padding=0);A.logo_area=DynamicContainer(lambda:A.begin_area);A.display_container=DynamicContainer(lambda:A.output_area);A.input_container=DynamicContainer(lambda:A.input_area);A.status_area=DynamicContainer(lambda:A.suggest_area);A.layout=Layout(HSplit([A.logo_area,A.output_area,A.interact_area,A.input_container,A.status_area],padding=0),focused_element=A.input_box);A.style=Style.from_dict({'logo':B,'output':B,'input_box':B,'status':B,'frame.border':B,'suggestions':B,'footer':B,'suggestion.label':B,'suggestion.desc':'#5f5f5f','spinner':B,'suggestion.selected':'bold #00afff'});I=create_output();A.app=Application(layout=A.layout,key_bindings=A.kb,style=A.style,output=I,full_screen=_C,mouse_support=_B);A.app.input_area=A.input_box;A.app.kb=A.kb;A.interrupt_tools=C.get('interrupt_tools',[]);A.toolcall_mode='manul'
+	def c(A,role='user',spinner='●',status='',tokens=0):A.status_label.text=[(_H,f" 状态: {status} | ({role}) | Tokens: {tokens} (esc + ⏎ 换行 按两次 esc 中断 ctrl + c 退出）")];A.app.invalidate()
+	def e(A,workspace=_A,mcp_status=_A,sandbox_status=_A,model_status=_A):
+		F=model_status;E=sandbox_status;D=mcp_status;C=workspace;B=_F
 		if C is not _A:A._footer_workspace.text=[(B,f"{C}(main) ")]
 		if D is not _A:A._footer_context.text=[(B,f"{D} ")]
 		if E is not _A:A._footer_env.text=[(B,f"Env: {E} ")]
@@ -72,65 +74,79 @@ class LiveChatUI:
 		def B(event):
 			if A.cancel_event:A.cancel_event.set()
 	async def _handle_submit(A,text,context=_A):
-		D='light_steel_blue';C=text;B=context
-		if A.logo_label in A.begin_items:A.begin_items.remove(A.logo_label);A.begin_area.children=list(A.begin_items);E=render_info(LOGO.format(A.workspace),style=D,markdown=_C);A.log_control.append_text(E);A.app.invalidate()
-		if C.strip()in['quit','exit','q']:get_app().exit();return
-		if C.strip()in['/clear','clear']:A.clear();return
-		A.spinner.start();A.e('● user',f"● {C}",style='light_salmon3');await asyncio.sleep(.05);B=A.context if B is _A else B;F=await A._handle_stream('○ bot',A._stream_generate(C,B),style=D,markdown=_B,context=B);A.spinner.stop();A.d(spinner='',status='等待输入',tokens=A.token_count);A.app.layout.focus(A.input_box);return F
-	def e(A,sender,message,style='green',markdown=_C):D=markdown;C=style;B=message;E=Markdown(B)if D else Text(B,style=C);F=render_panel(sender,E,C,D);A.log_control.append_text(F);A.app.invalidate()
+		D='light_steel_blue';C=context;B=text
+		if A.logo_label in A.begin_items:A.begin_items.remove(A.logo_label);A.begin_area.children=list(A.begin_items);J=render_info(LOGO.format(A.workspace),style=D,markdown=_C);A.log_control.append_text(J);A.app.invalidate()
+		if B.strip()in['quit','exit','q']:get_app().exit();return
+		if B.strip()in['/clear','clear']:A.clear();return
+		A.spinner.start();A.d('● user',f"● {B}",style='light_salmon3');await asyncio.sleep(.05)
+		if B.strip()in['/commands']and A.instruction_manager:
+			E=[]
+			for F in A.instruction_manager.list_instructions():E.append(f"/{F.name}: - {F.settings[_D]}")
+			K='\n'.join(E);A.d('● bot',K,style=D,markdown=_B);return
+		if A.instruction_manager:G=A.instruction_manager.parse(B);H,I=G['executed_instruction'],G['message'];B=f"""
+ [注意]: 执行用户请求必须严格遵循如下准则:
+{H}
+
+ 用户请求:
+{I}"""if H else I
+		C=A.context if C is _A else C;L=await A._handle_stream('○ bot',A._stream_generate(B,C),style=D,markdown=_B,context=C);A.spinner.stop();A.c(spinner='',status='等待输入',tokens=A.token_count);A.app.layout.focus(A.input_box);return L
+	def d(A,sender,message,style='green',markdown=_C):D=markdown;C=style;B=message;E=Markdown(B)if D else Text(B,style=C);F=render_panel(sender,E,C,D);A.log_control.append_text(F);A.app.invalidate()
 	async def _stream_generate(A,prompt,context=_A):
-		B=A.agent.astream({_F:[HumanMessage(content=prompt)]},config={_H:{_I:A.thread_id}},stream_mode=[_F,_J,_K],context=context);A.cancel_event=asyncio.Event()
+		B=A.agent.astream({_G:[HumanMessage(content=prompt)]},config={_I:{_J:A.thread_id}},stream_mode=[_G,_K,_L],context=context);A.cancel_event=asyncio.Event()
 		async for C in astream_handler(B,interrupt_tools=A.interrupt_tools,tool_mode=A.toolcall_mode):
 			if A.cancel_event and A.cancel_event.is_set():A.cancel_event.clear();A.cancel_event=_A;return
 			yield C
 	async def _resume_generate(A,interrupt_id,decisions,context=_A):
-		B=A.agent.astream(Command(resume={interrupt_id:{'decisions':decisions}}),config={_H:{_I:A.thread_id}},stream_mode=[_F,_J,_K],context=context);A.cancel_event=asyncio.Event()
+		B=A.agent.astream(Command(resume={interrupt_id:{'decisions':decisions}}),config={_I:{_J:A.thread_id}},stream_mode=[_G,_K,_L],context=context);A.cancel_event=asyncio.Event()
 		async for C in astream_handler(B,interrupt_tools=A.interrupt_tools,tool_mode=A.toolcall_mode):
 			if A.cancel_event and A.cancel_event.is_set():A.cancel_event.clear();A.cancel_event=_A
 			yield C
 	async def _handle_stream(D,sender,stream,style='green',markdown=_C,items=_A,context=_A):
-		n='value';m='parent_id';j=context;i='label';h='tool_result';g='text';f='thinking';d=markdown;c=style;b=sender;a='description';Z='success';Y='tool_call';P='args';O='name';I='type';G='content';A=items;Q,U='','';u=A is not _A
-		if A is _A:D.log_control.append_text(render_panel(b,'',c,d))
+		m='value';l='parent_id';i=context;h='label';g='tool_result';f='text';e='thinking';c=markdown;b=style;a=sender;Z='success';Y='tool_call';P='args';O='name';J='type';G='content';A=items;Q,V='','';t=A is not _A
+		if A is _A:D.log_control.append_text(render_panel(a,'',b,c))
 		A=A if A else[]
 		async for B in stream:
-			if B[I]==f:
-				if len(A)>0 and A[-1][1]==f:U+=B[G];J=markdown_to_wrapped_text(U);A[-1][0]=J
-				else:U=B[G];J=markdown_to_wrapped_text(U);A.append([J,f,_A,B,[]])
-			elif B[I]==g:
-				if len(A)>0 and A[-1][1]==g:Q+=B[G];J=markdown_to_wrapped_text(f"{Q}");A[-1][0]=J
-				else:Q=B[G];J=markdown_to_wrapped_text(f"{Q}");A.append([J,g,_A,B,[]])
-			elif B[I]=='token_usage':v=B['input_toks'];w=B['output_toks'];o=B['total_toks'];D.token_count=o
-			elif B[I]==Y:
-				V=B[O];W=B[P];H=B['id'];K=B[m]
-				if K is _A:F=display_tool_call(V,W,[]);A.append([F,Y,H,B,[]]);A.append([Text('',''),'margin',_A,_A,[]])
+			if B[J]==e:
+				if len(A)>0 and A[-1][1]==e:V+=B[G];K=markdown_to_wrapped_text(V);A[-1][0]=K
+				else:V=B[G];K=markdown_to_wrapped_text(V);A.append([K,e,_A,B,[]])
+			elif B[J]==f:
+				if len(A)>0 and A[-1][1]==f:Q+=B[G];K=markdown_to_wrapped_text(f"{Q}");A[-1][0]=K
+				else:Q=B[G];K=markdown_to_wrapped_text(f"{Q}");A.append([K,f,_A,B,[]])
+			elif B[J]=='token_usage':u=B['input_toks'];v=B['output_toks'];n=B['total_toks'];D.token_count=n
+			elif B[J]==Y:
+				R=B[O];W=B[P];H=B['id'];I=B[l]
+				if I is _A:F=display_tool_call(R,W,[]);A.append([F,Y,H,B,[]]);A.append([Text('',''),'margin',_A,_A,[]])
 				else:
-					C=index_(A,lambda x:x[2]==K and x[1]==Y)
+					C=index_(A,lambda x:x[2]==I and x[1]==Y)
 					if C is _A:continue
-					print(C);E=A[C];R=E[3][O];S=E[3][P];A[C][-1].append([_A,Y,H,B,[]]);F=display_tool_call(R,S,A[C][-1]);A[C][0]=F
-			elif B[I]==h:
-				V=B[O];H=B['id'];K=B[m];L=index_(A,lambda x:x[2]==H);p=A[L][3];W=p[P];X=B[Z]
+					E=A[C];S=E[3][O];T=E[3][P];A[C][-1].append([_A,Y,H,B,[]]);F=display_tool_call(S,T,A[C][-1]);A[C][0]=F
+			elif B[J]==g:
+				R=B[O];H=B['id'];I=B[l]
+				try:L=index_(A,lambda x:x[2]==H);o=A[L][3]
+				except Exception:D.log_control.append_text(f"[DEBUG] tool_result: {R}, {H}, {I}")
+				W=o[P];X=B[Z]
 				if X==Z:
-					if K is _A:T=B[G];F=display_tool_result(V,W,T,A[L][-1]);A[L]=[F,h,H,B,A[L][-1]]
+					if I is _A:U=B[G];F=display_tool_result(R,W,U,A[L][-1]);A[L]=[F,g,H,B,A[L][-1]]
 					else:
-						C=index_(A,lambda x:x[2]==K)
+						C=index_(A,lambda x:x[2]==I)
 						if C is _A:continue
-						E=A[C];R=E[3][O];S=E[3][P];M=index_(E[-1],lambda x:x[2]==H)
+						E=A[C];S=E[3][O];T=E[3][P];M=index_(E[-1],lambda x:x[2]==H)
 						if M is _A:continue
-						N=E[-1][M];N[Z]=X;N[G]=B[G];A[C][-1][M]=N;F=display_tool_result(R,S,T,A[C][-1]);A[C][0]=F
+						N=E[-1][M];N[3][Z]=X;N[3][G]=B[G];A[C][-1][M]=N;F=display_tool_result(S,T,U,A[C][-1]);A[C][0]=F
 				elif X=='error':
-					if K is _A:T=B[G];F=display_tool_error(V,W,T,A[L][-1]);A[L]=[F,h,H,B,A[L][-1]]
+					if I is _A:U=B[G];F=display_tool_error(R,W,U,A[L][-1]);A[L]=[F,g,H,B,A[L][-1]]
 					else:
-						C=index_(A,lambda x:x[2]==K)
+						C=index_(A,lambda x:x[2]==I)
 						if C is _A:continue
-						E=A[C];R=E[3][O];S=E[3][P];M=index_(E[-1],lambda x:x[2]==H)
+						E=A[C];S=E[3][O];T=E[3][P];M=index_(E[-1],lambda x:x[2]==H)
 						if M is _A:continue
-						N=E[-1][M];N[Z]=X;N[G]=B[G];A[C][-1][M]=N;F=display_tool_error(R,S,T,A[C][-1]);A[C][0]=F
-			elif B[I]=='done':0
-			elif B[I]=='interrupt':
-				D.spinner.stop();k=[];q=B['interrupt_id']
-				for e in B[n][n]['action_requests']:x=e[O];y=e[P];z=e[a];r=await D._handle_human_interrupt(message=f" 允许执行当前函数么？ ",options=[{i:'是的，允许当前函数执行',a:''},{i:'是的，总是允许执行，当前对话过程中不再提示',a:''},{i:'不, 不允许当前函数执行',a:''}]);l=['approve',_D,'reject'][r];D.toolcall_mode=_D if l==_D else'manual';k.append({I:l})
-				D.spinner.start();await D._handle_stream(b,D._resume_generate(q,k,j),style=c,markdown=d,items=A,context=j);break
-			s=Columns([A[0]for A in A],column_first=_B,expand=_B);D.log_control.update_last(render_panel(b,s,c,d));D.app.invalidate();await asyncio.sleep(.03);t='';D.d(spinner=t,status='正在生成 ...',tokens=D.token_count)
+						N=E[-1][M];N[Z]=X;N[G]=B[G];A[C][-1][M]=N;F=display_tool_error(S,T,U,A[C][-1]);A[C][0]=F
+			elif B[J]=='done':0
+			elif B[J]=='interrupt':
+				D.spinner.stop();j=[];p=B['interrupt_id']
+				for d in B[m][m]['action_requests']:w=d[O];x=d[P];y=d[_D];q=await D._handle_human_interrupt(message=f" 允许执行当前函数么？ ",options=[{h:'是的，允许当前函数执行',_D:''},{h:'是的，总是允许执行，当前对话过程中不再提示',_D:''},{h:'不, 不允许当前函数执行',_D:''}]);k=['approve',_E,'reject'][q];D.toolcall_mode=_E if k==_E else'manual';j.append({J:k})
+				D.spinner.start();await D._handle_stream(a,D._resume_generate(p,j,i),style=b,markdown=c,items=A,context=i);break
+			r=Columns([A[0]for A in A],column_first=_B,expand=_B);D.log_control.update_last(render_panel(a,r,b,c));D.app.invalidate();await asyncio.sleep(.03);s='';D.c(spinner=s,status='正在生成 ...',tokens=D.token_count)
 		return Q
 	async def _handle_human_interrupt(A,message,options):
 		E=asyncio.get_event_loop();C=E.create_future();D=A.app.key_bindings

package/dist/python-src/src/tui/components/tlist.py

@@ -19,20 +19,20 @@ from prompt_toolkit.layout import Layout,HSplit
 from prompt_toolkit.styles import Style
 from prompt_toolkit import Application
 class InterruptSelector:
-	def __init__(A,description,options,callback):B=description;A.options=options;A.description=B;A.selected_index=0;A.callback=callback;A.rows=A.p();A.list_container=HSplit(A.rows,padding=0);A.markdown=A.q(B);C=Window(content=A.markdown.content,height=A.markdown.height,dont_extend_height=_B,style='class:desc');D=Frame(body=C);A.container=HSplit([C,A.list_container]);A.kb=KeyBindings();A.s()
-	def q(C,content):A=StringIO();B=Console(file=A,width=80,force_terminal=_B,color_system='truecolor');B.print(Align.left(Markdown(content)),justify='left');return Window(content=FormattedTextControl(ANSI(A.getvalue())),height=D(min=1))
-	def p(A):
+	def __init__(A,description,options,callback):B=description;A.options=options;A.description=B;A.selected_index=0;A.callback=callback;A.rows=A.q();A.list_container=HSplit(A.rows,padding=0);A.markdown=A.t(B);C=Window(content=A.markdown.content,height=A.markdown.height,dont_extend_height=_B,style='class:desc');D=Frame(body=C);A.container=HSplit([C,A.list_container]);A.kb=KeyBindings();A.s()
+	def t(C,content):A=StringIO();B=Console(file=A,width=80,force_terminal=_B,color_system='truecolor');B.print(Align.left(Markdown(content)),justify='left');return Window(content=FormattedTextControl(ANSI(A.getvalue())),height=D(min=1))
+	def q(A):
 		E='class:suggestion.selected';B=[]
 		for(F,C)in enumerate(A.options):D=F==A.selected_index;G='> 'if D else'  ';H=E if D else'class:suggestion.label';I='class:suggestion.desc';J=VSplit([Window(FormattedTextControl([(E,G)]),width=2),Window(FormattedTextControl([(H,C[_A])]),width=60),Window(FormattedTextControl([(I,C[_C])]),wrap_lines=_B,dont_extend_width=False,always_hide_cursor=_B)],height=1);B.append(J)
 		return B
-	def r(A):A.rows=A.p();A.list_container.children=A.rows;get_app().invalidate()
+	def p(A):A.rows=A.q();A.list_container.children=A.rows;get_app().invalidate()
 	def s(A):
 		@A.kb.add('up')
 		def B(event):
-			if A.selected_index>0:A.selected_index-=1;A.r()
+			if A.selected_index>0:A.selected_index-=1;A.p()
 		@A.kb.add('down')
 		def C(event):
-			if A.selected_index<len(A.options)-1:A.selected_index+=1;A.r()
+			if A.selected_index<len(A.options)-1:A.selected_index+=1;A.p()
 		@A.kb.add('enter')
 		def D(event):A.callback(A.selected_index)
 async def demo():

package/dist/python-src/src/tui/components/tscroll_panel.py

@@ -6,22 +6,22 @@ from prompt_toolkit.layout.controls import UIControl,UIContent
 from prompt_toolkit.data_structures import Point
 from prompt_toolkit.formatted_text import ANSI
 class ScrollableFormattedLogControl(FormattedTextControl):
-	def __init__(A):A.lines=[];A.scroll_offset=0;A._height=0;A.last_count=0;super().__init__(A.y,focusable=True,show_cursor=False)
+	def __init__(A):A.lines=[];A.scroll_offset=0;A._height=0;A.last_count=0;super().__init__(A.z,focusable=True,show_cursor=False)
 	def clear(A):A.lines=[];A.scroll_offset=0;A.last_count=0;A._height=0
-	def append_text(A,ansi_text):B=ansi_text.splitlines();A.lines.extend(B);A.last_count=len(B);A.z()
+	def append_text(A,ansi_text):B=ansi_text.splitlines();A.lines.extend(B);A.last_count=len(B);A.y()
 	def update_last(A,ansi_text):
 		B=ansi_text.splitlines()
 		if A.lines:A.lines=A.lines[:-A.last_count]+B
 		else:A.lines=B
-		A.last_count=len(B);A.z()
+		A.last_count=len(B);A.y()
 	def refresh_scroll(A):
 		if A._height:A.scroll_offset=max(0,len(A.lines)-A._height)
-	def z(A):
+	def y(A):
 		if A._height:A.scroll_offset=max(0,len(A.lines)-A._height)
 	def x(A,amount):
 		if A._height:B=max(0,len(A.lines)-A._height);A.scroll_offset=max(0,min(A.scroll_offset+amount,B))
 	def is_focusable(A):return True
-	def y(A):
+	def z(A):
 		C=A._height or 100;D=A.lines[A.scroll_offset:A.scroll_offset+C];B=[]
 		for E in D:F=sanitize_ansi_text(E);B.extend(ANSI(F).__pt_formatted_text__());B.append(('','\n'))
 		return B
@@ -34,15 +34,15 @@ class ScrollableFormattedLogControl(FormattedTextControl):
 class ScrollableLogControl(UIControl):
 	def __init__(A):A.lines=[];A.scroll_offset=0;A.visible_lines=[];A._height=0;A.last_count=0
 	def clear(A):A.visible_lines=[];A.lines=[];A.scroll_offset=0;A.last_count=0;A._height=0
-	def append_text(A,ansi_text):B=ansi_text.splitlines();A.lines.extend(B);A.last_count=len(B);A.z()
+	def append_text(A,ansi_text):B=ansi_text.splitlines();A.lines.extend(B);A.last_count=len(B);A.y()
 	def update_last(A,ansi_text):
 		B=ansi_text.splitlines()
 		if A.lines:A.lines=A.lines[:-A.last_count]+B
 		else:A.lines=B
-		A.last_count=len(B);A.z()
+		A.last_count=len(B);A.y()
 	def refresh_scroll(A):
 		if A._height:A.scroll_offset=max(0,len(A.lines)-A._height)
-	def z(A):A.scroll_offset=max(0,len(A.lines)-A._height)
+	def y(A):A.scroll_offset=max(0,len(A.lines)-A._height)
 	def x(A,amount):A.scroll_offset=max(0,min(A.scroll_offset+amount,max(0,len(A.lines)-A._height)))
 	def is_focusable(A):return True
 	def create_content(A,width,height):B=height;A._height=B;A.visible_lines=A.lines[A.scroll_offset:A.scroll_offset+B];return UIContent(get_line=A.get_line,line_count=len(A.visible_lines),cursor_position=Point(0,len(A.visible_lines)-1))

package/dist/python-src/src/tui/utils/trender.py

@@ -27,8 +27,8 @@ from src.tui.components.tdiff import render_diff_as_markdown
 from src.tui.components.tdisplay import render_content_with_line_limit
 from src.tui.utils.render import markdown_to_wrapped_text
 def display_tool_call(tool_name,args,events=[]):
-	C=tool_name;A=events;E=format_tool_compact(C,args);D=j(C,args);B=Tree(Text(_I,style=_J)+Text(f"{E}",style=_C),guide_style=_D)
-	if A and len(A)>0:F=display_sub_panel(D,events=A);B.add(F)
+	C=tool_name;A=events;E=format_tool_compact(C,args);D=n(C,args);B=Tree(Text(_I,style=_J)+Text(f"{E}",style=_C),guide_style=_D)
+	if A and len(A)>0:F=display_sub_panel(D,sub_events=A);B.add(F)
 	else:B.add(D)
 	return B
 def display_tool_result(tool_name,args=_E,result=_E,events=[]):
@@ -40,13 +40,13 @@ def display_tool_result(tool_name,args=_E,result=_E,events=[]):
 		elif C==_L and isinstance(A,dict):B=k(A)
 		elif C in[_M]and isinstance(A,dict):B=k(A)
 		elif C==_H and isinstance(A,dict):B=h(A,D)
-		elif C==_N and isinstance(A,dict):B=m(A,D)
-		elif C==_O and isinstance(A,dict):B=o(A,D)
-		elif C==_P and isinstance(A,dict):B=i(A,D)
-		else:B=f(A,D)
+		elif C==_N and isinstance(A,dict):B=i(A,D)
+		elif C==_O and isinstance(A,dict):B=m(A,D)
+		elif C==_P and isinstance(A,dict):B=f(A,D)
+		else:B=j(A,D)
 	except Exception as I:import traceback as J;B=Text(f"Error: {str(I)}\n{J.format_exc()}",style='red')
 	F=Tree(Text(_I,style=_J)+Text(f"{H}",style=_C),guide_style=_D)
-	if E and len(E)>0:K=display_sub_panel(B,events=E);F.add(K)
+	if E and len(E)>0:K=display_sub_panel(B,sub_events=E);F.add(K)
 	else:F.add(B)
 	return F
 def display_tool_error(tool_name,args,error,events=[]):
@@ -55,7 +55,7 @@ def display_tool_error(tool_name,args,error,events=[]):
 	elif'file not found'in A.lower():A+='\n💡 Check if the file path is correct'
 	elif'command not found'in A.lower():A+='\n💡 Check if the command is installed and in PATH'
 	D=Text(A,style='red');C=Tree(Text(_I,style=_J)+Text(f"{E}",style=_C),guide_style=_D)
-	if B and len(B)>0:F=display_sub_panel(D,events=B);C.add(F)
+	if B and len(B)>0:F=display_sub_panel(D,sub_events=B);C.add(F)
 	else:C.add(D)
 	return C
 def format_tool_compact(name,args):
@@ -101,33 +101,33 @@ def format_tool_compact(name,args):
 	I=', '.join(M)
 	if len(I)>50:I=I[:47]+_B
 	return f"{J}({I})"
-def j(tool_name,arguments):
+def n(tool_name,arguments):
 	D=' Will search for pattern';C=arguments;B='bold grey';A=tool_name.lower()
 	if A==_H:return Text(f"running ...",style=B)
 	if A==_M:return Text(f" Executing ...",style=B)
-	elif A==_L:return n(C)
-	elif A==_K:return g(C)
+	elif A==_L:return g(C)
+	elif A==_K:return o(C)
 	elif A in[_N,_O]:return Text(D,style=B)
 	elif A==_P:return Text(D,stype=B)
 	else:return Text(' Executing ...',style=B)
 def display_sub_panel(result=_E,sub_events=[]):
-	H='success';B=result;A=[]
-	for(L,D)in enumerate(sub_events):
-		E=D['name'];F=json.dumps(D['args'])[:20];G=D[H];B=D[_R]
-		if G==H:C=Tree(Text('● ',style=_Q)+Text(f" {E}({F})",style=_C),guide_style=_D);A.append(C)
-		elif G=='error':C=Tree(Text('● ',style='bold red')+Text(f" {E}({F})",style=_C),guide_style=_D);A.append(C)
-		elif G=='calling':C=Tree(Text('○ ',style=_Q)+Text(f" {E}({F})",style=_C),guide_style=_D);A.append(C)
-	if B:
-		if isinstance(B,str):A.append(markdown_to_wrapped_text(f"{B[:200]}",prefix=_E))
-		else:A.append(B)
+	I='calling';H='success';C=result;A=[]
+	for(M,D)in enumerate(sub_events):
+		E=D[3]['name'];F=json.dumps(D[3]['args'])[:20];G=D[3].get(H,I);N=D[3].get(_R,'')
+		if G==H:B=Tree(Text('● ',style=_Q)+Text(f" {E}({F})",style=_C),guide_style=_D);A.append(B)
+		elif G=='error':B=Tree(Text('● ',style='bold red')+Text(f" {E}({F})",style=_C),guide_style=_D);A.append(B)
+		elif G==I:B=Tree(Text('○ ',style=_Q)+Text(f" {E}({F})",style=_C),guide_style=_D);A.append(B)
+	if C:
+		if isinstance(C,str):A.append(markdown_to_wrapped_text(f"{C[:200]}",prefix=_E))
+		else:A.append(C)
 	else:A.append(markdown_to_wrapped_text(f"calling ...",prefix=_E))
-	I=Columns(A,column_first=True,expand=True);J=Box('    \n    \n    \n    \n    \n    \n    \n    ');K=Panel(I,title_align='left',box=J);return K
-def g(arguments):
+	J=Columns(A,column_first=True,expand=True);K=Box('    \n    \n    \n    \n    \n    \n    \n    ');L=Panel(J,title_align='left',box=K);return L
+def o(arguments):
 	A=arguments;B=A.get(_F,'');C=A.get('old_string','');D=A.get('new_string','');E=''
 	if os.path.exists(B):
 		with open(B,'r',encoding='utf-8')as F:G=F.read()
 	H=D if C==''else G.replace(C,D,1);I=render_diff_as_markdown(E,H);return I
-def n(arguments):
+def g(arguments):
 	D=arguments;A=D.get(_F,'');B=D.get(_R,'')
 	if os.path.exists(A):C=open(A,'r').read()
 	else:C=''
@@ -163,7 +163,7 @@ def h(arguments,result):
 	E=F-D
 	if E>0:B.append(f" ... and {E} more lines")
 	return Text(_A.join(B),style=_G)
-def m(arguments,result):
+def i(arguments,result):
 	C=result.strip().split(_A);F=len(C);B=[];D=10;G=C[:D]
 	for(H,A)in enumerate(G):
 		I=''if H==0 else''
@@ -172,7 +172,7 @@ def m(arguments,result):
 	E=F-D
 	if E>0:B.append(f" ... and {E} more lines")
 	return Text(_A.join(B),style=_G)
-def o(arguments,result):
+def m(arguments,result):
 	C=result.strip().split(_A);F=len(C);B=[];D=10;G=C[:D]
 	for(H,A)in enumerate(G):
 		I=''if H==0 else''
@@ -181,7 +181,7 @@ def o(arguments,result):
 	E=F-D
 	if E>0:B.append(f" ... and {E} more lines")
 	return Text(_A.join(B),style=_G)
-def i(arguments,result):
+def f(arguments,result):
 	C=result.strip().split(_A);F=len(C);B=[];D=10;G=C[:D]
 	for(H,A)in enumerate(G):
 		I=''if H==0 else''
@@ -190,7 +190,7 @@ def i(arguments,result):
 	E=F-D
 	if E>0:B.append(f" ... and {E} more lines")
 	return Text(_A.join(B),style=_G)
-def f(arguments,result):
+def j(arguments,result):
 	B=result;A=str(B)if B else'tool completed successfully'
 	if len(A)>500:C=A[:500]+'\n ... (truncated)'
 	else:C=A

package/dist/python-src/src/utils/prompt.py

@@ -1,11 +1,22 @@
+_F='system'
+_E='%a %b %d %Y %H:%M:%S %z'
+_D='template'
+_C='input_variables'
+_B='prompt'
+_A=None
 from typing import Optional,List,Any,Dict,Annotated,Literal
 from datetime import datetime
 from langchain_core.prompts.loading import load_prompt_from_config
 from langchain_core.messages import BaseMessage
 from langgraph.graph import MessagesState
 from langchain_core.prompts import ChatPromptTemplate,MessagesPlaceholder,SystemMessagePromptTemplate,PromptTemplate
-def apply_template(agents_config,domain='',prompt_name='general',state=None,base_prompt=None,format_instruction=None,**G):
-	F='prompt';E=format_instruction;D=base_prompt;C=state;H=agents_config[domain];I=H['members'][prompt_name];J={'_type':F,'input_variables':[],'template':I[F]};A=load_prompt_from_config(J).partial(CURRENT_TIME=datetime.now().strftime('%a %b %d %Y %H:%M:%S %z'));K=SystemMessagePromptTemplate(prompt=A);B=[K]
+def apply_prompt(prompt,state=_A,base_prompt=_A,format_instruction=_A,**F):
+	E=format_instruction;D=base_prompt;C=state;A=prompt;G={'_type':_B,_C:[],_D:A};A=load_prompt_from_config(G).partial(CURRENT_TIME=datetime.now().strftime(_E));H=SystemMessagePromptTemplate(prompt=A);B=[H]
 	if D:B.append(SystemMessagePromptTemplate(prompt=PromptTemplate(template=D)))
-	if E:B.append(('system',f"{E}"))
-	A=ChatPromptTemplate.from_messages(B).partial(**G);A=A.format(**C)if C else A.format(**{});return A
+	if E:B.append((_F,f"{E}"))
+	A=ChatPromptTemplate.from_messages(B).partial(**F);A=A.format(**C)if C else A.format(**{});return A
+def apply_template(agents_config,domain='',prompt_name='general',state=_A,base_prompt=_A,format_instruction=_A,**F):
+	E=format_instruction;D=base_prompt;C=state;G=agents_config[domain];H=G['members'][prompt_name];I={'_type':_B,_C:[],_D:H[_B]};A=load_prompt_from_config(I).partial(CURRENT_TIME=datetime.now().strftime(_E));J=SystemMessagePromptTemplate(prompt=A);B=[J]
+	if D:B.append(SystemMessagePromptTemplate(prompt=PromptTemplate(template=D)))
+	if E:B.append((_F,f"{E}"))
+	A=ChatPromptTemplate.from_messages(B).partial(**F);A=A.format(**C)if C else A.format(**{});return A