@brandon_9527/tcode 1.0.3 → 1.0.6

package/dist/python-src/src/middlewares/summary.py

@@ -27,7 +27,7 @@ ContextFraction=tuple[Literal[_D],float]
 ContextTokens=tuple[Literal[_E],int]
 ContextMessages=tuple[Literal[_B],int]
 ContextSize=ContextFraction|ContextTokens|ContextMessages
-def cm(model):
+def ck(model):
 	if model._llm_type=='anthropic-chat':return partial(count_tokens_approximately,chars_per_token=3.3)
 	return count_tokens_approximately
 class SummaryState(AgentState):compact:NotRequired[bool]=_F
@@ -44,30 +44,30 @@ class SummarizationMiddleware(AgentMiddleware):
 		if isinstance(C,str):C=init_chat_model(C)
 		A.model=C
 		if B is _A:A.trigger=_A;G=[]
-		elif isinstance(B,list):I=[A.cl(B,N)for B in B];A.trigger=I;G=I
-		else:J=A.cl(B,N);A.trigger=J;G=[J]
-		A._trigger_conditions=G;A.keep=A.cl(F,'keep')
-		if H is count_tokens_approximately:A.token_counter=cm(A.model)
+		elif isinstance(B,list):I=[A.ch(B,N)for B in B];A.trigger=I;G=I
+		else:J=A.ch(B,N);A.trigger=J;G=[J]
+		A._trigger_conditions=G;A.keep=A.ch(F,'keep')
+		if H is count_tokens_approximately:A.token_counter=ck(A.model)
 		else:A.token_counter=H
 		A.summary_prompt=summary_prompt;A.trim_tokens_to_summarize=trim_tokens_to_summarize;K=any(A[0]==_D for A in A._trigger_conditions)
 		if A.keep[0]==_D:K=_C
-		if K and A.cn()is _A:O='Model profile information is required to use fractional token limits, and is unavailable for the specified model. Please use absolute token counts instead, or pass `\n\nChatModel(..., profile={"max_input_tokens": ...})`.\n\nwith a desired integer value of the model\'s maximum input tokens.';raise ValueError(O)
-	def ck(B,state):A=state.get(_G,_F);return bool(A)
+		if K and A.cp()is _A:O='Model profile information is required to use fractional token limits, and is unavailable for the specified model. Please use absolute token counts instead, or pass `\n\nChatModel(..., profile={"max_input_tokens": ...})`.\n\nwith a desired integer value of the model\'s maximum input tokens.';raise ValueError(O)
+	def cl(B,state):A=state.get(_G,_F);return bool(A)
 	@override
 	def before_model(self,state,runtime):
-		C=state;A=self;B=C[_B];A.cp(B);E=A.token_counter(B);F=A.ck(C);G=A.co(B,E)
+		C=state;A=self;B=C[_B];A.cq(B);E=A.token_counter(B);F=A.cl(C);G=A.co(B,E)
 		if not G and not F:return
-		D=A.cg(B)
+		D=A.cn(B)
 		if D<=0:return
-		H,I=A.cf(B,D);J=A.cj(H);K=A.ch(J);return{_B:[RemoveMessage(id=REMOVE_ALL_MESSAGES),*K,*I],_G:_F}
+		H,I=A.cg(B,D);J=A.cm(H);K=A.cj(J);return{_B:[RemoveMessage(id=REMOVE_ALL_MESSAGES),*K,*I],_G:_F}
 	@override
 	async def abefore_model(self,state,runtime):
-		C=state;A=self;B=C[_B];A.cp(B);E=A.token_counter(B);F=A.ck(C);G=A.co(B,E)
+		C=state;A=self;B=C[_B];A.cq(B);E=A.token_counter(B);F=A.cl(C);G=A.co(B,E)
 		if not G and not F:return
-		D=A.cg(B)
+		D=A.cn(B)
 		if D<=0:return
-		H,I=A.cf(B,D);J=await A._acreate_summary(H);K=A.ch(J);return{_B:[RemoveMessage(id=REMOVE_ALL_MESSAGES),*K,*I],_G:_F}
-	def cr(B,messages,threshold):
+		H,I=A.cg(B,D);J=await A._acreate_summary(H);K=A.cj(J);return{_B:[RemoveMessage(id=REMOVE_ALL_MESSAGES),*K,*I],_G:_F}
+	def cs(B,messages,threshold):
 		A=next((A for A in reversed(messages)if isinstance(A,AIMessage)),_A)
 		if isinstance(A,AIMessage)and A.usage_metadata is not _A and(C:=A.usage_metadata.get('total_tokens',-1))and C>=threshold and(D:=A.response_metadata.get('model_provider'))and D==B.model._get_ls_params().get('ls_provider'):return _C
 		return _F
@@ -77,28 +77,28 @@ class SummarizationMiddleware(AgentMiddleware):
 		for(B,C)in A._trigger_conditions:
 			if B==_B and len(E)>=C:return _C
 			if B==_E and F>=C:return _C
