diff --git a/.github/workflows/create-tag.yml b/.github/workflows/create-tag.yml index c131c84b2..8f24f2ae1 100644 --- a/.github/workflows/create-tag.yml +++ b/.github/workflows/create-tag.yml @@ -28,8 +28,7 @@ on: - provider-anthropic - provider-openai - provider-router - - session-inbox - - session-tree + - session - shell - storage - todo-worker diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 919a670c4..7f02861e6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,8 +21,7 @@ on: - 'provider-anthropic/v*' - 'provider-openai/v*' - 'provider-router/v*' - - 'session-inbox/v*' - - 'session-tree/v*' + - 'session/v*' - 'shell/v*' - 'iii-directory/v*' - 'storage/v*' diff --git a/README.md b/README.md index 9e9c5c103..3f4d5fe23 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ matching GitHub Release asset for the host's target triple. | Worker | Kind | Summary | |---|---|---| | [`auth-credentials`](auth-credentials/) | Rust | Provider credential vault under `auth::*` — API keys and OAuth tokens. | -| [`session-inbox`](session-inbox/) | Rust | Per-session inbox under `session-inbox::*` (push, drain, peek). | +| [`session`](session/) | Rust | Session storage under `session-tree::*` and per-session inbox under `session-inbox::*` (push, drain, peek). | | [`provider-router`](provider-router/) | Rust | `router::stream_assistant` provider router plus `router::abort` and `router::push_steering` / `push_followup` helpers. | | [`hook-fanout`](hook-fanout/) | Rust | Reusable publish-collect primitive under `hook-fanout::publish_collect` — fans an event to subscribers and merges replies. | | [`iii-lsp`](iii-lsp/) | Rust | Language Server for iii function ids, trigger configs, and worker discovery. Autocomplete/hover across JS/TS, Python, Rust. | @@ -28,7 +28,6 @@ matching GitHub Release asset for the host's target triple. | [`proof`](proof/) | Node | AI-driven browser testing — diffs changes, generates test plans, drives Playwright. | | [`provider-anthropic`](provider-anthropic/) | Rust | Native Anthropic Messages API streaming provider under `provider::anthropic::*`. | | [`provider-openai`](provider-openai/) | Rust | OpenAI Chat Completions provider under `provider::openai::*`. | -| [`session-tree`](session-tree/) | Rust | Session storage as a parent-id tree of typed entries under `session::*`. | | [`shell-bash`](shell-bash/) | Rust | Sandboxed shell execution under `shell::bash::*` — wraps the engine `sandbox::exec` primitive. | | [`shell-filesystem`](shell-filesystem/) | Rust | Sandboxed filesystem operations under `shell::fs::*` — read, write, list, stat, glob. | | [`turn-orchestrator`](turn-orchestrator/) | Rust | Durable `run::start` state machine driving each agent turn through provisioning, assistant, tools, steering, and tearing-down. | diff --git a/harness/ARCHITECTURE.md b/harness/ARCHITECTURE.md index e9551a30d..3705026a5 100644 --- a/harness/ARCHITECTURE.md +++ b/harness/ARCHITECTURE.md @@ -82,7 +82,7 @@ server-side. The model passes `function` (a bus id such as | Group | Workers | Role | |---|---|---| | Orchestration | `turn-orchestrator`, `provider-router` | Runs a turn end-to-end: fan a request to a provider and dispatch function calls. | -| Sessions / state | `session-tree`, `session-inbox` | Persisted message trees and a steering/follow-up inbox queue. | +| Sessions / state | `session` | Persisted message trees (`session-tree::*`) and a steering/follow-up inbox queue (`session-inbox::*`). | | Catalog | `models-catalog` | Model metadata. | | Auth | `auth-credentials` | Provider credentials store. | | Policy / safety | `policy-denylist`, `llm-budget` | Hook subscriber on `agent::before_function_call` and budget tracking. | diff --git a/harness/Makefile b/harness/Makefile index 3037048f9..00e4251eb 100644 --- a/harness/Makefile +++ b/harness/Makefile @@ -34,7 +34,7 @@ LOGS_DIR := $(DEMO_DIR)/logs WORKERS := \ turn-orchestrator provider-router \ - session-tree session-inbox \ + session \ models-catalog hook-fanout policy-denylist \ shell \ provider-anthropic provider-openai \ diff --git a/harness/iii.worker.yaml b/harness/iii.worker.yaml index ad9c66d14..f68d6b818 100644 --- a/harness/iii.worker.yaml +++ b/harness/iii.worker.yaml @@ -21,8 +21,7 @@ dependencies: iii-http: "^0.11.0" turn-orchestrator: "^0.1.0" provider-router: "^0.1.0" - session-tree: "^0.1.0" - session-inbox: "^0.1.0" + session: "^0.1.0" models-catalog: "^0.1.0" hook-fanout: "^0.1.0" policy-denylist: "^0.1.0" diff --git a/harness/scripts/demo.sh b/harness/scripts/demo.sh index befccaab0..043fd2351 100755 --- a/harness/scripts/demo.sh +++ b/harness/scripts/demo.sh @@ -39,7 +39,7 @@ DEMO_ENGINE_WS="${III_DEMO_ENGINE_URL:-ws://127.0.0.1:49134}" WORKERS=( turn-orchestrator provider-router - session-tree session-inbox + session models-catalog hook-fanout policy-denylist shell provider-anthropic provider-openai diff --git a/harness/scripts/real-usage.sh b/harness/scripts/real-usage.sh index d8386df66..bed9881c3 100755 --- a/harness/scripts/real-usage.sh +++ b/harness/scripts/real-usage.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash # Real end-to-end usage of the demo harness. # -# Important: turn-orchestrator and session-tree use DIFFERENT stores. +# Important: turn-orchestrator and session-tree::* use DIFFERENT stores. # - run::start_and_wait persists to engine state under scope="agent", # key="session//messages" (and a few sibling keys). -# - session::tree / session::messages read session-tree's own store, -# populated only by explicit session::create + session::append calls. +# - session-tree::tree / session-tree::messages read session-tree::*'s own +# store, populated only by explicit session-tree::create + append calls. # This script uses the run::start path. To enumerate, we list state keys # under scope="agent". # diff --git a/provider-router/README.md b/provider-router/README.md index 0b0ceb4fa..62ff690af 100644 --- a/provider-router/README.md +++ b/provider-router/README.md @@ -6,7 +6,7 @@ from `llm-router` when installed), abort via `state::set`, and steering / follow-up messages through `session-inbox::push`. The turn loop itself lives in `turn-orchestrator`; this worker only registers handlers and HTTP triggers. -`iii worker add` pulls declared worker dependencies (`session-inbox`, +`iii worker add` pulls declared worker dependencies (`session`, `llm-budget`). Function ids use `::` throughout (see [`src/register.rs`](src/register.rs)). diff --git a/provider-router/iii.worker.yaml b/provider-router/iii.worker.yaml index 7da845426..158a191d3 100644 --- a/provider-router/iii.worker.yaml +++ b/provider-router/iii.worker.yaml @@ -14,5 +14,5 @@ scripts: start: cargo run dependencies: - session-inbox: "^0.1.0" + session: "^0.1.0" llm-budget: "^0.1.0" diff --git a/registry/index.json b/registry/index.json index e134091a5..cdb9bd2d0 100644 --- a/registry/index.json +++ b/registry/index.json @@ -251,34 +251,23 @@ "default_config": {}, "version": "0.1.0" }, - "session-inbox": { + "session": { "type": "binary", - "description": "Per-session inbox (session-inbox::push, drain, peek) backed by iii state.", + "description": "Session storage (session-tree::*) + per-session inbox (session-inbox::*) backed by iii state.", "repo": "iii-hq/workers", - "tag_prefix": "session-inbox", + "tag_prefix": "session", "supported_targets": [ "aarch64-apple-darwin", "x86_64-unknown-linux-gnu" ], "has_checksum": true, "default_config": { - "max_inline_bytes": 262144 + "store_backend": "iii_state", + "engine_url": "ws://127.0.0.1:49134", + "state_scope": "agent" }, "version": "0.1.0" }, - "session-tree": { - "type": "binary", - "description": "Session storage as a parent-id tree of typed entries under session-tree::*.", - "repo": "iii-hq/workers", - "tag_prefix": "session-tree", - "supported_targets": [ - "aarch64-apple-darwin", - "x86_64-unknown-linux-gnu" - ], - "has_checksum": true, - "default_config": {}, - "version": "0.1.0" - }, "shell": { "type": "binary", "description": "Unix shell + filesystem worker — exec with allowlist/denylist/timeout/output caps and background jobs; fs::ls|stat|mkdir|rm|chmod|mv|grep|sed|read|write with host jail, denylist, size caps, and sandbox-target forwarding", diff --git a/session-inbox/Cargo.lock b/session-inbox/Cargo.lock deleted file mode 100644 index ab87b0369..000000000 --- a/session-inbox/Cargo.lock +++ /dev/null @@ -1,2663 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "aho-corasick" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" - -[[package]] -name = "anstyle-parse" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" -dependencies = [ - "anstyle", - "once_cell_polyfill", - "windows-sys 0.61.2", -] - -[[package]] -name = "anyhow" -version = "1.0.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" - -[[package]] -name = "async-trait" -version = "0.1.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "autocfg" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "bitflags" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bumpalo" -version = "3.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" - -[[package]] -name = "bytes" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" - -[[package]] -name = "cc" -version = "1.2.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d" -dependencies = [ - "find-msvc-tools", - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "clap" -version = "4.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" - -[[package]] -name = "colorchoice" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" - -[[package]] -name = "const-hex" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20d9a563d167a9cce0f94153382b33cb6eded6dfabff03c69ad65a28ea1514e0" -dependencies = [ - "cfg-if", - "cpufeatures", - "proptest", - "serde_core", -] - -[[package]] -name = "core-foundation" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "cpufeatures" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" -dependencies = [ - "libc", -] - -[[package]] -name = "crypto-common" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "data-encoding" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "dyn-clone" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" - -[[package]] -name = "either" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" - -[[package]] -name = "equivalent" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" - -[[package]] -name = "errno" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" -dependencies = [ - "libc", - "windows-sys 0.61.2", -] - -[[package]] -name = "find-msvc-tools" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - -[[package]] -name = "form_urlencoded" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures-channel" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" - -[[package]] -name = "futures-executor" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-macro" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" - -[[package]] -name = "futures-task" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" - -[[package]] -name = "futures-util" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" -dependencies = [ - "futures-core", - "futures-macro", - "futures-sink", - "futures-task", - "pin-project-lite", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "getrandom" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "r-efi 5.3.0", - "wasip2", - "wasm-bindgen", -] - -[[package]] -name = "getrandom" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" -dependencies = [ - "cfg-if", - "libc", - "r-efi 6.0.0", - "wasip2", - "wasip3", -] - -[[package]] -name = "h2" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash", -] - -[[package]] -name = "hashbrown" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hostname" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617aaa3557aef3810a6369d0a99fac8a080891b68bd9f9812a1eeda0c0730cbd" -dependencies = [ - "cfg-if", - "libc", - "windows-link", -] - -[[package]] -name = "http" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" -dependencies = [ - "bytes", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" - -[[package]] -name = "hyper" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca" -dependencies = [ - "atomic-waker", - "bytes", - "futures-channel", - "futures-core", - "h2", - "http", - "http-body", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" -dependencies = [ - "http", - "hyper", - "hyper-util", - "rustls", - "tokio", - "tokio-rustls", - "tower-service", - "webpki-roots", -] - -[[package]] -name = "hyper-timeout" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" -dependencies = [ - "hyper", - "hyper-util", - "pin-project-lite", - "tokio", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" -dependencies = [ - "base64", - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "ipnet", - "libc", - "percent-encoding", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", -] - -[[package]] -name = "icu_collections" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" -dependencies = [ - "displaydoc", - "potential_utf", - "utf8_iter", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locale_core" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_normalizer" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" -dependencies = [ - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" - -[[package]] -name = "icu_properties" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" -dependencies = [ - "icu_collections", - "icu_locale_core", - "icu_properties_data", - "icu_provider", - "zerotrie", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" - -[[package]] -name = "icu_provider" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" -dependencies = [ - "displaydoc", - "icu_locale_core", - "writeable", - "yoke", - "zerofrom", - "zerotrie", - "zerovec", -] - -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - -[[package]] -name = "idna" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" -dependencies = [ - "idna_adapter", - "smallvec", - "utf8_iter", -] - -[[package]] -name = "idna_adapter" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" -dependencies = [ - "icu_normalizer", - "icu_properties", -] - -[[package]] -name = "iii-sdk" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0226f7ce0d9071f9cb75ea7b7ac1241b15282915ccd41d9bbd2ee0db94f90c6" -dependencies = [ - "async-trait", - "futures-util", - "hostname", - "opentelemetry", - "opentelemetry-http", - "opentelemetry-proto", - "opentelemetry_sdk", - "prost", - "reqwest", - "schemars", - "serde", - "serde_json", - "sysinfo", - "thiserror", - "tokio", - "tokio-tungstenite", - "tracing", - "uuid", -] - -[[package]] -name = "indexmap" -version = "2.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" -dependencies = [ - "equivalent", - "hashbrown 0.17.0", - "serde", - "serde_core", -] - -[[package]] -name = "ipnet" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" - -[[package]] -name = "iri-string" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" - -[[package]] -name = "itertools" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" - -[[package]] -name = "js-sys" -version = "0.3.97" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf" -dependencies = [ - "cfg-if", - "futures-util", - "once_cell", - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - -[[package]] -name = "libc" -version = "0.2.186" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" - -[[package]] -name = "litemap" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" - -[[package]] -name = "log" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" - -[[package]] -name = "lru-slab" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" - -[[package]] -name = "matchers" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "memchr" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" - -[[package]] -name = "mio" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.61.2", -] - -[[package]] -name = "ntapi" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae" -dependencies = [ - "winapi", -] - -[[package]] -name = "nu-ansi-term" -version = "0.50.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "objc2-core-foundation" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" -dependencies = [ - "bitflags", -] - -[[package]] -name = "objc2-io-kit" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15" -dependencies = [ - "libc", - "objc2-core-foundation", -] - -[[package]] -name = "once_cell" -version = "1.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" - -[[package]] -name = "once_cell_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" - -[[package]] -name = "openssl-probe" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" - -[[package]] -name = "opentelemetry" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bcd6ae87133e903af7ef497404dda70c60d0ea14895fc8a5e6722754fc2a0" -dependencies = [ - "futures-core", - "futures-sink", - "js-sys", - "pin-project-lite", - "thiserror", - "tracing", -] - -[[package]] -name = "opentelemetry-http" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a6d09a73194e6b66df7c8f1b680f156d916a1a942abf2de06823dd02b7855d" -dependencies = [ - "async-trait", - "bytes", - "http", - "opentelemetry", - "reqwest", -] - -[[package]] -name = "opentelemetry-proto" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7175df06de5eaee9909d4805a3d07e28bb752c34cab57fa9cff549da596b30f" -dependencies = [ - "base64", - "const-hex", - "opentelemetry", - "opentelemetry_sdk", - "prost", - "serde", - "serde_json", - "tonic", - "tonic-prost", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ae4f5991976fd48df6d843de219ca6d31b01daaab2dad5af2badeded372bd" -dependencies = [ - "futures-channel", - "futures-executor", - "futures-util", - "opentelemetry", - "percent-encoding", - "rand", - "thiserror", - "tokio", - "tokio-stream", -] - -[[package]] -name = "percent-encoding" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" - -[[package]] -name = "pin-project" -version = "1.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" - -[[package]] -name = "potential_utf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" -dependencies = [ - "zerovec", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn", -] - -[[package]] -name = "proc-macro2" -version = "1.0.106" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proptest" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744" -dependencies = [ - "bitflags", - "num-traits", - "rand", - "rand_chacha", - "rand_xorshift", - "regex-syntax", - "unarray", -] - -[[package]] -name = "prost" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-derive" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "quinn" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" -dependencies = [ - "bytes", - "cfg_aliases", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "socket2", - "thiserror", - "tokio", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-proto" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" -dependencies = [ - "bytes", - "getrandom 0.3.4", - "lru-slab", - "rand", - "ring", - "rustc-hash", - "rustls", - "rustls-pki-types", - "slab", - "thiserror", - "tinyvec", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-udp" -version = "0.5.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" -dependencies = [ - "cfg_aliases", - "libc", - "once_cell", - "socket2", - "tracing", - "windows-sys 0.60.2", -] - -[[package]] -name = "quote" -version = "1.0.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - -[[package]] -name = "r-efi" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" - -[[package]] -name = "rand" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" -dependencies = [ - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" -dependencies = [ - "getrandom 0.3.4", -] - -[[package]] -name = "rand_xorshift" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" -dependencies = [ - "rand_core", -] - -[[package]] -name = "regex-automata" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" - -[[package]] -name = "reqwest" -version = "0.12.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" -dependencies = [ - "base64", - "bytes", - "futures-core", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "js-sys", - "log", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-rustls", - "tower", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", -] - -[[package]] -name = "ring" -version = "0.17.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" -dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.17", - "libc", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustc-hash" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" - -[[package]] -name = "rustls" -version = "0.23.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" -dependencies = [ - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-native-certs" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" -dependencies = [ - "openssl-probe", - "rustls-pki-types", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pki-types" -version = "1.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" -dependencies = [ - "web-time", - "zeroize", -] - -[[package]] -name = "rustls-webpki" -version = "0.103.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" - -[[package]] -name = "ryu" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" - -[[package]] -name = "schannel" -version = "0.1.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "schemars" -version = "0.8.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" -dependencies = [ - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", -] - -[[package]] -name = "schemars_derive" -version = "0.8.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn", -] - -[[package]] -name = "security-framework" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" - -[[package]] -name = "serde" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" -dependencies = [ - "serde_core", - "serde_derive", -] - -[[package]] -name = "serde_core" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_derive_internals" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" -dependencies = [ - "itoa", - "memchr", - "serde", - "serde_core", - "zmij", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "session-inbox" -version = "0.1.6" -dependencies = [ - "anyhow", - "clap", - "iii-sdk", - "serde", - "serde_json", - "serde_yaml", - "tokio", - "tracing", - "tracing-subscriber", - "which", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" -dependencies = [ - "errno", - "libc", -] - -[[package]] -name = "slab" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" - -[[package]] -name = "smallvec" -version = "1.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" - -[[package]] -name = "socket2" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" -dependencies = [ - "libc", - "windows-sys 0.61.2", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "syn" -version = "2.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" -dependencies = [ - "futures-core", -] - -[[package]] -name = "synstructure" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "sysinfo" -version = "0.38.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92ab6a2f8bfe508deb3c6406578252e491d299cbbf3bc0529ecc3313aee4a52f" -dependencies = [ - "libc", - "memchr", - "ntapi", - "objc2-core-foundation", - "objc2-io-kit", - "windows", -] - -[[package]] -name = "thiserror" -version = "2.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "tinystr" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" -dependencies = [ - "displaydoc", - "zerovec", -] - -[[package]] -name = "tinyvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.52.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6" -dependencies = [ - "bytes", - "libc", - "mio", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.61.2", -] - -[[package]] -name = "tokio-macros" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857" -dependencies = [ - "futures-util", - "log", - "rustls", - "rustls-native-certs", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tonic" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec7c61a0695dc1887c1b53952990f3ad2e3a31453e1f49f10e75424943a93ec" -dependencies = [ - "async-trait", - "base64", - "bytes", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-timeout", - "hyper-util", - "percent-encoding", - "pin-project", - "sync_wrapper", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tonic-prost" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55376a0bbaa4975a3f10d009ad763d8f4108f067c7c2e74f3001fb49778d309" -dependencies = [ - "bytes", - "prost", - "tonic", -] - -[[package]] -name = "tower" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" -dependencies = [ - "futures-core", - "futures-util", - "indexmap", - "pin-project-lite", - "slab", - "sync_wrapper", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" -dependencies = [ - "bitflags", - "bytes", - "futures-util", - "http", - "http-body", - "iri-string", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex-automata", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "tungstenite" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442" -dependencies = [ - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand", - "rustls", - "rustls-pki-types", - "sha1", - "thiserror", - "utf-8", -] - -[[package]] -name = "typenum" -version = "1.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" - -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - -[[package]] -name = "unicode-ident" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" - -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "uuid" -version = "1.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" -dependencies = [ - "getrandom 0.4.2", - "js-sys", - "serde_core", - "wasm-bindgen", -] - -[[package]] -name = "valuable" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.1+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" - -[[package]] -name = "wasip2" -version = "1.0.3+wasi-0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" -dependencies = [ - "wit-bindgen 0.57.1", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" -dependencies = [ - "wit-bindgen 0.51.0", -] - -[[package]] -name = "wasm-bindgen" -version = "0.2.120" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1" -dependencies = [ - "cfg-if", - "once_cell", - "rustversion", - "wasm-bindgen-macro", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af934872acec734c2d80e6617bbb5ff4f12b052dd8e6332b0817bce889516084" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.120" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.120" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41" -dependencies = [ - "bumpalo", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.120" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap", - "wasm-encoder", - "wasmparser", -] - -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags", - "hashbrown 0.15.5", - "indexmap", - "semver", -] - -[[package]] -name = "web-sys" -version = "0.3.97" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eadbac71025cd7b0834f20d1fe8472e8495821b4e9801eb0a60bd1f19827602" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "which" -version = "8.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81995fafaaaf6ae47a7d0cc83c67caf92aeb7e5331650ae6ff856f7c0c60c459" -dependencies = [ - "libc", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.62.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" -dependencies = [ - "windows-collections", - "windows-core", - "windows-future", - "windows-numerics", -] - -[[package]] -name = "windows-collections" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" -dependencies = [ - "windows-core", -] - -[[package]] -name = "windows-core" -version = "0.62.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-link", - "windows-result", - "windows-strings", -] - -[[package]] -name = "windows-future" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" -dependencies = [ - "windows-core", - "windows-link", - "windows-threading", -] - -[[package]] -name = "windows-implement" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "windows-interface" -version = "0.59.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "windows-link" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" - -[[package]] -name = "windows-numerics" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" -dependencies = [ - "windows-core", - "windows-link", -] - -[[package]] -name = "windows-result" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-strings" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", -] - -[[package]] -name = "windows-sys" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", -] - -[[package]] -name = "windows-threading" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - -[[package]] -name = "wit-bindgen" -version = "0.57.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" - -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck", - "indexmap", - "prettyplease", - "syn", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] - -[[package]] -name = "writeable" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" - -[[package]] -name = "yoke" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" -dependencies = [ - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerocopy" -version = "0.8.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zerofrom" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zeroize" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" - -[[package]] -name = "zerotrie" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", -] - -[[package]] -name = "zerovec" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zmij" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" diff --git a/session-inbox/Cargo.toml b/session-inbox/Cargo.toml deleted file mode 100644 index 92dfbd743..000000000 --- a/session-inbox/Cargo.toml +++ /dev/null @@ -1,111 +0,0 @@ -[workspace] - -[package] -name = "session-inbox" -version = "0.1.6" -description = "Per-session inbox (session-inbox::push, drain, peek) backed by iii state." -edition = "2021" -license = "Apache-2.0" -repository = "https://github.com/iii-hq/workers" -authors = ["iii contributors"] -publish = false -build = "build.rs" - -[lib] -name = "session_inbox" -path = "src/lib.rs" - -[[bin]] -name = "session-inbox" -path = "src/main.rs" - -[dependencies] -iii-sdk = "=0.11.3" -serde = { version = "1", features = ["derive"] } -serde_json = "1" -serde_yaml = "0.9" -tokio = { version = "1", features = ["rt-multi-thread", "macros", "sync", "signal"] } -anyhow = "1" -tracing = "0.1" -tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] } -clap = { version = "4", features = ["derive", "env"] } - -[dev-dependencies] -serde_json = "1" -which = "8" -tokio = { version = "1", features = ["rt-multi-thread", "macros", "time", "signal"] } - -[lints.rust] -unsafe_code = "forbid" - -[lints.clippy] -all = { level = "warn", priority = -1 } -pedantic = { level = "warn", priority = -1 } -nursery = { level = "warn", priority = -1 } -module_name_repetitions = "allow" -must_use_candidate = "allow" -missing_errors_doc = "allow" -missing_panics_doc = "allow" -struct_excessive_bools = "allow" -doc_markdown = "allow" -match_same_arms = "allow" -missing_const_for_fn = "allow" -derive_partial_eq_without_eq = "allow" -unreadable_literal = "allow" -needless_pass_by_value = "allow" -single_match_else = "allow" -option_if_let_else = "allow" -redundant_closure_for_method_calls = "allow" -significant_drop_tightening = "allow" -manual_let_else = "allow" -collapsible_if = "allow" -drain_collect = "allow" -manual_map = "allow" -useless_let_if_seq = "allow" -needless_continue = "allow" -items_after_statements = "allow" -too_many_lines = "allow" -unused_self = "allow" -single_call_fn = "allow" -inefficient_to_string = "allow" -cast_possible_truncation = "allow" -cast_sign_loss = "allow" -cast_possible_wrap = "allow" -cast_precision_loss = "allow" -cast_lossless = "allow" -similar_names = "allow" -or_fun_call = "allow" -unnecessary_wraps = "allow" -unused_async = "allow" -needless_collect = "allow" -case_sensitive_file_extension_comparisons = "allow" -significant_drop_in_scrutinee = "allow" -redundant_pub_crate = "allow" -ignored_unit_patterns = "allow" -manual_string_new = "allow" -redundant_else = "allow" -cognitive_complexity = "allow" -branches_sharing_code = "allow" -unnecessary_lazy_evaluations = "allow" -non_std_lazy_statics = "allow" -ignore_without_reason = "allow" -struct_field_names = "allow" -naive_bytecount = "allow" -suspicious_arithmetic_impl = "allow" -return_self_not_must_use = "allow" -needless_pass_by_ref_mut = "allow" -ref_option = "allow" -mut_mut = "allow" -should_implement_trait = "allow" -default_trait_access = "allow" -cloned_instead_of_copied = "allow" -implicit_clone = "allow" -use_self = "allow" -derivable_impls = "allow" -redundant_clone = "allow" -unnecessary_map_or = "allow" -double_ended_iterator_last = "allow" -format_push_string = "allow" -uninlined_format_args = "allow" -too_long_first_doc_paragraph = "allow" -map_unwrap_or = "allow" diff --git a/session-inbox/README.md b/session-inbox/README.md deleted file mode 100644 index ab71f8826..000000000 --- a/session-inbox/README.md +++ /dev/null @@ -1,67 +0,0 @@ -# session-inbox - -Per-session inbox on the iii bus. Producers push items keyed by -`(session_id, name)`; consumers drain them atomically at session boundaries -(typically between agent turns). Items live in iii state under -`session//` so they survive worker restart. - -This is **not** a job queue (compare the engine’s queue builtin with async -consumers, retries, and DLQ). `session-inbox` is a pull-mode list: producers -fire-and-forget, consumers drain when they decide. - -## Install - -```bash -iii worker add session-inbox -``` - -`iii worker add` fetches the binary, writes a config block into -`~/.iii/config.yaml`, and the engine starts the worker on the next -`iii start`. - -## Quickstart - -```rust -use iii_sdk::{register_worker, InitOptions, TriggerRequest}; -use serde_json::json; - -#[tokio::main] -async fn main() -> anyhow::Result<()> { - let iii = register_worker("ws://localhost:49134", InitOptions::default()); - - let result = iii - .trigger(TriggerRequest { - function_id: "session-inbox::push".into(), - payload: json!({ - "session_id": "s1", - "name": "steering", - "item": { "role": "user", "content": "hello" }, - }), - action: None, - timeout_ms: Some(5_000), - }) - .await?; - - println!("{result:#?}"); - Ok(()) -} -``` - -`session-inbox::drain` accepts `{ "session_id", "name" }` and returns -`{ "items": [...] }` (atomic read+clear). `session-inbox::peek` reads without -mutating. - -## Configuration - -```yaml -engine_url: ws://127.0.0.1:49134 # used when --url / III_URL is unset -state_scope: agent # iii state scope for inbox keys -``` - -Other defaults live in [`src/config.rs`](src/config.rs). - -## Migration notes - -Function ids were previously registered as `inbox::push`, `inbox::drain`, and -`inbox::peek`. They are now `session-inbox::push`, `session-inbox::drain`, and -`session-inbox::peek`. Payloads are unchanged. diff --git a/session-inbox/iii.worker.yaml b/session-inbox/iii.worker.yaml deleted file mode 100644 index 58d767f0c..000000000 --- a/session-inbox/iii.worker.yaml +++ /dev/null @@ -1,14 +0,0 @@ -iii: v1 -name: session-inbox -language: rust -deploy: binary -manifest: Cargo.toml -bin: session-inbox -description: Per-session inbox (session-inbox::push, drain, peek) backed by iii state. - -runtime: - kind: rust - -scripts: - install: cargo build - start: cargo run \ No newline at end of file diff --git a/session-inbox/src/main.rs b/session-inbox/src/main.rs deleted file mode 100644 index 07372b4b9..000000000 --- a/session-inbox/src/main.rs +++ /dev/null @@ -1,99 +0,0 @@ -use std::sync::Arc; - -use anyhow::Result; -use clap::Parser; -use iii_sdk::{register_worker, InitOptions, OtelConfig, WorkerMetadata}; -use session_inbox::{config, manifest, register_with_iii}; - -#[derive(Parser, Debug)] -#[command( - name = "session-inbox", - about = "Per-session inbox: push, drain, peek backed by iii state." -)] -struct Cli { - #[arg(long, default_value = "./config.yaml")] - config: String, - - /// Engine WebSocket URL. Overrides `engine_url` in `--config` when set (or use `III_URL`). - #[arg(long, env = "III_URL")] - url: Option, - - #[arg(long)] - manifest: bool, -} - -#[cfg(unix)] -async fn wait_for_shutdown() { - use tokio::signal::unix::{signal, SignalKind}; - - let mut sigterm = signal(SignalKind::terminate()).expect("install SIGTERM handler"); - tokio::select! { - _ = tokio::signal::ctrl_c() => {}, - _ = sigterm.recv() => {}, - } -} - -#[cfg(not(unix))] -async fn wait_for_shutdown() { - let _ = tokio::signal::ctrl_c().await; -} - -#[tokio::main] -async fn main() -> Result<()> { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new("info")), - ) - .init(); - - let cli = Cli::parse(); - - if cli.manifest { - let m = manifest::build_manifest(); - println!("{}", serde_json::to_string_pretty(&m)?); - return Ok(()); - } - - let cfg = match config::load_config(&cli.config) { - Ok(c) => c, - Err(e) => { - tracing::warn!(error = %e, path = %cli.config, "failed to load config, using defaults"); - config::WorkerConfig::default() - } - }; - let cfg = Arc::new(cfg); - - let url = cli.url.unwrap_or_else(|| cfg.engine_url.clone()); - - let iii = register_worker( - &url, - InitOptions { - otel: Some(OtelConfig::default()), - metadata: Some(WorkerMetadata { - runtime: "rust".to_string(), - version: env!("CARGO_PKG_VERSION").to_string(), - name: "session-inbox".to_string(), - os: std::env::consts::OS.to_string(), - pid: Some(std::process::id()), - telemetry: None, - ..WorkerMetadata::default() - }), - ..InitOptions::default() - }, - ); - let iii = Arc::new(iii); - - register_with_iii(&iii, &cfg); - tracing::info!( - "session-inbox ready ({}, {}, {})", - session_inbox::PUSH_ID, - session_inbox::DRAIN_ID, - session_inbox::PEEK_ID - ); - - wait_for_shutdown().await; - tracing::info!("session-inbox shutting down"); - iii.shutdown_async().await; - Ok(()) -} diff --git a/session-inbox/src/manifest.rs b/session-inbox/src/manifest.rs deleted file mode 100644 index 29a8f530b..000000000 --- a/session-inbox/src/manifest.rs +++ /dev/null @@ -1,45 +0,0 @@ -use serde::Serialize; - -use crate::config::WorkerConfig; - -#[derive(Serialize)] -pub struct ModuleManifest { - pub name: String, - pub version: String, - pub description: String, - pub default_config: serde_json::Value, - pub supported_targets: Vec, -} - -pub fn build_manifest() -> ModuleManifest { - ModuleManifest { - name: env!("CARGO_PKG_NAME").to_string(), - version: env!("CARGO_PKG_VERSION").to_string(), - description: - "Per-session inbox under session-inbox::* — push, drain, peek backed by iii state." - .to_string(), - default_config: serde_json::to_value(WorkerConfig::default()) - .expect("WorkerConfig serializes to JSON"), - supported_targets: vec![env!("TARGET").to_string()], - } -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn json_roundtrip_has_required_fields() { - let m = build_manifest(); - let json = serde_json::to_string_pretty(&m).unwrap(); - let parsed: serde_json::Value = serde_json::from_str(&json).unwrap(); - - assert_eq!(parsed["name"], env!("CARGO_PKG_NAME")); - assert_eq!(parsed["version"], env!("CARGO_PKG_VERSION")); - assert!(parsed["description"] - .as_str() - .is_some_and(|s| !s.is_empty())); - assert!(parsed["default_config"].is_object()); - assert!(!parsed["supported_targets"].as_array().unwrap().is_empty()); - } -} diff --git a/session-tree/README.md b/session-tree/README.md deleted file mode 100644 index c926bf8fc..000000000 --- a/session-tree/README.md +++ /dev/null @@ -1,137 +0,0 @@ - - -# session-tree - -Session storage on the iii bus as a parent-id DAG of typed entries — agent messages, branch summaries, custom payloads, and compaction markers. `session-tree::*` lets callers create sessions, append turn-by-turn, fork branches at any entry, clone whole histories, and export a self-contained HTML transcript of the active path. Forks share history because every entry references its parent rather than copying it forward. - - -For resuming an agent, prefer `session-tree::messages` over `session-tree::tree` — `messages` returns only the active path in oldest-first order, which slots straight into the agent's context. `tree` returns the entire DAG including sibling branches and is much heavier on large sessions. - - -## Install - -```bash -iii worker add session-tree -``` - -`iii worker add` fetches the binary, writes a config block into the engine's `config.yaml`, and the engine starts the worker on the next `iii worker start`. - -For surfacing `session-tree::*` to LLM agents, pair with the [`skills`](../skills) worker: - -```bash -iii worker add skills -``` - -## Quickstart - -```rust -use iii_sdk::{register_worker, InitOptions, TriggerRequest}; -use serde_json::json; - -#[tokio::main] -async fn main() -> anyhow::Result<()> { - let worker = register_worker("ws://localhost:49134", InitOptions::default()); - - let created = worker - .trigger(TriggerRequest { - function_id: "session-tree::create".into(), - payload: json!({ "display_name": "demo" }), - action: None, - timeout_ms: Some(5_000), - }) - .await?; - let session_id = created["session_id"].as_str().unwrap(); - - let appended = worker - .trigger(TriggerRequest { - function_id: "session-tree::append".into(), - payload: json!({ - "session_id": session_id, - "message": { - "role": "user", - "content": [{ "type": "text", "text": "hello" }], - "timestamp": 0, - }, - }), - action: None, - timeout_ms: Some(5_000), - }) - .await?; - - println!("entry_id = {:?}", appended["entry_id"]); - Ok(()) -} -``` - -```typescript -import { registerWorker } from 'iii-sdk' - -const worker = registerWorker('ws://localhost:49134') - -const { session_id } = await worker.trigger({ - function_id: 'session-tree::create', - payload: { display_name: 'demo' }, -}) - -const appended = await worker.trigger({ - function_id: 'session-tree::append', - payload: { - session_id, - message: { - role: 'user', - content: [{ type: 'text', text: 'hello' }], - timestamp: 0, - }, - }, -}) - -console.log(appended.entry_id) -``` - -```python -from iii import register_worker - -worker = register_worker("ws://localhost:49134") - -created = worker.trigger({ - "function_id": "session-tree::create", - "payload": {"display_name": "demo"}, -}) -session_id = created["session_id"] - -appended = worker.trigger({ - "function_id": "session-tree::append", - "payload": { - "session_id": session_id, - "message": { - "role": "user", - "content": [{"type": "text", "text": "hello"}], - "timestamp": 0, - }, - }, -}) - -print(appended["entry_id"]) -``` - -The example creates a session and appends a single user message. Other entry points: `session-tree::messages`, `session-tree::tree`, `session-tree::fork`, `session-tree::clone`, `session-tree::compact`, and `session-tree::export_html`. - -## Configuration - -```yaml -# session-tree runtime config. - -# Storage backend: `iii_state` (durable, persists via iii-state) or `memory` (ephemeral, in-process). -store_backend: iii_state -``` - -## Additional Resources - -- [Recording each turn of a conversation](skills/append.md) -- [Snapshotting a session before a destructive operation](skills/clone.md) -- [Recording a context compaction in the history](skills/compact.md) -- [Allocating a fresh session](skills/create.md) -- [Producing a transcript of a session branch](skills/export_html.md) -- [Branching a conversation at an earlier point](skills/fork.md) -- [Reconstructing the active path for a resuming agent](skills/messages.md) -- [Visualising the full session DAG](skills/tree.md) diff --git a/session-tree/build.rs b/session-tree/build.rs deleted file mode 100644 index 81caa36d6..000000000 --- a/session-tree/build.rs +++ /dev/null @@ -1,6 +0,0 @@ -fn main() { - println!( - "cargo:rustc-env=TARGET={}", - std::env::var("TARGET").unwrap() - ); -} diff --git a/session-tree/docs/intro.md b/session-tree/docs/intro.md deleted file mode 100644 index 507f1d4df..000000000 --- a/session-tree/docs/intro.md +++ /dev/null @@ -1,5 +0,0 @@ -Session storage on the iii bus as a parent-id DAG of typed entries — agent messages, branch summaries, custom payloads, and compaction markers. `session-tree::*` lets callers create sessions, append turn-by-turn, fork branches at any entry, clone whole histories, and export a self-contained HTML transcript of the active path. Forks share history because every entry references its parent rather than copying it forward. - - -For resuming an agent, prefer `session-tree::messages` over `session-tree::tree` — `messages` returns only the active path in oldest-first order, which slots straight into the agent's context. `tree` returns the entire DAG including sibling branches and is much heavier on large sessions. - diff --git a/session-tree/iii.worker.yaml b/session-tree/iii.worker.yaml deleted file mode 100644 index 10dc599f9..000000000 --- a/session-tree/iii.worker.yaml +++ /dev/null @@ -1,14 +0,0 @@ -iii: v1 -name: session-tree -language: rust -deploy: binary -manifest: Cargo.toml -bin: session-tree -description: Session storage as a parent-id tree of typed entries under session-tree::*. - -runtime: - kind: rust - -scripts: - install: cargo build - start: cargo run diff --git a/session-tree/src/config.rs b/session-tree/src/config.rs deleted file mode 100644 index 386694b5b..000000000 --- a/session-tree/src/config.rs +++ /dev/null @@ -1,49 +0,0 @@ -use anyhow::{Context, Result}; -use serde::Deserialize; - -#[derive(Deserialize, Debug, Clone)] -pub struct SessionTreeConfig { - #[serde(default = "default_store_backend")] - pub store_backend: String, -} - -fn default_store_backend() -> String { - "iii_state".to_string() -} - -impl Default for SessionTreeConfig { - fn default() -> Self { - Self { - store_backend: default_store_backend(), - } - } -} - -pub fn load_config(path: &str) -> Result { - let contents = std::fs::read_to_string(path).with_context(|| format!("read {path}"))?; - let cfg: SessionTreeConfig = - serde_yaml::from_str(&contents).with_context(|| format!("parse yaml {path}"))?; - Ok(cfg) -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn defaults_from_empty_yaml() { - let cfg: SessionTreeConfig = serde_yaml::from_str("{}").unwrap(); - assert_eq!(cfg.store_backend, "iii_state"); - } - - #[test] - fn custom_yaml_overrides() { - let cfg: SessionTreeConfig = serde_yaml::from_str("store_backend: memory").unwrap(); - assert_eq!(cfg.store_backend, "memory"); - } - - #[test] - fn impl_default_matches_yaml_defaults() { - assert_eq!(SessionTreeConfig::default().store_backend, "iii_state"); - } -} diff --git a/session-tree/tests/common/mod.rs b/session-tree/tests/common/mod.rs deleted file mode 100644 index a515eb876..000000000 --- a/session-tree/tests/common/mod.rs +++ /dev/null @@ -1,20 +0,0 @@ -use std::path::{Path, PathBuf}; - -pub fn session_tree_executable() -> PathBuf { - if let Some(p) = std::env::var_os("CARGO_BIN_EXE_session-tree") { - return PathBuf::from(p); - } - if let Some(p) = std::env::var_os("CARGO_BIN_EXE_session_tree") { - return PathBuf::from(p); - } - let dir = Path::new(env!("CARGO_MANIFEST_DIR")); - for profile in ["debug", "release"] { - let candidate = dir.join("target").join(profile).join("session-tree"); - if candidate.is_file() { - return candidate; - } - } - panic!( - "session-tree binary not found under target/{{debug,release}}/; run `cargo build --bin session-tree` first" - ); -} diff --git a/session-tree/tests/manifest.rs b/session-tree/tests/manifest.rs deleted file mode 100644 index b6c3425b1..000000000 --- a/session-tree/tests/manifest.rs +++ /dev/null @@ -1,45 +0,0 @@ -use std::path::{Path, PathBuf}; -use std::process::Command; - -use serde_json::Value; - -fn session_tree_executable() -> PathBuf { - if let Some(p) = std::env::var_os("CARGO_BIN_EXE_session_tree") { - return PathBuf::from(p); - } - let dir = Path::new(env!("CARGO_MANIFEST_DIR")); - for profile in ["debug", "release"] { - let candidate = dir.join("target").join(profile).join("session-tree"); - if candidate.is_file() { - return candidate; - } - } - panic!("session-tree binary not found; run `cargo build --bin session-tree` first"); -} - -#[test] -fn manifest_subcommand_emits_valid_json() { - let bin = session_tree_executable(); - let output = Command::new(&bin) - .arg("--manifest") - .output() - .expect("spawn session-tree --manifest"); - - assert!( - output.status.success(), - "binary exited with {:?}; stderr: {}", - output.status, - String::from_utf8_lossy(&output.stderr), - ); - - let stdout = String::from_utf8(output.stdout).expect("manifest stdout is utf-8"); - let manifest: Value = serde_json::from_str(&stdout).expect("manifest stdout is valid JSON"); - - assert_eq!(manifest["name"], env!("CARGO_PKG_NAME")); - assert_eq!(manifest["version"], env!("CARGO_PKG_VERSION")); - assert!(manifest["default_config"].is_object()); - assert!(!manifest["supported_targets"] - .as_array() - .expect("supported_targets must be an array") - .is_empty()); -} diff --git a/session-tree/Cargo.lock b/session/Cargo.lock similarity index 97% rename from session-tree/Cargo.lock rename to session/Cargo.lock index 03127bfdd..e9234b6a2 100644 --- a/session-tree/Cargo.lock +++ b/session/Cargo.lock @@ -134,9 +134,9 @@ checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] name = "cc" -version = "1.2.61" +version = "1.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d" +checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" dependencies = [ "find-msvc-tools", "shlex", @@ -458,9 +458,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" +checksum = "171fefbc92fe4a4de27e0698d6a5b392d6a0e333506bc49133760b3bcf948733" dependencies = [ "atomic-waker", "bytes", @@ -494,9 +494,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" [[package]] name = "heck" @@ -793,7 +793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.17.0", + "hashbrown 0.17.1", "serde", "serde_core", ] @@ -804,16 +804,6 @@ version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" -[[package]] -name = "iri-string" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "is_terminal_polyfill" version = "1.70.2" @@ -837,9 +827,9 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "js-sys" -version = "0.3.97" +version = "0.3.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf" +checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08" dependencies = [ "cfg-if", "futures-util", @@ -1074,18 +1064,18 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pin-project" -version = "1.1.11" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" +checksum = "cbf0d9e68100b3a7989b4901972f265cd542e560a3a8a724e1e20322f4d06ce9" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.11" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" +checksum = "a990e22f43e84855daf260dded30524ef4a9021cc7541c26540500a50b624389" dependencies = [ "proc-macro2", "quote", @@ -1619,8 +1609,8 @@ dependencies = [ ] [[package]] -name = "session-tree" -version = "0.1.6" +name = "session" +version = "0.1.0" dependencies = [ "anyhow", "async-trait", @@ -1817,9 +1807,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.52.1" +version = "1.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" dependencies = [ "bytes", "libc", @@ -1895,9 +1885,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec7c61a0695dc1887c1b53952990f3ad2e3a31453e1f49f10e75424943a93ec" +checksum = "ac2a5518c70fa84342385732db33fb3f44bc4cc748936eb5833d2df34d6445ef" dependencies = [ "async-trait", "base64", @@ -1921,9 +1911,9 @@ dependencies = [ [[package]] name = "tonic-prost" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55376a0bbaa4975a3f10d009ad763d8f4108f067c7c2e74f3001fb49778d309" +checksum = "50849f68853be452acf590cde0b146665b8d507b3b8af17261df47e02c209ea0" dependencies = [ "bytes", "prost", @@ -1951,20 +1941,20 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.8" +version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" +checksum = "68d6fdd9f81c2819c9a8b0e0cd91660e7746a8e6ea2ba7c6b2b057985f6bcb51" dependencies = [ "bitflags", "bytes", "futures-util", "http", "http-body", - "iri-string", "pin-project-lite", "tower", "tower-layer", "tower-service", + "url", ] [[package]] @@ -2190,9 +2180,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.120" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1" +checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790" dependencies = [ "cfg-if", "once_cell", @@ -2203,9 +2193,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.70" +version = "0.4.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af934872acec734c2d80e6617bbb5ff4f12b052dd8e6332b0817bce889516084" +checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8" dependencies = [ "js-sys", "wasm-bindgen", @@ -2213,9 +2203,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.120" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103" +checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2223,9 +2213,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.120" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41" +checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2" dependencies = [ "bumpalo", "proc-macro2", @@ -2236,9 +2226,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.120" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea" +checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441" dependencies = [ "unicode-ident", ] @@ -2279,9 +2269,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.97" +version = "0.3.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eadbac71025cd7b0834f20d1fe8472e8495821b4e9801eb0a60bd1f19827602" +checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/session-tree/Cargo.toml b/session/Cargo.toml similarity index 94% rename from session-tree/Cargo.toml rename to session/Cargo.toml index 971ad1506..6691024f2 100644 --- a/session-tree/Cargo.toml +++ b/session/Cargo.toml @@ -3,9 +3,9 @@ resolver = "2" members = ["crates/harness-types"] [package] -name = "session-tree" -version = "0.1.6" -description = "Session storage as a parent-id tree of typed entries under session-tree::*." +name = "session" +version = "0.1.0" +description = "Session storage (tree of typed entries) + per-session inbox, exposed as session-tree::* and session-inbox::* over iii." edition = "2021" license = "Apache-2.0" repository = "https://github.com/iii-hq/workers" @@ -14,11 +14,11 @@ publish = false build = "build.rs" [lib] -name = "session_tree" +name = "session" path = "src/lib.rs" [[bin]] -name = "session-tree" +name = "session" path = "src/main.rs" [dependencies] diff --git a/session/README.md b/session/README.md new file mode 100644 index 000000000..e1bbef606 --- /dev/null +++ b/session/README.md @@ -0,0 +1,29 @@ +# session + +Consolidated session worker. Registers two iii function namespaces from a single binary: + +- `session-tree::*`: persistent branching session storage (create, append, messages, tree, fork, clone, compact, export_html, list, ensure, reconcile). +- `session-inbox::*`: per-session inbox queues (push, drain, peek) backed by iii state. + +Both surfaces share the same engine connection, runtime, and release cadence. + +## Library layout + +- `session::tree`: parent-id tree of typed `SessionEntry` values. +- `session::inbox`: append/drain/peek per `inbox_key(name, session_id)`. + +The wire-level function ids (`session-tree::*`, `session-inbox::*`) are unchanged +from the original split workers; callers do not need to migrate. + +## Configuration + +`config.yaml` (loaded via `--config`): + +```yaml +# Backend for session-tree (iii_state | memory). +store_backend: iii_state +# WebSocket URL when --url / III_URL is unset. +engine_url: ws://127.0.0.1:49134 +# iii state scope used by session-inbox keys. +state_scope: agent +``` diff --git a/session-inbox/build.rs b/session/build.rs similarity index 100% rename from session-inbox/build.rs rename to session/build.rs diff --git a/session-tree/config.yaml b/session/config.yaml similarity index 100% rename from session-tree/config.yaml rename to session/config.yaml diff --git a/session-tree/crates/harness-types/Cargo.toml b/session/crates/harness-types/Cargo.toml similarity index 100% rename from session-tree/crates/harness-types/Cargo.toml rename to session/crates/harness-types/Cargo.toml diff --git a/session-tree/crates/harness-types/src/agent_event.rs b/session/crates/harness-types/src/agent_event.rs similarity index 100% rename from session-tree/crates/harness-types/src/agent_event.rs rename to session/crates/harness-types/src/agent_event.rs diff --git a/session-tree/crates/harness-types/src/agent_message.rs b/session/crates/harness-types/src/agent_message.rs similarity index 100% rename from session-tree/crates/harness-types/src/agent_message.rs rename to session/crates/harness-types/src/agent_message.rs diff --git a/session-tree/crates/harness-types/src/content.rs b/session/crates/harness-types/src/content.rs similarity index 100% rename from session-tree/crates/harness-types/src/content.rs rename to session/crates/harness-types/src/content.rs diff --git a/session-tree/crates/harness-types/src/function.rs b/session/crates/harness-types/src/function.rs similarity index 100% rename from session-tree/crates/harness-types/src/function.rs rename to session/crates/harness-types/src/function.rs diff --git a/session-tree/crates/harness-types/src/lib.rs b/session/crates/harness-types/src/lib.rs similarity index 100% rename from session-tree/crates/harness-types/src/lib.rs rename to session/crates/harness-types/src/lib.rs diff --git a/session-tree/crates/harness-types/src/stream_event.rs b/session/crates/harness-types/src/stream_event.rs similarity index 100% rename from session-tree/crates/harness-types/src/stream_event.rs rename to session/crates/harness-types/src/stream_event.rs diff --git a/session-tree/crates/harness-types/src/thinking.rs b/session/crates/harness-types/src/thinking.rs similarity index 100% rename from session-tree/crates/harness-types/src/thinking.rs rename to session/crates/harness-types/src/thinking.rs diff --git a/session-tree/docs/companions.md b/session/docs/companions.md similarity index 100% rename from session-tree/docs/companions.md rename to session/docs/companions.md diff --git a/session/docs/intro.md b/session/docs/intro.md new file mode 100644 index 000000000..c70e4992f --- /dev/null +++ b/session/docs/intro.md @@ -0,0 +1,5 @@ +Session storage on the iii bus as a parent-id DAG of typed entries: agent messages, branch summaries, custom payloads, and compaction markers. `session-tree::*` lets callers create sessions, append turn-by-turn, fork branches at any entry, clone whole histories, and export a self-contained HTML transcript of the active path. Forks share history because every entry references its parent rather than copying it forward. + + +For resuming an agent, prefer `session-tree::messages` over `session-tree::tree`; `messages` returns only the active path in oldest-first order, which slots straight into the agent's context. `tree` returns the entire DAG including sibling branches and is much heavier on large sessions. + diff --git a/session-tree/docs/leaves/append.md b/session/docs/leaves/append.md similarity index 76% rename from session-tree/docs/leaves/append.md rename to session/docs/leaves/append.md index a1bff91cb..63ea62312 100644 --- a/session-tree/docs/leaves/append.md +++ b/session/docs/leaves/append.md @@ -2,7 +2,7 @@ ## When to use -- Recording each turn as it occurs — user messages, assistant replies, tool results. +- Recording each turn as it occurs: user messages, assistant replies, tool results. - Building a branched history: pass the previous entry's id as `parent_id` to chain entries linearly. - Writing a synthetic session entry-by-entry before reconstructing it for an agent or rendering it for review. @@ -11,4 +11,4 @@ - `message` must be a valid `AgentMessage` from `harness-types`. Variants: `user`, `assistant`, `tool_result`, `custom`. - `parent_id` is optional. In a linear conversation thread every entry except the first should supply the previous `entry_id` as `parent_id`. - Entry ids are generated server-side; a caller-supplied id is ignored. -- The call is not idempotent — invoking it twice with the same payload writes two distinct entries. +- The call is not idempotent; invoking it twice with the same payload writes two distinct entries. diff --git a/session-tree/docs/leaves/clone.md b/session/docs/leaves/clone.md similarity index 85% rename from session-tree/docs/leaves/clone.md rename to session/docs/leaves/clone.md index 6747ebd76..c7b422663 100644 --- a/session-tree/docs/leaves/clone.md +++ b/session/docs/leaves/clone.md @@ -11,4 +11,4 @@ - Unlike `session-tree::fork`, clone copies every entry across every branch, not just the active path. - All entry ids in the clone are fresh UUIDs; parent links are fully rewired to point at the clone's equivalents. - The new session's display name is `" (clone)"` when the source has a display name. -- Cloning a large session is expensive — prefer `session-tree::fork` when only the active-path context matters. +- Cloning a large session is expensive; prefer `session-tree::fork` when only the active-path context matters. diff --git a/session-tree/docs/leaves/compact.md b/session/docs/leaves/compact.md similarity index 70% rename from session-tree/docs/leaves/compact.md rename to session/docs/leaves/compact.md index eec2e9bef..3298be79c 100644 --- a/session-tree/docs/leaves/compact.md +++ b/session/docs/leaves/compact.md @@ -3,7 +3,7 @@ ## When to use - After compacting context: record that the conversation was summarised and note which files were read or modified. -- Marking a checkpoint in a long-running agent loop — the compaction entry divides history segments. +- Marking a checkpoint in a long-running agent loop, where the compaction entry divides history segments. - Logging the pre-compaction token count for cost-tracking or monitoring dashboards. ## Notes @@ -11,4 +11,4 @@ - `summary` is required; `tokens_before` defaults to zero. - `details.read_files` and `details.modified_files` are optional string arrays. Omit `details` entirely when no file operations occurred. - `parent_id` is optional. Without it, the compaction entry anchors at the most recent entry on the active path. -- The call is not idempotent — invoking it twice writes two distinct compaction entries. Inspect existing entries first when idempotency matters. +- The call is not idempotent; invoking it twice writes two distinct compaction entries. Inspect existing entries first when idempotency matters. diff --git a/session-tree/docs/leaves/create.md b/session/docs/leaves/create.md similarity index 89% rename from session-tree/docs/leaves/create.md rename to session/docs/leaves/create.md index 4e2e71ddd..9db708e5f 100644 --- a/session-tree/docs/leaves/create.md +++ b/session/docs/leaves/create.md @@ -8,7 +8,7 @@ ## Notes -- `display_name` and `cwd` are both optional — omit them for anonymous sessions. +- `display_name` and `cwd` are both optional; omit them for anonymous sessions. - The returned `session_id` is a UUID; pass it verbatim to every other `session-tree::*` call. - Sessions persist via the configured backend (`store_backend: iii_state` by default; `memory` for ephemeral runs). - `created_at` and `updated_at` are millisecond epochs; `updated_at` advances on every subsequent `session-tree::append`. diff --git a/session-tree/docs/leaves/export_html.md b/session/docs/leaves/export_html.md similarity index 88% rename from session-tree/docs/leaves/export_html.md rename to session/docs/leaves/export_html.md index 1492e3203..4d15cb7d7 100644 --- a/session-tree/docs/leaves/export_html.md +++ b/session/docs/leaves/export_html.md @@ -3,7 +3,7 @@ ## When to use - Producing a human-readable transcript of a conversation branch for review, sharing, or archiving. -- Generating a debug artefact during incident triage — write the HTML to disk or return it as a tool result. +- Generating a debug artefact during incident triage; write the HTML to disk or return it as a tool result. - Driving a preview pane in a UI: the returned HTML can be embedded in an iframe or saved straight to a file. ## Notes diff --git a/session-tree/docs/leaves/fork.md b/session/docs/leaves/fork.md similarity index 100% rename from session-tree/docs/leaves/fork.md rename to session/docs/leaves/fork.md diff --git a/session-tree/docs/leaves/messages.md b/session/docs/leaves/messages.md similarity index 76% rename from session-tree/docs/leaves/messages.md rename to session/docs/leaves/messages.md index 59343220d..b06432fa7 100644 --- a/session-tree/docs/leaves/messages.md +++ b/session/docs/leaves/messages.md @@ -2,7 +2,7 @@ ## When to use -- Reconstructing the conversation history for a resuming agent — the returned messages slot into the next request. +- Reconstructing the conversation history for a resuming agent, so the returned messages slot into the next request. - Diffing two branches: call once per `branch_leaf` and compare the resulting arrays. - Extracting a single branch's transcript for display (use `session-tree::export_html` when you want it styled). @@ -10,5 +10,5 @@ - `branch_leaf` is optional; without it the function walks back from the most recently appended entry on the main thread. - Only `AgentMessage`-typed entries appear in the output. `BranchSummary` and `Compaction` are traversed for parent-link resolution but do not contribute to the returned array. -- Sibling branches are excluded — call `session-tree::tree` when you need the full DAG. +- Sibling branches are excluded; call `session-tree::tree` when you need the full DAG. - For an `AgentContext` that includes the system prompt, assemble it in the calling agent rather than here. diff --git a/session-tree/docs/leaves/tree.md b/session/docs/leaves/tree.md similarity index 77% rename from session-tree/docs/leaves/tree.md rename to session/docs/leaves/tree.md index 6412eb7db..112e02ef8 100644 --- a/session-tree/docs/leaves/tree.md +++ b/session/docs/leaves/tree.md @@ -3,7 +3,7 @@ ## When to use - Visualising the complete branching history of a session, including every fork. -- Debugging unexpected branching — inspect the tree to find entries with multiple children or orphans. +- Debugging unexpected branching; inspect the tree to find entries with multiple children or orphans. - Driving a UI that lets users navigate between branches and pick a leaf to resume from. ## Notes @@ -11,4 +11,4 @@ - Returns an error if the session has no entries or no root (an entry with `parent_id: null`). - A well-formed session has exactly one root; if multiple parent-less entries exist, the first appended is treated as the root. - `TreeNode.entry` may be any `SessionEntry` variant: `Message`, `CustomMessage`, `BranchSummary`, or `Compaction`. -- For large sessions with many forks the response can be significant — prefer `session-tree::messages` when only the active path is needed. +- For large sessions with many forks the response can be significant; prefer `session-tree::messages` when only the active path is needed. diff --git a/session-tree/docs/quickstart.md b/session/docs/quickstart.md similarity index 100% rename from session-tree/docs/quickstart.md rename to session/docs/quickstart.md diff --git a/session/iii.worker.yaml b/session/iii.worker.yaml new file mode 100644 index 000000000..d07ac8a87 --- /dev/null +++ b/session/iii.worker.yaml @@ -0,0 +1,14 @@ +iii: v1 +name: session +language: rust +deploy: binary +manifest: Cargo.toml +bin: session +description: Session storage (parent-id tree under session-tree::*) and per-session inbox (session-inbox::*) backed by iii state. + +runtime: + kind: rust + +scripts: + install: cargo build + start: cargo run diff --git a/session-tree/skill.md b/session/skill.md similarity index 62% rename from session-tree/skill.md rename to session/skill.md index 4be6ed69b..6ebc404a0 100644 --- a/session-tree/skill.md +++ b/session/skill.md @@ -2,9 +2,9 @@ # session-tree -Session storage on the iii bus as a parent-id DAG of typed entries — agent messages, branch summaries, custom payloads, and compaction markers. `session-tree::*` lets callers create sessions, append turn-by-turn, fork branches at any entry, clone whole histories, and export a self-contained HTML transcript of the active path. Forks share history because every entry references its parent rather than copying it forward. +Session storage on the iii bus as a parent-id DAG of typed entries: agent messages, branch summaries, custom payloads, and compaction markers. `session-tree::*` lets callers create sessions, append turn-by-turn, fork branches at any entry, clone whole histories, and export a self-contained HTML transcript of the active path. Forks share history because every entry references its parent rather than copying it forward. -For resuming an agent, prefer `session-tree::messages` over `session-tree::tree` — `messages` returns only the active path in oldest-first order, which slots straight into the agent's context. `tree` returns the entire DAG including sibling branches and is much heavier on large sessions. +For resuming an agent, prefer `session-tree::messages` over `session-tree::tree`; `messages` returns only the active path in oldest-first order, which slots straight into the agent's context. `tree` returns the entire DAG including sibling branches and is much heavier on large sessions. For surfacing `session-tree::*` to LLM agents, pair with the [`skills`](../skills) worker: diff --git a/session-tree/skills/append.md b/session/skills/append.md similarity index 79% rename from session-tree/skills/append.md rename to session/skills/append.md index 0aac785bc..32d4d00af 100644 --- a/session-tree/skills/append.md +++ b/session/skills/append.md @@ -4,7 +4,7 @@ ## When to use -- Recording each turn as it occurs — user messages, assistant replies, tool results. +- Recording each turn as it occurs: user messages, assistant replies, tool results. - Building a branched history: pass the previous entry's id as `parent_id` to chain entries linearly. - Writing a synthetic session entry-by-entry before reconstructing it for an agent or rendering it for review. @@ -13,4 +13,4 @@ - `message` must be a valid `AgentMessage` from `harness-types`. Variants: `user`, `assistant`, `tool_result`, `custom`. - `parent_id` is optional. In a linear conversation thread every entry except the first should supply the previous `entry_id` as `parent_id`. - Entry ids are generated server-side; a caller-supplied id is ignored. -- The call is not idempotent — invoking it twice with the same payload writes two distinct entries. +- The call is not idempotent; invoking it twice with the same payload writes two distinct entries. diff --git a/session-tree/skills/clone.md b/session/skills/clone.md similarity index 87% rename from session-tree/skills/clone.md rename to session/skills/clone.md index 290a7edb7..3b9837918 100644 --- a/session-tree/skills/clone.md +++ b/session/skills/clone.md @@ -13,4 +13,4 @@ - Unlike `session-tree::fork`, clone copies every entry across every branch, not just the active path. - All entry ids in the clone are fresh UUIDs; parent links are fully rewired to point at the clone's equivalents. - The new session's display name is `" (clone)"` when the source has a display name. -- Cloning a large session is expensive — prefer `session-tree::fork` when only the active-path context matters. +- Cloning a large session is expensive; prefer `session-tree::fork` when only the active-path context matters. diff --git a/session-tree/skills/compact.md b/session/skills/compact.md similarity index 74% rename from session-tree/skills/compact.md rename to session/skills/compact.md index 4fb0e1d5e..7e0a665ef 100644 --- a/session-tree/skills/compact.md +++ b/session/skills/compact.md @@ -5,7 +5,7 @@ ## When to use - After compacting context: record that the conversation was summarised and note which files were read or modified. -- Marking a checkpoint in a long-running agent loop — the compaction entry divides history segments. +- Marking a checkpoint in a long-running agent loop, where the compaction entry divides history segments. - Logging the pre-compaction token count for cost-tracking or monitoring dashboards. ## Notes @@ -13,4 +13,4 @@ - `summary` is required; `tokens_before` defaults to zero. - `details.read_files` and `details.modified_files` are optional string arrays. Omit `details` entirely when no file operations occurred. - `parent_id` is optional. Without it, the compaction entry anchors at the most recent entry on the active path. -- The call is not idempotent — invoking it twice writes two distinct compaction entries. Inspect existing entries first when idempotency matters. +- The call is not idempotent; invoking it twice writes two distinct compaction entries. Inspect existing entries first when idempotency matters. diff --git a/session-tree/skills/create.md b/session/skills/create.md similarity index 91% rename from session-tree/skills/create.md rename to session/skills/create.md index f4d338308..ca178511b 100644 --- a/session-tree/skills/create.md +++ b/session/skills/create.md @@ -10,7 +10,7 @@ ## Notes -- `display_name` and `cwd` are both optional — omit them for anonymous sessions. +- `display_name` and `cwd` are both optional; omit them for anonymous sessions. - The returned `session_id` is a UUID; pass it verbatim to every other `session-tree::*` call. - Sessions persist via the configured backend (`store_backend: iii_state` by default; `memory` for ephemeral runs). - `created_at` and `updated_at` are millisecond epochs; `updated_at` advances on every subsequent `session-tree::append`. diff --git a/session-tree/skills/export_html.md b/session/skills/export_html.md similarity index 90% rename from session-tree/skills/export_html.md rename to session/skills/export_html.md index 929549c27..863fbc748 100644 --- a/session-tree/skills/export_html.md +++ b/session/skills/export_html.md @@ -5,7 +5,7 @@ ## When to use - Producing a human-readable transcript of a conversation branch for review, sharing, or archiving. -- Generating a debug artefact during incident triage — write the HTML to disk or return it as a tool result. +- Generating a debug artefact during incident triage; write the HTML to disk or return it as a tool result. - Driving a preview pane in a UI: the returned HTML can be embedded in an iframe or saved straight to a file. ## Notes diff --git a/session-tree/skills/fork.md b/session/skills/fork.md similarity index 100% rename from session-tree/skills/fork.md rename to session/skills/fork.md diff --git a/session-tree/skills/messages.md b/session/skills/messages.md similarity index 79% rename from session-tree/skills/messages.md rename to session/skills/messages.md index 92d6937d1..b1705a903 100644 --- a/session-tree/skills/messages.md +++ b/session/skills/messages.md @@ -4,7 +4,7 @@ ## When to use -- Reconstructing the conversation history for a resuming agent — the returned messages slot into the next request. +- Reconstructing the conversation history for a resuming agent, so the returned messages slot into the next request. - Diffing two branches: call once per `branch_leaf` and compare the resulting arrays. - Extracting a single branch's transcript for display (use `session-tree::export_html` when you want it styled). @@ -12,5 +12,5 @@ - `branch_leaf` is optional; without it the function walks back from the most recently appended entry on the main thread. - Only `AgentMessage`-typed entries appear in the output. `BranchSummary` and `Compaction` are traversed for parent-link resolution but do not contribute to the returned array. -- Sibling branches are excluded — call `session-tree::tree` when you need the full DAG. +- Sibling branches are excluded; call `session-tree::tree` when you need the full DAG. - For an `AgentContext` that includes the system prompt, assemble it in the calling agent rather than here. diff --git a/session-tree/skills/tree.md b/session/skills/tree.md similarity index 80% rename from session-tree/skills/tree.md rename to session/skills/tree.md index 335b43327..7ad8fbbaf 100644 --- a/session-tree/skills/tree.md +++ b/session/skills/tree.md @@ -5,7 +5,7 @@ ## When to use - Visualising the complete branching history of a session, including every fork. -- Debugging unexpected branching — inspect the tree to find entries with multiple children or orphans. +- Debugging unexpected branching; inspect the tree to find entries with multiple children or orphans. - Driving a UI that lets users navigate between branches and pick a leaf to resume from. ## Notes @@ -13,4 +13,4 @@ - Returns an error if the session has no entries or no root (an entry with `parent_id: null`). - A well-formed session has exactly one root; if multiple parent-less entries exist, the first appended is treated as the root. - `TreeNode.entry` may be any `SessionEntry` variant: `Message`, `CustomMessage`, `BranchSummary`, or `Compaction`. -- For large sessions with many forks the response can be significant — prefer `session-tree::messages` when only the active path is needed. +- For large sessions with many forks the response can be significant; prefer `session-tree::messages` when only the active path is needed. diff --git a/session/src/config.rs b/session/src/config.rs new file mode 100644 index 000000000..074bc61b9 --- /dev/null +++ b/session/src/config.rs @@ -0,0 +1,77 @@ +use anyhow::{Context, Result}; +use serde::{Deserialize, Serialize}; + +#[derive(Deserialize, Serialize, Debug, Clone)] +pub struct SessionConfig { + #[serde(default = "default_store_backend")] + pub store_backend: String, + #[serde(default = "default_engine_url")] + pub engine_url: String, + #[serde(default = "default_state_scope")] + pub state_scope: String, +} + +fn default_store_backend() -> String { + "iii_state".to_string() +} + +fn default_engine_url() -> String { + "ws://127.0.0.1:49134".to_string() +} + +fn default_state_scope() -> String { + "agent".to_string() +} + +impl Default for SessionConfig { + fn default() -> Self { + Self { + store_backend: default_store_backend(), + engine_url: default_engine_url(), + state_scope: default_state_scope(), + } + } +} + +pub fn load_config(path: &str) -> Result { + let contents = std::fs::read_to_string(path).with_context(|| format!("read {path}"))?; + let cfg: SessionConfig = + serde_yaml::from_str(&contents).with_context(|| format!("parse yaml {path}"))?; + Ok(cfg) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn defaults_from_empty_yaml() { + let cfg: SessionConfig = serde_yaml::from_str("{}").unwrap(); + assert_eq!(cfg.store_backend, "iii_state"); + assert_eq!(cfg.engine_url, "ws://127.0.0.1:49134"); + assert_eq!(cfg.state_scope, "agent"); + } + + #[test] + fn custom_yaml_overrides() { + let cfg: SessionConfig = serde_yaml::from_str( + r#" +store_backend: memory +engine_url: "ws://example:49134" +state_scope: custom +"#, + ) + .unwrap(); + assert_eq!(cfg.store_backend, "memory"); + assert_eq!(cfg.engine_url, "ws://example:49134"); + assert_eq!(cfg.state_scope, "custom"); + } + + #[test] + fn impl_default_matches_yaml_defaults() { + let d = SessionConfig::default(); + assert_eq!(d.store_backend, default_store_backend()); + assert_eq!(d.engine_url, default_engine_url()); + assert_eq!(d.state_scope, default_state_scope()); + } +} diff --git a/session-inbox/src/config.rs b/session/src/inbox/config.rs similarity index 100% rename from session-inbox/src/config.rs rename to session/src/inbox/config.rs diff --git a/session-inbox/src/handler.rs b/session/src/inbox/handler.rs similarity index 98% rename from session-inbox/src/handler.rs rename to session/src/inbox/handler.rs index fd7b95fab..657e8c9d8 100644 --- a/session-inbox/src/handler.rs +++ b/session/src/inbox/handler.rs @@ -5,8 +5,8 @@ use std::sync::Arc; use iii_sdk::{IIIError, RegisterFunctionMessage, TriggerRequest, Value, III}; use serde_json::json; -use crate::config::WorkerConfig; -use crate::{inbox_key, DRAIN_ID, PEEK_ID, PUSH_ID}; +use super::config::WorkerConfig; +use super::{inbox_key, DRAIN_ID, PEEK_ID, PUSH_ID}; async fn execute_push(iii: III, state_scope: String, payload: Value) -> Result { let name = required_str(&payload, "name")?; diff --git a/session-inbox/src/lib.rs b/session/src/inbox/mod.rs similarity index 99% rename from session-inbox/src/lib.rs rename to session/src/inbox/mod.rs index 4cccef947..6abd2d569 100644 --- a/session-inbox/src/lib.rs +++ b/session/src/inbox/mod.rs @@ -4,7 +4,6 @@ use std::sync::Arc; pub mod config; pub mod handler; -pub mod manifest; pub const PUSH_ID: &str = "session-inbox::push"; pub const DRAIN_ID: &str = "session-inbox::drain"; diff --git a/session/src/lib.rs b/session/src/lib.rs new file mode 100644 index 000000000..97390ebbe --- /dev/null +++ b/session/src/lib.rs @@ -0,0 +1,11 @@ +//! Unified session worker library. +//! +//! Exposes two sibling namespaces from a single crate: +//! +//! - [`tree`] — branching session storage, registered as `session-tree::*`. +//! - [`inbox`] — per-session inbox queues, registered as `session-inbox::*`. + +pub mod config; +pub mod inbox; +pub mod manifest; +pub mod tree; diff --git a/session-tree/src/main.rs b/session/src/main.rs similarity index 75% rename from session-tree/src/main.rs rename to session/src/main.rs index 526da3c2f..c526925a6 100644 --- a/session-tree/src/main.rs +++ b/session/src/main.rs @@ -6,17 +6,17 @@ use clap::Parser; use iii_sdk::{register_worker, InitOptions, OtelConfig, TriggerRequest, WorkerMetadata}; use serde_json::json; -mod config; -mod manifest; +use session::{config, inbox, manifest, tree}; #[derive(Parser, Debug)] -#[command(name = "session-tree", about = "Session tree worker for iii")] +#[command(name = "session", about = "Session storage + inbox worker for iii")] struct Cli { #[arg(long, default_value = "./config.yaml")] config: String, - #[arg(long, env = "III_URL", default_value = "ws://127.0.0.1:49134")] - url: String, + /// Engine WebSocket URL. Overrides `engine_url` in `--config` when set (or use `III_URL`). + #[arg(long, env = "III_URL")] + url: Option, #[arg(long)] manifest: bool, @@ -43,18 +43,20 @@ async fn main() -> Result<()> { Ok(c) => c, Err(e) => { tracing::warn!(error = %e, path = %cli.config, "failed to load config, using defaults"); - config::SessionTreeConfig::default() + config::SessionConfig::default() } }; + let url = cli.url.unwrap_or_else(|| cfg.engine_url.clone()); + let iii = Arc::new(register_worker( - &cli.url, + &url, InitOptions { otel: Some(OtelConfig::default()), metadata: Some(WorkerMetadata { runtime: "rust".to_string(), version: env!("CARGO_PKG_VERSION").to_string(), - name: "session-tree".to_string(), + name: "session".to_string(), os: std::env::consts::OS.to_string(), pid: Some(std::process::id()), telemetry: None, @@ -64,15 +66,16 @@ async fn main() -> Result<()> { }, )); - let store: Arc = match cfg.store_backend.as_str() { + // session-tree::* surface + let store: Arc = match cfg.store_backend.as_str() { "memory" => { tracing::info!("session-tree: using in-memory store (store_backend=memory)"); - Arc::new(session_tree::InMemoryStore::default()) + Arc::new(tree::InMemoryStore::default()) } "iii_state" => { tracing::info!("session-tree: using iii-state store"); - let iii_for_store: Arc = iii.clone(); - Arc::new(session_tree::store_iii_state::IiiStateSessionStore::new( + let iii_for_store: Arc = iii.clone(); + Arc::new(tree::store_iii_state::IiiStateSessionStore::new( iii_for_store, )) } @@ -81,16 +84,29 @@ async fn main() -> Result<()> { unknown_backend = other, "unknown store_backend; falling back to iii_state (valid: memory, iii_state)" ); - let iii_for_store: Arc = iii.clone(); - Arc::new(session_tree::store_iii_state::IiiStateSessionStore::new( + let iii_for_store: Arc = iii.clone(); + Arc::new(tree::store_iii_state::IiiStateSessionStore::new( iii_for_store, )) } }; - let _refs = session_tree::register_with_iii(&iii, store); + let _tree_refs = tree::register_with_iii(&iii, store); tracing::info!("session-tree registered (session-tree::*)"); + // session-inbox::* surface + let inbox_cfg = Arc::new(inbox::config::WorkerConfig { + engine_url: cfg.engine_url.clone(), + state_scope: cfg.state_scope.clone(), + }); + inbox::register_with_iii(&iii, &inbox_cfg); + tracing::info!( + "session-inbox registered ({}, {}, {})", + inbox::PUSH_ID, + inbox::DRAIN_ID, + inbox::PEEK_ID + ); + spawn_skill_register(iii.clone()); wait_for_shutdown().await?; @@ -136,8 +152,8 @@ async fn register_skill_with_retry(iii: &iii_sdk::III, id: &str, body: &str) { fn spawn_skill_register(iii: Arc) { tokio::spawn(async move { - register_skill_with_retry(&iii, session_tree::SKILL_ID, session_tree::SKILL_MD).await; - for (id, body) in session_tree::SUB_SKILLS { + register_skill_with_retry(&iii, tree::SKILL_ID, tree::SKILL_MD).await; + for (id, body) in tree::SUB_SKILLS { register_skill_with_retry(&iii, id, body).await; } }); @@ -164,7 +180,7 @@ async fn wait_for_shutdown() -> Result<()> { } async fn unregister_skill(iii: &Arc) { - for (id, _) in session_tree::SUB_SKILLS { + for (id, _) in tree::SUB_SKILLS { let _ = iii .trigger(TriggerRequest { function_id: "skills::unregister".into(), @@ -177,7 +193,7 @@ async fn unregister_skill(iii: &Arc) { let _ = iii .trigger(TriggerRequest { function_id: "skills::unregister".into(), - payload: json!({ "id": session_tree::SKILL_ID }), + payload: json!({ "id": tree::SKILL_ID }), action: None, timeout_ms: Some(2_000), }) diff --git a/session-tree/src/manifest.rs b/session/src/manifest.rs similarity index 68% rename from session-tree/src/manifest.rs rename to session/src/manifest.rs index 789d3150a..f8741c855 100644 --- a/session-tree/src/manifest.rs +++ b/session/src/manifest.rs @@ -1,5 +1,7 @@ use serde::Serialize; +use crate::config::SessionConfig; + #[derive(Serialize)] pub struct ModuleManifest { pub name: String, @@ -13,11 +15,10 @@ pub fn build_manifest() -> ModuleManifest { ModuleManifest { name: env!("CARGO_PKG_NAME").to_string(), version: env!("CARGO_PKG_VERSION").to_string(), - description: "Session storage as a parent-id tree of typed entries under session-tree::*." + description: "Session storage (session-tree::*) + per-session inbox (session-inbox::*) backed by iii state." .to_string(), - default_config: serde_json::json!({ - "store_backend": "iii_state", - }), + default_config: serde_json::to_value(SessionConfig::default()) + .expect("SessionConfig serializes to JSON"), supported_targets: vec![env!("TARGET").to_string()], } } @@ -34,6 +35,9 @@ mod tests { assert_eq!(parsed["name"], env!("CARGO_PKG_NAME")); assert_eq!(parsed["version"], env!("CARGO_PKG_VERSION")); assert!(parsed["default_config"].is_object()); + assert!(parsed["default_config"]["store_backend"].is_string()); + assert!(parsed["default_config"]["engine_url"].is_string()); + assert!(parsed["default_config"]["state_scope"].is_string()); assert!(!parsed["supported_targets"].as_array().unwrap().is_empty()); } } diff --git a/session-tree/src/io.rs b/session/src/tree/io.rs similarity index 100% rename from session-tree/src/io.rs rename to session/src/tree/io.rs diff --git a/session-tree/src/lib.rs b/session/src/tree/mod.rs similarity index 98% rename from session-tree/src/lib.rs rename to session/src/tree/mod.rs index efe1ac8c6..c3a0c47b7 100644 --- a/session-tree/src/lib.rs +++ b/session/src/tree/mod.rs @@ -4,22 +4,31 @@ //! P2 surface: fork / clone_session / compact / export_html / tree. pub const SKILL_ID: &str = "session-tree"; -pub const SKILL_MD: &str = include_str!("../skill.md"); +pub const SKILL_MD: &str = include_str!("../../skill.md"); pub const SUB_SKILLS: &[(&str, &str)] = &[ - ("session-tree/create", include_str!("../skills/create.md")), - ("session-tree/append", include_str!("../skills/append.md")), + ( + "session-tree/create", + include_str!("../../skills/create.md"), + ), + ( + "session-tree/append", + include_str!("../../skills/append.md"), + ), ( "session-tree/messages", - include_str!("../skills/messages.md"), + include_str!("../../skills/messages.md"), + ), + ("session-tree/tree", include_str!("../../skills/tree.md")), + ("session-tree/fork", include_str!("../../skills/fork.md")), + ("session-tree/clone", include_str!("../../skills/clone.md")), + ( + "session-tree/compact", + include_str!("../../skills/compact.md"), ), - ("session-tree/tree", include_str!("../skills/tree.md")), - ("session-tree/fork", include_str!("../skills/fork.md")), - ("session-tree/clone", include_str!("../skills/clone.md")), - ("session-tree/compact", include_str!("../skills/compact.md")), ( "session-tree/export_html", - include_str!("../skills/export_html.md"), + include_str!("../../skills/export_html.md"), ), ]; diff --git a/session-tree/src/store_iii_state.rs b/session/src/tree/store_iii_state.rs similarity index 99% rename from session-tree/src/store_iii_state.rs rename to session/src/tree/store_iii_state.rs index 11d041317..109c38bb6 100644 --- a/session-tree/src/store_iii_state.rs +++ b/session/src/tree/store_iii_state.rs @@ -13,7 +13,7 @@ use std::sync::Arc; use iii_sdk::TriggerRequest; use serde_json::json; -use crate::{io::IIITrigger, SessionEntry, SessionError, SessionMeta, SessionStore}; +use crate::tree::{io::IIITrigger, SessionEntry, SessionError, SessionMeta, SessionStore}; const META_SCOPE: &str = "session_tree_meta"; diff --git a/session-inbox/tests/common/mod.rs b/session/tests/common/mod.rs similarity index 56% rename from session-inbox/tests/common/mod.rs rename to session/tests/common/mod.rs index a15e040a1..41e004fb3 100644 --- a/session-inbox/tests/common/mod.rs +++ b/session/tests/common/mod.rs @@ -1,17 +1,17 @@ use std::path::{Path, PathBuf}; -pub fn session_inbox_executable() -> PathBuf { - if let Some(p) = std::env::var_os("CARGO_BIN_EXE_session_inbox") { +pub fn session_executable() -> PathBuf { + if let Some(p) = std::env::var_os("CARGO_BIN_EXE_session") { return PathBuf::from(p); } let dir = Path::new(env!("CARGO_MANIFEST_DIR")); for profile in ["debug", "release"] { - let candidate = dir.join("target").join(profile).join("session-inbox"); + let candidate = dir.join("target").join(profile).join("session"); if candidate.is_file() { return candidate; } } panic!( - "session-inbox binary not found under target/{{debug,release}}/; run `cargo build --bin session-inbox` first" + "session binary not found under target/{{debug,release}}/; run `cargo build --bin session` first" ); } diff --git a/session-inbox/tests/integration.rs b/session/tests/inbox_integration.rs similarity index 88% rename from session-inbox/tests/integration.rs rename to session/tests/inbox_integration.rs index 4d66b3942..14425fe04 100644 --- a/session-inbox/tests/integration.rs +++ b/session/tests/inbox_integration.rs @@ -13,15 +13,15 @@ const ENGINE_WS: &str = "ws://127.0.0.1:49134"; #[test] fn function_ids_use_worker_namespace() { - assert_eq!(session_inbox::PUSH_ID, "session-inbox::push"); - assert_eq!(session_inbox::DRAIN_ID, "session-inbox::drain"); - assert_eq!(session_inbox::PEEK_ID, "session-inbox::peek"); + assert_eq!(session::inbox::PUSH_ID, "session-inbox::push"); + assert_eq!(session::inbox::DRAIN_ID, "session-inbox::drain"); + assert_eq!(session::inbox::PEEK_ID, "session-inbox::peek"); } #[test] fn inbox_key_uses_session_namespace() { assert_eq!( - session_inbox::inbox_key("steering", "s1"), + session::inbox::inbox_key("steering", "s1"), "session/s1/steering" ); } @@ -52,7 +52,7 @@ async fn boot() -> Option { sleep(Duration::from_millis(800)).await; - let worker_bin = common::session_inbox_executable(); + let worker_bin = common::session_executable(); let manifest_dir = env!("CARGO_MANIFEST_DIR"); let config_path = format!("{manifest_dir}/config.yaml"); diff --git a/session-inbox/tests/manifest.rs b/session/tests/manifest.rs similarity index 73% rename from session-inbox/tests/manifest.rs rename to session/tests/manifest.rs index a01ecaad9..2d4a1e312 100644 --- a/session-inbox/tests/manifest.rs +++ b/session/tests/manifest.rs @@ -1,16 +1,16 @@ -mod common; - use std::process::Command; use serde_json::Value; +mod common; + #[test] fn manifest_subcommand_emits_valid_json() { - let bin = common::session_inbox_executable(); - let output = Command::new(bin) + let bin = common::session_executable(); + let output = Command::new(&bin) .arg("--manifest") .output() - .expect("spawn session-inbox --manifest"); + .expect("spawn session --manifest"); assert!( output.status.success(), @@ -25,6 +25,10 @@ fn manifest_subcommand_emits_valid_json() { assert_eq!(manifest["name"], env!("CARGO_PKG_NAME")); assert_eq!(manifest["version"], env!("CARGO_PKG_VERSION")); assert!(manifest["default_config"].is_object()); + let cfg = &manifest["default_config"]; + assert!(cfg["store_backend"].is_string()); + assert!(cfg["engine_url"].is_string()); + assert!(cfg["state_scope"].is_string()); assert!(!manifest["supported_targets"] .as_array() .expect("supported_targets must be an array") diff --git a/session-tree/tests/integration.rs b/session/tests/tree_integration.rs similarity index 95% rename from session-tree/tests/integration.rs rename to session/tests/tree_integration.rs index 1f7746042..02f6cd2f1 100644 --- a/session-tree/tests/integration.rs +++ b/session/tests/tree_integration.rs @@ -1,13 +1,13 @@ //! Smoke + bus-level integration tests for `session-tree::list` and //! `session-tree::messages`. //! -//! The bus tests boot a real `iii` engine and the `session-tree` worker +//! The bus tests boot a real `iii` engine and the `session` worker //! against a transient in-memory store, then drive each function through //! `iii.trigger`. They skip silently when the `iii` CLI is not on PATH so //! `cargo test` stays green in plain dev environments. //! //! To run them locally: -//! cargo build --bin session-tree +//! cargo build --bin session //! cargo test --test integration mod common; @@ -24,7 +24,7 @@ const ENGINE_WS: &str = "ws://127.0.0.1:49134"; #[test] fn in_memory_store_constructs() { - let _store = session_tree::InMemoryStore::default(); + let _store = session::tree::InMemoryStore::default(); } struct Harness { @@ -53,9 +53,9 @@ async fn boot() -> Option { sleep(Duration::from_millis(800)).await; - let worker_bin = common::session_tree_executable(); + let worker_bin = common::session_executable(); let manifest_dir = env!("CARGO_MANIFEST_DIR"); - let config_path = format!("{manifest_dir}/tests/integration_memory.yaml"); + let config_path = format!("{manifest_dir}/tests/tree_integration_memory.yaml"); let worker = Command::new(worker_bin) .args(["--url", ENGINE_WS, "--config", &config_path]) diff --git a/session-tree/tests/integration_iii_state.rs b/session/tests/tree_integration_iii_state.rs similarity index 99% rename from session-tree/tests/integration_iii_state.rs rename to session/tests/tree_integration_iii_state.rs index 6a1e92712..d93c92fee 100644 --- a/session-tree/tests/integration_iii_state.rs +++ b/session/tests/tree_integration_iii_state.rs @@ -5,7 +5,7 @@ use std::sync::Arc; -use session_tree::{ +use session::tree::{ io::IIITrigger, store_iii_state::IiiStateSessionStore, SessionEntry, SessionMeta, SessionStore, }; diff --git a/session-tree/tests/integration_memory.yaml b/session/tests/tree_integration_memory.yaml similarity index 100% rename from session-tree/tests/integration_memory.yaml rename to session/tests/tree_integration_memory.yaml diff --git a/session-tree/tests/parity.rs b/session/tests/tree_parity.rs similarity index 99% rename from session-tree/tests/parity.rs rename to session/tests/tree_parity.rs index 0d34fd044..008e7e0f0 100644 --- a/session-tree/tests/parity.rs +++ b/session/tests/tree_parity.rs @@ -6,7 +6,7 @@ use std::sync::Arc; -use session_tree::{ +use session::tree::{ io::IIITrigger, store_iii_state::IiiStateSessionStore, InMemoryStore, SessionEntry, SessionError, SessionMeta, SessionStore, }; diff --git a/session-tree/tests/restart_e2e.rs b/session/tests/tree_restart_e2e.rs similarity index 94% rename from session-tree/tests/restart_e2e.rs rename to session/tests/tree_restart_e2e.rs index 88d3b9bc7..31c46b7a0 100644 --- a/session-tree/tests/restart_e2e.rs +++ b/session/tests/tree_restart_e2e.rs @@ -3,13 +3,13 @@ //! //! Requires: //! - `IIITEST_ENGINE_URL`: WebSocket URL of a running iii engine -//! - `IIITEST_WORKER_BIN`: absolute path to the session-tree binary +//! - `IIITEST_WORKER_BIN`: absolute path to the session binary //! //! Marked `#[ignore]` so cargo test default runs skip it. To execute: -//! cargo build --release -p session-tree +//! cargo build --release -p session //! IIITEST_ENGINE_URL=ws://127.0.0.1:49134 \ -//! IIITEST_WORKER_BIN=$(pwd)/target/release/session-tree \ -//! cargo test -p session-tree --test restart_e2e -- --ignored +//! IIITEST_WORKER_BIN=$(pwd)/target/release/session \ +//! cargo test -p session --test tree_restart_e2e -- --ignored //! //! Schema source (verified against session-tree/src/lib.rs `register_with_iii`): //! - `session-tree::create` payload: `{ "display_name": str?, "cwd": str? }` → @@ -38,7 +38,7 @@ fn spawn_worker(engine_url: &str, bin: &str) -> Child { .stdout(Stdio::null()) .stderr(Stdio::null()) .spawn() - .expect("spawn session-tree") + .expect("spawn session") } async fn wait_for_ready() { diff --git a/session-tree/tests/skill.rs b/session/tests/tree_skill.rs similarity index 92% rename from session-tree/tests/skill.rs rename to session/tests/tree_skill.rs index 8f960d7d8..bee9c43cb 100644 --- a/session-tree/tests/skill.rs +++ b/session/tests/tree_skill.rs @@ -72,14 +72,14 @@ fn id_is_valid(label: &str, id: &str) { #[test] fn router_well_formed() { - well_formed("router", session_tree::SKILL_MD, true); - id_is_valid("router", session_tree::SKILL_ID); + well_formed("router", session::tree::SKILL_MD, true); + id_is_valid("router", session::tree::SKILL_ID); } #[test] fn sub_skills_well_formed() { - let prefix = format!("{}/", session_tree::SKILL_ID); - for (id, body) in session_tree::SUB_SKILLS { + let prefix = format!("{}/", session::tree::SKILL_ID); + for (id, body) in session::tree::SUB_SKILLS { // Canonical leaves go directly from the topical H1 to ## When to use, // so the summary-paragraph assertion only applies to the router skill. well_formed(id, body, false); @@ -87,7 +87,7 @@ fn sub_skills_well_formed() { assert!( id.starts_with(&prefix), "sub-skill id {id:?} must be nested under the worker id ({}/)", - session_tree::SKILL_ID + session::tree::SKILL_ID ); } } diff --git a/turn-orchestrator/README.md b/turn-orchestrator/README.md index 11471f6fd..077dda986 100644 --- a/turn-orchestrator/README.md +++ b/turn-orchestrator/README.md @@ -16,7 +16,7 @@ iii worker add turn-orchestrator `iii worker add` fetches the binary, writes a config block into the engine's `config.yaml`, and the engine starts the worker on the next `iii worker start`. -`turn-orchestrator` depends on [`session-inbox`](../session-inbox), [`hook-fanout`](../hook-fanout), and [`provider-router`](../provider-router) — `iii worker add turn-orchestrator` pulls them in via the `dependencies` block. Most users get the orchestrator transitively by installing the [`harness`](../harness) meta-worker. For surfacing `run::*` to LLM agents, pair with [`skills`](../skills): +`turn-orchestrator` depends on [`session`](../session), [`hook-fanout`](../hook-fanout), and [`provider-router`](../provider-router) — `iii worker add turn-orchestrator` pulls them in via the `dependencies` block. Most users get the orchestrator transitively by installing the [`harness`](../harness) meta-worker. For surfacing `run::*` to LLM agents, pair with [`skills`](../skills): ```bash iii worker add skills diff --git a/turn-orchestrator/docs/companions.md b/turn-orchestrator/docs/companions.md index a1a307155..2e0bb4334 100644 --- a/turn-orchestrator/docs/companions.md +++ b/turn-orchestrator/docs/companions.md @@ -1,4 +1,4 @@ -`turn-orchestrator` depends on [`session-inbox`](../session-inbox), [`hook-fanout`](../hook-fanout), and [`provider-router`](../provider-router) — `iii worker add turn-orchestrator` pulls them in via the `dependencies` block. Most users get the orchestrator transitively by installing the [`harness`](../harness) meta-worker. For surfacing `run::*` to LLM agents, pair with [`skills`](../skills): +`turn-orchestrator` depends on [`session`](../session), [`hook-fanout`](../hook-fanout), and [`provider-router`](../provider-router) — `iii worker add turn-orchestrator` pulls them in via the `dependencies` block. Most users get the orchestrator transitively by installing the [`harness`](../harness) meta-worker. For surfacing `run::*` to LLM agents, pair with [`skills`](../skills): ```bash iii worker add skills diff --git a/turn-orchestrator/iii.worker.yaml b/turn-orchestrator/iii.worker.yaml index 30059c26b..a47a2a775 100644 --- a/turn-orchestrator/iii.worker.yaml +++ b/turn-orchestrator/iii.worker.yaml @@ -14,6 +14,6 @@ scripts: start: cargo run dependencies: - session-inbox: "^0.1.0" + session: "^0.1.0" hook-fanout: "^0.1.0" provider-router: "^0.1.0" diff --git a/turn-orchestrator/tests/common/mod.rs b/turn-orchestrator/tests/common/mod.rs index 90f00727e..c3cad562c 100644 --- a/turn-orchestrator/tests/common/mod.rs +++ b/turn-orchestrator/tests/common/mod.rs @@ -1,8 +1,8 @@ //! Shared boot harness for turn-orchestrator integration tests. //! -//! Spawns an `iii` engine and the `iii-session-tree` worker, returning a +//! Spawns an `iii` engine and the `session` worker, returning a //! handle whose [`Drop`] kills both. Tests skip gracefully if the `iii` -//! binary is not on PATH or the session-tree worker binary cannot be located, +//! binary is not on PATH or the session worker binary cannot be located, //! so plain `cargo test` stays green. #![allow(dead_code)] @@ -32,7 +32,7 @@ impl Drop for Harness { } impl Harness { - /// Boot iii engine + iii-session-tree worker. Returns `None` and logs to + /// Boot iii engine + session worker. Returns `None` and logs to /// stderr if the test environment is missing prerequisites. pub async fn boot() -> Option { let iii_bin = match which::which("iii") { @@ -43,21 +43,21 @@ impl Harness { } }; - let worker_bin = match find_session_tree_binary() { + let worker_bin = match find_session_binary() { Some(p) => p, None => { eprintln!( - "skipping: `iii-session-tree` binary not found; \ - run `cargo build --bin iii-session-tree` in ../session-tree first" + "skipping: `session` binary not found; \ + run `cargo build --bin session` in ../session first" ); return None; } }; - let config_path = match find_session_tree_memory_config() { + let config_path = match find_session_memory_config() { Some(p) => p, None => { - eprintln!("skipping: session-tree integration_memory.yaml not found"); + eprintln!("skipping: session tree_integration_memory.yaml not found"); return None; } }; @@ -96,20 +96,17 @@ impl Harness { } } -fn find_session_tree_binary() -> Option { - if let Some(p) = std::env::var_os("IIITEST_SESSION_TREE_BIN") { +fn find_session_binary() -> Option { + if let Some(p) = std::env::var_os("IIITEST_SESSION_BIN") { let buf = PathBuf::from(p); if buf.is_file() { return Some(buf); } } let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR")); - let session_tree_dir = manifest_dir.parent()?.join("session-tree"); + let session_dir = manifest_dir.parent()?.join("session"); for profile in ["debug", "release"] { - let candidate = session_tree_dir - .join("target") - .join(profile) - .join("session-tree"); + let candidate = session_dir.join("target").join(profile).join("session"); if candidate.is_file() { return Some(candidate); } @@ -117,13 +114,13 @@ fn find_session_tree_binary() -> Option { None } -fn find_session_tree_memory_config() -> Option { +fn find_session_memory_config() -> Option { let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR")); let candidate = manifest_dir .parent()? - .join("session-tree") + .join("session") .join("tests") - .join("integration_memory.yaml"); + .join("tree_integration_memory.yaml"); if candidate.is_file() { Some(candidate) } else {