Skip to content

Commit efba1ce

Browse files
yjjheizhuKuddev
authored andcommitted
Return the native assistant answer in delegation callbacks
1 parent d4a5857 commit efba1ce

2 files changed

Lines changed: 60 additions & 2 deletions

File tree

‎pebrel_app/src/runtime_api.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,8 +1297,11 @@ impl RuntimeHub {
12971297
_ => "completed",
12981298
};
12991299
let result = event
1300-
.message
1301-
.as_deref()
1300+
.answer
1301+
.as_ref()
1302+
.and_then(|answer| answer.source())
1303+
.map(|text| text.as_ref())
1304+
.or(event.message.as_deref())
13021305
.map(|message| truncate_chars(message, MAX_DELEGATION_RESULT_CHARS))
13031306
.unwrap_or_else(|| "No structured final message was provided; inspect the target pane if details are needed.".to_owned());
13041307
let result =

‎pebrel_app/src/runtime_api/tests.rs‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,61 @@ fn delegation_completion_returns_one_json_escaped_callback() {
859859
assert!(hub.take_ready_delegation_callbacks().is_empty());
860860
}
861861

862+
#[test]
863+
fn claude_delegation_returns_the_native_answer_or_the_available_diagnostic() {
864+
let hub = RuntimeHub::new();
865+
let session = "claude-session-1";
866+
let target = hub
867+
.register_agent(
868+
"worker".into(),
869+
crate::ai_agents::AgentKind::Claude,
870+
7,
871+
3,
872+
Some(session.into()),
873+
None,
874+
)
875+
.unwrap();
876+
hub.publish(delegation_snapshot(
877+
RuntimeTaskState::Finished,
878+
RuntimeTaskState::Finished,
879+
Some(session),
880+
));
881+
882+
let callback_result = |mut payload: Value| {
883+
payload["session_id"] = json!(session);
884+
let raw = format!("nebula-hook/1 source=claude pane=3\n{payload}");
885+
let event = crate::ai_hook::parse_remote_envelope(raw.as_bytes(), Some(3)).unwrap();
886+
let receipt = hub.begin_delegation(4, &target).unwrap();
887+
hub.complete_delegations_for_turn(&event);
888+
let callbacks = hub.take_ready_delegation_callbacks();
889+
assert_eq!(callbacks.len(), 1);
890+
assert_eq!(callbacks[0].task_id, receipt.task_id);
891+
let encoded = callbacks[0].prompt.split_once("worker_output=").unwrap().1;
892+
serde_json::from_str::<String>(encoded).unwrap()
893+
};
894+
895+
let text = "line 1\n\"done\"";
896+
assert_eq!(
897+
callback_result(json!({"hook_event_name":"Stop", "last_assistant_message":text})),
898+
text
899+
);
900+
let prefix = "字".repeat(MAX_DELEGATION_RESULT_CHARS);
901+
assert_eq!(
902+
callback_result(
903+
json!({"hook_event_name":"Stop", "last_assistant_message":format!("{prefix}界")})
904+
),
905+
format!("{prefix}...")
906+
);
907+
assert_eq!(
908+
callback_result(json!({"hook_event_name":"StopFailure", "error":"provider disconnected"})),
909+
"provider disconnected"
910+
);
911+
assert_eq!(
912+
callback_result(json!({"hook_event_name":"Stop"})),
913+
"No structured final message was provided; inspect the target pane if details are needed."
914+
);
915+
}
916+
862917
#[test]
863918
fn agent_delegate_dispatches_a_generation_bound_prompt() {
864919
let (hub, target) = delegation_hub(RuntimeTaskState::Finished);

0 commit comments

Comments
 (0)