@brandon_9527/tcode 1.0.6 → 1.0.7

package/dist/python-src/src/trackers/token/report.py

@@ -0,0 +1,114 @@
+from __future__ import annotations
+_O='output'
+_N='by_session_id'
+_M='by_user_id'
+_L='by_tag'
+_K='by_model'
+_J='total_tokens'
+_I='total_calls'
+_H='total_cost_usd'
+_G='period'
+_F='by_period'
+_E='until'
+_D='since'
+_C='calls'
+_B='cost_usd'
+_A=None
+import json
+from collections import defaultdict
+from datetime import datetime
+from typing import Optional
+from.tracker import CostTracker
+def dc(since,until,tag=_A,user_id=_A,session_id=_A):
+	F=session_id;E=user_id;D=until;C=since;A=[];B=[]
+	if C:A.append('timestamp >= ?');B.append(C.isoformat())
+	if D:A.append('timestamp <= ?');B.append(D.isoformat())
+	if tag:A.append('tag = ?');B.append(tag)
+	if E:A.append('user_id = ?');B.append(E)
+	if F:A.append('session_id = ?');B.append(F)
+	G=' AND '.join(A)if A else'1=1';return G,B
+def dd(period):
+	A=period
+	if A=='daily':return"strftime('%Y-%m-%d', timestamp)"
+	elif A=='weekly':return"strftime('%Y-%W', timestamp)"
+	elif A=='monthly':return"strftime('%Y-%m', timestamp)"
+	else:raise ValueError(f"Unknown period: {A}")
+class CostReport:
+	def __init__(A,tracker):A.tracker=tracker
+	def build(L,since=_A,until=_A,period='daily',tag=_A,user_id=_A,session_id=_A):I=period;H=until;G=since;F='output_tokens';E='input_tokens';B,C=dc(G,H,tag,user_id,session_id);A=L.tracker._conn.cursor();A.execute(f"""
+            SELECT 
+                COUNT(*),
+                SUM(cost),
+                SUM(input_tokens),
+                SUM(output_tokens)
+            FROM usage
+            WHERE {B}
+            """,C);D=A.fetchone();M=D[0]or 0;N=D[1]or .0;J=D[2]or 0;K=D[3]or 0;A.execute(f"""
+            SELECT 
+                model,
+                COUNT(*),
+                SUM(cost),
+                SUM(input_tokens),
+                SUM(output_tokens)
+            FROM usage
+            WHERE {B}
+            GROUP BY model
+            ORDER BY SUM(cost) DESC
+            """,C);O={A:{_B:round(C or 0,6),_C:B,E:D or 0,F:G or 0}for(A,B,C,D,G)in A.fetchall()};A.execute(f"""
+            SELECT 
+                tag,
+                COUNT(*),
+                SUM(cost),
+                SUM(input_tokens),
+                SUM(output_tokens)
+            FROM usage
+            WHERE {B}
+            GROUP BY tag
+            ORDER BY SUM(cost) DESC
+            """,C);P={A:{_B:round(C or 0,6),_C:B,E:D or 0,F:G or 0}for(A,B,C,D,G)in A.fetchall()};A.execute(f"""
+            SELECT 
+                user_id,
+                COUNT(*),
+                SUM(cost),
+                SUM(input_tokens),
+                SUM(output_tokens)
+            FROM usage
+            WHERE {B}
+            GROUP BY user_id
+            ORDER BY SUM(cost) DESC
+            """,C);Q={A:{_B:round(C or 0,6),_C:B,E:D or 0,F:G or 0}for(A,B,C,D,G)in A.fetchall()};A.execute(f"""
+            SELECT 
+                session_id,
+                COUNT(*),
+                SUM(cost),
+                SUM(input_tokens),
+                SUM(output_tokens)
+            FROM usage
+            WHERE {B}
+            GROUP BY session_id
+            ORDER BY SUM(cost) DESC
+            """,C);R={A:{_B:round(C or 0,6),_C:B,E:D or 0,F:G or 0}for(A,B,C,D,G)in A.fetchall()};S=dd(I);A.execute(f"""
+            SELECT 
+                {S} as bucket,
+                COUNT(*),
+                SUM(cost)
+            FROM usage
+            WHERE {B}
+            GROUP BY bucket
+            ORDER BY bucket
+            """,C);T={A:{_B:round(C or 0,6),_C:B}for(A,B,C)in A.fetchall()};return{_G:I,_D:G.isoformat()if G else _A,_E:H.isoformat()if H else _A,_H:round(N,6),_I:M,_J:{'input':J,_O:K,'total':J+K},_K:O,_L:P,_M:Q,_N:R,_F:T}
+	def to_json(A,**B):return json.dumps(A.build(**B),indent=2)
+	def to_text(G,**H):
+		E='─';B=G.build(**H);A=[];A.append(E*60);A.append('  LLM Cost Report');A.append(E*60)
+		if B[_D]:A.append(f"  Since: {B[_D]}")
+		if B[_E]:A.append(f"  Until: {B[_E]}")
+		A.append('');A.append(f"  Total cost  : ${B[_H]:.4f}");A.append(f"  Total calls : {B[_I]}");D=B[_J];A.append(f"  Tokens      : {D['input']:,} in / {D[_O]:,} out ({D['total']:,})")
+		def C(title,data):
+			if not data:return
+			A.append(f"\n  {title}:")
+			for(C,B)in data.items():A.append(f"    {C:<30} ${B[_B]:.4f} ({B[_C]} calls)")
+		C('By Model',B[_K]);C('By Tag',B[_L]);C('By User',B[_M]);C('By Session',B[_N])
+		if B[_F]:
+			A.append(f"\n  {B[_G].capitalize()} Breakdown:")
+			for(I,F)in B[_F].items():A.append(f"    {I:<15} ${F[_B]:.4f} ({F[_C]} calls)")
+		A.append('\n'+E*60);return'\n'.join(A)

