feat(agents,backends,conversations,frontends,ui): progress thinking is told apart by its agent, raycast reasoning stays collapsed, read_conversation keeps progress
This commit is contained in:
1 parent
13873f857b
commit
120985deab
18 files changed
+374
-110
No files matched your search
@@ -341,7 +341,11 @@ class MarkdownFrontend(Frontend):
|
||||
file_path=file_path,
|
||||
first_user_text=parsed.turns[0].text,
|
||||
)
|
||||
outcome = diff_and_fork(stored=stored_msgs, incoming=parsed.turns)
|
||||
outcome = diff_and_fork(
|
||||
stored=stored_msgs,
|
||||
incoming=parsed.turns,
|
||||
thinking_is_progress=agent.thinking_is_progress,
|
||||
)
|
||||
capture = TurnCapture()
|
||||
events = runtime.conversations.turn(
|
||||
conv,
|
||||
@@ -356,6 +360,7 @@ class MarkdownFrontend(Frontend):
|
||||
file_path=file_path,
|
||||
parsed=parsed,
|
||||
model=agent.model or agent.name,
|
||||
thinking_is_progress=agent.thinking_is_progress,
|
||||
filename=filename,
|
||||
write_disk=write_disk,
|
||||
)
|
||||
@@ -371,6 +376,7 @@ class MarkdownFrontend(Frontend):
|
||||
parsed=parsed,
|
||||
message=message,
|
||||
agent_name=agent.name,
|
||||
thinking_is_progress=agent.thinking_is_progress,
|
||||
conv_external_id=conv_external_id,
|
||||
write_disk=write_disk,
|
||||
)
|
||||
@@ -388,6 +394,7 @@ class MarkdownFrontend(Frontend):
|
||||
agent_name=agent.name,
|
||||
input_messages=list(parsed.messages),
|
||||
output_message=message,
|
||||
thinking_is_progress=agent.thinking_is_progress,
|
||||
system=None,
|
||||
source="markdown",
|
||||
)
|
||||
@@ -534,7 +541,11 @@ class MarkdownFrontend(Frontend):
|
||||
len(stored_msgs),
|
||||
len(parsed.turns),
|
||||
)
|
||||
outcome = diff_and_fork(stored=stored_msgs, incoming=parsed.turns)
|
||||
outcome = diff_and_fork(
|
||||
stored=stored_msgs,
|
||||
incoming=parsed.turns,
|
||||
thinking_is_progress=agent.thinking_is_progress,
|
||||
)
|
||||
_log.info(
|
||||
"chat/stream: file=%s diff_and_fork divergence=%s "
|
||||
"backend_msgs=%d persist_msgs=%d",
|
||||
@@ -567,7 +578,9 @@ class MarkdownFrontend(Frontend):
|
||||
partial = acc.finalize(model=model)
|
||||
if not partial.content:
|
||||
return None
|
||||
rendered = renderer.render_assistant_message(partial)
|
||||
rendered = renderer.render_assistant_message(
|
||||
partial, thinking_is_progress=agent.thinking_is_progress
|
||||
)
|
||||
new_body = renderer.append_to_body(parsed.body, rendered)
|
||||
return reattach_frontmatter(parsed.metadata, new_body)
|
||||
|
||||
@@ -593,7 +606,10 @@ class MarkdownFrontend(Frontend):
|
||||
new_body = parsed.body
|
||||
if partial.content:
|
||||
new_body = renderer.append_to_body(
|
||||
new_body, renderer.render_assistant_message(partial)
|
||||
new_body,
|
||||
renderer.render_assistant_message(
|
||||
partial, thinking_is_progress=agent.thinking_is_progress
|
||||
),
|
||||
)
|
||||
new_body = renderer.append_to_body(new_body, _render_error_block(exc))
|
||||
if write_disk:
|
||||
@@ -616,6 +632,7 @@ class MarkdownFrontend(Frontend):
|
||||
parsed=parsed,
|
||||
message=message,
|
||||
agent_name=agent.name,
|
||||
thinking_is_progress=agent.thinking_is_progress,
|
||||
conv_external_id=conv_external_id,
|
||||
write_disk=write_disk,
|
||||
)
|
||||
@@ -633,6 +650,7 @@ class MarkdownFrontend(Frontend):
|
||||
agent_name=agent.name,
|
||||
input_messages=list(parsed.messages),
|
||||
output_message=message,
|
||||
thinking_is_progress=agent.thinking_is_progress,
|
||||
system=None,
|
||||
source="markdown",
|
||||
)
|
||||
@@ -659,6 +677,7 @@ class MarkdownFrontend(Frontend):
|
||||
file_path: Path,
|
||||
parsed: parser.ParsedFile,
|
||||
model: str,
|
||||
thinking_is_progress: bool,
|
||||
filename: str,
|
||||
write_disk: bool = True,
|
||||
) -> Any:
|
||||
@@ -675,7 +694,9 @@ class MarkdownFrontend(Frontend):
|
||||
partial = acc.finalize(model=model)
|
||||
if not partial.content:
|
||||
return
|
||||
rendered = renderer.render_assistant_message(partial)
|
||||
rendered = renderer.render_assistant_message(
|
||||
partial, thinking_is_progress=thinking_is_progress
|
||||
)
|
||||
new_body = renderer.append_to_body(parsed.body, rendered)
|
||||
await write_atomic(
|
||||
file_path, reattach_frontmatter(parsed.metadata, new_body)
|
||||
@@ -698,7 +719,10 @@ class MarkdownFrontend(Frontend):
|
||||
new_body = parsed.body
|
||||
if partial.content:
|
||||
new_body = renderer.append_to_body(
|
||||
new_body, renderer.render_assistant_message(partial)
|
||||
new_body,
|
||||
renderer.render_assistant_message(
|
||||
partial, thinking_is_progress=thinking_is_progress
|
||||
),
|
||||
)
|
||||
new_body = renderer.append_to_body(new_body, _render_error_block(exc))
|
||||
if write_disk:
|
||||
@@ -715,11 +739,14 @@ class MarkdownFrontend(Frontend):
|
||||
parsed: parser.ParsedFile,
|
||||
message: Any,
|
||||
agent_name: str,
|
||||
thinking_is_progress: bool,
|
||||
conv_external_id: str,
|
||||
write_disk: bool = True,
|
||||
) -> str:
|
||||
"""Render the assistant turn, refresh frontmatter, write if we own the file."""
|
||||
rendered = renderer.render_assistant_message(message)
|
||||
rendered = renderer.render_assistant_message(
|
||||
message, thinking_is_progress=thinking_is_progress
|
||||
)
|
||||
new_body = renderer.append_to_body(parsed.body, rendered)
|
||||
new_body = renderer.append_to_body(new_body, renderer.USER_SCAFFOLD)
|
||||
updated_metadata = dict(parsed.metadata)
|
||||
|
||||
Reference in new issue
Block a user