v0.0.88 - Add full static ARM64 build support for didactyl and c-relay with dynamic nostr lib resolution and --platform override

Dockerfile.alpine-musl

@@ -68,6 +68,7 @@ COPY nostr_core_lib /build/nostr_core_lib/
 RUN cd nostr_core_lib && \
     chmod +x build.sh && \
     sed -i 's/CFLAGS="-Wall -Wextra -std=c99 -fPIC -O2"/CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -Wall -Wextra -std=c99 -fPIC -O2"/' build.sh && \
+    sed -i 's/CC="aarch64-linux-gnu-gcc"/CC="gcc"/' build.sh && \
     rm -f *.o *.a 2>/dev/null || true && \
     ./build.sh --nips=all
 
@@ -78,7 +79,10 @@ COPY Makefile /build/Makefile
 # Build didactyl with full static linking (only rebuilds when src/ changes)
 # Disable fortification to avoid __*_chk symbols that don't exist in MUSL
 # Use conditional compilation flags based on DEBUG_BUILD argument
-RUN if [ "$DEBUG_BUILD" = "true" ]; then \
+RUN NOSTR_LIB=$(ls /build/nostr_core_lib/libnostr_core_*.a 2>/dev/null | head -1) && \
+    if [ -z "$NOSTR_LIB" ]; then echo "ERROR: nostr_core_lib .a not found"; exit 1; fi && \
+    echo "Using nostr library: $NOSTR_LIB" && \
+    if [ "$DEBUG_BUILD" = "true" ]; then \
         CFLAGS="-g -O2 -DDEBUG"; \
         STRIP_CMD="echo 'Keeping debug symbols'"; \
         echo "Building with DEBUG symbols enabled (optimized with -O2)"; \
@@ -103,7 +107,7 @@ RUN if [ "$DEBUG_BUILD" = "true" ]; then \
     src/tools/tool_skill.c src/tools/tool_nostr_post.c src/tools/tool_memory.c src/tools/tool_config.c src/trigger_manager.c \
     src/prompt_template.c src/http_api.c src/setup_wizard.c src/mongoose.c src/debug.c \
     -o /build/didactyl_static \
-    nostr_core_lib/libnostr_core_x64.a \
+    $NOSTR_LIB \
     -lsecp256k1 \
     $OPENSSL_LIBS \
     $CURL_LIBS \

README.md

@@ -55,11 +55,11 @@ Skills compose by adoption-list order (`10123`) and trigger tags carry runtime e
 
 Didactyl will support local inference, which is very privacy preserving. Remote inference does however have it's advantages, and in those cases Didactyl supports using Bitcoin Lightning and eCash inference providers.
 
-## Current Status — v0.0.82
+## Current Status — v0.0.88
 
 **Active build — this project is barely working. Experiment at your own risk.**
 
-> Last release update: v0.0.82 — Move model/task persistence to kind 30078, add finish_reason stall diagnostics, and remove local config/tasks file coupling
+> Last release update: v0.0.88 — Add full static ARM64 build support for didactyl and c-relay with dynamic nostr lib resolution and --platform override
 
 - Connects to configured relays with auto-reconnect and relay state transition logging
 - Publishes configured startup events per relay as each relay becomes connected

build_static.sh

@@ -11,8 +11,19 @@ DOCKERFILE="$SCRIPT_DIR/Dockerfile.alpine-musl"
 
 # Parse command line arguments
 DEBUG_BUILD=false
-if [[ "$1" == "--debug" ]]; then
-    DEBUG_BUILD=true
+TARGET_PLATFORM=""
+for arg in "$@"; do
+    case "$arg" in
+        --debug)
+            DEBUG_BUILD=true
+            ;;
+        --platform=*)
+            TARGET_PLATFORM="${arg#*=}"
+            ;;
+    esac
+done
+
+if [ "$DEBUG_BUILD" = true ]; then
     echo "=========================================="
     echo "Didactyl MUSL Static Binary Builder (DEBUG MODE)"
     echo "=========================================="