package/dist/python-src/src/trackers/token/tracker.py

@@ -0,0 +1,65 @@
+_D=True
+_C='anonymous'
+_B='default'
+_A=None
+import asyncio,json,os,sqlite3,uuid
+from dataclasses import dataclass,asdict
+from datetime import datetime,timezone
+from pathlib import Path
+from typing import Optional,List,Dict
+@dataclass
+class UsageRecord:
+	model:str;input_tokens:int;output_tokens:int;tag:str=_B;user_id:str=_C;session_id:str=_B;timestamp:str=_A;record_id:str=_A;cost_usd:float=.0
+	def __post_init__(A):
+		if not A.timestamp:A.timestamp=datetime.now(timezone.utc).isoformat()
+		if not A.record_id:A.record_id=str(uuid.uuid4())[:8]
+	def to_tuple(A):return A.record_id,A.model,A.input_tokens,A.output_tokens,A.cost_usd,A.tag,A.user_id,A.session_id,A.timestamp
+class BudgetExceeded(Exception):0
+@dataclass
+class BudgetGuard:tag:Optional[str]=_A;user_id:Optional[str]=_A;session_id:Optional[str]=_A;limit_usd:float;alert_at:float=.8;raise_on_exceed:bool=_D
+class CostTracker:
+	DEFAULT_DB=Path.home()/'.config'/'llm-cost-tracker'/'usage.db'
+	def __init__(A,db_path=_A,pricing=_A,budgets=_A,batch_size=50,flush_interval=1.):A.db_path=Path(db_path or os.environ.get('LLM_COST_DB',A.DEFAULT_DB));A.db_path.parent.mkdir(parents=_D,exist_ok=_D);A.pricing=pricing;A.budgets={A.tag or f"{A.user_id or _C}_{A.session_id or _B}":A for A in budgets or[]};A.batch_size=batch_size;A.flush_interval=flush_interval;A._queue=asyncio.Queue();A._task=_A;A._conn=_A
+	async def start(A):A._conn=sqlite3.connect(A.db_path,isolation_level=_A,check_same_thread=False);A._conn.execute('PRAGMA journal_mode=WAL;');A._conn.execute('PRAGMA synchronous=NORMAL;');A.db();A._task=asyncio.create_task(A._writer_loop())
+	async def stop(A):
+		await A._queue.put(_A)
+		if A._task:await A._task
+		if A._conn:A._conn.close()
+	def db(A):A._conn.execute(' \n            CREATE TABLE IF NOT EXISTS usage (\n                id TEXT PRIMARY KEY,\n                model TEXT,\n                input_tokens INTEGER,\n                output_tokens INTEGER,\n                cost REAL,\n                \n                tag TEXT,\n                user_id TEXT,\n                session_id TEXT,\n                \n                timestamp TEXT\n            )\n            ');A._conn.execute('CREATE INDEX IF NOT EXISTS idx_tag ON usage(tag)');A._conn.execute('CREATE INDEX IF NOT EXISTS idx_user_id ON usage(user_id)');A._conn.execute('CREATE INDEX IF NOT EXISTS idx_session_id ON usage(session_id)');A._conn.execute('CREATE INDEX IF NOT EXISTS idx_user_session ON usage(user_id, session_id)')
+	async def add_call(A,model,input_tokens,output_tokens,tag=_B,user_id=_C,session_id=_C):
+		D=output_tokens;C=input_tokens;B=model;E=.0
+		if A.pricing:
+			try:E=A.pricing.compute_cost(B,C,D)
+			except Exception:pass
+		F=UsageRecord(model=B,input_tokens=C,output_tokens=D,tag=tag,user_id=user_id,session_id=session_id,cost_usd=E);await A._queue.put(F)
+	async def _write_loop(B):
+		A=[]
+		while _D:
+			try:C=await asyncio.wait_for(B._queue.get(),timeout=B.flush_interval)
+			except asyncio.TimeoutError:C=_A
+			if C is _A:
+				if A:B.da(A);A.clear()
+				if C is _A and B._queue.empty():break
+				continue
+			A.append(C)
+			if len(A)>=B.batch_size:B.da(A);A.clear()
+	def da(D,records):
+		F=records;A=D._conn.cursor()
+		try:
+			A.execute('BEGIN');A.executemany(' \n                INSERT INTO usage\n                (id, model, input_tokens, output_tokens, cost, tag, user_id, session_id, timestamp)\n                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)\n                ',[A.to_tuple()for A in F]);H={A.tag for A in F}
+			for B in H:
+				if B not in D.budgets:continue
+				C=D.budgets[B];A.execute('SELECT SUM(cost) from usage WHERE tag=?',(B,));G=A.fetchone()[0]or .0;E=G/C.limit_usd if C.limit_usd else 0
+				if E>=1.:
+					if C.raise_on_exceed:raise BudgetExceeded(f"{B} exceeded: {G:.4f}/{C.limit_usd:.4f}")
+				elif E>=C.alert_at:print(f"[WARN] {B} budget {E:.0%}")
+			A.execute('COMMIT')
+		except Exception:A.execute('ROLLBACK');raise
+	def cz(A):
+		B=[];C=[]
+		if A.tag:B.append('tag=?');C.append(A.tag)
+		if A.user_id:B.append('user_id=?');C.append(A.user_id)
+		if A.session_id:B.append('session_id=?');C.append(A.session_id)
+		D=' AND '.join(B)if B else'1=1';return D,C
+	def total_cost(A,tag=_A,user_id=_A,session_id=_A):B=A._conn.cursor();C=BudgetGuard(tag,user_id,session_id);D,E=A.cz(C);B.execute(f"SELECT SUM(cost) FROM usage WHERE {D}",E);return B.fetchone()[0]or .0
+	def total_tokens(C,tag=_A,user_id=_A,session_id=_A):E=BudgetGuard(tag,user_id,session_id);D=C._conn.cursor();F,G=C.cz(E);D.execute(f"SELECT SUM(input_tokens), SUM(output_tokens) FROM usage WHERE {F}",G);A,B=D.fetchone();A=A or 0;B=B or 0;return{'input':A,'output':B,'total':A+B}

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