-			if B==_E and A.cr(E,C):return _C
+			if B==_E and A.cs(E,C):return _C
 			if B==_D:
-				G=A.cn()
+				G=A.cp()
 				if G is _A:continue
 				D=int(G*C)
 				if D<=0:D=1
 				if F>=D:return _C
-				if A.cr(E,D):return _C
+				if A.cs(E,D):return _C
 		return _F
-	def cg(A,messages):
+	def cn(A,messages):
 		B=messages;D,E=A.keep
 		if D in{_E,_D}:
-			C=A.cs(B)
+			C=A.cf(B)
 			if C is not _A:return C
-			return A.ci(B,_DEFAULT_MESSAGES_TO_KEEP)
-		return A.ci(B,cast('int',E))
-	def cs(C,messages):
+			return A.cr(B,_DEFAULT_MESSAGES_TO_KEEP)
+		return A.cr(B,cast('int',E))
+	def cf(C,messages):
 		A=messages
 		if not A:return 0
 		H,I=C.keep
 		if H==_D:
-			J=C.cn()
+			J=C.cp()
 			if J is _A:return
 			F=int(J*I)
 		elif H==_E:F=int(I)
@@ -114,8 +114,8 @@ class SummarizationMiddleware(AgentMiddleware):
 		if B>=len(A):
 			if len(A)==1:return 0
 			B=len(A)-1
-		return C.cq(A,B)
-	def cn(C):
+		return C.ct(A,B)
+	def cp(C):
 		try:A=C.model.profile
 		except AttributeError:return
 		if not isinstance(A,Mapping):return
@@ -123,7 +123,7 @@ class SummarizationMiddleware(AgentMiddleware):
 		if not isinstance(B,int):return
 		return B
 	@staticmethod
-	def cl(context,parameter_name):
+	def ch(context,parameter_name):
 		E=context;C=parameter_name;D,B=E
 		if D==_D:
 			if not 0<B<=1:A=f"Fractional {C} values must be between 0 and 1, got {B}.";raise ValueError(A)
@@ -132,19 +132,19 @@ class SummarizationMiddleware(AgentMiddleware):
 		else:A=f"Unsupported context size type {D} for {C}.";raise ValueError(A)
 		return E
 	@staticmethod
-	def ch(summary):return[HumanMessage(content=f"Here is a summary of the conversation to date:\n\n{summary}",additional_kwargs={'lc_source':'summarization'})]
+	def cj(summary):return[HumanMessage(content=f"Here is a summary of the conversation to date:\n\n{summary}",additional_kwargs={'lc_source':'summarization'})]
 	@staticmethod
-	def cp(messages):
+	def cq(messages):
 		for A in messages:
 			if A.id is _A:A.id=str(uuid.uuid4())
 	@staticmethod
-	def cf(conversation_messages,cutoff_index):B=cutoff_index;A=conversation_messages;C=A[:B];D=A[B:];return C,D
-	def ci(C,messages,messages_to_keep):
+	def cg(conversation_messages,cutoff_index):B=cutoff_index;A=conversation_messages;C=A[:B];D=A[B:];return C,D
+	def cr(C,messages,messages_to_keep):
 		B=messages_to_keep;A=messages
 		if len(A)<=B:return 0
-		D=len(A)-B;return C.cq(A,D)
+		D=len(A)-B;return C.ct(A,D)
 	@staticmethod
-	def cq(messages,cutoff_index):
+	def ct(messages,cutoff_index):
 		B=cutoff_index;A=messages
 		if B>=len(A)or not isinstance(A[B],ToolMessage):return B
 		E=set();C=B
@@ -158,10 +158,10 @@ class SummarizationMiddleware(AgentMiddleware):
 				H={A.get('id')for A in D.tool_calls if A.get('id')}
 				if E&H:return G
 		return C
-	def cj(A,messages_to_sumarize):
+	def cm(A,messages_to_sumarize):
 		B=messages_to_sumarize
 		if not B:return _H
-		C=A.ct(B)
+		C=A.ci(B)
 		if not C:return'Previous conversation was too long to summarize'
 		D=get_buffer_string(C)
 		try:E=A.model.invoke(A.summary_prompt.format(messages=D));return E.text.strip()
@@ -169,12 +169,12 @@ class SummarizationMiddleware(AgentMiddleware):
 	async def _acreate_summary(A,messages_to_summarize):
 		B=messages_to_summarize
 		if not B:return _H
-		C=A.ct(B)
+		C=A.ci(B)
 		if not C:return'Previous conversation was too long to summarize.'
 		D=get_buffer_string(C)
 		try:E=await A.model.ainvoke(A.summary_prompt.format(messages=D));return E.text.strip()
 		except Exception as F:return f"Error generating sumamry: {F!s}"
-	def ct(A,messages):
+	def ci(A,messages):
 		B=messages
 		try:
 			if A.trim_tokens_to_summarize is _A:return B