@@ -61,24 +72,45 @@ DOCKER_CMD="docker"
 echo "✓ Docker is available and running"
 echo ""
 
-# Detect architecture
-ARCH=$(uname -m)
-case "$ARCH" in
-    x86_64)
-        PLATFORM="linux/amd64"
-        OUTPUT_NAME="didactyl_static_x86_64"
-        ;;
-    aarch64|arm64)
-        PLATFORM="linux/arm64"
-        OUTPUT_NAME="didactyl_static_arm64"
-        ;;
-    *)
-        echo "WARNING: Unknown architecture: $ARCH"
-        echo "Defaulting to linux/amd64"
-        PLATFORM="linux/amd64"
-        OUTPUT_NAME="didactyl_static_${ARCH}"
-        ;;
-esac
+# Detect architecture (or use explicit target platform override)
+if [ -n "$TARGET_PLATFORM" ]; then
+    PLATFORM="$TARGET_PLATFORM"
+    case "$PLATFORM" in
+        linux/amd64)
+            OUTPUT_NAME="didactyl_static_x86_64"
+            ;;
+        linux/arm64)
+            OUTPUT_NAME="didactyl_static_arm64"
+            ;;
+        linux/arm/v7)
+            OUTPUT_NAME="didactyl_static_armv7"
+            ;;
+        linux/arm/v6)
+            OUTPUT_NAME="didactyl_static_armv6"
+            ;;
+        *)
+            OUTPUT_NAME="didactyl_static_custom"
+            ;;
+    esac
+else
+    ARCH=$(uname -m)
+    case "$ARCH" in
+        x86_64)
+            PLATFORM="linux/amd64"
+            OUTPUT_NAME="didactyl_static_x86_64"
+            ;;
+        aarch64|arm64)
+            PLATFORM="linux/arm64"
+            OUTPUT_NAME="didactyl_static_arm64"
+            ;;
+        *)
+            echo "WARNING: Unknown architecture: $ARCH"
+            echo "Defaulting to linux/amd64"
+            PLATFORM="linux/amd64"
+            OUTPUT_NAME="didactyl_static_${ARCH}"
+            ;;
+    esac
+fi
 
 # Append _debug suffix to output name for debug builds
 if [ "$DEBUG_BUILD" = true ]; then

src/agent.c

@@ -437,6 +437,15 @@ static char* format_result_markdown_local(const char* raw_result) {
         return strdup(raw_result);
     }
 
+    if (cJSON_IsObject(root)) {
+        cJSON* content = cJSON_GetObjectItemCaseSensitive(root, "content");
+        if (content && cJSON_IsString(content) && content->valuestring) {
+            char* direct = strdup(content->valuestring);
+            cJSON_Delete(root);
+            return direct ? direct : strdup(raw_result);
+        }
+    }
+
     size_t cap = strlen(raw_result) * 2U + 512U;
     if (cap < 2048U) cap = 2048U;
     size_t used = 0U;
