Skip to content

fix: keep stage and subagent text on UTF-8 character boundaries #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wujiangang merged 2 commits into from
Jun 11, 2026
Merged

fix: keep stage and subagent text on UTF-8 character boundaries #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
813dcf8
fix(claw_core): truncate tool-call args on UTF-8 boundary
BigUncleUs Jun 11, 2026
61ea566
fix(claw_manager): keep subagent_completed within UTF-8 boundary
BigUncleUs Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions components/claw_modules/claw_core/src/claw_core_events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,11 @@ void claw_core_publish_stage_tool_calls(const claw_core_request_t *request,
const char *name = response->tool_calls[i].name ? response->tool_calls[i].name : "?";
const char *args = response->tool_calls[i].arguments_json;
if (args && args[0]) {
written = snprintf(buf + off, sizeof(buf) - off, "%s%s(%.40s%s)",
i == 0 ? "" : ", ", name, args,
strlen(args) > 40 ? "..." : "");
size_t arg_len = strlen(args);
size_t prefix_len = utf8_prefix_len(args, 40);
written = snprintf(buf + off, sizeof(buf) - off, "%s%s(%.*s%s)",
i == 0 ? "" : ", ", name, (int)prefix_len, args,
arg_len > prefix_len ? "..." : "");
} else {
written = snprintf(buf + off, sizeof(buf) - off, "%s%s",
i == 0 ? "" : ", ", name);
Expand Down
10 changes: 7 additions & 3 deletions components/claw_modules/claw_manager/src/claw_agent_mgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,9 +643,13 @@ static void claw_agent_mgr_completion_observer(const claw_core_completion_summar
if ((size_t)written >= sizeof(text)) {
size_t suffix_len = strlen(truncated_suffix);
if (suffix_len + 1U < sizeof(text)) {
strlcpy(text + sizeof(text) - suffix_len - 1U,
truncated_suffix,
suffix_len + 1U);
size_t p = sizeof(text) - suffix_len - 1U;
/* Back off so the suffix never splices into the middle of a
* multi-byte UTF-8 sequence, which would emit invalid bytes. */
while (p > 0 && ((unsigned char)text[p] & 0xC0) == 0x80) {
p--;
}
strlcpy(text + p, truncated_suffix, sizeof(text) - p);
}
}

Expand Down