package/dist/python-src/src/prompts/prompts.py

@@ -1 +1 @@
-leader=' \n## 工作环境\n\nCURRENT_TIME: {CURRENT_TIME}\nWORKSPACE: {WORKSPACE}\n\n## 角色定位\n你的名字是 David。\n你是一位拥有15年以上经验的资深项目任务指挥师专家，擅长通过系统化分析项目需求和现状，将复杂的项目目标分解为清晰、可执行的任务分配方案。\n你具备敏锐的项目管理洞察力和团队协调能力，能够快速识别项目关键路径、资源需求和风险点，从而为团队成员制定详细的分步骤执行计划。\n你专注于任务分解、资源配置和团队协作，将宏观的项目目标转化为微观的可执行任务。\n\n\n注意: 严禁你代替成员完成任务，只能协调和分配任务，不能直接执行任务。\n\n## 工作空间说明\n    你的工作空间(WORKSPACE)位置为: {WORKSPACE}, 你的项目文件夹可以放在 {{WORKSPACE}} 下。\n\n## 核心能力 \n    1. **项目需求分析**：\n      深入理解项目目标、范围、约束条件和成功标准，识别关键需求和优先级。\n      \n\n    2. **任务分解与规划**：\n        2.1 根据需求分析的结果判断项目的规模和复杂度。\n        2.2 如果是简单任务则按照其涉及到的工作内容直接分配给对应的团队成员执行。\n        2.3 如果不能明确判断任务和哪个团队成员相匹配，则优先分配给 通用代理 general agent 进行处理。\n        2.4 如果任务需要协调多个团队成员合作完成，则将项目目标分解为可管理的工作包，并明确任务间的依赖关系和执行顺序。\n    3. **团队角色分配**：根据任务特性和团队成员能力，合理分配团队成员的工作职责。\n    4. **协作流程设计**：设计高效的团队协作流程，明确沟通机制和决策流程。\n    5. **沟通协调**: \n        【注意】当团队成员在执行任务过程中需要与用户沟通，询问用户问题时，你需要接收成员的请求或询问， \n        终止当前的对话，将请求或询问内容放在 FINISH 的task中转发给用户。此时严禁自行回复成员或者分发任务。\n\n\n\n\n## 工作方式\n    你在指挥团队完成任务时需要严格遵循以下INSTRUCTION指令,不要执行超出指令范围之外的工作。\n    该指令约束了工作涉及范围以及定义了工作常规执行流程，并约束了工作涉及到的团队成员,\n    需要注意的是除了指令中指定的团队成员，不要调用其他的团队成员。\n\n\n## 约束条件\n    - **沟通语言:** 必须使用**中文**与用户进行交流，以及回复用户问题和报告执行状态\n\n## 交互规则\n\n    【注意】在接收到用户回复时，你需要判断是否是处于团队成员与用户交互过程中:\n      1. 如果是，你直接将用户的回复转发给团队成员，无需额外处理和任务分解。\n      2. 如果不是，你需要根据用户的问题进行任务分解和分配。\n\n    【注意】如果团队成员回复内容为询问，提问的形式，你如果不能给出答案，则向用户询问。\n\n'
+leader=' \n## 工作环境\n\nCURRENT_TIME: {CURRENT_TIME}\nWORKSPACE: {WORKSPACE}\n\n## 角色定位\n你的名字是 David。\n你是一位拥有15年以上经验的资深项目任务指挥师专家，擅长通过系统化分析项目需求和现状，将复杂的项目目标分解为清晰、可执行的任务分配方案。\n你具备敏锐的项目管理洞察力和团队协调能力，能够快速识别项目关键路径、资源需求和风险点，从而为团队成员制定详细的分步骤执行计划。\n你专注于任务分解、资源配置和团队协作，将宏观的项目目标转化为微观的可执行任务。\n\n\n注意: 严禁你代替成员完成任务，只能协调和分配任务，不能直接执行任务。\n\n## 工作空间说明\n    你的工作空间(WORKSPACE)位置为: {WORKSPACE}, 你的项目文件夹可以放在 {{WORKSPACE}} 下。\n\n## 核心能力 \n    1. **项目需求分析**：\n      深入理解项目目标、范围、约束条件和成功标准，识别关键需求和优先级。\n      \n\n    2. **任务分解与规划**：\n        2.1 根据需求分析的结果判断项目的规模和复杂度。\n        2.2 如果是简单任务则按照其涉及到的工作内容直接分配给对应的团队成员执行。\n        2.3 如果不能明确判断任务和哪个团队成员相匹配，则优先分配给 通用代理 general-purpose 进行处理。\n        2.4 如果任务需要协调多个团队成员合作完成，则将项目目标分解为可管理的工作包，并明确任务间的依赖关系和执行顺序。\n    3. **团队角色分配**：根据任务特性和团队成员能力，合理分配团队成员的工作职责。\n    4. **协作流程设计**：设计高效的团队协作流程，明确沟通机制和决策流程。\n    5. **沟通协调**: \n        【注意】当团队成员在执行任务过程中需要与用户沟通，询问用户问题时，你需要接收成员的请求或询问， \n        终止当前的对话，将请求或询问内容放在 FINISH 的task中转发给用户。此时严禁自行回复成员或者分发任务。\n\n## 工作方式\n    你在指挥团队完成任务时需要严格遵循以下INSTRUCTION指令,不要执行超出指令范围之外的工作。\n    该指令约束了工作涉及范围以及定义了工作常规执行流程，并约束了工作涉及到的团队成员,\n    需要注意的是除了指令中指定的团队成员，不要调用其他的团队成员。\n\n\n## 约束条件\n    - **沟通语言:** 必须使用**中文**与用户进行交流，以及回复用户问题和报告执行状态\n\n## 交互规则\n\n    【注意】在接收到用户回复时，你需要判断是否是处于团队成员与用户交互过程中:\n      1. 如果是，你直接将用户的回复转发给团队成员，无需额外处理和任务分解。\n      2. 如果不是，你需要根据用户的问题进行任务分解和分配。\n\n    【注意】如果团队成员回复内容为询问，提问的形式，你如果不能给出答案，则向用户询问。\n\n'

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

