Separate tool name from output across all agent sessions (s03-s_full)

Extends the readability fix from PR #128 (s02) to all remaining sessions.
Tool name and output are now on separate lines, consistent with s01's
existing pattern and improving readability for multi-line tool output.
This commit is contained in:
CrazyBoyM
2026-03-29 23:27:41 +08:00
parent a66558a8df
commit 10d90cdcc6
10 changed files with 20 additions and 10 deletions

View File

@@ -181,7 +181,8 @@ def agent_loop(messages: list):
output = handler(**block.input) if handler else f"Unknown tool: {block.name}" output = handler(**block.input) if handler else f"Unknown tool: {block.name}"
except Exception as e: except Exception as e:
output = f"Error: {e}" output = f"Error: {e}"
print(f"> {block.name}: {str(output)[:200]}") print(f"> {block.name}:")
print(str(output)[:200])
results.append({"type": "tool_result", "tool_use_id": block.id, "content": str(output)}) results.append({"type": "tool_result", "tool_use_id": block.id, "content": str(output)})
if block.name == "todo": if block.name == "todo":
used_todo = True used_todo = True

View File

@@ -202,7 +202,8 @@ def agent_loop(messages: list):
output = handler(**block.input) if handler else f"Unknown tool: {block.name}" output = handler(**block.input) if handler else f"Unknown tool: {block.name}"
except Exception as e: except Exception as e:
output = f"Error: {e}" output = f"Error: {e}"
print(f"> {block.name}: {str(output)[:200]}") print(f"> {block.name}:")
print(str(output)[:200])
results.append({"type": "tool_result", "tool_use_id": block.id, "content": str(output)}) results.append({"type": "tool_result", "tool_use_id": block.id, "content": str(output)})
messages.append({"role": "user", "content": results}) messages.append({"role": "user", "content": results})

View File

@@ -220,7 +220,8 @@ def agent_loop(messages: list):
output = handler(**block.input) if handler else f"Unknown tool: {block.name}" output = handler(**block.input) if handler else f"Unknown tool: {block.name}"
except Exception as e: except Exception as e:
output = f"Error: {e}" output = f"Error: {e}"
print(f"> {block.name}: {str(output)[:200]}") print(f"> {block.name}:")
print(str(output)[:200])
results.append({"type": "tool_result", "tool_use_id": block.id, "content": str(output)}) results.append({"type": "tool_result", "tool_use_id": block.id, "content": str(output)})
messages.append({"role": "user", "content": results}) messages.append({"role": "user", "content": results})
# Layer 3: manual compact triggered by the compact tool # Layer 3: manual compact triggered by the compact tool

View File

@@ -228,7 +228,8 @@ def agent_loop(messages: list):
output = handler(**block.input) if handler else f"Unknown tool: {block.name}" output = handler(**block.input) if handler else f"Unknown tool: {block.name}"
except Exception as e: except Exception as e:
output = f"Error: {e}" output = f"Error: {e}"
print(f"> {block.name}: {str(output)[:200]}") print(f"> {block.name}:")
print(str(output)[:200])
results.append({"type": "tool_result", "tool_use_id": block.id, "content": str(output)}) results.append({"type": "tool_result", "tool_use_id": block.id, "content": str(output)})
messages.append({"role": "user", "content": results}) messages.append({"role": "user", "content": results})

View File

@@ -210,7 +210,8 @@ def agent_loop(messages: list):
output = handler(**block.input) if handler else f"Unknown tool: {block.name}" output = handler(**block.input) if handler else f"Unknown tool: {block.name}"
except Exception as e: except Exception as e:
output = f"Error: {e}" output = f"Error: {e}"
print(f"> {block.name}: {str(output)[:200]}") print(f"> {block.name}:")
print(str(output)[:200])
results.append({"type": "tool_result", "tool_use_id": block.id, "content": str(output)}) results.append({"type": "tool_result", "tool_use_id": block.id, "content": str(output)})
messages.append({"role": "user", "content": results}) messages.append({"role": "user", "content": results})

View File

@@ -372,7 +372,8 @@ def agent_loop(messages: list):
output = handler(**block.input) if handler else f"Unknown tool: {block.name}" output = handler(**block.input) if handler else f"Unknown tool: {block.name}"
except Exception as e: except Exception as e:
output = f"Error: {e}" output = f"Error: {e}"
print(f"> {block.name}: {str(output)[:200]}") print(f"> {block.name}:")
print(str(output)[:200])
results.append({ results.append({
"type": "tool_result", "type": "tool_result",
"tool_use_id": block.id, "tool_use_id": block.id,

View File

@@ -453,7 +453,8 @@ def agent_loop(messages: list):
output = handler(**block.input) if handler else f"Unknown tool: {block.name}" output = handler(**block.input) if handler else f"Unknown tool: {block.name}"
except Exception as e: except Exception as e:
output = f"Error: {e}" output = f"Error: {e}"
print(f"> {block.name}: {str(output)[:200]}") print(f"> {block.name}:")
print(str(output)[:200])
results.append({ results.append({
"type": "tool_result", "type": "tool_result",
"tool_use_id": block.id, "tool_use_id": block.id,

View File

@@ -537,7 +537,8 @@ def agent_loop(messages: list):
output = handler(**block.input) if handler else f"Unknown tool: {block.name}" output = handler(**block.input) if handler else f"Unknown tool: {block.name}"
except Exception as e: except Exception as e:
output = f"Error: {e}" output = f"Error: {e}"
print(f"> {block.name}: {str(output)[:200]}") print(f"> {block.name}:")
print(str(output)[:200])
results.append({ results.append({
"type": "tool_result", "type": "tool_result",
"tool_use_id": block.id, "tool_use_id": block.id,

View File

@@ -747,7 +747,8 @@ def agent_loop(messages: list):
output = handler(**block.input) if handler else f"Unknown tool: {block.name}" output = handler(**block.input) if handler else f"Unknown tool: {block.name}"
except Exception as e: except Exception as e:
output = f"Error: {e}" output = f"Error: {e}"
print(f"> {block.name}: {str(output)[:200]}") print(f"> {block.name}:")
print(str(output)[:200])
results.append( results.append(
{ {
"type": "tool_result", "type": "tool_result",

View File

@@ -692,7 +692,8 @@ def agent_loop(messages: list):
output = handler(**block.input) if handler else f"Unknown tool: {block.name}" output = handler(**block.input) if handler else f"Unknown tool: {block.name}"
except Exception as e: except Exception as e:
output = f"Error: {e}" output = f"Error: {e}"
print(f"> {block.name}: {str(output)[:200]}") print(f"> {block.name}:")
print(str(output)[:200])
results.append({"type": "tool_result", "tool_use_id": block.id, "content": str(output)}) results.append({"type": "tool_result", "tool_use_id": block.id, "content": str(output)})
if block.name == "TodoWrite": if block.name == "TodoWrite":
used_todo = True used_todo = True