forked from WHC/Hermit
Usability pass: tool registry, TUI polish, saved keys and settings
Tools - Table-driven tool registry with permission classes and default/minimal profiles; new tools: edit_file, list_dir, glob, grep, delete_file, move_file, todo_write, web_fetch, ask_user (plus read_file paging). - Built-in Myers diff; write tools return unified diffs. - Persistent permission rules (.agent/permissions.json), per-turn undo snapshots (.agent/undo), AGENTS.md project notes, auto-compact at 80% of the model context, cancellable run_shell with process-group kill. TUI - Table-driven slash commands: /provider /key /effort /status /tools /permissions /yolo /undo /retry /diff /export /copy /rename /delete /init /max-steps /todo, with / and @ completion. - Permission modal with diff and prefix rules, ask_user modal, todo panel, header with model/effort/context, bracketed paste, line editing, wide-char cursor, NO_COLOR and ASCII fallback; Esc never quits. Startup and configuration - API keys are entered in the TUI (hidden) and saved per provider in <config>/credentials (0600); env variables are only a fallback. - Last provider, per-provider model and reasoning effort are remembered in <config>/settings.json; --effort/-e and /effort send reasoning_effort (low|medium|high|max) to models that accept it. - DeepSeek preset uses deepseek-flash / deepseek-v4-pro. - Session flags --new/--continue/--resume/--list-sessions, --yolo, --confirm. Compatibility and tests - ncurses detection, macOS/Homebrew support, make install, XDG config dir, POSIX cleanups; Gitea CI (gcc/clang/asan/musl/macOS). - Unit tests for diff, fs tools, registry, undo/perms and config; e2e fixtures multi_file_refactor and ask_or_todo; vendored cJSON.
This commit is contained in:
WHC
+27
-127
@@ -1,145 +1,45 @@
|
||||
#include "cJSON.h"
|
||||
#include "cst_agent.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
/* Minimal JSON tool object: {"name":"...","arguments":{...}}
|
||||
* Buffer-until-valid baseline (NOT bounded CST). */
|
||||
|
||||
static const char *skip_ws(const char *p, const char *end) {
|
||||
while (p < end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
|
||||
p++;
|
||||
return p;
|
||||
}
|
||||
|
||||
/* Find matching closing brace/bracket starting at open pos. Returns end ptr or
|
||||
* NULL if incomplete. Handles strings/escapes. */
|
||||
static const char *match_obj(const char *start, const char *end) {
|
||||
if (start >= end || *start != '{')
|
||||
return NULL;
|
||||
int depth = 0;
|
||||
int in_str = 0;
|
||||
for (const char *p = start; p < end; p++) {
|
||||
if (in_str) {
|
||||
if (*p == '\\' && p + 1 < end) {
|
||||
p++;
|
||||
continue;
|
||||
}
|
||||
if (*p == '"')
|
||||
in_str = 0;
|
||||
continue;
|
||||
}
|
||||
if (*p == '"') {
|
||||
in_str = 1;
|
||||
continue;
|
||||
}
|
||||
if (*p == '{')
|
||||
depth++;
|
||||
else if (*p == '}') {
|
||||
depth--;
|
||||
if (depth == 0)
|
||||
return p + 1;
|
||||
}
|
||||
}
|
||||
return NULL; /* incomplete */
|
||||
}
|
||||
|
||||
static int extract_string(const char *obj, const char *end, const char *key,
|
||||
char *out, size_t out_sz) {
|
||||
char pat[128];
|
||||
snprintf(pat, sizeof(pat), "\"%s\"", key);
|
||||
const char *k = obj;
|
||||
while (k && k < end) {
|
||||
k = strstr(k, pat);
|
||||
if (!k || k >= end)
|
||||
return -1;
|
||||
/* ensure key boundary */
|
||||
const char *colon = k + strlen(pat);
|
||||
colon = skip_ws(colon, end);
|
||||
if (colon >= end || *colon != ':') {
|
||||
k++;
|
||||
continue;
|
||||
}
|
||||
colon++;
|
||||
colon = skip_ws(colon, end);
|
||||
if (colon >= end || *colon != '"')
|
||||
return -1;
|
||||
colon++;
|
||||
size_t o = 0;
|
||||
for (const char *p = colon; p < end && o + 1 < out_sz; p++) {
|
||||
if (*p == '\\' && p + 1 < end) {
|
||||
p++;
|
||||
if (*p == 'n')
|
||||
out[o++] = '\n';
|
||||
else
|
||||
out[o++] = *p;
|
||||
continue;
|
||||
}
|
||||
if (*p == '"') {
|
||||
out[o] = 0;
|
||||
return 0;
|
||||
}
|
||||
out[o++] = *p;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* JSON-buffer baseline: {"name":"...","arguments":{...}} is executable only
|
||||
* once cJSON can parse the whole object (NOT bounded CST: nothing inside an
|
||||
* unfinished object is ever confirmed). */
|
||||
int cst_json_try_parse_tool(const char *buf, size_t len, cst_json_tool_t *out) {
|
||||
if (!buf || !out)
|
||||
return 0;
|
||||
memset(out, 0, sizeof(*out));
|
||||
const char *end = buf + len;
|
||||
const char *p = buf;
|
||||
const char *p = buf, *end = buf + len;
|
||||
while (p < end) {
|
||||
p = skip_ws(p, end);
|
||||
if (p >= end)
|
||||
break;
|
||||
if (*p != '{') {
|
||||
p++;
|
||||
continue;
|
||||
}
|
||||
const char *obj_end = match_obj(p, end);
|
||||
if (!obj_end)
|
||||
return 0; /* incomplete JSON — starvation failure mode */
|
||||
if (extract_string(p, obj_end, "name", out->name, sizeof(out->name)) !=
|
||||
0) {
|
||||
p++;
|
||||
continue;
|
||||
const char *obj_end = NULL;
|
||||
cJSON *o = cJSON_ParseWithLengthOpts(p, (size_t)(end - p), &obj_end, 0);
|
||||
if (!o)
|
||||
return 0; /* incomplete/invalid: the starvation failure mode */
|
||||
const cJSON *name = cJSON_GetObjectItemCaseSensitive(o, "name");
|
||||
const cJSON *args = cJSON_GetObjectItemCaseSensitive(o, "arguments");
|
||||
int ok = 0;
|
||||
if (cJSON_IsString(name) && args &&
|
||||
strlen(name->valuestring) < sizeof(out->name)) {
|
||||
char *a = cJSON_IsString(args) ? NULL : cJSON_PrintUnformatted(args);
|
||||
const char *av = a ? a : (cJSON_IsString(args) ? args->valuestring : "");
|
||||
if (strlen(av) < sizeof(out->arguments_json)) {
|
||||
snprintf(out->name, sizeof(out->name), "%s", name->valuestring);
|
||||
snprintf(out->arguments_json, sizeof(out->arguments_json), "%s", av);
|
||||
out->ok = ok = 1;
|
||||
}
|
||||
free(a);
|
||||
}
|
||||
/* arguments: object as raw substring */
|
||||
const char *akey = strstr(p, "\"arguments\"");
|
||||
if (!akey || akey >= obj_end) {
|
||||
p = obj_end;
|
||||
continue;
|
||||
}
|
||||
const char *colon = strchr(akey + 11, ':');
|
||||
if (!colon || colon >= obj_end)
|
||||
return 0;
|
||||
colon++;
|
||||
colon = skip_ws(colon, obj_end);
|
||||
if (colon >= obj_end)
|
||||
return 0;
|
||||
if (*colon == '{') {
|
||||
const char *ae = match_obj(colon, obj_end);
|
||||
if (!ae)
|
||||
return 0;
|
||||
size_t n = (size_t)(ae - colon);
|
||||
if (n >= sizeof(out->arguments_json))
|
||||
return 0;
|
||||
memcpy(out->arguments_json, colon, n);
|
||||
out->arguments_json[n] = 0;
|
||||
} else if (*colon == '"') {
|
||||
if (extract_string(akey, obj_end, "arguments", out->arguments_json,
|
||||
sizeof(out->arguments_json)) != 0)
|
||||
return 0;
|
||||
} else {
|
||||
p = obj_end;
|
||||
continue;
|
||||
}
|
||||
out->ok = 1;
|
||||
return 1;
|
||||
cJSON_Delete(o);
|
||||
if (ok)
|
||||
return 1;
|
||||
p = obj_end && obj_end > p ? obj_end : p + 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user