@@ -16,33 +16,33 @@ class ToolResultFormatter:
 	def detect_type(B,content):
 		A=content;A=A.strip()
 		if A.statswith(SUCCESS_PREFIX):
-			C=B.ba(A)
-			if B.bi(C):return ContentType.JSON
+			C=B.bi(A)
+			if B.bd(C):return ContentType.JSON
 			return ContentType.SUCCESS
 		if A.startswith(FAILURE_PREFIX):return ContentType.ERROR
-		if B.bi(A):return ContentType.JSON
-		if B.bh(A):return ContentType.ERROR
-		if B.bd(A):return ContentType.MARKDOWN
+		if B.bd(A):return ContentType.JSON
+		if B.bg(A):return ContentType.ERROR
+		if B.bc(A):return ContentType.MARKDOWN
 		return ContentType.TEXT
 	def is_success(A,content):return _is_success(content)
-	def format(A,name,content,max_length=800):B=content;C=A.detect_type(B);D=A.is_success(B);E={ContentType.SUCCESS:A.bb,ContentType.ERROR:A.bj,ContentType.JSON:A.be,ContentType.MARKDOWN:A.bf,ContentType.TEXT:A.bc};F=E.get(C,A.bc);G=F(name,B,max_length);return FormattedResult(content_type=C,elements=G,success=D)
-	def ba(B,content):A=content.split('\n',2);return A[2].strip()if len(A)>2 else''
-	def bi(B,content):
+	def format(A,name,content,max_length=800):B=content;C=A.detect_type(B);D=A.is_success(B);E={ContentType.SUCCESS:A.bf,ContentType.ERROR:A.bh,ContentType.JSON:A.bj,ContentType.MARKDOWN:A.bb,ContentType.TEXT:A.be};F=E.get(C,A.be);G=F(name,B,max_length);return FormattedResult(content_type=C,elements=G,success=D)
+	def bi(B,content):A=content.split('\n',2);return A[2].strip()if len(A)>2 else''
+	def bd(B,content):
 		A=content;A=A.strip()
 		if not A:return _A
 		if A.startswith('{')and A.endswith('}')or A.startswith('[')and A.endswith(']'):
 			try:json.loads(A);return True
 			except(json.JSONDecodeError,ValueError):pass
 		return _A
-	def bh(B,content):A=['Traceback (most recent call last)','Exception:','Error:'];return any(A in content for A in A)
-	def bd(C,content):A=content;B=['```','**','##','- **'];return A.startswith('#')or any(B in A for B in B)
-	def bb(B,name,content,max_length):A='green';C=B.bg(content,max_length);return[Panel(Text(C,style=A),title=f"📤 {name} ✓",border_style=A)]
-	def bj(B,name,content,max_length):A='red';C=B.bg(content,max_length);return[Panel(Text(C,style=A),title=f"📤 {name} ✗",border_style=A)]
-	def be(B,name,content,max_length):
+	def bg(B,content):A=['Traceback (most recent call last)','Exception:','Error:'];return any(A in content for A in A)
+	def bc(C,content):A=content;B=['```','**','##','- **'];return A.startswith('#')or any(B in A for B in B)
+	def bf(B,name,content,max_length):A='green';C=B.ba(content,max_length);return[Panel(Text(C,style=A),title=f"📤 {name} ✓",border_style=A)]
+	def bh(B,name,content,max_length):A='red';C=B.ba(content,max_length);return[Panel(Text(C,style=A),title=f"📤 {name} ✗",border_style=A)]
+	def bj(B,name,content,max_length):
 		D=max_length;A=content;E=A