@@ -26,6 +26,7 @@ from prompt_toolkit.styles import Style
 from prompt_toolkit import Application
 from rich.markdown import Markdown
 from rich.columns import Columns
+from rich.console import Group
 from rich.markup import render
 from rich.panel import Panel
 from rich.text import Text
@@ -41,11 +42,11 @@ 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
-d=load_dotenv(find_dotenv())
+a=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(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):
+	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(a);A.kb=KeyBindings();A.e();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=_B,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 d(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 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=_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} ")]
@@ -58,7 +59,7 @@ class LiveChatUI:
 	def clear(A):A.log_control.clear();A.input_box.text='';B=render_info(LOGO.format(A.workspace),style='light_stell_blue',markdown=_C);A.log_control.append_text(B);A.app.invalidate();A.app.layout.focus(A.input_box)
 	async def updater(A):await A.spinner.run(A.app)
 	async def run_async(A):await asyncio.gather(A.app.run_async(),A.updater())
-	def a(A):
+	def e(A):
 		D='enter';C='escape'
 		@A.kb.add(D)
 		def B(event):
@@ -77,19 +78,19 @@ 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.b('● user',f"● {B}",style='light_salmon3');await asyncio.sleep(.05)
+		A.spinner.start();A.c('● 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.b('● bot',K,style=D,markdown=_B);return
+			K='\n'.join(E);A.c('● 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 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()
+		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.d(spinner='',status='等待输入',tokens=A.token_count);A.app.layout.focus(A.input_box);return L
+	def c(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):
@@ -142,7 +143,7 @@ class LiveChatUI:
 				D.spinner.stop();j=[];p=B['interrupt_id']
 				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)
+			r=Group(*[A[0]for A in A]);D.log_control.update_last(render_panel(a,r,b,c));D.app.invalidate();await asyncio.sleep(.03);s='';D.d(spinner=s,status='正在生成 ...',tokens=D.token_count)
 		return R
 	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.r(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.q()
+	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.r(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.v()
 	def r(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):
 		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 t(A):A.rows=A.p();A.list_container.children=A.rows;get_app().invalidate()
-	def q(A):
+	def s(A):A.rows=A.p();A.list_container.children=A.rows;get_app().invalidate()
+	def v(A):
 		@A.kb.add('up')
 		def B(event):
-			if A.selected_index>0:A.selected_index-=1;A.t()
+			if A.selected_index>0:A.selected_index-=1;A.s()
 		@A.kb.add('down')
 		def C(event):
-			if A.selected_index<len(A.options)-1:A.selected_index+=1;A.t()
+			if A.selected_index<len(A.options)-1:A.selected_index+=1;A.s()
 		@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,44 +6,44 @@ 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.x()
 	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.x()
 	def refresh_scroll(A):
 		if A._height:A.scroll_offset=max(0,len(A.lines)-A._height)
-	def z(A):
+	def x(A):
 		if A._height:A.scroll_offset=max(0,len(A.lines)-A._height)
-	def x(A,amount):
+	def y(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
 	def create_content(B,width,height):A=height;B._height=A or 100;return super().create_content(width,A)
 	def mouse_handler(A,mouse_event):
 		B=mouse_event;C=5
-		if B.event_type==MouseEventType.SCROLL_UP:A.x(-C);return
-		elif B.event_type==MouseEventType.SCROLL_DOWN:A.x(C);return
+		if B.event_type==MouseEventType.SCROLL_UP:A.y(-C);return
+		elif B.event_type==MouseEventType.SCROLL_DOWN:A.y(C);return
 		return NotImplemented
 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.x()
 	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.x()
 	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 x(A,amount):A.scroll_offset=max(0,min(A.scroll_offset+amount,max(0,len(A.lines)-A._height)))
+	def x(A):A.scroll_offset=max(0,len(A.lines)-A._height)
+	def y(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))
 	def get_line(B,lineno):
@@ -52,7 +52,7 @@ class ScrollableLogControl(UIControl):
 		C=sanitize_ansi_text(B.visible_lines[A]);return ANSI(C).__pt_formatted_text__()
 	def mouse_handler(A,mouse_event):
 		B=mouse_event
-		if B.event_type==MouseEventType.SCROLL_UP:A.x(-1);return
-		elif B.event_type==MouseEventType.SCROLL_DOWN:A.x(1);return
+		if B.event_type==MouseEventType.SCROLL_UP:A.y(-1);return
+		elif B.event_type==MouseEventType.SCROLL_DOWN:A.y(1);return
 		return NotImplemented
 def sanitize_ansi_text(text):return re.sub('[¹²³⁰⁴⁵⁶⁷⁸⁹₀₁₂₃₄₅₆₇₈₉]',' ',text)

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

@@ -19,6 +19,7 @@ _A='\n'
 from pathlib import Path,PurePath
 import json,os
 from rich.columns import Columns
+from rich.console import Group
 from rich.panel import Panel
 from rich.text import Text
 from rich.tree import Tree
@@ -27,7 +28,7 @@ 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=h(C,args);B=Tree(Text(_I,style=_J)+Text(f"{E}",style=_C),guide_style=_D)
+	C=tool_name;A=events;E=format_tool_compact(C,args);D=l(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
@@ -36,14 +37,14 @@ def display_tool_result(tool_name,args=_E,result=_E,events=[]):
 	if A is _E:A={}
 	H=format_tool_compact(G,A);C=G.lower()
 	try:
-		if C==_K and isinstance(A,dict):B=f(A)
-		elif C==_L and isinstance(A,dict):B=f(A)
-		elif C in[_M]and isinstance(A,dict):B=f(A)
-		elif C==_H and isinstance(A,dict):B=o(A,D)
-		elif C==_N and isinstance(A,dict):B=m(A,D)
-		elif C==_O and isinstance(A,dict):B=n(A,D)
-		elif C==_P and isinstance(A,dict):B=l(A,D)
-		else:B=k(A,D)
+		if C==_K and isinstance(A,dict):B=o(A)
+		elif C==_L and isinstance(A,dict):B=o(A)
+		elif C in[_M]and isinstance(A,dict):B=o(A)
+		elif C==_H and isinstance(A,dict):B=f(A,D)
+		elif C==_N and isinstance(A,dict):B=g(A,D)
+		elif C==_O and isinstance(A,dict):B=h(A,D)
+		elif C==_P and isinstance(A,dict):B=i(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,sub_events=E);F.add(K)
@@ -101,12 +102,12 @@ def format_tool_compact(name,args):
 	I=', '.join(M)
 	if len(I)>50:I=I[:47]+_B
 	return f"{J}({I})"
-def h(tool_name,arguments):
+def l(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 g(C)
-	elif A==_K:return j(C)
+	elif A==_L:return m(C)
+	elif A==_K:return k(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)
@@ -121,13 +122,13 @@ def display_sub_panel(result=_E,sub_events=[]):
 		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))
-	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 j(arguments):
+	J=Group(*[A for A in A]);K=Box('    \n    \n    \n    \n    \n    \n    \n    ');L=Panel(J,title_align='left',box=K);return L
+def k(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 g(arguments):
+def m(arguments):
 	D=arguments;A=D.get(_F,'');B=D.get(_R,'')
 	if os.path.exists(A):C=open(A,'r').read()
 	else:C=''
@@ -136,7 +137,7 @@ def g(arguments):
 		E=recognize_language(A)
 		if E:G=f"```\n{E}\n{B}\n```";return render_content_with_line_limit(G,'',100)
 		else:return render_content_with_line_limit(B,'',100)
-def f(arguments):
+def o(arguments):
 	B=arguments.get(_F,'');C=''
 	if os.path.exists(B):C=open(B,'r').read()
 	E=C.split(_A);F=len(E);A=50
@@ -145,7 +146,7 @@ def f(arguments):
 	H=recognize_language(B)
 	if H:J=f"```{H}\n{D}\n```";return render_content_with_line_limit(J,'',-1)
 	else:return render_content_with_line_limit(D,'',-1)
-def i(arguments,result):
+def n(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''
@@ -154,7 +155,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 o(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''
@@ -163,7 +164,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 m(arguments,result):
+def g(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 +173,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 n(arguments,result):
+def h(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 +182,7 @@ def n(arguments,result):
 	E=F-D
 	if E>0:B.append(f" ... and {E} more lines")
 	return Text(_A.join(B),style=_G)
-def l(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''
@@ -190,7 +191,7 @@ def l(arguments,result):
 	E=F-D
 	if E>0:B.append(f" ... and {E} more lines")
 	return Text(_A.join(B),style=_G)
-def k(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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brandon_9527/tcode",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "TypeScript版 单仓库混合方案（Python源码随npm发布，本地Build）",
   "main": "dist/cli.js",
   "bin": {