Skip to content

Commit f031c30

Browse files
authored
Merge pull request #1784 from Pxx500/fix/mcp-frontend-recovery
fix(mcp): recover unsent requests after daemon loss
2 parents 5830d28 + b42159e commit f031c30

9 files changed

Lines changed: 651 additions & 139 deletions

File tree

‎src/daemon/application.c‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4026,7 +4026,7 @@ cbm_daemon_runtime_application_callbacks_t cbm_daemon_application_runtime_callba
40264026
static cbm_daemon_runtime_application_status_t application_client_exchange_tagged(
40274027
cbm_daemon_runtime_client_t *client, cbm_daemon_runtime_application_token_t request_token,
40284028
uint8_t *request, uint32_t request_length, uint8_t **response_out,
4029-
uint32_t *response_length_out, uint32_t timeout_ms) {
4029+
uint32_t *response_length_out, bool *request_sent_out, uint32_t timeout_ms) {
40304030
uint8_t *response = NULL;
40314031
uint32_t response_length = 0;
40324032
if (response_out) {
@@ -4035,13 +4035,16 @@ static cbm_daemon_runtime_application_status_t application_client_exchange_tagge
40354035
if (response_length_out) {
40364036
*response_length_out = 0;
40374037
}
4038+
if (request_sent_out) {
4039+
*request_sent_out = false;
4040+
}
40384041
cbm_daemon_runtime_application_status_t status =
40394042
request_token == CBM_DAEMON_RUNTIME_APPLICATION_TOKEN_INVALID
40404043
? cbm_daemon_runtime_client_application_request(client, request, request_length,
40414044
&response, &response_length, timeout_ms)
4042-
: cbm_daemon_runtime_client_application_request_tagged(client, request_token, request,
4043-
request_length, &response,
4044-
&response_length, timeout_ms);
4045+
: cbm_daemon_runtime_client_application_request_tagged(
4046+
client, request_token, request, request_length, &response, &response_length,
4047+
request_sent_out, timeout_ms);
40454048
free(request);
40464049
if (status != CBM_DAEMON_RUNTIME_APPLICATION_OK) {
40474050
free(response);
@@ -4072,7 +4075,7 @@ static cbm_daemon_runtime_application_status_t application_client_exchange(
40724075
uint8_t **response_out, uint32_t *response_length_out, uint32_t timeout_ms) {
40734076
return application_client_exchange_tagged(client, CBM_DAEMON_RUNTIME_APPLICATION_TOKEN_INVALID,
40744077
request, request_length, response_out,
4075-
response_length_out, timeout_ms);
4078+
response_length_out, NULL, timeout_ms);
40764079
}
40774080

40784081
cbm_daemon_runtime_application_status_t cbm_daemon_application_client_set_context(
@@ -4200,7 +4203,7 @@ cbm_daemon_runtime_application_status_t cbm_daemon_application_client_ui_readine
42004203
static cbm_daemon_runtime_application_status_t application_client_text_request_tagged(
42014204
cbm_daemon_runtime_client_t *client, cbm_daemon_runtime_application_token_t request_token,
42024205
cbm_daemon_application_request_kind_t kind, const char *text, uint8_t **response_out,
4203-
uint32_t *response_length_out, uint32_t timeout_ms) {
4206+
uint32_t *response_length_out, bool *request_sent_out, uint32_t timeout_ms) {
42044207
if (!client || !text || !text[0]) {
42054208
return CBM_DAEMON_RUNTIME_APPLICATION_REJECTED;
42064209
}
@@ -4216,15 +4219,15 @@ static cbm_daemon_runtime_application_status_t application_client_text_request_t
42164219
memcpy(request + 1, text, text_length);
42174220
return application_client_exchange_tagged(client, request_token, request,
42184221
(uint32_t)text_length + 1U, response_out,
4219-
response_length_out, timeout_ms);
4222+
response_length_out, request_sent_out, timeout_ms);
42204223
}
42214224

42224225
static cbm_daemon_runtime_application_status_t application_client_text_request(
42234226
cbm_daemon_runtime_client_t *client, cbm_daemon_application_request_kind_t kind,
42244227
const char *text, uint8_t **response_out, uint32_t *response_length_out, uint32_t timeout_ms) {
42254228
return application_client_text_request_tagged(
42264229
client, CBM_DAEMON_RUNTIME_APPLICATION_TOKEN_INVALID, kind, text, response_out,
4227-
response_length_out, timeout_ms);
4230+
response_length_out, NULL, timeout_ms);
42284231
}
42294232

42304233
cbm_daemon_runtime_application_status_t cbm_daemon_application_client_mcp(
@@ -4237,10 +4240,10 @@ cbm_daemon_runtime_application_status_t cbm_daemon_application_client_mcp(
42374240
cbm_daemon_runtime_application_status_t cbm_daemon_application_client_mcp_tagged(
42384241
cbm_daemon_runtime_client_t *client, cbm_daemon_runtime_application_token_t request_token,
42394242
const char *message, uint8_t **response_out, uint32_t *response_length_out,
4240-
uint32_t timeout_ms) {
4241-
return application_client_text_request_tagged(client, request_token,
4242-
CBM_DAEMON_APPLICATION_REQUEST_MCP, message,
4243-
response_out, response_length_out, timeout_ms);
4243+
bool *request_sent_out, uint32_t timeout_ms) {
4244+
return application_client_text_request_tagged(
4245+
client, request_token, CBM_DAEMON_APPLICATION_REQUEST_MCP, message, response_out,
4246+
response_length_out, request_sent_out, timeout_ms);
42444247
}
42454248

42464249
cbm_daemon_runtime_application_status_t cbm_daemon_application_client_tool(

‎src/daemon/application.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,12 @@ cbm_daemon_runtime_application_status_t cbm_daemon_application_client_mcp(
149149
cbm_daemon_runtime_client_t *client, const char *message, uint8_t **response_out,
150150
uint32_t *response_length_out, uint32_t timeout_ms);
151151

152-
/* Cancellable frontend variant using a token reserved on the runtime client. */
152+
/* Cancellable frontend variant using a token reserved on the runtime client.
153+
* request_sent_out preserves the runtime's application-frame delivery fact. */
153154
cbm_daemon_runtime_application_status_t cbm_daemon_application_client_mcp_tagged(
154155
cbm_daemon_runtime_client_t *client, cbm_daemon_runtime_application_token_t request_token,
155156
const char *message, uint8_t **response_out, uint32_t *response_length_out,
156-
uint32_t timeout_ms);
157+
bool *request_sent_out, uint32_t timeout_ms);
157158

158159
cbm_daemon_runtime_application_status_t cbm_daemon_application_client_tool(
159160
cbm_daemon_runtime_client_t *client, const char *tool_name, const char *args_json,

0 commit comments

Comments
 (0)