-		if A.startswith(SUCCESS_PREFIX):E=B.ba(A)
-		try:F=json.loads(E);C=json.dumps(F,indent=2,ensure_ascii=_A);C=B.bg(C,D);return[Text(f"📤 {name} ✓",style=_B),Syntax(C,'json',theme='monokai',line_numbers=_A)]
-		except(json.JSONDecodeError,ValueError):return B.bc(name,A,D)
-	def bf(A,name,content,max_length):B=A.bg(content,max_length);return[Panel(Markdown(B),title=f"📤 {name}",border_style='cyan dim')]
-	def bc(A,name,content,max_length):B=A.bg(content,max_length);return[Text(f"📤 {name}:",style=_B),Text(f"   {B}",style='dim')]
-	def bg(A,content,max_length):return truncate(content,max_length)
+		if A.startswith(SUCCESS_PREFIX):E=B.bi(A)
+		try:F=json.loads(E);C=json.dumps(F,indent=2,ensure_ascii=_A);C=B.ba(C,D);return[Text(f"📤 {name} ✓",style=_B),Syntax(C,'json',theme='monokai',line_numbers=_A)]
+		except(json.JSONDecodeError,ValueError):return B.be(name,A,D)
+	def bb(A,name,content,max_length):B=A.ba(content,max_length);return[Panel(Markdown(B),title=f"📤 {name}",border_style='cyan dim')]
+	def be(A,name,content,max_length):B=A.ba(content,max_length);return[Text(f"📤 {name}:",style=_B),Text(f"   {B}",style='dim')]
+	def ba(A,content,max_length):return truncate(content,max_length)

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

@@ -12,13 +12,13 @@ _R='result'
 _Q='tool_id'
 _P='parent_id'
 _O='custom'
-_N=False
-_M='text'
-_L='value'
-_K='__interrupt__'
-_J='auto'
-_I='status'
-_H='updates'
+_N='updates'
+_M=False
+_L='text'
+_K='value'
+_J='__interrupt__'
+_I='auto'
+_H='status'
 _G='type'
 _F='id'
 _E='content'
@@ -34,38 +34,37 @@ from src.stream.emitter import StreamEventEmitter as emitter
 from src.stream.tracker import ToolCallTracker
 from src.stream.file_write_parser import StreamParser
 async def ainput(prompt=''):return await asyncio.to_thread(input,prompt)
-async def anormal_handler(stream,detail=_N):
-	E=detail
-	async for H in stream:
-		if not isinstance(H,tuple)or len(H)!=2:continue
-		F,G=H
-		if F!=_H:print(f"[STREAM_MODE]: {F} {G}")
-		if F==_H:
+async def anormal_handler(stream,detail=_M):
+	E=detail;M=''
+	async for F in stream:
+		if not isinstance(F,tuple)or len(F)!=2:continue
+		J,G=F
+		if J==_N:
 			if not isinstance(G,dict):continue
-			for(M,C)in G.items():
+			for(N,C)in G.items():
 				if C is _C or isinstance(C,tuple):continue
 				if _A in C and isinstance(C[_A],list)and len(C[_A])>0:
 					for A in C[_A]:
 						if isinstance(A,AIMessage)and len(A.tool_calls)>0:
 							for B in A.tool_calls:
-								D=B[_B];I=B[_D];K=B[_F]
-								if E:print(f"[TOOL_CALL]: {D} \nargs: ({I}) ")
-						if isinstance(A,AIMessage)and A.content and A.content!='':print(f"[AIMESSAGE]: {A.content}")
+								D=B[_B];H=B[_D];K=B[_F]
+								if E:print(f"[TOOL_CALL]: {D} \nargs: ({H}) ")
+						if isinstance(A,AIMessage)and A.content and A.content!='':print(f"bot> {A.content}");M+=A.content
 						if isinstance(A,ToolMessage):
-							D=A.name;J=A.content;K=A.tool_call_id
-							if E:print(f"[TOOL_RESULT]: {D} \nresult: {J}")
-		elif F==_O:
-			B=json.loads(G);L=getattr(B,_G,'');N=getattr(B,_P,'');K=getattr(B,_Q,'');D=getattr(B,_B,'');I=getattr(B,_D,'');J=getattr(B,_R,'');O=getattr(B,_I,_S)
+							D=A.name;I=A.content;K=A.tool_call_id
+							if E:print(f"[TOOL_RESULT]: {D} \nresult: {I}")
+		elif J==_O:
+			B=json.loads(G);L=B.get(_G,'');O=B.get(_P,'');K=B.get(_Q,'');D=B.get(_B,'');H=B.get(_D,'');I=B.get(_R,'');P=B.get(_H,_S)
 			if L==_T:
-				if E:print(f"[SUB TOOL_CALL]: {D} \nargs: ({I}) ")
+				if E:print(f"[SUB TOOL_CALL]: {D} \nargs: ({H}) ")
 			elif L==_U:
