adriannoes · Oct 17, 2026 · Oct 16, 2026 · Oct 16, 2026 · Oct 16, 2026 · Oct 17, 2026
@@ -5,6 +5,10 @@ All notable changes to ShellClaw are documented here. Format follows [Keep a Cha
 ## [Unreleased]
 
 ### Fixed
+- Dashboard and cron SQLite access is serialized with `agent_lock()` (matching `POST /asap`), including `DELETE /api/sessions/{id}` session deletion, so the lws service thread cannot race `agent_run` / `cron_poll` on the shared `g_db` (`SQLITE_THREADSAFE=0`).
+- `interval:` schedules reject intervals that do not fit `now + seconds` and numbers that stop parsing early (`interval:60abc`), instead of wrapping to a past `next_run` that stays due and re-fires forever.
+- Cron schedules reject partial numbers instead of silently accepting the numeric prefix: `at:2026-10-08` (would become 2026), comma lists such as `0 9 1,15 * *`, and step syntax are now parse errors.
+- Stored recurring jobs whose schedule the stricter parser now rejects no longer disappear silently: on ack they are snoozed to `now + 365d` and the job id and schedule are logged (`shellclaw: cron:`), so the year-long gap is diagnosable.
 - Session compaction includes the boundary turn (index `msg_count - max_context_messages`) in the summary window, so the turn at the keep-tail boundary is not deleted without being summarized.
 - Session compaction keeps a message that does not fit the 64 KiB summary source, and everything after it, instead of skipping the long line and deleting it anyway.
 - Session compaction no longer persists the summarized transcript before the user turn finishes: a failed follow-up provider call leaves the raw stored session unchanged, and when the kept tail already starts with a user turn the summary is folded into that turn so consecutive user roles cannot break the next Anthropic call (supersedes #126).

@@ -467,7 +467,7 @@ $(HARDWARE_I2C_O): src/hardware/hardware_i2c.c src/hardware/hardware_i2c.h
 $(HARDWARE_CAMERA_O): src/hardware/hardware_camera.c src/hardware/hardware_camera.h src/hardware/board_detect.h
 	$(CC) $(CFLAGS) $(INC) -c -o $@ src/hardware/hardware_camera.c
 
-$(CRON_O): src/tools/cron.c src/tools/cron.h src/crypto/crypto.h src/core/memory.h src/channels/channel.h src/core/config.h
+$(CRON_O): src/tools/cron.c src/tools/cron.h src/crypto/crypto.h src/core/agent.h src/core/memory.h src/channels/channel.h src/core/config.h
 	$(CC) $(CFLAGS) $(INC) -c -o $@ src/tools/cron.c
 
 $(ASAP_INVOKE_O): src/tools/asap_invoke.c src/tools/asap_invoke.h src/tools/tool.h src/asap/envelope.h src/asap/client.h src/asap/registry.h src/asap/ulid.h src/asap/asap_version.h src/core/config.h vendor/cJSON/cJSON.h
@@ -631,9 +631,10 @@ test_web_search: tests/test_web_search.c $(WEBSEARCH_O) $(CONFIG_O) $(TOML_O) $(
 	$(CC) $(CFLAGS) $(LDFLAGS) $(INC) -o $(BINDIR)/$@ tests/test_web_search.c $(WEBSEARCH_O) $(CONFIG_O) $(TOML_O) $(CJSON_O) $(LDLIBS)
 	$(DSYM_SCRIPT)
 
-test_cron: tests/test_cron.c $(CRON_O) $(CRYPTO_LINK) $(MEMORY_O) $(SQLITE3_O) $(CHANNEL_COMMON_O) $(CJSON_O)
+test_cron: tests/test_cron.c $(CRON_O) $(CRYPTO_LINK) $(MEMORY_O) $(SQLITE3_O) $(CHANNEL_COMMON_O) $(CJSON_O) $(AGENT_O) $(SKILL_O) $(CONFIG_O) $(TOML_O) $(PROVIDER_COMMON_O)
 	@mkdir -p $(BINDIR)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(INC) -o $(BINDIR)/$@ tests/test_cron.c $(CRON_O) $(CRYPTO_LINK) $(MEMORY_O) $(SQLITE3_O) $(CHANNEL_COMMON_O) $(CJSON_O) $(LDLIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(INC) -o $(BINDIR)/$@ tests/test_cron.c $(CRON_O) $(CRYPTO_LINK) $(MEMORY_O) $(SQLITE3_O) $(CHANNEL_COMMON_O) $(CJSON_O) $(AGENT_O) $(SKILL_O) $(CONFIG_O) $(TOML_O) $(PROVIDER_COMMON_O) $(LDLIBS) -pthread
+	$(DSYM_SCRIPT)
 
 test_ws: tests/test_ws.c $(WS_TEST_O)
 	@mkdir -p $(BINDIR)
@@ -735,6 +736,18 @@ test_gateway_http: shellclaw tests/test_gateway_http.c $(AUTH_O) $(CONFIG_O) $(T
 	$(CC) $(CFLAGS) $(LDFLAGS) $(INC) -DSHELLCLAW_GATEWAY -pthread -o $(BINDIR)/$@ tests/test_gateway_http.c $(AUTH_O) $(CRYPTO_LINK) $(CONFIG_O) $(TOML_O) $(CJSON_O) $(LDLIBS) -pthread
 	$(DSYM_SCRIPT)
 
+GATEWAY_DB_LOCK_OBJS := $(filter-out src/core/main.o,$(SHELLCLAW_OBJS))
+
+test_gateway_db_lock: tests/test_gateway_db_lock.c $(GATEWAY_DB_LOCK_OBJS)
+	@mkdir -p $(BINDIR)
+	@if [ "$(GATEWAY)" != "1" ]; then \
+		if [ "$(CI)" = "true" ]; then echo "test_gateway_db_lock: GATEWAY=0 in CI — install libwebsockets-dev"; exit 1; fi; \
+		echo "test_gateway_db_lock: skipped (GATEWAY=0)"; \
+	else \
+		$(CC) $(CFLAGS) $(LDFLAGS) $(INC) $(GATEWAY_CFLAGS) -DSHELLCLAW_GATEWAY -pthread -o $(BINDIR)/$@ tests/test_gateway_db_lock.c $(GATEWAY_DB_LOCK_OBJS) $(LDLIBS) $(GATEWAY_LDLIBS) $(LIBGPIOD_LDLIBS) -pthread; \
+	fi
+	$(DSYM_SCRIPT)
+
 test_routes_hardware: tests/test_routes_hardware.c tests/test_routes_json_stub.c $(ROUTES_HARDWARE_O) $(HARDWARE_GPIO_SNAPSHOT_O) $(HARDWARE_TEGRASTATS_O) $(HARDWARE_INIT_O) $(HARDWARE_STUB_O) $(BOARD_DETECT_O) $(HARDWARE_I2C_O) $(HARDWARE_CAMERA_O) $(HARDWARE_LIBGPIOD_O) $(CONFIG_O) $(TOML_O) $(CJSON_O)
 	@if [ "$(GATEWAY)" != "1" ]; then \
 		if [ "$(CI)" = "true" ]; then echo "test_routes_hardware: GATEWAY=0 in CI — install libwebsockets-dev"; exit 1; fi; \
@@ -889,6 +902,7 @@ test: test_config test_config_patch test_memory test_skill test_provider test_an
 	$(MAKE) test_static && $(BINDIR)/test_static
 	@if [ "$(GATEWAY)" = "1" ]; then \
 		$(BINDIR)/test_routes_hardware && \
+		$(MAKE) test_gateway_db_lock && $(BINDIR)/test_gateway_db_lock && \
 		$(MAKE) test_asap_http_body && $(BINDIR)/test_asap_http_body && \
 		$(MAKE) test_gateway_http && $(BINDIR)/test_gateway_http; \
 	elif [ "$(CI)" = "true" ]; then echo "GATEWAY=0 in CI — install libwebsockets-dev"; exit 1; fi
@@ -912,6 +926,6 @@ clean: clean-root-dsym
 	rm -f $(OBJS) $(PROVIDER_COMMON_O) $(STUB_O) $(ANTHROPIC_O) $(OPENAI_COMPAT_O) $(OPENAI_O) $(LOCAL_O) $(ROUTER_O) $(CJSON_O) $(TWEETNACL_O) $(ANTHROPIC_TEST_O) $(OPENAI_TEST_O) $(LOCAL_TEST_O) $(CONTEXT_TEST_OBJS) $(HEARTBEAT_TEST_O) $(CHANNEL_TG_TEST_O) $(CHANNEL_COMMON_O) $(CHANNEL_STUB_O) $(CHANNEL_CLI_O) $(CHANNEL_TG_O) $(CHANNEL_DISCORD_O) $(DISCORD_HELPERS_O) $(CHANNEL_HEARTBEAT_O) $(CHANNEL_WEBCHAT_O) $(AUTH_O) $(STATIC_O) $(HTTP_O) $(HTTP_LWS_O) $(ASAP_HTTP_BODY_O) $(ROUTES_O) $(ROUTES_HARDWARE_O) $(WS_O) $(MANIFEST_O) $(MANIFEST_PROFILES_O) $(MANIFEST_BUILD_O) $(MANIFEST_SIGN_O) $(MANIFEST_KEYS_O) $(ENVELOPE_O) $(ULID_O) $(CLIENT_O) $(ASAP_REGISTRY_O) $(SERVER_O) $(ASAP_LOG_O) $(RATE_LIMIT_O) $(SHELL_O) $(WEBSEARCH_O) $(FILE_O) $(REGISTRY_O) $(CONTEXT_O) $(CONTEXT_CACHE_O) $(CONTEXT_HTTP_O) $(CONTEXT_GEO_O) $(CRYPTO_O) $(JCS_O) $(HARDWARE_STUB_O) $(HARDWARE_INIT_O) $(HARDWARE_GPIO_SNAPSHOT_O) $(HARDWARE_TEGRASTATS_O) $(HARDWARE_TOOLS_O) $(BOARD_DETECT_O) src/hardware/hardware_libgpiod.o $(HARDWARE_I2C_O) $(HARDWARE_CAMERA_O) $(CRON_O) $(ASAP_INVOKE_O) $(SANDBOX_CORE_O) $(SANDBOX_LANDLOCK_O) $(ALLOWLIST_SCAN_O) $(ALLOWLIST_PATH_O)
 	rm -f src/gateway/ui_assets.h
 	find . -name '*.gcno' -o -name '*.gcda' -o -name '*.gcov' | xargs rm -f 2>/dev/null || true
-	rm -f $(WS_TEST_O) $(BINDIR)/asap_registry_test.o $(BINDIR)/asap_invoke_test.o $(CONTEXT_TEST_OBJS) $(HEARTBEAT_TEST_O) $(BINDIR)/shellclaw $(BINDIR)/test_tweetnacl_smoke $(BINDIR)/test_config $(BINDIR)/test_config_patch $(BINDIR)/test_memory $(BINDIR)/test_skill $(BINDIR)/test_provider $(BINDIR)/test_anthropic $(BINDIR)/test_openai $(BINDIR)/test_local_provider $(BINDIR)/test_router $(BINDIR)/test_heartbeat $(BINDIR)/test_crypto $(BINDIR)/test_hardware_stub $(BINDIR)/test_board_detect $(BINDIR)/test_hardware_libgpiod $(BINDIR)/test_hardware_i2c $(BINDIR)/test_hardware_camera $(BINDIR)/test_pin_tables $(BINDIR)/test_hardware_init $(BINDIR)/test_hardware_tools $(BINDIR)/test_registry $(BINDIR)/test_ws $(BINDIR)/test_agent $(BINDIR)/test_channel $(BINDIR)/test_cli $(BINDIR)/test_shell $(BINDIR)/test_file $(BINDIR)/test_telegram $(BINDIR)/test_discord_helpers $(BINDIR)/test_web_search $(BINDIR)/test_cron $(BINDIR)/test_context $(BINDIR)/test_manifest_build $(BINDIR)/test_manifest_keys $(BINDIR)/test_jcs $(BINDIR)/test_asap_envelope $(BINDIR)/test_asap_ulid $(BINDIR)/test_asap_client $(BINDIR)/test_asap_registry $(BINDIR)/test_asap_server $(BINDIR)/test_asap_invoke $(BINDIR)/test_asap_log $(BINDIR)/test_auth $(BINDIR)/test_gateway_http $(BINDIR)/test_static $(BINDIR)/test_sandbox $(BINDIR)/test_allowlist $(BINDIR)/test_rate_limit
+	rm -f $(WS_TEST_O) $(BINDIR)/asap_registry_test.o $(BINDIR)/asap_invoke_test.o $(CONTEXT_TEST_OBJS) $(HEARTBEAT_TEST_O) $(BINDIR)/shellclaw $(BINDIR)/test_tweetnacl_smoke $(BINDIR)/test_config $(BINDIR)/test_config_patch $(BINDIR)/test_memory $(BINDIR)/test_skill $(BINDIR)/test_provider $(BINDIR)/test_anthropic $(BINDIR)/test_openai $(BINDIR)/test_local_provider $(BINDIR)/test_router $(BINDIR)/test_heartbeat $(BINDIR)/test_crypto $(BINDIR)/test_hardware_stub $(BINDIR)/test_board_detect $(BINDIR)/test_hardware_libgpiod $(BINDIR)/test_hardware_i2c $(BINDIR)/test_hardware_camera $(BINDIR)/test_pin_tables $(BINDIR)/test_hardware_init $(BINDIR)/test_hardware_tools $(BINDIR)/test_registry $(BINDIR)/test_ws $(BINDIR)/test_agent $(BINDIR)/test_channel $(BINDIR)/test_cli $(BINDIR)/test_shell $(BINDIR)/test_file $(BINDIR)/test_telegram $(BINDIR)/test_discord_helpers $(BINDIR)/test_web_search $(BINDIR)/test_cron $(BINDIR)/test_context $(BINDIR)/test_manifest_build $(BINDIR)/test_manifest_keys $(BINDIR)/test_jcs $(BINDIR)/test_asap_envelope $(BINDIR)/test_asap_ulid $(BINDIR)/test_asap_client $(BINDIR)/test_asap_registry $(BINDIR)/test_asap_server $(BINDIR)/test_asap_invoke $(BINDIR)/test_asap_log $(BINDIR)/test_auth $(BINDIR)/test_gateway_http $(BINDIR)/test_gateway_db_lock $(BINDIR)/test_static $(BINDIR)/test_sandbox $(BINDIR)/test_allowlist $(BINDIR)/test_rate_limit
 	rm -rf $(BINDIR)/*.dSYM $(DSYMDIR)
 	rm -f $(BOOTSTRAP_DISPATCH_STUB_O) $(TOOL_RELOAD_STUB_O) $(RELOAD_CHANNEL_STUB_O) $(HTTP_RELOAD_STUB_O)
@@ -58,14 +58,17 @@ int agent_run(const config_t *cfg, const char *session_id, const char *user_mess
  * cron_ack_delivery() (SQLite amalgamation is SQLITE_THREADSAFE=0).
  * Inbound mcp.tool_call must hold it around tool execute (see #60).
  * Inbound state.query must hold it around memory_get_row_counts() (see #60).
- * Release before channel I/O (ch->send). The mutex is not recursive.
+ * Dashboard /api/memory, /api/sessions list, and /api/cron handlers must hold
+ * it around g_db. cron_poll must hold it around due-job SQL, and must release
+ * it before the re-offer sleep. The mutex is not recursive.
+ * Release before channel I/O (ch->send).
  */
 void agent_lock(void);
 
 /**
  * Release the global agent mutex after agent_run(), a locked session_delete(),
- * inbound mcp.tool_call execute, a locked state.query memory read, or a
- * locked cron_ack_delivery().
+ * inbound mcp.tool_call execute, a locked state.query memory read, a locked
+ * cron_ack_delivery(), a dashboard g_db handler, or cron_poll's due-job SQL.
  */
 void agent_unlock(void);
 

@@ -17,6 +17,7 @@
 static sqlite3 *g_db;
 static void (*g_session_delete_hook_for_test)(const char *session_id);
 static void (*g_memory_get_row_counts_hook_for_test)(void);
+static void (*g_sqlite_entry_hook_for_test)(void);
 
 void session_delete_set_hook_for_test(void (*hook)(const char *session_id))
 {
@@ -28,6 +29,17 @@ void memory_get_row_counts_set_hook_for_test(void (*hook)(void))
 	g_memory_get_row_counts_hook_for_test = hook;
 }
 
+void memory_sqlite_entry_set_hook_for_test(void (*hook)(void))
+{
+	g_sqlite_entry_hook_for_test = hook;
+}
+
+static void memory_sqlite_entry_probe(void)
+{
+	if (g_sqlite_entry_hook_for_test)
+		g_sqlite_entry_hook_for_test();
+}
+
 static const char *SCHEMA_MEMORIES =
 	"CREATE TABLE IF NOT EXISTS memories ("
 	"  rowid INTEGER PRIMARY KEY,"
@@ -202,6 +214,7 @@ int memory_save(const char *key, const char *content, const char *metadata)
 int memory_recall(const char *query, char *results, size_t max_len, int limit)
 {
 	if (!g_db || !results || max_len == 0 || !query) return -1;
+	memory_sqlite_entry_probe();
 	results[0] = '\0';
 	if (limit <= 0) limit = 10;
 	const char *sql = "SELECT content FROM memories_fts WHERE memories_fts MATCH ?1 ORDER BY rank LIMIT ?2";
@@ -279,6 +292,7 @@ int session_delete(const char *session_id)
 	if (g_session_delete_hook_for_test)
 		g_session_delete_hook_for_test(session_id);
 	if (!g_db || !session_id) return -1;
+	memory_sqlite_entry_probe();
 	const char *sql = "DELETE FROM sessions WHERE id = ?1";
 	sqlite3_stmt *stmt = NULL;
 	if (sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL) != SQLITE_OK) return -1;
@@ -291,6 +305,7 @@ int session_delete(const char *session_id)
 int session_list(char **session_ids_out, int max_count)
 {
 	if (!g_db || !session_ids_out || max_count <= 0) return -1;
+	memory_sqlite_entry_probe();
 	const char *sql = "SELECT id FROM sessions ORDER BY updated_at DESC";
 	sqlite3_stmt *stmt = NULL;
 	if (sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL) != SQLITE_OK) return -1;
@@ -398,6 +413,7 @@ int cron_job_create(const char *id, const char *schedule, const char *message,
                     const char *channel, const char *recipient, long long next_run, int enabled)
 {
 	if (!g_db || !id || !schedule || !message) return -1;
+	memory_sqlite_entry_probe();
 	/* fill_cron_job_row truncates id[128]; a longer id breaks the due cursor. */
 	if (strlen(id) >= sizeof(((cron_job_row_t *)0)->id)) return -1;
 	if (strlen(schedule) > (size_t)CRON_JOB_TEXT_MAX) return -1;
@@ -423,6 +439,7 @@ int cron_job_create(const char *id, const char *schedule, const char *message,
 int cron_job_delete(const char *id)
 {
 	if (!g_db || !id) return -1;
+	memory_sqlite_entry_probe();
 	const char *sql = "DELETE FROM cron_jobs WHERE id = ?1";
 	sqlite3_stmt *stmt = NULL;
 	if (sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL) != SQLITE_OK) return -1;
@@ -435,6 +452,7 @@ int cron_job_delete(const char *id)
 int cron_job_toggle(const char *id)
 {
 	if (!g_db || !id) return -1;
+	memory_sqlite_entry_probe();
 	const char *sql = "UPDATE cron_jobs SET enabled = 1 - enabled WHERE id = ?1";
 	sqlite3_stmt *stmt = NULL;
 	if (sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL) != SQLITE_OK) return -1;
@@ -460,6 +478,7 @@ int cron_job_update_next_run(const char *id, long long next_run)
 int cron_job_list(cron_job_row_t *out, int max_count)
 {
 	if (!g_db || !out || max_count <= 0) return -1;
+	memory_sqlite_entry_probe();
 	const char *sql = "SELECT id, schedule, message, channel, recipient, next_run, enabled "
 		"FROM cron_jobs ORDER BY next_run ASC, id ASC";
 	sqlite3_stmt *stmt = NULL;
@@ -485,6 +504,7 @@ int cron_job_list_due(long long now, cron_due_key_t *out, int max_count)
 	int count = 0;
 
 	if (!g_db || !out || max_count <= 0) return -1;
+	memory_sqlite_entry_probe();
 	sql = "SELECT id, next_run FROM cron_jobs WHERE next_run <= ?1 AND enabled = 1 "
 		"ORDER BY next_run ASC, id ASC";
 	if (sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL) != SQLITE_OK) return -1;
@@ -551,6 +571,7 @@ int cron_job_get_by_id(const char *id, cron_job_row_t *out)
 	int ret = 0;
 
 	if (!g_db || !id || !out) return -1;
+	memory_sqlite_entry_probe();
 	sql = "SELECT id, schedule, message, channel, recipient, next_run, enabled FROM cron_jobs WHERE id = ?1";
 	if (sqlite3_prepare_v2(g_db, sql, -1, &stmt, NULL) != SQLITE_OK) return -1;
 	sqlite3_bind_text(stmt, 1, id, -1, SQLITE_TRANSIENT);

@@ -92,6 +92,15 @@ void session_delete_set_hook_for_test(void (*hook)(const char *session_id));
  */
 void memory_get_row_counts_set_hook_for_test(void (*hook)(void));
 
+/**
+ * Test-only: invoke @p hook when a dashboard or cron-poll SQL entry runs.
+ * Pass NULL to clear. Used to assert those callers hold agent_lock()
+ * (SQLite is SQLITE_THREADSAFE=0).
+ *
+ * Example: memory_sqlite_entry_set_hook_for_test(probe); session_list(ids, 8);
+ */
+void memory_sqlite_entry_set_hook_for_test(void (*hook)(void));
+
 /**
  * List session IDs from the database.
  *

@@ -458,8 +458,13 @@ static void handle_skill_delete(const config_t *cfg, const char *name,
 static void handle_memory_get(const char *query, int limit, char *buf, size_t size, int *status)
 {
 	char *results = malloc(MEMORY_RESULTS_MAX);
+	int recall_rc;
 	if (!results) { json_error(buf, size, status, 500, "Out of memory"); return; }
-	if (memory_recall(query ? query : "", results, MEMORY_RESULTS_MAX, limit > 0 ? limit : 20) != 0) {
+	agent_lock();
+	recall_rc = memory_recall(query ? query : "", results, MEMORY_RESULTS_MAX,
+				   limit > 0 ? limit : 20);
+	agent_unlock();
+	if (recall_rc != 0) {
 		free(results);
 		json_error(buf, size, status, 500, "Memory recall failed");
 		return;
@@ -481,7 +486,10 @@ static void handle_memory_get(const char *query, int limit, char *buf, size_t si
 static void handle_sessions_list(char *buf, size_t size, int *status)
 {
 	char *ids[64];
-	int n = session_list(ids, 64);
+	int n;
+	agent_lock();
+	n = session_list(ids, 64);
+	agent_unlock();
 	cJSON *arr = cJSON_CreateArray();
 	if (!arr) { json_error(buf, size, status, 500, "Internal error"); return; }
 	for (int i = 0; i < n; i++) {
@@ -500,7 +508,11 @@ static void handle_sessions_list(char *buf, size_t size, int *status)
 
 static void handle_session_delete(const char *id, char *buf, size_t size, int *status)
 {
-	if (session_delete(id) != 0) {
+	int rc;
+	agent_lock();
+	rc = session_delete(id);
+	agent_unlock();
+	if (rc != 0) {
 		json_error(buf, size, status, 404, "Session not found");
 		return;
 	}
@@ -522,7 +534,9 @@ static void handle_cron_list(char *buf, size_t size, int *status)
 	int n;
 	int i;
 	if (!rows) { json_error(buf, size, status, 500, "Out of memory"); return; }
+	agent_lock();
 	n = cron_job_list(rows, 64);
+	agent_unlock();
 	if (n < 0) {
 		free(rows);
 		json_error(buf, size, status, 500, "Internal error");
@@ -580,7 +594,10 @@ static void handle_cron_create(const char *body, size_t body_len, char *buf, siz
 		id[0] = '\0';
 	const char *ch = (channel && cJSON_IsString(channel)) ? channel->valuestring : NULL;
 	const char *rec = (recipient && cJSON_IsString(recipient)) ? recipient->valuestring : NULL;
-	int ret = cron_create_job(schedule->valuestring, message->valuestring, ch, rec, id, sizeof(id));
+	int ret;
+	agent_lock();
+	ret = cron_create_job(schedule->valuestring, message->valuestring, ch, rec, id, sizeof(id));
+	agent_unlock();
 	cJSON_Delete(root);
 	if (ret != 0) {
 		json_error(buf, size, status, 400, "Failed to create job");
@@ -600,7 +617,11 @@ static void handle_cron_create(const char *body, size_t body_len, char *buf, siz
 
 static void handle_cron_delete(const char *id, char *buf, size_t size, int *status)
 {
-	if (cron_job_delete(id) != 0) {
+	int rc;
+	agent_lock();
+	rc = cron_job_delete(id);
+	agent_unlock();
+	if (rc != 0) {
 		json_error(buf, size, status, 404, "Job not found");
 		return;
 	}
@@ -610,7 +631,11 @@ static void handle_cron_delete(const char *id, char *buf, size_t size, int *stat
 
 static void handle_cron_toggle(const char *id, char *buf, size_t size, int *status)
 {
-	if (cron_job_toggle(id) != 0) {
+	int rc;
+	agent_lock();
+	rc = cron_job_toggle(id);
+	agent_unlock();
+	if (rc != 0) {
 		json_error(buf, size, status, 404, "Job not found");
 		return;
 	}
@@ -964,8 +989,10 @@ int dispatch_route(http_server_ctx_t *ctx, struct lws *wsi, int method,
 		if (method != HTTP_GET) { json_error(buf, size, status, 405, "Method not allowed"); return 0; }
 		char qbuf[256] = {0};
 		char lbuf[32] = {0};
-		lws_get_urlarg_by_name_safe(wsi, "q", qbuf, sizeof(qbuf));
-		lws_get_urlarg_by_name_safe(wsi, "limit", lbuf, sizeof(lbuf));
+		if (wsi) {
+			lws_get_urlarg_by_name_safe(wsi, "q", qbuf, sizeof(qbuf));
+			lws_get_urlarg_by_name_safe(wsi, "limit", lbuf, sizeof(lbuf));
+		}
 		int limit = parse_memory_limit_arg(lbuf[0] ? lbuf : NULL);
 		handle_memory_get(qbuf[0] ? qbuf : NULL, limit, buf, size, status);
 		return 0;