izackp/takopi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: normalize cli item ids

Browse Source
This commit is contained in:
banteg
2025-12-28 23:06:26 +04:00
parent 638ee879e0
commit c2820e5b87
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex_telegram_bridge/src/codex_telegram_bridge/exec_render.py
+8 -11
View File
@@ -209,6 +209,7 @@ def render_event_cli(
_record_item(state, item) _record_item(state, item)
itype = item.get("type") itype = item.get("type")
item_num = _extract_numeric_id(item.get("id"), state.last_turn)
if itype == "agent_message" and etype == "item.completed": if itype == "agent_message" and etype == "item.completed":
text = item.get("text", "") text = item.get("text", "")
@@ -228,13 +229,11 @@ def render_event_cli(
elif itype == "command_execution": elif itype == "command_execution":
command = _format_command(item.get("command", "")) command = _format_command(item.get("command", ""))
if etype == "item.started": if etype == "item.started":
lines.append(_with_id(_extract_numeric_id(item.get("id")), f"{STATUS_RUNNING} running: {command}")) lines.append(_with_id(item_num, f"{STATUS_RUNNING} running: {command}"))
elif etype == "item.completed": elif etype == "item.completed":
exit_code = item.get("exit_code") exit_code = item.get("exit_code")
exit_part = f" (exit {exit_code})" if exit_code is not None else "" exit_part = f" (exit {exit_code})" if exit_code is not None else ""
lines.append( lines.append(_with_id(item_num, f"{STATUS_DONE} ran: {command}{exit_part}"))
_with_id(_extract_numeric_id(item.get(\"id\")), f\"{STATUS_DONE} ran: {command}{exit_part}\")
)
if show_output: if show_output:
output = _truncate_output(item.get("aggregated_output", "")) output = _truncate_output(item.get("aggregated_output", ""))
if output: if output:
@@ -242,24 +241,22 @@ def render_event_cli(
elif itype == "file_change" and etype == "item.completed": elif itype == "file_change" and etype == "item.completed":
line = _format_file_change(item.get("changes", [])) line = _format_file_change(item.get("changes", []))
lines.append(_with_id(_extract_numeric_id(item.get(\"id\")), f\"{STATUS_DONE} {line}\")) lines.append(_with_id(item_num, f"{STATUS_DONE} {line}"))
elif itype == "mcp_tool_call": elif itype == "mcp_tool_call":
name = _format_tool_call(item.get("server", ""), item.get("tool", "")) name = _format_tool_call(item.get("server", ""), item.get("tool", ""))
if etype == "item.started": if etype == "item.started":
lines.append( lines.append(_with_id(item_num, f"{STATUS_RUNNING} tool: {name}"))
_with_id(_extract_numeric_id(item.get(\"id\")), f\"{STATUS_RUNNING} tool: {name}\")
)
elif etype == "item.completed": elif etype == "item.completed":
lines.append(_with_id(_extract_numeric_id(item.get(\"id\")), f\"{STATUS_DONE} tool: {name}\")) lines.append(_with_id(item_num, f"{STATUS_DONE} tool: {name}"))
elif itype == "web_search" and etype == "item.completed": elif itype == "web_search" and etype == "item.completed":
query = _format_query(item.get("query", "")) query = _format_query(item.get("query", ""))
lines.append(_with_id(_extract_numeric_id(item.get(\"id\")), f\"{STATUS_DONE} searched: {query}\")) lines.append(_with_id(item_num, f"{STATUS_DONE} searched: {query}"))
elif itype == "error" and etype == "item.completed": elif itype == "error" and etype == "item.completed":
warning = _truncate(item.get("message", ""), 120) warning = _truncate(item.get("message", ""), 120)
lines.append(_with_id(_extract_numeric_id(item.get(\"id\")), f\"{STATUS_DONE} warning: {warning}\")) lines.append(_with_id(item_num, f"{STATUS_DONE} warning: {warning}"))
return lines return lines