-				if E:print(f"[SUB TOOL_RESULT]: {D} \nresult: {J}")
-async def astream_handler(stream,debug=_N,interrupt_tools=[],tool_mode=_J):
+				if E:print(f"[SUB TOOL_RESULT]: {D} \nresult: {I}")
+async def astream_handler(stream,debug=_M,interrupt_tools=[],tool_mode=_I):
 	P=interrupt_tools;J=debug;K=[];S='';T=StreamParser(top_fields=['path',_E])
 	async for F in stream:
 		if not isinstance(F,tuple)or len(F)!=2:continue
 		L,D=F
-		if L==_H:
+		if L==_N:
 			if not isinstance(D,dict):continue
 			for(d,H)in D.items():
 				if H is _C or isinstance(H,tuple):continue
@@ -74,35 +73,35 @@ async def astream_handler(stream,debug=_N,interrupt_tools=[],tool_mode=_J):
 						if isinstance(C,AIMessage)and len(C.tool_calls)>0:
 							for B in C.tool_calls:
 								E=B[_B];I=B[_D];G=B[_F]
-								if len(P)>0 and tool_mode!=_J and E.strip().lower()in P:continue
+								if len(P)>0 and tool_mode!=_I and E.strip().lower()in P:continue
 								A=emitter.tool_call(E,I,G);yield A.data
 						if isinstance(C,ToolMessage):E=C.name;M=C.content;G=C.tool_call_id;A=emitter.tool_result(E,M,_W,G);yield A.data
 						if isinstance(C,AIMessage)and C.usage_metadata:N=C.usage_metadata;U=N.get(_X,_C);V=N.get(_Y);W=N.get(_Z,_C);A=emitter.token_usage(U,V,W);yield A.data
-			if _K in D:
-				K=D[_K]
+			if _J in D:
+				K=D[_J]
 				if K:
-					e=_a;X=list(map(lambda interrupt:{_V:interrupt.id,_L:interrupt.value},K))
-					for O in X:Y='hitl';Z=O[_V];a=O[_L];B=a['action_requests'][0];E=B[_B];G=B[_F];I=B[_D];A=emitter.tool_call(E,I,G);yield A.data;A=emitter.interrupt(interrupt_type=Y,interrupt_id=Z,value=O);yield A.data
+					e=_a;X=list(map(lambda interrupt:{_V:interrupt.id,_K:interrupt.value},K))
+					for O in X:Y='hitl';Z=O[_V];a=O[_K];B=a['action_requests'][0];E=B[_B];G=B[_F];I=B[_D];A=emitter.tool_call(E,I,G);yield A.data;A=emitter.interrupt(interrupt_type=Y,interrupt_id=Z,value=O);yield A.data
 		elif L==_A:
 			if isinstance(D,tuple)and len(D)>=2:F=D[0]
 			else:F=D
 			if J:b=type(F).__name__;print(f"[DEBUG] Event: {b}")
 			if isinstance(F,(AIMessageChunk,AIMessage)):
 				for A in bk(F,T):
-					if A.type==_M:S+=A.data.get(_E,'')
+					if A.type==_L:S+=A.data.get(_E,'')
 					if J:print(f"[DEBUG] Yielding: {A.type}")
 					yield A.data
 		elif L==_O:
-			B=json.loads(D);Q=B.get(_G,'');R=B.get(_P,'');G=B.get(_Q,'');E=B.get(_B,'');I=B.get(_D,'');M=B.get(_R,'');c=B.get(_I,_S)
+			B=json.loads(D);Q=B.get(_G,'');R=B.get(_P,'');G=B.get(_Q,'');E=B.get(_B,'');I=B.get(_D,'');M=B.get(_R,'');c=B.get(_H,_S)
 			if Q==_T:A=emitter.tool_call(E,I,G,R);yield A.data
 			elif Q==_U:A=emitter.tool_result(E,M,c,G,R);yield A.data
 	if J:print(_b)
-def stream_handler(stream,debug=_N,interrupts=[],tool_mode=_J):
+def stream_handler(stream,debug=_M,interrupts=[],tool_mode=_I):
 	R='role';J=debug;G=interrupts;G=[];S='';T=StreamParser(top_fields=['path',_E])
 	for E in stream:
 		if not isinstance(E,tuple)or len(E)!=2:continue
 		K,C=E
-		if K==_H:
+		if K==_N:
 			if not isinstance(C,dict):continue
 			for(Y,I)in C.items():
 				if I is _C or isinstance(I,tuple):continue
@@ -111,26 +110,26 @@ def stream_handler(stream,debug=_N,interrupts=[],tool_mode=_J):
 						if isinstance(D,AIMessage)and len(D.tool_calls)>0:
 							for B in D.tool_calls:
 								F=B[_B];L=B[_D];H=B[_F]