@@ -574,10 +583,15 @@ static char* build_slash_help_all_json(void) {
 
     char* adopted_json = tools_execute(&g_tools_ctx, "adopted_skills", "{}");
     cJSON* adopted_root = adopted_json ? cJSON_Parse(adopted_json) : NULL;
+    cJSON* adoption_events_content = adopted_root ? cJSON_GetObjectItemCaseSensitive(adopted_root, "content") : NULL;
     cJSON* adoption_events_json = adopted_root ? cJSON_GetObjectItemCaseSensitive(adopted_root, "adoption_events_json") : NULL;
-    cJSON* adoption_events = (adoption_events_json && cJSON_IsString(adoption_events_json) && adoption_events_json->valuestring)
-                               ? cJSON_Parse(adoption_events_json->valuestring)
-                               : NULL;
+    const char* adoption_events_text = NULL;
+    if (adoption_events_content && cJSON_IsString(adoption_events_content) && adoption_events_content->valuestring) {
+        adoption_events_text = adoption_events_content->valuestring;
+    } else if (adoption_events_json && cJSON_IsString(adoption_events_json) && adoption_events_json->valuestring) {
+        adoption_events_text = adoption_events_json->valuestring;
+    }
+    cJSON* adoption_events = adoption_events_text ? cJSON_Parse(adoption_events_text) : NULL;
 
     int adopted_count = 0;
     if (adoption_events && cJSON_IsArray(adoption_events) && cJSON_GetArraySize(adoption_events) > 0) {
@@ -727,8 +741,11 @@ static int handle_slash_command(const char* sender_pubkey_hex, const char* messa
         result_json = strdup("{\"success\":false,\"error\":\"direct tool execution failed\"}");
     }
 
-    char* markdown_result = format_result_markdown_local(result_json);
-    const char* dm_payload = markdown_result ? markdown_result : result_json;
+    size_t tool_name_len = strlen(tool_name);
+    int send_raw_json = (tool_name_len >= 4U && strcmp(tool_name + tool_name_len - 4U, "_get") == 0);
+
+    char* markdown_result = send_raw_json ? NULL : format_result_markdown_local(result_json);
+    const char* dm_payload = send_raw_json ? result_json : (markdown_result ? markdown_result : result_json);
 
     size_t log_cap = strlen(message) + strlen(result_json ? result_json : "") + strlen(dm_payload ? dm_payload : "") + 192U;
     char* log_payload = (char*)malloc(log_cap);

src/http_api.c

@@ -726,10 +726,15 @@ static char* build_slash_help_all_json_local(void) {
 
     char* adopted_json = tools_execute(g_api_ctx.tools_ctx, "adopted_skills", "{}");
     cJSON* adopted_root = adopted_json ? cJSON_Parse(adopted_json) : NULL;
+    cJSON* adoption_events_content = adopted_root ? cJSON_GetObjectItemCaseSensitive(adopted_root, "content") : NULL;
     cJSON* adoption_events_json = adopted_root ? cJSON_GetObjectItemCaseSensitive(adopted_root, "adoption_events_json") : NULL;
-    cJSON* adoption_events = (adoption_events_json && cJSON_IsString(adoption_events_json) && adoption_events_json->valuestring)
-                               ? cJSON_Parse(adoption_events_json->valuestring)
-                               : NULL;
+    const char* adoption_events_text = NULL;
+    if (adoption_events_content && cJSON_IsString(adoption_events_content) && adoption_events_content->valuestring) {
+        adoption_events_text = adoption_events_content->valuestring;
+    } else if (adoption_events_json && cJSON_IsString(adoption_events_json) && adoption_events_json->valuestring) {
+        adoption_events_text = adoption_events_json->valuestring;
+    }
+    cJSON* adoption_events = adoption_events_text ? cJSON_Parse(adoption_events_text) : NULL;
 
     int adopted_count = 0;
     if (adoption_events && cJSON_IsArray(adoption_events) && cJSON_GetArraySize(adoption_events) > 0) {

src/main.c

@@ -813,24 +813,29 @@ static int publish_encrypted_self_config(const didactyl_config_t* cfg, const cha
     return rc;
 }
 
-static int persist_runtime_config_to_nostr(const didactyl_config_t* cfg) {
+static int persist_runtime_config_to_nostr(const didactyl_config_t* cfg, int persist_llm_config) {
     if (!cfg) return -1;
 
-    cJSON* llm = cJSON_CreateObject();
-    if (!llm) return -1;
-    cJSON_AddStringToObject(llm, "provider", cfg->llm.provider);
-    cJSON_AddStringToObject(llm, "api_key", cfg->llm.api_key);
-    cJSON_AddStringToObject(llm, "model", cfg->llm.model);
-    cJSON_AddStringToObject(llm, "base_url", cfg->llm.base_url);
-    cJSON_AddNumberToObject(llm, "max_tokens", cfg->llm.max_tokens);
-    cJSON_AddNumberToObject(llm, "temperature", cfg->llm.temperature);
+    int llm_rc = 0;
+    if (persist_llm_config) {
+        cJSON* llm = cJSON_CreateObject();
+        if (!llm) return -1;
+        cJSON_AddStringToObject(llm, "provider", cfg->llm.provider);
+        cJSON_AddStringToObject(llm, "api_key", cfg->llm.api_key);
+        cJSON_AddStringToObject(llm, "model", cfg->llm.model);
+        cJSON_AddStringToObject(llm, "base_url", cfg->llm.base_url);
+        cJSON_AddNumberToObject(llm, "max_tokens", cfg->llm.max_tokens);
+        cJSON_AddNumberToObject(llm, "temperature", cfg->llm.temperature);
 
-    char* llm_json = cJSON_PrintUnformatted(llm);
-    cJSON_Delete(llm);
-    if (!llm_json) return -1;
+        char* llm_json = cJSON_PrintUnformatted(llm);
+        cJSON_Delete(llm);
+        if (!llm_json) return -1;
 
-    int llm_rc = publish_encrypted_self_config(cfg, "llm_config", llm_json);
-    free(llm_json);
+        llm_rc = publish_encrypted_self_config(cfg, "llm_config", llm_json);
+        free(llm_json);
+    } else {
+        DEBUG_INFO("[didactyl] startup phase: skipping llm_config publish because it was recalled from Nostr");
+    }
 
     cJSON* agent = cJSON_CreateObject();
     if (!agent) return llm_rc;
@@ -846,15 +851,18 @@ static int persist_runtime_config_to_nostr(const didactyl_config_t* cfg) {
     return (llm_rc == 0 && agent_rc == 0) ? 0 : -1;
 }
 
-static void recover_missing_runtime_config_from_nostr(didactyl_config_t* cfg) {
+static int recover_missing_runtime_config_from_nostr(didactyl_config_t* cfg) {
     if (!cfg) {
-        return;
+        return 0;
     }
 
+    int llm_recalled_from_nostr = 0;
+
     if (!llm_config_is_complete(&cfg->llm)) {
         char* llm_plaintext = NULL;
         if (fetch_self_config_plaintext(cfg, "llm_config", &llm_plaintext) == 0 && llm_plaintext) {
             if (apply_recalled_llm_config(cfg, llm_plaintext) == 0) {
+                llm_recalled_from_nostr = 1;
                 DEBUG_INFO("[didactyl] startup phase: recovered llm_config from Nostr");
             } else {
                 DEBUG_WARN("[didactyl] startup phase: failed to apply recalled llm_config");
@@ -885,6 +893,8 @@ static void recover_missing_runtime_config_from_nostr(didactyl_config_t* cfg) {
         DEBUG_WARN("[didactyl] startup phase: agent_config recall unavailable");
     }
     free(agent_plaintext);
+
+    return llm_recalled_from_nostr;
 }
 
 int main(int argc, char** argv) {
@@ -1129,8 +1139,8 @@ int main(int argc, char** argv) {
     }
 
     startup_step_begin(2, "Recover runtime config from Nostr");
-    recover_missing_runtime_config_from_nostr(&cfg);
-    startup_step_ok(2, "Recover runtime config from Nostr", NULL);
+    int llm_recalled_from_nostr = recover_missing_runtime_config_from_nostr(&cfg);
+    startup_step_ok(2, "Recover runtime config from Nostr", llm_recalled_from_nostr ? "llm_config recalled" : NULL);
 
     startup_step_begin(3, "Validate LLM config");
     if (!llm_config_is_complete(&cfg.llm)) {
@@ -1184,7 +1194,7 @@ int main(int argc, char** argv) {
         }
     }
 
-    if (persist_runtime_config_to_nostr(&cfg) != 0) {
+    if (persist_runtime_config_to_nostr(&cfg, llm_recalled_from_nostr ? 0 : 1) != 0) {
         DEBUG_WARN("[didactyl] startup phase: failed to persist encrypted runtime config to Nostr");
     } else {
         DEBUG_INFO("[didactyl] startup phase: persisted encrypted runtime config to Nostr");

src/main.h

@@ -12,8 +12,8 @@
 // Using DIDACTYL_ prefix to avoid conflicts with nostr_core_lib VERSION macros
 #define DIDACTYL_VERSION_MAJOR 0
 #define DIDACTYL_VERSION_MINOR 0
-#define DIDACTYL_VERSION_PATCH 82
-#define DIDACTYL_VERSION "v0.0.82"
+#define DIDACTYL_VERSION_PATCH 88
+#define DIDACTYL_VERSION "v0.0.88"
 
 // Agent metadata
 #define DIDACTYL_NAME "Didactyl"

src/nostr_handler.c

@@ -3802,6 +3802,55 @@ char* nostr_handler_get_admin_kind1_notes_context(void) {
     return out;
 }
 
+static char* extract_latest_kind0_content_from_events_json(const char* events_json) {
+    if (!events_json || events_json[0] == '\0') {
+        return NULL;
+    }
+
+    cJSON* root = cJSON_Parse(events_json);
+    if (!root || !cJSON_IsArray(root)) {
+        cJSON_Delete(root);
+        return NULL;
+    }
+
+    char* best_content = NULL;
+    time_t best_created_at = 0;
+
+    int n = cJSON_GetArraySize(root);
+    for (int i = 0; i < n; i++) {
+        cJSON* ev = cJSON_GetArrayItem(root, i);
+        if (!ev || !cJSON_IsObject(ev)) {
+            continue;
+        }
+
+        cJSON* kind = cJSON_GetObjectItemCaseSensitive(ev, "kind");
+        cJSON* content = cJSON_GetObjectItemCaseSensitive(ev, "content");
+        cJSON* created_at = cJSON_GetObjectItemCaseSensitive(ev, "created_at");
+        if (!kind || !cJSON_IsNumber(kind) || (int)kind->valuedouble != 0 ||
+            !content || !cJSON_IsString(content) || !content->valuestring || content->valuestring[0] == '\0') {
+            continue;
+        }
+
+        time_t ev_created_at = 0;
+        if (created_at && cJSON_IsNumber(created_at)) {
+            ev_created_at = (time_t)created_at->valuedouble;
+        }
+
+        if (!best_content || ev_created_at >= best_created_at) {
+            char* dup = strdup(content->valuestring);
+            if (!dup) {
+                continue;
+            }
+            free(best_content);
+            best_content = dup;
+            best_created_at = ev_created_at;
+        }
+    }
+
+    cJSON_Delete(root);
+    return best_content;
+}
+
 char* nostr_handler_get_agent_kind0_context(void) {
     if (!g_cfg) {
         return NULL;
@@ -3810,7 +3859,46 @@ char* nostr_handler_get_agent_kind0_context(void) {
     pthread_mutex_lock(&g_admin_ctx_mutex);
     char* out = g_agent_kind0_json ? strdup(g_agent_kind0_json) : NULL;
     pthread_mutex_unlock(&g_admin_ctx_mutex);
-    return out;
+    if (out && out[0] != '\0') {
+        return out;
+    }
+    free(out);
+
+    cJSON* filter = cJSON_CreateObject();
+    cJSON* kinds = cJSON_CreateArray();
+    cJSON* authors = cJSON_CreateArray();
+    if (!filter || !kinds || !authors) {
+        cJSON_Delete(filter);
+        cJSON_Delete(kinds);
+        cJSON_Delete(authors);
+        return NULL;
+    }
+
+    cJSON_AddItemToArray(kinds, cJSON_CreateNumber(0));
+    cJSON_AddItemToObject(filter, "kinds", kinds);
+    cJSON_AddItemToArray(authors, cJSON_CreateString(g_cfg->keys.public_key_hex));
+    cJSON_AddItemToObject(filter, "authors", authors);
+    cJSON_AddNumberToObject(filter, "limit", 8);
+
+    char* events_json = nostr_handler_query_json(filter, 3000);
+    cJSON_Delete(filter);
+    if (!events_json) {
+        return NULL;
+    }
+
+    char* fetched_kind0 = extract_latest_kind0_content_from_events_json(events_json);
+    free(events_json);
+    if (!fetched_kind0 || fetched_kind0[0] == '\0') {
+        free(fetched_kind0);
+        return NULL;
+    }
+
+    pthread_mutex_lock(&g_admin_ctx_mutex);
+    free(g_agent_kind0_json);
+    g_agent_kind0_json = strdup(fetched_kind0);
+    pthread_mutex_unlock(&g_admin_ctx_mutex);
+
+    return fetched_kind0;
 }
 
 char* nostr_handler_get_agent_kind3_context(void) {

src/tools/tool_admin.c

@@ -47,8 +47,6 @@ char* execute_admin_identity(tools_context_t* ctx, const char* args_json) {
     }
 
     cJSON_AddBoolToObject(out, "success", 1);
-    cJSON_AddStringToObject(out, "admin_pubkey", ctx->cfg->admin.pubkey[0] ? ctx->cfg->admin.pubkey : "unknown");
-    cJSON_AddStringToObject(out, "sender_verification", tier_text);
 
     char content[768];
     snprintf(content,
@@ -82,7 +80,6 @@ char* execute_nostr_admin_profile(tools_context_t* ctx, const char* args_json) {
     }
 
     cJSON_AddBoolToObject(out, "success", 1);
-    cJSON_AddStringToObject(out, "admin_kind0_json", profile_json);
 
     size_t content_len = strlen("## Administrator Kind 0 Profile (source: nostr kind 0)\n\nAdministrator kind 0 profile content (JSON): ") + strlen(profile_json) + 1U;
     char* content = (char*)malloc(content_len);
@@ -121,7 +118,6 @@ char* execute_nostr_admin_contacts(tools_context_t* ctx, const char* args_json)
     }
 
     cJSON_AddBoolToObject(out, "success", 1);
-    cJSON_AddStringToObject(out, "admin_kind3_json", contacts_json);
 
     size_t content_len = strlen("## Administrator Kind 3 Contacts (source: nostr kind 3)\n\nAdministrator contacts (JSON): ") + strlen(contacts_json) + 1U;
     char* content = (char*)malloc(content_len);
@@ -160,7 +156,6 @@ char* execute_nostr_admin_relays(tools_context_t* ctx, const char* args_json) {
     }
 
     cJSON_AddBoolToObject(out, "success", 1);
-    cJSON_AddStringToObject(out, "admin_kind10002_json", relays_json);
 
     size_t content_len = strlen("## Administrator Kind 10002 Relays (source: nostr kind 10002)\n\nAdministrator relay list (JSON): ") + strlen(relays_json) + 1U;
     char* content = (char*)malloc(content_len);
@@ -199,7 +194,6 @@ char* execute_nostr_admin_notes(tools_context_t* ctx, const char* args_json) {
     }
 
     cJSON_AddBoolToObject(out, "success", 1);
-    cJSON_AddStringToObject(out, "admin_notes_content", notes_text);
 
     size_t content_len = strlen("## Administrator Recent Kind 1 Notes\n\n") + strlen(notes_text) + 1U;
     char* content = (char*)malloc(content_len);

src/tools/tool_agent.c

@@ -62,8 +62,6 @@ char* execute_agent_identity(tools_context_t* ctx, const char* args_json) {
     cJSON* out = cJSON_CreateObject();
     if (!out) return NULL;
     cJSON_AddBoolToObject(out, "success", 1);
-    cJSON_AddStringToObject(out, "agent_pubkey", ctx->cfg->keys.public_key_hex[0] ? ctx->cfg->keys.public_key_hex : "unknown");
-    cJSON_AddStringToObject(out, "agent_npub", npub);
 
     char content[384];
     snprintf(content,
@@ -95,7 +93,6 @@ char* execute_nostr_agent_profile(tools_context_t* ctx, const char* args_json) {
     }
 
     cJSON_AddBoolToObject(out, "success", 1);
-    cJSON_AddStringToObject(out, "agent_kind0_json", profile_json);
 
     size_t content_len = strlen("## Agent Kind 0 Profile (source: nostr kind 0)\n\nAgent kind 0 profile content (JSON): ") + strlen(profile_json) + 1U;
     char* content = (char*)malloc(content_len);
@@ -134,7 +131,6 @@ char* execute_nostr_agent_contacts(tools_context_t* ctx, const char* args_json)
     }
 
     cJSON_AddBoolToObject(out, "success", 1);
-    cJSON_AddStringToObject(out, "agent_kind3_json", contacts_json);
 
     size_t content_len = strlen("## Agent Kind 3 Contacts (source: nostr kind 3)\n\nAgent contacts (JSON): ") + strlen(contacts_json) + 1U;
     char* content = (char*)malloc(content_len);
@@ -173,7 +169,6 @@ char* execute_nostr_agent_relays(tools_context_t* ctx, const char* args_json) {
     }
 
     cJSON_AddBoolToObject(out, "success", 1);
-    cJSON_AddStringToObject(out, "agent_kind10002_json", relays_json);
 
     size_t content_len = strlen("## Agent Kind 10002 Relays (source: nostr kind 10002)\n\nAgent relay list (JSON): ") + strlen(relays_json) + 1U;
     char* content = (char*)malloc(content_len);
@@ -212,7 +207,6 @@ char* execute_nostr_agent_notes(tools_context_t* ctx, const char* args_json) {
     }
 
     cJSON_AddBoolToObject(out, "success", 1);
-    cJSON_AddStringToObject(out, "agent_notes_content", notes_text);
 
     size_t content_len = strlen("## Agent Recent Kind 1 Notes\n\n") + strlen(notes_text) + 1U;
     char* content = (char*)malloc(content_len);
@@ -267,7 +261,6 @@ char* execute_adopted_skills(tools_context_t* ctx, const char* args_json) {
     }
     cJSON_AddBoolToObject(out, "success", 1);
     cJSON_AddStringToObject(out, "content", (events_json && events_json[0]) ? events_json : "[]");
-    cJSON_AddStringToObject(out, "adoption_events_json", (events_json && events_json[0]) ? events_json : "[]");
 
     char* json = cJSON_PrintUnformatted(out);
     cJSON_Delete(out);
@@ -302,7 +295,6 @@ char* execute_trigger_event(tools_context_t* ctx, const char* args_json) {
     if (!out) return NULL;
     cJSON_AddBoolToObject(out, "success", 1);
     cJSON_AddStringToObject(out, "content", trigger_json);
-    cJSON_AddStringToObject(out, "trigger_event_json", trigger_json);
     char* json = cJSON_PrintUnformatted(out);
     cJSON_Delete(out);
     return json;

src/tools/tool_config.c

@@ -143,6 +143,9 @@ char* execute_config_store(tools_context_t* ctx, const char* args_json) {
         return json_error_local("config_store requires content");
     }
 
+    char d_tag_buf[128];
+    snprintf(d_tag_buf, sizeof(d_tag_buf), "%s", d_tag_j->valuestring);
+
     char* content_text = NULL;
     if (cJSON_IsString(content_j) && content_j->valuestring) {
         content_text = strdup(content_j->valuestring);
@@ -180,7 +183,7 @@ char* execute_config_store(tools_context_t* ctx, const char* args_json) {
     }
 
     cJSON_AddItemToArray(d_tag, cJSON_CreateString("d"));
-    cJSON_AddItemToArray(d_tag, cJSON_CreateString(d_tag_j->valuestring));
+    cJSON_AddItemToArray(d_tag, cJSON_CreateString(d_tag_buf));
     cJSON_AddItemToArray(tags, d_tag);
 
     cJSON_AddItemToArray(app_tag, cJSON_CreateString("app"));
@@ -208,7 +211,7 @@ char* execute_config_store(tools_context_t* ctx, const char* args_json) {
     }
 
     cJSON_AddBoolToObject(out, "success", 1);
-    cJSON_AddStringToObject(out, "d_tag", d_tag_j->valuestring);
+    cJSON_AddStringToObject(out, "d_tag", d_tag_buf);
     cJSON_AddNumberToObject(out, "kind", CONFIG_KIND);
     cJSON_AddNumberToObject(out, "content_length", (double)strlen(content_text));
     cJSON_AddStringToObject(out, "event_id", publish_result.event_id);

src/tools/tool_model.c

@@ -108,6 +108,25 @@ static int assign_string_field(cJSON* item, char* dst, size_t dst_size, int* cha
     return 0;
 }
 
+static void mask_api_key_local(const char* api_key, char* out, size_t out_size) {
+    if (!out || out_size == 0) return;
+    out[0] = '\0';
+    if (!api_key || api_key[0] == '\0') {
+        return;
+    }
+
+    size_t api_len = strlen(api_key);
+    if (api_len >= 8U) {
+        snprintf(out,
+                 out_size,
+                 "%.4s...%s",
+                 api_key,
+                 api_key + api_len - 4U);
+    } else {
+        snprintf(out, out_size, "%s", "(set)");
+    }
+}
+
 char* execute_model_get(const char* args_json) {
     cJSON* args = parse_args_local(args_json);
     if (!args) return json_error_local("invalid arguments JSON");
@@ -120,10 +139,15 @@ char* execute_model_get(const char* args_json) {
 
     cJSON* out = cJSON_CreateObject();
     if (!out) return NULL;
+
+    char api_key_masked[64] = {0};
+    mask_api_key_local(cfg.api_key, api_key_masked, sizeof(api_key_masked));
+
     cJSON_AddBoolToObject(out, "success", 1);
     cJSON_AddStringToObject(out, "provider", cfg.provider);
     cJSON_AddStringToObject(out, "model", cfg.model);
     cJSON_AddStringToObject(out, "base_url", cfg.base_url);
+    cJSON_AddStringToObject(out, "api_key", api_key_masked);
     cJSON_AddNumberToObject(out, "max_tokens", cfg.max_tokens);
     cJSON_AddNumberToObject(out, "temperature", cfg.temperature);
 
@@ -196,10 +220,14 @@ char* execute_model_set(tools_context_t* ctx, const char* args_json) {
 
     cJSON* out = cJSON_CreateObject();
     if (!out) return NULL;
+    char api_key_masked[64] = {0};
+    mask_api_key_local(cfg.api_key, api_key_masked, sizeof(api_key_masked));
+
     cJSON_AddBoolToObject(out, "success", 1);
     cJSON_AddStringToObject(out, "provider", cfg.provider);
     cJSON_AddStringToObject(out, "model", cfg.model);
     cJSON_AddStringToObject(out, "base_url", cfg.base_url);
+    cJSON_AddStringToObject(out, "api_key", api_key_masked);
     cJSON_AddNumberToObject(out, "max_tokens", cfg.max_tokens);
     cJSON_AddNumberToObject(out, "temperature", cfg.temperature);
     cJSON_AddBoolToObject(out, "persisted", persisted ? 1 : 0);