Merge remote-tracking branch 'origin/main' into browser-tools

# Conflicts:
#	Cargo.lock
#	src/channels/web/types.rs

.claude/commands/fix-issue.md

@@ -1,97 +0,0 @@
----
-description: Fetch a GitHub issue, create a branch, research the codebase, plan the fix, implement with tests, and commit
-disable-model-invocation: true
-allowed-tools: Bash(gh issue view:*), Bash(gh repo view:*), Bash(git fetch:*), Bash(git checkout:*), Bash(git status:*), Bash(git branch:*), Bash(git add:*), Bash(git commit:*), Bash(cargo fmt:*), Bash(cargo clippy:*), Bash(cargo test:*), Read, Edit, Write, Grep, Glob
-argument-hint: "<issue-number or github-issue-url>"
----
-
-# Fix GitHub Issue
-
-## Step 1: Resolve the issue
-
-Parse `$ARGUMENTS` to extract the issue number:
-- If it's a URL like `https://github.com/owner/repo/issues/42`, extract `42`.
-- If it's a bare number, use it directly.
-- If empty, stop and ask the user for an issue number.
-
-Fetch the issue:
-
-```
-gh issue view {number} --json title,body,labels,assignees,comments,state
-```
-
-If the issue is closed, warn the user and ask if they still want to proceed.
-
-## Step 2: Create a branch
-
-Create a fresh branch off the latest main:
-
-1. Fetch latest: `git fetch origin`
-2. Detect default branch: `gh repo view --json defaultBranchRef --jq .defaultBranchRef.name`
-3. Create and switch to a new branch: `git checkout -b fix/{number}-{short-slug} origin/{default-branch}`
-   - `{short-slug}` is 3-5 words from the issue title, lowercase, hyphenated (e.g. `fix/42-idor-workspace-check`)
-
-If the working tree has uncommitted changes, warn the user and stop. Do not stash or discard their work.
-
-## Step 3: Understand the issue
-
-Summarize the issue in 2-3 sentences. Identify:
-- **What's broken or missing** (the symptom or feature request)
-- **Acceptance criteria** (what "done" looks like, from the issue body or comments)
-- **Constraints** (mentioned technologies, backward compatibility, performance requirements)
-
-If the issue is unclear or ambiguous, list the open questions. These will be addressed during planning.
-
-## Step 4: Research the codebase
-
-Before planning, gather context:
-
-1. **Find relevant code** - Search for files, functions, types, and patterns mentioned in the issue. Read them in full.
-2. **Trace the flow** - If the issue is about a specific behavior, trace the code path from the entry point (route handler, CLI command, etc.) through to the relevant logic.
-3. **Check existing tests** - Find tests related to the affected code. Understand what's already covered.
-4. **Check for prior art** - Look for similar patterns in the codebase that solve analogous problems. Prefer consistency with existing patterns.
-
-## Step 5: Enter planning mode
-
-Enter planning mode to design the implementation. The plan MUST cover:
-
-1. **Root cause** (for bugs) or **design approach** (for features)
-2. **Files to modify** with specific descriptions of what changes in each
-3. **New files** (if any) with justification for why they're needed
-4. **Tests to add** - every code path introduced or changed needs a test:
-   - Happy path (expected input produces expected output)
-   - Error paths (invalid input, missing data, permission denied)
-   - Edge cases (empty collections, boundary values, concurrent access)
-5. **IronClaw-specific concerns**:
-   - If the change touches persistence, both database backends must be updated (`postgres.rs` and `libsql_backend.rs`)
-   - New `Database` trait methods need implementations in both backends
-   - No `.unwrap()` or `.expect()` in production code
-   - Use `crate::` imports, not `super::`
-   - Error types via `thiserror` in `error.rs`
-6. **Migration or compatibility concerns** (if any)
-
-Follow the project's CLAUDE.md guidance for architecture decisions.
-
-Wait for user approval before implementing.
-
-## Step 6: Implement
-
-After the plan is approved:
-
-1. Implement each change from the plan.
-2. Write all planned tests.
-3. Run IronClaw's full quality gate:
-   - `cargo fmt`
-   - `cargo clippy --all --benches --tests --examples --all-features` (zero warnings)
-   - `cargo test --lib` (all tests pass)
-4. If any check fails, fix it before proceeding.
-
-Note: Integration tests (`--test workspace_integration`) require PostgreSQL and are expected to fail locally. Only `--lib` test failures are blocking.
-
-## Step 7: Commit and summarize
-
-1. Commit with a descriptive message referencing the issue (e.g. `fix: prevent IDOR in function call outputs (#42)`).
-2. Summarize what was done:
-   - Files changed with line references
-   - Tests added and what they cover
-   - Any follow-up work or open questions

.claude/commands/respond-pr.md

@@ -1,81 +0,0 @@
----
-description: Respond to PR review comments — triage, plan fixes, implement after confirmation, push, and reply to reviewers
-disable-model-invocation: true
-allowed-tools: Bash(gh pr list:*), Bash(gh pr comment:*), Bash(gh api:*), Bash(gh repo view:*), Bash(git branch:*), Bash(git status:*), Bash(git add:*), Bash(git commit:*), Bash(git push:*), Bash(cargo fmt:*), Bash(cargo clippy:*), Bash(cargo test:*), Read, Edit, Write, Grep, Glob
-argument-hint: "[pr-number (optional, auto-detects from branch)]"
----
-
-# Review and Address PR Comments
-
-## Step 1: Find the PR
-
-If `$ARGUMENTS` is provided, use that as the PR number. Otherwise, detect the PR for the current branch:
-
-```
-gh pr list --head $(git branch --show-current) --json number,title,url --jq '.[0]'
-```
-
-If no PR is found, tell the user and stop.
-
-## Step 2: Fetch all review comments
-
-Resolve the repo owner and name:
-
-```
-gh repo view --json owner,name --jq '"\(.owner.login)/\(.name)"'
-```
-
-Fetch the full set of review comments (not issue-level comments):
-
-```
-gh api --paginate repos/{owner}/{repo}/pulls/{number}/comments
-```
-
-Also fetch the review summaries:
-
-```
-gh api --paginate repos/{owner}/{repo}/pulls/{number}/reviews
-```
-
-Deduplicate comments that appear multiple times (bots sometimes post the same finding under different IDs). Group by the actual issue being raised, not by comment ID.
-
-## Step 3: Triage and plan
-
-For each unique issue raised in the comments:
-
-1. **Check if already addressed** - Read the current code at the referenced location. If a prior commit already fixed it, note it as "already resolved".
-2. **Assess validity** - Determine if the comment identifies a real problem or is a false positive. Be honest about false positives but explain why.
-3. **Classify severity** - Critical (security/data loss), High (bugs/broken behavior), Medium (correctness/robustness), Low (style/naming/nits).
-4. **Plan the fix** - For each valid unresolved issue, describe the specific code change needed.
-
-Present the plan as a table to the user:
-
-| # | Issue | File:Line | Severity | Status | Planned Fix |
-|---|-------|-----------|----------|--------|-------------|
-
-Wait for user confirmation before proceeding to implementation.
-
-## Step 4: Implement fixes
-
-After user confirms:
-
-1. Implement each fix in the plan.
-2. Run IronClaw's quality gate to verify nothing breaks:
-   - `cargo fmt`
-   - `cargo clippy --all --benches --tests --examples --all-features`
-   - `cargo test --lib`
-3. Commit with a descriptive message referencing the PR review.
-4. Push to the branch.
-
-## Step 5: Reply to comments
-
-For each comment addressed, reply on the PR with a short message stating what was fixed and the commit SHA. For false positives or already-resolved items, reply explaining why no change was needed.
-
-## Rules
-
-- Never guess at code you haven't read. Always read the referenced file and line before assessing a comment.
-- Group duplicate comments (same issue reported by multiple bots) and reply to all of them.
-- Do not make changes beyond what the review comments ask for. Stay focused.
-- If a comment suggests a change you disagree with, present your reasoning to the user during the planning phase rather than silently ignoring it.
-- Follow IronClaw conventions: no `.unwrap()` in production code, use `crate::` imports, `thiserror` errors.
-- If changes touch persistence, verify both database backends are updated.

.claude/commands/review-crate.md

@@ -1,245 +0,0 @@
----
-description: Deep audit of the IronClaw crate for vulnerabilities, bugs, unfinished work, inconsistencies, and oversights
-disable-model-invocation: true
-allowed-tools: Bash(cargo fmt:*), Bash(cargo clippy:*), Bash(cargo test:*), Bash(cargo audit:*), Bash(git diff:*), Bash(git log:*), Bash(git show:*), Bash(wc:*), Read, Grep, Glob, Task
-argument-hint: "[path/to/crate]"
----
-
-# Rust Crate Audit
-
-You are performing a thorough audit of a Rust crate. Your goal is to find every vulnerability, bug, unfinished piece of work, inconsistency, and oversight before it ships. Leave no stone unturned.
-
-## Step 1: Locate the crate
-
-Parse `$ARGUMENTS`:
-- If a path is provided, use it as the crate root.
-- If empty, use the current working directory.
-
-Verify it's a valid Rust crate by checking for `Cargo.toml`. If not found, stop and ask the user.
-
-## Step 2: Understand the crate
-
-Read `Cargo.toml` to understand:
-- Crate name, version, edition
-- Dependencies (look for outdated, unmaintained, or suspicious crates)
-- Feature flags and their implications
-- Build scripts (`build.rs`) if any
-
-Read `CLAUDE.md`, `README.md`, or top-level documentation if present to understand intent and architecture.
-
-Read `src/lib.rs` or `src/main.rs` to get the module tree. Then read each module's `mod.rs` or top-level file to build a mental map of the crate's structure before diving into details.
-Read all Rust files (`src/*.rs`) to make sure everything is in context when you are reasoning.
-
-## Step 3: Run the compiler's checks
-
-Run these commands and capture output. Do NOT fix anything, just collect findings:
-
-```
-cargo fmt --check 2>&1
-```
-
-```
-cargo clippy --all --benches --tests --examples --all-features -- -W clippy::all -W clippy::pedantic -W clippy::nursery 2>&1
-```
-
-```
-cargo test --lib 2>&1
-```
-
-If any of these fail, record the failures as findings. If `cargo test` has ignored tests, note which ones and why.
-
-Note: Integration tests (`--test workspace_integration`) require a PostgreSQL database and are expected to fail locally. Only report `--lib` test failures as blocking.
-
-## Step 4: Scan for unfinished work
-
-Search the entire `src/` tree for:
-
-```
-todo!
-unimplemented!
-fixme
-FIXME
-TODO
-HACK
-XXX
-SAFETY:
-stub
-placeholder
-temporary
-```
-
-For each match:
-- Is it in production code or test code?
-- Is it a genuine incomplete feature or a deliberate placeholder?
-- Is there a tracking issue referenced?
-- Could this panic at runtime?
-
-Any `todo!()` or `unimplemented!()` in non-test code is **High severity** (runtime panic).
-
-## Step 5: Audit for vulnerabilities and unsafe code
-
-### 5a. Unsafe code
-
-Search for all `unsafe` blocks. For each one:
-- Is the safety invariant documented with a `// SAFETY:` comment?
-- Is the invariant actually upheld by the surrounding code?
-- Could the unsafe block be replaced with a safe alternative?
-- Are there any pointer dereferences, transmutes, or FFI calls?
-
-### 5b. Unwrap and panic paths
-
-Search for `.unwrap()`, `.expect(`, `panic!`, `unreachable!` in non-test code. For each:
-- Can this actually panic in production?
-- Is there a code path that reaches this with None/Err?
-- Should it be replaced with proper error handling (`?`, `.ok()`, `.unwrap_or_default()`)?
-
-IronClaw convention: `.unwrap()` and `.expect()` are banned in production code. Any occurrence outside `#[cfg(test)]` blocks is a **High severity** finding.
-
-### 5c. SQL and injection vectors
-
-Search for string formatting used in SQL queries, shell commands, or HTML:
-- `format!` used near `.execute(`, `.query(`, `Command::new(`
-- String interpolation in query construction vs parameterized queries
-- User input flowing into file paths (`Path::new`, `std::fs::`)
-
-IronClaw has two database backends (PostgreSQL and libSQL). Check both for injection vectors.
-
-### 5d. Cryptographic issues
-
-If the crate uses crypto:
-- Are comparisons constant-time? (look for `==` on secrets/hashes vs `subtle::ConstantTimeEq`)
-- Is randomness from `OsRng` / `thread_rng` and not a fixed seed?
-- Are keys/secrets zeroized after use? (`secrecy`, `zeroize` crates)
-- Are deprecated algorithms used? (MD5, SHA1 for security, RC4, DES)
-
-### 5e. Resource exhaustion
-
-- Are there unbounded allocations? (`Vec` growing from user input without limits)
-- Are there unbounded loops? (retry loops without max attempts)
-- Are file reads bounded? (`std::fs::read_to_string` on user-provided paths)
-- Are timeouts set on all network operations?
-- Are there connection/resource leaks? (opened but never closed, missing `Drop`)
-
-### 5f. Error handling
-
-- Are errors swallowed silently? (`let _ = ...`, `.ok()` discarding errors that matter)
-- Do error types carry enough context to debug in production?
-- Are there error type mismatches? (returning generic `anyhow::Error` where a typed error would prevent confusion)
-- Is `thiserror` used consistently for error types (IronClaw convention)?
-
-## Step 6: Check for inconsistencies
-
-### 6a. Naming conventions
-
-- Are types, functions, modules named consistently? (e.g., mixing `get_` and `fetch_`, `create_` and `new_`)
-- Do similar operations follow the same patterns?
-
-### 6b. Duplicate or near-duplicate code
-
-Look for:
-- Functions that do nearly the same thing with minor variations (candidates for generics or shared helpers)
-- Repeated error mapping patterns that should be extracted
-- Copy-pasted SQL queries or string templates with slight differences
-- Identical struct definitions or conversion logic in different modules
-
-### 6c. API consistency
-
-- Do similar functions take arguments in the same order?
-- Are return types consistent? (e.g., some functions return `Option<T>`, similar ones return `Result<T, E>`)
-- Are visibility modifiers consistent? (`pub` where it should be `pub(crate)`, or vice versa)
-
-### 6d. Dead code and unused items
-
-- Are there functions, structs, or modules that nothing references?
-- Are there `#[allow(dead_code)]` annotations that should be investigated?
-- Are there feature-gated items where the feature is never enabled?
-
-### 6e. Import style
-
-IronClaw convention: use `crate::` imports, not `super::`. Flag any `super::` imports in non-test code.
-
-## Step 7: Inspect for change oversights
-
-### 7a. Partial refactors
-
-- Are there old patterns coexisting with new patterns?
-- Are there renamed types/functions where some call sites still use the old name via a compatibility alias?
-- Are there comments referencing behavior that no longer exists?
-
-### 7b. Trait implementation gaps
-
-- If a trait is defined, do all intended types implement it?
-- Are there `impl` blocks that look incomplete?
-- Are `Default` implementations sensible?
-
-IronClaw key traits: `Database` (~60 methods), `Channel`, `Tool`, `LlmProvider`, `SuccessEvaluator`, `EmbeddingProvider`. If any new methods were added to `Database`, verify both `postgres.rs` and `libsql_backend.rs` implement them.
-
-### 7c. Test coverage gaps
-
-- Are there public functions without any test?
-- Are there error paths without tests?
-- Are there recently-changed functions where the tests still assert old behavior?
-
-### 7d. Documentation drift
-
-- Do doc comments match actual function behavior?
-- Are examples in doc comments still valid and compilable?
-
-## Step 8: Dependency audit
-
-Review `Cargo.toml` and `Cargo.lock`:
-- Are there duplicate versions of the same crate in the lock file? (potential version conflicts)
-- Are there dependencies with known security advisories? Run `cargo audit` to check (install with `cargo install cargo-audit` if not present).
-- Are there heavy dependencies used for trivial functionality?
-- Are dependency features minimal?
-
-## Step 9: Present findings
-
-Compile all findings into a structured report. Group by severity, then by category.
-
-### Format
-
-For each finding:
-
-```
-### [Severity] Category: One-line summary
-
-**Location:** `file_path:line_number`
-**Category:** Vulnerability | Bug | Unfinished | Inconsistency | Duplicate | Oversight | Style
-
-**Description:**
-Detailed explanation of the issue, why it matters, and how it could manifest.
-
-**Suggested fix:**
-Concrete suggestion with code if applicable.
-```
-
-### Severity levels
-
-- **Critical**: Security vulnerability, data loss, or crash in production
-- **High**: Bug that causes incorrect behavior, `todo!()`/`unimplemented!()` in prod code, or missing validation on trust boundaries
-- **Medium**: Inconsistency, duplicate code, incomplete error handling, missing tests for important paths
-- **Low**: Naming inconsistency, unnecessary complexity, documentation drift, minor dead code
-- **Nit**: Style preference, optional improvement
-
-### Summary table
-
-End with a summary table:
-
-| # | Severity | Category | File:Line | Finding |
-|---|----------|----------|-----------|---------|
-
-And a final tally: X Critical, Y High, Z Medium, W Low, V Nit.
-
-## Rules
-
-- Read every file before reporting on it. Never guess about code you haven't seen.
-- Be specific. "This might have issues" is worthless. "Line 42 calls `.unwrap()` on a `Result` that returns `Err` when the DB connection is dropped" is useful.
-- Distinguish certainty levels: "this IS a bug" vs "this COULD be a bug if X".
-- Don't invent problems to look thorough. If the code is solid, say so.
-- Focus on substance over style. Don't flag formatting unless it causes real confusion.
-- Respect existing project conventions (check CLAUDE.md). Don't flag patterns the project explicitly endorses.
-- When in doubt about severity, round up.
-- For large crates (>50 files), prioritize: core logic > public API > internal utilities > tests > examples.
-- Use the Task tool to parallelize file reading across modules when the crate is large.
-- Do NOT fix anything. This is a read-only audit. Report findings for the user to action.

.claude/commands/review-pr.md

@@ -1,170 +0,0 @@
----
-description: Paranoid architect review of a PR — fetches diff, reads changed files, deep review across 6 lenses, posts findings as GitHub comments
-disable-model-invocation: true
-allowed-tools: Bash(gh pr view:*), Bash(gh pr diff:*), Bash(gh pr comment:*), Bash(gh api:*), Bash(gh repo view:*), Bash(git diff:*), Bash(git log:*), Read, Grep, Glob
-argument-hint: "<pr-number or github-pr-url>"
----
-
-# Paranoid Architect Code Review
-
-You are reviewing this PR as a paranoid architect. Your job is to find every bug, vulnerability, race condition, edge case, and undocumented assumption before it ships. Assume adversarial users, concurrent access, and Murphy's law.
-
-## Step 1: Resolve the PR
-
-Parse `$ARGUMENTS` to extract the PR number:
-- If it's a URL like `https://github.com/owner/repo/pull/123`, extract `123`.
-- If it's a bare number, use it directly.
-- If empty, stop and ask the user for a PR number.
-
-Fetch PR metadata (including head commit SHA for posting line comments later):
-
-```
-gh pr view {number} --json title,body,baseRefName,headRefName,headRefOid,files,additions,deletions
-```
-
-Save the `headRefOid` value, you'll need it as `commit_id` in Step 6.
-
-## Step 2: Load the full diff
-
-```
-gh pr diff {number}
-```
-
-Also get the list of changed files:
-
-```
-gh pr diff {number} --name-only
-```
-
-## Step 3: Read every changed file in full
-
-For each changed file, read the ENTIRE current file (not just the diff hunks). You need surrounding context to catch:
-- Callers of modified functions that now behave differently
-- Trait/interface contracts that the change may violate
-- Invariants established elsewhere that the diff breaks
-
-If the PR touches more than 20 files, still read all of them, but process in this priority order: service logic > routes/handlers > models/types > tests > docs. Batch reads in groups of ~20 if needed.
-
-## Step 4: Deep review
-
-Go through the changes with each of these lenses. For every finding, note the file, line range, severity, and a concrete description.
-
-### IronClaw-specific checks
-
-In addition to the general lenses below, check IronClaw conventions (see CLAUDE.md):
-- No `.unwrap()` or `.expect()` in production code (tests are fine)
-- Use `crate::` imports, not `super::`
-- Error types use `thiserror` in `error.rs`
-- If the change touches persistence, verify both database backends are updated (PostgreSQL in `postgres.rs` AND libSQL in `libsql_backend.rs`)
-- New tools must implement the `Tool` trait correctly and be registered in `registry.rs`
-- External tool output must pass through the safety layer
-
-### 4a. Correctness and bugs
-
-- Off-by-one errors, wrong comparison operators, inverted conditions
-- Unreachable code, dead branches, impossible match arms
-- Type confusion (mixing up IDs, using wrong enum variant)
-- Incorrect error propagation (swallowed errors, wrong error type/status code)
-- Broken invariants (e.g. uniqueness assumptions violated, ordering assumptions wrong)
-- Concurrency issues (TOCTOU, missing locks, race conditions between check and use)
-
-### 4b. Edge cases and failure handling
-
-- What happens with empty input, None/null, zero-length collections?
-- What happens when external services fail (DB down, HTTP timeout, malformed response)?
-- What happens at integer boundaries (overflow, underflow, i64::MAX)?
-- What happens with malformed or adversarial input (invalid UTF-8, huge payloads, deeply nested JSON)?
-- Are all error paths tested? Does every `?` propagation make sense?
-- Are partial failures handled (e.g. wrote to DB but failed to emit event)?
-
-### 4c. Security (assume a malicious actor)
-
-- **Authentication/Authorization bypass**: Can an unauthenticated user reach this? Can workspace A's user access workspace B's data? Are there IDOR vulnerabilities?
-- **Injection**: SQL injection via string interpolation? Command injection? Log injection? Header injection?
-- **Data leakage**: Are secrets, PII, or conversation content logged? Returned in error messages? Exposed in API responses?
-- **Resource exhaustion / DoS**: Can an attacker send unbounded input? Trigger expensive operations without rate limits? Cause OOM via large allocations?
-- **Financial abuse**: Can tokens/credits be consumed without being tracked? Can usage limits be bypassed?
-- **Replay / race conditions**: Can the same request be replayed for double-spend? Can concurrent requests bypass limits?
-- **Cryptographic issues**: Timing attacks on comparisons? Weak randomness? Missing HMAC verification?
-
-### 4d. Test coverage
-
-- Is every new public function/method tested?
-- Are error paths tested (not just happy paths)?
-- Are edge cases covered (empty input, boundary values, concurrent access)?
-- Do existing tests still make sense with the new changes, or do they assert stale behavior?
-- Are there integration/e2e tests for the full flow?
-- If a test is missing, describe exactly what test should be written.
-
-### 4e. Documentation and assumptions
-
-- Are new assumptions documented in comments? (e.g. "this field is always non-empty because X")
-- Are non-obvious algorithms or business rules explained?
-- Are API contracts (request/response shapes, error codes, status codes) documented?
-- Are there TODO/FIXME/HACK comments that should be tracked as issues?
-
-### 4f. Architectural concerns
-
-- Does this change follow existing patterns in the codebase, or does it introduce a new one without justification?
-- Are there unnecessary abstractions or premature generalizations?
-- Is there duplicated logic that should be extracted?
-- Are dependencies between modules clean, or does this create circular/tight coupling?
-- Will this change make future work harder?
-
-## Step 5: Present findings
-
-Summarize findings to the user as a table:
-
-| # | Severity | Category | File:Line | Finding | Suggested Fix |
-|---|----------|----------|-----------|---------|---------------|
-
-Severity levels:
-- **Critical**: Security vulnerability, data loss, or financial exploit
-- **High**: Bug that will cause incorrect behavior in production
-- **Medium**: Robustness issue, missing validation, or incomplete error handling
-- **Low**: Style, naming, documentation, or minor improvement
-- **Nit**: Optional suggestion, take-it-or-leave-it
-
-Ask the user which findings to post as PR comments. Default: all Critical, High, and Medium.
-
-## Step 6: Post comments on GitHub
-
-Resolve the repo owner and name if not already known:
-
-```
-gh repo view --json owner,name --jq '"\(.owner.login)/\(.name)"'
-```
-
-For each approved finding, post a review comment on the PR at the specific file and line. Use the `headRefOid` from Step 1 as the `commit_id`:
-
-```
-gh api repos/{owner}/{repo}/pulls/{number}/comments \
-  -f body="..." \
-  -f path="..." \
-  -f commit_id="{headRefOid}" \
-  -F line=... \
-  -f side="RIGHT"
-```
-
-For findings that span multiple locations or are architectural, post as a regular PR comment:
-
-```
-gh pr comment {number} --body "..."
-```
-
-Format each comment clearly:
-- Severity tag (e.g. `**High Severity**`)
-- One-line summary
-- Detailed explanation of the issue
-- Concrete suggestion for the fix (with code if possible)
-
-## Rules
-
-- Read every changed file in full before writing a single finding. Context matters.
-- Never post a comment about code you haven't actually read. Verify line numbers against the actual file.
-- Be specific. "This might have issues" is useless. "Line 42 returns 404 but should return 400 because X" is useful.
-- Distinguish between "this IS a bug" and "this COULD be a bug if X". Be honest about certainty.
-- Don't nitpick formatting or style unless it causes actual confusion. Focus on substance.
-- If the code is good and you find nothing, say so. Don't invent problems to look thorough.
-- Respect the project's CLAUDE.md privacy rules: never include customer data, secrets, or PII in comments.
-- When in doubt about severity, round up. It's cheaper to dismiss a false alarm than to miss a real bug.

.claude/commands/triage-issues.md

@@ -1,257 +0,0 @@
----
-description: Triage open GitHub issues — split into bugs vs features, rank by severity/opportunity, and flag under-specified issues
-disable-model-invocation: true
-allowed-tools: Bash(gh issue list:*), Bash(gh issue view:*), Bash(gh api:*), Bash(git log:*), Read, Grep, Glob, Task
-argument-hint: "[--label=<filter>] [--milestone=<filter>]"
----
-
-# Issue Triage
-
-You are triaging all open issues on this repository. Your job is to split them into **bugs** and **feature requests**, rank each group, assess how well-specified each issue is, and produce an actionable triage report.
-
-## Step 1: Fetch all open issues
-
-Fetch every open issue with metadata:
-
-```
-gh issue list --state open --limit 200 --json number,title,author,labels,assignees,createdAt,updatedAt,body,commentsCount,reactionGroups,milestone
-```
-
-If `$ARGUMENTS` contains `--label=<X>`, append `--label '<X>'` to the command. If it contains `--milestone=<X>`, append `--milestone '<X>'` to the command.
-
-Also fetch recently closed issues (last 14 days) to detect duplicates and already-resolved work:
-
-```
-gh issue list --state closed --search "closed:>=$(date -v-14d +%Y-%m-%d)" --limit 100 --json number,title,body,labels,closedAt
-```
-
-**Exclude pull requests** — `gh issue list` may include PRs. Fetch open PR numbers to filter them out:
-
-```
-gh pr list --state open --json number --jq '.[].number'
-```
-
-Remove any issue whose number appears in this list.
-
-## Step 2: Classify each issue as Bug or Feature
-
-Read each issue's title, body, and labels to classify it into one of these categories:
-
-### Bugs
-Issues that describe **broken existing behavior** — something that worked or should work but doesn't. Signals:
-- Labels: `bug`, `defect`, `regression`, `crash`, `error`
-- Title/body keywords: "broken", "fails", "crash", "panic", "error", "regression", "doesn't work", "unexpected behavior"
-- Includes reproduction steps or error output
-- References existing functionality not working as documented
-
-### Feature Requests
-Issues that describe **new or enhanced behavior** — something that doesn't exist yet. Signals:
-- Labels: `enhancement`, `feature`, `feature-request`, `improvement`, `proposal`
-- Title/body keywords: "add", "support", "implement", "would be nice", "proposal", "RFC", "new"
-- Describes a capability the project doesn't have
-- Proposes a design or API change
-
-### Ambiguous
-If an issue doesn't clearly fit either category (e.g., "improve X performance" could be a bug or a feature), classify it as **Ambiguous** and note why.
-
-## Step 3: Rate issue detail level
-
-For each issue, assess how well-specified it is on a 3-tier scale:
-
-| Detail Level | Criteria |
-|-------------|----------|
-| **Well-specified** | Has clear description of what/why, reproduction steps (bugs) or user story (features), acceptance criteria or expected behavior, and enough context to start working immediately |
-| **Adequate** | Describes the problem or request clearly, but missing some detail — no repro steps, vague acceptance criteria, or unclear scope. Needs 1-2 clarifying questions before work can start |
-| **Under-specified** | Vague title-only or single-sentence body, no context on why it matters, no clear definition of done. Needs significant discussion before it's actionable |
-
-Indicators of good specification:
-- Code snippets, error logs, or screenshots
-- Steps to reproduce (bugs)
-- Proposed API/behavior (features)
-- Links to related issues or discussions
-- Clear "done when" criteria
-
-## Step 4: Rank bugs by severity
-
-Score each bug on these dimensions and compute an overall severity rank:
-
-### Impact (1-4)
-| Score | Level | Description |
-|-------|-------|-------------|
-| 4 | **Critical** | Data loss, security vulnerability, complete feature broken, crash in common path |
-| 3 | **High** | Major feature degraded, workaround exists but painful, affects many users |
-| 2 | **Medium** | Minor feature broken, easy workaround, affects subset of users |
-| 1 | **Low** | Cosmetic, edge case, documentation error, minor inconvenience |
-
-### Urgency (1-3)
-| Score | Level | Description |
-|-------|-------|-------------|
-| 3 | **Urgent** | Security issue, regression in recent release, blocking other work |
-| 2 | **Normal** | Should be fixed in next release cycle |
-| 1 | **Low** | Fix when convenient, backlog-worthy |
-
-### Scope (1-3)
-| Score | Level | Description |
-|-------|-------|-------------|
-| 3 | **Broad** | Affects core path, multiple modules, or all users |
-| 2 | **Moderate** | Affects one module or a specific configuration |
-| 1 | **Narrow** | Affects edge case or single obscure path |
-
-**Bug severity score** = Impact × 2 + Urgency + Scope (base max 14)
-
-Apply a one-time +2 boost if any of the following are true (max 16):
-- Has a linked PR already (someone is working on it — fast-track review)
-- Is labeled `security`
-- Is a regression (worked before, broken now)
-
-## Step 5: Rank features by opportunity
-
-Score each feature request on these dimensions:
-
-### Value (1-4)
-| Score | Level | Description |
-|-------|-------|-------------|
-| 4 | **High** | Unlocks new use cases, frequently requested, strategic alignment |
-| 3 | **Medium-High** | Significant quality-of-life improvement, good user demand signals |
-| 2 | **Medium** | Nice to have, modest improvement to existing workflow |
-| 1 | **Low** | Marginal value, niche use case, unclear demand |
-
-Look for value signals in the issue:
-- Number of thumbs-up reactions or "+1" comments
-- Multiple people asking for the same thing
-- Alignment with project roadmap (check CLAUDE.md TODOs)
-- Unblocks other features or simplifies architecture
-
-### Effort estimate (1-3, inverted — lower effort = higher score)
-| Score | Level | Description |
-|-------|-------|-------------|
-| 3 | **Small** | <1 day, isolated change, clear implementation path |
-| 2 | **Medium** | 1-3 days, touches a few modules, some design needed |
-| 1 | **Large** | 3+ days, cross-cutting, needs RFC or architectural discussion |
-
-### Readiness (1-3)
-| Score | Level | Description |
-|-------|-------|-------------|
-| 3 | **Ready** | Well-specified, implementation path clear, no blockers |
-| 2 | **Almost ready** | Needs minor clarification, but scope is understood |
-| 1 | **Not ready** | Needs design discussion, has open questions, blocked by other work |
-
-**Opportunity score** = Value × 2 + Effort + Readiness (base max 14)
-
-Apply a one-time +2 boost if any of the following are true (max 16):
-- A community member offered to implement it
-- It has a linked draft PR
-- It closes a gap listed in the project's "Current Limitations / TODOs"
-
-## Step 6: Detect duplicates and relationships
-
-Check for:
-- **Duplicates** — Issues describing the same bug or requesting the same feature (compare titles and bodies)
-- **Related clusters** — Groups of issues around the same area (e.g., multiple workspace issues, multiple CLI issues)
-- **Already fixed** — Open issues that may have been resolved by recently closed issues or merged PRs
-- **Blockers** — Issues that reference other issues as prerequisites ("depends on #N", "blocked by #N")
-- **Epic candidates** — Multiple small issues that could be grouped under a single tracking issue
-
-## Step 7: Produce the triage report
-
-Present the output in this format:
-
-### Quick Stats
-
-```
-Open: N | Bugs: N | Features: N | Ambiguous: N
-Well-specified: N | Adequate: N | Under-specified: N
-Unassigned: N | Stale (>30d): N
-```
-
----
-
-### Critical Bugs (Severity 12+)
-
-Bugs that need immediate attention. For each:
-
-| # | Title | Severity | Impact | Detail | Age | Assignee |
-|---|-------|----------|--------|--------|-----|----------|
-
-Include a 1-line summary of the root cause if discernible from the issue.
-
-### High-Priority Bugs (Severity 8-12)
-
-Same table format. These should be addressed in the next release cycle.
-
-### Medium/Low Bugs (Severity <8)
-
-Compact table, sorted by severity descending.
-
----
-
-### Quick Wins (Opportunity 12+ AND Effort = Small)
-
-Features that are high-value and low-effort — do these first. For each:
-
-| # | Title | Opportunity | Value | Effort | Detail | Age |
-|---|-------|-------------|-------|--------|--------|-----|
-
-### High-Opportunity Features (Opportunity 10+)
-
-Same table format. Worth investing in.
-
-### Backlog Features (Opportunity <10)
-
-Compact table, sorted by opportunity descending.
-
----
-
-### Under-Specified Issues (Need Clarification)
-
-Issues rated "Under-specified" that can't be triaged effectively. For each, suggest 1-2 specific questions to ask the author to make it actionable.
-
-| # | Title | Type | What's missing |
-|---|-------|------|---------------|
-
-### Ambiguous Issues (Bug or Feature?)
-
-Issues that couldn't be clearly classified. For each, explain the ambiguity and suggest which category it likely belongs in.
-
----
-
-### Duplicates & Overlaps
-
-Groups of issues that appear to be duplicates or closely related. Recommend which to keep and which to close.
-
-### Already Fixed?
-
-Open issues that may have been resolved by recently closed issues or merged PRs.
-
-### Stale Issues (>30 days, no activity)
-
-Issues with no updates in 30+ days. Recommend: close, ping author, or keep.
-
----
-
-### By Area
-
-Group all issues by the area of the codebase they affect (infer from title/body/labels):
-
-| Area | Bugs | Features | Top Priority |
-|------|------|----------|-------------|
-
-### Suggested Next Actions
-
-Based on the triage, provide 3-5 concrete recommendations:
-1. Which bugs to fix first and why
-2. Which quick-win features to pick up
-3. Which under-specified issues to clarify
-4. Which stale issues to close
-5. Any clusters that suggest a larger initiative
-
-## Rules
-
-- Use `gh` CLI for all GitHub operations. Never guess issue state — always check.
-- For large issue lists (>20), use the Task tool to parallelize fetching issue details and comments.
-- Be concise in summaries. One line per issue in tables.
-- When scoring, be honest about uncertainty. If you can't tell severity from the description, say so and rate it conservatively.
-- Factor in issue age — older unresolved bugs may indicate they're less critical than they seem, or that they're hard to fix. Note this in your assessment.
-- Check comment threads for additional context that the original body may lack. An under-specified issue with rich discussion may actually be well-understood.
-- Do NOT post comments, close issues, or take any action. This skill is read-only analysis.
-- If the repo has >100 open issues, focus the detailed analysis on the top 30 by recency and engagement (comments + reactions), and provide a summary table for the rest.

.claude/commands/triage-prs.md

@@ -1,161 +0,0 @@
----
-description: Classify all open PRs by module, review state, scope, and architectural impact — produces a prioritized triage dashboard
-disable-model-invocation: true
-allowed-tools: Bash(gh pr list:*), Bash(gh pr view:*), Bash(gh pr diff:*), Bash(gh api:*), Bash(gh pr checks:*), Bash(git log:*), Read, Grep, Glob, Task
-argument-hint: "[--label=<filter>] [--author=<filter>]"
----
-
-# PR Triage Dashboard
-
-You are triaging all open PRs on this repository. Your job is to produce a prioritized, module-grouped dashboard that tells the maintainer exactly which PRs need attention and in what order.
-
-## Step 1: Fetch all open PRs
-
-Fetch every open PR with metadata:
-
-```
-gh pr list --state open --limit 100 --json number,title,author,labels,additions,deletions,headRefName,createdAt,updatedAt,isDraft,reviewRequests,reviews,files,body
-```
-
-If `$ARGUMENTS` contains `--label=<X>`, append `--label '<X>'` to the `gh pr list` command. If it contains `--author=<X>`, append `--author '<X>'` to the command.
-
-Also fetch recently merged PRs (last 7 days) to detect superseded/conflicting work:
-
-```
-gh pr list --state merged --search "merged:>=$(date -v-7d +%Y-%m-%d)" --limit 100 --json number,title,body,mergedAt
-```
-
-## Step 2: Classify each PR by module
-
-For each open PR, determine the primary module it touches by examining the `files` field. Classify into these categories based on the dominant `src/` subdirectory:
-
-| Category | Directories |
-|----------|------------|
-| **LLM & Inference** | `src/llm/` |
-| **Agent Core** | `src/agent/`, `src/skills/` |
-| **Tools** | `src/tools/`, `tools-src/` |
-| **Channels** | `src/channels/`, `channels-src/` |
-| **Storage & Memory** | `src/db/`, `src/workspace/`, `migrations/` |
-| **Security** | `src/safety/`, `src/secrets/` |
-| **Config & Setup** | `src/config.rs`, `src/setup/`, `src/cli/` |
-| **Sandbox & Orchestration** | `src/sandbox/`, `src/orchestrator/`, `src/worker/` |
-| **Hooks & Extensions** | `src/hooks/`, `src/extensions/` |
-| **Context & History** | `src/context/`, `src/history/`, `src/estimation/`, `src/evaluation/` |
-| **Web Gateway** | `src/channels/web/` |
-| **CI/CD & Docs** | `.github/`, `README.md`, `CLAUDE.md`, `*.md` (no src) |
-| **Other** | Anything else |
-
-If a PR touches multiple modules, assign it to the **primary** module (most files changed) but note the cross-cutting modules.
-
-## Step 3: Assess review state
-
-For each PR, determine its review status:
-
-- **Approved** — At least one human APPROVED review, no outstanding CHANGES_REQUESTED
-- **Changes requested** — At least one CHANGES_REQUESTED review still unresolved
-- **Reviewed (comments only)** — Human comments but no formal approve/reject
-- **Automated only** — Only bot reviews (gemini-code-assist, copilot, etc.)
-- **No review** — No reviews at all
-
-Also check:
-- CI status: `gh pr checks {number}` — PASS / FAIL / NONE
-- Draft status: is the PR marked as draft?
-- Staleness: how many days since `updatedAt`?
-
-## Step 4: Determine scope and risk
-
-Classify each PR by scope:
-
-| Scope | Criteria |
-|-------|----------|
-| **Tiny** | <50 lines changed (additions + deletions), 1-2 files |
-| **Small** | 50-200 lines, 1-5 files |
-| **Medium** | 200-500 lines, 3-10 files |
-| **Large** | 500-2000 lines, 5-20 files |
-| **XL** | 2000+ lines or 20+ files |
-
-## Step 5: Classify as fix vs. architectural
-
-For each PR, determine its nature:
-
-### Fixes (merge fast)
-- Bug fixes with clear root cause
-- Security patches
-- Crash/panic prevention
-- Typo/doc corrections
-- Code quality (removing .unwrap(), etc.)
-
-### Features (standard review)
-- New functionality within existing patterns
-- New tool implementations
-- Configuration additions
-- Test additions
-
-### Architectural (deep review needed)
-- New modules or subsystems
-- Changes to core traits or interfaces
-- New database backends or storage engines
-- New provider abstractions
-- Changes touching 5+ modules
-- Anything modifying the agent loop, session model, or security layer
-- New dependencies (check Cargo.toml changes)
-
-## Step 6: Detect conflicts and superseded PRs
-
-Check for:
-- Multiple PRs fixing the same issue (look at "Closes #N" / "Fixes #N" in PR bodies)
-- PRs touching the same files (potential merge conflicts)
-- PRs that are follow-ups to other open PRs (dependency chains)
-- PRs superseded by recently merged work
-
-## Step 7: Produce the dashboard
-
-Present the output in this format:
-
-### Quick Stats
-```
-Open: N | Draft: N | Needs review: N | Changes requested: N | Ready to merge: N
-```
-
-### Ready to Merge
-PRs that are approved, CI passing, and non-draft. List with one-line summary.
-
-### Needs Human Review (Fixes)
-Fixes that have no human review yet, sorted by severity (security > crash > bug > quality).
-
-### Needs Human Review (Features)
-Features with no human review, sorted by scope (smallest first).
-
-### Needs Deep Architectural Review
-Large/XL PRs, new modules, or cross-cutting changes. For each, include:
-- Which modules are affected
-- What new patterns or abstractions are introduced
-- Key risk areas to focus review on
-
-### Changes Requested (Waiting on Author)
-PRs where a reviewer asked for changes. Include who requested and a 1-line summary of what's needed.
-
-### Stale / Blocked
-PRs with no activity >7 days, or blocked by other PRs.
-
-### Conflicts & Overlaps
-Any detected conflicts, superseded PRs, or dependency chains.
-
-### By Module
-Group all PRs by their primary module in a compact table:
-
-| Module | PRs | Key PR to review first |
-|--------|-----|----------------------|
-
-### Superseded PRs (recommend closing)
-PRs that are clearly superseded by merged work. Include reasoning.
-
-## Rules
-
-- Use `gh` CLI for all GitHub operations. Never guess PR state — always check.
-- For large PR lists (>15), use the Task tool to parallelize fetching PR details and diffs.
-- Be concise in summaries. One line per PR in tables.
-- When assessing "ready to merge", be conservative. If there's any unresolved concern from a repo member, it's not ready.
-- Flag any PR that has been open >14 days with no review as needing attention.
-- If a PR description says "Closes #N" but #N was already closed by another merged PR, flag it as potentially superseded.
-- Do NOT post comments or take any action on PRs. This skill is read-only analysis.

.env.example

@@ -2,43 +2,14 @@
 DATABASE_URL=postgres://localhost/ironclaw
 DATABASE_POOL_SIZE=10
 
-# LLM Provider
-# LLM_BACKEND=nearai           # default
-# Possible values: nearai, ollama, openai_compatible, openai, anthropic, tinfoil
-
-# === NEAR AI (Chat Completions API) ===
-# Two auth modes:
-#   1. Session token (default): Uses browser OAuth (GitHub/Google) on first run.
-#      Session token stored in ~/.ironclaw/session.json automatically.
-#      Base URL defaults to https://private.near.ai
-#   2. API key: Set NEARAI_API_KEY to use API key auth from cloud.near.ai.
-#      Base URL defaults to https://cloud-api.near.ai
-NEARAI_MODEL=zai-org/GLM-5-FP8
-NEARAI_BASE_URL=https://private.near.ai
+# LLM Provider (NEAR AI)
+# NEAR AI provides a unified interface to all models with user authentication
+# Session token is stored in ~/.ironclaw/session.json and managed automatically.
+# On first run, the agent will open a browser for OAuth authentication.
+NEARAI_MODEL=claude-3-5-sonnet-20241022
+NEARAI_BASE_URL=https://cloud-api.near.ai
 NEARAI_AUTH_URL=https://private.near.ai
-# NEARAI_SESSION_TOKEN=sess_...                  # hosting providers: set this
-# NEARAI_SESSION_PATH=~/.ironclaw/session.json   # optional, default shown
-# NEARAI_API_KEY=...                             # API key from cloud.near.ai
-
-# Local LLM Providers (Ollama, LM Studio, vLLM, LiteLLM)
-
-# === Ollama ===
-# OLLAMA_MODEL=llama3.2
-# LLM_BACKEND=ollama
-# OLLAMA_BASE_URL=http://localhost:11434   # default
-
-# === OpenAI-compatible (LM Studio, vLLM, Anything-LLM) ===
-# LLM_MODEL=llama-3.2-3b-instruct-q4_K_M
-# LLM_BACKEND=openai_compatible
-# LLM_BASE_URL=http://localhost:1234/v1
-# LLM_API_KEY=sk-...                        # optional for local servers
-
-# === OpenRouter (via OpenAI-compatible) ===
-# LLM_MODEL=anthropic/claude-sonnet-4
-# LLM_BACKEND=openai_compatible
-# LLM_BASE_URL=https://openrouter.ai/api/v1
-# LLM_API_KEY=sk-or-...
-
+# NEARAI_SESSION_PATH=~/.ironclaw/session.json  # optional, default shown
 
 # Channel Configuration
 # CLI is always enabled
@@ -75,12 +46,6 @@ HEARTBEAT_INTERVAL_SECS=1800
 HEARTBEAT_NOTIFY_CHANNEL=cli
 HEARTBEAT_NOTIFY_USER=default
 
-# Memory hygiene settings (automatic cleanup of stale workspace documents)
-# Runs on each heartbeat tick; identity files (IDENTITY.md, SOUL.md) are never deleted
-# MEMORY_HYGIENE_ENABLED=true
-# MEMORY_HYGIENE_RETENTION_DAYS=30     # delete daily/ docs older than this many days
-# MEMORY_HYGIENE_CADENCE_HOURS=12      # minimum hours between cleanup passes
-
 # Safety settings
 SAFETY_MAX_OUTPUT_LENGTH=100000
 SAFETY_INJECTION_CHECK_ENABLED=true

.github/labeler.yml

@@ -1,166 +0,0 @@
-# Scope labels for actions/labeler@v6
-# Maps file path globs to scope labels. Multiple labels can apply per PR.
-
-"scope: agent":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/agent/**
-
-"scope: channel":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/channels/channel.rs
-          - src/channels/manager.rs
-          - src/channels/mod.rs
-
-"scope: channel/cli":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/channels/cli/**
-          - src/cli/**
-
-"scope: channel/web":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/channels/web/**
-
-"scope: channel/wasm":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/channels/wasm/**
-
-"scope: tool":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/tools/tool.rs
-          - src/tools/registry.rs
-          - src/tools/mod.rs
-          - src/tools/sandbox.rs
-
-"scope: tool/builtin":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/tools/builtin/**
-
-"scope: tool/wasm":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/tools/wasm/**
-
-"scope: tool/mcp":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/tools/mcp/**
-
-"scope: tool/builder":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/tools/builder/**
-
-"scope: db":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/db/mod.rs
-
-"scope: db/postgres":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/db/postgres.rs
-          - migrations/**
-
-"scope: db/libsql":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/db/libsql_backend.rs
-          - src/db/libsql_migrations.rs
-
-"scope: safety":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/safety/**
-
-"scope: llm":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/llm/**
-
-"scope: workspace":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/workspace/**
-
-"scope: orchestrator":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/orchestrator/**
-
-"scope: worker":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/worker/**
-
-"scope: secrets":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/secrets/**
-
-"scope: config":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/config.rs
-          - src/settings.rs
-
-"scope: extensions":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/extensions/**
-
-"scope: setup":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/setup/**
-
-"scope: evaluation":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/evaluation/**
-
-"scope: estimation":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/estimation/**
-
-"scope: sandbox":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/sandbox/**
-          - Dockerfile*
-
-"scope: hooks":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/hooks/**
-
-"scope: pairing":
-  - changed-files:
-      - any-glob-to-any-file:
-          - src/pairing/**
-
-"scope: ci":
-  - changed-files:
-      - any-glob-to-any-file:
-          - .github/workflows/**
-          - .github/scripts/**
-
-"scope: docs":
-  - changed-files:
-      - any-glob-to-any-file:
-          - "**/*.md"
-          - docs/**
-          - LICENSE*
-
-"scope: dependencies":
-  - changed-files:
-      - any-glob-to-any-file:
-          - Cargo.toml
-          - Cargo.lock

.github/scripts/create-labels.sh

@@ -1,71 +0,0 @@
-#!/usr/bin/env bash
-# Idempotent label bootstrap for IronClaw PR automation.
-# Uses `gh label create --force` so it can be re-run safely.
-#
-# Usage: bash .github/scripts/create-labels.sh
-# Requires: gh CLI authenticated with repo scope
-
-set -euo pipefail
-
-if ! command -v gh &>/dev/null; then
-  echo "Error: gh CLI is required. Install from https://cli.github.com" >&2
-  exit 1
-fi
-
-create() {
-  local name="$1" color="$2" description="$3"
-  gh label create "$name" --color "$color" --description "$description" --force
-}
-
-echo "==> Creating size labels..."
-create "size: XS"    "F9D0C4" "< 10 changed lines (excluding docs)"
-create "size: S"     "F5A3A3" "10-49 changed lines"
-create "size: M"     "E57373" "50-199 changed lines"
-create "size: L"     "D32F2F" "200-499 changed lines"
-create "size: XL"    "B71C1C" "500+ changed lines"
-
-echo "==> Creating risk labels..."
-create "risk: low"    "4CAF50" "Changes to docs, tests, or low-risk modules"
-create "risk: medium" "FFC107" "Business logic, config, or moderate-risk modules"
-create "risk: high"   "F44336" "Safety, secrets, auth, or critical infrastructure"
-create "risk: manual" "9E9E9E" "Risk level set manually (sticky, not overwritten)"
-
-echo "==> Creating scope labels..."
-create "scope: agent"         "006B75" "Agent core (agent loop, router, scheduler)"
-create "scope: channel"       "00838F" "Channel infrastructure"
-create "scope: channel/cli"   "00897B" "TUI / CLI channel"
-create "scope: channel/web"   "00796B" "Web gateway channel"
-create "scope: channel/wasm"  "00695C" "WASM channel runtime"
-create "scope: tool"          "1565C0" "Tool infrastructure"
-create "scope: tool/builtin"  "1976D2" "Built-in tools"
-create "scope: tool/wasm"     "1E88E5" "WASM tool sandbox"
-create "scope: tool/mcp"      "2196F3" "MCP client"
-create "scope: tool/builder"  "42A5F5" "Dynamic tool builder"
-create "scope: db"            "4A148C" "Database trait / abstraction"
-create "scope: db/postgres"   "6A1B9A" "PostgreSQL backend"
-create "scope: db/libsql"     "7B1FA2" "libSQL / Turso backend"
-create "scope: safety"        "880E4F" "Prompt injection defense"
-create "scope: llm"           "4527A0" "LLM integration"
-create "scope: workspace"     "283593" "Persistent memory / workspace"
-create "scope: orchestrator"  "0D47A1" "Container orchestrator"
-create "scope: worker"        "01579B" "Container worker"
-create "scope: secrets"       "BF360C" "Secrets management"
-create "scope: config"        "E65100" "Configuration"
-create "scope: extensions"    "33691E" "Extension management"
-create "scope: setup"         "827717" "Onboarding / setup"
-create "scope: evaluation"    "558B2F" "Success evaluation"
-create "scope: estimation"    "9E9D24" "Cost/time estimation"
-create "scope: sandbox"       "00BFA5" "Docker sandbox"
-create "scope: hooks"         "6D4C41" "Git/event hooks"
-create "scope: pairing"       "4E342E" "Pairing mode"
-create "scope: ci"            "546E7A" "CI/CD workflows"
-create "scope: docs"          "78909C" "Documentation"
-create "scope: dependencies"  "90A4AE" "Dependency updates"
-
-echo "==> Creating contributor labels..."
-create "contributor: new"         "FFF9C4" "First-time contributor"
-create "contributor: regular"     "FFE082" "2-5 merged PRs"
-create "contributor: experienced" "FFB74D" "6-19 merged PRs"
-create "contributor: core"        "FF8A65" "20+ merged PRs"
-
-echo "Done. All labels created/updated."

.github/scripts/pr-labeler.sh

@@ -1,139 +0,0 @@
-#!/usr/bin/env bash
-# Classify a PR by size, risk, and contributor tier.
-# Called by the pr-label-classify workflow.
-#
-# Inputs (env vars):
-#   PR_NUMBER  — pull request number
-#   REPO       — owner/repo (e.g. "user/ironclaw")
-#
-# Requires: gh CLI, jq
-
-set -euo pipefail
-
-PR_NUMBER="${PR_NUMBER:?PR_NUMBER is required}"
-REPO="${REPO:?REPO is required}"
-
-# ─── helpers ────────────────────────────────────────────────────────────────
-
-# Remove all labels in a dimension except the desired one.
-# Usage: set_exclusive_label "size" "size: M"
-set_exclusive_label() {
-  local prefix="$1" desired="$2"
-
-  # Fetch current labels on the PR
-  local current
-  current=$(gh pr view "$PR_NUMBER" --repo "$REPO" --json labels --jq '.labels[].name')
-
-  # Remove any existing label with the same prefix
-  while IFS= read -r label; do
-    [[ -z "$label" ]] && continue
-    if [[ "$label" == "${prefix}:"* && "$label" != "$desired" ]]; then
-      gh pr edit "$PR_NUMBER" --repo "$REPO" --remove-label "$label" 2>/dev/null || true
-    fi
-  done <<< "$current"
-
-  # Add the desired label
-  gh pr edit "$PR_NUMBER" --repo "$REPO" --add-label "$desired"
-}
-
-# ─── size ───────────────────────────────────────────────────────────────────
-
-classify_size() {
-  # Sum changed lines across non-doc files
-  local total
-  total=$(gh api "repos/${REPO}/pulls/${PR_NUMBER}/files" \
-    --paginate --jq '
-      [.[] | select(.filename | test("\\.(md|txt|rst|adoc)$") | not) | .changes]
-      | add // 0
-    ')
-
-  local label
-  if   (( total < 10 ));  then label="size: XS"
-  elif (( total < 50 ));  then label="size: S"
-  elif (( total < 200 )); then label="size: M"
-  elif (( total < 500 )); then label="size: L"
-  else                         label="size: XL"
-  fi
-
-  echo "Size: ${total} changed lines -> ${label}"
-  set_exclusive_label "size" "$label"
-}
-
-# ─── risk ───────────────────────────────────────────────────────────────────
-
-classify_risk() {
-  # If "risk: manual" is present, skip — it's a sticky override
-  local current
-  current=$(gh pr view "$PR_NUMBER" --repo "$REPO" --json labels --jq '.labels[].name')
-  if echo "$current" | grep -qx "risk: manual"; then
-    echo "Risk: skipped (manual override)"
-    return
-  fi
-
-  # Fetch changed file paths
-  local files
-  files=$(gh api "repos/${REPO}/pulls/${PR_NUMBER}/files" \
-    --paginate --jq '.[].filename')
-
-  local risk="low"
-
-  while IFS= read -r file; do
-    [[ -z "$file" ]] && continue
-
-    case "$file" in
-      # High risk: safety, secrets, auth, crypto, setup, orchestrator auth
-      src/safety/*|src/secrets/*|src/llm/session.rs|src/orchestrator/auth.rs|\
-      src/channels/web/auth.rs|src/setup/*)
-        risk="high"
-        break  # can't go higher
-        ;;
-
-      # Medium risk: agent core, config, database, worker, tools, channels
-      src/agent/*|src/config.rs|src/settings.rs|src/db/*|src/worker/*|\
-      src/tools/*|src/channels/*|src/orchestrator/*|src/context/*|\
-      src/hooks/*|src/sandbox/*|src/extensions/*|Cargo.toml|\
-      .github/workflows/*)
-        # Only upgrade, never downgrade
-        [[ "$risk" != "high" ]] && risk="medium"
-        ;;
-
-      # Low risk: docs, tests, estimation, evaluation, history, etc.
-      *)
-        ;;
-    esac
-  done <<< "$files"
-
-  echo "Risk: ${risk}"
-  set_exclusive_label "risk" "risk: ${risk}"
-}
-
-# ─── contributor tier ───────────────────────────────────────────────────────
-
-classify_contributor() {
-  # Get PR author
-  local author
-  author=$(gh pr view "$PR_NUMBER" --repo "$REPO" --json author --jq '.author.login')
-
-  # Count merged PRs by this author in this repo
-  local count
-  count=$(gh pr list --repo "$REPO" --state merged --author "$author" \
-    --limit 100 --json number --jq 'length')
-
-  local label
-  if   (( count == 0 )); then label="contributor: new"
-  elif (( count < 6 ));  then label="contributor: regular"
-  elif (( count < 20 )); then label="contributor: experienced"
-  else                        label="contributor: core"
-  fi
-
-  echo "Contributor: ${author} has ${count} merged PRs -> ${label}"
-  set_exclusive_label "contributor" "$label"
-}
-
-# ─── main ───────────────────────────────────────────────────────────────────
-
-echo "Classifying PR #${PR_NUMBER} in ${REPO}..."
-classify_size
-classify_risk
-classify_contributor
-echo "Done."

.github/workflows/pr-label-classify.yml

@@ -1,26 +0,0 @@
-name: "PR: Classify (Size, Risk, Contributor)"
-
-on:
-  pull_request_target:
-    types: [opened, synchronize, reopened]
-
-permissions:
-  contents: read
-  pull-requests: write
-  issues: read           # needed for search/issues API (contributor count)
-
-jobs:
-  classify:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout base branch
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.base.ref }}
-
-      - name: Classify PR
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          REPO: ${{ github.repository }}
-        run: bash .github/scripts/pr-labeler.sh

.github/workflows/pr-label-scope.yml

@@ -1,18 +0,0 @@
-name: "PR: Scope Labels"
-
-on:
-  pull_request_target:
-    types: [opened, synchronize, reopened]
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  scope:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/labeler@v5
-        with:
-          configuration-path: .github/labeler.yml
-          sync-labels: false          # additive only — never remove scope labels

.github/workflows/release.yml

@@ -39,6 +39,7 @@ permissions:
 # If there's a prerelease-style suffix to the version, then the release(s)
 # will be marked as a prerelease.
 on:
+  pull_request:
   push:
     tags:
       - '**[0-9]+.[0-9]+.[0-9]+*'

.gitignore

@@ -1,21 +1,9 @@
 
 .env
 .env.local
-.env.*
-!.env.example
-
-# Claude Code worktrees
-.claude/worktrees/
-
-# Sidecar tool data
-.sidecar/
-.todos/
 
 target/
 
-# Benchmark results (local runs, not committed)
-bench-results/
-
 # WASM build artifacts (loaded from disk, not bundled)
 *.wasm
 

CHANGELOG.md

@@ -7,147 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.8.0](https://github.com/nearai/ironclaw/compare/ironclaw-v0.7.0...ironclaw-v0.8.0) - 2026-02-20
-
-### Added
-
-- extension registry with metadata catalog and onboarding integration ([#238](https://github.com/nearai/ironclaw/pull/238))
-- *(models)* add GPT-5.3 Codex, full GPT-5.x family, Claude 4.x series, o4-mini ([#197](https://github.com/nearai/ironclaw/pull/197))
-- wire memory hygiene into the heartbeat loop ([#195](https://github.com/nearai/ironclaw/pull/195))
-
-### Fixed
-
-- persist WASM channel workspace writes across callbacks ([#264](https://github.com/nearai/ironclaw/pull/264))
-- consolidate per-module ENV_MUTEX into crate-wide test lock ([#246](https://github.com/nearai/ironclaw/pull/246))
-- remove auto-proceed fake user message injection from agent loop ([#255](https://github.com/nearai/ironclaw/pull/255))
-- onboarding errors reset flow and remote server auth (#185, #186) ([#248](https://github.com/nearai/ironclaw/pull/248))
-- parallelize tool call execution via JoinSet ([#219](https://github.com/nearai/ironclaw/pull/219)) ([#252](https://github.com/nearai/ironclaw/pull/252))
-- prevent pipe deadlock in shell command execution ([#140](https://github.com/nearai/ironclaw/pull/140))
-- persist turns after approval and add agent-level tests ([#250](https://github.com/nearai/ironclaw/pull/250))
-
-### Other
-
-- remove Responses API, consolidate to Chat Completions ([#272](https://github.com/nearai/ironclaw/pull/272))
-- add automated PR labeling system ([#253](https://github.com/nearai/ironclaw/pull/253))
-- update CLAUDE.md for recently merged features ([#183](https://github.com/nearai/ironclaw/pull/183))
-
-## [0.7.0](https://github.com/nearai/ironclaw/compare/ironclaw-v0.6.0...ironclaw-v0.7.0) - 2026-02-19
-
-### Added
-
-- extend lifecycle hooks with declarative bundles ([#176](https://github.com/nearai/ironclaw/pull/176))
-- support per-request model override in /v1/chat/completions ([#103](https://github.com/nearai/ironclaw/pull/103))
-
-### Fixed
-
-- harden openai-compatible provider, approval replay, and embeddings defaults ([#237](https://github.com/nearai/ironclaw/pull/237))
-- Network Security Findings ([#201](https://github.com/nearai/ironclaw/pull/201))
-
-### Added
-
-- Refactored OpenAI-compatible chat completion routing to use the rig adapter and `RetryProvider` composition for custom base URL usage.
-- Added Ollama embeddings provider support (`EMBEDDING_PROVIDER=ollama`, `OLLAMA_BASE_URL`) in workspace embeddings.
-- Added migration `V9__flexible_embedding_dimension.sql` for flexible embedding vector dimensions.
-
-### Changed
-
-- Changed default sandbox image to `ironclaw-worker:latest` in config/settings/sandbox defaults.
-- Improved tool-message sanitization and provider compatibility handling across NEAR AI, rig adapter, and shared LLM provider code.
-
-### Fixed
-
-- Fixed approval-input aliases (`a`, `/approve`, `/always`, `/deny`, etc.) in submission parsing.
-- Fixed multi-tool approval resume flow by preserving and replaying deferred tool calls so all prior `tool_use` IDs receive matching `tool_result` messages.
-- Fixed REPL quit/exit handling to route shutdown through the agent loop for graceful termination.
-
-## [0.6.0](https://github.com/nearai/ironclaw/compare/ironclaw-v0.5.0...ironclaw-v0.6.0) - 2026-02-19
-
-### Added
-
-- add issue triage skill ([#200](https://github.com/nearai/ironclaw/pull/200))
-- add PR triage dashboard skill ([#196](https://github.com/nearai/ironclaw/pull/196))
-- add OpenRouter usage examples ([#189](https://github.com/nearai/ironclaw/pull/189))
-- add Tinfoil private inference provider ([#62](https://github.com/nearai/ironclaw/pull/62))
-- shell env scrubbing and command injection detection ([#164](https://github.com/nearai/ironclaw/pull/164))
-- Add PR review tools, job monitor, and channel injection for E2E sandbox workflows ([#57](https://github.com/nearai/ironclaw/pull/57))
-- Secure prompt-based skills system (Phases 1-4) ([#51](https://github.com/nearai/ironclaw/pull/51))
-- Add benchmarking harness with spot suite ([#10](https://github.com/nearai/ironclaw/pull/10))
-- 10 infrastructure improvements from zeroclaw ([#126](https://github.com/nearai/ironclaw/pull/126))
-
-### Fixed
-
-- *(rig)* prevent OpenAI Responses API panic on tool call IDs ([#182](https://github.com/nearai/ironclaw/pull/182))
-- *(docs)* correct settings storage path in README ([#194](https://github.com/nearai/ironclaw/pull/194))
-- OpenAI tool calling — schema normalization, missing types, and Responses API panic ([#132](https://github.com/nearai/ironclaw/pull/132))
-- *(security)* prevent path traversal bypass in WASM HTTP allowlist ([#137](https://github.com/nearai/ironclaw/pull/137))
-- persist OpenAI-compatible provider and respect embeddings disable ([#177](https://github.com/nearai/ironclaw/pull/177))
-- remove .expect() calls in FailoverProvider::try_providers ([#156](https://github.com/nearai/ironclaw/pull/156))
-- sentinel value collision in FailoverProvider cooldown ([#125](https://github.com/nearai/ironclaw/pull/125)) ([#154](https://github.com/nearai/ironclaw/pull/154))
-- skills module audit cleanup ([#173](https://github.com/nearai/ironclaw/pull/173))
-
-### Other
-
-- Fix division by zero panic in ValueEstimator::is_profitable ([#139](https://github.com/nearai/ironclaw/pull/139))
-- audit feature parity matrix against codebase and recent commits ([#202](https://github.com/nearai/ironclaw/pull/202))
-- architecture improvements for contributor velocity ([#198](https://github.com/nearai/ironclaw/pull/198))
-- fix rustfmt formatting from PR #137
-- add .env.example examples for Ollama and OpenAI-compatible ([#110](https://github.com/nearai/ironclaw/pull/110))
-
-## [0.5.0](https://github.com/nearai/ironclaw/compare/v0.4.0...v0.5.0) - 2026-02-17
-
-### Added
-
-- add cooldown management to FailoverProvider ([#114](https://github.com/nearai/ironclaw/pull/114))
-
-## [0.4.0](https://github.com/nearai/ironclaw/compare/v0.3.0...v0.4.0) - 2026-02-17
-
-### Added
-
-- move per-invocation approval check into Tool trait ([#119](https://github.com/nearai/ironclaw/pull/119))
-- add polished boot screen on CLI startup ([#118](https://github.com/nearai/ironclaw/pull/118))
-- Add lifecycle hooks system with 6 interception points ([#18](https://github.com/nearai/ironclaw/pull/18))
-
-### Other
-
-- remove accidentally committed .sidecar and .todos directories ([#123](https://github.com/nearai/ironclaw/pull/123))
-
-## [0.3.0](https://github.com/nearai/ironclaw/compare/v0.2.0...v0.3.0) - 2026-02-17
-
-### Added
-
-- direct api key and cheap model ([#116](https://github.com/nearai/ironclaw/pull/116))
-
-## [0.2.0](https://github.com/nearai/ironclaw/compare/v0.1.3...v0.2.0) - 2026-02-16
-
-### Added
-
-- mark Ollama + OpenAI-compatible as implemented ([#102](https://github.com/nearai/ironclaw/pull/102))
-- multi-provider inference + libSQL onboarding selection ([#92](https://github.com/nearai/ironclaw/pull/92))
-- add multi-provider LLM failover with retry backoff ([#28](https://github.com/nearai/ironclaw/pull/28))
-- add libSQL/Turso embedded database backend ([#47](https://github.com/nearai/ironclaw/pull/47))
-- Move debug log truncation from agent loop to REPL channel ([#65](https://github.com/nearai/ironclaw/pull/65))
-
-### Fixed
-
-- shell destructive-command check bypassed by Value::Object arguments ([#72](https://github.com/nearai/ironclaw/pull/72))
-- propagate real tool_call_id instead of hardcoded placeholder ([#73](https://github.com/nearai/ironclaw/pull/73))
-- Fix wasm tool schemas and runtime ([#42](https://github.com/nearai/ironclaw/pull/42))
-- flatten tool messages for NEAR AI cloud-api compatibility ([#41](https://github.com/nearai/ironclaw/pull/41))
-- security hardening across all layers ([#35](https://github.com/nearai/ironclaw/pull/35))
-
-### Other
-
-- Explicitly enable cargo-dist caching for binary artifacts building
-- Skip building binary artifacts on every PR
-- add module specification rules to CLAUDE.md
-- add setup/onboarding specification (src/setup/README.md)
-- deduplicate tool code and remove dead stubs ([#98](https://github.com/nearai/ironclaw/pull/98))
-- Reformat architecture diagram in README ([#64](https://github.com/nearai/ironclaw/pull/64))
-- Add review discipline guidelines to CLAUDE.md ([#68](https://github.com/nearai/ironclaw/pull/68))
-- Bump MSRV to 1.92, add GCP deployment files ([#40](https://github.com/nearai/ironclaw/pull/40))
-- Add OpenAI-compatible HTTP API (/v1/chat/completions, /v1/models)   ([#31](https://github.com/nearai/ironclaw/pull/31))
-
-
 ## [0.1.3](https://github.com/nearai/ironclaw/compare/v0.1.2...v0.1.3) - 2026-02-12
 
 ### Other

CLAUDE.md

@@ -13,17 +13,14 @@
 ### Features
 - **Multi-channel input**: TUI (Ratatui), HTTP webhooks, WASM channels (Telegram, Slack), web gateway
 - **Parallel job execution** with state machine and self-repair for stuck jobs
-- **Sandbox execution**: Docker container isolation with network proxy and credential injection
+- **Sandbox execution**: Docker container isolation with orchestrator/worker pattern
 - **Claude Code mode**: Delegate jobs to Claude CLI inside containers
-- **Skills system**: SKILL.md prompt extensions with trust model, tool attenuation, and ClawHub registry
 - **Routines**: Scheduled (cron) and reactive (event, webhook) task execution
 - **Web gateway**: Browser UI with SSE/WebSocket real-time streaming
 - **Extension management**: Install, auth, activate MCP/WASM extensions
 - **Extensible tools**: Built-in tools, WASM sandbox, MCP client, dynamic builder
 - **Persistent memory**: Workspace with hybrid search (FTS + vector via RRF)
-- **Prompt injection defense**: Sanitizer, validator, policy rules, leak detection, shell env scrubbing
-- **Multi-provider LLM**: NEAR AI, OpenAI, Anthropic, Ollama, OpenAI-compatible, Tinfoil private inference
-- **Setup wizard**: 7-step interactive onboarding for first-run configuration
+- **Prompt injection defense**: Sanitizer, validator, policy rules, leak detection
 - **Heartbeat system**: Proactive periodic execution with checklist
 
 ## Build & Test
@@ -67,7 +64,6 @@ src/
 │   ├── context_monitor.rs # Memory pressure detection
 │   ├── undo.rs         # Turn-based undo/redo with checkpoints
 │   ├── submission.rs   # Submission parsing (undo, redo, compact, clear, etc.)
-│   ├── dispatcher.rs   # Skill-aware job dispatching
 │   ├── task.rs         # Sub-task execution framework
 │   ├── routine.rs      # Routine types (Trigger, Action, Guardrails)
 │   └── routine_engine.rs # Routine execution (cron ticker, event matcher)
@@ -117,18 +113,11 @@ src/
 │   ├── policy.rs       # PolicyRule system with severity/actions
 │   └── leak_detector.rs # Secret detection (API keys, tokens, etc.)
 │
-├── llm/                # LLM integration (multi-provider)
-│   ├── mod.rs          # Provider factory, LlmBackend enum
+├── llm/                # LLM integration (NEAR AI only)
 │   ├── provider.rs     # LlmProvider trait, message types
-│   ├── nearai_chat.rs  # NEAR AI Chat Completions provider (session token + API key auth)
+│   ├── nearai.rs       # NEAR AI chat-api implementation
 │   ├── reasoning.rs    # Planning, tool selection, evaluation
-│   ├── session.rs      # Session token management with auto-renewal
-│   ├── circuit_breaker.rs # Circuit breaker for provider failures
-│   ├── retry.rs        # Retry with exponential backoff
-│   ├── failover.rs     # Multi-provider failover chain
-│   ├── response_cache.rs # LLM response caching
-│   ├── costs.rs        # Token cost tracking
-│   └── rig_adapter.rs  # Rig framework adapter
+│   └── session.rs      # Session token management with auto-renewal
 │
 ├── tools/              # Extensible tool system
 │   ├── tool.rs         # Tool trait, ToolOutput, ToolError
@@ -142,7 +131,6 @@ src/
 │   │   ├── job.rs      # CreateJob, ListJobs, JobStatus, CancelJob
 │   │   ├── routine.rs  # routine_create/list/update/delete/history
 │   │   ├── extension_tools.rs # Extension install/auth/activate/remove
-│   │   ├── skill_tools.rs # skill_list/search/install/remove tools
 │   │   └── marketplace.rs, ecommerce.rs, taskrabbit.rs, restaurant.rs (stubs)
 │   ├── builder/        # Dynamic tool building
 │   │   ├── core.rs     # BuildRequirement, SoftwareType, Language
@@ -192,38 +180,11 @@ src/
 │   ├── success.rs      # SuccessEvaluator trait, RuleBasedEvaluator, LlmEvaluator
 │   └── metrics.rs      # MetricsCollector, QualityMetrics
 │
-├── sandbox/            # Docker execution sandbox
-│   ├── mod.rs          # Public API, default allowlist
-│   ├── config.rs       # SandboxConfig, SandboxPolicy enum
-│   ├── manager.rs      # SandboxManager orchestration
-│   ├── container.rs    # ContainerRunner, Docker lifecycle
-│   ├── error.rs        # SandboxError types
-│   └── proxy/          # Network proxy for containers
-│       ├── mod.rs      # NetworkProxyBuilder
-│       ├── http.rs     # HttpProxy, CredentialResolver trait
-│       ├── policy.rs   # NetworkPolicyDecider trait
-│       └── allowlist.rs # DomainAllowlist validation
-│
 ├── secrets/            # Secrets management
 │   ├── crypto.rs       # AES-256-GCM encryption
 │   ├── store.rs        # Secret storage
 │   └── types.rs        # Credential types
 │
-├── setup/              # Onboarding wizard (spec: src/setup/README.md)
-│   ├── mod.rs          # Entry point, check_onboard_needed()
-│   ├── wizard.rs       # 7-step interactive wizard
-│   ├── channels.rs     # Channel setup helpers
-│   └── prompts.rs      # Terminal prompts (select, confirm, secret)
-│
-├── skills/             # SKILL.md prompt extension system
-│   ├── mod.rs          # Core types (SkillTrust, LoadedSkill)
-│   ├── registry.rs     # SkillRegistry: discover, install, remove
-│   ├── selector.rs     # Deterministic scoring prefilter
-│   ├── attenuation.rs  # Trust-based tool ceiling
-│   ├── gating.rs       # Requirement checks (bins, env, config)
-│   ├── parser.rs       # SKILL.md frontmatter + markdown parser
-│   └── catalog.rs      # ClawHub registry client
-│
 └── history/            # Persistence
     ├── store.rs        # PostgreSQL repositories
     └── analytics.rs    # Aggregation queries (JobStats, ToolStats)
@@ -253,7 +214,6 @@ When designing new features or systems, always prefer generic/extensible archite
 - `LlmProvider` - Add new LLM backends
 - `SuccessEvaluator` - Custom evaluation logic
 - `EmbeddingProvider` - Add embedding backends (workspace search)
-- `NetworkPolicyDecider` - Custom network access policies for sandbox containers
 
 ### Tool Implementation
 ```rust
@@ -292,40 +252,6 @@ Pending -> InProgress -> Completed -> Submitted -> Accepted
                               \-> Failed
 ```
 
-### Code Style
-
-- Use `crate::` imports, not `super::`
-- No `pub use` re-exports unless exposing to downstream consumers
-- Prefer strong types over strings (enums, newtypes)
-- Keep functions focused, extract helpers when logic is reused
-- Comments for non-obvious logic only
-
-### Review & Fix Discipline
-
-Hard-won lessons from code review -- follow these when fixing bugs or addressing review feedback.
-
-**Fix the pattern, not just the instance:** When a reviewer flags a bug (e.g., TOCTOU race in INSERT + SELECT-back), search the entire codebase for all instances of that same pattern. A fix in `SecretsStore::create()` that doesn't also fix `WasmToolStore::store()` is half a fix.
-
-**Propagate architectural fixes to satellite types:** If a core type changes its concurrency model (e.g., `LibSqlBackend` switches to connection-per-operation), every type that was handed a resource from the old model (e.g., `LibSqlSecretsStore`, `LibSqlWasmToolStore` holding a single `Connection`) must also be updated. Grep for the old type across the codebase.
-
-**Schema translation is more than DDL:** When translating a database schema between backends (PostgreSQL to libSQL, etc.), check for:
-- **Indexes** -- diff `CREATE INDEX` statements between the two schemas
-- **Seed data** -- check for `INSERT INTO` in migrations (e.g., `leak_detection_patterns`)
-- **Semantic differences** -- document where SQL functions behave differently (e.g., `json_patch` vs `jsonb_set`)
-
-**Feature flag testing:** When adding feature-gated code, test compilation with each feature in isolation:
-```bash
-cargo check                                          # default features
-cargo check --no-default-features --features libsql  # libsql only
-cargo check --all-features                           # all features
-```
-Dead code behind the wrong `#[cfg]` gate will only show up when building with a single feature.
-
-**Mechanical verification before committing:** Run these checks on changed files before committing:
-- `grep -rnE '\.unwrap\(|\.expect\(' <files>` -- no panics in production
-- `grep -rn 'super::' <files>` -- use `crate::` imports
-- If you fixed a pattern bug, `grep` for other instances of that pattern across `src/`
-
 ## Configuration
 
 Environment variables (see `.env.example`):
@@ -337,14 +263,10 @@ LIBSQL_PATH=~/.ironclaw/ironclaw.db    # libSQL local path (default)
 # LIBSQL_URL=libsql://xxx.turso.io    # Turso cloud (optional)
 # LIBSQL_AUTH_TOKEN=xxx                # Required with LIBSQL_URL
 
-# NEAR AI (when LLM_BACKEND=nearai, the default)
-# Two auth modes: session token (default) or API key
-# Session token auth (default): uses browser OAuth on first run
-NEARAI_SESSION_TOKEN=sess_...           # hosting providers: set this
-NEARAI_BASE_URL=https://private.near.ai
-# API key auth: set NEARAI_API_KEY, base URL defaults to cloud-api.near.ai
-# NEARAI_API_KEY=...                    # API key from cloud.near.ai
+# NEAR AI (required)
+NEARAI_SESSION_TOKEN=sess_...
 NEARAI_MODEL=claude-3-5-sonnet-20241022
+NEARAI_BASE_URL=https://private.near.ai
 
 # Agent settings
 AGENT_NAME=ironclaw
@@ -375,10 +297,6 @@ SANDBOX_ENABLED=true
 SANDBOX_IMAGE=ironclaw-worker:latest
 SANDBOX_MEMORY_LIMIT_MB=512
 SANDBOX_TIMEOUT_SECS=1800
-SANDBOX_CPU_LIMIT=1.0                  # CPU cores per container
-SANDBOX_NETWORK_PROXY=true             # Enable network proxy for containers
-SANDBOX_PROXY_PORT=8080                # Proxy listener port
-SANDBOX_DEFAULT_POLICY=workspace_write # ReadOnly, WorkspaceWrite, FullAccess
 
 # Claude Code mode (runs inside sandbox containers)
 CLAUDE_CODE_ENABLED=false
@@ -390,25 +308,16 @@ CLAUDE_CODE_CONFIG_DIR=/home/worker/.claude
 ROUTINES_ENABLED=true
 ROUTINES_CRON_INTERVAL=60            # Tick interval in seconds
 ROUTINES_MAX_CONCURRENT=3
-
-# Skills system
-SKILLS_ENABLED=true
-SKILLS_MAX_TOKENS=4000                 # Max prompt budget per turn
-SKILLS_CATALOG_URL=https://clawhub.dev # ClawHub registry URL
-SKILLS_AUTO_DISCOVER=true              # Scan skill directories on startup
-
-# Tinfoil private inference
-TINFOIL_API_KEY=...                    # Required when LLM_BACKEND=tinfoil
-TINFOIL_MODEL=kimi-k2-5               # Default model
 ```
 
-### LLM Providers
+### NEAR AI Provider
 
-IronClaw supports multiple LLM backends via the `LLM_BACKEND` env var: `nearai` (default), `openai`, `anthropic`, `ollama`, `openai_compatible`, and `tinfoil`.
+Uses the NEAR AI chat-api (`https://api.near.ai/v1/responses`) which provides:
+- Unified access to multiple models (OpenAI, Anthropic, etc.)
+- User authentication via session tokens
+- Usage tracking and billing through NEAR AI
 
-**NEAR AI** -- Uses the Chat Completions API with dual auth support. Session token auth (default): authenticates with session tokens (`sess_xxx`) obtained via browser OAuth (GitHub/Google), base URL defaults to `https://private.near.ai`. API key auth: set `NEARAI_API_KEY` (from `cloud.near.ai`), base URL defaults to `https://cloud-api.near.ai`. Both modes use the same Chat Completions endpoint. Tool messages are flattened to plain text for compatibility. Set `NEARAI_SESSION_TOKEN` env var for hosting providers that inject tokens via environment.
-
-**Tinfoil** -- Private inference via `https://inference.tinfoil.sh/v1`. Runs models inside hardware-attested TEEs so neither Tinfoil nor the cloud provider can see prompts or responses. Uses the OpenAI-compatible Chat Completions API. Configure with `TINFOIL_API_KEY` and `TINFOIL_MODEL` (default: `kimi-k2-5`).
+Session tokens have the format `sess_xxx` (37 characters). They are authenticated against the NEAR AI auth service.
 
 ## Database
 
@@ -477,7 +386,22 @@ Both backends implement this trait. PostgreSQL delegates to the existing `Store`
 - `tool_failures` - Self-repair tracking
 - `secrets`, `wasm_tools`, `tool_capabilities` - Extension infrastructure
 
-Database configuration: see Configuration section above.
+### Configuration
+
+```bash
+# Backend selection (default: postgres)
+DATABASE_BACKEND=libsql
+
+# PostgreSQL
+DATABASE_URL=postgres://user:pass@localhost/ironclaw
+
+# libSQL (embedded)
+LIBSQL_PATH=~/.ironclaw/ironclaw.db    # Default path
+
+# libSQL (Turso cloud sync)
+LIBSQL_URL=libsql://your-db.turso.io
+LIBSQL_AUTH_TOKEN=your-token            # Required when LIBSQL_URL is set
+```
 
 ### Current Limitations (libSQL backend)
 
@@ -495,7 +419,6 @@ All external tool output passes through `SafetyLayer`:
 1. **Sanitizer** - Detects injection patterns, escapes dangerous content
 2. **Validator** - Checks length, encoding, forbidden patterns
 3. **Policy** - Rules with severity (Critical/High/Medium/Low) and actions (Block/Warn/Review/Sanitize)
-4. **Leak Detector** - Scans for 15+ secret patterns (API keys, tokens, private keys, connection strings) at two points: tool output before it reaches the LLM, and LLM responses before they reach the user. Actions per pattern: Block (reject entirely), Redact (mask the secret), or Warn (flag but allow)
 
 Tool outputs are wrapped before reaching LLM:
 ```xml
@@ -504,95 +427,6 @@ Tool outputs are wrapped before reaching LLM:
 </tool_output>
 ```
 
-### Shell Environment Scrubbing
-
-The shell tool (`src/tools/builtin/shell.rs`) scrubs sensitive environment variables before executing commands, preventing secrets from leaking through `env`, `printenv`, or `$VAR` expansion. The sanitizer (`src/safety/sanitizer.rs`) also detects command injection patterns (chained commands, subshells, path traversal) and blocks or escapes them based on policy rules.
-
-## Skills System
-
-Skills are SKILL.md files that extend the agent's prompt with domain-specific instructions. Each skill is a YAML frontmatter block (metadata, activation criteria, required tools) followed by a markdown body that gets injected into the LLM context when the skill activates.
-
-### Trust Model
-
-| Trust Level | Source | Tool Access |
-|-------------|--------|-------------|
-| **Trusted** | User-placed in `~/.ironclaw/skills/` or workspace `skills/` | All tools available to the agent |
-| **Installed** | Downloaded from ClawHub registry | Read-only tools only (no shell, file write, HTTP) |
-
-### SKILL.md Format
-
-```yaml
----
-name: my-skill
-version: 0.1.0
-description: Does something useful
-activation:
-  patterns:
-    - "deploy to.*production"
-  keywords:
-    - "deployment"
-  max_context_tokens: 2000
-metadata:
-  openclaw:
-    requires:
-      bins: [docker, kubectl]
-      env: [KUBECONFIG]
----
-
-# Deployment Skill
-
-Instructions for the agent when this skill activates...
-```
-
-### Selection Pipeline
-
-1. **Gating** -- Check binary/env/config requirements; skip skills whose prerequisites are missing
-2. **Scoring** -- Deterministic scoring against message content using keywords, tags, and regex patterns
-3. **Budget** -- Select top-scoring skills that fit within `SKILLS_MAX_TOKENS` prompt budget
-4. **Attenuation** -- Apply trust-based tool ceiling; installed skills lose access to dangerous tools
-
-### Skill Tools
-
-Four built-in tools for managing skills at runtime:
-- **`skill_list`** -- List all discovered skills with trust level and status
-- **`skill_search`** -- Search ClawHub registry for available skills
-- **`skill_install`** -- Download and install a skill from ClawHub
-- **`skill_remove`** -- Remove an installed skill
-
-### Skill Directories
-
-- `~/.ironclaw/skills/` -- User's global skills (trusted)
-- `<workspace>/skills/` -- Per-workspace skills (trusted)
-- `~/.ironclaw/installed_skills/` -- Registry-installed skills (installed trust)
-
-Skills configuration: see Configuration section above.
-
-## Docker Sandbox
-
-The `src/sandbox/` module provides Docker-based isolation for job execution with a network proxy that controls outbound access and injects credentials.
-
-### Sandbox Policies
-
-| Policy | Filesystem | Network | Use Case |
-|--------|-----------|---------|----------|
-| **ReadOnly** | Read-only workspace mount | Allowlisted domains only | Analysis, code review |
-| **WorkspaceWrite** | Read-write workspace mount | Allowlisted domains only | Code generation, file edits |
-| **FullAccess** | Full filesystem | Unrestricted | Trusted admin tasks |
-
-### Network Proxy
-
-Containers route all HTTP/HTTPS traffic through a host-side proxy (`src/sandbox/proxy/`):
-- **Domain allowlist** -- Only allowlisted domains are reachable (default: package registries, docs sites, GitHub, common APIs)
-- **Credential injection** -- The `CredentialResolver` trait injects auth headers into proxied requests so secrets never enter the container environment
-- **CONNECT tunnel** -- HTTPS traffic uses CONNECT method; the proxy validates the target domain against the allowlist before establishing the tunnel
-- **Policy decisions** -- The `NetworkPolicyDecider` trait allows custom logic for allow/deny/inject decisions per request
-
-### Zero-Exposure Credential Model
-
-Secrets (API keys, tokens) are stored encrypted on the host and injected into HTTP requests by the proxy at transit time. Container processes never have access to raw credential values, preventing exfiltration even if container code is compromised.
-
-Sandbox configuration: see Configuration section above.
-
 ## Testing
 
 Tests are in `mod tests {}` blocks at the bottom of each file. Run specific module tests:
@@ -617,13 +451,164 @@ Key test patterns:
 7. **Webhook trigger endpoint** - Routines webhook trigger not yet exposed in web gateway
 8. **Full channel status view** - Gateway status widget exists, but no per-channel connection dashboard
 
-## Tool Architecture
+### Completed
 
-**Keep tool-specific logic out of the main agent codebase.** The main agent provides generic infrastructure; tools are self-contained units that declare their requirements through `capabilities.json` files (API endpoints, credentials, rate limits, auth setup). Service-specific auth flows, CLI commands, and configuration do not belong in the main agent.
+- ✅ **Workspace integration** - Memory tools registered, workspace passed to Agent and heartbeat
+- ✅ **WASM sandboxing** - Full implementation in `tools/wasm/` with fuel metering, memory limits, capabilities
+- ✅ **Dynamic tool building** - `tools/builder/` has LlmSoftwareBuilder with iterative build loop
+- ✅ **HTTP webhook security** - Secret validation implemented, proper error handling (no panics)
+- ✅ **Embeddings integration** - OpenAI and NEAR AI providers wired to workspace for semantic search
+- ✅ **Workspace system prompt** - Identity files (AGENTS.md, SOUL.md, USER.md, IDENTITY.md) injected into LLM context
+- ✅ **Heartbeat notifications** - Route through channel manager (broadcast API) instead of logging-only
+- ✅ **Auto-context compaction** - Triggers automatically when context exceeds threshold
+- ✅ **Embedding backfill** - Runs on startup when embeddings provider is enabled
+- ✅ **Clippy clean** - All warnings addressed via config struct refactoring
+- ✅ **Tool approval enforcement** - Tools with `requires_approval()` (shell, http, file write/patch, build_software) now gate execution, track auto-approved tools per session
+- ✅ **Tool definition refresh** - Tool definitions refreshed each iteration so newly built tools become visible in same session
+- ✅ **Worker tool call handling** - Uses `respond_with_tools()` to properly execute tool calls when `select_tools()` returns empty
+- ✅ **Gateway control plane** - Web gateway with 40+ API endpoints, SSE/WebSocket
+- ✅ **Web Control UI** - Browser-based dashboard with chat, memory, jobs, logs, extensions, routines
+- ✅ **Slack/Telegram channels** - Implemented as WASM tools
+- ✅ **Docker sandbox** - Orchestrator/worker containers with per-job auth
+- ✅ **Claude Code mode** - Delegate jobs to Claude CLI inside containers
+- ✅ **Routines system** - Cron, event, webhook, and manual triggers with guardrails
+- ✅ **Extension management** - Install, auth, activate MCP/WASM extensions via CLI and web UI
+- ✅ **libSQL/Turso backend** - Database trait abstraction (`src/db/`), feature-gated dual backend support (postgres/libsql), embedded SQLite for zero-dependency local mode
 
-Tools can be built as **WASM** (sandboxed, credential-injected, single binary) or **MCP servers** (ecosystem of pre-built servers, any language, but no sandbox). Both are first-class via `ironclaw tool install`. Auth is declared in capabilities files with OAuth and manual token entry support.
+## Adding a New Tool
 
-See `src/tools/README.md` for full tool architecture, adding new tools (built-in Rust and WASM), auth JSON examples, and WASM vs MCP decision guide.
+### Built-in Tools (Rust)
+
+1. Create `src/tools/builtin/my_tool.rs`
+2. Implement the `Tool` trait
+3. Add `mod my_tool;` and `pub use` in `src/tools/builtin/mod.rs`
+4. Register in `ToolRegistry::register_builtin_tools()` in `registry.rs`
+5. Add tests
+
+### WASM Tools (Recommended)
+
+WASM tools are the preferred way to add new capabilities. They run in a sandboxed environment with explicit capabilities.
+
+1. Create a new crate in `tools-src/<name>/`
+2. Implement the WIT interface (`wit/tool.wit`)
+3. Create `<name>.capabilities.json` declaring required permissions
+4. Build with `cargo build --target wasm32-wasip2 --release`
+5. Install with `ironclaw tool install path/to/tool.wasm`
+
+See `tools-src/` for examples.
+
+## Tool Architecture Principles
+
+**CRITICAL: Keep tool-specific logic out of the main agent codebase.**
+
+The main agent provides generic infrastructure; tools are self-contained units that declare their requirements through capabilities files.
+
+### What Goes in Tools (capabilities.json)
+
+- API endpoints the tool needs (HTTP allowlist)
+- Credentials required (secret names, injection locations)
+- Rate limits and timeouts
+- Auth setup instructions (see below)
+- Workspace paths the tool can read
+
+### What Does NOT Go in Main Agent
+
+- Service-specific auth flows (OAuth for Notion, Slack, etc.)
+- Service-specific CLI commands (`auth notion`, `auth slack`)
+- Service-specific configuration handling
+- Hardcoded API URLs or token formats
+
+### Tool Authentication
+
+Tools declare their auth requirements in `<tool>.capabilities.json` under the `auth` section. Two methods are supported:
+
+#### OAuth (Browser-based login)
+
+For services that support OAuth, users just click through browser login:
+
+```json
+{
+  "auth": {
+    "secret_name": "notion_api_token",
+    "display_name": "Notion",
+    "oauth": {
+      "authorization_url": "https://api.notion.com/v1/oauth/authorize",
+      "token_url": "https://api.notion.com/v1/oauth/token",
+      "client_id_env": "NOTION_OAUTH_CLIENT_ID",
+      "client_secret_env": "NOTION_OAUTH_CLIENT_SECRET",
+      "scopes": [],
+      "use_pkce": false,
+      "extra_params": { "owner": "user" }
+    },
+    "env_var": "NOTION_TOKEN"
+  }
+}
+```
+
+To enable OAuth for a tool:
+1. Register a public OAuth app with the service (e.g., notion.so/my-integrations)
+2. Configure redirect URIs: `http://localhost:9876/callback` through `http://localhost:9886/callback`
+3. Set environment variables for client_id and client_secret
+
+#### Manual Token Entry (Fallback)
+
+For services without OAuth or when OAuth isn't configured:
+
+```json
+{
+  "auth": {
+    "secret_name": "openai_api_key",
+    "display_name": "OpenAI",
+    "instructions": "Get your API key from platform.openai.com/api-keys",
+    "setup_url": "https://platform.openai.com/api-keys",
+    "token_hint": "Starts with 'sk-'",
+    "env_var": "OPENAI_API_KEY"
+  }
+}
+```
+
+#### Auth Flow Priority
+
+When running `ironclaw tool auth <tool>`:
+
+1. Check `env_var` - if set in environment, use it directly
+2. Check `oauth` - if configured, open browser for OAuth flow
+3. Fall back to `instructions` + manual token entry
+
+The agent reads auth config from the tool's capabilities file and provides the appropriate flow. No service-specific code in the main agent.
+
+### WASM Tools vs MCP Servers: When to Use Which
+
+Both are first-class in the extension system (`ironclaw tool install` handles both), but they have different strengths.
+
+**WASM Tools (IronClaw native)**
+
+- Sandboxed: fuel metering, memory limits, no access except what's allowlisted
+- Credentials injected by host runtime, tool code never sees the actual token
+- Output scanned for secret leakage before returning to the LLM
+- Auth (OAuth/manual) declared in `capabilities.json`, agent handles the flow
+- Single binary, no process management, works offline
+- Cost: must build yourself in Rust, no ecosystem, synchronous only
+
+**MCP Servers (Model Context Protocol)**
+
+- Growing ecosystem of pre-built servers (GitHub, Notion, Postgres, etc.)
+- Any language (TypeScript/Python most common)
+- Can do websockets, streaming, background polling
+- Cost: external process with full system access (no sandbox), manages own credentials, IronClaw can't prevent leaks
+
+**Decision guide:**
+
+| Scenario | Use |
+|----------|-----|
+| Good MCP server already exists | **MCP** |
+| Handles sensitive credentials (email send, banking) | **WASM** |
+| Quick prototype or one-off integration | **MCP** |
+| Core capability you'll maintain long-term | **WASM** |
+| Needs background connections (websockets, polling) | **MCP** |
+| Multiple tools share one OAuth token (e.g., Google suite) | **WASM** |
+
+The LLM-facing interface is identical for both (tool name, schema, execute), so swapping between them is transparent to the agent.
 
 ## Adding a New Channel
 
@@ -645,30 +630,153 @@ RUST_LOG=ironclaw::agent=debug cargo run
 RUST_LOG=ironclaw=debug,tower_http=debug cargo run
 ```
 
-## Module Specifications
+## Code Style
 
-Some modules have a `README.md` that serves as the authoritative specification
-for that module's behavior. When modifying code in a module that has a spec:
+- Use `crate::` imports, not `super::`
+- No `pub use` re-exports unless exposing to downstream consumers
+- Prefer strong types over strings (enums, newtypes)
+- Keep functions focused, extract helpers when logic is reused
+- Comments for non-obvious logic only
 
-1. **Read the spec first** before making changes
-2. **Code follows spec**: if the spec says X, the code must do X
-3. **Update both sides**: if you change behavior, update the spec to match;
-   if you're implementing a spec change, update the code to match
-4. **Spec is the tiebreaker**: when code and spec disagree, the spec is correct
-   (unless the spec is clearly outdated, in which case fix the spec first)
+## Review & Fix Discipline
 
-| Module | Spec File |
-|--------|-----------|
-| `src/setup/` | `src/setup/README.md` |
-| `src/workspace/` | `src/workspace/README.md` |
-| `src/tools/` | `src/tools/README.md` |
+Hard-won lessons from code review -- follow these when fixing bugs or addressing review feedback.
+
+### Fix the pattern, not just the instance
+When a reviewer flags a bug (e.g., TOCTOU race in INSERT + SELECT-back), search the entire codebase for all instances of that same pattern. A fix in `SecretsStore::create()` that doesn't also fix `WasmToolStore::store()` is half a fix.
+
+### Propagate architectural fixes to satellite types
+If a core type changes its concurrency model (e.g., `LibSqlBackend` switches to connection-per-operation), every type that was handed a resource from the old model (e.g., `LibSqlSecretsStore`, `LibSqlWasmToolStore` holding a single `Connection`) must also be updated. Grep for the old type across the codebase.
+
+### Schema translation is more than DDL
+When translating a database schema between backends (PostgreSQL to libSQL, etc.), check for:
+- **Indexes** -- diff `CREATE INDEX` statements between the two schemas
+- **Seed data** -- check for `INSERT INTO` in migrations (e.g., `leak_detection_patterns`)
+- **Semantic differences** -- document where SQL functions behave differently (e.g., `json_patch` vs `jsonb_set`)
+
+### Feature flag testing
+When adding feature-gated code, test compilation with each feature in isolation:
+```bash
+cargo check                                          # default features
+cargo check --no-default-features --features libsql  # libsql only
+cargo check --all-features                           # all features
+```
+Dead code behind the wrong `#[cfg]` gate will only show up when building with a single feature.
+
+### Mechanical verification before committing
+Run these checks on changed files before committing:
+- `grep -rnE '\.unwrap\(|\.expect\(' <files>` -- no panics in production
+- `grep -rn 'super::' <files>` -- use `crate::` imports
+- If you fixed a pattern bug, `grep` for other instances of that pattern across `src/`
 
 ## Workspace & Memory System
 
-OpenClaw-inspired persistent memory with a flexible filesystem-like structure. Principle: "Memory is database, not RAM" -- if you want to remember something, write it explicitly. Uses hybrid search combining FTS (keyword) + vector (semantic) via Reciprocal Rank Fusion.
+Inspired by [OpenClaw](https://github.com/openclaw/openclaw), the workspace provides persistent memory for agents with a flexible filesystem-like structure.
 
-Four memory tools for LLM use: `memory_search` (hybrid search -- call before answering questions about prior work), `memory_write`, `memory_read`, `memory_tree`. Identity files (AGENTS.md, SOUL.md, USER.md, IDENTITY.md) are injected into the LLM system prompt.
+### Key Principles
 
-The heartbeat system runs proactive periodic execution (default: 30 minutes), reading `HEARTBEAT.md` and notifying via channel if findings are detected.
+1. **"Memory is database, not RAM"** - If you want to remember something, write it explicitly
+2. **Flexible structure** - Create any directory/file hierarchy you need
+3. **Self-documenting** - Use README.md files to describe directory structure
+4. **Hybrid search** - Combines FTS (keyword) + vector (semantic) via Reciprocal Rank Fusion
 
-See `src/workspace/README.md` for full API documentation, filesystem structure, hybrid search details, chunking strategy, and heartbeat system.
+### Filesystem Structure
+
+```
+workspace/
+├── README.md              <- Root runbook/index
+├── MEMORY.md              <- Long-term curated memory
+├── HEARTBEAT.md           <- Periodic checklist
+├── IDENTITY.md            <- Agent name, nature, vibe
+├── SOUL.md                <- Core values
+├── AGENTS.md              <- Behavior instructions
+├── USER.md                <- User context
+├── context/               <- Identity-related docs
+│   ├── vision.md
+│   └── priorities.md
+├── daily/                 <- Daily logs
+│   ├── 2024-01-15.md
+│   └── 2024-01-16.md
+├── projects/              <- Arbitrary structure
+│   └── alpha/
+│       ├── README.md
+│       └── notes.md
+└── ...
+```
+
+### Using the Workspace
+
+```rust
+use crate::workspace::{Workspace, OpenAiEmbeddings, paths};
+
+// Create workspace for a user
+let workspace = Workspace::new("user_123", pool)
+    .with_embeddings(Arc::new(OpenAiEmbeddings::new(api_key)));
+
+// Read/write any path
+let doc = workspace.read("projects/alpha/notes.md").await?;
+workspace.write("context/priorities.md", "# Priorities\n\n1. Feature X").await?;
+workspace.append("daily/2024-01-15.md", "Completed task X").await?;
+
+// Convenience methods for well-known files
+workspace.append_memory("User prefers dark mode").await?;
+workspace.append_daily_log("Session note").await?;
+
+// List directory contents
+let entries = workspace.list("projects/").await?;
+
+// Search (hybrid FTS + vector)
+let results = workspace.search("dark mode preference", 5).await?;
+
+// Get system prompt from identity files
+let prompt = workspace.system_prompt().await?;
+```
+
+### Memory Tools
+
+Four tools for LLM use:
+
+- **`memory_search`** - Hybrid search, MUST be called before answering questions about prior work
+- **`memory_write`** - Write to any path (memory, daily_log, or custom paths)
+- **`memory_read`** - Read any file by path
+- **`memory_tree`** - View workspace structure as a tree (depth parameter, default 1)
+
+### Hybrid Search (RRF)
+
+Combines full-text search and vector similarity using Reciprocal Rank Fusion:
+
+```
+score(d) = Σ 1/(k + rank(d)) for each method where d appears
+```
+
+Default k=60. Results from both methods are combined, with documents appearing in both getting boosted scores.
+
+**Backend differences:**
+- **PostgreSQL:** `ts_rank_cd` for FTS, pgvector cosine distance for vectors, full RRF
+- **libSQL:** FTS5 for keyword search only (vector search via `libsql_vector_idx` not yet wired)
+
+### Heartbeat System
+
+Proactive periodic execution (default: 30 minutes):
+
+1. Reads `HEARTBEAT.md` checklist
+2. Runs agent turn with checklist prompt
+3. If findings, notifies via channel
+4. If nothing, agent replies "HEARTBEAT_OK" (no notification)
+
+```rust
+use crate::agent::{HeartbeatConfig, spawn_heartbeat};
+
+let config = HeartbeatConfig::default()
+    .with_interval(Duration::from_secs(60 * 30))
+    .with_notify("user_123", "telegram");
+
+spawn_heartbeat(config, workspace, llm, response_tx);
+```
+
+### Chunking Strategy
+
+Documents are chunked for search indexing:
+- Default: 800 words per chunk (roughly 800 tokens for English)
+- 15% overlap between chunks for context preservation
+- Minimum chunk size: 50 words (tiny trailing chunks merge with previous)

Cargo.lock

@@ -352,6 +352,23 @@ dependencies = [
  "syn 2.0.114",
 ]
 
+[[package]]
+name = "async-tungstenite"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc405d38be14342132609f06f02acaf825ddccfe76c4824a69281e0458ebd4"
+dependencies = [
+ "atomic-waker",
+ "futures-core",
+ "futures-io",
+ "futures-task",
+ "futures-util",
+ "log",
+ "pin-project-lite",
+ "tokio",
+ "tungstenite 0.28.0",
+]
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -505,7 +522,7 @@ dependencies = [
  "rustc-hash 1.1.0",
  "shlex",
  "syn 2.0.114",
- "which",
+ "which 4.4.2",
 ]
 
 [[package]]
@@ -816,6 +833,72 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "chromiumoxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c18200611490f523adb497ddd4744d6d536e243f6add13e7eeeb1c05904fbb1"
+dependencies = [
+ "async-tungstenite",
+ "base64 0.22.1",
+ "cfg-if",
+ "chromiumoxide_cdp",
+ "chromiumoxide_types",
+ "dunce",
+ "fnv",
+ "futures",
+ "futures-timer",
+ "pin-project-lite",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.69",
+ "tokio",
+ "tracing",
+ "url",
+ "which 8.0.0",
+ "windows-registry 0.5.3",
+]
+
+[[package]]
+name = "chromiumoxide_cdp"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8f78027ced540595dcbaf9e2f3413cbe3708b839ff239d2858acaea73915dcb"
+dependencies = [
+ "chromiumoxide_pdl",
+ "chromiumoxide_types",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "chromiumoxide_pdl"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d2c7b7c6b41a0de36d00a284e619017e0f4aec5c9bc8d90614b9e1687984f20"
+dependencies = [
+ "chromiumoxide_types",
+ "either",
+ "heck 0.4.1",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "chromiumoxide_types"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "309ba8f378bbc093c93f06beb7bd4c5ceffdf14107ad99cacbbf063709926795"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "chrono"
 version = "0.4.43"
@@ -827,7 +910,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-link",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -879,7 +962,7 @@ version = "4.5.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "syn 2.0.114",
@@ -1497,6 +1580,12 @@ version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
 [[package]]
 name = "dyn-clone"
 version = "1.0.20"
@@ -1563,6 +1652,12 @@ dependencies = [
  "syn 2.0.114",
 ]
 
+[[package]]
+name = "env_home"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe"
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -2020,6 +2115,12 @@ dependencies = [
  "hashbrown 0.14.5",
 ]
 
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -2267,7 +2368,7 @@ dependencies = [
  "tokio",
  "tower-service",
  "tracing",
- "windows-registry",
+ "windows-registry 0.6.1",
 ]
 
 [[package]]
@@ -2490,7 +2591,7 @@ dependencies = [
 
 [[package]]
 name = "ironclaw"
-version = "0.8.0"
+version = "0.1.3"
 dependencies = [
  "aes-gcm",
  "aho-corasick",
@@ -2501,6 +2602,7 @@ dependencies = [
  "blake3",
  "bollard",
  "bytes",
+ "chromiumoxide",
  "chrono",
  "clap",
  "cron",
@@ -2533,7 +2635,6 @@ dependencies = [
  "security-framework 3.5.1",
  "serde",
  "serde_json",
- "serde_yml",
  "sha2",
  "subtle",
  "tempfile",
@@ -2545,7 +2646,6 @@ dependencies = [
  "tokio-stream",
  "tokio-test",
  "tokio-tungstenite 0.26.2",
- "toml",
  "tower 0.5.3",
  "tower-http 0.6.8",
  "tracing",
@@ -2559,30 +2659,6 @@ dependencies = [
  "zbus",
 ]
 
-[[package]]
-name = "ironclaw-bench"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "chrono",
- "clap",
- "futures",
- "ironclaw",
- "regex",
- "rust_decimal",
- "serde",
- "serde_json",
- "tempfile",
- "thiserror 2.0.18",
- "tokio",
- "tokio-stream",
- "toml",
- "tracing",
- "tracing-subscriber",
- "uuid",
-]
-
 [[package]]
 name = "is-docker"
 version = "0.2.0"
@@ -2723,7 +2799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
 dependencies = [
  "cfg-if",
- "windows-link",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -2858,16 +2934,6 @@ dependencies = [
  "zerocopy 0.7.35",
 ]
 
-[[package]]
-name = "libyml"
-version = "0.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3302702afa434ffa30847a83305f0a69d6abd74293b6554c18ec85c7ef30c980"
-dependencies = [
- "anyhow",
- "version_check",
-]
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.15"
@@ -3345,7 +3411,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.5.18",
  "smallvec",
- "windows-link",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -3982,7 +4048,7 @@ version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72c225407d8e52ef8cf094393781ecda9a99d6544ec28d90a6915751de259264"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "refinery-core",
@@ -4627,21 +4693,6 @@ dependencies = [
  "syn 2.0.114",
 ]
 
-[[package]]
-name = "serde_yml"
-version = "0.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59e2dd588bf1597a252c3b920e0143eb99b0f76e4e082f4c92ce34fbc9e71ddd"
-dependencies = [
- "indexmap 2.13.0",
- "itoa",
- "libyml",
- "memchr",
- "ryu",
- "serde",
- "version_check",
-]
-
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -6233,7 +6284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f38f7a5eb2f06f53fe943e7fb8bf4197f7cf279f1bc52c0ce56e9d3ffd750a4"
 dependencies = [
  "anyhow",
- "heck",
+ "heck 0.5.0",
  "indexmap 2.13.0",
  "wit-parser",
 ]
@@ -6301,6 +6352,17 @@ dependencies = [
  "rustix 0.38.44",
 ]
 
+[[package]]
+name = "which"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fabb953106c3c8eea8306e4393700d7657561cb43122571b172bbfb7c7ba1d"
+dependencies = [
+ "env_home",
+ "rustix 1.1.3",
+ "winsafe",
+]
+
 [[package]]
 name = "whoami"
 version = "2.1.0"
@@ -6334,7 +6396,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8738c5a7ef3a9de0fae10f8b84091a2aa4e059d8fef23de202ab689812b6bc6e"
 dependencies = [
  "anyhow",
- "heck",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "shellexpand",
@@ -6410,9 +6472,9 @@ checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-link",
- "windows-result",
- "windows-strings",
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
 ]
 
 [[package]]
@@ -6437,21 +6499,47 @@ dependencies = [
  "syn 2.0.114",
 ]
 
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
 [[package]]
 name = "windows-link"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
+[[package]]
+name = "windows-registry"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
+dependencies = [
+ "windows-link 0.1.3",
+ "windows-result 0.3.4",
+ "windows-strings 0.4.2",
+]
+
 [[package]]
 name = "windows-registry"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
 dependencies = [
- "windows-link",
- "windows-result",
- "windows-strings",
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+dependencies = [
+ "windows-link 0.1.3",
 ]
 
 [[package]]
@@ -6460,7 +6548,16 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
 dependencies = [
- "windows-link",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+dependencies = [
+ "windows-link 0.1.3",
 ]
 
 [[package]]
@@ -6469,7 +6566,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
 dependencies = [
- "windows-link",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -6514,7 +6611,7 @@ version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows-link",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -6554,7 +6651,7 @@ version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows-link",
+ "windows-link 0.2.1",
  "windows_aarch64_gnullvm 0.53.1",
  "windows_aarch64_msvc 0.53.1",
  "windows_i686_gnu 0.53.1",
@@ -6712,6 +6809,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winsafe"
+version = "0.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
+
 [[package]]
 name = "winx"
 version = "0.36.4"

Cargo.toml

@@ -1,25 +1,6 @@
-[workspace]
-members = [".", "benchmarks"]
-exclude = [
-    "channels-src/discord",
-    "channels-src/telegram",
-    "channels-src/slack",
-    "channels-src/whatsapp",
-    "tools-src/github",
-    "tools-src/gmail",
-    "tools-src/google-calendar",
-    "tools-src/google-docs",
-    "tools-src/google-drive",
-    "tools-src/google-sheets",
-    "tools-src/google-slides",
-    "tools-src/okta",
-    "tools-src/slack",
-    "tools-src/telegram",
-]
-
 [package]
 name = "ironclaw"
-version = "0.8.0"
+version = "0.1.3"
 edition = "2024"
 rust-version = "1.92"
 description = "Secure personal AI assistant that protects your data and expands its capabilities on the fly"
@@ -66,7 +47,6 @@ tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
 
 # Configuration
 dotenvy = "0.15"
-toml = "0.8"
 
 # Core types
 uuid = { version = "1", features = ["v4", "serde"] }
@@ -88,7 +68,7 @@ termimad = "0.34"
 # Channel integrations
 axum = { version = "0.8", features = ["ws"] }
 tower = "0.5"
-tower-http = { version = "0.6", features = ["trace", "cors", "set-header"] }
+tower-http = { version = "0.6", features = ["trace", "cors"] }
 
 # Cron scheduling for routines
 cron = "0.13"
@@ -97,9 +77,6 @@ cron = "0.13"
 regex = "1"
 aho-corasick = "1"
 
-# YAML parsing for SKILL.md frontmatter
-serde_yml = "0.0.12"
-
 # Filesystem paths
 dirs = "6"
 fs4 = "0.6"
@@ -145,6 +122,9 @@ bytes = "1"
 base64 = "0.22.1"
 mime_guess = "2.0.5"
 
+# Headless browser automation via Chrome DevTools Protocol
+chromiumoxide = { version = "0.8", default-features = false, features = ["tokio-runtime"] }
+
 # macOS keychain
 [target.'cfg(target_os = "macos")'.dependencies]
 security-framework = "3"
@@ -162,7 +142,7 @@ pretty_assertions = "1"
 tempfile = "3"
 
 [features]
-default = ["postgres", "libsql"]
+default = ["postgres"]
 postgres = [
     "dep:deadpool-postgres",
     "dep:tokio-postgres",
@@ -174,6 +154,10 @@ postgres = [
 libsql = ["dep:libsql"]
 integration = []
 
+[[example]]
+name = "test_heartbeat"
+required-features = ["postgres"]
+
 # The profile that 'cargo dist' will build with
 [profile.dist]
 inherits = "release"
@@ -202,13 +186,11 @@ windows-archive = ".tar.gz"
 # The archive format to use for non-windows builds (defaults .tar.xz)
 unix-archive = ".tar.gz"
 # Which actions to run on pull requests
-pr-run-mode = "skip"
+pr-run-mode = "upload"
 # Path that installers should place binaries in
 install-path = "CARGO_HOME"
 # Whether to install an updater program
 install-updater = true
-# Cache intermediate build artifacts to speed up the release pipelines
-cache-builds = true
 
 [workspace.metadata.dist.github-custom-runners]
 aarch64-unknown-linux-gnu = "ubuntu-24.04-arm"

Dockerfile.worker

@@ -21,15 +21,10 @@ RUN cargo build --release --bin ironclaw
 
 FROM debian:bookworm-slim
 
-# Install curl first (needed to fetch the GitHub CLI GPG key), then add the
-# gh CLI apt repository, then install all remaining dev tools in one layer.
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends ca-certificates curl \
-    && curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \
-        | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
-    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" \
-        > /etc/apt/sources.list.d/github-cli.list \
-    && apt-get update && apt-get install -y --no-install-recommends \
+# Install common development tools
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ca-certificates \
+    curl \
     git \
     build-essential \
     pkg-config \
@@ -39,7 +34,6 @@ RUN apt-get update \
     python3 \
     python3-pip \
     python3-venv \
-    gh \
     && rm -rf /var/lib/apt/lists/*
 
 # Install Rust toolchain for the sandbox user

FEATURE_PARITY.md

@@ -37,7 +37,7 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Session management/routing | ✅ | ✅ | SessionManager exists |
 | Configuration hot-reload | ✅ | ❌ | |
 | Network modes (loopback/LAN/remote) | ✅ | 🚧 | HTTP only |
-| OpenAI-compatible HTTP API | ✅ | ✅ | /v1/chat/completions, per-request `model` override |
+| OpenAI-compatible HTTP API | ✅ | ✅ | /v1/chat/completions |
 | Canvas hosting | ✅ | ❌ | Agent-driven UI |
 | Gateway lock (PID-based) | ✅ | ❌ | |
 | launchd/systemd integration | ✅ | ❌ | |
@@ -45,13 +45,6 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Tailscale integration | ✅ | ❌ | |
 | Health check endpoints | ✅ | ✅ | /api/health + /api/gateway/status |
 | `doctor` diagnostics | ✅ | ❌ | |
-| Agent event broadcast | ✅ | 🚧 | SSE broadcast manager exists (SseManager) but tool/job-state events not fully wired |
-| Channel health monitor | ✅ | ❌ | Auto-restart with configurable interval |
-| Presence system | ✅ | ❌ | Beacons on connect, system presence for agents |
-| Trusted-proxy auth mode | ✅ | ❌ | Header-based auth for reverse proxies |
-| APNs push pipeline | ✅ | ❌ | Wake disconnected iOS nodes via push |
-| Oversized payload guard | ✅ | 🚧 | HTTP webhook has 64KB body limit + Content-Length check; no chat.history cap |
-| Pre-prompt context diagnostics | ✅ | ❌ | Context size logging before prompt |
 
 ### Owner: _Unassigned_
 
@@ -65,50 +58,23 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | HTTP webhook | ✅ | ✅ | - | axum with secret validation |
 | REPL (simple) | ✅ | ✅ | - | For testing |
 | WASM channels | ❌ | ✅ | - | IronClaw innovation |
-| WhatsApp | ✅ | ❌ | P1 | Baileys (Web), same-phone mode with echo detection |
+| WhatsApp | ✅ | ❌ | P1 | Baileys (Web) |
 | Telegram | ✅ | ✅ | - | WASM channel(MTProto), DM pairing, caption, /start, bot_username |
-| Discord | ✅ | ❌ | P2 | discord.js, thread parent binding inheritance |
+| Discord | ✅ | ❌ | P2 | discord.js |
 | Signal | ✅ | ❌ | P2 | signal-cli |
 | Slack | ✅ | ✅ | - | WASM tool |
-| iMessage | ✅ | ❌ | P3 | BlueBubbles or Linq recommended |
-| Linq | ✅ | ❌ | P3 | Real iMessage via API, no Mac required |
-| Feishu/Lark | ✅ | ❌ | P3 | Bitable create app/field tools |
+| iMessage | ✅ | ❌ | P3 | BlueBubbles recommended |
+| Feishu/Lark | ✅ | ❌ | P3 | |
 | LINE | ✅ | ❌ | P3 | |
 | WebChat | ✅ | ✅ | - | Web gateway chat |
 | Matrix | ✅ | ❌ | P3 | E2EE support |
-| Mattermost | ✅ | ❌ | P3 | Emoji reactions |
+| Mattermost | ✅ | ❌ | P3 | |
 | Google Chat | ✅ | ❌ | P3 | |
 | MS Teams | ✅ | ❌ | P3 | |
 | Twitch | ✅ | ❌ | P3 | |
-| Voice Call | ✅ | ❌ | P3 | Twilio/Telnyx, stale call reaper, pre-cached greeting |
+| Voice Call | ✅ | ❌ | P3 | Twilio/Telnyx |
 | Nostr | ✅ | ❌ | P3 | |
 
-### Telegram-Specific Features (since Feb 2025)
-
-| Feature | OpenClaw | IronClaw | Notes |
-|---------|----------|----------|-------|
-| Forum topic creation | ✅ | ❌ | Create topics in forum groups |
-| channel_post support | ✅ | ❌ | Bot-to-bot communication |
-| User message reactions | ✅ | ❌ | Surface inbound reactions |
-| sendPoll | ✅ | ❌ | Poll creation via agent |
-| Cron/heartbeat topic targeting | ✅ | ❌ | Messages land in correct topic |
-
-### Discord-Specific Features (since Feb 2025)
-
-| Feature | OpenClaw | IronClaw | Notes |
-|---------|----------|----------|-------|
-| Forwarded attachment downloads | ✅ | ❌ | Fetch media from forwarded messages |
-| Faster reaction state machine | ✅ | ❌ | Watchdog + debounce |
-| Thread parent binding inheritance | ✅ | ❌ | Threads inherit parent routing |
-
-### Slack-Specific Features (since Feb 2025)
-
-| Feature | OpenClaw | IronClaw | Notes |
-|---------|----------|----------|-------|
-| Streaming draft replies | ✅ | ❌ | Partial replies via draft message updates |
-| Configurable stream modes | ✅ | ❌ | Per-channel stream behavior |
-| Thread ownership | ✅ | ❌ | Thread-level ownership tracking |
-
 ### Channel Features
 
 | Feature | OpenClaw | IronClaw | Notes |
@@ -121,9 +87,6 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Thread isolation | ✅ | ✅ | Separate sessions per thread |
 | Per-channel media limits | ✅ | 🚧 | Caption support for media; no size limits |
 | Typing indicators | ✅ | 🚧 | TUI shows status |
-| Per-channel ackReaction config | ✅ | ❌ | Customizable acknowledgement reactions |
-| Group session priming | ✅ | ❌ | Member roster injected for context |
-| Sender_id in trusted metadata | ✅ | ❌ | Exposed in system metadata |
 
 ### Owner: _Unassigned_
 
@@ -141,16 +104,16 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | `config` | ✅ | ✅ | - | Read/write config |
 | `channels` | ✅ | ❌ | P2 | Channel management |
 | `models` | ✅ | 🚧 | - | Model selector in TUI |
-| `status` | ✅ | ✅ | - | System status (enriched session details) |
+| `status` | ✅ | ✅ | - | System status |
 | `agents` | ✅ | ❌ | P3 | Multi-agent management |
-| `sessions` | ✅ | ❌ | P3 | Session listing (shows subagent models) |
+| `sessions` | ✅ | ❌ | P3 | Session listing |
 | `memory` | ✅ | ✅ | - | Memory search CLI |
-| `skills` | ✅ | ✅ | - | Skills tools + web API endpoints (install, list, activate) |
-| `pairing` | ✅ | ✅ | - | list/approve, account selector |
-| `nodes` | ✅ | ❌ | P3 | Device management, remove/clear flows |
+| `skills` | ✅ | ❌ | P3 | Agent skills |
+| `pairing` | ✅ | ✅ | - | list/approve for channel DM pairing |
+| `nodes` | ✅ | ❌ | P3 | Device management |
 | `plugins` | ✅ | ❌ | P3 | Plugin management |
-| `hooks` | ✅ | ✅ | P2 | Lifecycle hooks |
-| `cron` | ✅ | ❌ | P2 | Scheduled jobs (model/thinking fields in edit) |
+| `hooks` | ✅ | ❌ | P2 | Lifecycle hooks |
+| `cron` | ✅ | ❌ | P2 | Scheduled jobs |
 | `webhooks` | ✅ | ❌ | P3 | Webhook config |
 | `message send` | ✅ | ❌ | P2 | Send to channels |
 | `browser` | ✅ | ❌ | P3 | Browser automation |
@@ -159,8 +122,6 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | `logs` | ✅ | ❌ | P3 | Query logs |
 | `update` | ✅ | ❌ | P3 | Self-update |
 | `completion` | ✅ | ❌ | P3 | Shell completion |
-| `/subagents spawn` | ✅ | ❌ | P3 | Spawn subagents from chat |
-| `/export-session` | ✅ | ❌ | P3 | Export current session transcript |
 
 ### Owner: _Unassigned_
 
@@ -177,32 +138,17 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Global sessions | ✅ | ❌ | Optional shared context |
 | Session pruning | ✅ | ❌ | Auto cleanup old sessions |
 | Context compaction | ✅ | ✅ | Auto summarization |
-| Post-compaction read audit | ✅ | ❌ | Layer 3: workspace rules appended to summaries |
-| Post-compaction context injection | ✅ | ❌ | Workspace context as system event |
-| Custom system prompts | ✅ | ✅ | Template variables, safety guardrails |
-| Skills (modular capabilities) | ✅ | ✅ | Prompt-based skills with trust gating, attenuation, activation criteria, catalog, selector |
-| Skill routing blocks | ✅ | 🚧 | ActivationCriteria (keywords, patterns, tags) but no "Use when / Don't use when" blocks |
-| Skill path compaction | ✅ | ❌ | ~ prefix to reduce prompt tokens |
+| Custom system prompts | ✅ | ✅ | Template variables |
+| Skills (modular capabilities) | ✅ | ❌ | Capability bundles |
 | Thinking modes (low/med/high) | ✅ | ❌ | Configurable reasoning depth |
-| Per-model thinkingDefault override | ✅ | ❌ | Override thinking level per model |
 | Block-level streaming | ✅ | ❌ | |
 | Tool-level streaming | ✅ | ❌ | |
-| Z.AI tool_stream | ✅ | ❌ | Real-time tool call streaming |
 | Plugin tools | ✅ | ✅ | WASM tools |
 | Tool policies (allow/deny) | ✅ | ✅ | |
 | Exec approvals (`/approve`) | ✅ | ✅ | TUI approval overlay |
 | Elevated mode | ✅ | ❌ | Privileged execution |
 | Subagent support | ✅ | ✅ | Task framework |
-| `/subagents spawn` command | ✅ | ❌ | Spawn from chat |
 | Auth profiles | ✅ | ❌ | Multiple auth strategies |
-| Generic API key rotation | ✅ | ❌ | Rotate keys across providers |
-| Stuck loop detection | ✅ | ❌ | Exponential backoff on stuck agent loops |
-| llms.txt discovery | ✅ | ❌ | Auto-discover site metadata |
-| Multiple images per tool call | ✅ | ❌ | Single tool call, multiple images |
-| URL allowlist (web_search/fetch) | ✅ | ❌ | Restrict web tool targets |
-| suppressToolErrors config | ✅ | ❌ | Hide tool errors from user |
-| Intent-first tool display | ✅ | ❌ | Details and exec summaries |
-| Transcript file size in status | ✅ | ❌ | Show size in session status |
 
 ### Owner: _Unassigned_
 
@@ -213,18 +159,12 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Provider | OpenClaw | IronClaw | Priority | Notes |
 |----------|----------|----------|----------|-------|
 | NEAR AI | ✅ | ✅ | - | Primary provider |
-| Anthropic (Claude) | ✅ | 🚧 | - | Via NEAR AI proxy; Opus 4.5, Sonnet 4, Sonnet 4.6 |
+| Anthropic (Claude) | ✅ | 🚧 | - | Via NEAR AI proxy |
 | OpenAI | ✅ | 🚧 | - | Via NEAR AI proxy |
 | AWS Bedrock | ✅ | ❌ | P3 | |
 | Google Gemini | ✅ | ❌ | P3 | |
-| NVIDIA API | ✅ | ❌ | P3 | New provider |
-| OpenRouter | ✅ | ✅ | - | Via OpenAI-compatible provider (RigAdapter) |
-| Tinfoil | ❌ | ✅ | - | Private inference provider (IronClaw-only) |
-| OpenAI-compatible | ❌ | ✅ | - | Generic OpenAI-compatible endpoint (RigAdapter) |
-| Ollama (local) | ✅ | ✅ | - | via `rig::providers::ollama` (full support) |
-| Perplexity | ✅ | ❌ | P3 | Freshness parameter for web_search |
-| MiniMax | ✅ | ❌ | P3 | Regional endpoint selection |
-| GLM-5 | ✅ | ❌ | P3 | |
+| OpenRouter | ✅ | ❌ | P3 | |
+| Ollama (local) | ✅ | ❌ | P2 | Local models |
 | node-llama-cpp | ✅ | ➖ | - | N/A for Rust |
 | llama.cpp (native) | ❌ | 🔮 | P3 | Rust bindings |
 
@@ -234,11 +174,9 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 |---------|----------|----------|-------|
 | Auto-discovery | ✅ | ❌ | |
 | Failover chains | ✅ | ✅ | `FailoverProvider` with configurable `fallback_model` |
-| Cooldown management | ✅ | ✅ | Lock-free per-provider cooldown in `FailoverProvider` |
+| Cooldown management | ✅ | ❌ | Skip failed providers |
 | Per-session model override | ✅ | ✅ | Model selector in TUI |
 | Model selection UI | ✅ | ✅ | TUI keyboard shortcut |
-| Per-model thinkingDefault | ✅ | ❌ | Override thinking level per model in config |
-| 1M context beta header | ✅ | ❌ | Anthropic extended context support |
 
 ### Owner: _Unassigned_
 
@@ -249,8 +187,6 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Feature | OpenClaw | IronClaw | Priority | Notes |
 |---------|----------|----------|----------|-------|
 | Image processing (Sharp) | ✅ | ❌ | P2 | Resize, format convert |
-| Configurable image resize dims | ✅ | ❌ | P2 | Per-agent dimension config |
-| Multiple images per tool call | ✅ | ❌ | P2 | Single tool invocation, multiple images |
 | Audio transcription | ✅ | ❌ | P2 | |
 | Video support | ✅ | ❌ | P3 | |
 | PDF parsing | ✅ | ❌ | P2 | pdfjs-dist |
@@ -259,7 +195,6 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Vision model integration | ✅ | ❌ | P2 | Image understanding |
 | TTS (Edge TTS) | ✅ | ❌ | P3 | Text-to-speech |
 | TTS (OpenAI) | ✅ | ❌ | P3 | |
-| Incremental TTS playback | ✅ | ❌ | P3 | iOS progressive playback |
 | Sticker-to-image | ✅ | ❌ | P3 | Telegram stickers |
 
 ### Owner: _Unassigned_
@@ -278,13 +213,10 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Auth plugins | ✅ | ❌ | |
 | Memory plugins | ✅ | ❌ | Custom backends |
 | Tool plugins | ✅ | ✅ | WASM tools |
-| Hook plugins | ✅ | ✅ | Declarative hooks from extension capabilities |
+| Hook plugins | ✅ | ❌ | |
 | Provider plugins | ✅ | ❌ | |
 | Plugin CLI (`install`, `list`) | ✅ | ✅ | `tool` subcommand |
 | ClawHub registry | ✅ | ❌ | Discovery |
-| `before_agent_start` hook | ✅ | ❌ | modelOverride/providerOverride support |
-| `before_message_write` hook | ✅ | ❌ | Pre-write message interception |
-| `llm_input`/`llm_output` hooks | ✅ | ❌ | LLM payload inspection |
 
 ### Owner: _Unassigned_
 
@@ -303,7 +235,6 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Legacy migration | ✅ | ➖ | |
 | State directory | ✅ `~/.openclaw-state/` | ✅ `~/.ironclaw/` | |
 | Credentials directory | ✅ | ✅ | Session files |
-| Full model compat fields in schema | ✅ | ❌ | pi-ai model compat exposed in config |
 
 ### Owner: _Unassigned_
 
@@ -316,19 +247,16 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Vector memory | ✅ | ✅ | pgvector |
 | Session-based memory | ✅ | ✅ | |
 | Hybrid search (BM25 + vector) | ✅ | ✅ | RRF algorithm |
-| Temporal decay (hybrid search) | ✅ | ❌ | Opt-in time-based scoring factor |
-| MMR re-ranking | ✅ | ❌ | Maximal marginal relevance for result diversity |
-| LLM-based query expansion | ✅ | ❌ | Expand FTS queries via LLM |
 | OpenAI embeddings | ✅ | ✅ | |
 | Gemini embeddings | ✅ | ❌ | |
 | Local embeddings | ✅ | ❌ | |
 | SQLite-vec backend | ✅ | ❌ | IronClaw uses PostgreSQL |
-| LanceDB backend | ✅ | ❌ | Configurable auto-capture max length |
+| LanceDB backend | ✅ | ❌ | |
 | QMD backend | ✅ | ❌ | |
 | Atomic reindexing | ✅ | ✅ | |
-| Embeddings batching | ✅ | ✅ | `embed_batch` on EmbeddingProvider trait |
+| Embeddings batching | ✅ | ❌ | |
 | Citation support | ✅ | ❌ | |
-| Memory CLI commands | ✅ | ✅ | `memory search/read/write/tree/status` CLI subcommands |
+| Memory CLI commands | ✅ | ❌ | `memory search/index/status` |
 | Flexible path structure | ✅ | ✅ | Filesystem-like API |
 | Identity files (AGENTS.md, etc.) | ✅ | ✅ | |
 | Daily logs | ✅ | ✅ | |
@@ -344,16 +272,12 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 |---------|----------|----------|----------|-------|
 | iOS app (SwiftUI) | ✅ | 🚫 | - | Out of scope initially |
 | Android app (Kotlin) | ✅ | 🚫 | - | Out of scope initially |
-| Apple Watch companion | ✅ | 🚫 | - | Send/receive messages MVP |
 | Gateway WebSocket client | ✅ | 🚫 | - | |
 | Camera/photo access | ✅ | 🚫 | - | |
 | Voice input | ✅ | 🚫 | - | |
 | Push-to-talk | ✅ | 🚫 | - | |
 | Location sharing | ✅ | 🚫 | - | |
 | Node pairing | ✅ | 🚫 | - | |
-| APNs push notifications | ✅ | 🚫 | - | Wake disconnected nodes before invoke |
-| Share to OpenClaw (iOS) | ✅ | 🚫 | - | iOS share sheet integration |
-| Background listening toggle | ✅ | 🚫 | - | iOS background audio |
 
 ### Owner: _Unassigned_ (if ever prioritized)
 
@@ -364,17 +288,12 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Feature | OpenClaw | IronClaw | Priority | Notes |
 |---------|----------|----------|----------|-------|
 | SwiftUI native app | ✅ | 🚫 | - | Out of scope |
-| Menu bar presence | ✅ | 🚫 | - | Animated menubar icon |
+| Menu bar presence | ✅ | 🚫 | - | |
 | Bundled gateway | ✅ | 🚫 | - | |
-| Canvas hosting | ✅ | 🚫 | - | Agent-controlled panel with placement/resizing |
-| Voice wake | ✅ | 🚫 | - | Overlay, mic picker, language selection, live meter |
-| Voice wake overlay | ✅ | 🚫 | - | Partial transcripts, adaptive delays, dismiss animations |
-| Push-to-talk hotkey | ✅ | 🚫 | - | System-wide hotkey |
+| Canvas hosting | ✅ | 🚫 | - | |
+| Voice wake | ✅ | 🚫 | - | |
 | Exec approval dialogs | ✅ | ✅ | - | TUI overlay |
 | iMessage integration | ✅ | 🚫 | - | |
-| Instances tab | ✅ | 🚫 | - | Presence beacons across instances |
-| Agent events debug window | ✅ | 🚫 | - | Real-time event inspector |
-| Sparkle auto-updates | ✅ | 🚫 | - | Appcast distribution |
 
 ### Owner: _Unassigned_ (if ever prioritized)
 
@@ -391,10 +310,7 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Config editing | ✅ | ❌ | P3 | |
 | Debug/logs viewer | ✅ | ✅ | - | Real-time log streaming with level/target filters |
 | WebChat interface | ✅ | ✅ | - | Web gateway chat with SSE/WebSocket |
-| Canvas system (A2UI) | ✅ | ❌ | P3 | Agent-driven UI, improved asset resolution |
-| Control UI i18n | ✅ | ❌ | P3 | English, Chinese, Portuguese |
-| WebChat theme sync | ✅ | ❌ | P3 | Sync with system dark/light mode |
-| Partial output on abort | ✅ | ❌ | P2 | Preserve partial output when aborting |
+| Canvas system (A2UI) | ✅ | ❌ | P3 | Agent-driven UI |
 
 ### Owner: _Unassigned_
 
@@ -405,26 +321,20 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Feature | OpenClaw | IronClaw | Priority | Notes |
 |---------|----------|----------|----------|-------|
 | Cron jobs | ✅ | ✅ | - | Routines with cron trigger |
-| Cron stagger controls | ✅ | ❌ | P3 | Default stagger for scheduled jobs |
-| Cron finished-run webhook | ✅ | ❌ | P3 | Webhook on job completion |
 | Timezone support | ✅ | ✅ | - | Via cron expressions |
 | One-shot/recurring jobs | ✅ | ✅ | - | Manual + cron triggers |
-| Channel health monitor | ✅ | ❌ | P2 | Auto-restart with configurable interval |
-| `beforeInbound` hook | ✅ | ✅ | P2 | |
-| `beforeOutbound` hook | ✅ | ✅ | P2 | |
-| `beforeToolCall` hook | ✅ | ✅ | P2 | |
-| `before_agent_start` hook | ✅ | ❌ | P2 | Model/provider override |
-| `before_message_write` hook | ✅ | ❌ | P2 | Pre-write interception |
+| `beforeInbound` hook | ✅ | ❌ | P2 | |
+| `beforeOutbound` hook | ✅ | ❌ | P2 | |
+| `beforeToolCall` hook | ✅ | ❌ | P2 | |
 | `onMessage` hook | ✅ | ✅ | - | Routines with event trigger |
-| `onSessionStart` hook | ✅ | ✅ | P2 | |
-| `onSessionEnd` hook | ✅ | ✅ | P2 | |
+| `onSessionStart` hook | ✅ | ❌ | P2 | |
+| `onSessionEnd` hook | ✅ | ❌ | P2 | |
 | `transcribeAudio` hook | ✅ | ❌ | P3 | |
-| `transformResponse` hook | ✅ | ✅ | P2 | |
-| `llm_input`/`llm_output` hooks | ✅ | ❌ | P3 | LLM payload inspection |
-| Bundled hooks | ✅ | ✅ | P2 | Audit + declarative rule/webhook hooks |
-| Plugin hooks | ✅ | ✅ | P3 | Registered from WASM `capabilities.json` |
-| Workspace hooks | ✅ | ✅ | P2 | `hooks/hooks.json` and `hooks/*.hook.json` |
-| Outbound webhooks | ✅ | ✅ | P2 | Fire-and-forget lifecycle event delivery |
+| `transformResponse` hook | ✅ | ❌ | P2 | |
+| Bundled hooks | ✅ | ❌ | P2 | |
+| Plugin hooks | ✅ | ❌ | P3 | |
+| Workspace hooks | ✅ | ❌ | P2 | Inline code |
+| Outbound webhooks | ✅ | ❌ | P2 | |
 | Heartbeat system | ✅ | ✅ | - | Periodic execution |
 | Gmail pub/sub | ✅ | ❌ | P3 | |
 
@@ -439,7 +349,6 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Gateway token auth | ✅ | ✅ | Bearer token auth on web gateway |
 | Device pairing | ✅ | ❌ | |
 | Tailscale identity | ✅ | ❌ | |
-| Trusted-proxy auth | ✅ | ❌ | Header-based reverse proxy auth |
 | OAuth flows | ✅ | 🚧 | NEAR AI OAuth |
 | DM pairing verification | ✅ | ✅ | ironclaw pairing approve, host APIs |
 | Allowlist/blocklist | ✅ | 🚧 | allow_from + pairing store |
@@ -447,26 +356,18 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Exec approvals | ✅ | ✅ | TUI overlay |
 | TLS 1.3 minimum | ✅ | ✅ | reqwest rustls |
 | SSRF protection | ✅ | ✅ | WASM allowlist |
-| SSRF IPv6 transition bypass block | ✅ | ❌ | Block IPv4-mapped IPv6 bypasses |
-| Cron webhook SSRF guard | ✅ | ❌ | SSRF checks on webhook delivery |
 | Loopback-first | ✅ | 🚧 | HTTP binds 0.0.0.0 |
 | Docker sandbox | ✅ | ✅ | Orchestrator/worker containers |
-| Podman support | ✅ | ❌ | Alternative to Docker |
 | WASM sandbox | ❌ | ✅ | IronClaw innovation |
-| Sandbox env sanitization | ✅ | 🚧 | Shell tool scrubs env vars (secret detection); docker container env sanitization partial |
 | Tool policies | ✅ | ✅ | |
 | Elevated mode | ✅ | ❌ | |
-| Safe bins allowlist | ✅ | ❌ | Hardened path trust |
+| Safe bins allowlist | ✅ | ❌ | |
 | LD*/DYLD* validation | ✅ | ❌ | |
-| Path traversal prevention | ✅ | ✅ | Including config includes (OC-06) |
-| Credential theft via env injection | ✅ | 🚧 | Shell env scrubbing + command injection detection; no full OC-09 defense |
-| Session file permissions (0o600) | ✅ | ✅ | Session token file set to 0o600 in llm/session.rs |
-| Skill download path restriction | ✅ | ❌ | Prevent arbitrary write targets |
+| Path traversal prevention | ✅ | ✅ | |
 | Webhook signature verification | ✅ | ✅ | |
 | Media URL validation | ✅ | ❌ | |
 | Prompt injection defense | ✅ | ✅ | Pattern detection, sanitization |
 | Leak detection | ✅ | ✅ | Secret exfiltration |
-| Dangerous tool re-enable warning | ✅ | ❌ | Warn when gateway.tools.allow re-enables HTTP tools |
 
 ### Owner: _Unassigned_
 
@@ -486,9 +387,6 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 | Coverage | V8 | tarpaulin/llvm-cov | |
 | CI/CD | GitHub Actions | GitHub Actions | |
 | Pre-commit hooks | prek | - | Consider adding |
-| Docker: Chromium + Xvfb | ✅ | ❌ | Optional browser in container |
-| Docker: init scripts | ✅ | ❌ | /openclaw-init.d/ support |
-| Browser: extraArgs config | ✅ | ❌ | Custom Chrome launch arguments |
 
 ### Owner: _Unassigned_
 
@@ -501,7 +399,7 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 - ✅ HTTP webhook channel
 - ✅ DM pairing (ironclaw pairing list/approve, host APIs)
 - ✅ WASM tool sandbox
-- ✅ Workspace/memory with hybrid search + embeddings batching
+- ✅ Workspace/memory with hybrid search
 - ✅ Prompt injection defense
 - ✅ Heartbeat system
 - ✅ Session management
@@ -516,27 +414,23 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 - ✅ Cron job scheduling (routines)
 - ✅ CLI subcommands (onboard, config, status, memory)
 - ✅ Gateway token auth
-- ✅ Skills system (prompt-based with trust gating, attenuation, activation criteria)
-- ✅ Session file permissions (0o600)
-- ✅ Memory CLI commands (search, read, write, tree, status)
-- ✅ Shell env scrubbing + command injection detection
-- ✅ Tinfoil private inference provider
-- ✅ OpenAI-compatible / OpenRouter provider support
 
 ### P1 - High Priority
 - ❌ Slack channel (real implementation)
 - ✅ Telegram channel (WASM, DM pairing, caption, /start)
 - ❌ WhatsApp channel
 - ✅ Multi-provider failover (`FailoverProvider` with retryable error classification)
-- ✅ Hooks system (core lifecycle hooks + bundled/plugin/workspace hooks + outbound webhooks)
+- ❌ Hooks system (beforeInbound, beforeToolCall, etc.)
 
 ### P2 - Medium Priority
-- ❌ Media handling (images, PDFs)
-- ✅ Ollama/local model support (via rig::providers::ollama)
+- ❌ Cron job scheduling
+- ❌ Web Control UI
+- ❌ WebChat channel
+- 🚧 Media handling (caption support; no image/PDF processing)
+- ❌ CLI subcommands (config, status, memory, doctor)
+- ❌ Ollama/local model support
 - ❌ Configuration hot-reload
 - ❌ Webhook trigger endpoint in web gateway
-- ❌ Channel health monitor with auto-restart
-- ❌ Partial output preservation on abort
 
 ### P3 - Lower Priority
 - ❌ Discord channel
@@ -545,12 +439,8 @@ This document tracks feature parity between IronClaw (Rust implementation) and O
 - ❌ Other messaging platforms
 - ❌ TTS/audio features
 - ❌ Video support
-- 🚧 Skills routing blocks (activation criteria exist, but no "Use when / Don't use when")
+- ❌ Skills system
 - ❌ Plugin registry
-- ❌ Streaming (block/tool/Z.AI tool_stream)
-- ❌ Memory: temporal decay, MMR re-ranking, query expansion
-- ❌ Control UI i18n
-- ❌ Stuck loop detection
 
 ---
 
@@ -575,12 +465,9 @@ IronClaw intentionally differs from OpenClaw in these ways:
 
 1. **Rust vs TypeScript**: Native performance, memory safety, single binary distribution
 2. **WASM sandbox vs Docker**: Lighter weight, faster startup, capability-based security
-3. **PostgreSQL + libSQL vs SQLite**: Dual-backend (production PG + embedded libSQL for zero-dep local mode)
+3. **PostgreSQL vs SQLite**: Better suited for production deployments
 4. **NEAR AI focus**: Primary provider with session-based auth
 5. **No mobile/desktop apps**: Focus on server-side and CLI initially
 6. **WASM channels**: Novel extension mechanism not in OpenClaw
-7. **Tinfoil private inference**: IronClaw-only provider for private/encrypted inference
-8. **GitHub WASM tool**: Native GitHub integration as WASM tool
-9. **Prompt-based skills**: Different approach than OpenClaw capability bundles (trust gating, attenuation)
 
 These are intentional architectural choices, not gaps to be filled.

README.md

@@ -139,9 +139,8 @@ ironclaw onboard
 ```
 
 The wizard handles database connection, NEAR AI authentication (via browser OAuth),
-and secrets encryption (using your system keychain). Settings are persisted in the
-connected database; bootstrap variables (e.g. `DATABASE_URL`, `LLM_BACKEND`) are
-written to `~/.ironclaw/.env` so they are available before the database connects.
+and secrets encryption (using your system keychain). All settings are saved to
+`~/.ironclaw/settings.toml`.
 
 ## Security
 

benchmarks/Cargo.toml

@@ -1,50 +0,0 @@
-[package]
-name = "ironclaw-bench"
-version = "0.1.0"
-edition = "2024"
-rust-version = "1.85"
-description = "Benchmarking harness for IronClaw agent"
-license = "MIT OR Apache-2.0"
-publish = false
-
-[[bin]]
-name = "ironclaw-bench"
-path = "src/main.rs"
-
-[dependencies]
-ironclaw = { path = ".." }
-
-# Async runtime
-tokio = { version = "1", features = ["full"] }
-tokio-stream = { version = "0.1", features = ["sync"] }
-futures = "0.3"
-
-# Serialization
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-toml = "0.8"
-
-# CLI
-clap = { version = "4", features = ["derive"] }
-
-# Core types
-uuid = { version = "1", features = ["v4", "serde"] }
-chrono = { version = "0.4", features = ["serde"] }
-rust_decimal = { version = "1", features = ["serde", "serde-with-str"] }
-
-# Error handling
-thiserror = "2"
-anyhow = "1"
-
-# Async traits
-async-trait = "0.1"
-
-# Logging
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-
-# Scoring
-regex = "1"
-
-[dev-dependencies]
-tempfile = "3"

benchmarks/baselines/spot-gpt5.2-2c43b83/run.json

@@ -1,15 +0,0 @@
-{
-  "run_id": "8a48de1f-09ce-4c35-9ad1-dad98fb83a1a",
-  "suite_id": "spot",
-  "config_label": "default",
-  "model": "openai/gpt-5.2",
-  "commit_hash": "2c43b83",
-  "pass_rate": 1.0,
-  "avg_score": 1.0,
-  "total_tasks": 21,
-  "completed_tasks": 21,
-  "total_cost_usd": 0.307053,
-  "total_wall_time_ms": 111009,
-  "started_at": "2026-02-17T22:02:08.206112Z",
-  "finished_at": "2026-02-17T22:03:59.270325Z"
-}

benchmarks/baselines/spot-gpt5.2-2c43b83/tasks.jsonl

@@ -1,21 +0,0 @@
-{"task_id":"smoke-greeting","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":2037,"llm_calls":1,"input_tokens":1359,"output_tokens":65,"estimated_cost_usd":0.005052,"tool_calls":[],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"I’m NEAR AI Agent—an autonomous assistant that helps you plan, write, debug, and execute tasks using available tools (like reading/writing files, running shell commands, and making HTTP requests). Tell me what you’re working on and what outcome you want, and I’ll drive it to completion.","started_at":"2026-02-17T22:02:08.206165Z","finished_at":"2026-02-17T22:02:10.243552Z","config_label":"default","error":null}
-{"task_id":"smoke-math","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":2038,"llm_calls":1,"input_tokens":1366,"output_tokens":5,"estimated_cost_usd":0.004173,"tool_calls":[],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"1081","started_at":"2026-02-17T22:02:10.243933Z","finished_at":"2026-02-17T22:02:12.282133Z","config_label":"default","error":null}
-{"task_id":"tool-echo","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":2646,"llm_calls":2,"input_tokens":2786,"output_tokens":24,"estimated_cost_usd":0.008718,"tool_calls":[{"name":"echo","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"Spot check passed","started_at":"2026-02-17T22:02:12.282294Z","finished_at":"2026-02-17T22:02:14.928540Z","config_label":"default","error":null}
-{"task_id":"tool-time","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":3460,"llm_calls":2,"input_tokens":2839,"output_tokens":78,"estimated_cost_usd":0.009687,"tool_calls":[{"name":"time","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"Current date/time (UTC): **2026-02-17 22:02:16**  \nISO 8601: **2026-02-17T22:02:16.045933+00:00**","started_at":"2026-02-17T22:02:14.928810Z","finished_at":"2026-02-17T22:02:18.389188Z","config_label":"default","error":null}
-{"task_id":"tool-json-query","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":2751,"llm_calls":2,"input_tokens":2839,"output_tokens":43,"estimated_cost_usd":0.009162,"tool_calls":[{"name":"json","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"Bob","started_at":"2026-02-17T22:02:18.389812Z","finished_at":"2026-02-17T22:02:21.141146Z","config_label":"default","error":null}
-{"task_id":"tool-shell-echo","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":3460,"llm_calls":2,"input_tokens":2811,"output_tokens":25,"estimated_cost_usd":0.008808,"tool_calls":[{"name":"shell","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"benchmark test","started_at":"2026-02-17T22:02:21.141384Z","finished_at":"2026-02-17T22:02:24.601812Z","config_label":"default","error":null}
-{"task_id":"tool-list-dir","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":19146,"llm_calls":2,"input_tokens":4370,"output_tokens":1337,"estimated_cost_usd":0.033165,"tool_calls":[{"name":"list_dir","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"```\nclaude-501/\nclaude-505/\nclaude/\ncodex/\ncom.apple.launchd.HqYyNM7hoK/\ncom.apple.launchd.Z0bTtlsPEN/\ncom.apple.launchd.oY8y5gkzN4/\ncom.apple.launchd.sdo3WGu0S7/\ndata-gym-cache/\ndocker-desktop-privileged2203342862/\ngrammers-test/\nnear-agent-target/\nnear-market-bot-push/\nnear-market-bot/\nopenclaw/\npowerlog/\ntest_grpo/\ntest_grpo2/\ntest_grpo_entry/\ntest_grpo_mix/\ntest_grpo_singleton/\ntmpybtjiuc0/\n.d8bd37babaf2f1f7-00000000.node (5.9MB)\n.d8bd37fbfbb0f7ff-00000000.node (5.9MB)\n.d8bd3d9bdf6dd3f7-00000000.node (5.9MB)\n.d8bd3fbfbf21ddf7-00000000.node (5.9MB)\n.d8bd7dfebb38d5ff-00000000.node (5.9MB)\n.d8bdf5deba3bf1f7-00000000.node (5.9MB)\n.d8bdf7cfff76f3f7-00000000.node (5.9MB)\n.d8bdfd8ffe26d5ff-00000000.node (5.9MB)\n.d8bdfdeb9ba8dbff-00000000.node (5.9MB)\n.d8bdfffe9ab2ddff-00000000.node (5.9MB)\n.s.PGSQL.5432 (0B)\n.s.PGSQL.5432.lock (56B)\n__KMP_REGISTERED_LIB_75079 (1.0KB)\nagent_loop_new.rs (28.5KB)\nagent_mod.rs (1.6KB)\nauth_trace.md (10.8KB)\nbench-daily.md (72B)\nbench-log.md (109B)\nbench-meeting.md (160B)\nbench-monday.md (44B)\nbench-prefs.md (61B)\nbench-project.md (213B)\nbench-reminder.md (68B)\nbench-todo.md (153B)\nbench-tuesday.md (40B)\ncac-deck.html (151.5KB)\ncircuit_breaker.rs (22.1KB)\ncli_config.rs (9.1KB)\ncli_service.rs (1.1KB)\ncommands.rs (17.5KB)\nconfig.rs (58.4KB)\nconflicts_summary.md (21.4KB)\ncost_guard.rs (11.3KB)\ndebug_forc2.py (2.8KB)\ndebug_forc3.py (3.0KB)\ndebug_forc4.py (3.0KB)\ndebug_forc5.py (4.0KB)\ndebug_forc6.py (3.9KB)\ndebug_forc7.py (2.7KB)\ndebug_forc8.py (2.9KB)\ndebug_forc_prove.py (3.0KB)\ndispatcher.rs (26.2KB)\ndoctor.rs (8.4KB)\nhygiene.rs (7.3KB)\nironclaw_blog_test.png (21.4KB)\nironclaw_browser_test_viewport.png (156.1KB)\nironclaw_linkedin_debug.png (6.5KB)\nironclaw_spot_test.txt (19B)\nkeys_chain_signatures.rs (6.1KB)\nkeys_error.rs (1.6KB)\nkeys_intents.rs (5.8KB)\nkeys_mod.rs (31.6KB)\nkeys_policy.rs (31.4KB)\nkeys_rpc.rs (8.5KB)\nkeys_signer.rs (8.0KB)\nkeys_spending.rs (5.9KB)\nkeys_transaction.rs (13.7KB)\nkeys_types.rs (17.4KB)\nleak_detection_research_summary.md (13.0KB)\nleak_detector.rs (25.3KB)\nlib_new.rs (5.0KB)\nllm_mod.rs (10.0KB)\nmain.rs (56.8KB)\nmain_bootstrap.rs (11.0KB)\nmain_rs.txt (34.1KB)\nnear_resp.json (39B)\nobs_log.rs (5.9KB)\nobs_mod.rs (2.7KB)\nobs_multi.rs (4.0KB)\nobs_noop.rs (1.5KB)\nobs_traits.rs (4.0KB)\nour_bootstrap.rs (12.6KB)\nour_config.rs (45.2KB)\npost_final_review.py (6.4KB)\npost_review.py (4.6KB)\npost_review2.py (4.8KB)\npost_review3.py (2.2KB)\npr-35.diff (137.4KB)\npr115.diff (1.6MB)\npr126.diff (336.9KB)\npr14_full_diff.txt (193.4KB)\npr39_files.txt (243B)\npr51_files.txt (548B)\npr93_diff.txt (160.4KB)\nprs.json (4.6KB)\nresponse_cache.rs (15.1KB)\nrun_hard_proof_search.sh (545B)\nrun_hard_proof_search2.sh (515B)\nrun_proof_search_v3.sh (523B)\nrun_proof_search_v4.sh (524B)\nservice.rs (11.9KB)\nsettings.rs (34.7KB)\ntest_line.py (789B)\ntest_search.txt (1.8KB)\nthread_ops.rs (38.5KB)\ntool_wit.txt (6.0KB)\ntunnel_cf.rs (3.9KB)\ntunnel_custom.rs (6.2KB)\ntunnel_mod.rs (10.4KB)\ntunnel_ngrok.rs (4.2KB)\ntunnel_none.rs (1.3KB)\ntunnel_ts.rs (3.5KB)\nwasm_capabilities.rs (15.2KB)\nwasm_capabilities_schema.rs (26.2KB)\nwasm_host.rs (25.3KB)\nwasm_wrapper.rs (14.9KB)\n```","started_at":"2026-02-17T22:02:24.602248Z","finished_at":"2026-02-17T22:02:43.748463Z","config_label":"default","error":null}
-{"task_id":"chain-write-read","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":5712,"llm_calls":3,"input_tokens":4489,"output_tokens":73,"estimated_cost_usd":0.014562,"tool_calls":[{"name":"write_file","duration_ms":0,"success":true},{"name":"read_file","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"It says: `ironclaw spot check`.","started_at":"2026-02-17T22:02:43.749933Z","finished_at":"2026-02-17T22:02:49.462007Z","config_label":"default","error":null}
-{"task_id":"chain-shell-json","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":4582,"llm_calls":3,"input_tokens":4433,"output_tokens":94,"estimated_cost_usd":0.014709,"tool_calls":[{"name":"shell","duration_ms":0,"success":true},{"name":"json","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"[Called tool `json` with arguments: {\"data\":{\"code\":200,\"status\":\"ok\"},\"operation\":\"query\",\"path\":\"status\"}]","started_at":"2026-02-17T22:02:49.463794Z","finished_at":"2026-02-17T22:02:54.046092Z","config_label":"default","error":null}
-{"task_id":"chain-time-echo","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":4583,"llm_calls":3,"input_tokens":4404,"output_tokens":76,"estimated_cost_usd":0.014352,"tool_calls":[{"name":"time","duration_ms":0,"success":true},{"name":"echo","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"2026-02-17T22:02:55.786456+00:00","started_at":"2026-02-17T22:02:54.046306Z","finished_at":"2026-02-17T22:02:58.629389Z","config_label":"default","error":null}
-{"task_id":"robust-no-tool","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":1020,"llm_calls":1,"input_tokens":1366,"output_tokens":5,"estimated_cost_usd":0.004173,"tool_calls":[],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"Paris.","started_at":"2026-02-17T22:02:58.630502Z","finished_at":"2026-02-17T22:02:59.650655Z","config_label":"default","error":null}
-{"task_id":"robust-correct-tool","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":3980,"llm_calls":2,"input_tokens":2825,"output_tokens":50,"estimated_cost_usd":0.009225,"tool_calls":[{"name":"time","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"It’s **22:03:01 UTC** right now (**2026-02-17**).","started_at":"2026-02-17T22:02:59.650901Z","finished_at":"2026-02-17T22:03:03.631122Z","config_label":"default","error":null}
-{"task_id":"robust-json-validate","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":2954,"llm_calls":2,"input_tokens":2822,"output_tokens":43,"estimated_cost_usd":0.009111,"tool_calls":[{"name":"json","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"The JSON is valid (`valid: true`).","started_at":"2026-02-17T22:03:03.631527Z","finished_at":"2026-02-17T22:03:06.585971Z","config_label":"default","error":null}
-{"task_id":"memory-save-daily","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":4890,"llm_calls":3,"input_tokens":4547,"output_tokens":114,"estimated_cost_usd":0.015351,"tool_calls":[{"name":"write_file","duration_ms":0,"success":true},{"name":"read_file","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"```md\n# Daily Tasks\n\n1. Review PR #42\n2. Update API docs\n3. Deploy to staging\n```","started_at":"2026-02-17T22:03:06.586556Z","finished_at":"2026-02-17T22:03:11.476648Z","config_label":"default","error":null}
-{"task_id":"memory-save-reminder","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":5607,"llm_calls":3,"input_tokens":4531,"output_tokens":95,"estimated_cost_usd":0.015018,"tool_calls":[{"name":"write_file","duration_ms":0,"success":true},{"name":"read_file","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"The appointment is on **March 5th at 2pm**, with **Dr. Smith**.","started_at":"2026-02-17T22:03:11.476873Z","finished_at":"2026-02-17T22:03:17.084343Z","config_label":"default","error":null}
-{"task_id":"memory-save-meeting","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":6113,"llm_calls":3,"input_tokens":4750,"output_tokens":122,"estimated_cost_usd":0.01608,"tool_calls":[{"name":"write_file","duration_ms":0,"success":true},{"name":"read_file","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"Frontend owner: **Bob**  \nLaunch date: **April 15th**","started_at":"2026-02-17T22:03:17.085432Z","finished_at":"2026-02-17T22:03:23.198905Z","config_label":"default","error":null}
-{"task_id":"memory-append-log","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":9880,"llm_calls":6,"input_tokens":9941,"output_tokens":208,"estimated_cost_usd":0.032943,"tool_calls":[{"name":"write_file","duration_ms":0,"success":true},{"name":"read_file","duration_ms":0,"success":true},{"name":"read_file","duration_ms":0,"success":true},{"name":"shell","duration_ms":0,"success":true},{"name":"read_file","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"Contents of `/tmp/bench-log.md`:\n1. Morning standup: discussed blockers on auth service  \n2. Afternoon: resolved API timeout issue in payment gateway  \n\nSummary: You discussed blockers affecting the auth service during the morning standup, and later in the afternoon you resolved an API timeout issue in the payment gateway.","started_at":"2026-02-17T22:03:23.199155Z","finished_at":"2026-02-17T22:03:33.079396Z","config_label":"default","error":null}
-{"task_id":"memory-recall-detail","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":4989,"llm_calls":3,"input_tokens":4721,"output_tokens":121,"estimated_cost_usd":0.015978,"tool_calls":[{"name":"write_file","duration_ms":0,"success":true},{"name":"read_file","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"The project uses **PostgreSQL** as the database, and the PM is **James**.","started_at":"2026-02-17T22:03:33.080611Z","finished_at":"2026-02-17T22:03:38.069896Z","config_label":"default","error":null}
-{"task_id":"memory-todo-priority","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":5916,"llm_calls":3,"input_tokens":4676,"output_tokens":110,"estimated_cost_usd":0.015678,"tool_calls":[{"name":"write_file","duration_ms":0,"success":true},{"name":"read_file","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"High priority tasks:\n- Fix login bug\n- Security audit","started_at":"2026-02-17T22:03:38.070162Z","finished_at":"2026-02-17T22:03:43.986831Z","config_label":"default","error":null}
-{"task_id":"memory-multifile","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":6081,"llm_calls":4,"input_tokens":6442,"output_tokens":196,"estimated_cost_usd":0.022266,"tool_calls":[{"name":"write_file","duration_ms":0,"success":true},{"name":"read_file","duration_ms":0,"success":true},{"name":"read_file","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"On Tuesday you have **Sprint retro at 11am**, then **team lunch at noon**.","started_at":"2026-02-17T22:03:43.988013Z","finished_at":"2026-02-17T22:03:50.069452Z","config_label":"default","error":null}
-{"task_id":"memory-update-context","suite_id":"spot","score":{"value":1.0,"label":"pass","details":null},"trace":{"wall_time_ms":9164,"llm_calls":5,"input_tokens":8354,"output_tokens":252,"estimated_cost_usd":0.028842,"tool_calls":[{"name":"write_file","duration_ms":0,"success":true},{"name":"read_file","duration_ms":0,"success":true},{"name":"apply_patch","duration_ms":0,"success":true},{"name":"read_file","duration_ms":0,"success":true}],"turns":1,"hit_iteration_limit":false,"hit_timeout":false},"response":"Final read confirms the file now says `timezone: EST`.","started_at":"2026-02-17T22:03:50.070277Z","finished_at":"2026-02-17T22:03:59.235196Z","config_label":"default","error":null}

benchmarks/data/spot.jsonl

@@ -1,21 +0,0 @@
-{"id": "smoke-greeting", "prompt": "Hello! Introduce yourself briefly.", "tags": ["smoke"], "assertions": {"response_matches": "(?i)(hello|hi|hey|assistant|agent|help)", "no_error": true, "max_tool_calls": 0}}
-{"id": "smoke-math", "prompt": "What is 47 * 23? Reply with just the number.", "tags": ["smoke"], "assertions": {"response_contains": ["1081"], "no_error": true, "max_tool_calls": 0}}
-{"id": "tool-echo", "prompt": "Use the echo tool to repeat the message: 'Spot check passed'", "tags": ["tool"], "assertions": {"tools_used": ["echo"], "response_contains": ["Spot check passed"], "no_error": true}}
-{"id": "tool-time", "prompt": "What is the current date and time? Use the time tool.", "tags": ["tool"], "assertions": {"tools_used": ["time"], "response_matches": "20\\d{2}", "no_error": true}}
-{"id": "tool-json-query", "prompt": "Given this JSON: {\"users\": [{\"name\": \"Alice\"}, {\"name\": \"Bob\"}]}, use the json tool to extract the second user's name.", "tags": ["tool"], "assertions": {"tools_used": ["json"], "response_contains": ["Bob"], "no_error": true}}
-{"id": "tool-shell-echo", "prompt": "Use the shell tool to run: echo 'benchmark test'", "tags": ["tool"], "assertions": {"tools_used": ["shell"], "response_contains": ["benchmark test"], "no_error": true}}
-{"id": "tool-list-dir", "prompt": "Use the list_dir tool to list the contents of the /tmp directory.", "tags": ["tool"], "assertions": {"tools_used": ["list_dir"], "no_error": true}}
-{"id": "chain-write-read", "prompt": "Write the text 'ironclaw spot check' to /tmp/ironclaw_spot_test.txt using the write_file tool, then read it back using the read_file tool and tell me what it says.", "tags": ["chain"], "assertions": {"tools_used": ["write_file", "read_file"], "response_contains": ["ironclaw spot check"], "no_error": true}}
-{"id": "chain-shell-json", "prompt": "Run a shell command to output the JSON string '{\"status\": \"ok\", \"code\": 200}', then use the json tool to extract the status field.", "tags": ["chain"], "assertions": {"response_contains": ["ok"], "min_tool_calls": 1, "no_error": true}}
-{"id": "chain-time-echo", "prompt": "First get the current time using the time tool, then use the echo tool to repeat it back.", "tags": ["chain"], "assertions": {"tools_used": ["time", "echo"], "no_error": true}}
-{"id": "robust-no-tool", "prompt": "What is the capital of France? Answer directly without using any tools.", "tags": ["robust"], "assertions": {"response_contains": ["Paris"], "max_tool_calls": 0, "no_error": true}}
-{"id": "robust-correct-tool", "prompt": "What time is it right now?", "tags": ["robust"], "assertions": {"tools_used": ["time"], "tools_not_used": ["shell", "echo"], "no_error": true}}
-{"id": "robust-json-validate", "prompt": "Use the json tool to validate whether this is valid JSON: {\"key\": \"value\", \"num\": 42}", "tags": ["robust"], "assertions": {"tools_used": ["json"], "tools_not_used": ["shell"], "no_error": true}}
-{"id": "memory-save-daily", "prompt": "Save these daily tasks to /tmp/bench-daily.md:\n1. Review PR #42\n2. Update API docs\n3. Deploy to staging\nThen read the file back and confirm what was saved.", "tags": ["memory"], "assertions": {"tools_used": ["write_file", "read_file"], "response_contains": ["PR #42", "docs", "staging"], "no_error": true}}
-{"id": "memory-save-reminder", "prompt": "Write a reminder to /tmp/bench-reminder.md: Dentist appointment on March 5th at 2pm with Dr. Smith. Then read the file back and tell me when the appointment is and with whom.", "tags": ["memory"], "assertions": {"tools_used": ["write_file", "read_file"], "response_contains": ["March 5", "Smith"], "response_matches": "2(:00)?\\s*[Pp][Mm]", "no_error": true}}
-{"id": "memory-save-meeting", "prompt": "Save these meeting notes to /tmp/bench-meeting.md:\nMeeting: Project Phoenix sync\nAttendees: Alice, Bob, Carol\nDecisions:\n- Launch date: April 15th\n- Budget: $50k approved\n- Bob owns frontend, Carol owns backend\nThen read the file back and tell me who owns the frontend and what the launch date is.", "tags": ["memory"], "assertions": {"tools_used": ["write_file", "read_file"], "response_contains": ["Bob", "frontend", "April 15"], "no_error": true}}
-{"id": "memory-append-log", "prompt": "Write 'Morning standup: discussed blockers on auth service' to /tmp/bench-log.md. Then append a new line 'Afternoon: resolved API timeout issue in payment gateway' to the same file. Finally read the full file and summarize what happened.", "tags": ["memory"], "assertions": {"tools_used": ["write_file", "read_file"], "response_contains": ["auth", "timeout"], "min_tool_calls": 3, "no_error": true}}
-{"id": "memory-recall-detail", "prompt": "Save the following project context to /tmp/bench-project.md:\nProject Ironclad uses Rust for the backend, React for the frontend, and PostgreSQL for the database. The API is deployed on AWS ECS. The lead developer is Sarah and the PM is James. The sprint ends on March 20th.\nThen read it back and answer: What database does the project use, and who is the PM?", "tags": ["memory"], "assertions": {"tools_used": ["write_file", "read_file"], "response_contains": ["PostgreSQL", "James"], "no_error": true}}
-{"id": "memory-todo-priority", "prompt": "Write the following to /tmp/bench-todo.md:\n- [ ] Fix login bug (priority: HIGH)\n- [ ] Write unit tests (priority: medium)\n- [ ] Update README (priority: low)\n- [ ] Security audit (priority: HIGH)\nThen read it back and tell me which tasks are high priority.", "tags": ["memory"], "assertions": {"tools_used": ["write_file", "read_file"], "response_contains": ["login bug", "security audit"], "no_error": true}}
-{"id": "memory-multifile", "prompt": "Save 'Team standup at 9am, then client demo at 2pm' to /tmp/bench-monday.md and 'Sprint retro at 11am, team lunch at noon' to /tmp/bench-tuesday.md. Then read both files and tell me what's happening on Tuesday.", "tags": ["memory"], "assertions": {"tools_used": ["write_file", "read_file"], "response_contains": ["retro", "lunch"], "min_tool_calls": 3, "no_error": true}}
-{"id": "memory-update-context", "prompt": "Write 'User preference: dark mode, timezone: PST, language: English' to /tmp/bench-prefs.md. Then read it back, and rewrite the file changing the timezone to EST. Finally read it one more time and confirm the timezone is now EST.", "tags": ["memory"], "assertions": {"tools_used": ["write_file", "read_file"], "response_contains": ["EST"], "min_tool_calls": 4, "no_error": true}}

benchmarks/spot.toml

@@ -1,8 +0,0 @@
-task_timeout = "120s"
-parallelism = 1
-
-[[matrix]]
-label = "default"
-
-[suite_config]
-dataset_path = "benchmarks/data/spot.jsonl"

benchmarks/src/adapters/custom.rs

@@ -1,243 +0,0 @@
-use std::io::BufRead;
-use std::path::PathBuf;
-
-use async_trait::async_trait;
-use serde::Deserialize;
-
-use crate::error::BenchError;
-use crate::scoring;
-use crate::suite::{BenchScore, BenchSuite, BenchTask, TaskSubmission};
-
-/// A single entry in the custom JSONL format.
-#[derive(Debug, Deserialize)]
-struct CustomEntry {
-    id: String,
-    prompt: String,
-    #[serde(default)]
-    context: Option<String>,
-    #[serde(default)]
-    tags: Vec<String>,
-    #[serde(default)]
-    expected: Option<String>,
-    #[serde(default)]
-    expected_contains: Option<String>,
-    #[serde(default)]
-    expected_regex: Option<String>,
-    /// "exact", "contains", "regex", or "llm" (default: "exact")
-    #[serde(default = "default_scorer")]
-    scorer: String,
-}
-
-fn default_scorer() -> String {
-    "exact".to_string()
-}
-
-/// Custom JSONL benchmark suite.
-///
-/// Each line of the JSONL file is a task with `id`, `prompt`, and scoring
-/// criteria (`expected`, `expected_contains`, `expected_regex`).
-pub struct CustomSuite {
-    dataset_path: PathBuf,
-}
-
-impl CustomSuite {
-    pub fn new(dataset_path: impl Into<PathBuf>) -> Self {
-        Self {
-            dataset_path: dataset_path.into(),
-        }
-    }
-}
-
-#[async_trait]
-impl BenchSuite for CustomSuite {
-    fn name(&self) -> &str {
-        "Custom JSONL"
-    }
-
-    fn id(&self) -> &str {
-        "custom"
-    }
-
-    async fn load_tasks(&self) -> Result<Vec<BenchTask>, BenchError> {
-        let file = std::fs::File::open(&self.dataset_path).map_err(BenchError::Io)?;
-        let reader = std::io::BufReader::new(file);
-        let mut tasks = Vec::new();
-
-        for (line_num, line) in reader.lines().enumerate() {
-            let line = line?;
-            let trimmed = line.trim();
-            if trimmed.is_empty() {
-                continue;
-            }
-            let entry: CustomEntry = serde_json::from_str(trimmed)
-                .map_err(|e| BenchError::Config(format!("line {}: {}", line_num + 1, e)))?;
-
-            let mut metadata = serde_json::json!({
-                "scorer": entry.scorer,
-            });
-            if let Some(ref expected) = entry.expected {
-                metadata["expected"] = serde_json::Value::String(expected.clone());
-            }
-            if let Some(ref expected_contains) = entry.expected_contains {
-                metadata["expected_contains"] =
-                    serde_json::Value::String(expected_contains.clone());
-            }
-            if let Some(ref expected_regex) = entry.expected_regex {
-                metadata["expected_regex"] = serde_json::Value::String(expected_regex.clone());
-            }
-
-            tasks.push(BenchTask {
-                id: entry.id,
-                prompt: entry.prompt,
-                context: entry.context,
-                resources: vec![],
-                tags: entry.tags,
-                expected_turns: None,
-                timeout: None,
-                metadata,
-            });
-        }
-
-        Ok(tasks)
-    }
-
-    async fn score(
-        &self,
-        task: &BenchTask,
-        submission: &TaskSubmission,
-    ) -> Result<BenchScore, BenchError> {
-        let scorer = task
-            .metadata
-            .get("scorer")
-            .and_then(|v| v.as_str())
-            .unwrap_or("exact");
-
-        match scorer {
-            "exact" => {
-                if let Some(expected) = task.metadata.get("expected").and_then(|v| v.as_str()) {
-                    Ok(scoring::exact_match(expected, &submission.response))
-                } else {
-                    Err(BenchError::Scoring {
-                        task_id: task.id.clone(),
-                        reason: "no 'expected' field for exact scoring".to_string(),
-                    })
-                }
-            }
-            "contains" => {
-                if let Some(expected) = task
-                    .metadata
-                    .get("expected_contains")
-                    .and_then(|v| v.as_str())
-                {
-                    Ok(scoring::contains_match(expected, &submission.response))
-                } else {
-                    Err(BenchError::Scoring {
-                        task_id: task.id.clone(),
-                        reason: "no 'expected_contains' field for contains scoring".to_string(),
-                    })
-                }
-            }
-            "regex" => {
-                if let Some(pattern) = task.metadata.get("expected_regex").and_then(|v| v.as_str())
-                {
-                    Ok(scoring::regex_match(pattern, &submission.response))
-                } else {
-                    Err(BenchError::Scoring {
-                        task_id: task.id.clone(),
-                        reason: "no 'expected_regex' field for regex scoring".to_string(),
-                    })
-                }
-            }
-            "llm" => {
-                // TODO: LLM-as-judge scoring
-                tracing::warn!(
-                    task_id = %task.id,
-                    "LLM-as-judge scoring not implemented, returning placeholder 0.5"
-                );
-                Ok(BenchScore::partial(0.5, "LLM scoring not yet implemented"))
-            }
-            other => Err(BenchError::Scoring {
-                task_id: task.id.clone(),
-                reason: format!("unknown scorer: {other}"),
-            }),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::io::Write;
-
-    #[tokio::test]
-    async fn test_custom_load_tasks() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("tasks.jsonl");
-        let mut file = std::fs::File::create(&path).unwrap();
-        writeln!(
-            file,
-            r#"{{"id": "t1", "prompt": "What is 2+2?", "expected": "4"}}"#
-        )
-        .unwrap();
-        writeln!(
-            file,
-            r#"{{"id": "t2", "prompt": "Say hello", "expected_contains": "hello", "scorer": "contains"}}"#
-        )
-        .unwrap();
-
-        let suite = CustomSuite::new(&path);
-        let tasks = suite.load_tasks().await.unwrap();
-        assert_eq!(tasks.len(), 2);
-        assert_eq!(tasks[0].id, "t1");
-        assert_eq!(tasks[1].id, "t2");
-    }
-
-    #[tokio::test]
-    async fn test_custom_exact_scoring() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("tasks.jsonl");
-        let mut file = std::fs::File::create(&path).unwrap();
-        writeln!(
-            file,
-            r#"{{"id": "t1", "prompt": "What is 2+2?", "expected": "4"}}"#
-        )
-        .unwrap();
-
-        let suite = CustomSuite::new(&path);
-        let tasks = suite.load_tasks().await.unwrap();
-
-        let submission = TaskSubmission {
-            response: "4".to_string(),
-            conversation: vec![],
-            tool_calls: vec![],
-            error: None,
-        };
-        let score = suite.score(&tasks[0], &submission).await.unwrap();
-        assert_eq!(score.value, 1.0);
-        assert_eq!(score.label, "pass");
-    }
-
-    #[tokio::test]
-    async fn test_custom_contains_scoring() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("tasks.jsonl");
-        let mut file = std::fs::File::create(&path).unwrap();
-        writeln!(
-            file,
-            r#"{{"id": "t1", "prompt": "Greet me", "expected_contains": "hello", "scorer": "contains"}}"#
-        )
-        .unwrap();
-
-        let suite = CustomSuite::new(&path);
-        let tasks = suite.load_tasks().await.unwrap();
-
-        let submission = TaskSubmission {
-            response: "Hello there!".to_string(),
-            conversation: vec![],
-            tool_calls: vec![],
-            error: None,
-        };
-        let score = suite.score(&tasks[0], &submission).await.unwrap();
-        assert_eq!(score.value, 1.0);
-    }
-}

benchmarks/src/adapters/gaia.rs

@@ -1,183 +0,0 @@
-use std::io::BufRead;
-use std::path::PathBuf;
-
-use async_trait::async_trait;
-use serde::Deserialize;
-
-use crate::error::BenchError;
-use crate::scoring;
-use crate::suite::{BenchScore, BenchSuite, BenchTask, TaskResource, TaskSubmission};
-
-/// GAIA dataset entry (Hugging Face JSONL format).
-#[derive(Debug, Deserialize)]
-struct GaiaEntry {
-    task_id: String,
-    #[serde(alias = "Question")]
-    question: String,
-    #[serde(alias = "Final answer", alias = "final_answer")]
-    final_answer: String,
-    #[serde(alias = "Level", default)]
-    level: Option<u32>,
-    #[serde(alias = "file_name", default)]
-    file_name: Option<String>,
-}
-
-/// GAIA benchmark suite.
-///
-/// Tasks are loaded from HuggingFace JSONL exports. Scoring uses normalized
-/// exact match against the `final_answer` field.
-pub struct GaiaSuite {
-    dataset_path: PathBuf,
-    attachments_dir: Option<PathBuf>,
-}
-
-impl GaiaSuite {
-    pub fn new(
-        dataset_path: impl Into<PathBuf>,
-        attachments_dir: Option<impl Into<PathBuf>>,
-    ) -> Self {
-        Self {
-            dataset_path: dataset_path.into(),
-            attachments_dir: attachments_dir.map(|d| d.into()),
-        }
-    }
-}
-
-#[async_trait]
-impl BenchSuite for GaiaSuite {
-    fn name(&self) -> &str {
-        "GAIA"
-    }
-
-    fn id(&self) -> &str {
-        "gaia"
-    }
-
-    async fn load_tasks(&self) -> Result<Vec<BenchTask>, BenchError> {
-        let file = std::fs::File::open(&self.dataset_path)?;
-        let reader = std::io::BufReader::new(file);
-        let mut tasks = Vec::new();
-
-        for (line_num, line) in reader.lines().enumerate() {
-            let line = line?;
-            let trimmed = line.trim();
-            if trimmed.is_empty() {
-                continue;
-            }
-            let entry: GaiaEntry = serde_json::from_str(trimmed)
-                .map_err(|e| BenchError::Config(format!("GAIA line {}: {}", line_num + 1, e)))?;
-
-            let mut resources = Vec::new();
-            if let Some(ref file_name) = entry.file_name {
-                if !file_name.is_empty() {
-                    if let Some(ref dir) = self.attachments_dir {
-                        resources.push(TaskResource {
-                            name: file_name.clone(),
-                            path: dir.join(file_name).to_string_lossy().to_string(),
-                            resource_type: crate::suite::ResourceType::File,
-                        });
-                    }
-                }
-            }
-
-            let mut tags = Vec::new();
-            if let Some(level) = entry.level {
-                tags.push(format!("level-{level}"));
-            }
-
-            let metadata = serde_json::json!({
-                "expected": entry.final_answer,
-                "level": entry.level,
-            });
-
-            tasks.push(BenchTask {
-                id: entry.task_id,
-                prompt: entry.question,
-                context: None,
-                resources,
-                tags,
-                expected_turns: None,
-                timeout: None,
-                metadata,
-            });
-        }
-
-        Ok(tasks)
-    }
-
-    async fn score(
-        &self,
-        task: &BenchTask,
-        submission: &TaskSubmission,
-    ) -> Result<BenchScore, BenchError> {
-        let expected = task
-            .metadata
-            .get("expected")
-            .and_then(|v| v.as_str())
-            .ok_or_else(|| BenchError::Scoring {
-                task_id: task.id.clone(),
-                reason: "missing expected answer in metadata".to_string(),
-            })?;
-
-        Ok(scoring::exact_match(expected, &submission.response))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::io::Write;
-
-    #[tokio::test]
-    async fn test_gaia_load_tasks() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("gaia.jsonl");
-        let mut file = std::fs::File::create(&path).unwrap();
-        writeln!(
-            file,
-            r#"{{"task_id": "g1", "question": "What is the capital of France?", "final_answer": "Paris", "Level": 1}}"#
-        )
-        .unwrap();
-
-        let suite = GaiaSuite::new(&path, None::<PathBuf>);
-        let tasks = suite.load_tasks().await.unwrap();
-        assert_eq!(tasks.len(), 1);
-        assert_eq!(tasks[0].id, "g1");
-        assert!(tasks[0].tags.contains(&"level-1".to_string()));
-    }
-
-    #[tokio::test]
-    async fn test_gaia_scoring() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("gaia.jsonl");
-        let mut file = std::fs::File::create(&path).unwrap();
-        writeln!(
-            file,
-            r#"{{"task_id": "g1", "question": "Capital of France?", "final_answer": "Paris"}}"#
-        )
-        .unwrap();
-
-        let suite = GaiaSuite::new(&path, None::<PathBuf>);
-        let tasks = suite.load_tasks().await.unwrap();
-
-        // Exact match (case insensitive)
-        let submission = TaskSubmission {
-            response: "paris".to_string(),
-            conversation: vec![],
-            tool_calls: vec![],
-            error: None,
-        };
-        let score = suite.score(&tasks[0], &submission).await.unwrap();
-        assert_eq!(score.value, 1.0);
-
-        // Wrong answer
-        let submission = TaskSubmission {
-            response: "London".to_string(),
-            conversation: vec![],
-            tool_calls: vec![],
-            error: None,
-        };
-        let score = suite.score(&tasks[0], &submission).await.unwrap();
-        assert_eq!(score.value, 0.0);
-    }
-}

benchmarks/src/adapters/mod.rs

@@ -1,124 +0,0 @@
-pub mod custom;
-pub mod gaia;
-pub mod spot;
-pub mod swe_bench;
-pub mod tau_bench;
-
-use crate::config::BenchConfig;
-use crate::error::BenchError;
-use crate::suite::BenchSuite;
-
-/// List of all known suite IDs.
-pub const KNOWN_SUITES: &[(&str, &str)] = &[
-    ("custom", "Custom JSONL tasks"),
-    ("gaia", "GAIA benchmark (knowledge & reasoning)"),
-    ("spot", "Spot checks (end-to-end user workflows)"),
-    ("tau_bench", "Tau-bench (multi-turn tool use)"),
-    ("swe_bench", "SWE-bench Pro (software engineering)"),
-];
-
-/// Create a suite adapter by name.
-pub fn create_suite(name: &str, config: &BenchConfig) -> Result<Box<dyn BenchSuite>, BenchError> {
-    let suite_map = config.suite_config_map();
-    match name {
-        "custom" => {
-            let dataset_path = suite_map
-                .get("dataset_path")
-                .and_then(|v| v.as_str())
-                .map(|s| s.to_string())
-                .ok_or_else(|| {
-                    BenchError::Config(
-                        "suite_config.dataset_path is required for 'custom' suite".to_string(),
-                    )
-                })?;
-            Ok(Box::new(custom::CustomSuite::new(dataset_path)))
-        }
-        "gaia" => {
-            let dataset_path = suite_map
-                .get("dataset_path")
-                .and_then(|v| v.as_str())
-                .map(|s| s.to_string())
-                .ok_or_else(|| {
-                    BenchError::Config(
-                        "suite_config.dataset_path is required for 'gaia' suite".to_string(),
-                    )
-                })?;
-            let attachments_dir = suite_map
-                .get("attachments_dir")
-                .and_then(|v| v.as_str())
-                .map(|s| s.to_string());
-            Ok(Box::new(gaia::GaiaSuite::new(
-                dataset_path,
-                attachments_dir,
-            )))
-        }
-        "spot" => {
-            let dataset_path = suite_map
-                .get("dataset_path")
-                .and_then(|v| v.as_str())
-                .map(|s| s.to_string())
-                .ok_or_else(|| {
-                    BenchError::Config(
-                        "suite_config.dataset_path is required for 'spot' suite".to_string(),
-                    )
-                })?;
-            Ok(Box::new(spot::SpotSuite::new(dataset_path)))
-        }
-        "tau_bench" => {
-            let dataset_path = suite_map
-                .get("dataset_path")
-                .and_then(|v| v.as_str())
-                .map(|s| s.to_string())
-                .ok_or_else(|| {
-                    BenchError::Config(
-                        "suite_config.dataset_path is required for 'tau_bench' suite".to_string(),
-                    )
-                })?;
-            let domain = suite_map
-                .get("domain")
-                .and_then(|v| v.as_str())
-                .unwrap_or("retail")
-                .to_string();
-            Ok(Box::new(tau_bench::TauBenchSuite::new(
-                dataset_path,
-                domain,
-            )))
-        }
-        "swe_bench" => {
-            let dataset_path = suite_map
-                .get("dataset_path")
-                .and_then(|v| v.as_str())
-                .map(|s| s.to_string())
-                .ok_or_else(|| {
-                    BenchError::Config(
-                        "suite_config.dataset_path is required for 'swe_bench' suite".to_string(),
-                    )
-                })?;
-            let workspace_dir = suite_map
-                .get("workspace_dir")
-                .and_then(|v| v.as_str())
-                .unwrap_or("/tmp/swe-bench")
-                .to_string();
-            let use_docker = suite_map
-                .get("use_docker")
-                .and_then(|v| v.as_bool())
-                .unwrap_or(false);
-            Ok(Box::new(swe_bench::SweBenchSuite::new(
-                dataset_path,
-                workspace_dir,
-                use_docker,
-            )))
-        }
-        _ => {
-            let available = KNOWN_SUITES
-                .iter()
-                .map(|(id, _)| *id)
-                .collect::<Vec<_>>()
-                .join(", ");
-            Err(BenchError::SuiteNotFound {
-                name: name.to_string(),
-                available,
-            })
-        }
-    }
-}

benchmarks/src/adapters/spot.rs

@@ -1,504 +0,0 @@
-use std::collections::HashSet;
-use std::io::BufRead;
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use async_trait::async_trait;
-use regex::Regex;
-use serde::{Deserialize, Serialize};
-
-use crate::error::BenchError;
-use crate::suite::{BenchScore, BenchSuite, BenchTask, TaskSubmission};
-
-/// Multi-criterion assertions for a spot check scenario.
-///
-/// Each field generates one or more individual checks. The final score is
-/// `passed_checks / total_checks`, giving a value between 0.0 and 1.0.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-pub struct SpotAssertions {
-    /// All must appear in the response (case-insensitive).
-    #[serde(default)]
-    pub response_contains: Vec<String>,
-
-    /// None may appear in the response (case-insensitive).
-    #[serde(default)]
-    pub response_not_contains: Vec<String>,
-
-    /// Each tool name must appear in the tool_calls list (checked by name,
-    /// not by count; duplicates in tool_calls are collapsed).
-    #[serde(default)]
-    pub tools_used: Vec<String>,
-
-    /// None of these tool names may appear in the tool_calls list.
-    #[serde(default)]
-    pub tools_not_used: Vec<String>,
-
-    /// Regex pattern the response must match.
-    #[serde(default)]
-    pub response_matches: Option<String>,
-
-    /// Hard fail if the task produced an error.
-    #[serde(default)]
-    pub no_error: bool,
-
-    /// Minimum number of tool calls expected (counts duplicates).
-    #[serde(default)]
-    pub min_tool_calls: Option<usize>,
-
-    /// Maximum number of tool calls allowed (counts duplicates).
-    #[serde(default)]
-    pub max_tool_calls: Option<usize>,
-}
-
-impl SpotAssertions {
-    /// Evaluate all assertions against a submission, returning (score, failure_details).
-    pub fn evaluate(&self, submission: &TaskSubmission) -> (f64, Vec<String>) {
-        let mut passed: usize = 0;
-        let mut total: usize = 0;
-        let mut failures: Vec<String> = Vec::new();
-
-        // Hard fail: error check
-        if self.no_error {
-            total += 1;
-            if let Some(ref err) = submission.error {
-                failures.push(format!("no_error: task errored with: {err}"));
-                // Hard fail: return 0.0 immediately
-                return (0.0, failures);
-            }
-            passed += 1;
-        }
-
-        let response_lower = submission.response.to_lowercase();
-
-        // response_contains: all must appear
-        for needle in &self.response_contains {
-            total += 1;
-            if response_lower.contains(&needle.to_lowercase()) {
-                passed += 1;
-            } else {
-                failures.push(format!("response_contains: missing \"{needle}\""));
-            }
-        }
-
-        // response_not_contains: none may appear
-        for needle in &self.response_not_contains {
-            total += 1;
-            if response_lower.contains(&needle.to_lowercase()) {
-                failures.push(format!("response_not_contains: found \"{needle}\""));
-            } else {
-                passed += 1;
-            }
-        }
-
-        let tool_set: HashSet<&str> = submission.tool_calls.iter().map(|s| s.as_str()).collect();
-
-        // tools_used: each must appear
-        for tool in &self.tools_used {
-            total += 1;
-            if tool_set.contains(tool.as_str()) {
-                passed += 1;
-            } else {
-                failures.push(format!("tools_used: \"{tool}\" not called"));
-            }
-        }
-
-        // tools_not_used: none may appear
-        for tool in &self.tools_not_used {
-            total += 1;
-            if tool_set.contains(tool.as_str()) {
-                failures.push(format!("tools_not_used: \"{tool}\" was called"));
-            } else {
-                passed += 1;
-            }
-        }
-
-        // response_matches: regex pattern
-        if let Some(ref pattern) = self.response_matches {
-            total += 1;
-            match Regex::new(pattern) {
-                Ok(re) => {
-                    if re.is_match(&submission.response) {
-                        passed += 1;
-                    } else {
-                        failures.push(format!("response_matches: /{pattern}/ did not match"));
-                    }
-                }
-                Err(e) => {
-                    failures.push(format!("response_matches: bad regex: {e}"));
-                }
-            }
-        }
-
-        let call_count = submission.tool_calls.len();
-
-        // min_tool_calls
-        if let Some(min) = self.min_tool_calls {
-            total += 1;
-            if call_count >= min {
-                passed += 1;
-            } else {
-                failures.push(format!(
-                    "min_tool_calls: expected >= {min}, got {call_count}"
-                ));
-            }
-        }
-
-        // max_tool_calls
-        if let Some(max) = self.max_tool_calls {
-            total += 1;
-            if call_count <= max {
-                passed += 1;
-            } else {
-                failures.push(format!(
-                    "max_tool_calls: expected <= {max}, got {call_count}"
-                ));
-            }
-        }
-
-        if total == 0 {
-            return (1.0, failures);
-        }
-
-        let score = passed as f64 / total as f64;
-        (score, failures)
-    }
-}
-
-/// JSONL entry for a spot check scenario.
-#[derive(Debug, Deserialize)]
-struct SpotEntry {
-    id: String,
-    prompt: String,
-    #[serde(default)]
-    context: Option<String>,
-    #[serde(default)]
-    tags: Vec<String>,
-    #[serde(default)]
-    assertions: SpotAssertions,
-}
-
-/// Spot benchmark suite: end-to-end checks for real user workflows.
-///
-/// Tests conversation, individual tool use, multi-tool chaining, and robustness.
-/// Each task declares multi-criterion assertions scored as passed/total.
-pub struct SpotSuite {
-    dataset_path: PathBuf,
-}
-
-impl SpotSuite {
-    pub fn new(dataset_path: impl Into<PathBuf>) -> Self {
-        Self {
-            dataset_path: dataset_path.into(),
-        }
-    }
-}
-
-#[async_trait]
-impl BenchSuite for SpotSuite {
-    fn name(&self) -> &str {
-        "Spot Checks"
-    }
-
-    fn id(&self) -> &str {
-        "spot"
-    }
-
-    async fn load_tasks(&self) -> Result<Vec<BenchTask>, BenchError> {
-        let file = std::fs::File::open(&self.dataset_path).map_err(BenchError::Io)?;
-        let reader = std::io::BufReader::new(file);
-        let mut tasks = Vec::new();
-
-        for (line_num, line) in reader.lines().enumerate() {
-            let line = line?;
-            let trimmed = line.trim();
-            if trimmed.is_empty() {
-                continue;
-            }
-            let entry: SpotEntry = serde_json::from_str(trimmed)
-                .map_err(|e| BenchError::Config(format!("spot line {}: {}", line_num + 1, e)))?;
-
-            let metadata = serde_json::json!({
-                "assertions": serde_json::to_value(&entry.assertions)
-                    .map_err(|e| BenchError::Config(format!("spot {}: {}", entry.id, e)))?,
-            });
-
-            tasks.push(BenchTask {
-                id: entry.id,
-                prompt: entry.prompt,
-                context: entry.context,
-                resources: vec![],
-                tags: entry.tags,
-                expected_turns: None,
-                timeout: None,
-                metadata,
-            });
-        }
-
-        Ok(tasks)
-    }
-
-    async fn score(
-        &self,
-        task: &BenchTask,
-        submission: &TaskSubmission,
-    ) -> Result<BenchScore, BenchError> {
-        let assertions: SpotAssertions = task
-            .metadata
-            .get("assertions")
-            .ok_or_else(|| BenchError::Scoring {
-                task_id: task.id.clone(),
-                reason: "missing assertions in metadata".to_string(),
-            })
-            .and_then(|v| {
-                serde_json::from_value(v.clone()).map_err(|e| BenchError::Scoring {
-                    task_id: task.id.clone(),
-                    reason: format!("bad assertions: {e}"),
-                })
-            })?;
-
-        let (score, failures) = assertions.evaluate(submission);
-
-        if score >= 1.0 {
-            Ok(BenchScore::pass())
-        } else if score <= 0.0 {
-            Ok(BenchScore::fail(failures.join("; ")))
-        } else {
-            Ok(BenchScore::partial(score, failures.join("; ")))
-        }
-    }
-
-    fn additional_tools(&self) -> Vec<Arc<dyn ironclaw::tools::Tool>> {
-        vec![
-            Arc::new(ironclaw::tools::builtin::ShellTool::new()),
-            Arc::new(ironclaw::tools::builtin::ReadFileTool::new()),
-            Arc::new(ironclaw::tools::builtin::WriteFileTool::new()),
-            Arc::new(ironclaw::tools::builtin::ListDirTool::new()),
-            Arc::new(ironclaw::tools::builtin::ApplyPatchTool::new()),
-        ]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::io::Write;
-
-    fn make_submission(
-        response: &str,
-        tool_calls: Vec<&str>,
-        error: Option<&str>,
-    ) -> TaskSubmission {
-        TaskSubmission {
-            response: response.to_string(),
-            conversation: vec![],
-            tool_calls: tool_calls.into_iter().map(|s| s.to_string()).collect(),
-            error: error.map(|s| s.to_string()),
-        }
-    }
-
-    #[test]
-    fn test_all_pass() {
-        let assertions = SpotAssertions {
-            response_contains: vec!["hello".to_string()],
-            tools_used: vec!["echo".to_string()],
-            no_error: true,
-            ..Default::default()
-        };
-        let sub = make_submission("Hello, world!", vec!["echo"], None);
-        let (score, failures) = assertions.evaluate(&sub);
-        assert_eq!(score, 1.0);
-        assert!(failures.is_empty());
-    }
-
-    #[test]
-    fn test_hard_fail_on_error() {
-        let assertions = SpotAssertions {
-            no_error: true,
-            response_contains: vec!["hello".to_string()],
-            ..Default::default()
-        };
-        let sub = make_submission("Hello!", vec![], Some("timeout after 60s"));
-        let (score, failures) = assertions.evaluate(&sub);
-        assert_eq!(score, 0.0);
-        assert!(failures[0].contains("no_error"));
-    }
-
-    #[test]
-    fn test_partial_score() {
-        let assertions = SpotAssertions {
-            response_contains: vec!["alpha".to_string(), "beta".to_string()],
-            ..Default::default()
-        };
-        let sub = make_submission("alpha is here but not the other", vec![], None);
-        let (score, failures) = assertions.evaluate(&sub);
-        assert_eq!(score, 0.5);
-        assert_eq!(failures.len(), 1);
-        assert!(failures[0].contains("beta"));
-    }
-
-    #[test]
-    fn test_response_not_contains() {
-        let assertions = SpotAssertions {
-            response_not_contains: vec!["error".to_string(), "fail".to_string()],
-            ..Default::default()
-        };
-        let sub = make_submission("This is an error message", vec![], None);
-        let (score, failures) = assertions.evaluate(&sub);
-        assert_eq!(score, 0.5);
-        assert_eq!(failures.len(), 1);
-        assert!(failures[0].contains("error"));
-    }
-
-    #[test]
-    fn test_tools_used_and_not_used() {
-        let assertions = SpotAssertions {
-            tools_used: vec!["time".to_string()],
-            tools_not_used: vec!["shell".to_string(), "echo".to_string()],
-            ..Default::default()
-        };
-        let sub = make_submission("The time is now", vec!["time"], None);
-        let (score, failures) = assertions.evaluate(&sub);
-        assert_eq!(score, 1.0);
-        assert!(failures.is_empty());
-    }
-
-    #[test]
-    fn test_tools_not_used_fails() {
-        let assertions = SpotAssertions {
-            tools_not_used: vec!["shell".to_string()],
-            ..Default::default()
-        };
-        let sub = make_submission("result", vec!["shell", "time"], None);
-        let (score, _) = assertions.evaluate(&sub);
-        assert_eq!(score, 0.0);
-    }
-
-    #[test]
-    fn test_response_matches_regex() {
-        let assertions = SpotAssertions {
-            response_matches: Some(r"\d{4}".to_string()),
-            ..Default::default()
-        };
-        let sub = make_submission("The year is 2026", vec![], None);
-        let (score, failures) = assertions.evaluate(&sub);
-        assert_eq!(score, 1.0);
-        assert!(failures.is_empty());
-    }
-
-    #[test]
-    fn test_response_matches_regex_fail() {
-        let assertions = SpotAssertions {
-            response_matches: Some(r"^\d+$".to_string()),
-            ..Default::default()
-        };
-        let sub = make_submission("not a number", vec![], None);
-        let (score, _) = assertions.evaluate(&sub);
-        assert_eq!(score, 0.0);
-    }
-
-    #[test]
-    fn test_min_max_tool_calls() {
-        let assertions = SpotAssertions {
-            min_tool_calls: Some(2),
-            max_tool_calls: Some(4),
-            ..Default::default()
-        };
-
-        // Within range
-        let sub = make_submission("ok", vec!["a", "b", "c"], None);
-        let (score, _) = assertions.evaluate(&sub);
-        assert_eq!(score, 1.0);
-
-        // Too few
-        let sub = make_submission("ok", vec!["a"], None);
-        let (score, failures) = assertions.evaluate(&sub);
-        assert_eq!(score, 0.5);
-        assert!(failures[0].contains("min_tool_calls"));
-
-        // Too many
-        let sub = make_submission("ok", vec!["a", "b", "c", "d", "e"], None);
-        let (score, failures) = assertions.evaluate(&sub);
-        assert_eq!(score, 0.5);
-        assert!(failures[0].contains("max_tool_calls"));
-    }
-
-    #[test]
-    fn test_max_zero_tool_calls() {
-        let assertions = SpotAssertions {
-            max_tool_calls: Some(0),
-            ..Default::default()
-        };
-        let sub = make_submission("just talking", vec![], None);
-        let (score, _) = assertions.evaluate(&sub);
-        assert_eq!(score, 1.0);
-
-        let sub = make_submission("oops", vec!["echo"], None);
-        let (score, _) = assertions.evaluate(&sub);
-        assert_eq!(score, 0.0);
-    }
-
-    #[test]
-    fn test_empty_assertions() {
-        let assertions = SpotAssertions::default();
-        let sub = make_submission("anything", vec!["whatever"], None);
-        let (score, _) = assertions.evaluate(&sub);
-        assert_eq!(score, 1.0);
-    }
-
-    #[tokio::test]
-    async fn test_spot_load_tasks() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("spot.jsonl");
-        let mut file = std::fs::File::create(&path).unwrap();
-        writeln!(
-            file,
-            r#"{{"id": "s1", "prompt": "Hello", "tags": ["smoke"], "assertions": {{"response_contains": ["hello"], "no_error": true}}}}"#
-        )
-        .unwrap();
-        writeln!(
-            file,
-            r#"{{"id": "s2", "prompt": "Echo test", "assertions": {{"tools_used": ["echo"]}}}}"#
-        )
-        .unwrap();
-
-        let suite = SpotSuite::new(&path);
-        let tasks = suite.load_tasks().await.unwrap();
-        assert_eq!(tasks.len(), 2);
-        assert_eq!(tasks[0].id, "s1");
-        assert_eq!(tasks[1].id, "s2");
-        assert!(tasks[0].tags.contains(&"smoke".to_string()));
-    }
-
-    #[tokio::test]
-    async fn test_spot_scoring() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("spot.jsonl");
-        let mut file = std::fs::File::create(&path).unwrap();
-        writeln!(
-            file,
-            r#"{{"id": "s1", "prompt": "Hello", "assertions": {{"response_contains": ["hello", "world"], "no_error": true}}}}"#
-        )
-        .unwrap();
-
-        let suite = SpotSuite::new(&path);
-        let tasks = suite.load_tasks().await.unwrap();
-
-        // Full pass
-        let sub = make_submission("Hello World!", vec![], None);
-        let score = suite.score(&tasks[0], &sub).await.unwrap();
-        assert_eq!(score.value, 1.0);
-        assert_eq!(score.label, "pass");
-
-        // Partial
-        let sub = make_submission("Hello there", vec![], None);
-        let score = suite.score(&tasks[0], &sub).await.unwrap();
-        assert!(score.value > 0.0 && score.value < 1.0);
-        assert_eq!(score.label, "partial");
-
-        // Error hard fail
-        let sub = make_submission("Hello World!", vec![], Some("boom"));
-        let score = suite.score(&tasks[0], &sub).await.unwrap();
-        assert_eq!(score.value, 0.0);
-        assert_eq!(score.label, "fail");
-    }
-}

benchmarks/src/adapters/swe_bench.rs

@@ -1,416 +0,0 @@
-use std::io::BufRead;
-use std::path::PathBuf;
-
-use async_trait::async_trait;
-use regex::Regex;
-use serde::Deserialize;
-
-use crate::error::BenchError;
-use crate::suite::{BenchScore, BenchSuite, BenchTask, TaskSubmission};
-
-/// Validate that a string is safe for use as a filesystem path component.
-/// Allows alphanumerics, hyphens, underscores, dots, and forward slashes (for nested paths).
-/// Rejects absolute paths, `..` traversal, and shell metacharacters.
-fn is_safe_path_component(s: &str) -> bool {
-    !s.is_empty()
-        && !s.starts_with('/')
-        && !s.contains("..")
-        && s.chars()
-            .all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_' | '.' | '/'))
-}
-
-/// Validate that a repo string matches the expected `owner/repo` GitHub format.
-fn is_valid_github_repo(repo: &str) -> bool {
-    // Match "owner/repo" where both parts are alphanumeric with hyphens/underscores/dots
-    static REPO_PATTERN: std::sync::LazyLock<Regex> =
-        std::sync::LazyLock::new(|| Regex::new(r"^[a-zA-Z0-9._-]+/[a-zA-Z0-9._-]+$").unwrap());
-    REPO_PATTERN.is_match(repo)
-}
-
-/// Validate that a string looks like a git ref (hex SHA or valid ref name).
-fn is_valid_git_ref(s: &str) -> bool {
-    !s.is_empty()
-        && s.chars()
-            .all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_' | '.' | '/'))
-        && !s.contains("..")
-}
-
-/// SWE-bench dataset entry.
-#[derive(Debug, Deserialize)]
-struct SweBenchEntry {
-    instance_id: String,
-    repo: String,
-    base_commit: String,
-    #[serde(default)]
-    problem_statement: String,
-    #[serde(default)]
-    hints_text: Option<String>,
-    #[serde(default)]
-    test_patch: Option<String>,
-    #[serde(default)]
-    patch: Option<String>,
-}
-
-/// SWE-bench Pro: real-world software engineering tasks.
-///
-/// Each task clones a repo at a specific commit, presents the problem statement,
-/// and expects the agent to produce a patch. Scoring runs the test suite.
-pub struct SweBenchSuite {
-    dataset_path: PathBuf,
-    workspace_dir: PathBuf,
-    use_docker: bool,
-}
-
-impl SweBenchSuite {
-    pub fn new(
-        dataset_path: impl Into<PathBuf>,
-        workspace_dir: impl Into<PathBuf>,
-        use_docker: bool,
-    ) -> Self {
-        Self {
-            dataset_path: dataset_path.into(),
-            workspace_dir: workspace_dir.into(),
-            use_docker,
-        }
-    }
-}
-
-#[async_trait]
-impl BenchSuite for SweBenchSuite {
-    fn name(&self) -> &str {
-        "SWE-bench Pro"
-    }
-
-    fn id(&self) -> &str {
-        "swe_bench"
-    }
-
-    async fn load_tasks(&self) -> Result<Vec<BenchTask>, BenchError> {
-        let file = std::fs::File::open(&self.dataset_path)?;
-        let reader = std::io::BufReader::new(file);
-        let mut tasks = Vec::new();
-
-        for (line_num, line) in reader.lines().enumerate() {
-            let line = line?;
-            let trimmed = line.trim();
-            if trimmed.is_empty() {
-                continue;
-            }
-            let entry: SweBenchEntry = serde_json::from_str(trimmed).map_err(|e| {
-                BenchError::Config(format!("swe_bench line {}: {}", line_num + 1, e))
-            })?;
-
-            if !is_safe_path_component(&entry.instance_id) {
-                return Err(BenchError::Config(format!(
-                    "swe_bench line {}: unsafe instance_id \"{}\"",
-                    line_num + 1,
-                    entry.instance_id,
-                )));
-            }
-            if !is_valid_github_repo(&entry.repo) {
-                return Err(BenchError::Config(format!(
-                    "swe_bench line {}: invalid repo format \"{}\"",
-                    line_num + 1,
-                    entry.repo,
-                )));
-            }
-            if !is_valid_git_ref(&entry.base_commit) {
-                return Err(BenchError::Config(format!(
-                    "swe_bench line {}: invalid base_commit \"{}\"",
-                    line_num + 1,
-                    entry.base_commit,
-                )));
-            }
-
-            let metadata = serde_json::json!({
-                "repo": entry.repo,
-                "base_commit": entry.base_commit,
-                "test_patch": entry.test_patch,
-                "gold_patch": entry.patch,
-                "use_docker": self.use_docker,
-                "workspace_dir": self.workspace_dir.to_string_lossy(),
-            });
-
-            let prompt = if let Some(ref hints) = entry.hints_text {
-                format!("{}\n\nHints:\n{}", entry.problem_statement, hints)
-            } else {
-                entry.problem_statement
-            };
-
-            tasks.push(BenchTask {
-                id: entry.instance_id,
-                prompt,
-                context: Some(format!(
-                    "Repository: {}, Commit: {}",
-                    entry.repo, entry.base_commit
-                )),
-                resources: vec![],
-                tags: vec![format!("repo-{}", entry.repo.replace('/', "-"))],
-                expected_turns: None,
-                timeout: None,
-                metadata,
-            });
-        }
-
-        Ok(tasks)
-    }
-
-    async fn setup_task(&self, task: &BenchTask) -> Result<(), BenchError> {
-        let repo = task
-            .metadata
-            .get("repo")
-            .and_then(|v| v.as_str())
-            .ok_or_else(|| BenchError::TaskFailed {
-                task_id: task.id.clone(),
-                reason: "missing repo in metadata".to_string(),
-            })?;
-        let base_commit = task
-            .metadata
-            .get("base_commit")
-            .and_then(|v| v.as_str())
-            .ok_or_else(|| BenchError::TaskFailed {
-                task_id: task.id.clone(),
-                reason: "missing base_commit in metadata".to_string(),
-            })?;
-
-        let task_dir = self.workspace_dir.join(&task.id);
-
-        // Clone repo if not already present
-        if !task_dir.exists() {
-            let repo_url = format!("https://github.com/{}.git", repo);
-            let output = tokio::process::Command::new("git")
-                .args([
-                    "clone",
-                    "--depth",
-                    "1",
-                    &repo_url,
-                    &task_dir.to_string_lossy(),
-                ])
-                .output()
-                .await
-                .map_err(|e| BenchError::TaskFailed {
-                    task_id: task.id.clone(),
-                    reason: format!("git clone failed: {e}"),
-                })?;
-
-            if !output.status.success() {
-                let stderr = String::from_utf8_lossy(&output.stderr);
-                return Err(BenchError::TaskFailed {
-                    task_id: task.id.clone(),
-                    reason: format!("git clone failed: {stderr}"),
-                });
-            }
-        }
-
-        // Checkout the base commit
-        let output = tokio::process::Command::new("git")
-            .args(["checkout", base_commit])
-            .current_dir(&task_dir)
-            .output()
-            .await
-            .map_err(|e| BenchError::TaskFailed {
-                task_id: task.id.clone(),
-                reason: format!("git checkout failed: {e}"),
-            })?;
-
-        if !output.status.success() {
-            // Shallow clone might not have the commit; fetch more history
-            let _ = tokio::process::Command::new("git")
-                .args(["fetch", "--unshallow"])
-                .current_dir(&task_dir)
-                .output()
-                .await;
-
-            let output = tokio::process::Command::new("git")
-                .args(["checkout", base_commit])
-                .current_dir(&task_dir)
-                .output()
-                .await
-                .map_err(|e| BenchError::TaskFailed {
-                    task_id: task.id.clone(),
-                    reason: format!("git checkout retry failed: {e}"),
-                })?;
-
-            if !output.status.success() {
-                let stderr = String::from_utf8_lossy(&output.stderr);
-                return Err(BenchError::TaskFailed {
-                    task_id: task.id.clone(),
-                    reason: format!("git checkout failed: {stderr}"),
-                });
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn teardown_task(&self, task: &BenchTask) -> Result<(), BenchError> {
-        let task_dir = self.workspace_dir.join(&task.id);
-        if task_dir.exists() {
-            // Reset any changes
-            let _ = tokio::process::Command::new("git")
-                .args(["checkout", "."])
-                .current_dir(&task_dir)
-                .output()
-                .await;
-            let _ = tokio::process::Command::new("git")
-                .args(["clean", "-fdx"])
-                .current_dir(&task_dir)
-                .output()
-                .await;
-        }
-        Ok(())
-    }
-
-    async fn score(
-        &self,
-        task: &BenchTask,
-        submission: &TaskSubmission,
-    ) -> Result<BenchScore, BenchError> {
-        // For SWE-bench, scoring requires running the test patch against the agent's changes.
-        // This is a simplified version that checks if the agent produced any code changes.
-
-        let test_patch = task.metadata.get("test_patch").and_then(|v| v.as_str());
-
-        if submission.response.is_empty() {
-            return Ok(BenchScore::fail("no response from agent"));
-        }
-
-        // If we have a test patch, try to verify the submission
-        if let Some(_test_patch) = test_patch {
-            // TODO: Apply agent's patch, then apply test patch, then run tests.
-            // For now, give partial credit if the agent produced some output.
-            tracing::warn!(
-                task_id = %task.id,
-                "SWE-bench test execution not implemented, returning placeholder 0.25"
-            );
-            Ok(BenchScore::partial(
-                0.25,
-                "test execution not yet implemented; partial credit for response",
-            ))
-        } else {
-            tracing::warn!(
-                task_id = %task.id,
-                "no test_patch available, returning placeholder 0.25"
-            );
-            Ok(BenchScore::partial(
-                0.25,
-                "no test_patch available for automated scoring",
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::io::Write;
-
-    #[tokio::test]
-    async fn test_swe_bench_load() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("swe.jsonl");
-        let mut file = std::fs::File::create(&path).unwrap();
-        writeln!(
-            file,
-            r#"{{"instance_id": "django__django-12345", "repo": "django/django", "base_commit": "abc123", "problem_statement": "Fix the ORM bug"}}"#
-        )
-        .unwrap();
-
-        let suite = SweBenchSuite::new(&path, "/tmp/swe-test", false);
-        let tasks = suite.load_tasks().await.unwrap();
-        assert_eq!(tasks.len(), 1);
-        assert_eq!(tasks[0].id, "django__django-12345");
-        assert!(tasks[0].tags.contains(&"repo-django-django".to_string()));
-    }
-
-    #[tokio::test]
-    async fn test_swe_bench_scoring_no_response() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("swe.jsonl");
-        let mut file = std::fs::File::create(&path).unwrap();
-        writeln!(
-            file,
-            r#"{{"instance_id": "s1", "repo": "org/repo", "base_commit": "abc", "problem_statement": "Fix bug"}}"#
-        )
-        .unwrap();
-
-        let suite = SweBenchSuite::new(&path, "/tmp/swe-test", false);
-        let tasks = suite.load_tasks().await.unwrap();
-
-        let submission = TaskSubmission {
-            response: String::new(),
-            conversation: vec![],
-            tool_calls: vec![],
-            error: None,
-        };
-        let score = suite.score(&tasks[0], &submission).await.unwrap();
-        assert_eq!(score.value, 0.0);
-    }
-
-    #[test]
-    fn test_is_safe_path_component() {
-        assert!(is_safe_path_component("django__django-12345"));
-        assert!(is_safe_path_component("org/repo"));
-        assert!(is_safe_path_component("abc123"));
-        assert!(!is_safe_path_component(""));
-        assert!(!is_safe_path_component("../../etc/passwd"));
-        assert!(!is_safe_path_component("/etc/passwd"));
-        assert!(!is_safe_path_component("foo;rm -rf /"));
-        assert!(!is_safe_path_component("foo bar"));
-    }
-
-    #[test]
-    fn test_is_valid_github_repo() {
-        assert!(is_valid_github_repo("django/django"));
-        assert!(is_valid_github_repo("org/repo-name"));
-        assert!(is_valid_github_repo("Org.Name/Repo_v2"));
-        assert!(!is_valid_github_repo(""));
-        assert!(!is_valid_github_repo("no-slash"));
-        assert!(!is_valid_github_repo("too/many/slashes"));
-        assert!(!is_valid_github_repo("spa ce/repo"));
-    }
-
-    #[test]
-    fn test_is_valid_git_ref() {
-        assert!(is_valid_git_ref("abc123"));
-        assert!(is_valid_git_ref("deadbeef0123456789abcdef0123456789abcdef"));
-        assert!(is_valid_git_ref("v1.2.3"));
-        assert!(is_valid_git_ref("main"));
-        assert!(!is_valid_git_ref(""));
-        assert!(!is_valid_git_ref("bad..ref"));
-        assert!(!is_valid_git_ref("has space"));
-        assert!(!is_valid_git_ref("semi;colon"));
-    }
-
-    #[tokio::test]
-    async fn test_swe_bench_rejects_path_traversal() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("swe.jsonl");
-        let mut file = std::fs::File::create(&path).unwrap();
-        writeln!(
-            file,
-            r#"{{"instance_id": "../../etc/passwd", "repo": "org/repo", "base_commit": "abc", "problem_statement": "evil"}}"#
-        )
-        .unwrap();
-
-        let suite = SweBenchSuite::new(&path, "/tmp/swe-test", false);
-        let err = suite.load_tasks().await.unwrap_err();
-        assert!(err.to_string().contains("unsafe instance_id"));
-    }
-
-    #[tokio::test]
-    async fn test_swe_bench_rejects_bad_repo() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("swe.jsonl");
-        let mut file = std::fs::File::create(&path).unwrap();
-        writeln!(
-            file,
-            r#"{{"instance_id": "task1", "repo": "not-a-repo-format", "base_commit": "abc", "problem_statement": "bad"}}"#
-        )
-        .unwrap();
-
-        let suite = SweBenchSuite::new(&path, "/tmp/swe-test", false);
-        let err = suite.load_tasks().await.unwrap_err();
-        assert!(err.to_string().contains("invalid repo format"));
-    }
-}

benchmarks/src/adapters/tau_bench.rs

@@ -1,233 +0,0 @@
-use std::io::BufRead;
-use std::path::PathBuf;
-
-use async_trait::async_trait;
-use serde::Deserialize;
-
-use crate::error::BenchError;
-use crate::suite::{BenchScore, BenchSuite, BenchTask, ConversationTurn, TaskSubmission};
-
-/// Tau-bench task entry.
-#[derive(Debug, Deserialize)]
-struct TauBenchEntry {
-    id: String,
-    #[serde(default)]
-    domain: String,
-    instruction: String,
-    #[serde(default)]
-    user_persona: Option<String>,
-    #[serde(default)]
-    expected_state: Option<serde_json::Value>,
-    #[serde(default)]
-    expected_actions: Vec<String>,
-    #[serde(default)]
-    max_turns: Option<usize>,
-}
-
-/// Tau-bench: multi-turn tool-calling dialog benchmark.
-///
-/// Tests agent ability to handle customer service scenarios with simulated
-/// domain APIs (retail, airline). Scoring compares final state against expected.
-pub struct TauBenchSuite {
-    dataset_path: PathBuf,
-    domain: String,
-}
-
-impl TauBenchSuite {
-    pub fn new(dataset_path: impl Into<PathBuf>, domain: impl Into<String>) -> Self {
-        Self {
-            dataset_path: dataset_path.into(),
-            domain: domain.into(),
-        }
-    }
-}
-
-#[async_trait]
-impl BenchSuite for TauBenchSuite {
-    fn name(&self) -> &str {
-        "Tau-bench"
-    }
-
-    fn id(&self) -> &str {
-        "tau_bench"
-    }
-
-    async fn load_tasks(&self) -> Result<Vec<BenchTask>, BenchError> {
-        let file = std::fs::File::open(&self.dataset_path)?;
-        let reader = std::io::BufReader::new(file);
-        let mut tasks = Vec::new();
-
-        for (line_num, line) in reader.lines().enumerate() {
-            let line = line?;
-            let trimmed = line.trim();
-            if trimmed.is_empty() {
-                continue;
-            }
-            let entry: TauBenchEntry = serde_json::from_str(trimmed).map_err(|e| {
-                BenchError::Config(format!("tau_bench line {}: {}", line_num + 1, e))
-            })?;
-
-            let domain = if entry.domain.is_empty() {
-                self.domain.clone()
-            } else {
-                entry.domain.clone()
-            };
-
-            let metadata = serde_json::json!({
-                "domain": domain,
-                "user_persona": entry.user_persona,
-                "expected_state": entry.expected_state,
-                "expected_actions": entry.expected_actions,
-            });
-
-            tasks.push(BenchTask {
-                id: entry.id,
-                prompt: entry.instruction,
-                context: entry.user_persona.clone(),
-                resources: vec![],
-                tags: vec![format!("domain-{domain}")],
-                expected_turns: entry.max_turns,
-                timeout: None,
-                metadata,
-            });
-        }
-
-        Ok(tasks)
-    }
-
-    async fn score(
-        &self,
-        task: &BenchTask,
-        submission: &TaskSubmission,
-    ) -> Result<BenchScore, BenchError> {
-        // Score based on expected actions completion
-        let expected_actions: Vec<String> = task
-            .metadata
-            .get("expected_actions")
-            .and_then(|v| serde_json::from_value(v.clone()).ok())
-            .unwrap_or_default();
-
-        if expected_actions.is_empty() {
-            // No expected actions defined; score based on whether agent responded
-            if submission.response.is_empty() {
-                return Ok(BenchScore::fail("no response"));
-            }
-            return Ok(BenchScore::partial(
-                0.5,
-                "no expected_actions to evaluate against",
-            ));
-        }
-
-        // Check which expected actions were actually called
-        let called: std::collections::HashSet<&str> =
-            submission.tool_calls.iter().map(|s| s.as_str()).collect();
-        let matched = expected_actions
-            .iter()
-            .filter(|a| called.contains(a.as_str()))
-            .count();
-
-        let ratio = matched as f64 / expected_actions.len() as f64;
-        if ratio >= 1.0 {
-            Ok(BenchScore::pass())
-        } else if ratio > 0.0 {
-            Ok(BenchScore::partial(
-                ratio,
-                format!(
-                    "{}/{} expected actions completed",
-                    matched,
-                    expected_actions.len()
-                ),
-            ))
-        } else {
-            Ok(BenchScore::fail(format!(
-                "0/{} expected actions completed",
-                expected_actions.len()
-            )))
-        }
-    }
-
-    async fn next_user_message(
-        &self,
-        task: &BenchTask,
-        conversation: &[ConversationTurn],
-    ) -> Result<Option<String>, BenchError> {
-        // Check if we've exceeded max turns
-        if let Some(max) = task.expected_turns {
-            let user_turns = conversation
-                .iter()
-                .filter(|t| matches!(t.role, crate::suite::TurnRole::User))
-                .count();
-            if user_turns >= max {
-                return Ok(None);
-            }
-        }
-
-        // Multi-turn simulation requires an LLM to play the customer role.
-        // Until that's implemented, every scenario is single-turn only.
-        // TODO: Use LLM to simulate customer based on user_persona.
-        tracing::warn!(
-            task_id = %task.id,
-            "multi-turn simulation not implemented, ending after first turn"
-        );
-        Ok(None)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::io::Write;
-
-    #[tokio::test]
-    async fn test_tau_bench_load() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("tau.jsonl");
-        let mut file = std::fs::File::create(&path).unwrap();
-        writeln!(
-            file,
-            r#"{{"id": "t1", "instruction": "Return my order", "expected_actions": ["lookup_order", "process_return"], "max_turns": 3}}"#
-        )
-        .unwrap();
-
-        let suite = TauBenchSuite::new(&path, "retail");
-        let tasks = suite.load_tasks().await.unwrap();
-        assert_eq!(tasks.len(), 1);
-        assert_eq!(tasks[0].expected_turns, Some(3));
-    }
-
-    #[tokio::test]
-    async fn test_tau_bench_scoring() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("tau.jsonl");
-        let mut file = std::fs::File::create(&path).unwrap();
-        writeln!(
-            file,
-            r#"{{"id": "t1", "instruction": "Return order", "expected_actions": ["lookup_order", "process_return"]}}"#
-        )
-        .unwrap();
-
-        let suite = TauBenchSuite::new(&path, "retail");
-        let tasks = suite.load_tasks().await.unwrap();
-
-        // Partial completion
-        let submission = TaskSubmission {
-            response: "I found your order.".to_string(),
-            conversation: vec![],
-            tool_calls: vec!["lookup_order".to_string()],
-            error: None,
-        };
-        let score = suite.score(&tasks[0], &submission).await.unwrap();
-        assert_eq!(score.value, 0.5);
-        assert_eq!(score.label, "partial");
-
-        // Full completion
-        let submission = TaskSubmission {
-            response: "Return processed.".to_string(),
-            conversation: vec![],
-            tool_calls: vec!["lookup_order".to_string(), "process_return".to_string()],
-            error: None,
-        };
-        let score = suite.score(&tasks[0], &submission).await.unwrap();
-        assert_eq!(score.value, 1.0);
-    }
-}

benchmarks/src/channel.rs

@@ -1,259 +0,0 @@
-use std::sync::Arc;
-
-use async_trait::async_trait;
-use tokio::sync::{Mutex, mpsc};
-use tokio_stream::wrappers::ReceiverStream;
-
-use ironclaw::channels::{Channel, IncomingMessage, MessageStream, OutgoingResponse, StatusUpdate};
-use ironclaw::error::ChannelError;
-
-use crate::results::TraceToolCall;
-use crate::suite::ConversationTurn;
-
-/// Truncate a string to at most `max_bytes` without splitting a UTF-8 character.
-fn truncate_str(s: &str, max_bytes: usize) -> &str {
-    if s.len() <= max_bytes {
-        return s;
-    }
-    let mut end = max_bytes;
-    while !s.is_char_boundary(end) {
-        end -= 1;
-    }
-    &s[..end]
-}
-
-/// Captured state from a benchmark channel run.
-#[derive(Debug, Default)]
-pub struct ChannelCapture {
-    /// All responses the agent sent back.
-    pub responses: Vec<String>,
-    /// Tool calls observed (name, success, duration_ms).
-    pub tool_calls: Vec<TraceToolCall>,
-    /// Full conversation turns for multi-turn scoring.
-    pub conversation: Vec<ConversationTurn>,
-    /// Status messages (for debugging).
-    pub status_log: Vec<String>,
-}
-
-/// A headless Channel implementation for benchmarking.
-///
-/// Modeled after `ReplChannel`: uses mpsc to inject messages and captures
-/// all responses and tool status events. Auto-approves tool execution
-/// so benchmarks run without user interaction.
-pub struct BenchChannel {
-    /// Sender to inject messages into the agent loop.
-    msg_tx: mpsc::Sender<IncomingMessage>,
-    /// Receiver the agent loop reads from (taken once by `start()`).
-    msg_rx: Mutex<Option<mpsc::Receiver<IncomingMessage>>>,
-    /// Accumulated capture data.
-    capture: Arc<Mutex<ChannelCapture>>,
-}
-
-impl BenchChannel {
-    pub fn new() -> (Self, mpsc::Sender<IncomingMessage>) {
-        let (tx, rx) = mpsc::channel(64);
-        let channel = Self {
-            msg_tx: tx.clone(),
-            msg_rx: Mutex::new(Some(rx)),
-            capture: Arc::new(Mutex::new(ChannelCapture::default())),
-        };
-        (channel, tx)
-    }
-
-    /// Get a handle to the capture data.
-    pub fn capture(&self) -> Arc<Mutex<ChannelCapture>> {
-        Arc::clone(&self.capture)
-    }
-}
-
-#[async_trait]
-impl Channel for BenchChannel {
-    fn name(&self) -> &str {
-        "bench"
-    }
-
-    async fn start(&self) -> Result<MessageStream, ChannelError> {
-        let rx = self
-            .msg_rx
-            .lock()
-            .await
-            .take()
-            .ok_or_else(|| ChannelError::StartupFailed {
-                name: "bench".to_string(),
-                reason: "start() already called".to_string(),
-            })?;
-        Ok(Box::pin(ReceiverStream::new(rx)))
-    }
-
-    async fn respond(
-        &self,
-        _msg: &IncomingMessage,
-        response: OutgoingResponse,
-    ) -> Result<(), ChannelError> {
-        let mut cap = self.capture.lock().await;
-        cap.responses.push(response.content.clone());
-        cap.conversation.push(ConversationTurn {
-            role: crate::suite::TurnRole::Assistant,
-            content: response.content,
-        });
-        Ok(())
-    }
-
-    async fn send_status(
-        &self,
-        status: StatusUpdate,
-        _metadata: &serde_json::Value,
-    ) -> Result<(), ChannelError> {
-        let mut cap = self.capture.lock().await;
-
-        match status {
-            StatusUpdate::ToolCompleted { ref name, success } => {
-                cap.tool_calls.push(TraceToolCall {
-                    name: name.clone(),
-                    duration_ms: 0, // We don't have precise per-tool timing here
-                    success,
-                });
-                cap.status_log
-                    .push(format!("tool_completed: {name} success={success}"));
-            }
-            StatusUpdate::ApprovalNeeded { ref request_id, .. } => {
-                // Auto-approve all tools during benchmarks
-                cap.status_log.push(format!("auto_approved: {request_id}"));
-                drop(cap); // Release lock before sending
-                let approval = IncomingMessage::new("bench", "bench-user", "always");
-                let _ = self.msg_tx.send(approval).await;
-                return Ok(());
-            }
-            StatusUpdate::Thinking(ref msg) => {
-                cap.status_log.push(format!("thinking: {msg}"));
-            }
-            StatusUpdate::ToolStarted { ref name } => {
-                cap.status_log.push(format!("tool_started: {name}"));
-            }
-            StatusUpdate::ToolResult {
-                ref name,
-                ref preview,
-            } => {
-                cap.status_log.push(format!(
-                    "tool_result: {name} -> {}",
-                    truncate_str(preview, 100)
-                ));
-            }
-            StatusUpdate::StreamChunk(_) => {}
-            StatusUpdate::Status(ref msg) => {
-                cap.status_log.push(format!("status: {msg}"));
-            }
-            StatusUpdate::JobStarted {
-                ref job_id,
-                ref title,
-                ..
-            } => {
-                cap.status_log
-                    .push(format!("job_started: {job_id} ({title})"));
-            }
-            StatusUpdate::AuthRequired {
-                ref extension_name, ..
-            } => {
-                cap.status_log
-                    .push(format!("auth_required: {extension_name} (auto-skipped)"));
-            }
-            StatusUpdate::AuthCompleted {
-                ref extension_name,
-                success,
-                ..
-            } => {
-                cap.status_log.push(format!(
-                    "auth_completed: {extension_name} success={success}"
-                ));
-            }
-        }
-        Ok(())
-    }
-
-    async fn broadcast(
-        &self,
-        _user_id: &str,
-        response: OutgoingResponse,
-    ) -> Result<(), ChannelError> {
-        let mut cap = self.capture.lock().await;
-        cap.status_log.push(format!(
-            "broadcast: {}",
-            truncate_str(&response.content, 100)
-        ));
-        Ok(())
-    }
-
-    async fn health_check(&self) -> Result<(), ChannelError> {
-        Ok(())
-    }
-
-    async fn shutdown(&self) -> Result<(), ChannelError> {
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[tokio::test]
-    async fn test_bench_channel_captures_responses() {
-        let (channel, _tx) = BenchChannel::new();
-        let capture = channel.capture();
-
-        let msg = IncomingMessage::new("bench", "user", "hello");
-        let response = OutgoingResponse::text("world");
-        channel.respond(&msg, response).await.unwrap();
-
-        let cap = capture.lock().await;
-        assert_eq!(cap.responses.len(), 1);
-        assert_eq!(cap.responses[0], "world");
-        assert_eq!(cap.conversation.len(), 1);
-    }
-
-    #[tokio::test]
-    async fn test_bench_channel_auto_approves() {
-        let (channel, _tx) = BenchChannel::new();
-        // start() to consume the receiver
-        let _stream = channel.start().await.unwrap();
-
-        let status = StatusUpdate::ApprovalNeeded {
-            request_id: "req-1".to_string(),
-            tool_name: "shell".to_string(),
-            description: "run ls".to_string(),
-            parameters: serde_json::json!({}),
-        };
-        channel
-            .send_status(status, &serde_json::Value::Null)
-            .await
-            .unwrap();
-
-        // The approval message was sent through msg_tx,
-        // which means the stream would receive it.
-        // We can't easily read from the stream in this test without
-        // consuming it, but we can verify the status log.
-        let capture_arc = channel.capture();
-        let cap = capture_arc.lock().await;
-        assert!(cap.status_log.iter().any(|s| s.contains("auto_approved")));
-    }
-
-    #[tokio::test]
-    async fn test_bench_channel_captures_tool_events() {
-        let (channel, _tx) = BenchChannel::new();
-
-        let status = StatusUpdate::ToolCompleted {
-            name: "echo".to_string(),
-            success: true,
-        };
-        channel
-            .send_status(status, &serde_json::Value::Null)
-            .await
-            .unwrap();
-
-        let capture_arc = channel.capture();
-        let cap = capture_arc.lock().await;
-        assert_eq!(cap.tool_calls.len(), 1);
-        assert_eq!(cap.tool_calls[0].name, "echo");
-        assert!(cap.tool_calls[0].success);
-    }
-}

benchmarks/src/config.rs

@@ -1,205 +0,0 @@
-use std::path::{Path, PathBuf};
-use std::time::Duration;
-
-use serde::Deserialize;
-
-use crate::error::BenchError;
-
-/// Top-level bench configuration, loaded from TOML.
-#[derive(Debug, Clone, Deserialize)]
-pub struct BenchConfig {
-    /// Where to write results. Default: "./bench-results".
-    #[serde(default = "default_results_dir")]
-    pub results_dir: PathBuf,
-
-    /// Per-task timeout. Default: "300s".
-    #[serde(
-        default = "default_task_timeout",
-        deserialize_with = "deserialize_duration"
-    )]
-    pub task_timeout: Duration,
-
-    /// How many tasks to run in parallel. Default: 1.
-    #[serde(default = "default_parallelism")]
-    pub parallelism: usize,
-
-    /// Model/config matrix entries. At least one required.
-    #[serde(default)]
-    pub matrix: Vec<MatrixEntry>,
-
-    /// Suite-specific configuration (passed through to adapter).
-    #[serde(default = "default_suite_config")]
-    pub suite_config: toml::Value,
-}
-
-/// A single model/config combination to benchmark.
-#[derive(Debug, Clone, Deserialize)]
-pub struct MatrixEntry {
-    /// Label for this configuration (used in results).
-    pub label: String,
-
-    /// Model identifier.
-    #[serde(default)]
-    pub model: Option<String>,
-}
-
-impl BenchConfig {
-    /// Load from a TOML file.
-    pub fn from_file(path: &Path) -> Result<Self, BenchError> {
-        if !path.exists() {
-            return Err(BenchError::ConfigNotFound {
-                path: path.to_path_buf(),
-            });
-        }
-        let content = std::fs::read_to_string(path)?;
-        let config: BenchConfig = toml::from_str(&content)?;
-        if config.matrix.is_empty() {
-            return Err(BenchError::Config(
-                "config must have at least one [[matrix]] entry".to_string(),
-            ));
-        }
-        Ok(config)
-    }
-
-    /// Create a minimal config for when no config file is provided.
-    /// Uses defaults and optional CLI overrides.
-    pub fn minimal(model: Option<String>) -> Self {
-        let label = model.as_deref().unwrap_or("default").to_string();
-        Self {
-            results_dir: default_results_dir(),
-            task_timeout: default_task_timeout(),
-            parallelism: default_parallelism(),
-            matrix: vec![MatrixEntry { label, model }],
-            suite_config: toml::Value::Table(toml::map::Map::new()),
-        }
-    }
-
-    /// Get the suite_config as a generic map for adapter use.
-    pub fn suite_config_map(&self) -> toml::map::Map<String, toml::Value> {
-        match &self.suite_config {
-            toml::Value::Table(map) => map.clone(),
-            _ => toml::map::Map::new(),
-        }
-    }
-
-    /// Get a string value from suite_config.
-    pub fn suite_config_str(&self, key: &str) -> Option<String> {
-        self.suite_config_map()
-            .get(key)
-            .and_then(|v| v.as_str())
-            .map(|s| s.to_string())
-    }
-}
-
-fn default_suite_config() -> toml::Value {
-    toml::Value::Table(toml::map::Map::new())
-}
-
-fn default_results_dir() -> PathBuf {
-    PathBuf::from("./bench-results")
-}
-
-fn default_task_timeout() -> Duration {
-    Duration::from_secs(300)
-}
-
-fn default_parallelism() -> usize {
-    1
-}
-
-/// Deserialize a duration from a string like "300s", "5m", etc.
-fn deserialize_duration<'de, D>(deserializer: D) -> Result<Duration, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    let s = String::deserialize(deserializer)?;
-    parse_duration(&s).map_err(serde::de::Error::custom)
-}
-
-fn parse_duration(s: &str) -> Result<Duration, String> {
-    let s = s.trim();
-    if let Some(secs) = s.strip_suffix('s') {
-        secs.trim()
-            .parse::<u64>()
-            .map(Duration::from_secs)
-            .map_err(|e| format!("invalid seconds: {e}"))
-    } else if let Some(mins) = s.strip_suffix('m') {
-        mins.trim()
-            .parse::<u64>()
-            .map(|m| Duration::from_secs(m * 60))
-            .map_err(|e| format!("invalid minutes: {e}"))
-    } else {
-        // Assume seconds if no suffix
-        s.parse::<u64>()
-            .map(Duration::from_secs)
-            .map_err(|e| format!("invalid duration '{s}': {e}"))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_parse_duration() {
-        assert_eq!(parse_duration("300s").unwrap(), Duration::from_secs(300));
-        assert_eq!(parse_duration("5m").unwrap(), Duration::from_secs(300));
-        assert_eq!(parse_duration("60").unwrap(), Duration::from_secs(60));
-    }
-
-    #[test]
-    fn test_minimal_config() {
-        let config = BenchConfig::minimal(Some("test-model".to_string()));
-        assert_eq!(config.matrix.len(), 1);
-        assert_eq!(config.matrix[0].label, "test-model");
-        assert_eq!(config.parallelism, 1);
-    }
-
-    #[test]
-    fn test_config_rejects_empty_matrix() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("empty.toml");
-        std::fs::write(
-            &path,
-            r#"
-results_dir = "./results"
-task_timeout = "60s"
-"#,
-        )
-        .unwrap();
-        let err = BenchConfig::from_file(&path).unwrap_err();
-        assert!(
-            err.to_string().contains("at least one [[matrix]]"),
-            "got: {err}"
-        );
-    }
-
-    #[test]
-    fn test_config_from_toml() {
-        let toml_str = r#"
-results_dir = "./my-results"
-task_timeout = "60s"
-parallelism = 2
-
-[[matrix]]
-label = "fast"
-model = "gpt-4o-mini"
-
-[[matrix]]
-label = "full"
-model = "claude-3-5-sonnet"
-
-[suite_config]
-dataset_path = "./data/test.jsonl"
-"#;
-        let config: BenchConfig = toml::from_str(toml_str).unwrap();
-        assert_eq!(config.results_dir, PathBuf::from("./my-results"));
-        assert_eq!(config.task_timeout, Duration::from_secs(60));
-        assert_eq!(config.parallelism, 2);
-        assert_eq!(config.matrix.len(), 2);
-        assert_eq!(
-            config.suite_config_str("dataset_path").unwrap(),
-            "./data/test.jsonl"
-        );
-    }
-}

benchmarks/src/error.rs

@@ -1,31 +0,0 @@
-use std::path::PathBuf;
-
-#[derive(Debug, thiserror::Error)]
-pub enum BenchError {
-    #[error("Config error: {0}")]
-    Config(String),
-
-    #[error("Config file not found: {path}")]
-    ConfigNotFound { path: PathBuf },
-
-    #[error("Suite {name} not found. Available: {available}")]
-    SuiteNotFound { name: String, available: String },
-
-    #[error("Task {task_id} failed: {reason}")]
-    TaskFailed { task_id: String, reason: String },
-
-    #[error("Scoring error for task {task_id}: {reason}")]
-    Scoring { task_id: String, reason: String },
-
-    #[error("IO error: {0}")]
-    Io(#[from] std::io::Error),
-
-    #[error("JSON error: {0}")]
-    Json(#[from] serde_json::Error),
-
-    #[error("TOML parse error: {0}")]
-    Toml(#[from] toml::de::Error),
-
-    #[error("Agent error: {0}")]
-    Agent(#[from] ironclaw::Error),
-}

benchmarks/src/instrumented_llm.rs

@@ -1,249 +0,0 @@
-use std::sync::Arc;
-use std::sync::atomic::{AtomicU32, Ordering};
-use std::time::Instant;
-
-use async_trait::async_trait;
-use rust_decimal::Decimal;
-use rust_decimal::prelude::ToPrimitive;
-use tokio::sync::Mutex;
-
-use ironclaw::error::LlmError;
-use ironclaw::llm::{
-    CompletionRequest, CompletionResponse, LlmProvider, ToolCompletionRequest,
-    ToolCompletionResponse,
-};
-
-/// Recorded metrics from a single LLM call.
-#[derive(Debug, Clone)]
-#[allow(dead_code)]
-pub struct LlmCallRecord {
-    pub input_tokens: u32,
-    pub output_tokens: u32,
-    pub duration_ms: u64,
-    pub had_tool_calls: bool,
-}
-
-/// Wraps an `LlmProvider` to record per-call metrics.
-///
-/// The wrapper is transparent to the agent: it delegates every call
-/// to the inner provider and captures token counts and timings.
-pub struct InstrumentedLlm {
-    inner: Arc<dyn LlmProvider>,
-    records: Mutex<Vec<LlmCallRecord>>,
-    total_input_tokens: AtomicU32,
-    total_output_tokens: AtomicU32,
-    call_count: AtomicU32,
-}
-
-impl InstrumentedLlm {
-    pub fn new(inner: Arc<dyn LlmProvider>) -> Self {
-        Self {
-            inner,
-            records: Mutex::new(Vec::new()),
-            total_input_tokens: AtomicU32::new(0),
-            total_output_tokens: AtomicU32::new(0),
-            call_count: AtomicU32::new(0),
-        }
-    }
-
-    /// Take all recorded call metrics, clearing the internal buffer.
-    pub async fn take_records(&self) -> Vec<LlmCallRecord> {
-        let mut records = self.records.lock().await;
-        std::mem::take(&mut *records)
-    }
-
-    /// Snapshot of total tokens without clearing.
-    pub fn total_input_tokens(&self) -> u32 {
-        self.total_input_tokens.load(Ordering::Relaxed)
-    }
-
-    pub fn total_output_tokens(&self) -> u32 {
-        self.total_output_tokens.load(Ordering::Relaxed)
-    }
-
-    pub fn call_count(&self) -> u32 {
-        self.call_count.load(Ordering::Relaxed)
-    }
-
-    /// Estimated cost using the inner provider's cost-per-token rates.
-    pub fn estimated_cost(&self) -> f64 {
-        let (input_rate, output_rate) = self.inner.cost_per_token();
-        let input_cost =
-            input_rate * Decimal::from(self.total_input_tokens.load(Ordering::Relaxed));
-        let output_cost =
-            output_rate * Decimal::from(self.total_output_tokens.load(Ordering::Relaxed));
-        let total = input_cost + output_cost;
-        total.to_f64().unwrap_or(0.0)
-    }
-
-    /// Reset all counters and records.
-    pub async fn reset(&self) {
-        self.records.lock().await.clear();
-        self.total_input_tokens.store(0, Ordering::Relaxed);
-        self.total_output_tokens.store(0, Ordering::Relaxed);
-        self.call_count.store(0, Ordering::Relaxed);
-    }
-
-    async fn record(
-        &self,
-        input_tokens: u32,
-        output_tokens: u32,
-        duration_ms: u64,
-        had_tool_calls: bool,
-    ) {
-        self.total_input_tokens
-            .fetch_add(input_tokens, Ordering::Relaxed);
-        self.total_output_tokens
-            .fetch_add(output_tokens, Ordering::Relaxed);
-        self.call_count.fetch_add(1, Ordering::Relaxed);
-        self.records.lock().await.push(LlmCallRecord {
-            input_tokens,
-            output_tokens,
-            duration_ms,
-            had_tool_calls,
-        });
-    }
-}
-
-#[async_trait]
-impl LlmProvider for InstrumentedLlm {
-    fn model_name(&self) -> &str {
-        self.inner.model_name()
-    }
-
-    fn cost_per_token(&self) -> (Decimal, Decimal) {
-        self.inner.cost_per_token()
-    }
-
-    async fn complete(&self, request: CompletionRequest) -> Result<CompletionResponse, LlmError> {
-        let start = Instant::now();
-        let response = self.inner.complete(request).await?;
-        let elapsed = start.elapsed().as_millis() as u64;
-        self.record(
-            response.input_tokens,
-            response.output_tokens,
-            elapsed,
-            false,
-        )
-        .await;
-        Ok(response)
-    }
-
-    async fn complete_with_tools(
-        &self,
-        request: ToolCompletionRequest,
-    ) -> Result<ToolCompletionResponse, LlmError> {
-        let start = Instant::now();
-        let response = self.inner.complete_with_tools(request).await?;
-        let elapsed = start.elapsed().as_millis() as u64;
-        let had_tool_calls = !response.tool_calls.is_empty();
-        self.record(
-            response.input_tokens,
-            response.output_tokens,
-            elapsed,
-            had_tool_calls,
-        )
-        .await;
-        Ok(response)
-    }
-
-    async fn list_models(&self) -> Result<Vec<String>, LlmError> {
-        self.inner.list_models().await
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use ironclaw::llm::{ChatMessage, CompletionRequest, CompletionResponse, FinishReason};
-
-    /// Fake LLM that returns a canned response with known token counts.
-    struct FakeLlm;
-
-    #[async_trait]
-    impl LlmProvider for FakeLlm {
-        fn model_name(&self) -> &str {
-            "fake-model"
-        }
-
-        fn cost_per_token(&self) -> (Decimal, Decimal) {
-            (
-                Decimal::new(3, 6),  // $0.000003 per input token
-                Decimal::new(15, 6), // $0.000015 per output token
-            )
-        }
-
-        async fn complete(
-            &self,
-            _request: CompletionRequest,
-        ) -> Result<CompletionResponse, LlmError> {
-            Ok(CompletionResponse {
-                content: "test response".to_string(),
-                input_tokens: 100,
-                output_tokens: 50,
-                finish_reason: FinishReason::Stop,
-            })
-        }
-
-        async fn complete_with_tools(
-            &self,
-            _request: ToolCompletionRequest,
-        ) -> Result<ToolCompletionResponse, LlmError> {
-            Ok(ToolCompletionResponse {
-                content: Some("tool response".to_string()),
-                tool_calls: vec![],
-                input_tokens: 200,
-                output_tokens: 100,
-                finish_reason: FinishReason::Stop,
-            })
-        }
-    }
-
-    #[tokio::test]
-    async fn test_instrumented_records_metrics() {
-        let inner = Arc::new(FakeLlm);
-        let instrumented = InstrumentedLlm::new(inner);
-
-        let request = CompletionRequest::new(vec![ChatMessage::user("hello")]);
-        let _ = instrumented.complete(request).await.unwrap();
-
-        assert_eq!(instrumented.call_count(), 1);
-        assert_eq!(instrumented.total_input_tokens(), 100);
-        assert_eq!(instrumented.total_output_tokens(), 50);
-
-        let records = instrumented.take_records().await;
-        assert_eq!(records.len(), 1);
-        assert_eq!(records[0].input_tokens, 100);
-        assert!(!records[0].had_tool_calls);
-    }
-
-    #[tokio::test]
-    async fn test_instrumented_cost_calculation() {
-        let inner = Arc::new(FakeLlm);
-        let instrumented = InstrumentedLlm::new(inner);
-
-        let request = CompletionRequest::new(vec![ChatMessage::user("hello")]);
-        let _ = instrumented.complete(request).await.unwrap();
-
-        // 100 * 0.000003 + 50 * 0.000015 = 0.0003 + 0.00075 = 0.00105
-        let cost = instrumented.estimated_cost();
-        assert!((cost - 0.00105).abs() < 0.0001);
-    }
-
-    #[tokio::test]
-    async fn test_instrumented_reset() {
-        let inner = Arc::new(FakeLlm);
-        let instrumented = InstrumentedLlm::new(inner);
-
-        let request = CompletionRequest::new(vec![ChatMessage::user("hello")]);
-        let _ = instrumented.complete(request).await.unwrap();
-        assert_eq!(instrumented.call_count(), 1);
-
-        instrumented.reset().await;
-        assert_eq!(instrumented.call_count(), 0);
-        assert_eq!(instrumented.total_input_tokens(), 0);
-
-        let records = instrumented.take_records().await;
-        assert!(records.is_empty());
-    }
-}

benchmarks/src/main.rs

@@ -1,313 +0,0 @@
-mod adapters;
-mod channel;
-mod config;
-mod error;
-mod instrumented_llm;
-mod results;
-mod runner;
-mod scoring;
-mod suite;
-
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use clap::{Parser, Subcommand};
-use tracing_subscriber::{EnvFilter, layer::SubscriberExt, util::SubscriberInitExt};
-use uuid::Uuid;
-
-use crate::config::BenchConfig;
-
-#[derive(Parser)]
-#[command(name = "ironclaw-bench", about = "IronClaw benchmarking harness")]
-struct Cli {
-    #[command(subcommand)]
-    command: Commands,
-}
-
-#[derive(Subcommand)]
-enum Commands {
-    /// Run a benchmark suite.
-    Run {
-        /// Suite to run (custom, gaia, spot, tau_bench, swe_bench).
-        #[arg(long)]
-        suite: String,
-
-        /// Path to bench config TOML.
-        #[arg(long)]
-        config: Option<PathBuf>,
-
-        /// Override model for all matrix entries.
-        #[arg(long)]
-        model: Option<String>,
-
-        /// Max tasks to run in parallel.
-        #[arg(long)]
-        parallelism: Option<usize>,
-
-        /// Sample N tasks from the suite (for quick testing).
-        #[arg(long)]
-        sample: Option<usize>,
-
-        /// Only run these task IDs (comma-separated).
-        #[arg(long, value_delimiter = ',')]
-        task_ids: Option<Vec<String>>,
-
-        /// Only run tasks with these tags (comma-separated).
-        #[arg(long, value_delimiter = ',')]
-        tags: Option<Vec<String>>,
-
-        /// Per-task timeout in seconds.
-        #[arg(long)]
-        timeout_secs: Option<u64>,
-
-        /// Override results directory.
-        #[arg(long)]
-        results_dir: Option<PathBuf>,
-
-        /// Resume a previous run by ID.
-        #[arg(long)]
-        resume: Option<Uuid>,
-    },
-
-    /// Show results for a run.
-    Results {
-        /// Run ID or "latest".
-        #[arg(default_value = "latest")]
-        run_id: String,
-
-        /// Output format.
-        #[arg(long, default_value = "table")]
-        format: ResultsFormat,
-
-        /// Override results directory.
-        #[arg(long)]
-        results_dir: Option<PathBuf>,
-    },
-
-    /// Compare two runs.
-    Compare {
-        /// Baseline run ID.
-        baseline: Uuid,
-
-        /// Comparison run ID.
-        comparison: Uuid,
-
-        /// Override results directory.
-        #[arg(long)]
-        results_dir: Option<PathBuf>,
-    },
-
-    /// List available benchmark suites.
-    List,
-}
-
-#[derive(Clone, Debug, clap::ValueEnum)]
-enum ResultsFormat {
-    Table,
-    Json,
-    Csv,
-}
-
-#[tokio::main]
-async fn main() -> anyhow::Result<()> {
-    let cli = Cli::parse();
-
-    tracing_subscriber::registry()
-        .with(
-            EnvFilter::try_from_default_env()
-                .unwrap_or_else(|_| EnvFilter::new("ironclaw_bench=info,ironclaw=warn")),
-        )
-        .with(tracing_subscriber::fmt::layer().with_target(false))
-        .init();
-
-    match cli.command {
-        Commands::List => {
-            println!("Available benchmark suites:\n");
-            for (id, desc) in adapters::KNOWN_SUITES {
-                println!("  {:<15} {}", id, desc);
-            }
-            println!();
-        }
-        Commands::Run {
-            suite,
-            config: config_path,
-            model,
-            parallelism,
-            sample,
-            task_ids,
-            tags,
-            timeout_secs,
-            results_dir,
-            resume,
-        } => {
-            // Load or create config
-            let mut bench_config = if let Some(ref path) = config_path {
-                BenchConfig::from_file(path)?
-            } else {
-                BenchConfig::minimal(model.clone())
-            };
-
-            // Apply CLI overrides
-            if let Some(p) = parallelism {
-                bench_config.parallelism = p;
-            }
-            if let Some(t) = timeout_secs {
-                bench_config.task_timeout = std::time::Duration::from_secs(t);
-            }
-            if let Some(ref dir) = results_dir {
-                bench_config.results_dir = dir.clone();
-            }
-
-            // If model override specified and we have matrix entries, update them
-            if let Some(ref m) = model {
-                for entry in &mut bench_config.matrix {
-                    entry.model = Some(m.clone());
-                }
-            }
-
-            // Create suite
-            let bench_suite = adapters::create_suite(&suite, &bench_config)?;
-
-            // Initialize ironclaw LLM provider
-            let ironclaw_config = ironclaw::Config::from_env().await.map_err(|e| {
-                anyhow::anyhow!(
-                    "Failed to load ironclaw config: {}. Make sure .env is configured.",
-                    e
-                )
-            })?;
-
-            let session = ironclaw::llm::create_session_manager(ironclaw::llm::SessionConfig {
-                auth_base_url: ironclaw_config.llm.nearai.auth_base_url.clone(),
-                session_path: ironclaw_config.llm.nearai.session_path.clone(),
-            })
-            .await;
-            session.ensure_authenticated().await?;
-
-            let llm = ironclaw::llm::create_llm_provider(&ironclaw_config.llm, session)?;
-            let safety = Arc::new(ironclaw::safety::SafetyLayer::new(&ironclaw_config.safety));
-
-            let runner = runner::BenchRunner::new(bench_suite, bench_config.clone(), llm, safety);
-
-            // Run for each matrix entry
-            for matrix_entry in &bench_config.matrix {
-                let run_id = runner
-                    .run(
-                        matrix_entry,
-                        sample,
-                        task_ids.as_deref(),
-                        tags.as_deref(),
-                        resume,
-                    )
-                    .await?;
-                println!("Run complete: {}", run_id);
-            }
-        }
-        Commands::Results {
-            run_id,
-            format,
-            results_dir,
-        } => {
-            let base = results_dir.unwrap_or_else(|| PathBuf::from("./bench-results"));
-            let uuid = if run_id == "latest" {
-                results::find_latest_run(&base)?
-                    .ok_or_else(|| anyhow::anyhow!("No runs found in {}", base.display()))?
-            } else {
-                Uuid::parse_str(&run_id)?
-            };
-
-            let json_path = results::run_json_path(&base, uuid);
-            let jsonl_path = results::tasks_jsonl_path(&base, uuid);
-
-            let run = results::read_run_result(&json_path)?;
-            let tasks = results::read_task_results(&jsonl_path)?;
-
-            match format {
-                ResultsFormat::Table => {
-                    results::print_results_table(&tasks, &run);
-                }
-                ResultsFormat::Json => {
-                    let output = serde_json::json!({
-                        "run": run,
-                        "tasks": tasks,
-                    });
-                    println!("{}", serde_json::to_string_pretty(&output)?);
-                }
-                ResultsFormat::Csv => {
-                    println!("task_id,score,label,tokens,cost,turns,time_s");
-                    for task in &tasks {
-                        println!(
-                            "{},{:.3},{},{},{:.4},{},{:.1}",
-                            task.task_id,
-                            task.score.value,
-                            task.score.label,
-                            task.trace.input_tokens + task.trace.output_tokens,
-                            task.trace.estimated_cost_usd,
-                            task.trace.turns,
-                            task.trace.wall_time_ms as f64 / 1000.0,
-                        );
-                    }
-                }
-            }
-        }
-        Commands::Compare {
-            baseline,
-            comparison,
-            results_dir,
-        } => {
-            let base = results_dir.unwrap_or_else(|| PathBuf::from("./bench-results"));
-
-            let baseline_run = results::read_run_result(&results::run_json_path(&base, baseline))?;
-            let comparison_run =
-                results::read_run_result(&results::run_json_path(&base, comparison))?;
-
-            println!("\nComparison: {} vs {}\n", baseline, comparison);
-            println!(
-                "{:<20} {:>12} {:>12} {:>10}",
-                "Metric", "Baseline", "Comparison", "Delta"
-            );
-            println!("{}", "-".repeat(58));
-
-            let pass_delta = comparison_run.pass_rate - baseline_run.pass_rate;
-            println!(
-                "{:<20} {:>11.1}% {:>11.1}% {:>+9.1}%",
-                "Pass rate",
-                baseline_run.pass_rate * 100.0,
-                comparison_run.pass_rate * 100.0,
-                pass_delta * 100.0,
-            );
-
-            let score_delta = comparison_run.avg_score - baseline_run.avg_score;
-            println!(
-                "{:<20} {:>12.3} {:>12.3} {:>+10.3}",
-                "Avg score", baseline_run.avg_score, comparison_run.avg_score, score_delta,
-            );
-
-            let cost_delta = comparison_run.total_cost_usd - baseline_run.total_cost_usd;
-            println!(
-                "{:<20} {:>11.4}$ {:>11.4}$ {:>+9.4}$",
-                "Total cost",
-                baseline_run.total_cost_usd,
-                comparison_run.total_cost_usd,
-                cost_delta,
-            );
-
-            let time_b = baseline_run.total_wall_time_ms as f64 / 1000.0;
-            let time_c = comparison_run.total_wall_time_ms as f64 / 1000.0;
-            println!(
-                "{:<20} {:>11.1}s {:>11.1}s {:>+9.1}s",
-                "Total time",
-                time_b,
-                time_c,
-                time_c - time_b,
-            );
-
-            println!(
-                "{:<20} {:>12} {:>12}",
-                "Model", baseline_run.model, comparison_run.model,
-            );
-            println!();
-        }
-    }
-
-    Ok(())
-}

benchmarks/src/results.rs

@@ -1,473 +0,0 @@
-use std::collections::HashSet;
-use std::io::{BufRead, Write};
-use std::path::{Path, PathBuf};
-
-use chrono::{DateTime, Utc};
-use uuid::Uuid;
-
-use crate::error::BenchError;
-use crate::suite::BenchScore;
-
-/// Metrics from a single task run: LLM usage, timing, tool calls.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct Trace {
-    pub wall_time_ms: u64,
-    pub llm_calls: u32,
-    pub input_tokens: u32,
-    pub output_tokens: u32,
-    pub estimated_cost_usd: f64,
-    pub tool_calls: Vec<TraceToolCall>,
-    pub turns: u32,
-    pub hit_iteration_limit: bool,
-    pub hit_timeout: bool,
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct TraceToolCall {
-    pub name: String,
-    pub duration_ms: u64,
-    pub success: bool,
-}
-
-/// Result of running a single benchmark task.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct TaskResult {
-    pub task_id: String,
-    pub suite_id: String,
-    pub score: BenchScore,
-    pub trace: Trace,
-    pub response: String,
-    pub started_at: DateTime<Utc>,
-    pub finished_at: DateTime<Utc>,
-    pub config_label: String,
-    #[serde(default)]
-    pub error: Option<String>,
-}
-
-/// Aggregate results for a full benchmark run.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct RunResult {
-    pub run_id: Uuid,
-    pub suite_id: String,
-    pub config_label: String,
-    pub model: String,
-    /// Short git commit hash at the time of the run.
-    #[serde(default)]
-    pub commit_hash: String,
-    pub pass_rate: f64,
-    pub avg_score: f64,
-    pub total_tasks: usize,
-    pub completed_tasks: usize,
-    pub total_cost_usd: f64,
-    pub total_wall_time_ms: u64,
-    pub started_at: DateTime<Utc>,
-    pub finished_at: DateTime<Utc>,
-}
-
-impl RunResult {
-    /// Build aggregate from individual task results.
-    #[allow(clippy::too_many_arguments)]
-    pub fn from_tasks(
-        run_id: Uuid,
-        suite_id: &str,
-        config_label: &str,
-        model: &str,
-        commit_hash: &str,
-        total_tasks: usize,
-        tasks: &[TaskResult],
-        started_at: DateTime<Utc>,
-    ) -> Self {
-        let pass_count = tasks.iter().filter(|t| t.score.value >= 1.0).count();
-        let pass_rate = if tasks.is_empty() {
-            0.0
-        } else {
-            pass_count as f64 / tasks.len() as f64
-        };
-        let avg_score = if tasks.is_empty() {
-            0.0
-        } else {
-            tasks.iter().map(|t| t.score.value).sum::<f64>() / tasks.len() as f64
-        };
-        let total_cost: f64 = tasks.iter().map(|t| t.trace.estimated_cost_usd).sum();
-        let total_wall: u64 = tasks.iter().map(|t| t.trace.wall_time_ms).sum();
-
-        Self {
-            run_id,
-            suite_id: suite_id.to_string(),
-            config_label: config_label.to_string(),
-            model: model.to_string(),
-            commit_hash: commit_hash.to_string(),
-            pass_rate,
-            avg_score,
-            total_tasks,
-            completed_tasks: tasks.len(),
-            total_cost_usd: total_cost,
-            total_wall_time_ms: total_wall,
-            started_at,
-            finished_at: Utc::now(),
-        }
-    }
-}
-
-/// Append a single task result as one JSON line to the JSONL file.
-pub fn append_task_result(path: &Path, result: &TaskResult) -> Result<(), BenchError> {
-    let mut file = std::fs::OpenOptions::new()
-        .create(true)
-        .append(true)
-        .open(path)?;
-    let line = serde_json::to_string(result)?;
-    writeln!(file, "{line}")?;
-    Ok(())
-}
-
-/// Overwrite the JSONL file with the given results (used after scoring).
-pub fn write_task_results(path: &Path, results: &[TaskResult]) -> Result<(), BenchError> {
-    let mut file = std::fs::File::create(path)?;
-    for result in results {
-        let line = serde_json::to_string(result)?;
-        writeln!(file, "{line}")?;
-    }
-    Ok(())
-}
-
-/// Read all task results from a JSONL file.
-pub fn read_task_results(path: &Path) -> Result<Vec<TaskResult>, BenchError> {
-    if !path.exists() {
-        return Ok(Vec::new());
-    }
-    let file = std::fs::File::open(path)?;
-    let reader = std::io::BufReader::new(file);
-    let mut results = Vec::new();
-    for line in reader.lines() {
-        let line = line?;
-        let trimmed = line.trim();
-        if trimmed.is_empty() {
-            continue;
-        }
-        let result: TaskResult = serde_json::from_str(trimmed)?;
-        results.push(result);
-    }
-    Ok(results)
-}
-
-/// Write the aggregate run result as JSON.
-pub fn write_run_result(path: &Path, result: &RunResult) -> Result<(), BenchError> {
-    let json = serde_json::to_string_pretty(result)?;
-    std::fs::write(path, json)?;
-    Ok(())
-}
-
-/// Read the aggregate run result from JSON.
-pub fn read_run_result(path: &Path) -> Result<RunResult, BenchError> {
-    let json = std::fs::read_to_string(path)?;
-    let result: RunResult = serde_json::from_str(&json)?;
-    Ok(result)
-}
-
-/// Get the set of already-completed task IDs from a JSONL file (for resume).
-///
-/// Only includes tasks that have been scored (label != "pending"). Tasks that
-/// were written but not scored (e.g., from an interrupted run) will be re-executed.
-pub fn completed_task_ids(path: &Path) -> Result<HashSet<String>, BenchError> {
-    let results = read_task_results(path)?;
-    Ok(results
-        .into_iter()
-        .filter(|r| r.score.label != "pending")
-        .map(|r| r.task_id)
-        .collect())
-}
-
-/// Get the results directory for a specific run.
-pub fn run_dir(base: &Path, run_id: Uuid) -> PathBuf {
-    base.join(run_id.to_string())
-}
-
-/// Get the tasks JSONL path for a run.
-pub fn tasks_jsonl_path(base: &Path, run_id: Uuid) -> PathBuf {
-    run_dir(base, run_id).join("tasks.jsonl")
-}
-
-/// Get the run JSON path for a run.
-pub fn run_json_path(base: &Path, run_id: Uuid) -> PathBuf {
-    run_dir(base, run_id).join("run.json")
-}
-
-/// Find the latest run directory by the modification time of its `run.json`.
-///
-/// Falls back to `tasks.jsonl` mtime, then directory mtime. This avoids the
-/// issue where modifying files inside a directory doesn't update the directory's
-/// mtime on many filesystems.
-pub fn find_latest_run(base: &Path) -> Result<Option<Uuid>, BenchError> {
-    if !base.exists() {
-        return Ok(None);
-    }
-    let mut entries: Vec<_> = std::fs::read_dir(base)?
-        .filter_map(|e| e.ok())
-        .filter(|e| e.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
-        .filter_map(|e| {
-            let name = e.file_name().to_string_lossy().to_string();
-            let uuid = Uuid::parse_str(&name).ok()?;
-            let dir_path = e.path();
-            // Prefer run.json mtime, fall back to tasks.jsonl, then directory
-            let modified = std::fs::metadata(dir_path.join("run.json"))
-                .and_then(|m| m.modified())
-                .or_else(|_| {
-                    std::fs::metadata(dir_path.join("tasks.jsonl")).and_then(|m| m.modified())
-                })
-                .or_else(|_| e.metadata().and_then(|m| m.modified()))
-                .ok()?;
-            Some((uuid, modified))
-        })
-        .collect();
-    entries.sort_by(|a, b| b.1.cmp(&a.1));
-    Ok(entries.first().map(|(uuid, _)| *uuid))
-}
-
-/// Print a summary table of task results.
-pub fn print_results_table(tasks: &[TaskResult], run: &RunResult) {
-    println!();
-    let commit_suffix = if run.commit_hash.is_empty() {
-        String::new()
-    } else {
-        format!(" | Commit: {}", run.commit_hash)
-    };
-    println!(
-        "Run: {} | Suite: {} | Model: {}{}",
-        run.run_id, run.suite_id, run.model, commit_suffix
-    );
-    println!(
-        "Pass rate: {:.1}% | Avg score: {:.3} | Tasks: {}/{} | Cost: ${:.4} | Time: {:.1}s",
-        run.pass_rate * 100.0,
-        run.avg_score,
-        run.completed_tasks,
-        run.total_tasks,
-        run.total_cost_usd,
-        run.total_wall_time_ms as f64 / 1000.0,
-    );
-    println!();
-
-    // Header
-    println!(
-        "{:<30} {:>6} {:>7} {:>8} {:>10} {:>6} {:>8}",
-        "Task ID", "Score", "Label", "Tokens", "Cost", "Turns", "Time"
-    );
-    println!("{}", "-".repeat(80));
-
-    for task in tasks {
-        let total_tokens = task.trace.input_tokens + task.trace.output_tokens;
-        let task_id_display = if task.task_id.len() > 28 {
-            let truncated: String = task.task_id.chars().take(25).collect();
-            format!("{truncated}...")
-        } else {
-            task.task_id.clone()
-        };
-        println!(
-            "{:<30} {:>6.3} {:>7} {:>8} {:>10.4} {:>6} {:>7.1}s",
-            task_id_display,
-            task.score.value,
-            task.score.label,
-            total_tokens,
-            task.trace.estimated_cost_usd,
-            task.trace.turns,
-            task.trace.wall_time_ms as f64 / 1000.0,
-        );
-    }
-    println!();
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_run_result_from_tasks() {
-        let tasks = vec![
-            TaskResult {
-                task_id: "t1".to_string(),
-                suite_id: "custom".to_string(),
-                score: BenchScore {
-                    value: 1.0,
-                    label: "pass".to_string(),
-                    details: None,
-                },
-                trace: Trace {
-                    wall_time_ms: 1000,
-                    llm_calls: 2,
-                    input_tokens: 100,
-                    output_tokens: 50,
-                    estimated_cost_usd: 0.01,
-                    tool_calls: vec![],
-                    turns: 1,
-                    hit_iteration_limit: false,
-                    hit_timeout: false,
-                },
-                response: "answer".to_string(),
-                started_at: Utc::now(),
-                finished_at: Utc::now(),
-                config_label: "default".to_string(),
-                error: None,
-            },
-            TaskResult {
-                task_id: "t2".to_string(),
-                suite_id: "custom".to_string(),
-                score: BenchScore {
-                    value: 0.0,
-                    label: "fail".to_string(),
-                    details: Some("wrong".to_string()),
-                },
-                trace: Trace {
-                    wall_time_ms: 2000,
-                    llm_calls: 3,
-                    input_tokens: 200,
-                    output_tokens: 100,
-                    estimated_cost_usd: 0.02,
-                    tool_calls: vec![],
-                    turns: 2,
-                    hit_iteration_limit: false,
-                    hit_timeout: false,
-                },
-                response: "wrong answer".to_string(),
-                started_at: Utc::now(),
-                finished_at: Utc::now(),
-                config_label: "default".to_string(),
-                error: None,
-            },
-        ];
-
-        let run = RunResult::from_tasks(
-            Uuid::new_v4(),
-            "custom",
-            "default",
-            "test-model",
-            "abc1234",
-            2,
-            &tasks,
-            Utc::now(),
-        );
-
-        assert_eq!(run.pass_rate, 0.5);
-        assert_eq!(run.avg_score, 0.5);
-        assert_eq!(run.total_tasks, 2);
-        assert_eq!(run.completed_tasks, 2);
-        assert!((run.total_cost_usd - 0.03).abs() < f64::EPSILON);
-        assert_eq!(run.total_wall_time_ms, 3000);
-    }
-
-    #[test]
-    fn test_jsonl_roundtrip() {
-        let dir = tempfile::tempdir().expect("temp dir");
-        let path = dir.path().join("tasks.jsonl");
-
-        let result = TaskResult {
-            task_id: "round-trip-test".to_string(),
-            suite_id: "custom".to_string(),
-            score: BenchScore::pass(),
-            trace: Trace {
-                wall_time_ms: 500,
-                llm_calls: 1,
-                input_tokens: 10,
-                output_tokens: 5,
-                estimated_cost_usd: 0.001,
-                tool_calls: vec![],
-                turns: 1,
-                hit_iteration_limit: false,
-                hit_timeout: false,
-            },
-            response: "hello".to_string(),
-            started_at: Utc::now(),
-            finished_at: Utc::now(),
-            config_label: "test".to_string(),
-            error: None,
-        };
-
-        append_task_result(&path, &result).expect("append");
-        append_task_result(&path, &result).expect("append");
-
-        let loaded = read_task_results(&path).expect("read");
-        assert_eq!(loaded.len(), 2);
-        assert_eq!(loaded[0].task_id, "round-trip-test");
-    }
-
-    #[test]
-    fn test_completed_task_ids() {
-        let dir = tempfile::tempdir().expect("temp dir");
-        let path = dir.path().join("tasks.jsonl");
-
-        let result = TaskResult {
-            task_id: "unique-id-1".to_string(),
-            suite_id: "custom".to_string(),
-            score: BenchScore::pass(),
-            trace: Trace {
-                wall_time_ms: 100,
-                llm_calls: 1,
-                input_tokens: 10,
-                output_tokens: 5,
-                estimated_cost_usd: 0.0,
-                tool_calls: vec![],
-                turns: 1,
-                hit_iteration_limit: false,
-                hit_timeout: false,
-            },
-            response: "x".to_string(),
-            started_at: Utc::now(),
-            finished_at: Utc::now(),
-            config_label: "test".to_string(),
-            error: None,
-        };
-        append_task_result(&path, &result).expect("append");
-
-        let ids = completed_task_ids(&path).expect("ids");
-        assert!(ids.contains("unique-id-1"));
-        assert!(!ids.contains("unique-id-2"));
-    }
-
-    #[test]
-    fn test_write_task_results_overwrites() {
-        let dir = tempfile::tempdir().expect("temp dir");
-        let path = dir.path().join("tasks.jsonl");
-
-        // Write initial "pending" result via append
-        let pending = TaskResult {
-            task_id: "t1".to_string(),
-            suite_id: "spot".to_string(),
-            score: BenchScore {
-                value: 0.0,
-                label: "pending".to_string(),
-                details: None,
-            },
-            trace: Trace {
-                wall_time_ms: 100,
-                llm_calls: 1,
-                input_tokens: 10,
-                output_tokens: 5,
-                estimated_cost_usd: 0.001,
-                tool_calls: vec![],
-                turns: 1,
-                hit_iteration_limit: false,
-                hit_timeout: false,
-            },
-            response: "42".to_string(),
-            started_at: Utc::now(),
-            finished_at: Utc::now(),
-            config_label: "default".to_string(),
-            error: None,
-        };
-        append_task_result(&path, &pending).expect("append");
-
-        // Verify pending score
-        let before = read_task_results(&path).expect("read");
-        assert_eq!(before.len(), 1);
-        assert_eq!(before[0].score.label, "pending");
-
-        // Overwrite with scored result
-        let mut scored = pending;
-        scored.score = BenchScore::pass();
-        write_task_results(&path, &[scored]).expect("write");
-
-        // Verify scored result replaced pending
-        let after = read_task_results(&path).expect("read");
-        assert_eq!(after.len(), 1);
-        assert_eq!(after[0].score.label, "pass");
-        assert_eq!(after[0].score.value, 1.0);
-    }
-}

benchmarks/src/runner.rs

@@ -1,550 +0,0 @@
-use std::collections::{HashMap, HashSet};
-use std::sync::Arc;
-use std::time::Instant;
-
-use chrono::Utc;
-use tokio::sync::Mutex;
-use uuid::Uuid;
-
-use ironclaw::agent::{Agent, AgentDeps};
-use ironclaw::channels::{ChannelManager, IncomingMessage};
-use ironclaw::config::AgentConfig;
-use ironclaw::llm::LlmProvider;
-use ironclaw::safety::SafetyLayer;
-use ironclaw::tools::ToolRegistry;
-
-use crate::channel::BenchChannel;
-use crate::config::{BenchConfig, MatrixEntry};
-use crate::error::BenchError;
-use crate::instrumented_llm::InstrumentedLlm;
-use crate::results::{
-    RunResult, TaskResult, Trace, append_task_result, completed_task_ids, run_dir, run_json_path,
-    tasks_jsonl_path, write_run_result, write_task_results,
-};
-use crate::suite::{BenchSuite, BenchTask, ConversationTurn, TaskSubmission, TurnRole};
-
-/// Parameters for running a single task in isolation.
-struct TaskRunParams<'a> {
-    task: &'a BenchTask,
-    suite_id: &'a str,
-    config_label: &'a str,
-    llm: Arc<dyn LlmProvider>,
-    safety: Arc<SafetyLayer>,
-    timeout: std::time::Duration,
-    additional_tools: &'a [Arc<dyn ironclaw::tools::Tool>],
-}
-
-/// Orchestrates benchmark execution: loads tasks, runs agent per task,
-/// scores results, writes JSONL output.
-pub struct BenchRunner {
-    suite: Arc<dyn BenchSuite>,
-    config: BenchConfig,
-    llm: Arc<dyn LlmProvider>,
-    safety: Arc<SafetyLayer>,
-}
-
-impl BenchRunner {
-    pub fn new(
-        suite: Box<dyn BenchSuite>,
-        config: BenchConfig,
-        llm: Arc<dyn LlmProvider>,
-        safety: Arc<SafetyLayer>,
-    ) -> Self {
-        Self {
-            suite: Arc::from(suite),
-            config,
-            llm,
-            safety,
-        }
-    }
-
-    /// Run the benchmark for one matrix entry.
-    ///
-    /// Returns the run_id for result retrieval.
-    pub async fn run(
-        &self,
-        matrix: &MatrixEntry,
-        sample: Option<usize>,
-        task_filter: Option<&[String]>,
-        tag_filter: Option<&[String]>,
-        resume_run_id: Option<Uuid>,
-    ) -> Result<Uuid, BenchError> {
-        let run_id = resume_run_id.unwrap_or_else(Uuid::new_v4);
-        let results_base = &self.config.results_dir;
-        let dir = run_dir(results_base, run_id);
-        std::fs::create_dir_all(&dir)?;
-
-        let jsonl_path = tasks_jsonl_path(results_base, run_id);
-        let json_path = run_json_path(results_base, run_id);
-
-        // Load completed task IDs for resume support
-        let completed: HashSet<String> = if resume_run_id.is_some() {
-            completed_task_ids(&jsonl_path)?
-        } else {
-            HashSet::new()
-        };
-
-        if !completed.is_empty() {
-            tracing::info!(
-                "Resuming run {}: {} tasks already completed",
-                run_id,
-                completed.len()
-            );
-        }
-
-        // Load all tasks once (used for both execution and scoring)
-        let all_tasks = self.suite.load_tasks().await?;
-        let task_index: HashMap<String, BenchTask> = all_tasks
-            .iter()
-            .map(|t| (t.id.clone(), t.clone()))
-            .collect();
-
-        // Filter tasks for execution
-        let mut tasks = all_tasks;
-
-        if let Some(ids) = task_filter {
-            let id_set: HashSet<&str> = ids.iter().map(|s| s.as_str()).collect();
-            tasks.retain(|t| id_set.contains(t.id.as_str()));
-        }
-
-        if let Some(tags) = tag_filter {
-            let tag_set: HashSet<&str> = tags.iter().map(|s| s.as_str()).collect();
-            tasks.retain(|t| t.tags.iter().any(|tag| tag_set.contains(tag.as_str())));
-        }
-
-        // Filter out already-completed tasks
-        tasks.retain(|t| !completed.contains(&t.id));
-
-        // Sample if requested
-        if let Some(n) = sample {
-            tasks.truncate(n);
-        }
-
-        let total_tasks = tasks.len() + completed.len();
-        let model_label = matrix.model.as_deref().unwrap_or(self.llm.model_name());
-        let commit_hash = git_short_hash();
-        tracing::info!(
-            "[{} @ {}] Running {} tasks for suite '{}' (run: {})",
-            model_label,
-            commit_hash,
-            tasks.len(),
-            self.suite.id(),
-            run_id
-        );
-
-        let started_at = Utc::now();
-        let all_results: Arc<Mutex<Vec<TaskResult>>> =
-            Arc::new(Mutex::new(Vec::with_capacity(tasks.len())));
-
-        if self.config.parallelism <= 1 {
-            // Sequential execution
-            let additional_tools = self.suite.additional_tools();
-            for (i, task) in tasks.iter().enumerate() {
-                tracing::info!(
-                    "[{}/{}] Running task: {}",
-                    i + 1 + completed.len(),
-                    total_tasks,
-                    task.id
-                );
-                if let Err(e) = self.suite.setup_task(task).await {
-                    tracing::warn!("setup_task failed for {}: {}", task.id, e);
-                    let result = make_error_result(
-                        task,
-                        self.suite.id(),
-                        &matrix.label,
-                        Utc::now(),
-                        &format!("setup_task failed: {e}"),
-                    );
-                    append_task_result(&jsonl_path, &result)?;
-                    all_results.lock().await.push(result);
-                    continue;
-                }
-                let params = TaskRunParams {
-                    task,
-                    suite_id: self.suite.id(),
-                    config_label: &matrix.label,
-                    llm: Arc::clone(&self.llm),
-                    safety: Arc::clone(&self.safety),
-                    timeout: task.timeout.unwrap_or(self.config.task_timeout),
-                    additional_tools: &additional_tools,
-                };
-                let result = run_task_isolated(params).await;
-                if let Err(e) = self.suite.teardown_task(task).await {
-                    tracing::warn!("teardown_task failed for {}: {}", task.id, e);
-                }
-                append_task_result(&jsonl_path, &result)?;
-                all_results.lock().await.push(result);
-            }
-        } else {
-            // Parallel execution with bounded concurrency
-            let semaphore = Arc::new(tokio::sync::Semaphore::new(self.config.parallelism));
-            let shared_tools: Arc<[Arc<dyn ironclaw::tools::Tool>]> =
-                Arc::from(self.suite.additional_tools());
-
-            let mut handles = Vec::new();
-            for (i, task) in tasks.into_iter().enumerate() {
-                let sem = Arc::clone(&semaphore);
-                let suite = Arc::clone(&self.suite);
-                let config_label = matrix.label.clone();
-                let llm = Arc::clone(&self.llm);
-                let safety = Arc::clone(&self.safety);
-                let timeout = task.timeout.unwrap_or(self.config.task_timeout);
-                let results_ref = Arc::clone(&all_results);
-                let completed_count = completed.len();
-                let total = total_tasks;
-                let additional_tools = Arc::clone(&shared_tools);
-
-                handles.push(tokio::spawn(async move {
-                    let _permit = match sem.acquire().await {
-                        Ok(p) => p,
-                        Err(_) => {
-                            tracing::error!("Semaphore closed for task {}", task.id);
-                            return;
-                        }
-                    };
-                    tracing::info!(
-                        "[{}/{}] Running task: {}",
-                        i + 1 + completed_count,
-                        total,
-                        task.id
-                    );
-                    if let Err(e) = suite.setup_task(&task).await {
-                        tracing::warn!("setup_task failed for {}: {}", task.id, e);
-                        let result = make_error_result(
-                            &task,
-                            suite.id(),
-                            &config_label,
-                            Utc::now(),
-                            &format!("setup_task failed: {e}"),
-                        );
-                        results_ref.lock().await.push(result);
-                        return;
-                    }
-                    let suite_id = suite.id().to_string();
-                    let params = TaskRunParams {
-                        task: &task,
-                        suite_id: &suite_id,
-                        config_label: &config_label,
-                        llm,
-                        safety,
-                        timeout,
-                        additional_tools: &additional_tools,
-                    };
-                    let result = run_task_isolated(params).await;
-                    if let Err(e) = suite.teardown_task(&task).await {
-                        tracing::warn!("teardown_task failed for {}: {}", task.id, e);
-                    }
-                    results_ref.lock().await.push(result);
-                }));
-            }
-
-            for handle in handles {
-                if let Err(e) = handle.await {
-                    tracing::error!("Task panicked: {}", e);
-                }
-            }
-
-            // Write all results to JSONL after parallel execution completes.
-            // This avoids the race condition of concurrent file appends.
-            let results = all_results.lock().await;
-            for result in results.iter() {
-                append_task_result(&jsonl_path, result)?;
-            }
-        }
-
-        // Score all results using the cached task index
-        let results = all_results.lock().await;
-        let mut scored: Vec<TaskResult> = Vec::with_capacity(results.len());
-        for result in results.iter() {
-            if let Some(task) = task_index.get(&result.task_id) {
-                let submission = TaskSubmission {
-                    response: result.response.clone(),
-                    conversation: vec![],
-                    tool_calls: result
-                        .trace
-                        .tool_calls
-                        .iter()
-                        .map(|tc| tc.name.clone())
-                        .collect(),
-                    error: result.error.clone(),
-                };
-                match self.suite.score(task, &submission).await {
-                    Ok(score) => {
-                        let mut scored_result = result.clone();
-                        scored_result.score = score;
-                        scored.push(scored_result);
-                    }
-                    Err(e) => {
-                        tracing::warn!("Scoring failed for {}: {}", result.task_id, e);
-                        scored.push(result.clone());
-                    }
-                }
-            } else {
-                scored.push(result.clone());
-            }
-        }
-
-        // Combine with any previously completed results for the aggregate
-        let mut all_for_aggregate = crate::results::read_task_results(&jsonl_path)?;
-        // De-duplicate (prefer the newer scored versions)
-        let scored_ids: HashSet<String> = scored.iter().map(|r| r.task_id.clone()).collect();
-        all_for_aggregate.retain(|r| !scored_ids.contains(&r.task_id));
-        all_for_aggregate.extend(scored);
-
-        // Rewrite JSONL with scored results so `results` command shows final scores
-        write_task_results(&jsonl_path, &all_for_aggregate)?;
-
-        let model_name = matrix.model.as_deref().unwrap_or(self.llm.model_name());
-
-        let run_result = RunResult::from_tasks(
-            run_id,
-            self.suite.id(),
-            &matrix.label,
-            model_name,
-            &commit_hash,
-            total_tasks,
-            &all_for_aggregate,
-            started_at,
-        );
-
-        write_run_result(&json_path, &run_result)?;
-
-        tracing::info!(
-            "[{} @ {}] Run {} complete: {:.1}% pass rate, {:.3} avg score, ${:.4} cost",
-            model_name,
-            commit_hash,
-            run_id,
-            run_result.pass_rate * 100.0,
-            run_result.avg_score,
-            run_result.total_cost_usd,
-        );
-
-        Ok(run_id)
-    }
-}
-
-/// Run a single benchmark task in complete isolation.
-///
-/// Creates a fresh Agent + BenchChannel + InstrumentedLlm for the task,
-/// injects the prompt, waits for the response, and returns the result.
-///
-/// # Current limitations
-///
-/// - **Single-turn only**: After the first assistant response, `/quit` is sent.
-///   Multi-turn suites (e.g., Tau-bench's `next_user_message()`) are not yet wired.
-/// - **Resources not injected**: `BenchTask.resources` (e.g., GAIA file attachments)
-///   are not included in the prompt or made available via the workspace.
-/// - **Conversation not captured**: `TaskSubmission.conversation` is always empty,
-///   which prevents multi-turn scoring hooks from working.
-async fn run_task_isolated(params: TaskRunParams<'_>) -> TaskResult {
-    let TaskRunParams {
-        task,
-        suite_id,
-        config_label,
-        llm,
-        safety,
-        timeout,
-        additional_tools,
-    } = params;
-
-    let started_at = Utc::now();
-    let start = Instant::now();
-
-    // Wrap LLM with instrumentation
-    let instrumented = Arc::new(InstrumentedLlm::new(llm));
-
-    // Create bench channel
-    let (bench_channel, msg_tx) = BenchChannel::new();
-    let capture = bench_channel.capture();
-
-    // Build tool registry
-    let tools = Arc::new(ToolRegistry::new());
-    tools.register_builtin_tools();
-
-    // Register additional suite-specific tools
-    for tool in additional_tools {
-        tools.register(Arc::clone(tool)).await;
-    }
-
-    // Build agent config (minimal, headless)
-    let agent_config = AgentConfig {
-        name: format!("bench-{}", task.id),
-        max_parallel_jobs: 1,
-        job_timeout: timeout,
-        stuck_threshold: timeout,
-        repair_check_interval: timeout + std::time::Duration::from_secs(999),
-        max_repair_attempts: 0,
-        use_planning: false,
-        session_idle_timeout: timeout,
-        allow_local_tools: true,
-        max_cost_per_day_cents: None,
-        max_actions_per_hour: None,
-    };
-
-    let cost_guard = Arc::new(ironclaw::agent::cost_guard::CostGuard::new(
-        ironclaw::agent::cost_guard::CostGuardConfig::default(),
-    ));
-
-    let deps = AgentDeps {
-        store: None,
-        llm: instrumented.clone() as Arc<dyn LlmProvider>,
-        cheap_llm: None,
-        safety,
-        tools,
-        workspace: None,
-        extension_manager: None,
-        skill_registry: None,
-        skills_config: ironclaw::config::SkillsConfig::default(),
-        hooks: Arc::new(ironclaw::hooks::HookRegistry::new()),
-        cost_guard,
-    };
-
-    let mut channels = ChannelManager::new();
-    channels.add(Box::new(bench_channel));
-
-    let agent = Agent::new(agent_config, deps, channels, None, None, None, None, None);
-
-    // Build the full prompt with context
-    let full_prompt = if let Some(ref ctx) = task.context {
-        format!("{}\n\nContext:\n{}", task.prompt, ctx)
-    } else {
-        task.prompt.clone()
-    };
-
-    // Inject the task prompt
-    let incoming = IncomingMessage::new("bench", "bench-user", &full_prompt);
-    if msg_tx.send(incoming).await.is_err() {
-        return make_error_result(
-            task,
-            suite_id,
-            config_label,
-            started_at,
-            "failed to send prompt",
-        );
-    }
-
-    // Record prompt in conversation
-    {
-        let mut cap = capture.lock().await;
-        cap.conversation.push(ConversationTurn {
-            role: TurnRole::User,
-            content: full_prompt,
-        });
-    }
-
-    // Run agent with timeout.
-    // After the first response, send /quit to end the session.
-    let quit_tx = msg_tx.clone();
-    let capture_for_quit = Arc::clone(&capture);
-    let quit_handle = tokio::spawn(async move {
-        // Poll for first response
-        loop {
-            tokio::time::sleep(std::time::Duration::from_millis(100)).await;
-            let cap = capture_for_quit.lock().await;
-            if !cap.responses.is_empty() {
-                break;
-            }
-        }
-        // Give a small grace period for any final status events
-        tokio::time::sleep(std::time::Duration::from_millis(200)).await;
-        let quit = IncomingMessage::new("bench", "bench-user", "/quit");
-        let _ = quit_tx.send(quit).await;
-    });
-
-    let agent_result = tokio::time::timeout(timeout, agent.run()).await;
-
-    quit_handle.abort();
-
-    let wall_time = start.elapsed();
-    let hit_timeout = agent_result.is_err();
-
-    if let Ok(Err(e)) = &agent_result {
-        tracing::warn!("Agent error for task {}: {}", task.id, e);
-    }
-
-    // Extract results from capture
-    let cap = capture.lock().await;
-    let response = cap.responses.last().cloned().unwrap_or_default();
-
-    let trace = Trace {
-        wall_time_ms: wall_time.as_millis() as u64,
-        llm_calls: instrumented.call_count(),
-        input_tokens: instrumented.total_input_tokens(),
-        output_tokens: instrumented.total_output_tokens(),
-        estimated_cost_usd: instrumented.estimated_cost(),
-        tool_calls: cap.tool_calls.clone(),
-        turns: cap.responses.len() as u32,
-        hit_iteration_limit: false,
-        hit_timeout,
-    };
-
-    let error = if hit_timeout {
-        Some(format!("timeout after {}s", timeout.as_secs()))
-    } else if let Ok(Err(e)) = &agent_result {
-        Some(e.to_string())
-    } else {
-        None
-    };
-
-    TaskResult {
-        task_id: task.id.clone(),
-        suite_id: suite_id.to_string(),
-        score: crate::suite::BenchScore {
-            value: 0.0,
-            label: "pending".to_string(),
-            details: None,
-        },
-        trace,
-        response,
-        started_at,
-        finished_at: Utc::now(),
-        config_label: config_label.to_string(),
-        error,
-    }
-}
-
-fn make_error_result(
-    task: &BenchTask,
-    suite_id: &str,
-    config_label: &str,
-    started_at: chrono::DateTime<Utc>,
-    reason: &str,
-) -> TaskResult {
-    TaskResult {
-        task_id: task.id.clone(),
-        suite_id: suite_id.to_string(),
-        score: crate::suite::BenchScore::fail(reason),
-        trace: Trace {
-            wall_time_ms: 0,
-            llm_calls: 0,
-            input_tokens: 0,
-            output_tokens: 0,
-            estimated_cost_usd: 0.0,
-            tool_calls: vec![],
-            turns: 0,
-            hit_iteration_limit: false,
-            hit_timeout: false,
-        },
-        response: String::new(),
-        started_at,
-        finished_at: Utc::now(),
-        config_label: config_label.to_string(),
-        error: Some(reason.to_string()),
-    }
-}
-
-/// Get the short git commit hash of HEAD, or "unknown" if not in a repo.
-fn git_short_hash() -> String {
-    std::process::Command::new("git")
-        .args(["rev-parse", "--short", "HEAD"])
-        .output()
-        .ok()
-        .and_then(|o| {
-            if o.status.success() {
-                Some(String::from_utf8_lossy(&o.stdout).trim().to_string())
-            } else {
-                None
-            }
-        })
-        .unwrap_or_else(|| "unknown".to_string())
-}

benchmarks/src/scoring.rs

@@ -1,113 +0,0 @@
-use regex::Regex;
-
-use crate::suite::BenchScore;
-
-/// Normalize an answer string for comparison: lowercase, trim whitespace,
-/// strip trailing punctuation, collapse internal whitespace.
-pub fn normalize_answer(s: &str) -> String {
-    let trimmed = s.trim().to_lowercase();
-    let collapsed: String = trimmed.split_whitespace().collect::<Vec<_>>().join(" ");
-    collapsed.trim_end_matches(['.', ',', ';', '!']).to_string()
-}
-
-/// Exact match after normalization.
-pub fn exact_match(expected: &str, actual: &str) -> BenchScore {
-    let norm_expected = normalize_answer(expected);
-    let norm_actual = normalize_answer(actual);
-    if norm_expected == norm_actual {
-        BenchScore::pass()
-    } else {
-        BenchScore::fail(format!(
-            "expected \"{norm_expected}\", got \"{norm_actual}\""
-        ))
-    }
-}
-
-/// Check if the actual answer contains the expected substring (normalized).
-pub fn contains_match(expected_substring: &str, actual: &str) -> BenchScore {
-    let norm_expected = normalize_answer(expected_substring);
-    let norm_actual = normalize_answer(actual);
-    if norm_actual.contains(&norm_expected) {
-        BenchScore::pass()
-    } else {
-        BenchScore::fail(format!("response does not contain \"{norm_expected}\""))
-    }
-}
-
-/// Check if the actual answer matches a regex pattern.
-pub fn regex_match(pattern: &str, actual: &str) -> BenchScore {
-    match Regex::new(pattern) {
-        Ok(re) => {
-            if re.is_match(actual) {
-                BenchScore::pass()
-            } else {
-                BenchScore::fail(format!("response does not match pattern /{pattern}/"))
-            }
-        }
-        Err(e) => BenchScore::fail(format!("invalid regex pattern: {e}")),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_normalize_answer() {
-        assert_eq!(normalize_answer("  Hello   World.  "), "hello world");
-        assert_eq!(normalize_answer("Yes!"), "yes");
-        assert_eq!(normalize_answer("42"), "42");
-        assert_eq!(normalize_answer("  "), "");
-    }
-
-    #[test]
-    fn test_exact_match_pass() {
-        let score = exact_match("Hello World", "  hello   world.  ");
-        assert_eq!(score.value, 1.0);
-        assert_eq!(score.label, "pass");
-    }
-
-    #[test]
-    fn test_exact_match_fail() {
-        let score = exact_match("hello", "world");
-        assert_eq!(score.value, 0.0);
-        assert_eq!(score.label, "fail");
-    }
-
-    #[test]
-    fn test_contains_match_pass() {
-        let score = contains_match("world", "Hello World!");
-        assert_eq!(score.value, 1.0);
-    }
-
-    #[test]
-    fn test_contains_match_fail() {
-        let score = contains_match("xyz", "Hello World!");
-        assert_eq!(score.value, 0.0);
-    }
-
-    #[test]
-    fn test_regex_match_pass() {
-        let score = regex_match(r"\d{4}", "The year is 2024.");
-        assert_eq!(score.value, 1.0);
-    }
-
-    #[test]
-    fn test_regex_match_fail() {
-        let score = regex_match(r"\d{4}", "No numbers here.");
-        assert_eq!(score.value, 0.0);
-    }
-
-    #[test]
-    fn test_regex_match_invalid_pattern() {
-        let score = regex_match(r"[invalid", "anything");
-        assert_eq!(score.value, 0.0);
-        assert!(
-            score
-                .details
-                .as_deref()
-                .unwrap_or("")
-                .contains("invalid regex")
-        );
-    }
-}

benchmarks/src/suite.rs

@@ -1,154 +0,0 @@
-use std::sync::Arc;
-use std::time::Duration;
-
-use async_trait::async_trait;
-
-use crate::error::BenchError;
-
-/// A single task in a benchmark suite.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct BenchTask {
-    pub id: String,
-    pub prompt: String,
-    #[serde(default)]
-    pub context: Option<String>,
-    #[serde(default)]
-    pub resources: Vec<TaskResource>,
-    #[serde(default)]
-    pub tags: Vec<String>,
-    #[serde(default)]
-    pub expected_turns: Option<usize>,
-    #[serde(default)]
-    pub timeout: Option<Duration>,
-    #[serde(default)]
-    pub metadata: serde_json::Value,
-}
-
-/// A resource attached to a benchmark task (file, URL, etc.).
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct TaskResource {
-    pub name: String,
-    pub path: String,
-    #[serde(default)]
-    pub resource_type: ResourceType,
-}
-
-#[derive(Debug, Clone, Default, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum ResourceType {
-    #[default]
-    File,
-    Url,
-    Directory,
-}
-
-/// What the agent produced for scoring.
-#[derive(Debug, Clone)]
-#[allow(dead_code)]
-pub struct TaskSubmission {
-    pub response: String,
-    pub conversation: Vec<ConversationTurn>,
-    pub tool_calls: Vec<String>,
-    pub error: Option<String>,
-}
-
-/// A single turn in a multi-turn conversation.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct ConversationTurn {
-    pub role: TurnRole,
-    pub content: String,
-}
-
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum TurnRole {
-    User,
-    Assistant,
-    System,
-}
-
-/// Score for a single task.
-#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
-pub struct BenchScore {
-    /// 0.0 to 1.0 (1.0 = perfect).
-    pub value: f64,
-    /// "pass" / "fail" / "partial".
-    pub label: String,
-    #[serde(default)]
-    pub details: Option<String>,
-}
-
-impl BenchScore {
-    pub fn pass() -> Self {
-        Self {
-            value: 1.0,
-            label: "pass".to_string(),
-            details: None,
-        }
-    }
-
-    pub fn fail(details: impl Into<String>) -> Self {
-        Self {
-            value: 0.0,
-            label: "fail".to_string(),
-            details: Some(details.into()),
-        }
-    }
-
-    pub fn partial(value: f64, details: impl Into<String>) -> Self {
-        Self {
-            value: value.clamp(0.0, 1.0),
-            label: "partial".to_string(),
-            details: Some(details.into()),
-        }
-    }
-}
-
-/// Trait for benchmark suite adapters.
-///
-/// Each suite (GAIA, Tau-bench, custom, etc.) implements this trait
-/// to provide task loading, scoring, and optional lifecycle hooks.
-#[async_trait]
-#[allow(dead_code)]
-pub trait BenchSuite: Send + Sync {
-    /// Human-readable name (e.g., "GAIA Validation").
-    fn name(&self) -> &str;
-
-    /// Machine ID (e.g., "gaia").
-    fn id(&self) -> &str;
-
-    /// Load all tasks from the suite's data source.
-    async fn load_tasks(&self) -> Result<Vec<BenchTask>, BenchError>;
-
-    /// Score the agent's submission against the expected answer.
-    async fn score(
-        &self,
-        task: &BenchTask,
-        submission: &TaskSubmission,
-    ) -> Result<BenchScore, BenchError>;
-
-    /// Optional: set up environment before running a task (clone repo, init DB, etc.).
-    async fn setup_task(&self, _task: &BenchTask) -> Result<(), BenchError> {
-        Ok(())
-    }
-
-    /// Optional: tear down environment after a task completes.
-    async fn teardown_task(&self, _task: &BenchTask) -> Result<(), BenchError> {
-        Ok(())
-    }
-
-    /// Optional: additional tools to register for this suite's tasks.
-    fn additional_tools(&self) -> Vec<Arc<dyn ironclaw::tools::Tool>> {
-        vec![]
-    }
-
-    /// Multi-turn: generate next simulated user message based on conversation so far.
-    /// Return `None` to end the conversation.
-    async fn next_user_message(
-        &self,
-        _task: &BenchTask,
-        _conversation: &[ConversationTurn],
-    ) -> Result<Option<String>, BenchError> {
-        Ok(None)
-    }
-}

channels-src/discord/Cargo.toml

@@ -1,25 +0,0 @@
-[package]
-name = "discord-channel"
-version = "0.1.0"
-edition = "2021"
-description = "Discord channel for IronClaw"
-license = "MIT OR Apache-2.0"
-publish = false
-
-[dependencies]
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-wit-bindgen = "0.41.0"
-
-[lib]
-crate-type = ["cdylib"]
-
-[profile.release]
-strip = true
-opt-level = "s"
-lto = true
-codegen-units = 1
-
-
-
-[workspace]

channels-src/discord/README.md

@@ -1,121 +0,0 @@
-# Discord Channel for IronClaw
-
-WASM channel for Discord integration - handle slash commands and button interactions via webhooks.
-
-## Features
-
-- **Slash Commands** - Process Discord slash commands
-- **Button Interactions** - Handle button clicks
-- **Thread Support** - Respond in threads
-- **DM Support** - Handle direct messages
-
-## Setup
-
-1. Create a Discord Application at <https://discord.com/developers/applications>
-2. Create a Bot and get the token
-3. Set up Interactions URL to point to your IronClaw instance
-4. Copy the Application ID and Public Key
-5. Store in IronClaw secrets:
-
-   ```bash
-   ironclaw secret set discord_bot_token YOUR_BOT_TOKEN
-   ```
-
-   **Note:** The `discord_bot_token` secret is the only value read directly by this
-   Discord channel WASM component. The `discord_app_id` and `discord_public_key`
-   secrets are used by the IronClaw host (for example, to verify Discord
-   interaction signatures and manage slash command registration) and are not
-   accessed from the WASM module itself.
-
-## Discord Configuration
-
-### Register Slash Commands
-
-```bash
-curl -X POST \
-  -H "Authorization: Bot YOUR_BOT_TOKEN" \
-  -H "Content-Type: application/json" \
-  https://discord.com/api/v10/applications/YOUR_APP_ID/commands \
-  -d '{
-    "name": "ask",
-    "description": "Ask the AI agent",
-    "options": [{
-      "name": "question",
-      "description": "Your question",
-      "type": 3,
-      "required": true
-    }]
-  }'
-```
-
-### Set Interactions Endpoint
-
-In your Discord app settings, set:
-
-- Interactions Endpoint URL: `https://your-ironclaw.com/webhook/discord`
-
-## Usage Examples
-
-### Slash Command
-
-User types: `/ask question: What is the weather?`
-
-The agent receives:
-
-```text
-User: @username
-Content: /ask question: What is the weather?
-```
-
-### Button Click
-
-When a user clicks a button in a message, the agent receives:
-
-```text
-User: @username
-Content: [Button clicked] Original message content
-```
-
-## Error Handling
-
-If an internal error occurs (e.g., metadata serialization failure), the tool attempts to send an ephemeral message to the user:
-
-```text
-❌ Internal Error: Failed to process command metadata.
-```
-
-Check the host logs for detailed error information.
-
-## Advanced Usage
-
-### Embeds
-
-To send embeds, include an `embeds` array in the `metadata_json` field of the agent's response. The structure should match the Discord API `embed` object.
-
-## Troubleshooting
-
-### "Invalid Signature"
-
-- Check that `discord_public_key` is set correctly in IronClaw secrets.
-- This validation happens on the host before reaching the WASM.
-
-### "401 Unauthorized"
-
-- Check that `discord_bot_token` is set correctly in IronClaw secrets.
-- Ensure the bot is added to the server.
-
-### "Interaction Failed"
-
-- The interaction might have timed out (Discord requires a response within 3 seconds).
-- The `interactions_endpoint_url` might be unreachable.
-
-## Building
-
-```bash
-cd channels-src/discord
-cargo build --target wasm32-wasi --release
-```
-
-## License
-
-MIT/Apache-2.0

channels-src/discord/discord.capabilities.json

@@ -1,39 +0,0 @@
-{
-  "type": "channel",
-  "name": "discord",
-  "description": "Discord Gateway/Webhook channel for handling slash commands, buttons, and messages",
-  "capabilities": {
-    "http": {
-      "allowlist": [
-        { "host": "discord.com", "path_prefix": "/api/v10" }
-      ],
-      "credentials": {
-        "discord_bot_token": {
-          "secret_name": "discord_bot_token",
-          "location": { "type": "header", "header_name": "Authorization", "prefix": "Bot " },
-          "host_patterns": ["discord.com"]
-        }
-      },
-      "rate_limit": {
-        "requests_per_minute": 60,
-        "requests_per_hour": 3600
-      }
-    },
-    "secrets": {
-      "allowed_names": ["discord_bot_token", "discord_*"]
-    },
-    "channel": {
-      "allowed_paths": ["/webhook/discord"],
-      "allow_polling": false,
-      "callback_timeout_secs": 45,
-      "workspace_prefix": "channels/discord/",
-      "emit_rate_limit": {
-        "messages_per_minute": 100,
-        "messages_per_hour": 5000
-      }
-    }
-  },
-  "config": {
-    "require_signature_verification": true
-  }
-}

channels-src/discord/src/lib.rs

@@ -1,476 +0,0 @@
-//! Discord Gateway/Webhook channel for IronClaw.
-//!
-//! This WASM component implements the channel interface for handling Discord
-//! interactions via webhooks and sending messages back to Discord.
-//!
-//! # Features
-//!
-//! - URL verification for Discord interactions
-//! - Slash command handling
-//! - Message event parsing (@mentions, DMs)
-//! - Thread support for conversations
-//! - Response posting via Discord Web API
-//! - Automatic message truncation (> 2000 chars)
-//!
-//! # Security
-//!
-//! - Signature validation is handled by the host (webhook secrets)
-//! - Bot token is injected by host during HTTP requests
-//! - WASM never sees raw credentials
-
-wit_bindgen::generate!({
-    world: "sandboxed-channel",
-    path: "../../wit/channel.wit",
-});
-
-use serde::{Deserialize, Serialize};
-
-use exports::near::agent::channel::{
-    AgentResponse, ChannelConfig, Guest, HttpEndpointConfig, IncomingHttpRequest,
-    OutgoingHttpResponse, StatusUpdate,
-};
-use near::agent::channel_host::{self, EmittedMessage};
-
-/// Discord interaction wrapper.
-#[derive(Debug, Deserialize)]
-struct DiscordInteraction {
-    /// Interaction type (1=Ping, 2=ApplicationCommand, 3=MessageComponent)
-    #[serde(rename = "type")]
-    interaction_type: u8,
-
-    /// Interaction ID
-    id: String,
-
-    /// Application ID
-    application_id: String,
-
-    /// Guild ID (if in server)
-    #[allow(dead_code)] // Part of API payload, currently unused
-    guild_id: Option<String>,
-
-    /// Channel ID
-    channel_id: Option<String>,
-
-    /// Member info (if in server)
-    member: Option<DiscordMember>,
-
-    /// User info (if DM)
-    user: Option<DiscordUser>,
-
-    /// Command data (for slash commands)
-    data: Option<DiscordCommandData>,
-
-    /// Message (for component interactions)
-    message: Option<DiscordMessage>,
-
-    /// Token for responding
-    token: String,
-}
-
-#[derive(Debug, Deserialize, Clone)]
-struct DiscordMember {
-    user: DiscordUser,
-    #[allow(dead_code)] // Part of API payload, currently unused
-    nick: Option<String>,
-}
-
-#[derive(Debug, Deserialize, Clone)]
-struct DiscordUser {
-    id: String,
-    username: String,
-    global_name: Option<String>,
-}
-
-#[derive(Debug, Deserialize, Clone)]
-struct DiscordCommandData {
-    #[allow(dead_code)] // Part of API payload, currently unused
-    id: String,
-    name: String,
-    options: Option<Vec<DiscordCommandOption>>,
-}
-
-#[derive(Debug, Deserialize, Clone)]
-struct DiscordCommandOption {
-    name: String,
-    value: serde_json::Value,
-}
-
-#[derive(Debug, Deserialize, Clone)]
-struct DiscordMessage {
-    #[allow(dead_code)] // Part of API payload, currently unused
-    id: String,
-    content: String,
-    channel_id: String,
-    #[allow(dead_code)] // Part of API payload, currently unused
-    author: DiscordUser,
-}
-
-/// Metadata stored with emitted messages for response routing.
-#[derive(Debug, Serialize, Deserialize)]
-struct DiscordMessageMetadata {
-    /// Discord channel ID
-    channel_id: String,
-
-    /// Interaction ID for followups
-    interaction_id: String,
-
-    /// Interaction token for responding
-    token: String,
-
-    /// Application ID
-    application_id: String,
-
-    /// Thread ID (for forum threads)
-    thread_id: Option<String>,
-}
-
-struct DiscordChannel;
-
-impl Guest for DiscordChannel {
-    fn on_start(_config_json: String) -> Result<ChannelConfig, String> {
-        channel_host::log(channel_host::LogLevel::Info, "Discord channel starting");
-
-        Ok(ChannelConfig {
-            display_name: "Discord".to_string(),
-            http_endpoints: vec![HttpEndpointConfig {
-                path: "/webhook/discord".to_string(),
-                methods: vec!["POST".to_string()],
-                require_secret: true,
-            }],
-            poll: None,
-        })
-    }
-
-    fn on_http_request(req: IncomingHttpRequest) -> OutgoingHttpResponse {
-        let body_str = match std::str::from_utf8(&req.body) {
-            Ok(s) => s,
-            Err(_) => {
-                return json_response(400, serde_json::json!({"error": "Invalid UTF-8 body"}));
-            }
-        };
-
-        let interaction: DiscordInteraction = match serde_json::from_str(body_str) {
-            Ok(i) => i,
-            Err(e) => {
-                channel_host::log(
-                    channel_host::LogLevel::Error,
-                    &format!("Failed to parse Discord interaction: {}", e),
-                );
-                return json_response(400, serde_json::json!({"error": "Invalid interaction"}));
-            }
-        };
-
-        match interaction.interaction_type {
-            // Ping - Discord verification
-            1 => {
-                channel_host::log(channel_host::LogLevel::Info, "Responding to Discord ping");
-                json_response(200, serde_json::json!({"type": 1}))
-            }
-
-            // Application Command (slash command)
-            2 => {
-                handle_slash_command(&interaction);
-                json_response(
-                    200,
-                    serde_json::json!({
-                        "type": 5,
-                        "data": {
-                            "content": "🤔 Thinking..."
-                        }
-                    }),
-                )
-            }
-
-            // Message Component (buttons, selects)
-            3 => {
-                if let Some(ref message) = interaction.message {
-                    handle_message_component(&interaction, message);
-                }
-                json_response(200, serde_json::json!({"type": 6}))
-            }
-
-            _ => {
-                channel_host::log(
-                    channel_host::LogLevel::Warn,
-                    &format!(
-                        "Unknown Discord interaction type: {}",
-                        interaction.interaction_type
-                    ),
-                );
-                json_response(200, serde_json::json!({"type": 6}))
-            }
-        }
-    }
-
-    fn on_poll() {}
-
-    fn on_respond(response: AgentResponse) -> Result<(), String> {
-        let metadata: DiscordMessageMetadata = serde_json::from_str(&response.metadata_json)
-            .map_err(|e| format!("Failed to parse metadata: {}", e))?;
-
-        // Use webhook endpoint for followup
-        let url = format!(
-            "https://discord.com/api/v10/webhooks/{}/{}",
-            metadata.application_id, metadata.token
-        );
-
-        // Truncate content to 2000 characters to comply with Discord limits
-        let content = truncate_message(&response.content);
-
-        let mut payload = serde_json::json!({
-            "content": content,
-        });
-
-        // Check for embeds in metadata
-        if let Ok(meta_json) = serde_json::from_str::<serde_json::Value>(&response.metadata_json) {
-            if let Some(embeds) = meta_json.get("embeds") {
-                payload["embeds"] = embeds.clone();
-            }
-        }
-
-        let payload_bytes =
-            serde_json::to_vec(&payload).map_err(|e| format!("Failed to serialize: {}", e))?;
-
-        let headers = serde_json::json!({
-            "Content-Type": "application/json"
-        });
-
-        let result = channel_host::http_request(
-            "POST",
-            &url,
-            &headers.to_string(),
-            Some(&payload_bytes),
-            None,
-        );
-
-        match result {
-            Ok(http_response) => {
-                if http_response.status >= 200 && http_response.status < 300 {
-                    channel_host::log(channel_host::LogLevel::Debug, "Posted followup to Discord");
-                    Ok(())
-                } else {
-                    let body_str = String::from_utf8_lossy(&http_response.body);
-                    Err(format!(
-                        "Discord API error: {} - {}",
-                        http_response.status, body_str
-                    ))
-                }
-            }
-            Err(e) => Err(format!("HTTP request failed: {}", e)),
-        }
-    }
-
-    fn on_status(_update: StatusUpdate) {}
-
-    fn on_shutdown() {
-        channel_host::log(
-            channel_host::LogLevel::Info,
-            "Discord channel shutting down",
-        );
-    }
-}
-
-fn handle_slash_command(interaction: &DiscordInteraction) {
-    let user = interaction
-        .member
-        .as_ref()
-        .map(|m| &m.user)
-        .or(interaction.user.as_ref());
-    let user_id = user.map(|u| u.id.clone()).unwrap_or_default();
-    let user_name = user
-        .map(|u| {
-            u.global_name
-                .as_ref()
-                .filter(|s| !s.is_empty())
-                .unwrap_or(&u.username)
-                .clone()
-        })
-        .unwrap_or_default();
-
-    let channel_id = interaction.channel_id.clone().unwrap_or_default();
-
-    let command_name = interaction
-        .data
-        .as_ref()
-        .map(|d| d.name.clone())
-        .unwrap_or_default();
-    let options = interaction.data.as_ref().and_then(|d| d.options.clone());
-
-    let content = if let Some(opts) = options {
-        let opt_str = opts
-            .iter()
-            .map(|o| format!("{}: {}", o.name, o.value))
-            .collect::<Vec<_>>()
-            .join(", ");
-        format!("/{} {}", command_name, opt_str)
-    } else {
-        format!("/{}", command_name)
-    };
-
-    let metadata = DiscordMessageMetadata {
-        channel_id: channel_id.clone(),
-        interaction_id: interaction.id.clone(),
-        token: interaction.token.clone(),
-        application_id: interaction.application_id.clone(),
-        thread_id: None,
-    };
-
-    let metadata_json = match serde_json::to_string(&metadata) {
-        Ok(json) => json,
-        Err(e) => {
-            channel_host::log(
-                channel_host::LogLevel::Error,
-                &format!("Failed to serialize metadata: {}", e),
-            );
-            // Attempt to notify user of internal error
-            let url = format!(
-                "https://discord.com/api/v10/webhooks/{}/{}",
-                interaction.application_id, interaction.token
-            );
-            let payload = serde_json::json!({
-                "content": "❌ Internal Error: Failed to process command metadata.",
-                "flags": 64 // Ephemeral
-            });
-            let _ = channel_host::http_request(
-                "POST",
-                &url,
-                &serde_json::json!({"Content-Type": "application/json"}).to_string(),
-                Some(&serde_json::to_vec(&payload).unwrap_or_default()),
-                None,
-            );
-            return;
-        }
-    };
-
-    channel_host::emit_message(&EmittedMessage {
-        user_id,
-        user_name: Some(user_name),
-        content,
-        thread_id: None,
-        metadata_json,
-    });
-}
-
-fn handle_message_component(interaction: &DiscordInteraction, message: &DiscordMessage) {
-    // Check member first (for server contexts), then user (for DMs)
-    let user = interaction
-        .member
-        .as_ref()
-        .map(|m| &m.user)
-        .or(interaction.user.as_ref());
-    let user_id = user.map(|u| u.id.clone()).unwrap_or_default();
-    let user_name = user
-        .map(|u| {
-            u.global_name
-                .as_ref()
-                .filter(|s| !s.is_empty())
-                .unwrap_or(&u.username)
-                .clone()
-        })
-        .unwrap_or_default();
-
-    let channel_id = message.channel_id.clone();
-
-    let metadata = DiscordMessageMetadata {
-        channel_id: channel_id.clone(),
-        interaction_id: interaction.id.clone(),
-        token: interaction.token.clone(),
-        application_id: interaction.application_id.clone(),
-        thread_id: None,
-    };
-
-    let metadata_json = match serde_json::to_string(&metadata) {
-        Ok(json) => json,
-        Err(e) => {
-            channel_host::log(
-                channel_host::LogLevel::Error,
-                &format!("Failed to serialize metadata: {}", e),
-            );
-            return; // Don't emit message if metadata can't be serialized
-        }
-    };
-
-    channel_host::emit_message(&EmittedMessage {
-        user_id,
-        user_name: Some(user_name),
-        content: format!("[Button clicked] {}", message.content),
-        thread_id: None,
-        metadata_json,
-    });
-}
-
-fn json_response(status: u16, value: serde_json::Value) -> OutgoingHttpResponse {
-    let body = serde_json::to_vec(&value).unwrap_or_default();
-    let headers = serde_json::json!({"Content-Type": "application/json"});
-
-    OutgoingHttpResponse {
-        status,
-        headers_json: headers.to_string(),
-        body,
-    }
-}
-
-export!(DiscordChannel);
-
-fn truncate_message(content: &str) -> String {
-    if content.len() <= 2000 {
-        content.to_string()
-    } else {
-        let max_bytes = 1990;
-        let cutoff = content
-            .char_indices()
-            .map(|(i, c)| i + c.len_utf8())
-            .take_while(|&end| end <= max_bytes)
-            .last()
-            .unwrap_or(0);
-        let mut truncated = content[..cutoff].to_string();
-        truncated.push_str("\n... (truncated)");
-        truncated
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_truncate_message() {
-        let short = "Hello world";
-        assert_eq!(truncate_message(short), short);
-
-        let long = "a".repeat(2005);
-        let truncated = truncate_message(&long);
-        assert_eq!(truncated.len(), 2006); // 1990 + 16 chars suffix
-        assert!(truncated.ends_with("\n... (truncated)"));
-
-        // Test with multibyte characters (Euro sign is 3 bytes)
-        // 1000 chars * 3 bytes = 3000 bytes
-        let multi = "€".repeat(1000);
-        let truncated_multi = truncate_message(&multi);
-
-        // 1990 bytes limit. 1990 / 3 = 663 with remainder 1.
-        // Should truncate at 663 chars (1989 bytes).
-        // Suffix is 16 bytes. Total: 1989 + 16 = 2005 bytes.
-        assert!(truncated_multi.len() <= 2006);
-        assert!(truncated_multi.len() >= 2006 - 4); // Allow for max utf8 char width variance
-        assert!(truncated_multi.ends_with("\n... (truncated)"));
-
-        let content_part = &truncated_multi[..truncated_multi.len() - 16];
-        assert!(content_part.chars().all(|c| c == '€'));
-    }
-
-    #[test]
-    fn test_metadata_serialization() {
-        let metadata = DiscordMessageMetadata {
-            channel_id: "123".into(),
-            interaction_id: "456".into(),
-            token: "abc".into(),
-            application_id: "789".into(),
-            thread_id: None,
-        };
-        let json = serde_json::to_string(&metadata).unwrap();
-        let parsed: DiscordMessageMetadata = serde_json::from_str(&json).unwrap();
-        assert_eq!(parsed.channel_id, "123");
-        assert_eq!(parsed.interaction_id, "456");
-    }
-}

channels-src/slack/Cargo.toml

@@ -27,5 +27,3 @@ opt-level = "s"
 lto = true
 strip = true
 codegen-units = 1
-
-[workspace]

channels-src/slack/src/lib.rs

@@ -338,13 +338,7 @@ fn emit_message(
         team_id,
     };
 
-    let metadata_json = serde_json::to_string(&metadata).unwrap_or_else(|e| {
-        channel_host::log(
-            channel_host::LogLevel::Error,
-            &format!("Failed to serialize Slack metadata: {}", e),
-        );
-        "{}".to_string()
-    });
+    let metadata_json = serde_json::to_string(&metadata).unwrap_or_else(|_| "{}".to_string());
 
     // Strip @ mentions of the bot from the text for cleaner messages
     let cleaned_text = strip_bot_mention(&text);
@@ -372,13 +366,7 @@ fn strip_bot_mention(text: &str) -> String {
 
 /// Create a JSON HTTP response.
 fn json_response(status: u16, value: serde_json::Value) -> OutgoingHttpResponse {
-    let body = serde_json::to_vec(&value).unwrap_or_else(|e| {
-        channel_host::log(
-            channel_host::LogLevel::Error,
-            &format!("Failed to serialize JSON response: {}", e),
-        );
-        Vec::new()
-    });
+    let body = serde_json::to_vec(&value).unwrap_or_default();
     let headers = serde_json::json!({"Content-Type": "application/json"});
 
     OutgoingHttpResponse {

channels-src/telegram/Cargo.toml

@@ -16,14 +16,9 @@ wit-bindgen = "0.36"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 
-# Exclude from parent workspace (this is a standalone WASM component)
-[workspace]
-
 [profile.release]
 # Optimize for size
 opt-level = "s"
 lto = true
 strip = true
 codegen-units = 1
-
-[workspace]

channels-src/telegram/src/lib.rs

@@ -285,7 +285,11 @@ impl Guest for TelegramChannel {
         }
 
         // Persist dm_policy and allow_from for DM pairing in handle_message
-        let dm_policy = config.dm_policy.as_deref().unwrap_or("pairing").to_string();
+        let dm_policy = config
+            .dm_policy
+            .as_deref()
+            .unwrap_or("pairing")
+            .to_string();
         let _ = channel_host::workspace_write(DM_POLICY_PATH, &dm_policy);
 
         let allow_from_json = serde_json::to_string(&config.allow_from.unwrap_or_default())
@@ -840,8 +844,8 @@ fn send_pairing_reply(chat_id: i64, code: &str) -> Result<(), String> {
         "parse_mode": "Markdown",
     });
 
-    let payload_bytes =
-        serde_json::to_vec(&payload).map_err(|e| format!("Failed to serialize payload: {}", e))?;
+    let payload_bytes = serde_json::to_vec(&payload)
+        .map_err(|e| format!("Failed to serialize payload: {}", e))?;
 
     let headers = serde_json::json!({
         "Content-Type": "application/json"
@@ -911,10 +915,15 @@ fn handle_message(message: TelegramMessage) {
     let is_private = message.chat.chat_type == "private";
 
     // Owner validation: when owner_id is set, only that user can message
-    let owner_id_str = channel_host::workspace_read(OWNER_ID_PATH).filter(|s| !s.is_empty());
+    let owner_configured = channel_host::workspace_read(OWNER_ID_PATH)
+        .map(|s| !s.is_empty())
+        .unwrap_or(false);
 
-    if let Some(ref id_str) = owner_id_str {
-        if let Ok(owner_id) = id_str.parse::<i64>() {
+    if owner_configured {
+        if let Ok(owner_id) = channel_host::workspace_read(OWNER_ID_PATH)
+            .unwrap()
+            .parse::<i64>()
+        {
             if from.id != owner_id {
                 channel_host::log(
                     channel_host::LogLevel::Debug,
@@ -928,8 +937,8 @@ fn handle_message(message: TelegramMessage) {
         }
     } else if is_private {
         // No owner_id: apply dm_policy for private chats
-        let dm_policy =
-            channel_host::workspace_read(DM_POLICY_PATH).unwrap_or_else(|| "pairing".to_string());
+        let dm_policy = channel_host::workspace_read(DM_POLICY_PATH)
+            .unwrap_or_else(|| "pairing".to_string());
 
         if dm_policy != "open" {
             // Build effective allow list: config allow_from + pairing store
@@ -992,7 +1001,8 @@ fn handle_message(message: TelegramMessage) {
 
         if !respond_to_all {
             let has_command = content.starts_with('/');
-            let bot_username = channel_host::workspace_read(BOT_USERNAME_PATH).unwrap_or_default();
+            let bot_username = channel_host::workspace_read(BOT_USERNAME_PATH)
+                .unwrap_or_default();
             let has_bot_mention = if bot_username.is_empty() {
                 content.contains('@')
             } else {
@@ -1038,18 +1048,9 @@ fn handle_message(message: TelegramMessage) {
         },
     );
 
-    // Determine what to emit to the agent.
-    // - `/start` (no args): emit a welcome placeholder so the agent greets the user
-    // - Other bare `/commands` (e.g. /interrupt, /help): pass the raw command through
-    //   so Submission::parse() can handle it
-    // - Commands with args (e.g. `/start hello`): cleaned_text already has the args
-    // - Plain text: pass through as-is
-    let trimmed_content = content.trim();
-    let content_to_emit = if trimmed_content.eq_ignore_ascii_case("/start") {
+    // For /start with no args, emit placeholder so agent can respond with welcome
+    let content_to_emit = if cleaned_text.is_empty() && content.trim().starts_with('/') {
         "[User started the bot]".to_string()
-    } else if cleaned_text.is_empty() && trimmed_content.starts_with('/') {
-        // Bare control command like /interrupt, /stop, /help — pass through raw
-        trimmed_content.to_string()
     } else if cleaned_text.is_empty() {
         return;
     } else {
@@ -1168,77 +1169,6 @@ mod tests {
         assert_eq!(clean_message_text("@MyBot", Some("MyBot")), "");
     }
 
-    #[test]
-    fn test_clean_message_text_bare_commands() {
-        // Bare commands return empty (the caller decides what to emit)
-        assert_eq!(clean_message_text("/start", None), "");
-        assert_eq!(clean_message_text("/interrupt", None), "");
-        assert_eq!(clean_message_text("/stop", None), "");
-        assert_eq!(clean_message_text("/help", None), "");
-        assert_eq!(clean_message_text("/undo", None), "");
-        assert_eq!(clean_message_text("/ping", None), "");
-
-        // Commands with args: command prefix stripped, args returned
-        assert_eq!(clean_message_text("/start hello", None), "hello");
-        assert_eq!(clean_message_text("/help me please", None), "me please");
-        assert_eq!(clean_message_text("/model claude-opus-4-6", None), "claude-opus-4-6");
-    }
-
-    /// Tests for the content_to_emit logic in handle_message.
-    /// Since handle_message uses WASM host calls, we test the decision logic inline.
-    #[test]
-    fn test_content_to_emit_logic() {
-        // Simulates the content_to_emit decision for various inputs.
-        // This mirrors the logic in handle_message after clean_message_text.
-        fn resolve_content(content: &str) -> Option<String> {
-            let cleaned_text = clean_message_text(content, None);
-            let trimmed_content = content.trim();
-            if trimmed_content.eq_ignore_ascii_case("/start") {
-                Some("[User started the bot]".to_string())
-            } else if cleaned_text.is_empty() && trimmed_content.starts_with('/') {
-                Some(trimmed_content.to_string())
-            } else if cleaned_text.is_empty() {
-                None // would return/skip in handle_message
-            } else {
-                Some(cleaned_text)
-            }
-        }
-
-        // /start → welcome placeholder
-        assert_eq!(resolve_content("/start"), Some("[User started the bot]".to_string()));
-        assert_eq!(resolve_content("/Start"), Some("[User started the bot]".to_string()));
-        assert_eq!(resolve_content("  /start  "), Some("[User started the bot]".to_string()));
-
-        // /start with args → pass args through
-        assert_eq!(resolve_content("/start hello"), Some("hello".to_string()));
-
-        // Control commands → pass through raw so Submission::parse() can match
-        assert_eq!(resolve_content("/interrupt"), Some("/interrupt".to_string()));
-        assert_eq!(resolve_content("/stop"), Some("/stop".to_string()));
-        assert_eq!(resolve_content("/help"), Some("/help".to_string()));
-        assert_eq!(resolve_content("/undo"), Some("/undo".to_string()));
-        assert_eq!(resolve_content("/redo"), Some("/redo".to_string()));
-        assert_eq!(resolve_content("/ping"), Some("/ping".to_string()));
-        assert_eq!(resolve_content("/tools"), Some("/tools".to_string()));
-        assert_eq!(resolve_content("/compact"), Some("/compact".to_string()));
-        assert_eq!(resolve_content("/clear"), Some("/clear".to_string()));
-        assert_eq!(resolve_content("/version"), Some("/version".to_string()));
-
-        // Commands with args → cleaned text (command stripped)
-        assert_eq!(resolve_content("/help me please"), Some("me please".to_string()));
-
-        // Plain text → pass through
-        assert_eq!(resolve_content("hello world"), Some("hello world".to_string()));
-        assert_eq!(resolve_content("just text"), Some("just text".to_string()));
-
-        // Empty / whitespace → skip (None)
-        assert_eq!(resolve_content(""), None);
-        assert_eq!(resolve_content("   "), None);
-
-        // Bare @mention without bot → skip
-        assert_eq!(resolve_content("@botname"), None);
-    }
-
     #[test]
     fn test_config_with_owner_id() {
         let json = r#"{"owner_id": 123456789}"#;

channels-src/whatsapp/Cargo.toml

@@ -16,5 +16,3 @@ serde_json = "1"
 opt-level = "s"
 lto = true
 strip = true
-
-[workspace]

channels-src/whatsapp/src/lib.rs

@@ -254,19 +254,10 @@ struct WhatsAppChannel;
 
 impl Guest for WhatsAppChannel {
     fn on_start(config_json: String) -> Result<ChannelConfig, String> {
-        let config: WhatsAppConfig = match serde_json::from_str(&config_json) {
-            Ok(c) => c,
-            Err(e) => {
-                channel_host::log(
-                    channel_host::LogLevel::Warn,
-                    &format!("Failed to parse WhatsApp config, using defaults: {}", e),
-                );
-                WhatsAppConfig {
-                    api_version: default_api_version(),
-                    reply_to_message: default_reply_to_message(),
-                }
-            }
-        };
+        let config: WhatsAppConfig = serde_json::from_str(&config_json).unwrap_or(WhatsAppConfig {
+            api_version: default_api_version(),
+            reply_to_message: default_reply_to_message(),
+        });
 
         channel_host::log(
             channel_host::LogLevel::Info,
@@ -276,9 +267,6 @@ impl Guest for WhatsAppChannel {
             ),
         );
 
-        // Persist api_version in workspace so on_respond() can read it
-        let _ = channel_host::workspace_write("channels/whatsapp/api_version", &config.api_version);
-
         // WhatsApp Cloud API is webhook-only, no polling available
         Ok(ChannelConfig {
             display_name: "WhatsApp".to_string(),
@@ -339,16 +327,11 @@ impl Guest for WhatsAppChannel {
         let metadata: WhatsAppMessageMetadata = serde_json::from_str(&response.metadata_json)
             .map_err(|e| format!("Failed to parse metadata: {}", e))?;
 
-        // Read api_version from workspace (set during on_start), fallback to default
-        let api_version = channel_host::workspace_read("channels/whatsapp/api_version")
-            .filter(|s| !s.is_empty())
-            .unwrap_or_else(|| "v18.0".to_string());
-
         // Build WhatsApp API URL with token placeholder
         // Host will replace {WHATSAPP_ACCESS_TOKEN} with actual token in Authorization header
         let api_url = format!(
-            "https://graph.facebook.com/{}/{}/messages",
-            api_version, metadata.phone_number_id
+            "https://graph.facebook.com/v18.0/{}/messages",
+            metadata.phone_number_id
         );
 
         // Build sendMessage payload

deploy/env.example

@@ -2,15 +2,12 @@
 # Do not use placeholder passwords in production.
 DATABASE_URL=postgres://ironclaw:CHANGE_ME@localhost:5432/ironclaw
 
-# NEAR AI Cloud (API key auth, Chat Completions API)
-# Get an API key from https://cloud.near.ai
-NEARAI_API_KEY=CHANGE_ME
+# NEAR AI
+NEARAI_SESSION_TOKEN=CHANGE_ME
 NEARAI_MODEL=claude-3-5-sonnet-20241022
 NEARAI_BASE_URL=https://cloud-api.near.ai
-
-# Or use NEAR AI Chat (session token auth, Responses API):
-# NEARAI_SESSION_TOKEN=sess_...
-# NEARAI_BASE_URL=https://private.near.ai
+NEARAI_AUTH_URL=https://private.near.ai
+NEARAI_API_MODE=chat_completions
 
 # Agent
 AGENT_NAME=ironclaw

examples/test_heartbeat.rs

@@ -1,12 +1,11 @@
-#![cfg(feature = "postgres")]
-//! Heartbeat integration test.
+//! Standalone heartbeat test.
 //!
 //! Exercises the heartbeat system in isolation: connects to the real
 //! database, reads the real HEARTBEAT.md, calls the real LLM, and prints
 //! every step so you can see exactly where it breaks.
 //!
 //! Usage:
-//!   cargo test --test heartbeat_integration -- --ignored --nocapture
+//!   cargo run --example test_heartbeat
 
 use std::sync::Arc;
 
@@ -15,23 +14,23 @@ use ironclaw::{
     config::Config,
     history::Store,
     llm::{SessionConfig, create_llm_provider, create_session_manager},
-    safety::SafetyLayer,
     workspace::Workspace,
 };
 
-#[tokio::test]
-#[ignore] // Requires running database and LLM credentials
-async fn test_heartbeat_end_to_end() {
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
     // Load .env and set up logging
     let _ = dotenvy::dotenv();
-    let _ = tracing_subscriber::fmt()
+    tracing_subscriber::fmt()
         .with_env_filter("ironclaw=debug")
-        .try_init();
+        .init();
 
     println!("=== Heartbeat Integration Test ===\n");
 
     // 1. Load config
-    let config = Config::from_env().await.expect("Failed to load config");
+    let config = Config::from_env()
+        .await
+        .map_err(|e| anyhow::anyhow!("Config: {}", e))?;
     println!("[1/6] Config loaded");
     println!("  heartbeat.enabled = {}", config.heartbeat.enabled);
     println!(
@@ -48,13 +47,8 @@ async fn test_heartbeat_end_to_end() {
     );
 
     // 2. Connect to database
-    let store = Store::new(&config.database)
-        .await
-        .expect("Failed to connect to database");
-    store
-        .run_migrations()
-        .await
-        .expect("Failed to run migrations");
+    let store = Store::new(&config.database).await?;
+    store.run_migrations().await?;
     println!("[2/6] Database connected");
 
     // 3. Create workspace
@@ -89,16 +83,14 @@ async fn test_heartbeat_end_to_end() {
         session_path: config.llm.nearai.session_path.clone(),
     })
     .await;
-    let llm = create_llm_provider(&config.llm, session).expect("Failed to create LLM provider");
+    let llm = create_llm_provider(&config.llm, session)?;
     println!("[5/6] LLM provider created (model: {})", llm.model_name());
 
     // 6. Run heartbeat check
     println!("[6/6] Running check_heartbeat()...\n");
 
     let hb_config = ironclaw::agent::HeartbeatConfig::default();
-    let hygiene_config = ironclaw::workspace::hygiene::HygieneConfig::default();
-    let safety = Arc::new(SafetyLayer::new(&config.safety));
-    let runner = HeartbeatRunner::new(hb_config, hygiene_config, workspace, llm, safety);
+    let runner = HeartbeatRunner::new(hb_config, workspace, llm);
 
     let result = runner.check_heartbeat().await;
 
@@ -124,4 +116,6 @@ async fn test_heartbeat_end_to_end() {
             println!("  Error: {}", err);
         }
     }
+
+    Ok(())
 }

migrations/V9__flexible_embedding_dimension.sql

@@ -1,43 +0,0 @@
--- Allow embedding vectors of any dimension (not just 1536).
--- This supports Ollama models (768-dim nomic-embed-text, 1024-dim mxbai-embed-large)
--- alongside OpenAI models (1536-dim text-embedding-3-small, 3072-dim text-embedding-3-large).
---
--- NOTE: HNSW indexes require a fixed dimension, so we drop the index.
--- Exact (sequential) cosine distance search still works without the index.
--- For a personal assistant workspace the dataset is small enough that this
--- has negligible impact on query latency.
-
--- Drop dependent views first
-DROP VIEW IF EXISTS chunks_pending_embedding;
-DROP VIEW IF EXISTS memory_documents_summary;
-
-DROP INDEX IF EXISTS idx_memory_chunks_embedding;
-
-ALTER TABLE memory_chunks
-    ALTER COLUMN embedding TYPE vector
-    USING embedding::vector;
-
--- Recreate the views
-CREATE VIEW memory_documents_summary AS
-SELECT
-    d.id,
-    d.user_id,
-    d.path,
-    d.created_at,
-    d.updated_at,
-    COUNT(c.id) as chunk_count,
-    COUNT(c.embedding) as embedded_chunk_count
-FROM memory_documents d
-LEFT JOIN memory_chunks c ON c.document_id = d.id
-GROUP BY d.id;
-
-CREATE VIEW chunks_pending_embedding AS
-SELECT
-    c.id as chunk_id,
-    c.document_id,
-    d.user_id,
-    d.path,
-    LENGTH(c.content) as content_length
-FROM memory_chunks c
-JOIN memory_documents d ON d.id = c.document_id
-WHERE c.embedding IS NULL;

registry/_bundles.json

@@ -1,42 +0,0 @@
-{
-  "bundles": {
-    "google": {
-      "display_name": "Google Suite",
-      "description": "Gmail, Calendar, Drive, Docs, Sheets, Slides",
-      "extensions": [
-        "tools/gmail",
-        "tools/google-calendar",
-        "tools/google-docs",
-        "tools/google-drive",
-        "tools/google-sheets",
-        "tools/google-slides"
-      ],
-      "shared_auth": "google_oauth_token"
-    },
-    "messaging": {
-      "display_name": "Messaging Channels",
-      "description": "Discord, Telegram, Slack, and WhatsApp channels",
-      "extensions": [
-        "channels/discord",
-        "channels/telegram",
-        "channels/slack",
-        "channels/whatsapp"
-      ],
-      "shared_auth": null
-    },
-    "default": {
-      "display_name": "Recommended Set",
-      "description": "Core tools and channels for a productive setup",
-      "extensions": [
-        "tools/github",
-        "tools/gmail",
-        "tools/google-calendar",
-        "tools/google-drive",
-        "tools/slack",
-        "channels/telegram",
-        "channels/slack"
-      ],
-      "shared_auth": null
-    }
-  }
-}

registry/channels/discord.json

@@ -1,31 +0,0 @@
-{
-  "name": "discord",
-  "display_name": "Discord",
-  "kind": "channel",
-  "version": "0.1.0",
-  "description": "Discord Gateway/Webhook channel for slash commands, buttons, and messages",
-  "keywords": ["messaging", "chat", "discord", "bot"],
-
-  "source": {
-    "dir": "channels-src/discord",
-    "capabilities": "discord.capabilities.json",
-    "crate_name": "discord-channel"
-  },
-
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": null,
-      "sha256": null
-    }
-  },
-
-  "auth_summary": {
-    "method": "manual",
-    "provider": "Discord",
-    "secrets": ["discord_bot_token"],
-    "shared_auth": null,
-    "setup_url": "https://discord.com/developers/applications"
-  },
-
-  "tags": ["messaging"]
-}

registry/channels/slack.json

@@ -1,31 +0,0 @@
-{
-  "name": "slack",
-  "display_name": "Slack",
-  "kind": "channel",
-  "version": "0.1.0",
-  "description": "Slack Events API channel for receiving and responding to Slack messages",
-  "keywords": ["messaging", "chat", "workspace", "slack"],
-
-  "source": {
-    "dir": "channels-src/slack",
-    "capabilities": "slack.capabilities.json",
-    "crate_name": "slack-channel"
-  },
-
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": null,
-      "sha256": null
-    }
-  },
-
-  "auth_summary": {
-    "method": "manual",
-    "provider": "Slack",
-    "secrets": ["slack_bot_token", "slack_signing_secret"],
-    "shared_auth": null,
-    "setup_url": "https://api.slack.com/apps"
-  },
-
-  "tags": ["default", "messaging"]
-}

registry/channels/telegram.json

@@ -1,31 +0,0 @@
-{
-  "name": "telegram",
-  "display_name": "Telegram",
-  "kind": "channel",
-  "version": "0.1.0",
-  "description": "Telegram Bot API channel for receiving and responding to messages",
-  "keywords": ["messaging", "bot", "chat", "telegram"],
-
-  "source": {
-    "dir": "channels-src/telegram",
-    "capabilities": "telegram.capabilities.json",
-    "crate_name": "telegram-channel"
-  },
-
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": null,
-      "sha256": null
-    }
-  },
-
-  "auth_summary": {
-    "method": "manual",
-    "provider": "Telegram",
-    "secrets": ["telegram_bot_token"],
-    "shared_auth": null,
-    "setup_url": "https://t.me/BotFather"
-  },
-
-  "tags": ["default", "messaging"]
-}

registry/channels/whatsapp.json

@@ -1,31 +0,0 @@
-{
-  "name": "whatsapp",
-  "display_name": "WhatsApp",
-  "kind": "channel",
-  "version": "0.1.0",
-  "description": "WhatsApp Cloud API channel for receiving and responding to messages",
-  "keywords": ["messaging", "chat", "whatsapp", "meta"],
-
-  "source": {
-    "dir": "channels-src/whatsapp",
-    "capabilities": "whatsapp.capabilities.json",
-    "crate_name": "whatsapp-channel"
-  },
-
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": null,
-      "sha256": null
-    }
-  },
-
-  "auth_summary": {
-    "method": "manual",
-    "provider": "Meta",
-    "secrets": ["whatsapp_access_token", "whatsapp_verify_token"],
-    "shared_auth": null,
-    "setup_url": "https://developers.facebook.com/apps/"
-  },
-
-  "tags": ["messaging"]
-}

registry/tools/github.json

@@ -1,31 +0,0 @@
-{
-  "name": "github",
-  "display_name": "GitHub",
-  "kind": "tool",
-  "version": "0.1.0",
-  "description": "GitHub integration for issues, PRs, repos, and code search",
-  "keywords": ["git", "code", "issues", "pull-requests", "repositories"],
-
-  "source": {
-    "dir": "tools-src/github",
-    "capabilities": "github-tool.capabilities.json",
-    "crate_name": "github-tool"
-  },
-
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": null,
-      "sha256": null
-    }
-  },
-
-  "auth_summary": {
-    "method": "manual",
-    "provider": "GitHub",
-    "secrets": ["github_token"],
-    "shared_auth": null,
-    "setup_url": "https://github.com/settings/tokens"
-  },
-
-  "tags": ["default", "development"]
-}

registry/tools/gmail.json

@@ -1,31 +0,0 @@
-{
-  "name": "gmail",
-  "display_name": "Gmail",
-  "kind": "tool",
-  "version": "0.1.0",
-  "description": "Read, send, and manage Gmail messages and threads",
-  "keywords": ["email", "google", "mail", "messaging"],
-
-  "source": {
-    "dir": "tools-src/gmail",
-    "capabilities": "gmail-tool.capabilities.json",
-    "crate_name": "gmail-tool"
-  },
-
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": null,
-      "sha256": null
-    }
-  },
-
-  "auth_summary": {
-    "method": "oauth",
-    "provider": "Google",
-    "secrets": ["google_oauth_token"],
-    "shared_auth": "google_oauth_token",
-    "setup_url": "https://console.cloud.google.com/apis/credentials"
-  },
-
-  "tags": ["default", "google", "messaging"]
-}

registry/tools/google-calendar.json

@@ -1,31 +0,0 @@
-{
-  "name": "google-calendar",
-  "display_name": "Google Calendar",
-  "kind": "tool",
-  "version": "0.1.0",
-  "description": "Create, read, update, and delete Google Calendar events",
-  "keywords": ["calendar", "google", "scheduling", "events"],
-
-  "source": {
-    "dir": "tools-src/google-calendar",
-    "capabilities": "google-calendar-tool.capabilities.json",
-    "crate_name": "google-calendar-tool"
-  },
-
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": null,
-      "sha256": null
-    }
-  },
-
-  "auth_summary": {
-    "method": "oauth",
-    "provider": "Google",
-    "secrets": ["google_oauth_token"],
-    "shared_auth": "google_oauth_token",
-    "setup_url": "https://console.cloud.google.com/apis/credentials"
-  },
-
-  "tags": ["default", "google", "productivity"]
-}

registry/tools/google-docs.json

@@ -1,31 +0,0 @@
-{
-  "name": "google-docs",
-  "display_name": "Google Docs",
-  "kind": "tool",
-  "version": "0.1.0",
-  "description": "Create and edit Google Docs documents",
-  "keywords": ["documents", "google", "writing", "docs"],
-
-  "source": {
-    "dir": "tools-src/google-docs",
-    "capabilities": "google-docs-tool.capabilities.json",
-    "crate_name": "google-docs-tool"
-  },
-
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": null,
-      "sha256": null
-    }
-  },
-
-  "auth_summary": {
-    "method": "oauth",
-    "provider": "Google",
-    "secrets": ["google_oauth_token"],
-    "shared_auth": "google_oauth_token",
-    "setup_url": "https://console.cloud.google.com/apis/credentials"
-  },
-
-  "tags": ["google", "productivity"]
-}

registry/tools/google-drive.json

@@ -1,31 +0,0 @@
-{
-  "name": "google-drive",
-  "display_name": "Google Drive",
-  "kind": "tool",
-  "version": "0.1.0",
-  "description": "Upload, download, search, and manage Google Drive files and folders",
-  "keywords": ["storage", "google", "files", "drive"],
-
-  "source": {
-    "dir": "tools-src/google-drive",
-    "capabilities": "google-drive-tool.capabilities.json",
-    "crate_name": "google-drive-tool"
-  },
-
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": null,
-      "sha256": null
-    }
-  },
-
-  "auth_summary": {
-    "method": "oauth",
-    "provider": "Google",
-    "secrets": ["google_oauth_token"],
-    "shared_auth": "google_oauth_token",
-    "setup_url": "https://console.cloud.google.com/apis/credentials"
-  },
-
-  "tags": ["default", "google", "storage"]
-}

registry/tools/google-sheets.json

@@ -1,31 +0,0 @@
-{
-  "name": "google-sheets",
-  "display_name": "Google Sheets",
-  "kind": "tool",
-  "version": "0.1.0",
-  "description": "Read and write Google Sheets spreadsheet data",
-  "keywords": ["spreadsheets", "google", "data", "sheets"],
-
-  "source": {
-    "dir": "tools-src/google-sheets",
-    "capabilities": "google-sheets-tool.capabilities.json",
-    "crate_name": "google-sheets-tool"
-  },
-
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": null,
-      "sha256": null
-    }
-  },
-
-  "auth_summary": {
-    "method": "oauth",
-    "provider": "Google",
-    "secrets": ["google_oauth_token"],
-    "shared_auth": "google_oauth_token",
-    "setup_url": "https://console.cloud.google.com/apis/credentials"
-  },
-
-  "tags": ["google", "productivity"]
-}

registry/tools/google-slides.json

@@ -1,31 +0,0 @@
-{
-  "name": "google-slides",
-  "display_name": "Google Slides",
-  "kind": "tool",
-  "version": "0.1.0",
-  "description": "Create and edit Google Slides presentations",
-  "keywords": ["presentations", "google", "slides"],
-
-  "source": {
-    "dir": "tools-src/google-slides",
-    "capabilities": "google-slides-tool.capabilities.json",
-    "crate_name": "google-slides-tool"
-  },
-
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": null,
-      "sha256": null
-    }
-  },
-
-  "auth_summary": {
-    "method": "oauth",
-    "provider": "Google",
-    "secrets": ["google_oauth_token"],
-    "shared_auth": "google_oauth_token",
-    "setup_url": "https://console.cloud.google.com/apis/credentials"
-  },
-
-  "tags": ["google", "productivity"]
-}

registry/tools/okta.json

@@ -1,31 +0,0 @@
-{
-  "name": "okta",
-  "display_name": "Okta",
-  "kind": "tool",
-  "version": "0.1.0",
-  "description": "Okta SSO for user profile, app catalog, and SSO launch links",
-  "keywords": ["sso", "identity", "authentication", "okta"],
-
-  "source": {
-    "dir": "tools-src/okta",
-    "capabilities": "okta-tool.capabilities.json",
-    "crate_name": "okta-tool"
-  },
-
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": null,
-      "sha256": null
-    }
-  },
-
-  "auth_summary": {
-    "method": "oauth",
-    "provider": "Okta",
-    "secrets": ["okta_oauth_token"],
-    "shared_auth": null,
-    "setup_url": "https://developer.okta.com/docs/guides/implement-oauth-for-okta/main/"
-  },
-
-  "tags": ["identity"]
-}

registry/tools/slack.json

@@ -1,31 +0,0 @@
-{
-  "name": "slack",
-  "display_name": "Slack",
-  "kind": "tool",
-  "version": "0.1.0",
-  "description": "Post messages, read channels, and manage conversations via Slack API",
-  "keywords": ["messaging", "chat", "workspace"],
-
-  "source": {
-    "dir": "tools-src/slack",
-    "capabilities": "slack-tool.capabilities.json",
-    "crate_name": "slack-tool"
-  },
-
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": null,
-      "sha256": null
-    }
-  },
-
-  "auth_summary": {
-    "method": "oauth",
-    "provider": "Slack",
-    "secrets": ["slack_bot_token"],
-    "shared_auth": null,
-    "setup_url": "https://api.slack.com/apps"
-  },
-
-  "tags": ["default", "messaging"]
-}

registry/tools/telegram.json

@@ -1,31 +0,0 @@
-{
-  "name": "telegram",
-  "display_name": "Telegram",
-  "kind": "tool",
-  "version": "0.1.0",
-  "description": "Telegram user-mode integration via MTProto for messages and contacts",
-  "keywords": ["messaging", "chat", "telegram", "mtproto"],
-
-  "source": {
-    "dir": "tools-src/telegram",
-    "capabilities": "telegram-tool.capabilities.json",
-    "crate_name": "telegram-tool"
-  },
-
-  "artifacts": {
-    "wasm32-wasip2": {
-      "url": null,
-      "sha256": null
-    }
-  },
-
-  "auth_summary": {
-    "method": "manual",
-    "provider": "Telegram",
-    "secrets": ["telegram_api_id", "telegram_api_hash"],
-    "shared_auth": null,
-    "setup_url": "https://my.telegram.org/apps"
-  },
-
-  "tags": ["messaging"]
-}

scripts/dev-setup.sh

@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-# Developer setup script for IronClaw.
-#
-# Gets a fresh checkout ready for development without requiring
-# Docker, PostgreSQL, or any external services.
-#
-# Usage:
-#   ./scripts/dev-setup.sh
-#
-# After running, you can:
-#   cargo check           # default features (postgres + libsql)
-#   cargo test            # default test suite (uses libsql temp DB)
-#   cargo test --all-features         # full test suite
-
-set -euo pipefail
-
-cd "$(dirname "$0")/.."
-
-echo "=== IronClaw Developer Setup ==="
-echo ""
-
-# 1. Check rustup
-if ! command -v rustup &>/dev/null; then
-    echo "ERROR: rustup not found. Install from https://rustup.rs"
-    exit 1
-fi
-echo "[1/5] rustup found: $(rustup --version 2>/dev/null | head -1)"
-
-# 2. Add WASM target (required by build.rs for channel compilation)
-echo "[2/5] Adding wasm32-wasip2 target..."
-rustup target add wasm32-wasip2
-
-# 3. Install wasm-tools (required by build.rs for WASM component model)
-echo "[3/5] Installing wasm-tools..."
-if command -v wasm-tools &>/dev/null; then
-    echo "  wasm-tools already installed: $(wasm-tools --version)"
-else
-    cargo install wasm-tools --locked
-fi
-
-# 4. Verify the project compiles
-echo "[4/5] Running cargo check..."
-cargo check
-
-# 5. Run tests using libsql temp DB (no Docker/external DB needed)
-echo "[5/5] Running tests (no external DB required)..."
-cargo test
-
-echo ""
-echo "=== Setup complete ==="
-echo ""
-echo "Quick start:"
-echo "  cargo run                            # Run with default features"
-echo "  cargo test                           # Test suite (libsql temp DB)"
-echo "  cargo test --all-features            # Full test suite"
-echo "  cargo clippy --all-features          # Lint all code"

src/NETWORK_SECURITY.md

@@ -1,566 +0,0 @@
-# IronClaw Network Security Reference
-
-This document catalogs every network-facing surface in IronClaw, its authentication mechanism, bind address, security controls, and known findings. Use this as the authoritative reference during code reviews that touch network-facing code.
-
-**Last updated:** 2026-02-18
-
----
-
-## Threat Model
-
-IronClaw operates across four trust boundaries:
-
-| Boundary | Trust Level | Examples |
-|----------|------------|---------|
-| **Local user** | Fully trusted | TUI, web gateway (loopback), CLI commands |
-| **Browser client** | Authenticated | Web UI connected via bearer token; subject to CORS, Origin validation, CSRF protections |
-| **Docker containers** | Untrusted (sandboxed) | Worker containers executing user jobs; isolated via per-job tokens, allowlisted egress, dropped capabilities |
-| **External services** | Untrusted | Webhook senders (Telegram, Slack); authenticated via shared secret |
-
-**Key assumptions:**
-
-- The local machine is single-user. The web gateway and OAuth listener bind to loopback and do not defend against other local users.
-- Docker containers are adversarial. A compromised container should not be able to access other jobs, exfiltrate secrets, or reach the host network beyond the orchestrator API.
-- Webhook senders must prove knowledge of the shared secret. The secret is never transmitted in the clear by IronClaw itself.
-- MCP server URLs are operator-configured and treated as trusted destinations (see [MCP Client](#mcp-client)).
-
----
-
-## Network Surface Inventory
-
-| Listener | Default Port | Default Bind | Auth Mechanism | Config Env Var | Source |
-|----------|-------------|-------------|----------------|----------------|--------|
-| Web Gateway | 3000 | `127.0.0.1` | Bearer token (constant-time) | `GATEWAY_HOST`, `GATEWAY_PORT`, `GATEWAY_AUTH_TOKEN` | `server.rs` — `start_server()` |
-| HTTP Webhook Server | 8080 | `0.0.0.0` | Shared secret (body field) | `HTTP_HOST`, `HTTP_PORT`, `HTTP_WEBHOOK_SECRET` | `webhook_server.rs` — `start()` |
-| Orchestrator Internal API | 50051 | `127.0.0.1` (macOS/Win) / `0.0.0.0` (Linux) | Per-job bearer token (constant-time) | `ORCHESTRATOR_PORT` | `api.rs` — `OrchestratorApi::start()` |
-| OAuth Callback Listener | 9876 | `127.0.0.1` | None (ephemeral, 5-min timeout) | N/A (hardcoded) | `oauth_defaults.rs` — `bind_callback_listener()` |
-| Sandbox HTTP Proxy | OS-assigned (ephemeral) | `127.0.0.1` | None (loopback only) | N/A (auto-assigned) | `proxy/http.rs` — `SandboxProxy::start()` |
-
----
-
-## 1. Web Gateway
-
-**Source:** `src/channels/web/server.rs`, `src/channels/web/auth.rs`
-
-### Bind Address
-
-Configurable via `GATEWAY_HOST` (default `127.0.0.1`) and `GATEWAY_PORT` (default `3000`). The gateway is designed as a local-first, single-user service.
-
-**Reference:** `src/config.rs` — `gateway_host` default (`"127.0.0.1"`), `gateway_port` default (`3000`)
-
-### Authentication
-
-Bearer token middleware applied to all `/api/*` routes via `route_layer`. Token checked in two locations:
-
-1. `Authorization: Bearer <token>` header (primary)
-2. `?token=<token>` query parameter (fallback for SSE `EventSource` which cannot set headers)
-
-Both paths use **constant-time comparison** via `subtle::ConstantTimeEq` (`ct_eq`).
-
-**Reference:** `src/channels/web/auth.rs` — `auth_middleware()`, header check and query-param fallback both use `ct_eq`
-
-If `GATEWAY_AUTH_TOKEN` is not set, a random hex token is generated at startup.
-
-### Unauthenticated Routes
-
-| Route | Purpose | Response |
-|-------|---------|----------|
-| `/api/health` | Health check endpoint | `{"status":"healthy","channel":"gateway"}` — no version, uptime, or fingerprinting data |
-| `/` | Static HTML (embedded) | Single-page app shell |
-| `/style.css` | Static CSS (embedded) | Stylesheet |
-| `/app.js` | Static JS (embedded) | Client-side app |
-
-### CORS Policy
-
-Restricted to a two-origin allowlist (not browser same-origin policy, but a CORS allowlist that achieves equivalent protection):
-
-- `http://<bind_ip>:<bind_port>`
-- `http://localhost:<bind_port>`
-
-Allowed methods: `GET`, `POST`, `PUT`, `DELETE`. Allowed headers: `Content-Type`, `Authorization`. Credentials allowed.
-
-**Reference:** `src/channels/web/server.rs` — `CorsLayer::new()` block
-
-### WebSocket Origin Validation
-
-The `/api/chat/ws` endpoint has two layers of protection:
-
-1. **Bearer token auth** — the route is inside the `protected` router with `route_layer`, so `auth_middleware` runs before the handler. The token is passed via the `Authorization: Bearer` header on the HTTP upgrade request (not via query parameter).
-
-2. **Origin header validation** (inside the handler) as a defense-in-depth guard against cross-site WebSocket hijacking (CSWSH):
-   - Origin header is **required** — missing Origin returns 403 (browsers always send it for WS upgrades; absence implies a non-browser client)
-   - Origin host is extracted by stripping scheme and port, then compared **exactly** against `localhost`, `127.0.0.1`, and `[::1]`
-   - Partial matches like `localhost.evil.com` are rejected because the check extracts the host portion before the first `:` or `/`
-
-**Reference:** `src/channels/web/server.rs` — `chat_ws_handler()` (origin validation block)
-
-### Rate Limiting
-
-Chat endpoint (`/api/chat/send`) enforces a sliding-window rate limit: **30 requests per 60 seconds** (global, not per-IP — single-user gateway).
-
-**Reference:** `src/channels/web/server.rs` — `RateLimiter` struct, `chat_rate_limiter` field
-
-### Body Limits
-
-- Global: **1 MB** max request body (`DefaultBodyLimit::max(1024 * 1024)`)
-- **Reference:** `src/channels/web/server.rs` — `.layer(DefaultBodyLimit::max(...))`
-
-### Project File Serving
-
-The `/projects/{project_id}/*` routes serve files from project directories. These are **behind auth middleware** to prevent unauthorized file access.
-
-**Reference:** `src/channels/web/server.rs` — project file routes in `protected` router
-
-### Security Headers
-
-The gateway sets the following security headers on all responses (via `SetResponseHeaderLayer::if_not_present`, so handlers can override):
-
-- `X-Content-Type-Options: nosniff` — prevents MIME-sniffing
-- `X-Frame-Options: DENY` — prevents clickjacking via iframes
-
-**Reference:** `src/channels/web/server.rs` — `SetResponseHeaderLayer` calls
-
-### Graceful Shutdown
-
-Shutdown is triggered via a `oneshot::Sender` stored in `GatewayState::shutdown_tx`. The server uses `axum::serve(...).with_graceful_shutdown(...)` to drain in-flight requests before closing the listener.
-
-**Reference:** `src/channels/web/server.rs` — `shutdown_tx` / `shutdown_rx` setup
-
----
-
-## 2. HTTP Webhook Server
-
-**Source:** `src/channels/webhook_server.rs`, `src/channels/http.rs`
-
-### Bind Address
-
-Configurable via `HTTP_HOST` (default `0.0.0.0`) and `HTTP_PORT` (default `8080`).
-
-**WARNING:** The default bind address is `0.0.0.0`, meaning the webhook server listens on **all interfaces** by default. This is intentional (webhooks must be reachable from external services like Telegram/Slack), but operators should be aware of the exposure.
-
-**Reference:** `src/config.rs` — `http_host` default (`"0.0.0.0"`), `http_port` default (`8080`)
-
-### Authentication
-
-Webhook secret is passed **in the JSON request body** (`secret` field), not as a header. The secret is compared using **constant-time** `subtle::ConstantTimeEq` (`ct_eq`).
-
-The secret is required to start the channel — if `HTTP_WEBHOOK_SECRET` is not set, `start()` returns an error.
-
-**CSRF note:** Because the secret is in the JSON body (not a cookie or header that browsers auto-attach), a cross-origin form POST cannot forge a valid request. Browsers would send `application/x-www-form-urlencoded`, which the `Json<T>` extractor rejects with HTTP 415. Even if `Content-Type` were spoofed via CORS preflight, the attacker would need the secret value, which is never stored in the browser.
-
-**Reference:** `src/channels/http.rs` — `webhook_handler()` (secret validation with `ct_eq`), `start()` (required-secret check)
-
-### Content-Type Validation
-
-The webhook endpoint uses axum's `Json<WebhookRequest>` extractor, which enforces `Content-Type: application/json`. Requests with missing or incorrect Content-Type are rejected with **HTTP 415 Unsupported Media Type** before the handler body executes. Malformed JSON bodies are rejected with **HTTP 422 Unprocessable Entity**.
-
-**Reference:** `src/channels/http.rs` — `webhook_handler()` function signature (`Json(req): Json<WebhookRequest>`)
-
-### Rate Limiting
-
-**60 requests per minute**, enforced via a mutex-protected sliding window.
-
-**Reference:** `src/channels/http.rs` — `MAX_REQUESTS_PER_MINUTE` constant, rate-limit check in `webhook_handler()`
-
-### Body Limits
-
-- JSON body: **64 KB** max (`MAX_BODY_BYTES`)
-- Message content: **32 KB** max (`MAX_CONTENT_BYTES`)
-- Pending synchronous responses: **100 max** (`MAX_PENDING_RESPONSES`)
-- Synchronous response timeout: **60 seconds**
-
-**Reference:** `src/channels/http.rs` — constants block (`MAX_BODY_BYTES`, `MAX_CONTENT_BYTES`, `MAX_PENDING_RESPONSES`, `MAX_REQUESTS_PER_MINUTE`)
-
-### Routes
-
-| Route | Auth | Purpose | Response |
-|-------|------|---------|----------|
-| `/health` | None | Health check | `{"status":"healthy","channel":"http"}` — no fingerprinting data |
-| `/webhook` | Webhook secret | Receive messages | Webhook response |
-
-### Graceful Shutdown
-
-Shutdown is triggered via a `oneshot::Sender` stored on the `WebhookServer` struct. The server uses `axum::serve(...).with_graceful_shutdown(...)`. The public `shutdown()` method sends the signal and awaits the task join handle, ensuring a clean drain-and-wait.
-
-**Reference:** `src/channels/webhook_server.rs` — `shutdown()` method
-
----
-
-## 3. Orchestrator Internal API
-
-**Source:** `src/orchestrator/api.rs`, `src/orchestrator/auth.rs`
-
-### Bind Address
-
-Platform-dependent:
-
-- **macOS / Windows**: `127.0.0.1:<port>` — Docker Desktop routes `host.docker.internal` through its VM to `127.0.0.1`
-- **Linux**: `0.0.0.0:<port>` — containers reach the host via the Docker bridge gateway (`172.17.0.1`), which is not loopback
-
-Default port: `50051`.
-
-**Reference:** `src/orchestrator/api.rs` — `OrchestratorApi::start()`, platform-conditional bind address block
-
-### Authentication
-
-Per-job bearer tokens validated by `worker_auth_middleware`:
-
-1. Tokens are **cryptographically random** (32 bytes, hex-encoded = 64 chars)
-2. Tokens are **scoped to a specific job_id** — a token for job A cannot access endpoints for job B
-3. Comparison uses **constant-time** `subtle::ConstantTimeEq`
-4. Tokens are **ephemeral** (in-memory only, never persisted to disk or DB)
-5. Tokens and associated credential grants are **revoked** when the container is cleaned up
-
-**Reference:** `src/orchestrator/auth.rs` — `TokenStore::create_token()`, `TokenStore::validate()`, `generate_token()`
-
-### Token Extraction
-
-The middleware extracts the job UUID from the URL path (`/worker/{job_id}/...`) and validates the `Authorization: Bearer` header against the stored token for that specific job.
-
-**Reference:** `src/orchestrator/auth.rs` — `worker_auth_middleware()`, `extract_job_id_from_path()`
-
-### Credential Grants
-
-The orchestrator can grant per-job access to specific secrets from the encrypted secrets store. Grants are:
-
-- Stored alongside the token in the `TokenStore`
-- Scoped to specific `(secret_name, env_var)` pairs
-- Revoked when the job token is revoked
-- Decrypted on-demand when the worker requests `/worker/{job_id}/credentials`
-
-**Reference:** `src/orchestrator/auth.rs` — `CredentialGrant` struct, `src/orchestrator/api.rs` — `get_credentials_handler()`
-
-### Rate Limiting
-
-**None.** The orchestrator API has no rate limiting. All `/worker/*` endpoints are authenticated via per-job bearer tokens, but a compromised container could spam authenticated endpoints without throttling.
-
-**Mitigation:** Tokens are scoped per-job so a compromised container can only abuse its own job's endpoints. Container execution is time-bounded (see [Docker Container Security](#docker-container-security)), which limits the window for abuse.
-
-### Routes
-
-| Route | Auth | Purpose | Response |
-|-------|------|---------|----------|
-| `/health` | None | Health check | `"ok"` (plain text) — no fingerprinting data |
-| `/worker/{job_id}/job` | Per-job token | Get job description | Job JSON |
-| `/worker/{job_id}/llm/complete` | Per-job token | Proxy LLM completion | LLM response |
-| `/worker/{job_id}/llm/complete_with_tools` | Per-job token | Proxy LLM tool completion | LLM response |
-| `/worker/{job_id}/status` | Per-job token | Report worker status | Ack |
-| `/worker/{job_id}/complete` | Per-job token | Report job completion | Ack |
-| `/worker/{job_id}/event` | Per-job token | Send job events (SSE broadcast) | Ack |
-| `/worker/{job_id}/prompt` | Per-job token | Poll for follow-up prompts | Prompt or empty |
-| `/worker/{job_id}/credentials` | Per-job token | Retrieve decrypted credentials | Credentials JSON |
-
-### Graceful Shutdown
-
-**None.** The orchestrator calls `axum::serve(listener, router).await?` without `.with_graceful_shutdown()`. The server stops only when the task is dropped (process exit or tokio task cancellation). In-flight requests may be interrupted.
-
-**Reference:** `src/orchestrator/api.rs` — `OrchestratorApi::start()`
-
----
-
-## 4. OAuth Callback Listener
-
-**Source:** `src/cli/oauth_defaults.rs`
-
-### Bind Address
-
-Always binds to **loopback only**: `127.0.0.1:9876`. Falls back to `[::1]:9876` (IPv6 loopback) if IPv4 binding fails for reasons other than `AddrInUse`. If the port is already in use, the error is returned immediately (fail-fast).
-
-Both IPv4 and IPv6 loopback addresses are security-equivalent — they are only reachable from the local machine.
-
-**Reference:** `src/cli/oauth_defaults.rs` — `OAUTH_CALLBACK_PORT` constant, `bind_callback_listener()`
-
-### Lifecycle
-
-The listener is **ephemeral** — it is started only when an OAuth flow is initiated (e.g., `ironclaw tool auth <name>`) and shut down after the callback is received or the timeout expires.
-
-### Timeout
-
-**5-minute timeout** (`Duration::from_secs(300)`). If the user does not complete the OAuth flow in the browser within 5 minutes, the listener shuts down.
-
-**Reference:** `src/cli/oauth_defaults.rs` — `tokio::time::timeout(Duration::from_secs(300), ...)`
-
-### Security Controls
-
-- **HTML escaping**: Provider names displayed in the landing page are HTML-escaped to prevent XSS (escapes `&`, `<`, `>`, `"`, `'`)
-- **Error parameter checking**: The handler checks for `error=` in the callback query string before extracting the auth code
-- **URL decoding**: Callback parameters are URL-decoded safely
-
-**Reference:** `src/cli/oauth_defaults.rs` — `html_escape()`
-
-### Built-in OAuth Credentials
-
-Google OAuth client ID and secret are compiled into the binary (with compile-time override via `IRONCLAW_GOOGLE_CLIENT_ID` / `IRONCLAW_GOOGLE_CLIENT_SECRET`). As noted in the source, Google Desktop App client secrets are [not actually secret](https://developers.google.com/identity/protocols/oauth2/native-app) per Google's documentation.
-
-**Reference:** `src/cli/oauth_defaults.rs` — `GOOGLE_CLIENT_ID` / `GOOGLE_CLIENT_SECRET` constants
-
-### Graceful Shutdown
-
-Implicit. The listener is a raw `TcpListener` (not axum) inside a `tokio::time::timeout` future. Once the authorization code or error is received, the future returns and the `TcpListener` is dropped, closing the port. No explicit shutdown signal is needed.
-
-**Reference:** `src/cli/oauth_defaults.rs` — `wait_for_callback()`
-
----
-
-## 5. Sandbox HTTP Proxy
-
-**Source:** `src/sandbox/proxy/http.rs`, `src/sandbox/proxy/allowlist.rs`, `src/sandbox/proxy/policy.rs`
-
-### Bind Address
-
-Always binds to **`127.0.0.1`** (localhost only). Port is OS-assigned (port `0`, ephemeral). Falls back to `[::1]` (IPv6 loopback) if IPv4 is unavailable.
-
-Both IPv4 and IPv6 loopback addresses are security-equivalent — they are only reachable from the local machine.
-
-**Reference:** `src/sandbox/proxy/http.rs` — `SandboxProxy::start()`, `TcpListener::bind("127.0.0.1:0")`
-
-### Purpose
-
-Acts as an HTTP/HTTPS proxy for Docker sandbox containers. Containers are configured with `http_proxy` / `https_proxy` environment variables pointing to this proxy, so all outbound HTTP traffic is routed through it.
-
-### Domain Allowlisting
-
-All requests are validated against a domain allowlist before being forwarded:
-
-- **Empty allowlist = deny all** (fail-closed default)
-- Supports exact matches and wildcard patterns (`*.example.com`)
-- Validates URL scheme (HTTP/HTTPS only, rejects `ftp://`, `file://`, etc.)
-
-**Reference:** `src/sandbox/proxy/allowlist.rs` — `DomainAllowlist` struct, `is_allowed()` method
-
-### HTTPS Tunneling (CONNECT)
-
-- CONNECT requests for HTTPS tunneling are subject to the same allowlist
-- **30-minute timeout** on established tunnels to prevent indefinite holds
-- **No MITM**: the proxy cannot inspect or inject credentials into HTTPS traffic (by design — containers that need credentials must use the orchestrator's `/worker/{job_id}/credentials` endpoint)
-
-**Reference:** `src/sandbox/proxy/http.rs` — `handle_connect()` function
-
-### Credential Injection (HTTP only)
-
-For plain HTTP requests to allowed hosts, the proxy can inject credentials:
-
-- Bearer tokens in `Authorization` header
-- Custom headers (e.g., `X-API-Key`)
-- Query parameters
-- Credentials are resolved at request time from the encrypted secrets store
-- Credentials never enter the container's environment or filesystem
-
-**Reference:** `src/sandbox/proxy/http.rs` — credential injection block in `handle_request()`
-
-### Hop-by-Hop Header Filtering
-
-The proxy strips hop-by-hop headers to prevent header-based attacks: `connection`, `keep-alive`, `proxy-authenticate`, `proxy-authorization`, `te`, `trailers`, `transfer-encoding`, `upgrade`.
-
-**Reference:** `src/sandbox/proxy/http.rs` — `is_hop_by_hop_header()`
-
-### Docker Container Security
-
-Containers that use the proxy are configured with defense-in-depth:
-
-| Control | Setting | Reference |
-|---------|---------|-----------|
-| Capabilities | Drop ALL, add only CHOWN | `src/sandbox/container.rs` — `cap_drop` / `cap_add` |
-| Privilege escalation | `no-new-privileges:true` | `src/sandbox/container.rs` — `security_opt` |
-| Root filesystem | Read-only (except FullAccess policy) | `src/sandbox/container.rs` — `readonly_rootfs` |
-| User | Non-root (UID 1000:1000) | `src/sandbox/container.rs` — `user` field |
-| Network | Bridge mode (isolated) | `src/sandbox/container.rs` — `network_mode` |
-| Tmpfs | `/tmp` (512 MB), `/home/sandbox/.cargo/registry` (1 GB) | `src/sandbox/container.rs` — `tmpfs` block |
-| Auto-remove | Enabled | `src/sandbox/container.rs` — `auto_remove` |
-| Output limits | Configurable max stdout/stderr | `src/sandbox/container.rs` — `collect_logs()` |
-| Timeout | Enforced with forced container removal | `src/sandbox/container.rs` — `tokio::time::timeout` in `run()` |
-
-### Graceful Shutdown
-
-Shutdown is triggered via a `oneshot::Sender` stored on the proxy. The accept loop uses `tokio::select!` to race `listener.accept()` against the shutdown signal. The `stop()` method fires the signal; the loop breaks on the next iteration. Note: `stop()` does not await a join handle, so there is no drain-and-wait for in-flight connections.
-
-**Reference:** `src/sandbox/proxy/http.rs` — `stop()` method, `tokio::select!` loop
-
----
-
-## Egress Controls
-
-### WASM Tool HTTP Requests
-
-WASM tools execute HTTP requests through the host runtime, subject to:
-
-1. **Endpoint allowlist** — declared in `<tool>.capabilities.json`, validated by `AllowlistValidator`
-   - Host matching (exact or wildcard)
-   - Path prefix matching
-   - HTTP method restriction
-   - HTTPS required by default
-   - Userinfo in URLs (`user:pass@host`) rejected to prevent allowlist bypass
-   - Path traversal (`../`, `%2e%2e/`) normalized and blocked
-   - Invalid percent-encoding rejected
-   - **Reference:** `src/tools/wasm/allowlist.rs`
-
-2. **Credential injection** — secrets injected at the host boundary by `CredentialInjector`
-   - WASM code never sees actual credential values
-   - Secrets must be in the tool's `allowed_secrets` list
-   - Injection supports: Bearer header, Basic auth, custom header, query parameter
-   - **Reference:** `src/tools/wasm/credential_injector.rs`
-
-3. **Leak detection** — `LeakDetector` scans both outbound requests and inbound responses for secret patterns
-   - Runs at two points: before sending and after receiving
-   - Uses Aho-Corasick for fast multi-pattern matching
-   - **Reference:** `src/safety/leak_detector.rs`
-
-### Built-in HTTP Tool
-
-The `http` tool (`src/tools/builtin/http.rs`) has its own SSRF protections:
-
-| Protection | Details | Reference |
-|-----------|---------|-----------|
-| HTTPS only | Rejects `http://` URLs | `http.rs` — scheme check |
-| Localhost blocked | Rejects `localhost` and `*.localhost` | `http.rs` — host check |
-| Private IP blocked | Rejects RFC 1918, loopback, link-local, multicast, unspecified | `http.rs` — `is_disallowed_ip()` |
-| DNS rebinding | Resolves hostname and checks all resolved IPs against blocklist | `http.rs` — DNS resolution block |
-| Cloud metadata | Blocks `169.254.169.254` (AWS/GCP metadata endpoint) | `http.rs` — `is_disallowed_ip()` |
-| Redirect blocking | Returns error on 3xx responses (prevents SSRF via redirect) | `http.rs` — status code check |
-| Response size limit | **5 MB** max, enforced both via Content-Length header and streaming | `http.rs` — `MAX_RESPONSE_SIZE` constant, streaming cap |
-| Outbound leak scan | Scans URL, headers, and body for secrets before sending | `http.rs` — `LeakDetector::scan_http_request()` |
-| Approval required | Requires user approval before execution | `http.rs` — `requires_approval()` returns `true` |
-| Timeout | 30 seconds default | `http.rs` — `reqwest::Client` builder |
-| No redirects | `redirect::Policy::none()` — redirects are not followed | `http.rs` — `reqwest::Client` builder |
-
-### MCP Client
-
-MCP servers are external processes accessed via HTTP. The MCP client (`src/tools/mcp/client.rs`) uses `reqwest` with a 30-second timeout but has **no SSRF protections** — it connects to whatever URL is configured for the MCP server.
-
-This is by design: MCP server URLs come from **operator-controlled configuration** (config files, environment variables, or the CLI `tool install` command), not from user input or LLM output. A compromised config file is outside IronClaw's threat model — it would imply the operator's machine is already compromised.
-
-**Reference:** `src/tools/mcp/client.rs` — `reqwest::Client` builder
-
-### Sandbox Domain Allowlists
-
-Sandbox containers route all HTTP traffic through the proxy, which enforces a domain allowlist. The allowlist is built from:
-
-1. A default set of domains (`src/sandbox/config.rs` — `default_allowlist()`)
-2. Additional domains from `SANDBOX_EXTRA_DOMAINS` env var (comma-separated)
-
-**Reference:** `src/config.rs` — sandbox allowlist assembly
-
----
-
-## Authentication Mechanisms Summary
-
-| Mechanism | Constant-Time | Used By | Reference |
-|-----------|:------------:|---------|-----------|
-| Gateway bearer token | Yes | Web gateway (header + query) | `src/channels/web/auth.rs` — `auth_middleware()` |
-| Webhook shared secret | Yes | HTTP webhook (`ct_eq` comparison) | `src/channels/http.rs` — `webhook_handler()` |
-| Per-job bearer token | Yes | Orchestrator worker API | `src/orchestrator/auth.rs` — `TokenStore::validate()` |
-| OAuth callback | N/A | CLI OAuth flow (no auth, loopback-only) | `src/cli/oauth_defaults.rs` — `bind_callback_listener()` |
-| Sandbox proxy | N/A | No auth (loopback-only, ephemeral) | `src/sandbox/proxy/http.rs` — `SandboxProxy::start()` |
-
----
-
-## Known Security Findings
-
-### Open
-
-#### F-2. No TLS at the application layer
-
-**Severity:** Low (for local deployment)
-**Details:** None of the listeners terminate TLS. All communication is plain HTTP.
-**Mitigation:** The web gateway and OAuth callback bind to loopback by default. For production, users are expected to front the gateway with a reverse proxy (nginx, Caddy) or tunnel (Cloudflare, ngrok) that provides TLS.
-**Recommendation:** Document the requirement for a TLS-terminating reverse proxy in deployment guides.
-
-#### F-3. Orchestrator binds to `0.0.0.0` on Linux
-
-**Severity:** Medium
-**Location:** `src/orchestrator/api.rs` — platform-conditional bind in `OrchestratorApi::start()`
-**Details:** On Linux, the orchestrator API binds to all interfaces because Docker containers reach the host via the bridge gateway (`172.17.0.1`), not loopback. This means the API is reachable from any network interface on the host.
-**Mitigation:** All `/worker/*` endpoints require per-job bearer tokens (constant-time, cryptographically random). The `/health` endpoint is the only unauthenticated route and returns only `"ok"`. Firewall rules should block external access to port 50051.
-**Recommendation:** Document firewall requirements for Linux deployments. Consider binding to the Docker bridge IP (`172.17.0.1`) instead of `0.0.0.0`.
-
-#### F-6. WebSocket/SSE connection limit
-
-**Severity:** Info
-**Details:** The `SseManager` enforces a hard limit of **100 concurrent connections** (`MAX_CONNECTIONS` constant in `src/channels/web/sse.rs`). Both SSE subscribers and WebSocket connections share this counter. When exceeded, new WebSocket upgrades are rejected with a warning log and the connection is immediately closed.
-**Reference:** `src/channels/web/sse.rs` — `MAX_CONNECTIONS`, `src/channels/web/ws.rs` — `handle_ws_connection()` early return
-
-#### F-7. Orchestrator API has no rate limiting
-
-**Severity:** Low
-**Details:** The orchestrator API has no request-rate throttling. A compromised container could spam authenticated endpoints (e.g., `/worker/{job_id}/llm/complete`) to drive up LLM costs or degrade service for other jobs.
-**Mitigation:** Tokens are scoped per-job, limiting blast radius. Container execution is time-bounded by the sandbox timeout, which caps the abuse window.
-**Recommendation:** Consider adding per-token rate limiting on the LLM proxy endpoints.
-
-#### F-8. Orchestrator API has no graceful shutdown
-
-**Severity:** Info
-**Details:** The orchestrator calls `axum::serve(listener, router).await?` without `.with_graceful_shutdown()`. In-flight requests (including LLM proxy calls) may be interrupted during process shutdown.
-**Reference:** `src/orchestrator/api.rs` — `OrchestratorApi::start()`
-
-### Resolved / Mitigated
-
-<details>
-<summary>Resolved and mitigated findings (click to expand)</summary>
-
-#### F-1. ~~Webhook secret comparison is not constant-time~~ (Resolved)
-
-**Severity:** Low
-**Location:** `src/channels/http.rs` — `webhook_handler()`
-**Status:** Resolved — webhook secret now uses `subtle::ConstantTimeEq` (`ct_eq`), consistent with web gateway and orchestrator auth.
-
-#### F-4. ~~HTTP webhook server binds to `0.0.0.0` by default~~ (Mitigated)
-
-**Severity:** Low
-**Location:** `src/config.rs`, `src/main.rs`
-**Status:** Mitigated — a `tracing::warn!` is now emitted at startup when the webhook server binds to an unspecified address (`0.0.0.0` or `::`), advising operators to set `HTTP_HOST=127.0.0.1` to restrict to localhost. The default bind address remains `0.0.0.0`, so webhook exposure is still controlled by operator configuration and external network controls (firewalls, ingress rules).
-
-#### F-5. ~~Missing security headers on web gateway~~ (Mitigated)
-
-**Severity:** Low
-**Status:** Mitigated — `X-Content-Type-Options: nosniff` and `X-Frame-Options: DENY` are now set on all gateway responses via `SetResponseHeaderLayer::if_not_present`. Layer ordering ensures these headers are applied even to error responses generated by inner layers (e.g., `DefaultBodyLimit` 413 rejections).
-
-</details>
-
----
-
-## Review Checklist for Network Changes
-
-Use this checklist for any PR that adds or modifies network-facing code.
-
-### New Listener
-
-- [ ] **Bind address**: Does it bind to loopback (`127.0.0.1`) or all interfaces (`0.0.0.0`)? Justify if `0.0.0.0`.
-- [ ] **Port configuration**: Is the port configurable via env var? Is a sensible default set?
-- [ ] **Authentication**: Is auth required? If yes, is it constant-time? If no, why not?
-- [ ] **Rate limiting**: Is there a rate limiter? What are the limits?
-- [ ] **Body size limit**: Is `DefaultBodyLimit` (or equivalent) set?
-- [ ] **Content-Type validation**: Does the handler validate Content-Type (e.g., via axum `Json<T>` extractor)?
-- [ ] **Graceful shutdown**: Does the listener support graceful shutdown via oneshot or similar?
-- [ ] **Inventory update**: Is this document updated with the new listener?
-
-### New Route on Existing Listener
-
-- [ ] **Auth layer**: Is the route behind the auth middleware? If public, why?
-- [ ] **Input validation**: Are path parameters, query parameters, and body fields validated?
-- [ ] **Error responses**: Do error responses avoid leaking internal details?
-
-### Egress (Outbound HTTP)
-
-- [ ] **SSRF protection**: Does the code block private IPs, localhost, and cloud metadata endpoints?
-- [ ] **DNS rebinding**: Are resolved IPs checked (not just the hostname)?
-- [ ] **Redirect handling**: Are redirects blocked or validated?
-- [ ] **Response size**: Is there a max response size?
-- [ ] **Timeout**: Is a request timeout set?
-- [ ] **Leak detection**: Is the outbound request scanned for secrets?
-
-### Credential Handling
-
-- [ ] **Constant-time comparison**: Are secrets compared with `subtle::ConstantTimeEq`?
-- [ ] **No logging**: Are credentials excluded from log messages?
-- [ ] **Ephemeral storage**: Are tokens stored in memory only (not persisted)?
-- [ ] **Scope**: Are credentials scoped to the minimum necessary (per-job, per-tool)?
-- [ ] **Revocation**: Are credentials revoked when no longer needed?
-
-### Container / Sandbox
-
-- [ ] **Capabilities**: Are all capabilities dropped except what's needed?
-- [ ] **Filesystem**: Is the root filesystem read-only?
-- [ ] **User**: Does the container run as non-root?
-- [ ] **Network**: Is network access routed through the proxy?
-- [ ] **Timeout**: Is there an execution timeout with forced cleanup?
-- [ ] **Output limits**: Are stdout/stderr capped?

src/agent/commands.rs

@@ -1,507 +0,0 @@
-//! System commands and job handlers for the agent.
-//!
-//! Extracted from `agent_loop.rs` to isolate the /help, /model, /status,
-//! and other command processing from the core agent loop.
-
-use std::sync::Arc;
-
-use tokio::sync::Mutex;
-use uuid::Uuid;
-
-use crate::agent::session::Session;
-use crate::agent::submission::SubmissionResult;
-use crate::agent::{Agent, MessageIntent};
-use crate::channels::{IncomingMessage, StatusUpdate};
-use crate::error::Error;
-use crate::llm::{ChatMessage, Reasoning};
-
-impl Agent {
-    /// Handle job-related intents without turn tracking.
-    pub(super) async fn handle_job_or_command(
-        &self,
-        intent: MessageIntent,
-        message: &IncomingMessage,
-    ) -> Result<SubmissionResult, Error> {
-        // Send thinking status for non-trivial operations
-        if let MessageIntent::CreateJob { .. } = &intent {
-            let _ = self
-                .channels
-                .send_status(
-                    &message.channel,
-                    StatusUpdate::Thinking("Processing...".into()),
-                    &message.metadata,
-                )
-                .await;
-        }
-
-        let response = match intent {
-            MessageIntent::CreateJob {
-                title,
-                description,
-                category,
-            } => {
-                self.handle_create_job(&message.user_id, title, description, category)
-                    .await?
-            }
-            MessageIntent::CheckJobStatus { job_id } => {
-                self.handle_check_status(&message.user_id, job_id).await?
-            }
-            MessageIntent::CancelJob { job_id } => {
-                self.handle_cancel_job(&message.user_id, &job_id).await?
-            }
-            MessageIntent::ListJobs { filter } => {
-                self.handle_list_jobs(&message.user_id, filter).await?
-            }
-            MessageIntent::HelpJob { job_id } => {
-                self.handle_help_job(&message.user_id, &job_id).await?
-            }
-            MessageIntent::Command { command, args } => {
-                match self.handle_command(&command, &args).await? {
-                    Some(s) => s,
-                    None => return Ok(SubmissionResult::Ok { message: None }), // Shutdown signal
-                }
-            }
-            _ => "Unknown intent".to_string(),
-        };
-        Ok(SubmissionResult::response(response))
-    }
-
-    async fn handle_create_job(
-        &self,
-        user_id: &str,
-        title: String,
-        description: String,
-        category: Option<String>,
-    ) -> Result<String, Error> {
-        // Create job context
-        let job_id = self
-            .context_manager
-            .create_job_for_user(user_id, &title, &description)
-            .await?;
-
-        // Update category if provided
-        if let Some(cat) = category {
-            self.context_manager
-                .update_context(job_id, |ctx| {
-                    ctx.category = Some(cat);
-                })
-                .await?;
-        }
-
-        // Persist new job to database (fire-and-forget)
-        if let Some(store) = self.store()
-            && let Ok(ctx) = self.context_manager.get_context(job_id).await
-        {
-            let store = store.clone();
-            tokio::spawn(async move {
-                if let Err(e) = store.save_job(&ctx).await {
-                    tracing::warn!("Failed to persist new job {}: {}", job_id, e);
-                }
-            });
-        }
-
-        // Schedule for execution
-        self.scheduler.schedule(job_id).await?;
-
-        Ok(format!(
-            "Created job: {}\nID: {}\n\nThe job has been scheduled and is now running.",
-            title, job_id
-        ))
-    }
-
-    async fn handle_check_status(
-        &self,
-        user_id: &str,
-        job_id: Option<String>,
-    ) -> Result<String, Error> {
-        match job_id {
-            Some(id) => {
-                let uuid = Uuid::parse_str(&id)
-                    .map_err(|_| crate::error::JobError::NotFound { id: Uuid::nil() })?;
-
-                let ctx = self.context_manager.get_context(uuid).await?;
-                if ctx.user_id != user_id {
-                    return Err(crate::error::JobError::NotFound { id: uuid }.into());
-                }
-
-                Ok(format!(
-                    "Job: {}\nStatus: {:?}\nCreated: {}\nStarted: {}\nActual cost: {}",
-                    ctx.title,
-                    ctx.state,
-                    ctx.created_at.format("%Y-%m-%d %H:%M:%S"),
-                    ctx.started_at
-                        .map(|t| t.format("%Y-%m-%d %H:%M:%S").to_string())
-                        .unwrap_or_else(|| "Not started".to_string()),
-                    ctx.actual_cost
-                ))
-            }
-            None => {
-                // Show summary of all jobs
-                let summary = self.context_manager.summary_for(user_id).await;
-                Ok(format!(
-                    "Jobs summary:\n  Total: {}\n  In Progress: {}\n  Completed: {}\n  Failed: {}\n  Stuck: {}",
-                    summary.total,
-                    summary.in_progress,
-                    summary.completed,
-                    summary.failed,
-                    summary.stuck
-                ))
-            }
-        }
-    }
-
-    async fn handle_cancel_job(&self, user_id: &str, job_id: &str) -> Result<String, Error> {
-        let uuid = Uuid::parse_str(job_id)
-            .map_err(|_| crate::error::JobError::NotFound { id: Uuid::nil() })?;
-
-        let ctx = self.context_manager.get_context(uuid).await?;
-        if ctx.user_id != user_id {
-            return Err(crate::error::JobError::NotFound { id: uuid }.into());
-        }
-
-        self.scheduler.stop(uuid).await?;
-
-        Ok(format!("Job {} has been cancelled.", job_id))
-    }
-
-    async fn handle_list_jobs(
-        &self,
-        user_id: &str,
-        _filter: Option<String>,
-    ) -> Result<String, Error> {
-        let jobs = self.context_manager.all_jobs_for(user_id).await;
-
-        if jobs.is_empty() {
-            return Ok("No jobs found.".to_string());
-        }
-
-        let mut output = String::from("Jobs:\n");
-        for job_id in jobs {
-            if let Ok(ctx) = self.context_manager.get_context(job_id).await
-                && ctx.user_id == user_id
-            {
-                output.push_str(&format!("  {} - {} ({:?})\n", job_id, ctx.title, ctx.state));
-            }
-        }
-
-        Ok(output)
-    }
-
-    async fn handle_help_job(&self, user_id: &str, job_id: &str) -> Result<String, Error> {
-        let uuid = Uuid::parse_str(job_id)
-            .map_err(|_| crate::error::JobError::NotFound { id: Uuid::nil() })?;
-
-        let ctx = self.context_manager.get_context(uuid).await?;
-        if ctx.user_id != user_id {
-            return Err(crate::error::JobError::NotFound { id: uuid }.into());
-        }
-
-        if ctx.state == crate::context::JobState::Stuck {
-            // Attempt recovery
-            self.context_manager
-                .update_context(uuid, |ctx| ctx.attempt_recovery())
-                .await?
-                .map_err(|s| crate::error::JobError::ContextError {
-                    id: uuid,
-                    reason: s,
-                })?;
-
-            // Reschedule
-            self.scheduler.schedule(uuid).await?;
-
-            Ok(format!(
-                "Job {} was stuck. Attempting recovery (attempt #{}).",
-                job_id,
-                ctx.repair_attempts + 1
-            ))
-        } else {
-            Ok(format!(
-                "Job {} is not stuck (current state: {:?}). No help needed.",
-                job_id, ctx.state
-            ))
-        }
-    }
-
-    /// Trigger a manual heartbeat check.
-    pub(super) async fn process_heartbeat(&self) -> Result<SubmissionResult, Error> {
-        let Some(workspace) = self.workspace() else {
-            return Ok(SubmissionResult::error(
-                "Heartbeat requires a workspace (database must be connected).",
-            ));
-        };
-
-        let runner = crate::agent::HeartbeatRunner::new(
-            crate::agent::HeartbeatConfig::default(),
-            crate::workspace::hygiene::HygieneConfig::default(),
-            workspace.clone(),
-            self.llm().clone(),
-            self.safety().clone(),
-        );
-
-        match runner.check_heartbeat().await {
-            crate::agent::HeartbeatResult::Ok => Ok(SubmissionResult::ok_with_message(
-                "Heartbeat: all clear, nothing needs attention.",
-            )),
-            crate::agent::HeartbeatResult::NeedsAttention(msg) => Ok(SubmissionResult::response(
-                format!("Heartbeat findings:\n\n{}", msg),
-            )),
-            crate::agent::HeartbeatResult::Skipped => Ok(SubmissionResult::ok_with_message(
-                "Heartbeat skipped: no HEARTBEAT.md checklist found in workspace.",
-            )),
-            crate::agent::HeartbeatResult::Failed(err) => Ok(SubmissionResult::error(format!(
-                "Heartbeat failed: {}",
-                err
-            ))),
-        }
-    }
-
-    /// Summarize the current thread's conversation.
-    pub(super) async fn process_summarize(
-        &self,
-        session: Arc<Mutex<Session>>,
-        thread_id: Uuid,
-    ) -> Result<SubmissionResult, Error> {
-        let messages = {
-            let sess = session.lock().await;
-            let thread = sess
-                .threads
-                .get(&thread_id)
-                .ok_or_else(|| Error::from(crate::error::JobError::NotFound { id: thread_id }))?;
-            thread.messages()
-        };
-
-        if messages.is_empty() {
-            return Ok(SubmissionResult::ok_with_message(
-                "Nothing to summarize (empty thread).",
-            ));
-        }
-
-        // Build a summary prompt with the conversation
-        let mut context = Vec::new();
-        context.push(ChatMessage::system(
-            "Summarize the conversation so far in 3-5 concise bullet points. \
-             Focus on decisions made, actions taken, and key outcomes. \
-             Be brief and factual.",
-        ));
-        // Include the conversation messages (truncate to last 20 to avoid context overflow)
-        let start = if messages.len() > 20 {
-            messages.len() - 20
-        } else {
-            0
-        };
-        context.extend_from_slice(&messages[start..]);
-        context.push(ChatMessage::user("Summarize this conversation."));
-
-        let request = crate::llm::CompletionRequest::new(context)
-            .with_max_tokens(512)
-            .with_temperature(0.3);
-
-        let reasoning = Reasoning::new(self.llm().clone(), self.safety().clone());
-        match reasoning.complete(request).await {
-            Ok((text, _usage)) => Ok(SubmissionResult::response(format!(
-                "Thread Summary:\n\n{}",
-                text.trim()
-            ))),
-            Err(e) => Ok(SubmissionResult::error(format!("Summarize failed: {}", e))),
-        }
-    }
-
-    /// Suggest next steps based on the current thread.
-    pub(super) async fn process_suggest(
-        &self,
-        session: Arc<Mutex<Session>>,
-        thread_id: Uuid,
-    ) -> Result<SubmissionResult, Error> {
-        let messages = {
-            let sess = session.lock().await;
-            let thread = sess
-                .threads
-                .get(&thread_id)
-                .ok_or_else(|| Error::from(crate::error::JobError::NotFound { id: thread_id }))?;
-            thread.messages()
-        };
-
-        if messages.is_empty() {
-            return Ok(SubmissionResult::ok_with_message(
-                "Nothing to suggest from (empty thread).",
-            ));
-        }
-
-        let mut context = Vec::new();
-        context.push(ChatMessage::system(
-            "Based on the conversation so far, suggest 2-4 concrete next steps the user could take. \
-             Be actionable and specific. Format as a numbered list.",
-        ));
-        let start = if messages.len() > 20 {
-            messages.len() - 20
-        } else {
-            0
-        };
-        context.extend_from_slice(&messages[start..]);
-        context.push(ChatMessage::user("What should I do next?"));
-
-        let request = crate::llm::CompletionRequest::new(context)
-            .with_max_tokens(512)
-            .with_temperature(0.5);
-
-        let reasoning = Reasoning::new(self.llm().clone(), self.safety().clone());
-        match reasoning.complete(request).await {
-            Ok((text, _usage)) => Ok(SubmissionResult::response(format!(
-                "Suggested Next Steps:\n\n{}",
-                text.trim()
-            ))),
-            Err(e) => Ok(SubmissionResult::error(format!("Suggest failed: {}", e))),
-        }
-    }
-
-    /// Handle system commands that bypass thread-state checks entirely.
-    pub(super) async fn handle_system_command(
-        &self,
-        command: &str,
-        args: &[String],
-    ) -> Result<SubmissionResult, Error> {
-        match command {
-            "help" => Ok(SubmissionResult::response(concat!(
-                "System:\n",
-                "  /help             Show this help\n",
-                "  /model [name]     Show or switch the active model\n",
-                "  /version          Show version info\n",
-                "  /tools            List available tools\n",
-                "  /debug            Toggle debug mode\n",
-                "  /ping             Connectivity check\n",
-                "\n",
-                "Jobs:\n",
-                "  /job <desc>       Create a new job\n",
-                "  /status [id]      Check job status\n",
-                "  /cancel <id>      Cancel a job\n",
-                "  /list             List all jobs\n",
-                "\n",
-                "Session:\n",
-                "  /undo             Undo last turn\n",
-                "  /redo             Redo undone turn\n",
-                "  /compact          Compress context window\n",
-                "  /clear            Clear current thread\n",
-                "  /interrupt        Stop current operation\n",
-                "  /new              New conversation thread\n",
-                "  /thread <id>      Switch to thread\n",
-                "  /resume <id>      Resume from checkpoint\n",
-                "\n",
-                "Agent:\n",
-                "  /heartbeat        Run heartbeat check\n",
-                "  /summarize        Summarize current thread\n",
-                "  /suggest          Suggest next steps\n",
-                "\n",
-                "  /quit             Exit",
-            ))),
-
-            "ping" => Ok(SubmissionResult::response("pong!")),
-
-            "version" => Ok(SubmissionResult::response(format!(
-                "{} v{}",
-                env!("CARGO_PKG_NAME"),
-                env!("CARGO_PKG_VERSION")
-            ))),
-
-            "tools" => {
-                let tools = self.tools().list().await;
-                Ok(SubmissionResult::response(format!(
-                    "Available tools: {}",
-                    tools.join(", ")
-                )))
-            }
-
-            "debug" => {
-                // Debug toggle is handled client-side in the REPL.
-                // For non-REPL channels, just acknowledge.
-                Ok(SubmissionResult::ok_with_message(
-                    "Debug toggle is handled by your client.",
-                ))
-            }
-
-            "model" => {
-                let current = self.llm().active_model_name();
-
-                if args.is_empty() {
-                    // Show current model and list available models
-                    let mut out = format!("Active model: {}\n", current);
-                    match self.llm().list_models().await {
-                        Ok(models) if !models.is_empty() => {
-                            out.push_str("\nAvailable models:\n");
-                            for m in &models {
-                                let marker = if *m == current { " (active)" } else { "" };
-                                out.push_str(&format!("  {}{}\n", m, marker));
-                            }
-                            out.push_str("\nUse /model <name> to switch.");
-                        }
-                        Ok(_) => {
-                            out.push_str(
-                                "\nCould not fetch model list. Use /model <name> to switch.",
-                            );
-                        }
-                        Err(e) => {
-                            out.push_str(&format!(
-                                "\nCould not fetch models: {}. Use /model <name> to switch.",
-                                e
-                            ));
-                        }
-                    }
-                    Ok(SubmissionResult::response(out))
-                } else {
-                    let requested = &args[0];
-
-                    // Validate the model exists
-                    match self.llm().list_models().await {
-                        Ok(models) if !models.is_empty() => {
-                            if !models.iter().any(|m| m == requested) {
-                                return Ok(SubmissionResult::error(format!(
-                                    "Unknown model: {}. Available models:\n  {}",
-                                    requested,
-                                    models.join("\n  ")
-                                )));
-                            }
-                        }
-                        Ok(_) => {
-                            // Empty model list, can't validate but try anyway
-                        }
-                        Err(e) => {
-                            tracing::warn!("Could not fetch model list for validation: {}", e);
-                        }
-                    }
-
-                    match self.llm().set_model(requested) {
-                        Ok(()) => Ok(SubmissionResult::response(format!(
-                            "Switched model to: {}",
-                            requested
-                        ))),
-                        Err(e) => Ok(SubmissionResult::error(format!(
-                            "Failed to switch model: {}",
-                            e
-                        ))),
-                    }
-                }
-            }
-
-            _ => Ok(SubmissionResult::error(format!(
-                "Unknown command: {}. Try /help",
-                command
-            ))),
-        }
-    }
-
-    /// Handle legacy command routing from the Router (job commands that go through
-    /// process_user_input -> router -> handle_job_or_command -> here).
-    pub(super) async fn handle_command(
-        &self,
-        command: &str,
-        args: &[String],
-    ) -> Result<Option<String>, Error> {
-        // System commands are now handled directly via Submission::SystemCommand,
-        // but the router may still send us unknown /commands.
-        match self.handle_system_command(command, args).await? {
-            SubmissionResult::Response { content } => Ok(Some(content)),
-            SubmissionResult::Ok { message } => Ok(message),
-            SubmissionResult::Error { message } => Ok(Some(format!("Error: {}", message))),
-            _ => Ok(None),
-        }
-    }
-}

src/agent/compaction.rs

@@ -12,8 +12,7 @@ use chrono::Utc;
 use crate::agent::context_monitor::{CompactionStrategy, ContextBreakdown};
 use crate::agent::session::Thread;
 use crate::error::Error;
-use crate::llm::{ChatMessage, CompletionRequest, LlmProvider, Reasoning};
-use crate::safety::SafetyLayer;
+use crate::llm::{ChatMessage, CompletionRequest, LlmProvider};
 use crate::workspace::Workspace;
 
 /// Result of a compaction operation.
@@ -34,13 +33,12 @@ pub struct CompactionResult {
 /// Compacts conversation context to stay within limits.
 pub struct ContextCompactor {
     llm: Arc<dyn LlmProvider>,
-    safety: Arc<SafetyLayer>,
 }
 
 impl ContextCompactor {
     /// Create a new context compactor.
-    pub fn new(llm: Arc<dyn LlmProvider>, safety: Arc<SafetyLayer>) -> Self {
-        Self { llm, safety }
+    pub fn new(llm: Arc<dyn LlmProvider>) -> Self {
+        Self { llm }
     }
 
     /// Compact a thread's context using the given strategy.
@@ -107,16 +105,7 @@ impl ContextCompactor {
 
         // Write to workspace if available
         let summary_written = if let Some(ws) = workspace {
-            match self.write_summary_to_workspace(ws, &summary).await {
-                Ok(()) => true,
-                Err(e) => {
-                    tracing::warn!(
-                        "Compaction summary write failed (turns will still be truncated): {}",
-                        e
-                    );
-                    false
-                }
-            }
+            self.write_summary_to_workspace(ws, &summary).await.is_ok()
         } else {
             false
         };
@@ -168,16 +157,7 @@ impl ContextCompactor {
         let content = format_turns_for_storage(old_turns);
 
         // Write to workspace
-        let written = match self.write_context_to_workspace(ws, &content).await {
-            Ok(()) => true,
-            Err(e) => {
-                tracing::warn!(
-                    "Compaction context write failed (turns will still be truncated): {}",
-                    e
-                );
-                false
-            }
-        };
+        let written = self.write_context_to_workspace(ws, &content).await.is_ok();
 
         // Truncate
         thread.truncate_turns(keep_recent);
@@ -233,9 +213,8 @@ Be brief but capture all important details. Use bullet points."#,
             .with_max_tokens(1024)
             .with_temperature(0.3);
 
-        let reasoning = Reasoning::new(self.llm.clone(), self.safety.clone());
-        let (text, _) = reasoning.complete(request).await?;
-        Ok(text)
+        let response = self.llm.complete(request).await?;
+        Ok(response.content)
     }
 
     /// Write a summary to the workspace daily log.

src/agent/cost_guard.rs

@@ -1,339 +0,0 @@
-//! Cost enforcement guardrails for the agent.
-//!
-//! Tracks LLM spending and action rates, enforcing configurable limits
-//! to prevent runaway agents from burning through API credits. Especially
-//! important for daemon/heartbeat modes where the agent acts autonomously.
-
-use std::collections::VecDeque;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::time::Instant;
-
-use rust_decimal::Decimal;
-use rust_decimal_macros::dec;
-use tokio::sync::Mutex;
-
-use crate::llm::costs;
-
-/// Configuration for cost guardrails.
-#[derive(Debug, Clone, Default)]
-pub struct CostGuardConfig {
-    /// Maximum spend per day in cents (e.g. 10000 = $100). None = unlimited.
-    pub max_cost_per_day_cents: Option<u64>,
-    /// Maximum LLM calls per hour. None = unlimited.
-    pub max_actions_per_hour: Option<u64>,
-}
-
-/// Error returned when a cost limit is exceeded.
-#[derive(Debug, Clone)]
-pub enum CostLimitExceeded {
-    /// Daily spending cap reached.
-    DailyBudget { spent_cents: u64, limit_cents: u64 },
-    /// Hourly action rate limit reached.
-    HourlyRate { actions: u64, limit: u64 },
-}
-
-impl std::fmt::Display for CostLimitExceeded {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::DailyBudget {
-                spent_cents,
-                limit_cents,
-            } => write!(
-                f,
-                "Daily cost limit exceeded: spent ${:.2} of ${:.2} allowed",
-                *spent_cents as f64 / 100.0,
-                *limit_cents as f64 / 100.0
-            ),
-            Self::HourlyRate { actions, limit } => write!(
-                f,
-                "Hourly action limit exceeded: {} actions of {} allowed per hour",
-                actions, limit
-            ),
-        }
-    }
-}
-
-/// Tracks costs and action rates, enforcing configurable limits.
-///
-/// Thread-safe; designed to be shared via `Arc<CostGuard>`.
-pub struct CostGuard {
-    config: CostGuardConfig,
-
-    /// Running cost total for the current day (in USD, not cents).
-    daily_cost: Mutex<DailyCost>,
-
-    /// Sliding window of action timestamps for rate limiting.
-    action_window: Mutex<VecDeque<Instant>>,
-
-    /// Flag set when daily budget is exceeded to short-circuit checks.
-    budget_exceeded: AtomicBool,
-}
-
-struct DailyCost {
-    total: Decimal,
-    /// Day boundary (midnight UTC) for resetting the counter.
-    reset_date: chrono::NaiveDate,
-}
-
-impl CostGuard {
-    pub fn new(config: CostGuardConfig) -> Self {
-        Self {
-            config,
-            daily_cost: Mutex::new(DailyCost {
-                total: Decimal::ZERO,
-                reset_date: chrono::Utc::now().date_naive(),
-            }),
-            action_window: Mutex::new(VecDeque::new()),
-            budget_exceeded: AtomicBool::new(false),
-        }
-    }
-
-    /// Check whether the next action is allowed under the configured limits.
-    ///
-    /// Call this BEFORE making an LLM call. Does NOT record the action yet,
-    /// call `record_action` after the action completes.
-    pub async fn check_allowed(&self) -> Result<(), CostLimitExceeded> {
-        // Fast path: if budget already blown, skip the lock
-        if self.budget_exceeded.load(Ordering::Relaxed) {
-            let daily = self.daily_cost.lock().await;
-            let spent_cents = to_cents(daily.total);
-            return Err(CostLimitExceeded::DailyBudget {
-                spent_cents,
-                limit_cents: self.config.max_cost_per_day_cents.unwrap_or(0),
-            });
-        }
-
-        // Check daily budget
-        if let Some(limit_cents) = self.config.max_cost_per_day_cents {
-            let daily = self.daily_cost.lock().await;
-            let spent_cents = to_cents(daily.total);
-            if spent_cents >= limit_cents {
-                self.budget_exceeded.store(true, Ordering::Relaxed);
-                return Err(CostLimitExceeded::DailyBudget {
-                    spent_cents,
-                    limit_cents,
-                });
-            }
-        }
-
-        // Check hourly rate
-        if let Some(limit) = self.config.max_actions_per_hour {
-            let mut window = self.action_window.lock().await;
-            let cutoff = Instant::now() - std::time::Duration::from_secs(3600);
-            // Drain expired entries
-            while window.front().is_some_and(|t| *t < cutoff) {
-                window.pop_front();
-            }
-            let count = window.len() as u64;
-            if count >= limit {
-                return Err(CostLimitExceeded::HourlyRate {
-                    actions: count,
-                    limit,
-                });
-            }
-        }
-
-        Ok(())
-    }
-
-    /// Record a completed LLM action: its token costs and the action timestamp.
-    ///
-    /// Call this AFTER an LLM call completes so that costs are tracked.
-    pub async fn record_llm_call(
-        &self,
-        model: &str,
-        input_tokens: u32,
-        output_tokens: u32,
-    ) -> Decimal {
-        let (input_rate, output_rate) =
-            costs::model_cost(model).unwrap_or_else(costs::default_cost);
-        let cost =
-            input_rate * Decimal::from(input_tokens) + output_rate * Decimal::from(output_tokens);
-
-        // Update daily cost (reset if new day)
-        {
-            let mut daily = self.daily_cost.lock().await;
-            let today = chrono::Utc::now().date_naive();
-            if today != daily.reset_date {
-                daily.total = Decimal::ZERO;
-                daily.reset_date = today;
-                self.budget_exceeded.store(false, Ordering::Relaxed);
-                tracing::info!("Cost guard: daily counter reset for {}", today);
-            }
-            daily.total += cost;
-
-            // Check if we just crossed the threshold
-            if let Some(limit_cents) = self.config.max_cost_per_day_cents {
-                let spent_cents = to_cents(daily.total);
-                if spent_cents >= limit_cents {
-                    self.budget_exceeded.store(true, Ordering::Relaxed);
-                    tracing::warn!(
-                        "Daily cost limit reached: ${:.2} of ${:.2}",
-                        daily.total,
-                        Decimal::from(limit_cents) / dec!(100)
-                    );
-                }
-                // Warn at 80% threshold
-                let warn_threshold = limit_cents * 80 / 100;
-                if spent_cents >= warn_threshold && spent_cents < limit_cents {
-                    tracing::warn!(
-                        "Approaching daily cost limit: ${:.2} of ${:.2} ({}%)",
-                        daily.total,
-                        Decimal::from(limit_cents) / dec!(100),
-                        spent_cents * 100 / limit_cents
-                    );
-                }
-            }
-        }
-
-        // Record action in sliding window
-        {
-            let mut window = self.action_window.lock().await;
-            window.push_back(Instant::now());
-        }
-
-        cost
-    }
-
-    /// Current daily spend in USD (as Decimal).
-    pub async fn daily_spend(&self) -> Decimal {
-        let daily = self.daily_cost.lock().await;
-        let today = chrono::Utc::now().date_naive();
-        if today != daily.reset_date {
-            Decimal::ZERO
-        } else {
-            daily.total
-        }
-    }
-
-    /// Number of actions in the current hourly window.
-    pub async fn actions_this_hour(&self) -> u64 {
-        let mut window = self.action_window.lock().await;
-        let cutoff = Instant::now() - std::time::Duration::from_secs(3600);
-        while window.front().is_some_and(|t| *t < cutoff) {
-            window.pop_front();
-        }
-        window.len() as u64
-    }
-}
-
-/// Convert a Decimal USD amount to whole cents (truncated).
-fn to_cents(usd: Decimal) -> u64 {
-    let cents = (usd * dec!(100)).trunc();
-    cents.to_string().parse::<u64>().unwrap_or(0)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[tokio::test]
-    async fn test_unlimited_allows_everything() {
-        let guard = CostGuard::new(CostGuardConfig::default());
-
-        // No limits set, should always be allowed
-        assert!(guard.check_allowed().await.is_ok());
-
-        // Record a big call, still allowed
-        guard.record_llm_call("gpt-4o", 100_000, 100_000).await;
-        assert!(guard.check_allowed().await.is_ok());
-    }
-
-    #[tokio::test]
-    async fn test_daily_budget_enforcement() {
-        let guard = CostGuard::new(CostGuardConfig {
-            max_cost_per_day_cents: Some(1), // $0.01 limit
-            max_actions_per_hour: None,
-        });
-
-        // First call allowed
-        assert!(guard.check_allowed().await.is_ok());
-
-        // Record a call that costs more than $0.01
-        // gpt-4o: input=$0.0000025/tok, output=$0.00001/tok
-        // 10000 input + 10000 output = $0.025 + $0.10 = $0.125
-        guard.record_llm_call("gpt-4o", 10_000, 10_000).await;
-
-        // Now should be blocked
-        let result = guard.check_allowed().await;
-        assert!(result.is_err());
-        match result.unwrap_err() {
-            CostLimitExceeded::DailyBudget { limit_cents, .. } => {
-                assert_eq!(limit_cents, 1);
-            }
-            other => panic!("Expected DailyBudget, got {:?}", other),
-        }
-    }
-
-    #[tokio::test]
-    async fn test_hourly_rate_enforcement() {
-        let guard = CostGuard::new(CostGuardConfig {
-            max_cost_per_day_cents: None,
-            max_actions_per_hour: Some(3),
-        });
-
-        // First 3 actions allowed
-        for _ in 0..3 {
-            assert!(guard.check_allowed().await.is_ok());
-            guard.record_llm_call("gpt-4o", 10, 10).await;
-        }
-
-        // 4th should be blocked
-        let result = guard.check_allowed().await;
-        assert!(result.is_err());
-        match result.unwrap_err() {
-            CostLimitExceeded::HourlyRate { actions, limit } => {
-                assert_eq!(actions, 3);
-                assert_eq!(limit, 3);
-            }
-            other => panic!("Expected HourlyRate, got {:?}", other),
-        }
-    }
-
-    #[tokio::test]
-    async fn test_daily_spend_tracking() {
-        let guard = CostGuard::new(CostGuardConfig::default());
-
-        assert_eq!(guard.daily_spend().await, Decimal::ZERO);
-
-        let cost = guard.record_llm_call("gpt-4o", 1000, 500).await;
-        assert!(cost > Decimal::ZERO);
-        assert_eq!(guard.daily_spend().await, cost);
-    }
-
-    #[tokio::test]
-    async fn test_actions_this_hour() {
-        let guard = CostGuard::new(CostGuardConfig::default());
-
-        assert_eq!(guard.actions_this_hour().await, 0);
-
-        guard.record_llm_call("gpt-4o", 10, 10).await;
-        guard.record_llm_call("gpt-4o", 10, 10).await;
-
-        assert_eq!(guard.actions_this_hour().await, 2);
-    }
-
-    #[test]
-    fn test_to_cents() {
-        assert_eq!(to_cents(dec!(1.50)), 150);
-        assert_eq!(to_cents(dec!(0.01)), 1);
-        assert_eq!(to_cents(Decimal::ZERO), 0);
-    }
-
-    #[test]
-    fn test_cost_limit_display() {
-        let budget = CostLimitExceeded::DailyBudget {
-            spent_cents: 1050,
-            limit_cents: 1000,
-        };
-        assert!(budget.to_string().contains("$10.50"));
-        assert!(budget.to_string().contains("$10.00"));
-
-        let rate = CostLimitExceeded::HourlyRate {
-            actions: 101,
-            limit: 100,
-        };
-        assert!(rate.to_string().contains("101 actions"));
-        assert!(rate.to_string().contains("100 allowed"));
-    }
-}

src/agent/heartbeat.rs

@@ -29,10 +29,8 @@ use std::time::Duration;
 use tokio::sync::mpsc;
 
 use crate::channels::OutgoingResponse;
-use crate::llm::{ChatMessage, CompletionRequest, LlmProvider, Reasoning};
-use crate::safety::SafetyLayer;
+use crate::llm::{ChatMessage, CompletionRequest, FinishReason, LlmProvider};
 use crate::workspace::Workspace;
-use crate::workspace::hygiene::HygieneConfig;
 
 /// Configuration for the heartbeat runner.
 #[derive(Debug, Clone)]
@@ -98,10 +96,8 @@ pub enum HeartbeatResult {
 /// Heartbeat runner for proactive periodic execution.
 pub struct HeartbeatRunner {
     config: HeartbeatConfig,
-    hygiene_config: HygieneConfig,
     workspace: Arc<Workspace>,
     llm: Arc<dyn LlmProvider>,
-    safety: Arc<SafetyLayer>,
     response_tx: Option<mpsc::Sender<OutgoingResponse>>,
     consecutive_failures: u32,
 }
@@ -110,17 +106,13 @@ impl HeartbeatRunner {
     /// Create a new heartbeat runner.
     pub fn new(
         config: HeartbeatConfig,
-        hygiene_config: HygieneConfig,
         workspace: Arc<Workspace>,
         llm: Arc<dyn LlmProvider>,
-        safety: Arc<SafetyLayer>,
     ) -> Self {
         Self {
             config,
-            hygiene_config,
             workspace,
             llm,
-            safety,
             response_tx: None,
             consecutive_failures: 0,
         }
@@ -153,22 +145,6 @@ impl HeartbeatRunner {
         loop {
             interval.tick().await;
 
-            // Run memory hygiene in the background so it never delays the
-            // heartbeat checklist. Failures are logged inside run_if_due.
-            let hygiene_workspace = Arc::clone(&self.workspace);
-            let hygiene_config = self.hygiene_config.clone();
-            tokio::spawn(async move {
-                let report =
-                    crate::workspace::hygiene::run_if_due(&hygiene_workspace, &hygiene_config)
-                        .await;
-                if report.had_work() {
-                    tracing::info!(
-                        daily_logs_deleted = report.daily_logs_deleted,
-                        "heartbeat: memory hygiene deleted stale documents"
-                    );
-                }
-            });
-
             match self.check_heartbeat().await {
                 HeartbeatResult::Ok => {
                     tracing::debug!("Heartbeat OK");
@@ -262,18 +238,25 @@ impl HeartbeatRunner {
             .with_max_tokens(max_tokens)
             .with_temperature(0.3);
 
-        let reasoning = Reasoning::new(self.llm.clone(), self.safety.clone());
-        let (content, _usage) = match reasoning.complete(request).await {
+        let response = match self.llm.complete(request).await {
             Ok(r) => r,
             Err(e) => return HeartbeatResult::Failed(format!("LLM call failed: {}", e)),
         };
 
-        let content = content.trim();
+        let content = response.content.trim();
 
         // Guard against empty content. Reasoning models (e.g. GLM-4.7) may
         // burn all output tokens on chain-of-thought and return content: null.
         if content.is_empty() {
-            return HeartbeatResult::Failed("LLM returned empty content.".to_string());
+            return if response.finish_reason == FinishReason::Length {
+                HeartbeatResult::Failed(
+                    "LLM response was truncated (finish_reason=length) with no content. \
+                     The model may have exhausted its token budget on reasoning."
+                        .to_string(),
+                )
+            } else {
+                HeartbeatResult::Failed("LLM returned empty content.".to_string())
+            };
         }
 
         // Check if nothing needs attention
@@ -349,13 +332,11 @@ fn strip_html_comments(content: &str) -> String {
 /// Returns a handle that can be used to stop the runner.
 pub fn spawn_heartbeat(
     config: HeartbeatConfig,
-    hygiene_config: HygieneConfig,
     workspace: Arc<Workspace>,
     llm: Arc<dyn LlmProvider>,
-    safety: Arc<SafetyLayer>,
     response_tx: Option<mpsc::Sender<OutgoingResponse>>,
 ) -> tokio::task::JoinHandle<()> {
-    let mut runner = HeartbeatRunner::new(config, hygiene_config, workspace, llm, safety);
+    let mut runner = HeartbeatRunner::new(config, workspace, llm);
     if let Some(tx) = response_tx {
         runner = runner.with_response_channel(tx);
     }

src/agent/job_monitor.rs

@@ -1,245 +0,0 @@
-//! Background job monitor that forwards Claude Code output to the main agent loop.
-//!
-//! When the main agent kicks off a sandbox job (especially Claude Code), this
-//! monitor subscribes to the broadcast event channel and injects relevant
-//! assistant messages back into the channel manager's stream. This lets the
-//! main agent see what the sub-agent is producing and surface it to the user.
-//!
-//! ```text
-//!   Container ──NDJSON──► Orchestrator ──broadcast──► JobMonitor
-//!                                                        │
-//!                                                  inject_tx (mpsc)
-//!                                                        │
-//!                                                        ▼
-//!                                                   Agent Loop
-//! ```
-
-use tokio::sync::{broadcast, mpsc};
-use tokio::task::JoinHandle;
-use uuid::Uuid;
-
-use crate::channels::IncomingMessage;
-use crate::channels::web::types::SseEvent;
-
-/// Spawn a background task that watches for events from a specific job and
-/// injects assistant messages into the agent loop.
-///
-/// The monitor forwards:
-/// - `SseEvent::JobMessage` (assistant role): injected as incoming messages so
-///   the main agent can read and relay to the user.
-/// - `SseEvent::JobResult`: injected as a completion notice, then the task exits.
-///
-/// Tool use/result and status events are intentionally skipped (too noisy for
-/// the main agent's context window).
-pub fn spawn_job_monitor(
-    job_id: Uuid,
-    mut event_rx: broadcast::Receiver<(Uuid, SseEvent)>,
-    inject_tx: mpsc::Sender<IncomingMessage>,
-) -> JoinHandle<()> {
-    let short_id = job_id.to_string()[..8].to_string();
-
-    tokio::spawn(async move {
-        tracing::info!(job_id = %short_id, "Job monitor started successfully");
-
-        loop {
-            match event_rx.recv().await {
-                Ok((ev_job_id, event)) => {
-                    if ev_job_id != job_id {
-                        continue;
-                    }
-
-                    match event {
-                        SseEvent::JobMessage { role, content, .. } if role == "assistant" => {
-                            let msg = IncomingMessage::new(
-                                "job_monitor",
-                                "system",
-                                format!("[Job {}] Claude Code: {}", short_id, content),
-                            );
-                            if inject_tx.send(msg).await.is_err() {
-                                tracing::debug!(
-                                    job_id = %short_id,
-                                    "Inject channel closed, stopping monitor"
-                                );
-                                break;
-                            }
-                        }
-                        SseEvent::JobResult { status, .. } => {
-                            let msg = IncomingMessage::new(
-                                "job_monitor",
-                                "system",
-                                format!(
-                                    "[Job {}] Container finished (status: {})",
-                                    short_id, status
-                                ),
-                            );
-                            let _ = inject_tx.send(msg).await;
-                            tracing::debug!(
-                                job_id = %short_id,
-                                status = %status,
-                                "Job monitor exiting (job finished)"
-                            );
-                            break;
-                        }
-                        _ => {
-                            // Skip tool_use, tool_result, status events
-                        }
-                    }
-                }
-                Err(broadcast::error::RecvError::Lagged(n)) => {
-                    tracing::warn!(
-                        job_id = %short_id,
-                        skipped = n,
-                        "Job monitor lagged, some events were dropped"
-                    );
-                }
-                Err(broadcast::error::RecvError::Closed) => {
-                    tracing::debug!(
-                        job_id = %short_id,
-                        "Broadcast channel closed, stopping monitor"
-                    );
-                    break;
-                }
-            }
-        }
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[tokio::test]
-    async fn test_monitor_forwards_assistant_messages() {
-        let (event_tx, _) = broadcast::channel::<(Uuid, SseEvent)>(16);
-        let (inject_tx, mut inject_rx) = mpsc::channel::<IncomingMessage>(16);
-
-        let job_id = Uuid::new_v4();
-        let _handle = spawn_job_monitor(job_id, event_tx.subscribe(), inject_tx);
-
-        // Send an assistant message
-        event_tx
-            .send((
-                job_id,
-                SseEvent::JobMessage {
-                    job_id: job_id.to_string(),
-                    role: "assistant".to_string(),
-                    content: "I found a bug".to_string(),
-                },
-            ))
-            .unwrap();
-
-        let msg = tokio::time::timeout(std::time::Duration::from_secs(1), inject_rx.recv())
-            .await
-            .unwrap()
-            .unwrap();
-
-        assert_eq!(msg.channel, "job_monitor");
-        assert_eq!(msg.user_id, "system");
-        assert!(msg.content.contains("I found a bug"));
-    }
-
-    #[tokio::test]
-    async fn test_monitor_ignores_other_jobs() {
-        let (event_tx, _) = broadcast::channel::<(Uuid, SseEvent)>(16);
-        let (inject_tx, mut inject_rx) = mpsc::channel::<IncomingMessage>(16);
-
-        let job_id = Uuid::new_v4();
-        let other_job_id = Uuid::new_v4();
-        let _handle = spawn_job_monitor(job_id, event_tx.subscribe(), inject_tx);
-
-        // Send a message for a different job
-        event_tx
-            .send((
-                other_job_id,
-                SseEvent::JobMessage {
-                    job_id: other_job_id.to_string(),
-                    role: "assistant".to_string(),
-                    content: "wrong job".to_string(),
-                },
-            ))
-            .unwrap();
-
-        // Should not receive anything
-        let result =
-            tokio::time::timeout(std::time::Duration::from_millis(100), inject_rx.recv()).await;
-        assert!(
-            result.is_err(),
-            "should have timed out, no message expected"
-        );
-    }
-
-    #[tokio::test]
-    async fn test_monitor_exits_on_job_result() {
-        let (event_tx, _) = broadcast::channel::<(Uuid, SseEvent)>(16);
-        let (inject_tx, mut inject_rx) = mpsc::channel::<IncomingMessage>(16);
-
-        let job_id = Uuid::new_v4();
-        let handle = spawn_job_monitor(job_id, event_tx.subscribe(), inject_tx);
-
-        // Send a completion event
-        event_tx
-            .send((
-                job_id,
-                SseEvent::JobResult {
-                    job_id: job_id.to_string(),
-                    status: "completed".to_string(),
-                    session_id: None,
-                },
-            ))
-            .unwrap();
-
-        // Should receive the completion message
-        let msg = tokio::time::timeout(std::time::Duration::from_secs(1), inject_rx.recv())
-            .await
-            .unwrap()
-            .unwrap();
-        assert!(msg.content.contains("finished"));
-
-        // The monitor task should exit
-        tokio::time::timeout(std::time::Duration::from_secs(1), handle)
-            .await
-            .expect("monitor should have exited")
-            .expect("monitor task should not panic");
-    }
-
-    #[tokio::test]
-    async fn test_monitor_skips_tool_events() {
-        let (event_tx, _) = broadcast::channel::<(Uuid, SseEvent)>(16);
-        let (inject_tx, mut inject_rx) = mpsc::channel::<IncomingMessage>(16);
-
-        let job_id = Uuid::new_v4();
-        let _handle = spawn_job_monitor(job_id, event_tx.subscribe(), inject_tx);
-
-        // Send tool use event (should be skipped)
-        event_tx
-            .send((
-                job_id,
-                SseEvent::JobToolUse {
-                    job_id: job_id.to_string(),
-                    tool_name: "shell".to_string(),
-                    input: serde_json::json!({"command": "ls"}),
-                },
-            ))
-            .unwrap();
-
-        // Send user message (should be skipped)
-        event_tx
-            .send((
-                job_id,
-                SseEvent::JobMessage {
-                    job_id: job_id.to_string(),
-                    role: "user".to_string(),
-                    content: "user prompt".to_string(),
-                },
-            ))
-            .unwrap();
-
-        // Should not receive anything for tool events or user messages
-        let result =
-            tokio::time::timeout(std::time::Duration::from_millis(100), inject_rx.recv()).await;
-        assert!(
-            result.is_err(),
-            "should have timed out, no message expected"
-        );
-    }
-}

src/agent/mod.rs

@@ -11,13 +11,9 @@
 //! - Context compaction for long conversations
 
 mod agent_loop;
-mod commands;
 pub mod compaction;
 pub mod context_monitor;
-pub mod cost_guard;
-mod dispatcher;
 mod heartbeat;
-pub mod job_monitor;
 mod router;
 pub mod routine;
 pub mod routine_engine;
@@ -27,7 +23,6 @@ pub mod session;
 mod session_manager;
 pub mod submission;
 pub mod task;
-mod thread_ops;
 pub mod undo;
 pub mod worker;
 
@@ -44,6 +39,6 @@ pub use self_repair::{BrokenTool, RepairResult, RepairTask, SelfRepair, StuckJob
 pub use session::{PendingApproval, PendingAuth, Session, Thread, ThreadState, Turn, TurnState};
 pub use session_manager::SessionManager;
 pub use submission::{Submission, SubmissionParser, SubmissionResult};
-pub use task::{Task, TaskContext, TaskHandler, TaskOutput};
+pub use task::{Task, TaskContext, TaskHandler, TaskOutput, TaskStatus};
 pub use undo::{Checkpoint, UndoManager};
 pub use worker::{Worker, WorkerDeps};

src/agent/routine.rs

@@ -26,8 +26,6 @@ use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
-use crate::error::RoutineError;
-
 /// A routine is a named, persistent, user-owned task with a trigger and an action.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Routine {
@@ -88,16 +86,13 @@ impl Trigger {
     }
 
     /// Parse a trigger from its DB representation.
-    pub fn from_db(trigger_type: &str, config: serde_json::Value) -> Result<Self, RoutineError> {
+    pub fn from_db(trigger_type: &str, config: serde_json::Value) -> Result<Self, String> {
         match trigger_type {
             "cron" => {
                 let schedule = config
                     .get("schedule")
                     .and_then(|v| v.as_str())
-                    .ok_or_else(|| RoutineError::MissingField {
-                        context: "cron trigger".into(),
-                        field: "schedule".into(),
-                    })?
+                    .ok_or("cron trigger missing 'schedule'")?
                     .to_string();
                 Ok(Trigger::Cron { schedule })
             }
@@ -105,10 +100,7 @@ impl Trigger {
                 let pattern = config
                     .get("pattern")
                     .and_then(|v| v.as_str())
-                    .ok_or_else(|| RoutineError::MissingField {
-                        context: "event trigger".into(),
-                        field: "pattern".into(),
-                    })?
+                    .ok_or("event trigger missing 'pattern'")?
                     .to_string();
                 let channel = config
                     .get("channel")
@@ -128,9 +120,7 @@ impl Trigger {
                 Ok(Trigger::Webhook { path, secret })
             }
             "manual" => Ok(Trigger::Manual),
-            other => Err(RoutineError::UnknownTriggerType {
-                trigger_type: other.to_string(),
-            }),
+            other => Err(format!("unknown trigger type: {other}")),
         }
     }
 
@@ -196,16 +186,13 @@ impl RoutineAction {
     }
 
     /// Parse an action from its DB representation.
-    pub fn from_db(action_type: &str, config: serde_json::Value) -> Result<Self, RoutineError> {
+    pub fn from_db(action_type: &str, config: serde_json::Value) -> Result<Self, String> {
         match action_type {
             "lightweight" => {
                 let prompt = config
                     .get("prompt")
                     .and_then(|v| v.as_str())
-                    .ok_or_else(|| RoutineError::MissingField {
-                        context: "lightweight action".into(),
-                        field: "prompt".into(),
-                    })?
+                    .ok_or("lightweight action missing 'prompt'")?
                     .to_string();
                 let context_paths = config
                     .get("context_paths")
@@ -230,18 +217,12 @@ impl RoutineAction {
                 let title = config
                     .get("title")
                     .and_then(|v| v.as_str())
-                    .ok_or_else(|| RoutineError::MissingField {
-                        context: "full_job action".into(),
-                        field: "title".into(),
-                    })?
+                    .ok_or("full_job action missing 'title'")?
                     .to_string();
                 let description = config
                     .get("description")
                     .and_then(|v| v.as_str())
-                    .ok_or_else(|| RoutineError::MissingField {
-                        context: "full_job action".into(),
-                        field: "description".into(),
-                    })?
+                    .ok_or("full_job action missing 'description'")?
                     .to_string();
                 let max_iterations = config
                     .get("max_iterations")
@@ -254,9 +235,7 @@ impl RoutineAction {
                     max_iterations,
                 })
             }
-            other => Err(RoutineError::UnknownActionType {
-                action_type: other.to_string(),
-            }),
+            other => Err(format!("unknown action type: {other}")),
         }
     }
 
@@ -355,16 +334,14 @@ impl std::fmt::Display for RunStatus {
 }
 
 impl FromStr for RunStatus {
-    type Err = RoutineError;
+    type Err = String;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
             "running" => Ok(RunStatus::Running),
             "ok" => Ok(RunStatus::Ok),
             "attention" => Ok(RunStatus::Attention),
             "failed" => Ok(RunStatus::Failed),
-            other => Err(RoutineError::UnknownRunStatus {
-                status: other.to_string(),
-            }),
+            other => Err(format!("unknown run status: {other}")),
         }
     }
 }
@@ -393,11 +370,9 @@ pub fn content_hash(content: &str) -> u64 {
 }
 
 /// Parse a cron expression and compute the next fire time from now.
-pub fn next_cron_fire(schedule: &str) -> Result<Option<DateTime<Utc>>, RoutineError> {
+pub fn next_cron_fire(schedule: &str) -> Result<Option<DateTime<Utc>>, String> {
     let cron_schedule =
-        cron::Schedule::from_str(schedule).map_err(|e| RoutineError::InvalidCron {
-            reason: e.to_string(),
-        })?;
+        cron::Schedule::from_str(schedule).map_err(|e| format!("invalid cron: {e}"))?;
     Ok(cron_schedule.upcoming(Utc).next())
 }
 

src/agent/routine_engine.rs

@@ -25,7 +25,6 @@ use crate::agent::routine::{
 use crate::channels::{IncomingMessage, OutgoingResponse};
 use crate::config::RoutineConfig;
 use crate::db::Database;
-use crate::error::RoutineError;
 use crate::llm::{ChatMessage, CompletionRequest, FinishReason, LlmProvider};
 use crate::workspace::Workspace;
 
@@ -175,26 +174,23 @@ impl RoutineEngine {
     }
 
     /// Fire a routine manually (from tool call or CLI).
-    pub async fn fire_manual(&self, routine_id: Uuid) -> Result<Uuid, RoutineError> {
+    pub async fn fire_manual(&self, routine_id: Uuid) -> Result<Uuid, String> {
         let routine = self
             .store
             .get_routine(routine_id)
             .await
-            .map_err(|e| RoutineError::Database {
-                reason: e.to_string(),
-            })?
-            .ok_or(RoutineError::NotFound { id: routine_id })?;
+            .map_err(|e| format!("DB error: {e}"))?
+            .ok_or_else(|| format!("routine {routine_id} not found"))?;
 
         if !routine.enabled {
-            return Err(RoutineError::Disabled {
-                name: routine.name.clone(),
-            });
+            return Err(format!("routine '{}' is disabled", routine.name));
         }
 
         if !self.check_concurrent(&routine).await {
-            return Err(RoutineError::MaxConcurrent {
-                name: routine.name.clone(),
-            });
+            return Err(format!(
+                "routine '{}' already at max concurrent runs",
+                routine.name
+            ));
         }
 
         let run_id = Uuid::new_v4();
@@ -213,9 +209,7 @@ impl RoutineEngine {
         };
 
         if let Err(e) = self.store.create_routine_run(&run).await {
-            return Err(RoutineError::Database {
-                reason: format!("failed to create run record: {e}"),
-            });
+            return Err(format!("failed to create run record: {e}"));
         }
 
         // Execute inline for manual triggers (caller wants to wait)
@@ -319,27 +313,13 @@ async fn execute_routine(ctx: EngineContext, routine: Routine, run: RoutineRun)
             max_tokens,
         } => execute_lightweight(&ctx, &routine, prompt, context_paths, *max_tokens).await,
         RoutineAction::FullJob { description, .. } => {
-            // Full job mode: scheduler integration not yet implemented.
-            // Execute as lightweight and prepend a warning to the summary.
-            tracing::warn!(
+            // Full job mode: for now, execute as lightweight with the description
+            // as prompt. Full scheduler integration will come as a follow-up.
+            tracing::info!(
                 routine = %routine.name,
-                "FullJob mode not yet implemented; falling back to lightweight execution"
+                "FullJob mode executing as lightweight (scheduler integration pending)"
             );
-            match execute_lightweight(&ctx, &routine, description, &[], ctx.max_lightweight_tokens)
-                .await
-            {
-                Ok((status, summary, tokens)) => {
-                    let warning = "[Note: FullJob mode is not yet implemented. This routine ran as \
-                         a single LLM call without tool access. Configure as 'lightweight' \
-                         or wait for full scheduler integration.]";
-                    let summary = match summary {
-                        Some(s) => Some(format!("{warning}\n\n{s}")),
-                        None => Some(warning.to_string()),
-                    };
-                    Ok((status, summary, tokens))
-                }
-                Err(e) => Err(e),
-            }
+            execute_lightweight(&ctx, &routine, description, &[], ctx.max_lightweight_tokens).await
         }
     };
 
@@ -351,7 +331,7 @@ async fn execute_routine(ctx: EngineContext, routine: Routine, run: RoutineRun)
         Ok(execution) => execution,
         Err(e) => {
             tracing::error!(routine = %routine.name, "Execution failed: {}", e);
-            (RunStatus::Failed, Some(e.to_string()), None)
+            (RunStatus::Failed, Some(e), None)
         }
     };
 
@@ -404,20 +384,6 @@ async fn execute_routine(ctx: EngineContext, routine: Routine, run: RoutineRun)
     .await;
 }
 
-/// Sanitize a routine name for use in workspace paths.
-/// Only keeps alphanumeric, dash, and underscore characters; replaces everything else.
-fn sanitize_routine_name(name: &str) -> String {
-    name.chars()
-        .map(|c| {
-            if c.is_ascii_alphanumeric() || c == '-' || c == '_' {
-                c
-            } else {
-                '_'
-            }
-        })
-        .collect()
-}
-
 /// Execute a lightweight routine (single LLM call).
 async fn execute_lightweight(
     ctx: &EngineContext,
@@ -425,7 +391,7 @@ async fn execute_lightweight(
     prompt: &str,
     context_paths: &[String],
     max_tokens: u32,
-) -> Result<(RunStatus, Option<String>, Option<i32>), RoutineError> {
+) -> Result<(RunStatus, Option<String>, Option<i32>), String> {
     // Load context from workspace
     let mut context_parts = Vec::new();
     for path in context_paths {
@@ -442,9 +408,8 @@ async fn execute_lightweight(
         }
     }
 
-    // Load routine state from workspace (name sanitized to prevent path traversal)
-    let safe_name = sanitize_routine_name(&routine.name);
-    let state_path = format!("routines/{safe_name}/state.md");
+    // Load routine state from workspace
+    let state_path = format!("routines/{}/state.md", routine.name);
     let state_content = match ctx.workspace.read(&state_path).await {
         Ok(doc) => Some(doc.content),
         Err(_) => None,
@@ -504,9 +469,7 @@ async fn execute_lightweight(
         .llm
         .complete(request)
         .await
-        .map_err(|e| RoutineError::LlmFailed {
-            reason: e.to_string(),
-        })?;
+        .map_err(|e| format!("LLM call failed: {e}"))?;
 
     let content = response.content.trim();
     let tokens_used = Some((response.input_tokens + response.output_tokens) as i32);
@@ -514,9 +477,13 @@ async fn execute_lightweight(
     // Empty content guard (same as heartbeat)
     if content.is_empty() {
         return if response.finish_reason == FinishReason::Length {
-            Err(RoutineError::TruncatedResponse)
+            Err(
+                "LLM response truncated (finish_reason=length) with no content. \
+                 Model may have exhausted token budget on reasoning."
+                    .to_string(),
+            )
         } else {
-            Err(RoutineError::EmptyResponse)
+            Err("LLM returned empty content.".to_string())
         };
     }
 

src/agent/scheduler.rs

@@ -14,7 +14,6 @@ use crate::config::AgentConfig;
 use crate::context::{ContextManager, JobContext, JobState};
 use crate::db::Database;
 use crate::error::{Error, JobError};
-use crate::hooks::HookRegistry;
 use crate::llm::LlmProvider;
 use crate::safety::SafetyLayer;
 use crate::tools::ToolRegistry;
@@ -50,7 +49,6 @@ pub struct Scheduler {
     safety: Arc<SafetyLayer>,
     tools: Arc<ToolRegistry>,
     store: Option<Arc<dyn Database>>,
-    hooks: Arc<HookRegistry>,
     /// Running jobs (main LLM-driven jobs).
     jobs: Arc<RwLock<HashMap<Uuid, ScheduledJob>>>,
     /// Running sub-tasks (tool executions, background tasks).
@@ -66,7 +64,6 @@ impl Scheduler {
         safety: Arc<SafetyLayer>,
         tools: Arc<ToolRegistry>,
         store: Option<Arc<dyn Database>>,
-        hooks: Arc<HookRegistry>,
     ) -> Self {
         Self {
             config,
@@ -75,7 +72,6 @@ impl Scheduler {
             safety,
             tools,
             store,
-            hooks,
             jobs: Arc::new(RwLock::new(HashMap::new())),
             subtasks: Arc::new(RwLock::new(HashMap::new())),
         }
@@ -122,7 +118,6 @@ impl Scheduler {
                 safety: self.safety.clone(),
                 tools: self.tools.clone(),
                 store: self.store.clone(),
-                hooks: self.hooks.clone(),
                 timeout: self.config.job_timeout,
                 use_planning: self.config.use_planning,
             };
@@ -136,9 +131,7 @@ impl Scheduler {
             });
 
             // Start the worker
-            if tx.send(WorkerMessage::Start).await.is_err() {
-                tracing::error!(job_id = %job_id, "Worker died before receiving Start message");
-            }
+            let _ = tx.send(WorkerMessage::Start).await;
 
             // Insert while still holding the write lock
             jobs.insert(job_id, ScheduledJob { handle, tx });
@@ -420,16 +413,10 @@ impl Scheduler {
             // Update job state
             self.context_manager
                 .update_context(job_id, |ctx| {
-                    if let Err(e) = ctx.transition_to(
+                    let _ = ctx.transition_to(
                         JobState::Cancelled,
                         Some("Stopped by scheduler".to_string()),
-                    ) {
-                        tracing::warn!(
-                            job_id = %job_id,
-                            error = %e,
-                            "Failed to transition job to Cancelled state"
-                        );
-                    }
+                    );
                 })
                 .await?;
 

src/agent/self_repair.rs

@@ -66,14 +66,12 @@ pub trait SelfRepair: Send + Sync {
 /// Default self-repair implementation.
 pub struct DefaultSelfRepair {
     context_manager: Arc<ContextManager>,
-    // TODO: use for time-based stuck detection (currently only max_repair_attempts is checked)
-    #[allow(dead_code)]
+    #[allow(dead_code)] // Will be used for time-based stuck detection
     stuck_threshold: Duration,
     max_repair_attempts: u32,
     store: Option<Arc<dyn Database>>,
     builder: Option<Arc<dyn SoftwareBuilder>>,
-    // TODO: use for tool hot-reload after repair
-    #[allow(dead_code)]
+    #[allow(dead_code)] // Will be used for tool hot-reload after repair
     tools: Option<Arc<ToolRegistry>>,
 }
 
@@ -95,15 +93,15 @@ impl DefaultSelfRepair {
     }
 
     /// Add a Store for tool failure tracking.
-    #[allow(dead_code)] // TODO: wire up in main.rs when persistence is needed
-    pub(crate) fn with_store(mut self, store: Arc<dyn Database>) -> Self {
+    #[allow(dead_code)] // Public API for configuring repair with persistence
+    pub fn with_store(mut self, store: Arc<dyn Database>) -> Self {
         self.store = Some(store);
         self
     }
 
     /// Add a Builder and ToolRegistry for automatic tool repair.
-    #[allow(dead_code)] // TODO: wire up in main.rs when auto-repair is needed
-    pub(crate) fn with_builder(
+    #[allow(dead_code)] // Public API for enabling automatic tool repair
+    pub fn with_builder(
         mut self,
         builder: Arc<dyn SoftwareBuilder>,
         tools: Arc<ToolRegistry>,

src/agent/session.rs

@@ -16,7 +16,7 @@ use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
-use crate::llm::{ChatMessage, ToolCall};
+use crate::llm::ChatMessage;
 
 /// A session containing one or more threads.
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -70,9 +70,10 @@ impl Session {
     pub fn create_thread(&mut self) -> &mut Thread {
         let thread = Thread::new(self.id);
         let thread_id = thread.id;
+        self.threads.insert(thread_id, thread);
         self.active_thread = Some(thread_id);
         self.last_active_at = Utc::now();
-        self.threads.entry(thread_id).or_insert(thread)
+        self.threads.get_mut(&thread_id).expect("just inserted")
     }
 
     /// Get the active thread.
@@ -87,19 +88,10 @@ impl Session {
 
     /// Get or create the active thread.
     pub fn get_or_create_thread(&mut self) -> &mut Thread {
-        match self.active_thread {
-            None => self.create_thread(),
-            Some(id) => {
-                if self.threads.contains_key(&id) {
-                    // Safe: contains_key confirmed the entry exists.
-                    self.threads.get_mut(&id).unwrap()
-                } else {
-                    // Stale active_thread ID: create a new thread, which
-                    // updates self.active_thread to the new thread's ID.
-                    self.create_thread()
-                }
-            }
+        if self.active_thread.is_none() {
+            self.create_thread();
         }
+        self.active_thread_mut().expect("just created")
     }
 
     /// Switch to a different thread.
@@ -156,10 +148,6 @@ pub struct PendingApproval {
     pub tool_call_id: String,
     /// Context messages at the time of the request (to resume from).
     pub context_messages: Vec<ChatMessage>,
-    /// Remaining tool calls from the same assistant message that were not
-    /// executed yet when approval was requested.
-    #[serde(default)]
-    pub deferred_tool_calls: Vec<ToolCall>,
 }
 
 /// A conversation thread within a session.
@@ -185,6 +173,10 @@ pub struct Thread {
     /// Pending auth token request (thread is in auth mode).
     #[serde(default)]
     pub pending_auth: Option<PendingAuth>,
+    /// Last NEAR AI response ID for response chaining. Persisted to DB
+    /// metadata so we can resume chaining across restarts.
+    #[serde(default)]
+    pub last_response_id: Option<String>,
 }
 
 impl Thread {
@@ -201,6 +193,7 @@ impl Thread {
             metadata: serde_json::Value::Null,
             pending_approval: None,
             pending_auth: None,
+            last_response_id: None,
         }
     }
 
@@ -217,6 +210,7 @@ impl Thread {
             metadata: serde_json::Value::Null,
             pending_approval: None,
             pending_auth: None,
+            last_response_id: None,
         }
     }
 
@@ -242,8 +236,7 @@ impl Thread {
         self.turns.push(turn);
         self.state = ThreadState::Processing;
         self.updated_at = Utc::now();
-        // turn_number was len() before push, so it's a valid index after push
-        &mut self.turns[turn_number]
+        self.turns.last_mut().expect("just pushed")
     }
 
     /// Complete the current turn with a response.
@@ -356,10 +349,8 @@ impl Thread {
                 if let Some(next) = iter.peek()
                     && next.role == crate::llm::Role::Assistant
                 {
-                    // iter.next() is guaranteed Some after a successful peek()
-                    if let Some(response) = iter.next() {
-                        turn.complete(&response.content);
-                    }
+                    let response = iter.next().expect("peeked");
+                    turn.complete(&response.content);
                 }
 
                 self.turns.push(turn);
@@ -857,6 +848,7 @@ mod tests {
 
         thread.start_turn("hello");
         thread.complete_turn("world");
+        thread.last_response_id = Some("resp_abc123".to_string());
 
         let json = serde_json::to_string(&thread).unwrap();
         let restored: Thread = serde_json::from_str(&json).unwrap();
@@ -866,6 +858,7 @@ mod tests {
         assert_eq!(restored.turns.len(), 1);
         assert_eq!(restored.turns[0].user_input, "hello");
         assert_eq!(restored.turns[0].response, Some("world".to_string()));
+        assert_eq!(restored.last_response_id, Some("resp_abc123".to_string()));
     }
 
     #[test]
@@ -953,7 +946,6 @@ mod tests {
             description: "dangerous command".to_string(),
             tool_call_id: "call_123".to_string(),
             context_messages: vec![ChatMessage::user("do it")],
-            deferred_tool_calls: vec![],
         };
 
         thread.await_approval(approval);
@@ -977,7 +969,6 @@ mod tests {
             description: "test".to_string(),
             tool_call_id: "call_456".to_string(),
             context_messages: vec![],
-            deferred_tool_calls: vec![],
         };
 
         thread.await_approval(approval);

src/agent/session_manager.rs

@@ -11,10 +11,6 @@ use uuid::Uuid;
 
 use crate::agent::session::Session;
 use crate::agent::undo::UndoManager;
-use crate::hooks::HookRegistry;
-
-/// Warn when session count exceeds this threshold.
-const SESSION_COUNT_WARNING_THRESHOLD: usize = 1000;
 
 /// Key for mapping external thread IDs to internal ones.
 #[derive(Clone, Hash, Eq, PartialEq)]
@@ -29,7 +25,6 @@ pub struct SessionManager {
     sessions: RwLock<HashMap<String, Arc<Mutex<Session>>>>,
     thread_map: RwLock<HashMap<ThreadKey, Uuid>>,
     undo_managers: RwLock<HashMap<Uuid, Arc<Mutex<UndoManager>>>>,
-    hooks: Option<Arc<HookRegistry>>,
 }
 
 impl SessionManager {
@@ -39,16 +34,9 @@ impl SessionManager {
             sessions: RwLock::new(HashMap::new()),
             thread_map: RwLock::new(HashMap::new()),
             undo_managers: RwLock::new(HashMap::new()),
-            hooks: None,
         }
     }
 
-    /// Attach a hook registry for session lifecycle events.
-    pub fn with_hooks(mut self, hooks: Arc<HookRegistry>) -> Self {
-        self.hooks = Some(hooks);
-        self
-    }
-
     /// Get or create a session for a user.
     pub async fn get_or_create_session(&self, user_id: &str) -> Arc<Mutex<Session>> {
         // Fast path: check if session exists
@@ -66,36 +54,8 @@ impl SessionManager {
             return Arc::clone(session);
         }
 
-        let new_session = Session::new(user_id);
-        let session_id = new_session.id.to_string();
-        let session = Arc::new(Mutex::new(new_session));
+        let session = Arc::new(Mutex::new(Session::new(user_id)));
         sessions.insert(user_id.to_string(), Arc::clone(&session));
-
-        if sessions.len() >= SESSION_COUNT_WARNING_THRESHOLD && sessions.len() % 100 == 0 {
-            tracing::warn!(
-                "High session count: {} active sessions. \
-                 Pruning runs every 10 minutes; consider reducing session_idle_timeout.",
-                sessions.len()
-            );
-        }
-
-        // Fire OnSessionStart hook (fire-and-forget)
-        if let Some(ref hooks) = self.hooks {
-            let hooks = hooks.clone();
-            let uid = user_id.to_string();
-            let sid = session_id;
-            tokio::spawn(async move {
-                use crate::hooks::HookEvent;
-                let event = HookEvent::SessionStart {
-                    user_id: uid,
-                    session_id: sid,
-                };
-                if let Err(e) = hooks.run(&event).await {
-                    tracing::warn!("OnSessionStart hook error: {}", e);
-                }
-            });
-        }
-
         session
     }
 
@@ -213,8 +173,8 @@ impl SessionManager {
     pub async fn prune_stale_sessions(&self, max_idle: std::time::Duration) -> usize {
         let cutoff = chrono::Utc::now() - chrono::TimeDelta::seconds(max_idle.as_secs() as i64);
 
-        // Find stale sessions (user_id + session_id)
-        let stale_sessions: Vec<(String, String)> = {
+        // Find stale session user_ids
+        let stale_users: Vec<String> = {
             let sessions = self.sessions.read().await;
             sessions
                 .iter()
@@ -222,7 +182,7 @@ impl SessionManager {
                     // Try to lock; skip if contended (someone is actively using it)
                     let sess = session.try_lock().ok()?;
                     if sess.last_active_at < cutoff {
-                        Some((user_id.clone(), sess.id.to_string()))
+                        Some(user_id.clone())
                     } else {
                         None
                     }
@@ -230,11 +190,6 @@ impl SessionManager {
                 .collect()
         };
 
-        let stale_users: Vec<String> = stale_sessions
-            .iter()
-            .map(|(user_id, _)| user_id.clone())
-            .collect();
-
         if stale_users.is_empty() {
             return 0;
         }
@@ -252,25 +207,6 @@ impl SessionManager {
             }
         }
 
-        // Fire OnSessionEnd hooks for stale sessions (fire-and-forget)
-        if let Some(ref hooks) = self.hooks {
-            for (user_id, session_id) in &stale_sessions {
-                let hooks = hooks.clone();
-                let uid = user_id.clone();
-                let sid = session_id.clone();
-                tokio::spawn(async move {
-                    use crate::hooks::HookEvent;
-                    let event = HookEvent::SessionEnd {
-                        user_id: uid,
-                        session_id: sid,
-                    };
-                    if let Err(e) = hooks.run(&event).await {
-                        tracing::warn!("OnSessionEnd hook error: {}", e);
-                    }
-                });
-            }
-        }
-
         // Remove sessions
         let count = {
             let mut sessions = self.sessions.write().await;

src/agent/submission.rs

@@ -118,19 +118,19 @@ impl SubmissionParser {
         // Approval responses (simple yes/no/always for pending approvals)
         // These are short enough to check explicitly
         match lower.as_str() {
-            "yes" | "y" | "approve" | "ok" | "/approve" | "/yes" | "/y" => {
+            "yes" | "y" | "approve" | "ok" => {
                 return Submission::ApprovalResponse {
                     approved: true,
                     always: false,
                 };
             }
-            "always" | "a" | "yes always" | "approve always" | "/always" | "/a" => {
+            "always" | "yes always" | "approve always" => {
                 return Submission::ApprovalResponse {
                     approved: true,
                     always: true,
                 };
             }
-            "no" | "n" | "deny" | "reject" | "cancel" | "/deny" | "/no" | "/n" => {
+            "no" | "n" | "deny" | "reject" | "cancel" => {
                 return Submission::ApprovalResponse {
                     approved: false,
                     always: false,
@@ -234,7 +234,6 @@ impl Submission {
     }
 
     /// Create an approval submission.
-    #[cfg(test)]
     pub fn approval(request_id: Uuid, approved: bool) -> Self {
         Self::ExecApproval {
             request_id,
@@ -244,7 +243,6 @@ impl Submission {
     }
 
     /// Create an "always approve" submission.
-    #[cfg(test)]
     pub fn always_approve(request_id: Uuid) -> Self {
         Self::ExecApproval {
             request_id,
@@ -254,31 +252,26 @@ impl Submission {
     }
 
     /// Create an interrupt submission.
-    #[cfg(test)]
     pub fn interrupt() -> Self {
         Self::Interrupt
     }
 
     /// Create a compact submission.
-    #[cfg(test)]
     pub fn compact() -> Self {
         Self::Compact
     }
 
     /// Create an undo submission.
-    #[cfg(test)]
     pub fn undo() -> Self {
         Self::Undo
     }
 
     /// Create a redo submission.
-    #[cfg(test)]
     pub fn redo() -> Self {
         Self::Redo
     }
 
     /// Check if this submission starts a new turn.
-    #[cfg(test)]
     pub fn starts_turn(&self) -> bool {
         matches!(self, Self::UserInput { .. })
     }
@@ -347,7 +340,6 @@ impl SubmissionResult {
     }
 
     /// Create an OK result.
-    #[cfg(test)]
     pub fn ok() -> Self {
         Self::Ok { message: None }
     }
@@ -483,57 +475,6 @@ mod tests {
         assert!(matches!(submission, Submission::UserInput { content } if content == "/unknown"));
     }
 
-    #[test]
-    fn test_parser_approval_response_aliases() {
-        // approve once
-        assert!(matches!(
-            SubmissionParser::parse("y"),
-            Submission::ApprovalResponse {
-                approved: true,
-                always: false
-            }
-        ));
-        assert!(matches!(
-            SubmissionParser::parse("/approve"),
-            Submission::ApprovalResponse {
-                approved: true,
-                always: false
-            }
-        ));
-
-        // approve always
-        assert!(matches!(
-            SubmissionParser::parse("a"),
-            Submission::ApprovalResponse {
-                approved: true,
-                always: true
-            }
-        ));
-        assert!(matches!(
-            SubmissionParser::parse("/always"),
-            Submission::ApprovalResponse {
-                approved: true,
-                always: true
-            }
-        ));
-
-        // deny
-        assert!(matches!(
-            SubmissionParser::parse("n"),
-            Submission::ApprovalResponse {
-                approved: false,
-                always: false
-            }
-        ));
-        assert!(matches!(
-            SubmissionParser::parse("/deny"),
-            Submission::ApprovalResponse {
-                approved: false,
-                always: false
-            }
-        ));
-    }
-
     #[test]
     fn test_parser_json_exec_approval() {
         let req_id = Uuid::new_v4();

src/agent/task.rs

@@ -29,7 +29,6 @@ impl TaskOutput {
     }
 
     /// Create a text result.
-    #[cfg(test)]
     pub fn text(text: impl Into<String>, duration: Duration) -> Self {
         Self {
             result: serde_json::Value::String(text.into()),
@@ -38,7 +37,6 @@ impl TaskOutput {
     }
 
     /// Create an empty success result.
-    #[cfg(test)]
     pub fn empty(duration: Duration) -> Self {
         Self {
             result: serde_json::Value::Null,
@@ -132,7 +130,6 @@ impl Task {
     }
 
     /// Create a new Job task with a specific ID.
-    #[cfg(test)]
     pub fn job_with_id(id: Uuid, title: impl Into<String>, description: impl Into<String>) -> Self {
         Self::Job {
             id,
@@ -155,7 +152,6 @@ impl Task {
     }
 
     /// Create a new Background task.
-    #[cfg(test)]
     pub fn background(handler: std::sync::Arc<dyn TaskHandler>) -> Self {
         Self::Background {
             id: Uuid::new_v4(),
@@ -164,7 +160,6 @@ impl Task {
     }
 
     /// Create a new Background task with a specific ID.
-    #[cfg(test)]
     pub fn background_with_id(id: Uuid, handler: std::sync::Arc<dyn TaskHandler>) -> Self {
         Self::Background { id, handler }
     }
@@ -179,7 +174,6 @@ impl Task {
     }
 
     /// Get the parent ID for sub-tasks.
-    #[cfg(test)]
     pub fn parent_id(&self) -> Option<Uuid> {
         match self {
             Self::Job { .. } => None,
@@ -231,7 +225,6 @@ impl fmt::Debug for Task {
 }
 
 /// Status of a scheduled task.
-#[cfg(test)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum TaskStatus {
     /// Task is queued waiting for execution.

src/agent/undo.rs

@@ -43,10 +43,6 @@ impl Checkpoint {
 }
 
 /// Manager for undo/redo functionality.
-///
-/// Each undo/redo operation pops from one stack and pushes the current state
-/// onto the other, so `undo_count() + redo_count()` stays constant across
-/// undo/redo cycles (only `checkpoint()` and `clear()` change the total).
 pub struct UndoManager {
     /// Stack of past checkpoints (for undo).
     undo_stack: VecDeque<Checkpoint>,
@@ -67,20 +63,11 @@ impl UndoManager {
     }
 
     /// Create with a custom checkpoint limit.
-    #[cfg(test)]
     pub fn with_max_checkpoints(mut self, max: usize) -> Self {
         self.max_checkpoints = max;
         self
     }
 
-    /// Push a checkpoint onto the undo stack, trimming oldest entries if over limit.
-    fn push_undo(&mut self, checkpoint: Checkpoint) {
-        self.undo_stack.push_back(checkpoint);
-        while self.undo_stack.len() > self.max_checkpoints {
-            self.undo_stack.pop_front();
-        }
-    }
-
     /// Create a checkpoint at the current state.
     ///
     /// This clears the redo stack since we're creating a new history branch.
@@ -93,23 +80,24 @@ impl UndoManager {
         // Clear redo stack (new branch of history)
         self.redo_stack.clear();
 
+        // Create and push checkpoint
         let checkpoint = Checkpoint::new(turn_number, messages, description);
-        self.push_undo(checkpoint);
+        self.undo_stack.push_back(checkpoint);
+
+        // Trim if over limit
+        while self.undo_stack.len() > self.max_checkpoints {
+            self.undo_stack.pop_front();
+        }
     }
 
     /// Undo: pop the last checkpoint and return it.
     ///
-    /// Saves the current state to the redo stack and pops the most recent
-    /// checkpoint from the undo stack so that repeated undos walk backwards
-    /// through history.
-    ///
-    /// Takes ownership of `current_messages`; callers must clone first if
-    /// they need to retain a copy.
+    /// The current state should be saved to redo stack before calling this.
     pub fn undo(
         &mut self,
         current_turn: usize,
         current_messages: Vec<ChatMessage>,
-    ) -> Option<Checkpoint> {
+    ) -> Option<&Checkpoint> {
         if self.undo_stack.is_empty() {
             return None;
         }
@@ -122,40 +110,18 @@ impl UndoManager {
         );
         self.redo_stack.push(current);
 
-        // Pop and return the most recent checkpoint
-        self.undo_stack.pop_back()
+        // Return the most recent checkpoint without removing it
+        // (we keep it so multiple undos can work)
+        self.undo_stack.back()
     }
 
     /// Pop the last checkpoint from the undo stack.
-    #[cfg(test)]
     pub fn pop_undo(&mut self) -> Option<Checkpoint> {
         self.undo_stack.pop_back()
     }
 
     /// Redo: restore a previously undone state.
-    ///
-    /// Saves the current state to the undo stack and pops the most recent
-    /// checkpoint from the redo stack.
-    ///
-    /// Takes ownership of `current_messages`; callers must clone first if
-    /// they need to retain a copy.
-    pub fn redo(
-        &mut self,
-        current_turn: usize,
-        current_messages: Vec<ChatMessage>,
-    ) -> Option<Checkpoint> {
-        if self.redo_stack.is_empty() {
-            return None;
-        }
-
-        // Save current state to undo stack
-        let current = Checkpoint::new(
-            current_turn,
-            current_messages,
-            format!("Turn {}", current_turn),
-        );
-        self.push_undo(current);
-
+    pub fn redo(&mut self) -> Option<Checkpoint> {
         self.redo_stack.pop()
     }
 
@@ -180,7 +146,6 @@ impl UndoManager {
     }
 
     /// Get a checkpoint by ID.
-    #[cfg(test)]
     pub fn get_checkpoint(&self, id: Uuid) -> Option<&Checkpoint> {
         self.undo_stack
             .iter()
@@ -189,7 +154,6 @@ impl UndoManager {
     }
 
     /// List all available checkpoints (for UI display).
-    #[cfg(test)]
     pub fn list_checkpoints(&self) -> Vec<&Checkpoint> {
         self.undo_stack.iter().collect()
     }
@@ -250,16 +214,14 @@ mod tests {
         assert!(manager.can_undo());
         assert!(!manager.can_redo());
 
-        // Undo - returns owned Checkpoint now
+        // Undo
         let current = vec![ChatMessage::user("Hello"), ChatMessage::assistant("Hi")];
         let checkpoint = manager.undo(2, current);
         assert!(checkpoint.is_some());
-        let checkpoint = checkpoint.unwrap();
-        assert_eq!(checkpoint.turn_number, 1);
         assert!(manager.can_redo());
 
-        // Redo - now requires current state parameters
-        let restored = manager.redo(checkpoint.turn_number, checkpoint.messages);
+        // Redo
+        let restored = manager.redo();
         assert!(restored.is_some());
     }
 
@@ -287,90 +249,4 @@ mod tests {
         assert!(restored.is_some());
         assert_eq!(manager.undo_count(), 0);
     }
-
-    #[test]
-    fn test_repeated_undo_advances_through_stack() {
-        let mut manager = UndoManager::new();
-
-        // Create 3 checkpoints at turns 0, 1, 2
-        manager.checkpoint(0, vec![], "Turn 0");
-        manager.checkpoint(1, vec![ChatMessage::user("msg1")], "Turn 1");
-        manager.checkpoint(2, vec![ChatMessage::user("msg2")], "Turn 2");
-        assert_eq!(manager.undo_count(), 3);
-
-        // First undo: should return turn 2 checkpoint, stack shrinks to 2
-        let cp1 = manager
-            .undo(3, vec![ChatMessage::user("msg3")])
-            .expect("first undo should succeed");
-        assert_eq!(cp1.turn_number, 2);
-        assert_eq!(manager.undo_count(), 2);
-
-        // Second undo: should return turn 1 checkpoint (different!), stack shrinks to 1
-        let cp2 = manager
-            .undo(cp1.turn_number, cp1.messages)
-            .expect("second undo should succeed");
-        assert_eq!(cp2.turn_number, 1);
-        assert_eq!(manager.undo_count(), 1);
-
-        // Verify we walked backwards through distinct checkpoints
-        assert_ne!(cp1.turn_number, cp2.turn_number);
-    }
-
-    #[test]
-    fn test_undo_redo_cycle_preserves_state() {
-        let mut manager = UndoManager::new();
-
-        let msgs_t0: Vec<ChatMessage> = vec![];
-        let msgs_t1 = vec![ChatMessage::user("hello")];
-        let msgs_t2 = vec![ChatMessage::user("hello"), ChatMessage::assistant("hi")];
-
-        manager.checkpoint(0, msgs_t0, "Turn 0");
-        manager.checkpoint(1, msgs_t1, "Turn 1");
-
-        // Undo from turn 2 -> get turn 1 checkpoint
-        let cp_undo1 = manager
-            .undo(2, msgs_t2.clone())
-            .expect("undo should succeed");
-        assert_eq!(cp_undo1.turn_number, 1);
-
-        // Redo from turn 1 -> get turn 2 state back
-        let cp_redo = manager
-            .redo(cp_undo1.turn_number, cp_undo1.messages)
-            .expect("redo should succeed");
-        assert_eq!(cp_redo.turn_number, 2);
-        assert_eq!(cp_redo.messages.len(), 2);
-
-        // Undo again from turn 2 -> should go back to turn 1 again
-        let cp_undo2 = manager
-            .undo(cp_redo.turn_number, cp_redo.messages)
-            .expect("second undo should succeed");
-        assert_eq!(cp_undo2.turn_number, 1);
-    }
-
-    #[test]
-    fn test_undo_redo_stack_sizes_consistent() {
-        let mut manager = UndoManager::new();
-
-        manager.checkpoint(0, vec![], "Turn 0");
-        manager.checkpoint(1, vec![ChatMessage::user("a")], "Turn 1");
-        manager.checkpoint(2, vec![ChatMessage::user("b")], "Turn 2");
-
-        // Start: undo=3, redo=0, total=3
-        let total = manager.undo_count() + manager.redo_count();
-        assert_eq!(total, 3);
-
-        // After undo: total should still be 3 (one moved from undo to redo,
-        // plus the current state pushed to redo)
-        // Actually: undo pops one (3->2), pushes current to redo (0->1), total=3
-        let cp = manager.undo(3, vec![]).unwrap();
-        assert_eq!(manager.undo_count() + manager.redo_count(), 3);
-
-        // After redo: redo pops one (1->0), pushes current to undo (2->3), total=3
-        let cp2 = manager.redo(cp.turn_number, cp.messages).unwrap();
-        assert_eq!(manager.undo_count() + manager.redo_count(), 3);
-
-        // After another undo: same invariant
-        let _cp3 = manager.undo(cp2.turn_number, cp2.messages).unwrap();
-        assert_eq!(manager.undo_count() + manager.redo_count(), 3);
-    }
 }

src/agent/worker.rs

@@ -3,8 +3,8 @@
 use std::sync::Arc;
 use std::time::Duration;
 
+use futures::future::join_all;
 use tokio::sync::mpsc;
-use tokio::task::JoinSet;
 use uuid::Uuid;
 
 use crate::agent::scheduler::WorkerMessage;
@@ -12,7 +12,6 @@ use crate::agent::task::TaskOutput;
 use crate::context::{ContextManager, JobState};
 use crate::db::Database;
 use crate::error::Error;
-use crate::hooks::HookRegistry;
 use crate::llm::{
     ActionPlan, ChatMessage, LlmProvider, Reasoning, ReasoningContext, RespondResult, ToolSelection,
 };
@@ -30,7 +29,6 @@ pub struct WorkerDeps {
     pub safety: Arc<SafetyLayer>,
     pub tools: Arc<ToolRegistry>,
     pub store: Option<Arc<dyn Database>>,
-    pub hooks: Arc<HookRegistry>,
     pub timeout: Duration,
     pub use_planning: bool,
 }
@@ -292,21 +290,19 @@ Report when the job is complete or if you encounter issues you cannot resolve."#
                                 tool_calls.clone(),
                             ));
 
-                        // Convert ToolCalls to ToolSelections and execute in parallel
-                        let selections: Vec<ToolSelection> = tool_calls
-                            .iter()
-                            .map(|tc| ToolSelection {
+                        for tc in tool_calls {
+                            let result = self.execute_tool(&tc.name, &tc.arguments).await;
+
+                            // Create synthetic selection for process_tool_result
+                            let selection = ToolSelection {
                                 tool_name: tc.name.clone(),
                                 parameters: tc.arguments.clone(),
                                 reasoning: String::new(),
                                 alternatives: vec![],
                                 tool_call_id: tc.id.clone(),
-                            })
-                            .collect();
+                            };
 
-                        let results = self.execute_tools_parallel(&selections).await;
-                        for (selection, result) in selections.iter().zip(results) {
-                            self.process_tool_result(reason_ctx, selection, result.result)
+                            self.process_tool_result(reason_ctx, &selection, result)
                                 .await?;
                         }
                     }
@@ -349,87 +345,54 @@ Report when the job is complete or if you encounter issues you cannot resolve."#
         }
     }
 
-    /// Execute multiple tools in parallel using a JoinSet.
-    ///
-    /// Each task is tagged with its original index so results are returned
-    /// in the same order as `selections`, regardless of completion order.
+    /// Execute multiple tools in parallel.
     async fn execute_tools_parallel(&self, selections: &[ToolSelection]) -> Vec<ToolExecResult> {
-        let count = selections.len();
+        let futures: Vec<_> = selections
+            .iter()
+            .map(|selection| {
+                let tool_name = selection.tool_name.clone();
+                let params = selection.parameters.clone();
+                let tools = self.tools().clone();
+                let context_manager = self.context_manager().clone();
+                let safety = self.safety().clone();
+                let job_id = self.job_id;
+                let store = self.deps.store.clone();
 
-        // Short-circuit for single tool: execute directly without JoinSet overhead
-        if count <= 1 {
-            let mut results = Vec::with_capacity(count);
-            for selection in selections {
-                let result = Self::execute_tool_inner(
-                    &self.deps,
-                    self.job_id,
-                    &selection.tool_name,
-                    &selection.parameters,
-                )
-                .await;
-                results.push(ToolExecResult { result });
-            }
-            return results;
-        }
-
-        let mut join_set = JoinSet::new();
-
-        for (idx, selection) in selections.iter().enumerate() {
-            let deps = self.deps.clone();
-            let job_id = self.job_id;
-            let tool_name = selection.tool_name.clone();
-            let params = selection.parameters.clone();
-            join_set.spawn(async move {
-                let result = Self::execute_tool_inner(&deps, job_id, &tool_name, &params).await;
-                (idx, ToolExecResult { result })
-            });
-        }
-
-        // Collect and reorder by original index
-        let mut results: Vec<Option<ToolExecResult>> = (0..count).map(|_| None).collect();
-        while let Some(join_result) = join_set.join_next().await {
-            match join_result {
-                Ok((idx, exec_result)) => results[idx] = Some(exec_result),
-                Err(e) => {
-                    if e.is_panic() {
-                        tracing::error!("Tool execution task panicked: {}", e);
-                    } else {
-                        tracing::error!("Tool execution task cancelled: {}", e);
-                    }
+                async move {
+                    let result = Self::execute_tool_inner(
+                        tools,
+                        context_manager,
+                        safety,
+                        store,
+                        job_id,
+                        &tool_name,
+                        &params,
+                    )
+                    .await;
+                    ToolExecResult { result }
                 }
-            }
-        }
-
-        // Fill any panicked slots with error results
-        results
-            .into_iter()
-            .enumerate()
-            .map(|(i, opt)| {
-                opt.unwrap_or_else(|| ToolExecResult {
-                    result: Err(crate::error::ToolError::ExecutionFailed {
-                        name: selections[i].tool_name.clone(),
-                        reason: "Task failed during execution".to_string(),
-                    }
-                    .into()),
-                })
             })
-            .collect()
+            .collect();
+
+        join_all(futures).await
     }
 
     /// Inner tool execution logic that can be called from both single and parallel paths.
     async fn execute_tool_inner(
-        deps: &WorkerDeps,
+        tools: Arc<ToolRegistry>,
+        context_manager: Arc<ContextManager>,
+        safety: Arc<SafetyLayer>,
+        store: Option<Arc<dyn Database>>,
         job_id: Uuid,
         tool_name: &str,
         params: &serde_json::Value,
     ) -> Result<String, Error> {
-        let tool =
-            deps.tools
-                .get(tool_name)
-                .await
-                .ok_or_else(|| crate::error::ToolError::NotFound {
-                    name: tool_name.to_string(),
-                })?;
+        let tool = tools
+            .get(tool_name)
+            .await
+            .ok_or_else(|| crate::error::ToolError::NotFound {
+                name: tool_name.to_string(),
+            })?;
 
         // Tools requiring approval are blocked in autonomous jobs
         if tool.requires_approval() {
@@ -439,46 +402,8 @@ Report when the job is complete or if you encounter issues you cannot resolve."#
             .into());
         }
 
-        // Fetch job context early so we have the real user_id for hooks
-        let job_ctx = deps.context_manager.get_context(job_id).await?;
-
-        // Run BeforeToolCall hook
-        let params = {
-            use crate::hooks::{HookError, HookEvent, HookOutcome};
-            let event = HookEvent::ToolCall {
-                tool_name: tool_name.to_string(),
-                parameters: params.clone(),
-                user_id: job_ctx.user_id.clone(),
-                context: format!("job:{}", job_id),
-            };
-            match deps.hooks.run(&event).await {
-                Err(HookError::Rejected { reason }) => {
-                    return Err(crate::error::ToolError::ExecutionFailed {
-                        name: tool_name.to_string(),
-                        reason: format!("Blocked by hook: {}", reason),
-                    }
-                    .into());
-                }
-                Err(err) => {
-                    return Err(crate::error::ToolError::ExecutionFailed {
-                        name: tool_name.to_string(),
-                        reason: format!("Blocked by hook failure mode: {}", err),
-                    }
-                    .into());
-                }
-                Ok(HookOutcome::Continue {
-                    modified: Some(new_params),
-                }) => serde_json::from_str(&new_params).unwrap_or_else(|e| {
-                    tracing::warn!(
-                        tool = %tool_name,
-                        "Hook returned non-JSON modification for ToolCall, ignoring: {}",
-                        e
-                    );
-                    params.clone()
-                }),
-                _ => params.clone(),
-            }
-        };
+        // Get job context for the tool
+        let job_ctx = context_manager.get_context(job_id).await?;
         if job_ctx.state == JobState::Cancelled {
             return Err(crate::error::ToolError::ExecutionFailed {
                 name: tool_name.to_string(),
@@ -488,7 +413,7 @@ Report when the job is complete or if you encounter issues you cannot resolve."#
         }
 
         // Validate tool parameters
-        let validation = deps.safety.validator().validate_tool_params(&params);
+        let validation = safety.validator().validate_tool_params(params);
         if !validation.is_valid {
             let details = validation
                 .errors
@@ -553,9 +478,8 @@ Report when the job is complete or if you encounter issues you cannot resolve."#
             Ok(Ok(output)) => {
                 let output_str = serde_json::to_string_pretty(&output.result)
                     .ok()
-                    .map(|s| deps.safety.sanitize_tool_output(tool_name, &s).content);
-                match deps
-                    .context_manager
+                    .map(|s| safety.sanitize_tool_output(tool_name, &s).content);
+                context_manager
                     .update_memory(job_id, |mem| {
                         let rec = mem.create_action(tool_name, params.clone()).succeed(
                             output_str.clone(),
@@ -566,56 +490,32 @@ Report when the job is complete or if you encounter issues you cannot resolve."#
                         rec
                     })
                     .await
-                {
-                    Ok(rec) => Some(rec),
-                    Err(e) => {
-                        tracing::warn!(job_id = %job_id, tool = tool_name, "Failed to record action in memory: {e}");
-                        None
-                    }
-                }
-            }
-            Ok(Err(e)) => {
-                match deps
-                    .context_manager
-                    .update_memory(job_id, |mem| {
-                        let rec = mem
-                            .create_action(tool_name, params.clone())
-                            .fail(e.to_string(), elapsed);
-                        mem.record_action(rec.clone());
-                        rec
-                    })
-                    .await
-                {
-                    Ok(rec) => Some(rec),
-                    Err(e) => {
-                        tracing::warn!(job_id = %job_id, tool = tool_name, "Failed to record action in memory: {e}");
-                        None
-                    }
-                }
-            }
-            Err(_) => {
-                match deps
-                    .context_manager
-                    .update_memory(job_id, |mem| {
-                        let rec = mem
-                            .create_action(tool_name, params.clone())
-                            .fail("Execution timeout", elapsed);
-                        mem.record_action(rec.clone());
-                        rec
-                    })
-                    .await
-                {
-                    Ok(rec) => Some(rec),
-                    Err(e) => {
-                        tracing::warn!(job_id = %job_id, tool = tool_name, "Failed to record action in memory: {e}");
-                        None
-                    }
-                }
+                    .ok()
             }
+            Ok(Err(e)) => context_manager
+                .update_memory(job_id, |mem| {
+                    let rec = mem
+                        .create_action(tool_name, params.clone())
+                        .fail(e.to_string(), elapsed);
+                    mem.record_action(rec.clone());
+                    rec
+                })
+                .await
+                .ok(),
+            Err(_) => context_manager
+                .update_memory(job_id, |mem| {
+                    let rec = mem
+                        .create_action(tool_name, params.clone())
+                        .fail("Execution timeout", elapsed);
+                    mem.record_action(rec.clone());
+                    rec
+                })
+                .await
+                .ok(),
         };
 
         // Persist action to database (fire-and-forget)
-        if let (Some(action), Some(store)) = (action, deps.store.clone()) {
+        if let (Some(action), Some(store)) = (action, store) {
             tokio::spawn(async move {
                 if let Err(e) = store.save_action(job_id, &action).await {
                     tracing::warn!("Failed to persist action for job {}: {}", job_id, e);
@@ -801,7 +701,16 @@ Report when the job is complete or if you encounter issues you cannot resolve."#
         tool_name: &str,
         params: &serde_json::Value,
     ) -> Result<String, Error> {
-        Self::execute_tool_inner(&self.deps, self.job_id, tool_name, params).await
+        Self::execute_tool_inner(
+            self.tools().clone(),
+            self.context_manager().clone(),
+            self.safety().clone(),
+            self.deps.store.clone(),
+            self.job_id,
+            tool_name,
+            params,
+        )
+        .await
     }
 
     async fn mark_completed(&self) -> Result<(), Error> {
@@ -872,102 +781,6 @@ mod tests {
     use crate::llm::ToolSelection;
     use crate::util::llm_signals_completion;
 
-    use super::*;
-    use crate::config::SafetyConfig;
-    use crate::context::JobContext;
-    use crate::llm::{
-        CompletionRequest, CompletionResponse, LlmProvider, ToolCompletionRequest,
-        ToolCompletionResponse,
-    };
-    use crate::safety::SafetyLayer;
-    use crate::tools::{Tool, ToolError, ToolOutput};
-
-    /// A test tool that sleeps for a configurable duration before returning.
-    struct SlowTool {
-        tool_name: String,
-        delay: Duration,
-    }
-
-    #[async_trait::async_trait]
-    impl Tool for SlowTool {
-        fn name(&self) -> &str {
-            &self.tool_name
-        }
-        fn description(&self) -> &str {
-            "Test tool with configurable delay"
-        }
-        fn parameters_schema(&self) -> serde_json::Value {
-            serde_json::json!({"type": "object", "properties": {}})
-        }
-        async fn execute(
-            &self,
-            _params: serde_json::Value,
-            _ctx: &JobContext,
-        ) -> Result<ToolOutput, ToolError> {
-            let start = std::time::Instant::now();
-            tokio::time::sleep(self.delay).await;
-            Ok(ToolOutput::text(
-                format!("done_{}", self.tool_name),
-                start.elapsed(),
-            ))
-        }
-        fn requires_sanitization(&self) -> bool {
-            false
-        }
-    }
-
-    /// Stub LLM provider (never called in these tests).
-    struct StubLlm;
-
-    #[async_trait::async_trait]
-    impl LlmProvider for StubLlm {
-        fn model_name(&self) -> &str {
-            "stub"
-        }
-        fn cost_per_token(&self) -> (rust_decimal::Decimal, rust_decimal::Decimal) {
-            (rust_decimal::Decimal::ZERO, rust_decimal::Decimal::ZERO)
-        }
-        async fn complete(
-            &self,
-            _req: CompletionRequest,
-        ) -> Result<CompletionResponse, crate::error::LlmError> {
-            unimplemented!("stub")
-        }
-        async fn complete_with_tools(
-            &self,
-            _req: ToolCompletionRequest,
-        ) -> Result<ToolCompletionResponse, crate::error::LlmError> {
-            unimplemented!("stub")
-        }
-    }
-
-    /// Build a Worker wired to a ToolRegistry containing the given tools.
-    async fn make_worker(tools: Vec<Arc<dyn Tool>>) -> Worker {
-        let registry = ToolRegistry::new();
-        for t in tools {
-            registry.register(t).await;
-        }
-
-        let cm = Arc::new(crate::context::ContextManager::new(5));
-        let job_id = cm.create_job("test", "test job").await.unwrap();
-
-        let deps = WorkerDeps {
-            context_manager: cm,
-            llm: Arc::new(StubLlm),
-            safety: Arc::new(SafetyLayer::new(&SafetyConfig {
-                max_output_length: 100_000,
-                injection_check_enabled: false,
-            })),
-            tools: Arc::new(registry),
-            store: None,
-            hooks: Arc::new(crate::hooks::HookRegistry::new()),
-            timeout: Duration::from_secs(30),
-            use_planning: false,
-        };
-
-        Worker::new(job_id, deps)
-    }
-
     #[test]
     fn test_tool_selection_preserves_call_id() {
         let selection = ToolSelection {
@@ -1044,119 +857,4 @@ mod tests {
             "The tool returned: TASK_COMPLETE signal"
         ));
     }
-
-    #[tokio::test]
-    async fn test_parallel_speedup() {
-        // 3 tools each sleeping 200ms should finish in roughly 200ms (parallel),
-        // not ~600ms (sequential).
-        let tools: Vec<Arc<dyn Tool>> = (0..3)
-            .map(|i| {
-                Arc::new(SlowTool {
-                    tool_name: format!("slow_{}", i),
-                    delay: Duration::from_millis(200),
-                }) as Arc<dyn Tool>
-            })
-            .collect();
-
-        let worker = make_worker(tools).await;
-
-        let selections: Vec<ToolSelection> = (0..3)
-            .map(|i| ToolSelection {
-                tool_name: format!("slow_{}", i),
-                parameters: serde_json::json!({}),
-                reasoning: String::new(),
-                alternatives: vec![],
-                tool_call_id: format!("call_{}", i),
-            })
-            .collect();
-
-        let start = std::time::Instant::now();
-        let results = worker.execute_tools_parallel(&selections).await;
-        let elapsed = start.elapsed();
-
-        assert_eq!(results.len(), 3);
-        for r in &results {
-            assert!(r.result.is_ok(), "Tool should succeed");
-        }
-        // Parallel should complete well under the sequential 600ms threshold.
-        assert!(
-            elapsed < Duration::from_millis(500),
-            "Parallel execution took {:?}, expected < 500ms",
-            elapsed
-        );
-    }
-
-    #[tokio::test]
-    async fn test_result_ordering_preserved() {
-        // Tools with different delays finish in different order.
-        // Results must be returned in the original request order.
-        let tools: Vec<Arc<dyn Tool>> = vec![
-            Arc::new(SlowTool {
-                tool_name: "tool_a".into(),
-                delay: Duration::from_millis(300),
-            }),
-            Arc::new(SlowTool {
-                tool_name: "tool_b".into(),
-                delay: Duration::from_millis(100),
-            }),
-            Arc::new(SlowTool {
-                tool_name: "tool_c".into(),
-                delay: Duration::from_millis(200),
-            }),
-        ];
-
-        let worker = make_worker(tools).await;
-
-        let selections = vec![
-            ToolSelection {
-                tool_name: "tool_a".into(),
-                parameters: serde_json::json!({}),
-                reasoning: String::new(),
-                alternatives: vec![],
-                tool_call_id: "call_a".into(),
-            },
-            ToolSelection {
-                tool_name: "tool_b".into(),
-                parameters: serde_json::json!({}),
-                reasoning: String::new(),
-                alternatives: vec![],
-                tool_call_id: "call_b".into(),
-            },
-            ToolSelection {
-                tool_name: "tool_c".into(),
-                parameters: serde_json::json!({}),
-                reasoning: String::new(),
-                alternatives: vec![],
-                tool_call_id: "call_c".into(),
-            },
-        ];
-
-        let results = worker.execute_tools_parallel(&selections).await;
-
-        // Results must be in same order as selections, not completion order.
-        assert!(results[0].result.as_ref().unwrap().contains("done_tool_a"));
-        assert!(results[1].result.as_ref().unwrap().contains("done_tool_b"));
-        assert!(results[2].result.as_ref().unwrap().contains("done_tool_c"));
-    }
-
-    #[tokio::test]
-    async fn test_missing_tool_produces_error_not_panic() {
-        // If a tool doesn't exist, the result slot should contain an error.
-        let worker = make_worker(vec![]).await;
-
-        let selections = vec![ToolSelection {
-            tool_name: "nonexistent_tool".into(),
-            parameters: serde_json::json!({}),
-            reasoning: String::new(),
-            alternatives: vec![],
-            tool_call_id: "call_x".into(),
-        }];
-
-        let results = worker.execute_tools_parallel(&selections).await;
-        assert_eq!(results.len(), 1);
-        assert!(
-            results[0].result.is_err(),
-            "Missing tool should produce an error, not a panic"
-        );
-    }
 }

src/app.rs

@@ -1,780 +0,0 @@
-//! Application builder for initializing core IronClaw components.
-//!
-//! Extracts the mechanical initialization phases from `main.rs` into a
-//! reusable builder so that:
-//!
-//! - Tests can construct a full `AppComponents` without wiring channels
-//! - Main stays focused on CLI dispatch and channel setup
-//! - Each init phase is independently testable
-
-use std::sync::Arc;
-
-use crate::channels::web::log_layer::LogBroadcaster;
-use crate::config::Config;
-use crate::context::ContextManager;
-use crate::db::Database;
-use crate::extensions::ExtensionManager;
-use crate::hooks::HookRegistry;
-use crate::llm::{LlmProvider, SessionManager};
-use crate::safety::SafetyLayer;
-use crate::secrets::SecretsStore;
-use crate::skills::SkillRegistry;
-use crate::skills::catalog::SkillCatalog;
-use crate::tools::ToolRegistry;
-use crate::tools::mcp::McpSessionManager;
-use crate::tools::wasm::WasmToolRuntime;
-use crate::workspace::{EmbeddingProvider, Workspace};
-
-/// Fully initialized application components, ready for channel wiring
-/// and agent construction.
-pub struct AppComponents {
-    /// The (potentially mutated) config after DB reload and secret injection.
-    pub config: Config,
-    pub db: Option<Arc<dyn Database>>,
-    pub secrets_store: Option<Arc<dyn SecretsStore + Send + Sync>>,
-    pub llm: Arc<dyn LlmProvider>,
-    pub cheap_llm: Option<Arc<dyn LlmProvider>>,
-    pub safety: Arc<SafetyLayer>,
-    pub tools: Arc<ToolRegistry>,
-    pub embeddings: Option<Arc<dyn EmbeddingProvider>>,
-    pub workspace: Option<Arc<Workspace>>,
-    pub extension_manager: Option<Arc<ExtensionManager>>,
-    pub mcp_session_manager: Arc<McpSessionManager>,
-    pub wasm_tool_runtime: Option<Arc<WasmToolRuntime>>,
-    pub log_broadcaster: Arc<LogBroadcaster>,
-    pub context_manager: Arc<ContextManager>,
-    pub hooks: Arc<HookRegistry>,
-    pub skill_registry: Option<Arc<std::sync::RwLock<SkillRegistry>>>,
-    pub skill_catalog: Option<Arc<SkillCatalog>>,
-    pub cost_guard: Arc<crate::agent::cost_guard::CostGuard>,
-    pub session: Arc<SessionManager>,
-}
-
-/// Options that control optional init phases.
-#[derive(Default)]
-pub struct AppBuilderFlags {
-    pub no_db: bool,
-}
-
-/// Builder that orchestrates the 5 mechanical init phases.
-pub struct AppBuilder {
-    config: Config,
-    flags: AppBuilderFlags,
-    toml_path: Option<std::path::PathBuf>,
-    session: Arc<SessionManager>,
-    log_broadcaster: Arc<LogBroadcaster>,
-
-    // Accumulated state
-    db: Option<Arc<dyn Database>>,
-    secrets_store: Option<Arc<dyn SecretsStore + Send + Sync>>,
-
-    // Backend-specific handles needed by secrets store
-    #[cfg(feature = "postgres")]
-    pg_pool: Option<deadpool_postgres::Pool>,
-    #[cfg(feature = "libsql")]
-    libsql_db: Option<Arc<libsql::Database>>,
-}
-
-impl AppBuilder {
-    /// Create a new builder.
-    ///
-    /// The `session` and `log_broadcaster` are created before the builder
-    /// because tracing must be initialized before any init phase runs,
-    /// and the log broadcaster is part of the tracing layer.
-    pub fn new(
-        config: Config,
-        flags: AppBuilderFlags,
-        toml_path: Option<std::path::PathBuf>,
-        session: Arc<SessionManager>,
-        log_broadcaster: Arc<LogBroadcaster>,
-    ) -> Self {
-        Self {
-            config,
-            flags,
-            toml_path,
-            session,
-            log_broadcaster,
-            db: None,
-            secrets_store: None,
-            #[cfg(feature = "postgres")]
-            pg_pool: None,
-            #[cfg(feature = "libsql")]
-            libsql_db: None,
-        }
-    }
-
-    /// Phase 1: Initialize database backend.
-    ///
-    /// Creates the database connection, runs migrations, reloads config
-    /// from DB, attaches DB to session manager, and cleans up stale jobs.
-    pub async fn init_database(&mut self) -> Result<(), anyhow::Error> {
-        if self.flags.no_db {
-            tracing::warn!("Running without database connection");
-            return Ok(());
-        }
-
-        let db: Arc<dyn Database> = match self.config.database.backend {
-            #[cfg(feature = "libsql")]
-            crate::config::DatabaseBackend::LibSql => {
-                use crate::db::Database as _;
-                use crate::db::libsql::LibSqlBackend;
-                use secrecy::ExposeSecret as _;
-
-                let default_path = crate::config::default_libsql_path();
-                let db_path = self
-                    .config
-                    .database
-                    .libsql_path
-                    .as_deref()
-                    .unwrap_or(&default_path);
-
-                let backend = if let Some(ref url) = self.config.database.libsql_url {
-                    let token =
-                        self.config
-                            .database
-                            .libsql_auth_token
-                            .as_ref()
-                            .ok_or_else(|| {
-                                anyhow::anyhow!(
-                                    "LIBSQL_AUTH_TOKEN is required when LIBSQL_URL is set"
-                                )
-                            })?;
-                    LibSqlBackend::new_remote_replica(db_path, url, token.expose_secret()).await?
-                } else {
-                    LibSqlBackend::new_local(db_path).await?
-                };
-                backend.run_migrations().await?;
-                tracing::info!("libSQL database connected and migrations applied");
-
-                #[cfg(feature = "libsql")]
-                {
-                    self.libsql_db = Some(backend.shared_db());
-                }
-
-                Arc::new(backend) as Arc<dyn Database>
-            }
-            #[cfg(feature = "postgres")]
-            _ => {
-                use crate::db::Database as _;
-                let pg = crate::db::postgres::PgBackend::new(&self.config.database)
-                    .await
-                    .map_err(|e| anyhow::anyhow!("{}", e))?;
-                pg.run_migrations()
-                    .await
-                    .map_err(|e| anyhow::anyhow!("{}", e))?;
-                tracing::info!("PostgreSQL database connected and migrations applied");
-
-                #[cfg(feature = "postgres")]
-                {
-                    self.pg_pool = Some(pg.pool());
-                }
-
-                Arc::new(pg) as Arc<dyn Database>
-            }
-            #[cfg(not(feature = "postgres"))]
-            _ => {
-                anyhow::bail!(
-                    "No database backend available. Enable 'postgres' or 'libsql' feature."
-                );
-            }
-        };
-
-        // Post-init: migrate disk config, reload config from DB, attach session, cleanup
-        if let Err(e) = crate::bootstrap::migrate_disk_to_db(db.as_ref(), "default").await {
-            tracing::warn!("Disk-to-DB settings migration failed: {}", e);
-        }
-
-        let toml_path = self.toml_path.as_deref();
-        match Config::from_db_with_toml(db.as_ref(), "default", toml_path).await {
-            Ok(db_config) => {
-                self.config = db_config;
-                tracing::info!("Configuration reloaded from database");
-            }
-            Err(e) => {
-                tracing::warn!(
-                    "Failed to reload config from DB, keeping env-based config: {}",
-                    e
-                );
-            }
-        }
-
-        self.session.attach_store(db.clone(), "default").await;
-
-        if let Err(e) = db.cleanup_stale_sandbox_jobs().await {
-            tracing::warn!("Failed to cleanup stale sandbox jobs: {}", e);
-        }
-
-        self.db = Some(db);
-        Ok(())
-    }
-
-    /// Phase 2: Create secrets store.
-    ///
-    /// Requires a master key and a backend-specific DB handle. After creating
-    /// the store, injects any encrypted LLM API keys into the config overlay
-    /// and re-resolves config.
-    pub async fn init_secrets(&mut self) -> Result<(), anyhow::Error> {
-        let master_key = match self.config.secrets.master_key() {
-            Some(k) => k,
-            None => {
-                // Consume unused handles
-                #[cfg(feature = "libsql")]
-                {
-                    self.libsql_db.take();
-                }
-                return Ok(());
-            }
-        };
-
-        let crypto = match crate::secrets::SecretsCrypto::new(master_key.clone()) {
-            Ok(c) => Arc::new(c),
-            Err(e) => {
-                tracing::warn!("Failed to initialize secrets crypto: {}", e);
-                #[cfg(feature = "libsql")]
-                {
-                    self.libsql_db.take();
-                }
-                return Ok(());
-            }
-        };
-
-        let store: Option<Arc<dyn SecretsStore + Send + Sync>> = None;
-
-        #[cfg(feature = "libsql")]
-        let store = store.or_else(|| {
-            self.libsql_db.take().map(|db| {
-                Arc::new(crate::secrets::LibSqlSecretsStore::new(
-                    db,
-                    Arc::clone(&crypto),
-                )) as Arc<dyn SecretsStore + Send + Sync>
-            })
-        });
-
-        #[cfg(feature = "postgres")]
-        let store = store.or_else(|| {
-            self.pg_pool.as_ref().map(|pool| {
-                Arc::new(crate::secrets::PostgresSecretsStore::new(
-                    pool.clone(),
-                    Arc::clone(&crypto),
-                )) as Arc<dyn SecretsStore + Send + Sync>
-            })
-        });
-
-        if let Some(ref secrets) = store {
-            // Inject LLM API keys from encrypted storage
-            crate::config::inject_llm_keys_from_secrets(secrets.as_ref(), "default").await;
-
-            // Re-resolve config with newly available keys
-            if let Some(ref db) = self.db {
-                let toml_path = self.toml_path.as_deref();
-                match Config::from_db_with_toml(db.as_ref(), "default", toml_path).await {
-                    Ok(refreshed) => {
-                        self.config = refreshed;
-                        tracing::debug!("LlmConfig re-resolved after secret injection");
-                    }
-                    Err(e) => {
-                        tracing::warn!("Failed to re-resolve config after secret injection: {}", e);
-                    }
-                }
-            }
-        }
-
-        self.secrets_store = store;
-        Ok(())
-    }
-
-    /// Phase 3: Initialize LLM provider chain.
-    ///
-    /// Creates the primary provider, then wraps with failover, circuit
-    /// breaker, and response cache as configured.
-    #[allow(clippy::type_complexity)]
-    pub fn init_llm(
-        &self,
-    ) -> Result<(Arc<dyn LlmProvider>, Option<Arc<dyn LlmProvider>>), anyhow::Error> {
-        use crate::llm::{
-            CachedProvider, CircuitBreakerConfig, CircuitBreakerProvider, CooldownConfig,
-            FailoverProvider, ResponseCacheConfig, create_cheap_llm_provider, create_llm_provider,
-            create_llm_provider_with_config,
-        };
-
-        let llm = create_llm_provider(&self.config.llm, self.session.clone())?;
-        tracing::info!("LLM provider initialized: {}", llm.model_name());
-
-        // Wrap in failover if a fallback model is configured
-        let llm: Arc<dyn LlmProvider> = if let Some(fallback_model) =
-            self.config.llm.nearai.fallback_model.as_ref()
-        {
-            if fallback_model == &self.config.llm.nearai.model {
-                tracing::warn!(
-                    "fallback_model is the same as primary model, failover may not be effective"
-                );
-            }
-            let mut fallback_config = self.config.llm.nearai.clone();
-            fallback_config.model = fallback_model.clone();
-            let fallback = create_llm_provider_with_config(&fallback_config, self.session.clone())?;
-            tracing::info!(
-                primary = %llm.model_name(),
-                fallback = %fallback.model_name(),
-                "LLM failover enabled"
-            );
-            let cooldown_config = CooldownConfig {
-                cooldown_duration: std::time::Duration::from_secs(
-                    self.config.llm.nearai.failover_cooldown_secs,
-                ),
-                failure_threshold: self.config.llm.nearai.failover_cooldown_threshold,
-            };
-            Arc::new(FailoverProvider::with_cooldown(
-                vec![llm, fallback],
-                cooldown_config,
-            )?)
-        } else {
-            llm
-        };
-
-        // Wrap in circuit breaker if configured
-        let llm: Arc<dyn LlmProvider> =
-            if let Some(threshold) = self.config.llm.nearai.circuit_breaker_threshold {
-                let cb_config = CircuitBreakerConfig {
-                    failure_threshold: threshold,
-                    recovery_timeout: std::time::Duration::from_secs(
-                        self.config.llm.nearai.circuit_breaker_recovery_secs,
-                    ),
-                    ..CircuitBreakerConfig::default()
-                };
-                tracing::info!(
-                    threshold,
-                    recovery_secs = self.config.llm.nearai.circuit_breaker_recovery_secs,
-                    "LLM circuit breaker enabled"
-                );
-                Arc::new(CircuitBreakerProvider::new(llm, cb_config))
-            } else {
-                llm
-            };
-
-        // Wrap in response cache if configured
-        let llm: Arc<dyn LlmProvider> = if self.config.llm.nearai.response_cache_enabled {
-            let rc_config = ResponseCacheConfig {
-                ttl: std::time::Duration::from_secs(self.config.llm.nearai.response_cache_ttl_secs),
-                max_entries: self.config.llm.nearai.response_cache_max_entries,
-            };
-            tracing::info!(
-                ttl_secs = self.config.llm.nearai.response_cache_ttl_secs,
-                max_entries = self.config.llm.nearai.response_cache_max_entries,
-                "LLM response cache enabled"
-            );
-            Arc::new(CachedProvider::new(llm, rc_config))
-        } else {
-            llm
-        };
-
-        // Cheap LLM for lightweight tasks
-        let cheap_llm = create_cheap_llm_provider(&self.config.llm, self.session.clone())?;
-        if let Some(ref cheap) = cheap_llm {
-            tracing::info!("Cheap LLM provider initialized: {}", cheap.model_name());
-        }
-
-        Ok((llm, cheap_llm))
-    }
-
-    /// Phase 4: Initialize safety, tools, embeddings, and workspace.
-    pub async fn init_tools(
-        &self,
-        llm: &Arc<dyn LlmProvider>,
-    ) -> Result<
-        (
-            Arc<SafetyLayer>,
-            Arc<ToolRegistry>,
-            Option<Arc<dyn EmbeddingProvider>>,
-            Option<Arc<Workspace>>,
-        ),
-        anyhow::Error,
-    > {
-        use crate::workspace::{NearAiEmbeddings, OpenAiEmbeddings};
-
-        let safety = Arc::new(SafetyLayer::new(&self.config.safety));
-        tracing::info!("Safety layer initialized");
-
-        let tools = Arc::new(ToolRegistry::new());
-        tools.register_builtin_tools();
-
-        // Create embeddings provider if configured
-        let embeddings: Option<Arc<dyn EmbeddingProvider>> = if self.config.embeddings.enabled {
-            match self.config.embeddings.provider.as_str() {
-                "nearai" => {
-                    tracing::info!(
-                        "Embeddings enabled via NEAR AI (model: {})",
-                        self.config.embeddings.model
-                    );
-                    Some(Arc::new(
-                        NearAiEmbeddings::new(
-                            &self.config.llm.nearai.base_url,
-                            self.session.clone(),
-                        )
-                        .with_model(&self.config.embeddings.model, 1536),
-                    ))
-                }
-                _ => {
-                    if let Some(api_key) = self.config.embeddings.openai_api_key() {
-                        tracing::info!(
-                            "Embeddings enabled via OpenAI (model: {})",
-                            self.config.embeddings.model
-                        );
-                        Some(Arc::new(OpenAiEmbeddings::with_model(
-                            api_key,
-                            &self.config.embeddings.model,
-                            match self.config.embeddings.model.as_str() {
-                                "text-embedding-3-large" => 3072,
-                                _ => 1536,
-                            },
-                        )))
-                    } else {
-                        tracing::warn!("Embeddings configured but OPENAI_API_KEY not set");
-                        None
-                    }
-                }
-            }
-        } else {
-            tracing::info!("Embeddings disabled (set OPENAI_API_KEY or EMBEDDING_ENABLED=true)");
-            None
-        };
-
-        // Register memory tools if database is available
-        let workspace = if let Some(ref db) = self.db {
-            let mut ws = Workspace::new_with_db("default", db.clone());
-            if let Some(ref emb) = embeddings {
-                ws = ws.with_embeddings(emb.clone());
-            }
-            let ws = Arc::new(ws);
-            tools.register_memory_tools(Arc::clone(&ws));
-            Some(ws)
-        } else {
-            None
-        };
-
-        // Register builder tool if enabled
-        if self.config.builder.enabled
-            && (self.config.agent.allow_local_tools || !self.config.sandbox.enabled)
-        {
-            tools
-                .register_builder_tool(
-                    llm.clone(),
-                    safety.clone(),
-                    Some(self.config.builder.to_builder_config()),
-                )
-                .await;
-            tracing::info!("Builder mode enabled");
-        }
-
-        Ok((safety, tools, embeddings, workspace))
-    }
-
-    /// Phase 5: Load WASM tools, MCP servers, and create extension manager.
-    pub async fn init_extensions(
-        &self,
-        tools: &Arc<ToolRegistry>,
-        hooks: &Arc<HookRegistry>,
-    ) -> Result<
-        (
-            Arc<McpSessionManager>,
-            Option<Arc<WasmToolRuntime>>,
-            Option<Arc<ExtensionManager>>,
-        ),
-        anyhow::Error,
-    > {
-        use crate::tools::mcp::{McpClient, config::load_mcp_servers_from_db, is_authenticated};
-        use crate::tools::wasm::{WasmToolLoader, load_dev_tools};
-
-        let mcp_session_manager = Arc::new(McpSessionManager::new());
-
-        // Create WASM tool runtime
-        let wasm_tool_runtime: Option<Arc<WasmToolRuntime>> =
-            if self.config.wasm.enabled && self.config.wasm.tools_dir.exists() {
-                match WasmToolRuntime::new(self.config.wasm.to_runtime_config()) {
-                    Ok(runtime) => Some(Arc::new(runtime)),
-                    Err(e) => {
-                        tracing::warn!("Failed to initialize WASM runtime: {}", e);
-                        None
-                    }
-                }
-            } else {
-                None
-            };
-
-        // Load WASM tools and MCP servers concurrently
-        let wasm_tools_future = {
-            let wasm_tool_runtime = wasm_tool_runtime.clone();
-            let secrets_store = self.secrets_store.clone();
-            let tools = Arc::clone(tools);
-            let wasm_config = self.config.wasm.clone();
-            async move {
-                if let Some(ref runtime) = wasm_tool_runtime {
-                    let mut loader = WasmToolLoader::new(Arc::clone(runtime), Arc::clone(&tools));
-                    if let Some(ref secrets) = secrets_store {
-                        loader = loader.with_secrets_store(Arc::clone(secrets));
-                    }
-
-                    match loader.load_from_dir(&wasm_config.tools_dir).await {
-                        Ok(results) => {
-                            if !results.loaded.is_empty() {
-                                tracing::info!(
-                                    "Loaded {} WASM tools from {}",
-                                    results.loaded.len(),
-                                    wasm_config.tools_dir.display()
-                                );
-                            }
-                            for (path, err) in &results.errors {
-                                tracing::warn!(
-                                    "Failed to load WASM tool {}: {}",
-                                    path.display(),
-                                    err
-                                );
-                            }
-                        }
-                        Err(e) => {
-                            tracing::warn!("Failed to scan WASM tools directory: {}", e);
-                        }
-                    }
-
-                    match load_dev_tools(&loader, &wasm_config.tools_dir).await {
-                        Ok(results) => {
-                            if !results.loaded.is_empty() {
-                                tracing::info!(
-                                    "Loaded {} dev WASM tools from build artifacts",
-                                    results.loaded.len()
-                                );
-                            }
-                        }
-                        Err(e) => {
-                            tracing::debug!("No dev WASM tools found: {}", e);
-                        }
-                    }
-                }
-            }
-        };
-
-        let mcp_servers_future = {
-            let secrets_store = self.secrets_store.clone();
-            let db = self.db.clone();
-            let tools = Arc::clone(tools);
-            let mcp_sm = Arc::clone(&mcp_session_manager);
-            async move {
-                if let Some(ref secrets) = secrets_store {
-                    let servers_result = if let Some(ref d) = db {
-                        load_mcp_servers_from_db(d.as_ref(), "default").await
-                    } else {
-                        crate::tools::mcp::config::load_mcp_servers().await
-                    };
-                    match servers_result {
-                        Ok(servers) => {
-                            let enabled: Vec<_> = servers.enabled_servers().cloned().collect();
-                            if !enabled.is_empty() {
-                                tracing::info!(
-                                    "Loading {} configured MCP server(s)...",
-                                    enabled.len()
-                                );
-                            }
-
-                            let mut join_set = tokio::task::JoinSet::new();
-                            for server in enabled {
-                                let mcp_sm = Arc::clone(&mcp_sm);
-                                let secrets = Arc::clone(secrets);
-                                let tools = Arc::clone(&tools);
-
-                                join_set.spawn(async move {
-                                    let server_name = server.name.clone();
-                                    let has_tokens =
-                                        is_authenticated(&server, &secrets, "default").await;
-
-                                    let client = if has_tokens || server.requires_auth() {
-                                        McpClient::new_authenticated(
-                                            server, mcp_sm, secrets, "default",
-                                        )
-                                    } else {
-                                        McpClient::new_with_name(&server_name, &server.url)
-                                    };
-
-                                    match client.list_tools().await {
-                                        Ok(mcp_tools) => {
-                                            let tool_count = mcp_tools.len();
-                                            match client.create_tools().await {
-                                                Ok(tool_impls) => {
-                                                    for tool in tool_impls {
-                                                        tools.register(tool).await;
-                                                    }
-                                                    tracing::info!(
-                                                        "Loaded {} tools from MCP server '{}'",
-                                                        tool_count,
-                                                        server_name
-                                                    );
-                                                }
-                                                Err(e) => {
-                                                    tracing::warn!(
-                                                        "Failed to create tools from MCP server '{}': {}",
-                                                        server_name,
-                                                        e
-                                                    );
-                                                }
-                                            }
-                                        }
-                                        Err(e) => {
-                                            let err_str = e.to_string();
-                                            if err_str.contains("401")
-                                                || err_str.contains("authentication")
-                                            {
-                                                tracing::warn!(
-                                                    "MCP server '{}' requires authentication. \
-                                                     Run: ironclaw mcp auth {}",
-                                                    server_name,
-                                                    server_name
-                                                );
-                                            } else {
-                                                tracing::warn!(
-                                                    "Failed to connect to MCP server '{}': {}",
-                                                    server_name,
-                                                    e
-                                                );
-                                            }
-                                        }
-                                    }
-                                });
-                            }
-
-                            while let Some(result) = join_set.join_next().await {
-                                if let Err(e) = result {
-                                    tracing::warn!("MCP server loading task panicked: {}", e);
-                                }
-                            }
-                        }
-                        Err(e) => {
-                            tracing::debug!("No MCP servers configured ({})", e);
-                        }
-                    }
-                }
-            }
-        };
-
-        tokio::join!(wasm_tools_future, mcp_servers_future);
-
-        // Create extension manager
-        let extension_manager = if let Some(ref secrets) = self.secrets_store {
-            let manager = Arc::new(ExtensionManager::new(
-                Arc::clone(&mcp_session_manager),
-                Arc::clone(secrets),
-                Arc::clone(tools),
-                Some(Arc::clone(hooks)),
-                wasm_tool_runtime.clone(),
-                self.config.wasm.tools_dir.clone(),
-                self.config.channels.wasm_channels_dir.clone(),
-                self.config.tunnel.public_url.clone(),
-                "default".to_string(),
-                self.db.clone(),
-            ));
-            tools.register_extension_tools(Arc::clone(&manager));
-            tracing::info!("Extension manager initialized with in-chat discovery tools");
-            Some(manager)
-        } else {
-            tracing::debug!(
-                "Extension manager not available (no secrets store). \
-                 Extension tools won't be registered."
-            );
-            None
-        };
-
-        // register_builder_tool() already calls register_dev_tools() internally,
-        // so only register them here when the builder didn't already do it.
-        let builder_registered_dev_tools = self.config.builder.enabled
-            && (self.config.agent.allow_local_tools || !self.config.sandbox.enabled);
-        if self.config.agent.allow_local_tools && !builder_registered_dev_tools {
-            tools.register_dev_tools();
-        }
-
-        Ok((mcp_session_manager, wasm_tool_runtime, extension_manager))
-    }
-
-    /// Run all init phases in order and return the assembled components.
-    pub async fn build_all(mut self) -> Result<AppComponents, anyhow::Error> {
-        self.init_database().await?;
-        self.init_secrets().await?;
-
-        let (llm, cheap_llm) = self.init_llm()?;
-        let (safety, tools, embeddings, workspace) = self.init_tools(&llm).await?;
-
-        // Create hook registry early so runtime extension activation can register hooks.
-        let hooks = Arc::new(HookRegistry::new());
-
-        let (mcp_session_manager, wasm_tool_runtime, extension_manager) =
-            self.init_extensions(&tools, &hooks).await?;
-
-        // Seed workspace and backfill embeddings
-        if let Some(ref ws) = workspace {
-            match ws.seed_if_empty().await {
-                Ok(_) => {}
-                Err(e) => {
-                    tracing::warn!("Failed to seed workspace: {}", e);
-                }
-            }
-
-            if embeddings.is_some() {
-                match ws.backfill_embeddings().await {
-                    Ok(count) if count > 0 => {
-                        tracing::info!("Backfilled embeddings for {} chunks", count);
-                    }
-                    Ok(_) => {}
-                    Err(e) => {
-                        tracing::warn!("Failed to backfill embeddings: {}", e);
-                    }
-                }
-            }
-        }
-
-        // Skills system
-        let (skill_registry, skill_catalog) = if self.config.skills.enabled {
-            let mut registry = SkillRegistry::new(self.config.skills.local_dir.clone());
-            let loaded = registry.discover_all().await;
-            if !loaded.is_empty() {
-                tracing::info!("Loaded {} skill(s): {}", loaded.len(), loaded.join(", "));
-            }
-            let registry = Arc::new(std::sync::RwLock::new(registry));
-            let catalog = crate::skills::catalog::shared_catalog();
-            tools.register_skill_tools(Arc::clone(&registry), Arc::clone(&catalog));
-            (Some(registry), Some(catalog))
-        } else {
-            (None, None)
-        };
-
-        let context_manager = Arc::new(ContextManager::new(self.config.agent.max_parallel_jobs));
-        let cost_guard = Arc::new(crate::agent::cost_guard::CostGuard::new(
-            crate::agent::cost_guard::CostGuardConfig {
-                max_cost_per_day_cents: self.config.agent.max_cost_per_day_cents,
-                max_actions_per_hour: self.config.agent.max_actions_per_hour,
-            },
-        ));
-
-        tracing::info!(
-            "Tool registry initialized with {} total tools",
-            tools.count()
-        );
-
-        Ok(AppComponents {
-            config: self.config,
-            db: self.db,
-            secrets_store: self.secrets_store,
-            llm,
-            cheap_llm,
-            safety,
-            tools,
-            embeddings,
-            workspace,
-            extension_manager,
-            mcp_session_manager,
-            wasm_tool_runtime,
-            log_broadcaster: self.log_broadcaster,
-            context_manager,
-            hooks,
-            skill_registry,
-            skill_catalog,
-            cost_guard,
-            session: self.session,
-        })
-    }
-}

src/boot_screen.rs

@@ -1,228 +0,0 @@
-//! Boot screen displayed after all initialization completes.
-//!
-//! Shows a polished ANSI-styled status panel summarizing the agent's runtime
-//! state: model, database, tool count, enabled features, active channels,
-//! and the gateway URL.
-
-/// All displayable fields for the boot screen.
-pub struct BootInfo {
-    pub version: String,
-    pub agent_name: String,
-    pub llm_backend: String,
-    pub llm_model: String,
-    pub cheap_model: Option<String>,
-    pub db_backend: String,
-    pub db_connected: bool,
-    pub tool_count: usize,
-    pub gateway_url: Option<String>,
-    pub embeddings_enabled: bool,
-    pub embeddings_provider: Option<String>,
-    pub heartbeat_enabled: bool,
-    pub heartbeat_interval_secs: u64,
-    pub sandbox_enabled: bool,
-    pub claude_code_enabled: bool,
-    pub routines_enabled: bool,
-    pub channels: Vec<String>,
-    /// Public URL from a managed tunnel (e.g., "https://abc.ngrok.io").
-    pub tunnel_url: Option<String>,
-    /// Provider name for the managed tunnel (e.g., "ngrok").
-    pub tunnel_provider: Option<String>,
-}
-
-/// Print the boot screen to stdout.
-pub fn print_boot_screen(info: &BootInfo) {
-    // ANSI codes matching existing REPL palette
-    let bold = "\x1b[1m";
-    let cyan = "\x1b[36m";
-    let dim = "\x1b[90m";
-    let yellow_underline = "\x1b[33;4m";
-    let reset = "\x1b[0m";
-
-    let border = format!("  {dim}{}{reset}", "\u{2576}".repeat(58));
-
-    println!();
-    println!("{border}");
-    println!();
-    println!("  {bold}{}{reset} v{}", info.agent_name, info.version);
-    println!();
-
-    // Model line
-    let model_display = if let Some(ref cheap) = info.cheap_model {
-        format!(
-            "{cyan}{}{reset}  {dim}cheap{reset} {cyan}{}{reset}",
-            info.llm_model, cheap
-        )
-    } else {
-        format!("{cyan}{}{reset}", info.llm_model)
-    };
-    println!(
-        "  {dim}model{reset}     {model_display}  {dim}via {}{reset}",
-        info.llm_backend
-    );
-
-    // Database line
-    let db_status = if info.db_connected {
-        "connected"
-    } else {
-        "none"
-    };
-    println!(
-        "  {dim}database{reset}  {cyan}{}{reset} {dim}({db_status}){reset}",
-        info.db_backend
-    );
-
-    // Tools line
-    println!(
-        "  {dim}tools{reset}     {cyan}{}{reset} {dim}registered{reset}",
-        info.tool_count
-    );
-
-    // Features line
-    let mut features = Vec::new();
-    if info.embeddings_enabled {
-        if let Some(ref provider) = info.embeddings_provider {
-            features.push(format!("embeddings ({provider})"));
-        } else {
-            features.push("embeddings".to_string());
-        }
-    }
-    if info.heartbeat_enabled {
-        let mins = info.heartbeat_interval_secs / 60;
-        features.push(format!("heartbeat ({mins}m)"));
-    }
-    if info.sandbox_enabled {
-        features.push("sandbox".to_string());
-    }
-    if info.claude_code_enabled {
-        features.push("claude-code".to_string());
-    }
-    if info.routines_enabled {
-        features.push("routines".to_string());
-    }
-    if !features.is_empty() {
-        println!(
-            "  {dim}features{reset}  {cyan}{}{reset}",
-            features.join("  ")
-        );
-    }
-
-    // Channels line
-    if !info.channels.is_empty() {
-        println!(
-            "  {dim}channels{reset}  {cyan}{}{reset}",
-            info.channels.join("  ")
-        );
-    }
-
-    // Gateway URL (highlighted)
-    if let Some(ref url) = info.gateway_url {
-        println!();
-        println!("  {dim}gateway{reset}   {yellow_underline}{url}{reset}");
-    }
-
-    // Tunnel URL
-    if let Some(ref url) = info.tunnel_url {
-        let provider_tag = info
-            .tunnel_provider
-            .as_deref()
-            .map(|p| format!(" {dim}({p}){reset}"))
-            .unwrap_or_default();
-        println!("  {dim}tunnel{reset}    {yellow_underline}{url}{reset}{provider_tag}");
-    }
-
-    println!();
-    println!("{border}");
-    println!();
-    println!("  /help for commands, /quit to exit");
-    println!();
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_print_boot_screen_full() {
-        let info = BootInfo {
-            version: "0.2.0".to_string(),
-            agent_name: "ironclaw".to_string(),
-            llm_backend: "nearai".to_string(),
-            llm_model: "claude-3-5-sonnet-20241022".to_string(),
-            cheap_model: Some("gpt-4o-mini".to_string()),
-            db_backend: "libsql".to_string(),
-            db_connected: true,
-            tool_count: 24,
-            gateway_url: Some("http://127.0.0.1:3001/?token=abc123".to_string()),
-            embeddings_enabled: true,
-            embeddings_provider: Some("openai".to_string()),
-            heartbeat_enabled: true,
-            heartbeat_interval_secs: 1800,
-            sandbox_enabled: true,
-            claude_code_enabled: false,
-            routines_enabled: true,
-            channels: vec![
-                "repl".to_string(),
-                "gateway".to_string(),
-                "telegram".to_string(),
-            ],
-            tunnel_url: Some("https://abc123.ngrok.io".to_string()),
-            tunnel_provider: Some("ngrok".to_string()),
-        };
-        // Should not panic
-        print_boot_screen(&info);
-    }
-
-    #[test]
-    fn test_print_boot_screen_minimal() {
-        let info = BootInfo {
-            version: "0.2.0".to_string(),
-            agent_name: "ironclaw".to_string(),
-            llm_backend: "nearai".to_string(),
-            llm_model: "gpt-4o".to_string(),
-            cheap_model: None,
-            db_backend: "none".to_string(),
-            db_connected: false,
-            tool_count: 5,
-            gateway_url: None,
-            embeddings_enabled: false,
-            embeddings_provider: None,
-            heartbeat_enabled: false,
-            heartbeat_interval_secs: 0,
-            sandbox_enabled: false,
-            claude_code_enabled: false,
-            routines_enabled: false,
-            channels: vec![],
-            tunnel_url: None,
-            tunnel_provider: None,
-        };
-        // Should not panic
-        print_boot_screen(&info);
-    }
-
-    #[test]
-    fn test_print_boot_screen_no_features() {
-        let info = BootInfo {
-            version: "0.1.0".to_string(),
-            agent_name: "test".to_string(),
-            llm_backend: "openai".to_string(),
-            llm_model: "gpt-4o".to_string(),
-            cheap_model: None,
-            db_backend: "postgres".to_string(),
-            db_connected: true,
-            tool_count: 10,
-            gateway_url: None,
-            embeddings_enabled: false,
-            embeddings_provider: None,
-            heartbeat_enabled: false,
-            heartbeat_interval_secs: 0,
-            sandbox_enabled: false,
-            claude_code_enabled: false,
-            routines_enabled: false,
-            channels: vec!["repl".to_string()],
-            tunnel_url: None,
-            tunnel_provider: None,
-        };
-        // Should not panic
-        print_boot_screen(&info);
-    }
-}

src/bootstrap.rs

@@ -81,97 +81,17 @@ fn migrate_bootstrap_json_to_env(env_path: &std::path::Path) {
     }
 }
 
-/// Write database bootstrap vars to `~/.ironclaw/.env`.
-///
-/// These settings form the chicken-and-egg layer: they must be available
-/// from the filesystem (env vars) BEFORE any database connection, because
-/// they determine which database to connect to. Everything else is stored
-/// in the database itself.
-///
-/// Creates the parent directory if it doesn't exist.
-/// Values are double-quoted so that `#` (common in URL-encoded passwords)
-/// and other shell-special characters are preserved by dotenvy.
-pub fn save_bootstrap_env(vars: &[(&str, &str)]) -> std::io::Result<()> {
-    let path = ironclaw_env_path();
-    if let Some(parent) = path.parent() {
-        std::fs::create_dir_all(parent)?;
-    }
-    let mut content = String::new();
-    for (key, value) in vars {
-        // Escape backslashes and double quotes to prevent env var injection
-        // (e.g. a value containing `"\nINJECTED="x` would break out of quotes).
-        let escaped = value.replace('\\', "\\\\").replace('"', "\\\"");
-        content.push_str(&format!("{}=\"{}\"\n", key, escaped));
-    }
-    std::fs::write(&path, &content)?;
-    restrict_file_permissions(&path)?;
-    Ok(())
-}
-
-/// Update or add a single variable in `~/.ironclaw/.env`, preserving existing content.
-///
-/// Unlike `save_bootstrap_env` (which overwrites the entire file), this
-/// reads the current `.env`, replaces the line for `key` if it exists,
-/// or appends it otherwise. Use this when writing a single bootstrap var
-/// outside the wizard (which manages the full set via `save_bootstrap_env`).
-pub fn upsert_bootstrap_var(key: &str, value: &str) -> std::io::Result<()> {
-    let path = ironclaw_env_path();
-    if let Some(parent) = path.parent() {
-        std::fs::create_dir_all(parent)?;
-    }
-
-    let escaped = value.replace('\\', "\\\\").replace('"', "\\\"");
-    let new_line = format!("{}=\"{}\"", key, escaped);
-    let prefix = format!("{}=", key);
-
-    let existing = std::fs::read_to_string(&path).unwrap_or_default();
-
-    let mut found = false;
-    let mut result = String::new();
-    for line in existing.lines() {
-        if line.starts_with(&prefix) {
-            if !found {
-                result.push_str(&new_line);
-                result.push('\n');
-                found = true;
-            }
-            // Skip duplicate lines for this key
-            continue;
-        }
-        result.push_str(line);
-        result.push('\n');
-    }
-
-    if !found {
-        result.push_str(&new_line);
-        result.push('\n');
-    }
-
-    std::fs::write(&path, result)?;
-    restrict_file_permissions(&path)?;
-    Ok(())
-}
-
-/// Set restrictive file permissions (0o600) on Unix systems.
-///
-/// The `.env` file may contain database credentials and API keys,
-/// so it should only be readable by the owner.
-fn restrict_file_permissions(_path: &std::path::Path) -> std::io::Result<()> {
-    #[cfg(unix)]
-    {
-        use std::os::unix::fs::PermissionsExt;
-        let perms = std::fs::Permissions::from_mode(0o600);
-        std::fs::set_permissions(_path, perms)?;
-    }
-    Ok(())
-}
-
 /// Write `DATABASE_URL` to `~/.ironclaw/.env`.
 ///
-/// Convenience wrapper around `save_bootstrap_env` for single-value migration
-/// paths. Prefer `save_bootstrap_env` for new code.
+/// Creates the parent directory if it doesn't exist.
+/// The value is double-quoted so that `#` (common in URL-encoded passwords)
+/// and other shell-special characters are preserved by dotenvy.
 pub fn save_database_url(url: &str) -> std::io::Result<()> {
-    save_bootstrap_env(&[("DATABASE_URL", url)])
+    let path = ironclaw_env_path();
+    if let Some(parent) = path.parent() {
+        std::fs::create_dir_all(parent)?;
+    }
+    std::fs::write(&path, format!("DATABASE_URL=\"{}\"\n", url))
 }
 
 /// One-time migration of legacy `~/.ironclaw/settings.json` into the database.
@@ -264,7 +184,7 @@ pub async fn migrate_disk_to_db(
             Ok(content) => match serde_json::from_str::<serde_json::Value>(&content) {
                 Ok(value) => {
                     store
-                        .set_setting(user_id, "nearai.session_token", &value)
+                        .set_setting(user_id, "nearai.session", &value)
                         .await
                         .map_err(|e| {
                             MigrationError::Database(format!(
@@ -386,34 +306,6 @@ mod tests {
         assert!(content.contains("DATABASE_URL=postgres://test"));
     }
 
-    #[test]
-    fn test_save_bootstrap_env_escapes_quotes() {
-        let dir = tempdir().unwrap();
-        let env_path = dir.path().join(".env");
-
-        // A malicious URL attempting to inject a second env var
-        let malicious = r#"http://evil.com"
-INJECTED="pwned"#;
-        let mut content = String::new();
-        let escaped = malicious.replace('\\', "\\\\").replace('"', "\\\"");
-        content.push_str(&format!("LLM_BASE_URL=\"{}\"\n", escaped));
-        std::fs::write(&env_path, &content).unwrap();
-
-        let parsed: Vec<(String, String)> = dotenvy::from_path_iter(&env_path)
-            .unwrap()
-            .filter_map(|r| r.ok())
-            .collect();
-
-        // Must parse as exactly one variable, not two
-        assert_eq!(parsed.len(), 1, "injection must not create extra vars");
-        assert_eq!(parsed[0].0, "LLM_BASE_URL");
-        // The value should contain the original malicious content (unescaped by dotenvy)
-        assert!(
-            parsed[0].1.contains("INJECTED"),
-            "value should contain the literal injection attempt, not execute it"
-        );
-    }
-
     #[test]
     fn test_ironclaw_env_path() {
         let path = ironclaw_env_path();
@@ -493,91 +385,4 @@ INJECTED="pwned"#;
         // Nothing should happen
         assert!(!env_path.exists());
     }
-
-    #[test]
-    fn test_save_bootstrap_env_multiple_vars() {
-        let dir = tempdir().unwrap();
-        let env_path = dir.path().join("nested").join(".env");
-
-        std::fs::create_dir_all(env_path.parent().unwrap()).unwrap();
-
-        let vars = [
-            ("DATABASE_BACKEND", "libsql"),
-            ("LIBSQL_PATH", "/home/user/.ironclaw/ironclaw.db"),
-        ];
-
-        // Write manually to the temp path (save_bootstrap_env uses the global path)
-        let mut content = String::new();
-        for (key, value) in &vars {
-            content.push_str(&format!("{}=\"{}\"\n", key, value));
-        }
-        std::fs::write(&env_path, &content).unwrap();
-
-        // Verify dotenvy can parse all entries
-        let parsed: Vec<(String, String)> = dotenvy::from_path_iter(&env_path)
-            .unwrap()
-            .filter_map(|r| r.ok())
-            .collect();
-        assert_eq!(parsed.len(), 2);
-        assert_eq!(
-            parsed[0],
-            ("DATABASE_BACKEND".to_string(), "libsql".to_string())
-        );
-        assert_eq!(
-            parsed[1],
-            (
-                "LIBSQL_PATH".to_string(),
-                "/home/user/.ironclaw/ironclaw.db".to_string()
-            )
-        );
-    }
-
-    #[test]
-    fn test_save_bootstrap_env_overwrites_previous() {
-        let dir = tempdir().unwrap();
-        let env_path = dir.path().join(".env");
-
-        // Write initial content
-        std::fs::write(&env_path, "DATABASE_URL=\"postgres://old\"\n").unwrap();
-
-        // Overwrite with new vars (simulating save_bootstrap_env behavior)
-        let content = "DATABASE_BACKEND=\"libsql\"\nLIBSQL_PATH=\"/new/path.db\"\n";
-        std::fs::write(&env_path, content).unwrap();
-
-        let parsed: Vec<(String, String)> = dotenvy::from_path_iter(&env_path)
-            .unwrap()
-            .filter_map(|r| r.ok())
-            .collect();
-        // Old DATABASE_URL should be gone
-        assert_eq!(parsed.len(), 2);
-        assert!(parsed.iter().all(|(k, _)| k != "DATABASE_URL"));
-    }
-
-    #[test]
-    fn test_onboard_completed_round_trips_through_env() {
-        let dir = tempdir().unwrap();
-        let env_path = dir.path().join(".env");
-
-        // Simulate what the wizard writes: bootstrap vars + ONBOARD_COMPLETED
-        let vars = [
-            ("DATABASE_BACKEND", "libsql"),
-            ("ONBOARD_COMPLETED", "true"),
-        ];
-        let mut content = String::new();
-        for (key, value) in &vars {
-            let escaped = value.replace('\\', "\\\\").replace('"', "\\\"");
-            content.push_str(&format!("{}=\"{}\"\n", key, escaped));
-        }
-        std::fs::write(&env_path, &content).unwrap();
-
-        // Verify dotenvy parses ONBOARD_COMPLETED correctly
-        let parsed: Vec<(String, String)> = dotenvy::from_path_iter(&env_path)
-            .unwrap()
-            .filter_map(|r| r.ok())
-            .collect();
-        assert_eq!(parsed.len(), 2);
-        let onboard = parsed.iter().find(|(k, _)| k == "ONBOARD_COMPLETED");
-        assert!(onboard.is_some(), "ONBOARD_COMPLETED must be present");
-        assert_eq!(onboard.unwrap().1, "true");
-    }
 }

src/channels/http.rs

@@ -12,7 +12,6 @@ use axum::{
 };
 use secrecy::ExposeSecret;
 use serde::{Deserialize, Serialize};
-use subtle::ConstantTimeEq;
 use tokio::sync::{RwLock, mpsc, oneshot};
 use tokio_stream::wrappers::ReceiverStream;
 use uuid::Uuid;
@@ -174,7 +173,7 @@ async fn webhook_handler(
     // Validate secret if configured
     if let Some(ref expected_secret) = state.webhook_secret {
         match &req.secret {
-            Some(provided) if bool::from(provided.as_bytes().ct_eq(expected_secret.as_bytes())) => {
+            Some(provided) if provided == expected_secret => {
                 // Secret matches, continue
             }
             Some(_) => {
@@ -357,89 +356,19 @@ impl Channel for HttpChannel {
 
 #[cfg(test)]
 mod tests {
-    use axum::body::Body;
-    use axum::http::Request;
-    use secrecy::SecretString;
-    use tower::ServiceExt;
-
     use super::*;
 
-    fn test_channel(secret: Option<&str>) -> HttpChannel {
-        HttpChannel::new(HttpConfig {
-            host: "127.0.0.1".to_string(),
-            port: 0,
-            webhook_secret: secret.map(|s| SecretString::from(s.to_string())),
-            user_id: "http".to_string(),
-        })
-    }
-
     #[tokio::test]
     async fn test_http_channel_requires_secret() {
-        let channel = test_channel(None);
+        let config = HttpConfig {
+            host: "127.0.0.1".to_string(),
+            port: 0,
+            webhook_secret: None,
+            user_id: "http".to_string(),
+        };
+
+        let channel = HttpChannel::new(config);
         let result = channel.start().await;
         assert!(result.is_err());
     }
-
-    #[tokio::test]
-    async fn webhook_correct_secret_returns_ok() {
-        let channel = test_channel(Some("test-secret-123"));
-        // Start the channel so the tx sender is populated (otherwise 503).
-        let _stream = channel.start().await.unwrap();
-        let app = channel.routes();
-
-        let body = serde_json::json!({
-            "content": "hello",
-            "secret": "test-secret-123"
-        });
-        let req = Request::builder()
-            .method("POST")
-            .uri("/webhook")
-            .header("content-type", "application/json")
-            .body(Body::from(serde_json::to_vec(&body).unwrap()))
-            .unwrap();
-
-        let resp = app.oneshot(req).await.unwrap();
-        assert_eq!(resp.status(), StatusCode::OK);
-    }
-
-    #[tokio::test]
-    async fn webhook_wrong_secret_returns_unauthorized() {
-        let channel = test_channel(Some("correct-secret"));
-        let _stream = channel.start().await.unwrap();
-        let app = channel.routes();
-
-        let body = serde_json::json!({
-            "content": "hello",
-            "secret": "wrong-secret"
-        });
-        let req = Request::builder()
-            .method("POST")
-            .uri("/webhook")
-            .header("content-type", "application/json")
-            .body(Body::from(serde_json::to_vec(&body).unwrap()))
-            .unwrap();
-
-        let resp = app.oneshot(req).await.unwrap();
-        assert_eq!(resp.status(), StatusCode::UNAUTHORIZED);
-    }
-
-    #[tokio::test]
-    async fn webhook_missing_secret_returns_unauthorized() {
-        let channel = test_channel(Some("correct-secret"));
-        let _stream = channel.start().await.unwrap();
-        let app = channel.routes();
-
-        let body = serde_json::json!({
-            "content": "hello"
-        });
-        let req = Request::builder()
-            .method("POST")
-            .uri("/webhook")
-            .header("content-type", "application/json")
-            .body(Body::from(serde_json::to_vec(&body).unwrap()))
-            .unwrap();
-
-        let resp = app.oneshot(req).await.unwrap();
-        assert_eq!(resp.status(), StatusCode::UNAUTHORIZED);
-    }
 }

src/channels/manager.rs

@@ -4,41 +4,24 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use futures::stream;
-use tokio::sync::{RwLock, mpsc};
+use tokio::sync::RwLock;
 
 use crate::channels::{Channel, IncomingMessage, MessageStream, OutgoingResponse, StatusUpdate};
 use crate::error::ChannelError;
 
 /// Manages multiple input channels and merges their message streams.
-///
-/// Includes an injection channel so background tasks (e.g., job monitors) can
-/// push messages into the agent loop without being a full `Channel` impl.
 pub struct ChannelManager {
     channels: Arc<RwLock<HashMap<String, Box<dyn Channel>>>>,
-    inject_tx: mpsc::Sender<IncomingMessage>,
-    /// Taken once in `start_all()` and merged into the stream.
-    inject_rx: tokio::sync::Mutex<Option<mpsc::Receiver<IncomingMessage>>>,
 }
 
 impl ChannelManager {
     /// Create a new channel manager.
     pub fn new() -> Self {
-        let (inject_tx, inject_rx) = mpsc::channel(64);
         Self {
             channels: Arc::new(RwLock::new(HashMap::new())),
-            inject_tx,
-            inject_rx: tokio::sync::Mutex::new(Some(inject_rx)),
         }
     }
 
-    /// Get a clone of the injection sender.
-    ///
-    /// Background tasks (like job monitors) use this to push messages into the
-    /// agent loop without being a full `Channel` implementation.
-    pub fn inject_sender(&self) -> mpsc::Sender<IncomingMessage> {
-        self.inject_tx.clone()
-    }
-
     /// Add a channel to the manager.
     pub fn add(&mut self, channel: Box<dyn Channel>) {
         let name = channel.name().to_string();
@@ -53,12 +36,9 @@ impl ChannelManager {
     }
 
     /// Start all channels and return a merged stream of messages.
-    ///
-    /// Also merges the injection channel so background tasks can push messages
-    /// into the same stream.
     pub async fn start_all(&self) -> Result<MessageStream, ChannelError> {
         let channels = self.channels.read().await;
-        let mut streams: Vec<MessageStream> = Vec::new();
+        let mut streams = Vec::new();
 
         for (name, channel) in channels.iter() {
             match channel.start().await {
@@ -80,13 +60,6 @@ impl ChannelManager {
             });
         }
 
-        // Take the injection receiver (can only be taken once)
-        if let Some(inject_rx) = self.inject_rx.lock().await.take() {
-            let inject_stream = tokio_stream::wrappers::ReceiverStream::new(inject_rx);
-            streams.push(Box::pin(inject_stream));
-            tracing::debug!("Injection channel merged into message stream");
-        }
-
         // Merge all streams into one
         let merged = stream::select_all(streams);
         Ok(Box::pin(merged))

src/channels/repl.rs

@@ -184,8 +184,6 @@ pub struct ReplChannel {
     debug_mode: Arc<AtomicBool>,
     /// Whether we're currently streaming (chunks have been printed without a trailing newline).
     is_streaming: Arc<AtomicBool>,
-    /// When true, the one-liner startup banner is suppressed (boot screen shown instead).
-    suppress_banner: Arc<AtomicBool>,
 }
 
 impl ReplChannel {
@@ -195,7 +193,6 @@ impl ReplChannel {
             single_message: None,
             debug_mode: Arc::new(AtomicBool::new(false)),
             is_streaming: Arc::new(AtomicBool::new(false)),
-            suppress_banner: Arc::new(AtomicBool::new(false)),
         }
     }
 
@@ -205,15 +202,9 @@ impl ReplChannel {
             single_message: Some(message),
             debug_mode: Arc::new(AtomicBool::new(false)),
             is_streaming: Arc::new(AtomicBool::new(false)),
-            suppress_banner: Arc::new(AtomicBool::new(false)),
         }
     }
 
-    /// Suppress the one-liner startup banner (boot screen will be shown instead).
-    pub fn suppress_banner(&self) {
-        self.suppress_banner.store(true, Ordering::Relaxed);
-    }
-
     fn is_debug(&self) -> bool {
         self.debug_mode.load(Ordering::Relaxed)
     }
@@ -273,7 +264,6 @@ impl Channel for ReplChannel {
         let (tx, rx) = mpsc::channel(32);
         let single_message = self.single_message.clone();
         let debug_mode = Arc::clone(&self.debug_mode);
-        let suppress_banner = Arc::clone(&self.suppress_banner);
 
         std::thread::spawn(move || {
             // Single message mode: send it and return
@@ -308,10 +298,8 @@ impl Channel for ReplChannel {
             }
             let _ = rl.load_history(&hist_path);
 
-            if !suppress_banner.load(Ordering::Relaxed) {
-                println!("\x1b[1mIronClaw\x1b[0m  /help for commands, /quit to exit");
-                println!();
-            }
+            println!("\x1b[1mIronClaw\x1b[0m  /help for commands, /quit to exit");
+            println!();
 
             loop {
                 let prompt = if debug_mode.load(Ordering::Relaxed) {
@@ -330,13 +318,7 @@ impl Channel for ReplChannel {
                         // Handle local REPL commands (only commands that need
                         // immediate local handling stay here)
                         match line.to_lowercase().as_str() {
-                            "/quit" | "/exit" => {
-                                // Forward shutdown command so the agent loop exits even
-                                // when other channels (e.g. web gateway) are still active.
-                                let msg = IncomingMessage::new("repl", "default", "/quit");
-                                let _ = tx.blocking_send(msg);
-                                break;
-                            }
+                            "/quit" | "/exit" => break,
                             "/help" => {
                                 print_help();
                                 continue;

src/channels/wasm/host.rs

@@ -300,51 +300,6 @@ impl ChannelHostState {
     }
 }
 
-/// In-memory workspace store for WASM channels.
-///
-/// Persists workspace writes across callback invocations within a single
-/// channel lifetime. This allows WASM channels to maintain state (e.g.,
-/// Telegram polling offsets) between poll ticks without requiring a
-/// full database-backed workspace.
-///
-/// Uses `std::sync::RwLock` (not tokio) because WASM execution runs
-/// inside `spawn_blocking`.
-pub struct ChannelWorkspaceStore {
-    data: std::sync::RwLock<std::collections::HashMap<String, String>>,
-}
-
-impl ChannelWorkspaceStore {
-    /// Create a new empty workspace store.
-    pub fn new() -> Self {
-        Self {
-            data: std::sync::RwLock::new(std::collections::HashMap::new()),
-        }
-    }
-
-    /// Commit pending writes from a callback execution into the store.
-    pub fn commit_writes(&self, writes: &[PendingWorkspaceWrite]) {
-        if writes.is_empty() {
-            return;
-        }
-        if let Ok(mut data) = self.data.write() {
-            for write in writes {
-                tracing::debug!(
-                    path = %write.path,
-                    content_len = write.content.len(),
-                    "Committing workspace write to channel store"
-                );
-                data.insert(write.path.clone(), write.content.clone());
-            }
-        }
-    }
-}
-
-impl crate::tools::wasm::WorkspaceReader for ChannelWorkspaceStore {
-    fn read(&self, path: &str) -> Option<String> {
-        self.data.read().ok()?.get(path).cloned()
-    }
-}
-
 /// Rate limiter for channel message emission.
 ///
 /// Tracks emission rates across multiple executions.
@@ -542,56 +497,4 @@ mod tests {
 
         assert_eq!(state.channel_name(), "telegram");
     }
-
-    #[test]
-    fn test_channel_workspace_store_commit_and_read() {
-        use crate::channels::wasm::host::{ChannelWorkspaceStore, PendingWorkspaceWrite};
-        use crate::tools::wasm::WorkspaceReader;
-
-        let store = ChannelWorkspaceStore::new();
-
-        // Initially empty
-        assert!(store.read("channels/telegram/offset").is_none());
-
-        // Commit some writes
-        let writes = vec![
-            PendingWorkspaceWrite {
-                path: "channels/telegram/offset".to_string(),
-                content: "103".to_string(),
-            },
-            PendingWorkspaceWrite {
-                path: "channels/telegram/state.json".to_string(),
-                content: r#"{"ok":true}"#.to_string(),
-            },
-        ];
-        store.commit_writes(&writes);
-
-        // Should be readable
-        assert_eq!(
-            store.read("channels/telegram/offset"),
-            Some("103".to_string())
-        );
-        assert_eq!(
-            store.read("channels/telegram/state.json"),
-            Some(r#"{"ok":true}"#.to_string())
-        );
-
-        // Overwrite a value
-        let writes2 = vec![PendingWorkspaceWrite {
-            path: "channels/telegram/offset".to_string(),
-            content: "200".to_string(),
-        }];
-        store.commit_writes(&writes2);
-        assert_eq!(
-            store.read("channels/telegram/offset"),
-            Some("200".to_string())
-        );
-
-        // Empty writes are a no-op
-        store.commit_writes(&[]);
-        assert_eq!(
-            store.read("channels/telegram/offset"),
-            Some("200".to_string())
-        );
-    }
 }

src/channels/wasm/wrapper.rs

@@ -42,9 +42,7 @@ use wasmtime_wasi::{ResourceTable, WasiCtx, WasiCtxBuilder, WasiView};
 
 use crate::channels::wasm::capabilities::ChannelCapabilities;
 use crate::channels::wasm::error::WasmChannelError;
-use crate::channels::wasm::host::{
-    ChannelEmitRateLimiter, ChannelHostState, ChannelWorkspaceStore, EmittedMessage,
-};
+use crate::channels::wasm::host::{ChannelEmitRateLimiter, ChannelHostState, EmittedMessage};
 use crate::channels::wasm::router::RegisteredEndpoint;
 use crate::channels::wasm::runtime::{PreparedChannelModule, WasmChannelRuntime};
 use crate::channels::wasm::schema::ChannelConfig;
@@ -549,10 +547,6 @@ pub struct WasmChannel {
 
     /// Pairing store for DM pairing (guest access control).
     pairing_store: Arc<PairingStore>,
-
-    /// In-memory workspace store persisting writes across callback invocations.
-    /// Ensures WASM channels can maintain state (e.g., polling offsets) between ticks.
-    workspace_store: Arc<ChannelWorkspaceStore>,
 }
 
 impl WasmChannel {
@@ -583,7 +577,6 @@ impl WasmChannel {
             credentials: Arc::new(RwLock::new(HashMap::new())),
             typing_task: RwLock::new(None),
             pairing_store,
-            workspace_store: Arc::new(ChannelWorkspaceStore::new()),
         }
     }
 
@@ -641,26 +634,6 @@ impl WasmChannel {
         self.endpoints.read().await.clone()
     }
 
-    /// Inject the workspace store as the reader into a capabilities clone.
-    ///
-    /// Ensures `workspace_read` capability is present with the store as its reader,
-    /// so WASM callbacks can read previously written workspace state.
-    fn inject_workspace_reader(
-        capabilities: &ChannelCapabilities,
-        store: &Arc<ChannelWorkspaceStore>,
-    ) -> ChannelCapabilities {
-        let mut caps = capabilities.clone();
-        let ws_cap = caps
-            .tool_capabilities
-            .workspace_read
-            .get_or_insert_with(|| crate::tools::wasm::WorkspaceCapability {
-                allowed_prefixes: Vec::new(),
-                reader: None,
-            });
-        ws_cap.reader = Some(Arc::clone(store) as Arc<dyn crate::tools::wasm::WorkspaceReader>);
-        caps
-    }
-
     /// Add channel host functions to the linker using generated bindings.
     ///
     /// Uses the wasmtime::component::bindgen! generated `add_to_linker` function
@@ -792,13 +765,12 @@ impl WasmChannel {
 
         let runtime = Arc::clone(&self.runtime);
         let prepared = Arc::clone(&self.prepared);
-        let capabilities = Self::inject_workspace_reader(&self.capabilities, &self.workspace_store);
+        let capabilities = self.capabilities.clone();
         let config_json = self.config_json.read().await.clone();
         let timeout = self.runtime.config().callback_timeout;
         let channel_name = self.name.clone();
         let credentials = self.get_credentials().await;
         let pairing_store = self.pairing_store.clone();
-        let workspace_store = self.workspace_store.clone();
 
         // Execute in blocking task with timeout
         let result = tokio::time::timeout(timeout, async move {
@@ -829,13 +801,8 @@ impl WasmChannel {
                     }
                 };
 
-                let mut host_state =
+                let host_state =
                     Self::extract_host_state(&mut store, &prepared.name, &capabilities);
-
-                // Commit pending workspace writes to the persistent store
-                let pending_writes = host_state.take_pending_writes();
-                workspace_store.commit_writes(&pending_writes);
-
                 Ok((config, host_state))
             })
             .await
@@ -930,11 +897,10 @@ impl WasmChannel {
 
         let runtime = Arc::clone(&self.runtime);
         let prepared = Arc::clone(&self.prepared);
-        let capabilities = Self::inject_workspace_reader(&self.capabilities, &self.workspace_store);
+        let capabilities = self.capabilities.clone();
         let timeout = self.runtime.config().callback_timeout;
         let credentials = self.get_credentials().await;
         let pairing_store = self.pairing_store.clone();
-        let workspace_store = self.workspace_store.clone();
 
         // Prepare request data
         let method = method.to_string();
@@ -974,13 +940,8 @@ impl WasmChannel {
                     .map_err(|e| Self::map_wasm_error(e, &prepared.name, prepared.limits.fuel))?;
 
                 let response = convert_http_response(wit_response);
-                let mut host_state =
+                let host_state =
                     Self::extract_host_state(&mut store, &prepared.name, &capabilities);
-
-                // Commit pending workspace writes to the persistent store
-                let pending_writes = host_state.take_pending_writes();
-                workspace_store.commit_writes(&pending_writes);
-
                 Ok((response, host_state))
             })
             .await
@@ -1028,12 +989,11 @@ impl WasmChannel {
 
         let runtime = Arc::clone(&self.runtime);
         let prepared = Arc::clone(&self.prepared);
-        let capabilities = Self::inject_workspace_reader(&self.capabilities, &self.workspace_store);
+        let capabilities = self.capabilities.clone();
         let timeout = self.runtime.config().callback_timeout;
         let channel_name = self.name.clone();
         let credentials = self.get_credentials().await;
         let pairing_store = self.pairing_store.clone();
-        let workspace_store = self.workspace_store.clone();
 
         // Execute in blocking task with timeout
         let result = tokio::time::timeout(timeout, async move {
@@ -1053,13 +1013,8 @@ impl WasmChannel {
                     .call_on_poll(&mut store)
                     .map_err(|e| Self::map_wasm_error(e, &prepared.name, prepared.limits.fuel))?;
 
-                let mut host_state =
+                let host_state =
                     Self::extract_host_state(&mut store, &prepared.name, &capabilities);
-
-                // Commit pending workspace writes to the persistent store
-                let pending_writes = host_state.take_pending_writes();
-                workspace_store.commit_writes(&pending_writes);
-
                 Ok(((), host_state))
             })
             .await
@@ -1546,7 +1501,6 @@ impl WasmChannel {
         let credentials = self.credentials.clone();
         let pairing_store = self.pairing_store.clone();
         let callback_timeout = self.runtime.config().callback_timeout;
-        let workspace_store = self.workspace_store.clone();
 
         tokio::spawn(async move {
             let mut interval_timer = tokio::time::interval(interval);
@@ -1569,7 +1523,6 @@ impl WasmChannel {
                             &credentials,
                             pairing_store.clone(),
                             callback_timeout,
-                            &workspace_store,
                         ).await;
 
                         match result {
@@ -1612,10 +1565,7 @@ impl WasmChannel {
 
     /// Execute a single poll callback with a fresh WASM instance.
     ///
-    /// Returns any emitted messages from the callback. Pending workspace writes
-    /// are committed to the shared `ChannelWorkspaceStore` so state persists
-    /// across poll ticks (e.g., Telegram polling offset).
-    #[allow(clippy::too_many_arguments)]
+    /// Returns any emitted messages from the callback.
     async fn execute_poll(
         channel_name: &str,
         runtime: &Arc<WasmChannelRuntime>,
@@ -1624,7 +1574,6 @@ impl WasmChannel {
         credentials: &RwLock<HashMap<String, String>>,
         pairing_store: Arc<PairingStore>,
         timeout: Duration,
-        workspace_store: &Arc<ChannelWorkspaceStore>,
     ) -> Result<Vec<EmittedMessage>, WasmChannelError> {
         // Skip if no WASM bytes (testing mode)
         if prepared.component_bytes.is_empty() {
@@ -1637,10 +1586,9 @@ impl WasmChannel {
 
         let runtime = Arc::clone(runtime);
         let prepared = Arc::clone(prepared);
-        let capabilities = Self::inject_workspace_reader(capabilities, workspace_store);
+        let capabilities = capabilities.clone();
         let credentials_snapshot = credentials.read().await.clone();
         let channel_name_owned = channel_name.to_string();
-        let workspace_store = Arc::clone(workspace_store);
 
         // Execute in blocking task with timeout
         let result = tokio::time::timeout(timeout, async move {
@@ -1660,13 +1608,8 @@ impl WasmChannel {
                     .call_on_poll(&mut store)
                     .map_err(|e| Self::map_wasm_error(e, &prepared.name, prepared.limits.fuel))?;
 
-                let mut host_state =
+                let host_state =
                     Self::extract_host_state(&mut store, &prepared.name, &capabilities);
-
-                // Commit pending workspace writes to the persistent store
-                let pending_writes = host_state.take_pending_writes();
-                workspace_store.commit_writes(&pending_writes);
-
                 Ok(host_state)
             })
             .await
@@ -2287,8 +2230,6 @@ mod tests {
         let credentials = Arc::new(tokio::sync::RwLock::new(std::collections::HashMap::new()));
         let timeout = std::time::Duration::from_secs(5);
 
-        let workspace_store = Arc::new(crate::channels::wasm::host::ChannelWorkspaceStore::new());
-
         let result = WasmChannel::execute_poll(
             "poll-test",
             &runtime,
@@ -2297,7 +2238,6 @@ mod tests {
             &credentials,
             Arc::new(PairingStore::new()),
             timeout,
-            &workspace_store,
         )
         .await;
 

src/channels/web/handlers/chat.rs

@@ -1,633 +0,0 @@
-//! Chat handlers: send, approval, auth, SSE events, WebSocket, history, threads.
-
-use std::sync::Arc;
-
-use axum::{
-    Json,
-    extract::{Query, State, WebSocketUpgrade},
-    http::StatusCode,
-    response::IntoResponse,
-};
-use serde::Deserialize;
-use uuid::Uuid;
-
-use crate::channels::IncomingMessage;
-use crate::channels::web::server::GatewayState;
-use crate::channels::web::types::*;
-
-pub async fn chat_send_handler(
-    State(state): State<Arc<GatewayState>>,
-    Json(req): Json<SendMessageRequest>,
-) -> Result<(StatusCode, Json<SendMessageResponse>), (StatusCode, String)> {
-    if !state.chat_rate_limiter.check() {
-        return Err((
-            StatusCode::TOO_MANY_REQUESTS,
-            "Rate limit exceeded. Try again shortly.".to_string(),
-        ));
-    }
-
-    let mut msg = IncomingMessage::new("gateway", &state.user_id, &req.content);
-
-    if let Some(ref thread_id) = req.thread_id {
-        msg = msg.with_thread(thread_id);
-        msg = msg.with_metadata(serde_json::json!({"thread_id": thread_id}));
-    }
-
-    let msg_id = msg.id;
-
-    let tx_guard = state.msg_tx.read().await;
-    let tx = tx_guard.as_ref().ok_or((
-        StatusCode::SERVICE_UNAVAILABLE,
-        "Channel not started".to_string(),
-    ))?;
-
-    tx.send(msg).await.map_err(|_| {
-        (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            "Channel closed".to_string(),
-        )
-    })?;
-
-    Ok((
-        StatusCode::ACCEPTED,
-        Json(SendMessageResponse {
-            message_id: msg_id,
-            status: "accepted",
-        }),
-    ))
-}
-
-pub async fn chat_approval_handler(
-    State(state): State<Arc<GatewayState>>,
-    Json(req): Json<ApprovalRequest>,
-) -> Result<(StatusCode, Json<SendMessageResponse>), (StatusCode, String)> {
-    let (approved, always) = match req.action.as_str() {
-        "approve" => (true, false),
-        "always" => (true, true),
-        "deny" => (false, false),
-        other => {
-            return Err((
-                StatusCode::BAD_REQUEST,
-                format!("Unknown action: {}", other),
-            ));
-        }
-    };
-
-    let request_id = Uuid::parse_str(&req.request_id).map_err(|_| {
-        (
-            StatusCode::BAD_REQUEST,
-            "Invalid request_id (expected UUID)".to_string(),
-        )
-    })?;
-
-    // Build a structured ExecApproval submission as JSON, sent through the
-    // existing message pipeline so the agent loop picks it up.
-    let approval = crate::agent::submission::Submission::ExecApproval {
-        request_id,
-        approved,
-        always,
-    };
-    let content = serde_json::to_string(&approval).map_err(|e| {
-        (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            format!("Failed to serialize approval: {}", e),
-        )
-    })?;
-
-    let mut msg = IncomingMessage::new("gateway", &state.user_id, content);
-
-    if let Some(ref thread_id) = req.thread_id {
-        msg = msg.with_thread(thread_id);
-    }
-
-    let msg_id = msg.id;
-
-    let tx_guard = state.msg_tx.read().await;
-    let tx = tx_guard.as_ref().ok_or((
-        StatusCode::SERVICE_UNAVAILABLE,
-        "Channel not started".to_string(),
-    ))?;
-
-    tx.send(msg).await.map_err(|_| {
-        (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            "Channel closed".to_string(),
-        )
-    })?;
-
-    Ok((
-        StatusCode::ACCEPTED,
-        Json(SendMessageResponse {
-            message_id: msg_id,
-            status: "accepted",
-        }),
-    ))
-}
-
-/// Submit an auth token directly to the extension manager, bypassing the message pipeline.
-///
-/// The token never touches the LLM, chat history, or SSE stream.
-pub async fn chat_auth_token_handler(
-    State(state): State<Arc<GatewayState>>,
-    Json(req): Json<AuthTokenRequest>,
-) -> Result<Json<ActionResponse>, (StatusCode, String)> {
-    let ext_mgr = state.extension_manager.as_ref().ok_or((
-        StatusCode::SERVICE_UNAVAILABLE,
-        "Extension manager not available".to_string(),
-    ))?;
-
-    let result = ext_mgr
-        .auth(&req.extension_name, Some(&req.token))
-        .await
-        .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
-
-    if result.status == "authenticated" {
-        // Auto-activate so tools are available immediately
-        let msg = match ext_mgr.activate(&req.extension_name).await {
-            Ok(r) => format!(
-                "{} authenticated ({} tools loaded)",
-                req.extension_name,
-                r.tools_loaded.len()
-            ),
-            Err(e) => format!(
-                "{} authenticated but activation failed: {}",
-                req.extension_name, e
-            ),
-        };
-
-        // Clear auth mode on the active thread
-        clear_auth_mode(&state).await;
-
-        state.sse.broadcast(SseEvent::AuthCompleted {
-            extension_name: req.extension_name,
-            success: true,
-            message: msg.clone(),
-        });
-
-        Ok(Json(ActionResponse::ok(msg)))
-    } else {
-        // Re-emit auth_required for retry
-        state.sse.broadcast(SseEvent::AuthRequired {
-            extension_name: req.extension_name.clone(),
-            instructions: result.instructions.clone(),
-            auth_url: result.auth_url.clone(),
-            setup_url: result.setup_url.clone(),
-        });
-        Ok(Json(ActionResponse::fail(
-            result
-                .instructions
-                .unwrap_or_else(|| "Invalid token".to_string()),
-        )))
-    }
-}
-
-/// Cancel an in-progress auth flow.
-pub async fn chat_auth_cancel_handler(
-    State(state): State<Arc<GatewayState>>,
-    Json(_req): Json<AuthCancelRequest>,
-) -> Result<Json<ActionResponse>, (StatusCode, String)> {
-    clear_auth_mode(&state).await;
-    Ok(Json(ActionResponse::ok("Auth cancelled")))
-}
-
-/// Clear pending auth mode on the active thread.
-pub async fn clear_auth_mode(state: &GatewayState) {
-    if let Some(ref sm) = state.session_manager {
-        let session = sm.get_or_create_session(&state.user_id).await;
-        let mut sess = session.lock().await;
-        if let Some(thread_id) = sess.active_thread
-            && let Some(thread) = sess.threads.get_mut(&thread_id)
-        {
-            thread.pending_auth = None;
-        }
-    }
-}
-
-pub async fn chat_events_handler(
-    State(state): State<Arc<GatewayState>>,
-) -> Result<impl IntoResponse, (StatusCode, String)> {
-    state.sse.subscribe().ok_or((
-        StatusCode::SERVICE_UNAVAILABLE,
-        "Too many connections".to_string(),
-    ))
-}
-
-pub async fn chat_ws_handler(
-    headers: axum::http::HeaderMap,
-    ws: WebSocketUpgrade,
-    State(state): State<Arc<GatewayState>>,
-) -> Result<impl IntoResponse, (StatusCode, String)> {
-    // Validate Origin header to prevent cross-site WebSocket hijacking.
-    let origin = headers
-        .get("origin")
-        .and_then(|v| v.to_str().ok())
-        .ok_or_else(|| {
-            (
-                StatusCode::FORBIDDEN,
-                "WebSocket Origin header required".to_string(),
-            )
-        })?;
-
-    let host = origin
-        .strip_prefix("http://")
-        .or_else(|| origin.strip_prefix("https://"))
-        .and_then(|rest| rest.split(':').next()?.split('/').next())
-        .unwrap_or("");
-
-    let is_local = matches!(host, "localhost" | "127.0.0.1" | "[::1]");
-    if !is_local {
-        return Err((
-            StatusCode::FORBIDDEN,
-            "WebSocket origin not allowed".to_string(),
-        ));
-    }
-    Ok(ws.on_upgrade(move |socket| crate::channels::web::ws::handle_ws_connection(socket, state)))
-}
-
-#[derive(Deserialize)]
-pub struct HistoryQuery {
-    pub thread_id: Option<String>,
-    pub limit: Option<usize>,
-    pub before: Option<String>,
-}
-
-pub async fn chat_history_handler(
-    State(state): State<Arc<GatewayState>>,
-    Query(query): Query<HistoryQuery>,
-) -> Result<Json<HistoryResponse>, (StatusCode, String)> {
-    let session_manager = state.session_manager.as_ref().ok_or((
-        StatusCode::SERVICE_UNAVAILABLE,
-        "Session manager not available".to_string(),
-    ))?;
-
-    let session = session_manager.get_or_create_session(&state.user_id).await;
-    let sess = session.lock().await;
-
-    let limit = query.limit.unwrap_or(50);
-    let before_cursor = query
-        .before
-        .as_deref()
-        .map(|s| {
-            chrono::DateTime::parse_from_rfc3339(s)
-                .map(|dt| dt.with_timezone(&chrono::Utc))
-                .map_err(|_| {
-                    (
-                        StatusCode::BAD_REQUEST,
-                        "Invalid 'before' timestamp".to_string(),
-                    )
-                })
-        })
-        .transpose()?;
-
-    // Find the thread
-    let thread_id = if let Some(ref tid) = query.thread_id {
-        Uuid::parse_str(tid)
-            .map_err(|_| (StatusCode::BAD_REQUEST, "Invalid thread_id".to_string()))?
-    } else {
-        sess.active_thread
-            .ok_or((StatusCode::NOT_FOUND, "No active thread".to_string()))?
-    };
-
-    // Verify the thread belongs to the authenticated user before returning any data.
-    if query.thread_id.is_some()
-        && let Some(ref store) = state.store
-    {
-        let owned = store
-            .conversation_belongs_to_user(thread_id, &state.user_id)
-            .await
-            .unwrap_or(false);
-        if !owned && !sess.threads.contains_key(&thread_id) {
-            return Err((StatusCode::NOT_FOUND, "Thread not found".to_string()));
-        }
-    }
-
-    // For paginated requests (before cursor set), always go to DB
-    if before_cursor.is_some()
-        && let Some(ref store) = state.store
-    {
-        let (messages, has_more) = store
-            .list_conversation_messages_paginated(thread_id, before_cursor, limit as i64)
-            .await
-            .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
-
-        let oldest_timestamp = messages.first().map(|m| m.created_at.to_rfc3339());
-        let turns = build_turns_from_db_messages(&messages);
-        return Ok(Json(HistoryResponse {
-            thread_id,
-            turns,
-            has_more,
-            oldest_timestamp,
-        }));
-    }
-
-    // Try in-memory first (freshest data for active threads)
-    if let Some(thread) = sess.threads.get(&thread_id)
-        && !thread.turns.is_empty()
-    {
-        let turns: Vec<TurnInfo> = thread
-            .turns
-            .iter()
-            .map(|t| TurnInfo {
-                turn_number: t.turn_number,
-                user_input: t.user_input.clone(),
-                response: t.response.clone(),
-                state: format!("{:?}", t.state),
-                started_at: t.started_at.to_rfc3339(),
-                completed_at: t.completed_at.map(|dt| dt.to_rfc3339()),
-                tool_calls: t
-                    .tool_calls
-                    .iter()
-                    .map(|tc| ToolCallInfo {
-                        name: tc.name.clone(),
-                        has_result: tc.result.is_some(),
-                        has_error: tc.error.is_some(),
-                    })
-                    .collect(),
-            })
-            .collect();
-
-        return Ok(Json(HistoryResponse {
-            thread_id,
-            turns,
-            has_more: false,
-            oldest_timestamp: None,
-        }));
-    }
-
-    // Fall back to DB for historical threads not in memory (paginated)
-    if let Some(ref store) = state.store {
-        let (messages, has_more) = store
-            .list_conversation_messages_paginated(thread_id, None, limit as i64)
-            .await
-            .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
-
-        if !messages.is_empty() {
-            let oldest_timestamp = messages.first().map(|m| m.created_at.to_rfc3339());
-            let turns = build_turns_from_db_messages(&messages);
-            return Ok(Json(HistoryResponse {
-                thread_id,
-                turns,
-                has_more,
-                oldest_timestamp,
-            }));
-        }
-    }
-
-    // Empty thread (just created, no messages yet)
-    Ok(Json(HistoryResponse {
-        thread_id,
-        turns: Vec::new(),
-        has_more: false,
-        oldest_timestamp: None,
-    }))
-}
-
-/// Build TurnInfo pairs from flat DB messages (alternating user/assistant).
-pub fn build_turns_from_db_messages(
-    messages: &[crate::history::ConversationMessage],
-) -> Vec<TurnInfo> {
-    let mut turns = Vec::new();
-    let mut turn_number = 0;
-    let mut iter = messages.iter().peekable();
-
-    while let Some(msg) = iter.next() {
-        if msg.role == "user" {
-            let mut turn = TurnInfo {
-                turn_number,
-                user_input: msg.content.clone(),
-                response: None,
-                state: "Completed".to_string(),
-                started_at: msg.created_at.to_rfc3339(),
-                completed_at: None,
-                tool_calls: Vec::new(),
-            };
-
-            // Check if next message is an assistant response
-            if let Some(next) = iter.peek()
-                && next.role == "assistant"
-            {
-                let assistant_msg = iter.next().expect("peeked");
-                turn.response = Some(assistant_msg.content.clone());
-                turn.completed_at = Some(assistant_msg.created_at.to_rfc3339());
-            }
-
-            // Incomplete turn (user message without response)
-            if turn.response.is_none() {
-                turn.state = "Failed".to_string();
-            }
-
-            turns.push(turn);
-            turn_number += 1;
-        }
-    }
-
-    turns
-}
-
-pub async fn chat_threads_handler(
-    State(state): State<Arc<GatewayState>>,
-) -> Result<Json<ThreadListResponse>, (StatusCode, String)> {
-    let session_manager = state.session_manager.as_ref().ok_or((
-        StatusCode::SERVICE_UNAVAILABLE,
-        "Session manager not available".to_string(),
-    ))?;
-
-    let session = session_manager.get_or_create_session(&state.user_id).await;
-    let sess = session.lock().await;
-
-    // Try DB first for persistent thread list
-    if let Some(ref store) = state.store {
-        // Auto-create assistant thread if it doesn't exist
-        let assistant_id = store
-            .get_or_create_assistant_conversation(&state.user_id, "gateway")
-            .await
-            .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
-
-        if let Ok(summaries) = store
-            .list_conversations_with_preview(&state.user_id, "gateway", 50)
-            .await
-        {
-            let mut assistant_thread = None;
-            let mut threads = Vec::new();
-
-            for s in &summaries {
-                let info = ThreadInfo {
-                    id: s.id,
-                    state: "Idle".to_string(),
-                    turn_count: (s.message_count / 2).max(0) as usize,
-                    created_at: s.started_at.to_rfc3339(),
-                    updated_at: s.last_activity.to_rfc3339(),
-                    title: s.title.clone(),
-                    thread_type: s.thread_type.clone(),
-                };
-
-                if s.id == assistant_id {
-                    assistant_thread = Some(info);
-                } else {
-                    threads.push(info);
-                }
-            }
-
-            // If assistant wasn't in the list (0 messages), synthesize it
-            if assistant_thread.is_none() {
-                assistant_thread = Some(ThreadInfo {
-                    id: assistant_id,
-                    state: "Idle".to_string(),
-                    turn_count: 0,
-                    created_at: chrono::Utc::now().to_rfc3339(),
-                    updated_at: chrono::Utc::now().to_rfc3339(),
-                    title: None,
-                    thread_type: Some("assistant".to_string()),
-                });
-            }
-
-            return Ok(Json(ThreadListResponse {
-                assistant_thread,
-                threads,
-                active_thread: sess.active_thread,
-            }));
-        }
-    }
-
-    // Fallback: in-memory only (no assistant thread without DB)
-    let threads: Vec<ThreadInfo> = sess
-        .threads
-        .values()
-        .map(|t| ThreadInfo {
-            id: t.id,
-            state: format!("{:?}", t.state),
-            turn_count: t.turns.len(),
-            created_at: t.created_at.to_rfc3339(),
-            updated_at: t.updated_at.to_rfc3339(),
-            title: None,
-            thread_type: None,
-        })
-        .collect();
-
-    Ok(Json(ThreadListResponse {
-        assistant_thread: None,
-        threads,
-        active_thread: sess.active_thread,
-    }))
-}
-
-pub async fn chat_new_thread_handler(
-    State(state): State<Arc<GatewayState>>,
-) -> Result<Json<ThreadInfo>, (StatusCode, String)> {
-    let session_manager = state.session_manager.as_ref().ok_or((
-        StatusCode::SERVICE_UNAVAILABLE,
-        "Session manager not available".to_string(),
-    ))?;
-
-    let session = session_manager.get_or_create_session(&state.user_id).await;
-    let mut sess = session.lock().await;
-    let thread = sess.create_thread();
-    let thread_id = thread.id;
-    let info = ThreadInfo {
-        id: thread.id,
-        state: format!("{:?}", thread.state),
-        turn_count: thread.turns.len(),
-        created_at: thread.created_at.to_rfc3339(),
-        updated_at: thread.updated_at.to_rfc3339(),
-        title: None,
-        thread_type: Some("thread".to_string()),
-    };
-
-    // Persist the empty conversation row with thread_type metadata
-    if let Some(ref store) = state.store {
-        let store = Arc::clone(store);
-        let user_id = state.user_id.clone();
-        tokio::spawn(async move {
-            if let Err(e) = store
-                .ensure_conversation(thread_id, "gateway", &user_id, None)
-                .await
-            {
-                tracing::warn!("Failed to persist new thread: {}", e);
-            }
-            let metadata_val = serde_json::json!("thread");
-            if let Err(e) = store
-                .update_conversation_metadata_field(thread_id, "thread_type", &metadata_val)
-                .await
-            {
-                tracing::warn!("Failed to set thread_type metadata: {}", e);
-            }
-        });
-    }
-
-    Ok(Json(info))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_build_turns_from_db_messages_complete() {
-        let now = chrono::Utc::now();
-        let messages = vec![
-            crate::history::ConversationMessage {
-                id: Uuid::new_v4(),
-                role: "user".to_string(),
-                content: "Hello".to_string(),
-                created_at: now,
-            },
-            crate::history::ConversationMessage {
-                id: Uuid::new_v4(),
-                role: "assistant".to_string(),
-                content: "Hi there!".to_string(),
-                created_at: now + chrono::TimeDelta::seconds(1),
-            },
-            crate::history::ConversationMessage {
-                id: Uuid::new_v4(),
-                role: "user".to_string(),
-                content: "How are you?".to_string(),
-                created_at: now + chrono::TimeDelta::seconds(2),
-            },
-            crate::history::ConversationMessage {
-                id: Uuid::new_v4(),
-                role: "assistant".to_string(),
-                content: "Doing well!".to_string(),
-                created_at: now + chrono::TimeDelta::seconds(3),
-            },
-        ];
-
-        let turns = build_turns_from_db_messages(&messages);
-        assert_eq!(turns.len(), 2);
-        assert_eq!(turns[0].user_input, "Hello");
-        assert_eq!(turns[0].response.as_deref(), Some("Hi there!"));
-        assert_eq!(turns[0].state, "Completed");
-        assert_eq!(turns[1].user_input, "How are you?");
-        assert_eq!(turns[1].response.as_deref(), Some("Doing well!"));
-    }
-
-    #[test]
-    fn test_build_turns_from_db_messages_incomplete_last() {
-        let now = chrono::Utc::now();
-        let messages = vec![
-            crate::history::ConversationMessage {
-                id: Uuid::new_v4(),
-                role: "user".to_string(),
-                content: "Hello".to_string(),
-                created_at: now,
-            },
-            crate::history::ConversationMessage {
-                id: Uuid::new_v4(),
-                role: "assistant".to_string(),
-                content: "Hi!".to_string(),
-                created_at: now + chrono::TimeDelta::seconds(1),
-            },
-            crate::history::ConversationMessage {
-                id: Uuid::new_v4(),
-                role: "user".to_string(),
-                content: "Lost message".to_string(),
-                created_at: now + chrono::TimeDelta::seconds(2),
-            },
-        ];
-
-        let turns = build_turns_from_db_messages(&messages);
-        assert_eq!(turns.len(), 2);
-        assert_eq!(turns[1].user_input, "Lost message");
-        assert!(turns[1].response.is_none());
-        assert_eq!(turns[1].state, "Failed");
-    }
-}

src/channels/web/handlers/extensions.rs

@@ -1,153 +0,0 @@
-//! Extension management API handlers.
-
-use std::sync::Arc;
-
-use axum::{
-    Json,
-    extract::{Path, State},
-    http::StatusCode,
-};
-
-use crate::channels::web::server::GatewayState;
-use crate::channels::web::types::*;
-
-pub async fn extensions_list_handler(
-    State(state): State<Arc<GatewayState>>,
-) -> Result<Json<ExtensionListResponse>, (StatusCode, String)> {
-    let ext_mgr = state.extension_manager.as_ref().ok_or((
-        StatusCode::NOT_IMPLEMENTED,
-        "Extension manager not available (secrets store required)".to_string(),
-    ))?;
-
-    let installed = ext_mgr
-        .list(None)
-        .await
-        .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
-
-    let extensions = installed
-        .into_iter()
-        .map(|ext| ExtensionInfo {
-            name: ext.name,
-            kind: ext.kind.to_string(),
-            description: ext.description,
-            url: ext.url,
-            authenticated: ext.authenticated,
-            active: ext.active,
-            tools: ext.tools,
-        })
-        .collect();
-
-    Ok(Json(ExtensionListResponse { extensions }))
-}
-
-pub async fn extensions_tools_handler(
-    State(state): State<Arc<GatewayState>>,
-) -> Result<Json<ToolListResponse>, (StatusCode, String)> {
-    let registry = state.tool_registry.as_ref().ok_or((
-        StatusCode::SERVICE_UNAVAILABLE,
-        "Tool registry not available".to_string(),
-    ))?;
-
-    let definitions = registry.tool_definitions().await;
-    let tools = definitions
-        .into_iter()
-        .map(|td| ToolInfo {
-            name: td.name,
-            description: td.description,
-        })
-        .collect();
-
-    Ok(Json(ToolListResponse { tools }))
-}
-
-pub async fn extensions_install_handler(
-    State(state): State<Arc<GatewayState>>,
-    Json(req): Json<InstallExtensionRequest>,
-) -> Result<Json<ActionResponse>, (StatusCode, String)> {
-    let ext_mgr = state.extension_manager.as_ref().ok_or((
-        StatusCode::NOT_IMPLEMENTED,
-        "Extension manager not available (secrets store required)".to_string(),
-    ))?;
-
-    let kind_hint = req.kind.as_deref().and_then(|k| match k {
-        "mcp_server" => Some(crate::extensions::ExtensionKind::McpServer),
-        "wasm_tool" => Some(crate::extensions::ExtensionKind::WasmTool),
-        "wasm_channel" => Some(crate::extensions::ExtensionKind::WasmChannel),
-        _ => None,
-    });
-
-    match ext_mgr
-        .install(&req.name, req.url.as_deref(), kind_hint)
-        .await
-    {
-        Ok(result) => Ok(Json(ActionResponse::ok(result.message))),
-        Err(e) => Ok(Json(ActionResponse::fail(e.to_string()))),
-    }
-}
-
-pub async fn extensions_activate_handler(
-    State(state): State<Arc<GatewayState>>,
-    Path(name): Path<String>,
-) -> Result<Json<ActionResponse>, (StatusCode, String)> {
-    let ext_mgr = state.extension_manager.as_ref().ok_or((
-        StatusCode::NOT_IMPLEMENTED,
-        "Extension manager not available (secrets store required)".to_string(),
-    ))?;
-
-    match ext_mgr.activate(&name).await {
-        Ok(result) => Ok(Json(ActionResponse::ok(result.message))),
-        Err(activate_err) => {
-            let err_str = activate_err.to_string();
-            let needs_auth = err_str.contains("authentication")
-                || err_str.contains("401")
-                || err_str.contains("Unauthorized");
-
-            if !needs_auth {
-                return Ok(Json(ActionResponse::fail(err_str)));
-            }
-
-            // Activation failed due to auth; try authenticating first.
-            match ext_mgr.auth(&name, None).await {
-                Ok(auth_result) if auth_result.status == "authenticated" => {
-                    // Auth succeeded, retry activation.
-                    match ext_mgr.activate(&name).await {
-                        Ok(result) => Ok(Json(ActionResponse::ok(result.message))),
-                        Err(e) => Ok(Json(ActionResponse::fail(e.to_string()))),
-                    }
-                }
-                Ok(auth_result) => {
-                    // Auth in progress (OAuth URL or awaiting manual token).
-                    let mut resp = ActionResponse::fail(
-                        auth_result
-                            .instructions
-                            .clone()
-                            .unwrap_or_else(|| format!("'{}' requires authentication.", name)),
-                    );
-                    resp.auth_url = auth_result.auth_url;
-                    resp.awaiting_token = Some(auth_result.awaiting_token);
-                    resp.instructions = auth_result.instructions;
-                    Ok(Json(resp))
-                }
-                Err(auth_err) => Ok(Json(ActionResponse::fail(format!(
-                    "Authentication failed: {}",
-                    auth_err
-                )))),
-            }
-        }
-    }
-}
-
-pub async fn extensions_remove_handler(
-    State(state): State<Arc<GatewayState>>,
-    Path(name): Path<String>,
-) -> Result<Json<ActionResponse>, (StatusCode, String)> {
-    let ext_mgr = state.extension_manager.as_ref().ok_or((
-        StatusCode::NOT_IMPLEMENTED,
-        "Extension manager not available (secrets store required)".to_string(),
-    ))?;
-
-    match ext_mgr.remove(&name).await {
-        Ok(message) => Ok(Json(ActionResponse::ok(message))),
-        Err(e) => Ok(Json(ActionResponse::fail(e.to_string()))),
-    }
-}