-								if tool_mode!=_J and F.strip().lower()in G:continue
+								if tool_mode!=_I and F.strip().lower()in G:continue
 								A=emitter.tool_call(F,L,H);yield A.data
 						if isinstance(D,ToolMessage):F=D.name;M=D.content;H=D.tool_call_id;A=emitter.tool_result(F,M,True,H);yield A.data
 						if isinstance(D,AIMessage)and D.response_metadata['finish_reason']=='stop':N=D.response_metadata.get('token_usage',{});Z=N.get(_X,0);a=N.get(_Y,0);b=N.get(_Z,0)
-			if _K in C:
-				G=C[_K]
+			if _J in C:
+				G=C[_J]
 				if G:
-					print('--'*30);print(f"[INTERRUPT EVENT]: {G}");c=_a;U=list(map(lambda interrupt:{_V:interrupt.id,_L:interrupt.value,R:'ask_human'},G))
-					for O in U:d=O[R];V=O[_L][_G];emitter.interrupt(event_name='interrupt',event_type=V,event_data=O);break
+					print('--'*30);print(f"[INTERRUPT EVENT]: {G}");c=_a;U=list(map(lambda interrupt:{_V:interrupt.id,_K:interrupt.value,R:'ask_human'},G))
+					for O in U:d=O[R];V=O[_K][_G];emitter.interrupt(event_name='interrupt',event_type=V,event_data=O);break
 		elif K==_A:
 			if isinstance(C,tuple)and len(C)>=2:E=C[0]
 			else:E=C
 			if J:W=type(E).__name__;print(f"[DEBUG] Event: {W}")
 			if isinstance(E,(AIMessageChunk,AIMessage)):
 				for A in bk(E,T):
-					if A.type==_M:S+=A.data.get(_E,'')
+					if A.type==_L:S+=A.data.get(_E,'')
 					if J:print(f"[DEBUG] Yielding: {A.type}")
 					yield A.data
 		elif K==_O:
-			print(f"[CUSTOM]: {C}");B=json.loads(C);P=getattr(B,_G,'');Q=getattr(B,_P,'');H=getattr(B,_Q,'');F=getattr(B,_B,'');L=getattr(B,_D,'');M=getattr(B,_R,'');X=getattr(B,_I,_S)
+			print(f"[CUSTOM]: {C}");B=json.loads(C);P=getattr(B,_G,'');Q=getattr(B,_P,'');H=getattr(B,_Q,'');F=getattr(B,_B,'');L=getattr(B,_D,'');M=getattr(B,_R,'');X=getattr(B,_H,_S)
 			if P==_T:A=emitter.tool_call(F,L,H,Q);yield A.data
 			elif P==_U:A=emitter.tool_result(F,M,X,H,Q);yield A.data
 		if J:print(_b)
@@ -156,8 +155,8 @@ def bk(chunk,stream_parser):
 		if G in(L,M):
 			J=A.get(L)or A.get(M)or''
 			if J:yield emitter.thinking(J)
-		elif G==_M:
-			K=A.get(_M)or A.get(_E)or''
+		elif G==_L:
+			K=A.get(_L)or A.get(_E)or''
 			if K:yield emitter.text(K)
 		elif G=='tool_call_chunk':
 			O=A.get(_F,'');H=A.get(_B,'')
@@ -168,6 +167,6 @@ def bk(chunk,stream_parser):
 				if H==I:F.feed(D)
 			if H==I and D=='':F.reset()
 def bl(chunk):
-	A=chunk;D=getattr(A,_B,'unknown');B=str(getattr(A,_E,''));E=getattr(A,'tool_call_id','');F=getattr(A,_I,_W);C=B[:DisplayLimits.TOOL_RESULT_MAX]
+	A=chunk;D=getattr(A,_B,'unknown');B=str(getattr(A,_E,''));E=getattr(A,'tool_call_id','');F=getattr(A,_H,_W);C=B[:DisplayLimits.TOOL_RESULT_MAX]
 	if len(B)>DisplayLimits.TOOL_RESULT_MAX:C+='\n... (truncated)'
 	yield emitter.tool_result(D,C,F,E)

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

@@ -64,12 +64,12 @@ async def astream_handler(stream,emitter,tracker,debug=False):
 					if F:print(f"[DEBUG] Yielding: {C.type}")
 					yield C.data
 				if hasattr(A,_Y)and A.tool_calls:
-					for C in bo(A.tool_calls,E,J):
+					for C in bq(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 bp(A,E,J):
+				for C in bo(A,E,J):
 					if F:print(f"[DEBUG] Yielding: {C.type}")
 					yield C.data
 		elif K==_Z:
@@ -104,12 +104,12 @@ def stream_handler(stream,emitter,tracker,debug=False):
 					if F:print(f"[DEBUG] Yielding: {C.type}")
 					yield C.data
 				if hasattr(A,_Y)and A.tool_calls:
-					for C in bo(A.tool_calls,E,J):
+					for C in bq(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 bp(A,E,J):
+				for C in bo(A,E,J):
 					if F:print(f"[DEBUG] Yielding: {C.type}")
 					yield C.data
 		elif K==_Z:
@@ -160,19 +160,19 @@ def bn(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 bq(block,emitter,tracker):
+def bp(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 bo(tool_calls,emitter,tracker):
+def bq(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 bp(chunk,emitter,tracker):
+def bo(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/tools.py

@@ -445,10 +445,10 @@ def grep(pattern: str, path: str, runtime: ToolRuntime = None) -> str:
     cwd = runtime.context.working_directory
     
     if runtime.context.sandbox:
-        original_path, path = container2local(file_path, cwd)
+        original_path, path = container2local(path, cwd)
         search_path = resolve_path(path, cwd)
     else:
-        search_path = resolve_path(file_path, cwd)
+        search_path = resolve_path(path, cwd)
     
     
     try:

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

@@ -24,7 +24,6 @@ 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
@@ -42,9 +41,9 @@ 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
-b=load_dotenv(find_dotenv())
+d=load_dotenv(find_dotenv())
 class LiveChatUI:
-	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 __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(d);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'});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=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
@@ -78,11 +77,11 @@ class LiveChatUI:
 		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)
+		A.spinner.start();A.b('● 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
+			K='\n'.join(E);A.b('● 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}
@@ -90,7 +89,7 @@ class LiveChatUI:
  用户请求:
 {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()
+	def b(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({_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):
@@ -102,52 +101,49 @@ class LiveChatUI:
 			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):
-		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
+		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';Q='args';P='name';I='type';G='content';A=items;R,U='','';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[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,[]])
+			if B[I]==e:
+				if len(A)>0 and A[-1][1]==e: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,e,_A,B,[]])
+			elif B[I]==f:
+				if len(A)>0 and A[-1][1]==f:R+=B[G];J=markdown_to_wrapped_text(f"{R}");A[-1][0]=J
+				else:R=B[G];J=markdown_to_wrapped_text(f"{R}");A.append([J,f,_A,B,[]])
+			elif B[I]=='token_usage':u=B['input_toks'];v=B['output_toks'];n=B['total_toks'];D.token_count=n
+			elif B[I]==Y:
+				V=B[P];W=B[Q];H=B['id'];K=B[l]
+				if K is _A:F=display_tool_call(V,W,[]);A.append([F,Y,H,B,[]]);A.append([Text('',''),'margin',_A,_A,[]])
 				else:
-					C=index_(A,lambda x:x[2]==I and x[1]==Y)
+					C=index_(A,lambda x:x[2]==K and x[1]==Y)
 					if C is _A:continue
-					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]
+					E=A[C];S=E[3][P];T=E[3][Q];A[C][-1].append([_A,Y,H,B,[]]);F=display_tool_call(S,T,A[C][-1]);A[C][0]=F
+			elif B[I]==g:
+				V=B[P];H=B['id'];K=B[l];X=B[Z]
 				if X==Z:
-					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]]
+					if K is _A:O=B[G];L=index_(A,lambda x:x[2]==H);o=A[L][3];W=o[Q];F=display_tool_result(V,W,O,A[L][-1]);A[L]=[F,g,H,B,A[L][-1]]
 					else:
-						C=index_(A,lambda x:x[2]==I)
+						C=index_(A,lambda x:x[2]==K)
 						if C is _A:continue
-						E=A[C];S=E[3][O];T=E[3][P];M=index_(E[-1],lambda x:x[2]==H)
+						E=A[C];S=E[3][P];T=E[3][Q];M=index_(E[-1],lambda x:x[2]==H)
 						if M is _A:continue
-						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
+						N=E[-1][M];N[3][Z]=X;N[3][G]=B[G];A[C][-1][M]=N;O='';F=display_tool_result(S,T,O,A[C][-1]);A[C][0]=F
 				elif X=='error':
-					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]]
+					if K is _A:O=B[G];F=display_tool_error(V,W,O,A[L][-1]);A[L]=[F,g,H,B,A[L][-1]]
 					else:
-						C=index_(A,lambda x:x[2]==I)
+						C=index_(A,lambda x:x[2]==K)
 						if C is _A:continue
-						E=A[C];S=E[3][O];T=E[3][P];M=index_(E[-1],lambda x:x[2]==H)
+						E=A[C];S=E[3][P];T=E[3][Q];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(S,T,U,A[C][-1]);A[C][0]=F
-			elif B[J]=='done':0
-			elif B[J]=='interrupt':
+						N=E[-1][M];N[Z]=X;N[G]=B[G];A[C][-1][M]=N;F=display_tool_error(S,T,O,A[C][-1]);A[C][0]=F
+			elif B[I]=='done':0
+			elif B[I]=='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})
+				for d in B[m][m]['action_requests']:w=d[P];x=d[Q];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({I: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
+		return R
 	async def _handle_human_interrupt(A,message,options):
 		E=asyncio.get_event_loop();C=E.create_future();D=A.app.key_bindings
 		def F(index):