fix: track retained assignment parents

fix: validate assignment runtime snapshots
fix: preserve retained assignment history
2026-08-20 11:47:09 +09:00 · 2026-08-20 11:47:09 +09:00 · 2026-08-20 11:47:09 +09:00 · 2026-08-20 11:47:09 +09:00 · 2026-08-20 11:47:09 +09:00 · 2026-08-20 11:47:09 +09:00
343 changed files with 3836 additions and 19336 deletions
@@ -14,7 +14,7 @@ Workerの状態から純粋に再現可能で、且つ揮発性の無い操作

 **禁止**: ターンを跨ぐことができない情報に基づいて、history に記録せずに context だけにコンテンツを差し込むこと。これをやると LLM はそれに反応して生成を行う一方、次以降のターンでhistoryに残らないため、「自分がなぜその発言/tool call をしたか」の根拠が消えるうえ、prompt cache のヒット率も低下させることになる。

-新しい input を context に乗せたいなら、必ず先に `worker.history` に append して commit すること。`history.json` への永続化はそこから自動的についてくる。Notify / WorkerEvent / typed `SystemItem` reminder はこの原則で扱う。
+新しい input を context に乗せたいなら、必ず先に `worker.history` に append して commit すること。`history.json` への永続化はそこから自動的についてくる。Notify / WorkerEvent / `<system-reminder>` 系はこの原則で扱う。
 また、キャッシュを破壊するタイミングは正確にコントロールされる必要があり、キャッシュ破壊とトークン消費のトレードオフに基づいて慎重に設計されるべきである。

 ---
@@ -37,42 +37,6 @@ dependencies = [
 "cpufeatures 0.2.17",
 ]

-[[package]]
-name = "agen"
-version = "0.2.1"
-dependencies = [
- "agen-macros",
- "async-trait",
- "base64 0.22.1",
- "chrono",
- "clap",
- "dotenv",
- "eventsource-stream",
- "futures",
- "reqwest",
- "schemars",
- "serde",
- "serde_json",
- "tempfile",
- "thiserror 2.0.18",
- "tokio",
- "tokio-util",
- "tracing",
- "tracing-subscriber",
- "trybuild",
- "wiremock",
- "zstd",
-]
-
-[[package]]
-name = "agen-macros"
-version = "0.2.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.4"
@@ -576,7 +540,6 @@ dependencies = [
 "tokio-tungstenite 0.29.0",
 "uuid",
 "workdir",
- "workspace-api",
 ]

 [[package]]
@@ -2297,6 +2260,42 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"

+[[package]]
+name = "llm-engine"
+version = "0.2.1"
+dependencies = [
+ "async-trait",
+ "base64 0.22.1",
+ "chrono",
+ "clap",
+ "dotenv",
+ "eventsource-stream",
+ "futures",
+ "llm-engine-macros",
+ "reqwest",
+ "schemars",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "thiserror 2.0.18",
+ "tokio",
+ "tokio-util",
+ "tracing",
+ "tracing-subscriber",
+ "trybuild",
+ "wiremock",
+ "zstd",
+]
+
+[[package]]
+name = "llm-engine-macros"
+version = "0.2.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "lock_api"
 version = "0.4.14"
@@ -2384,8 +2383,8 @@ dependencies = [
 name = "manifest"
 version = "0.1.0"
 dependencies = [
- "agen",
 "arc-swap",
+ "llm-engine",
 "protocol",
 "secrets",
 "serde",
@@ -2512,11 +2511,11 @@ dependencies = [
 name = "memory"
 version = "0.1.0"
 dependencies = [
- "agen",
 "async-trait",
 "chrono",
 "libc",
 "lint-common",
+ "llm-engine",
 "manifest",
 "schemars",
 "serde",
@@ -3967,10 +3966,10 @@ dependencies = [
 name = "session-store"
 version = "0.1.0"
 dependencies = [
- "agen",
 "async-trait",
 "base64 0.22.1",
 "futures",
+ "llm-engine",
 "protocol",
 "serde",
 "serde_json",
@@ -4408,10 +4407,10 @@ dependencies = [
 name = "ticket"
 version = "0.1.0"
 dependencies = [
- "agen",
 "async-trait",
 "chrono",
 "fs4",
+ "llm-engine",
 "project-record",
 "rusqlite",
 "schemars",
@@ -4612,11 +4611,11 @@ checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
 name = "tools"
 version = "0.1.0"
 dependencies = [
- "agen",
 "async-trait",
 "filetime",
 "fs-operation",
 "html5ever",
+ "llm-engine",
 "manifest",
 "markup5ever_rcdom",
 "pdf-extract",
@@ -4794,11 +4793,11 @@ checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
 name = "tui"
 version = "0.1.0"
 dependencies = [
- "agen",
 "base64 0.22.1",
 "client",
 "crossterm 0.28.1",
 "fs4",
+ "llm-engine",
 "manifest",
 "protocol",
 "pulldown-cmark",
@@ -6060,7 +6059,6 @@ dependencies = [
 name = "worker"
 version = "0.1.0"
 dependencies = [
- "agen",
 "arc-swap",
 "async-trait",
 "chrono",
@@ -6075,6 +6073,7 @@ dependencies = [
 "futures-util",
 "include_dir",
 "libc",
+ "llm-engine",
 "manifest",
 "mcp",
 "memory",
@@ -6108,13 +6107,13 @@ dependencies = [
 name = "worker-runtime"
 version = "0.1.0"
 dependencies = [
- "agen",
 "async-trait",
 "axum",
 "base64 0.22.1",
 "decodal",
 "flow",
 "futures",
+ "llm-engine",
 "manifest",
 "protocol",
 "reqwest",
@@ -6136,16 +6135,6 @@ dependencies = [
 "worker",
 ]

-[[package]]
-name = "workspace-api"
-version = "0.1.0"
-dependencies = [
- "serde",
- "serde_json",
- "ts-rs",
- "workdir",
-]
-
 [[package]]
 name = "writeable"
 version = "0.6.3"
@@ -6216,7 +6205,6 @@ dependencies = [
 "toml",
 "tui",
 "worker",
- "workspace-api",
 ]

 [[package]]
@@ -6277,7 +6265,6 @@ dependencies = [
 "workdir",
 "worker",
 "worker-runtime",
- "workspace-api",
 ]

 [[package]]
@@ -2,8 +2,8 @@
 resolver = "2"
 members = [
    "crates/client",
-    "crates/agen",
-    "crates/agen-macros",
+    "crates/llm-engine",
+    "crates/llm-engine-macros",
    "crates/session-store",
    "crates/secrets",
    "crates/manifest",
@@ -27,14 +27,13 @@ members = [
    "crates/ticket",
    "crates/merge-request",
    "crates/project-record",
-    "crates/workspace-api",
    "crates/workspace-server",
    "tests/e2e",
 ]
 default-members = [
    "crates/client",
-    "crates/agen",
-    "crates/agen-macros",
+    "crates/llm-engine",
+    "crates/llm-engine-macros",
    "crates/session-store",
    "crates/secrets",
    "crates/manifest",
@@ -58,7 +57,6 @@ default-members = [
    "crates/ticket",
    "crates/merge-request",
    "crates/project-record",
-    "crates/workspace-api",
    "crates/workspace-server",
 ]

@@ -69,8 +67,8 @@ license = "MIT"
 [workspace.dependencies]
 # Internal crates
 client = { path = "crates/client" }
-agen = { path = "crates/agen", version = "0.2" }
-agen-macros = { path = "crates/agen-macros", version = "0.2" }
+llm-engine = { path = "crates/llm-engine", version = "0.2" }
+llm-engine-macros = { path = "crates/llm-engine-macros", version = "0.2" }
 manifest = { path = "crates/manifest" }
 mcp = { path = "crates/mcp" }
 lint-common = { path = "crates/lint-common" }
@@ -80,7 +78,6 @@ ticket = { path = "crates/ticket" }
 project-record = { path = "crates/project-record" }
 worker = { path = "crates/worker" }
 worker-runtime = { path = "crates/worker-runtime" }
-workspace-api = { path = "crates/workspace-api" }
 yoi-plugin-pdk = { path = "crates/plugin-pdk" }
 yoi = { path = "crates/yoi" }
 protocol = { path = "crates/protocol" }
@@ -1,25 +0,0 @@
-[package]
-name = "agen-macros"
-description = "Procedural macros for declaring agen tools"
-version = "0.2.0"
-edition.workspace = true
-rust-version = "1.85"
-license.workspace = true
-readme = "README.md"
-repository = "https://gitea.hareworks.net/Hare/yoi"
-homepage = "https://gitea.hareworks.net/Hare/yoi"
-documentation = "https://docs.rs/agen-macros"
-keywords = ["llm", "agent", "tools", "macros"]
-categories = ["development-tools::procedural-macro-helpers"]
-include = ["src/**", "README.md", "LICENSE"]
-
-[lib]
-proc-macro = true
-
-[dependencies]
-proc-macro2 = "1"
-quote = "1"
-syn = { version = "2", features = ["full"] }
-
-[package.metadata.docs.rs]
-all-features = true
@@ -1,7 +0,0 @@
-Copyright 2026 Hare
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -1,32 +0,0 @@
-# agen-macros
-
-Procedural macros used by [`agen`](https://crates.io/crates/agen) to declare LLM tools from Rust methods.
-
-Applications should normally depend only on `agen` and import its re-exports:
-
-```rust
-use agen::tool_registry;
-
-#[derive(Clone)]
-struct Tools;
-
-#[tool_registry]
-impl Tools {
-    /// Returns the supplied text.
-    #[tool]
-    async fn echo(
-        &self,
-        #[description = "Text to return"] text: String,
-    ) -> Result<String, std::io::Error> {
-        Ok(text)
-    }
-}
-```
-
-`#[tool_registry]` generates the argument schema, a `Tool` implementation, and an `<method>_definition` constructor. It rejects arguments of its own, duplicate `#[tool]` markers, malformed or duplicate `#[description = "..."]` attributes, and non-identifier argument patterns.
-
-Generated code targets the canonical `::agen` path and uses implementation dependencies re-exported by `agen`; consumers do not need direct `serde`, `schemars`, `serde_json`, or `async-trait` dependencies. Renaming the `agen` dependency in `Cargo.toml` is not currently supported.
-
-This companion package is published before the matching `agen` release. Its public contract is the generated API consumed by `agen`, and its minor version compatibility follows the `agen` 0.2 series.
-
-Licensed under the [MIT License](https://gitea.hareworks.net/Hare/yoi/src/branch/develop/LICENSE).
@@ -1,482 +0,0 @@
-//! Procedural macros for declaring [`agen`](https://docs.rs/agen) tools.
-//!
-//! [`tool_registry`] expands methods marked with `#[tool]` into `agen::tool::Tool`
-//! implementations and tool definitions. Applications normally use the re-exports from
-//! `agen`; this companion crate exists so those macros can be published and versioned
-//! independently.
-
-use proc_macro::TokenStream;
-use quote::{format_ident, quote};
-use syn::{
-    Attribute, FnArg, ImplItem, ItemImpl, Lit, Meta, Pat, ReturnType, Type, parse_macro_input,
-    spanned::Spanned,
-};
-
-/// Generates tools for methods marked with `#[tool]` in an `impl` block.
-///
-/// Method doc comments become the tool description. An argument can use
-/// `#[description = "..."]` to supply its JSON Schema description.
-///
-/// ```ignore
-/// #[derive(Clone)]
-/// struct MyApp;
-///
-/// #[agen::tool_registry]
-/// impl MyApp {
-///     /// Retrieves a user by ID.
-///     #[tool]
-///     async fn get_user(
-///         &self,
-///         #[description = "The user ID"] user_id: String,
-///     ) -> Result<String, std::io::Error> {
-///         todo!()
-///     }
-/// }
-/// ```
-///
-/// This generates a `ToolGetUser` wrapper, a `GetUserArgs` schema type, and
-/// `MyApp::get_user_definition()`.
-#[proc_macro_attribute]
-pub fn tool_registry(attr: TokenStream, item: TokenStream) -> TokenStream {
-    let attr = proc_macro2::TokenStream::from(attr);
-    let impl_block = parse_macro_input!(item as ItemImpl);
-
-    expand_tool_registry(attr, impl_block)
-        .unwrap_or_else(syn::Error::into_compile_error)
-        .into()
-}
-
-fn expand_tool_registry(
-    attr: proc_macro2::TokenStream,
-    mut impl_block: ItemImpl,
-) -> syn::Result<proc_macro2::TokenStream> {
-    if !attr.is_empty() {
-        return Err(syn::Error::new(
-            attr.span(),
-            "tool_registry does not accept arguments",
-        ));
-    }
-
-    let self_ty = impl_block.self_ty.as_ref().clone();
-    let mut generated_items = Vec::new();
-
-    for item in &mut impl_block.items {
-        let ImplItem::Fn(method) = item else {
-            continue;
-        };
-
-        let tool_attrs: Vec<_> = method
-            .attrs
-            .iter()
-            .filter(|attr| attr.path().is_ident("tool"))
-            .collect();
-        if tool_attrs.len() > 1 {
-            return Err(syn::Error::new_spanned(
-                tool_attrs[1],
-                "duplicate #[tool] attribute",
-            ));
-        }
-        let Some(tool_attr) = tool_attrs.first() else {
-            continue;
-        };
-        if !matches!(tool_attr.meta, Meta::Path(_)) {
-            return Err(syn::Error::new_spanned(
-                tool_attr,
-                "#[tool] does not accept arguments",
-            ));
-        }
-
-        method.attrs.retain(|attr| !attr.path().is_ident("tool"));
-        generated_items.push(generate_tool_impl(&self_ty, method)?);
-
-        for input in &mut method.sig.inputs {
-            if let FnArg::Typed(pat_type) = input {
-                pat_type
-                    .attrs
-                    .retain(|attr| !attr.path().is_ident("description"));
-            }
-        }
-    }
-
-    Ok(quote! {
-        #impl_block
-
-        #(#generated_items)*
-    })
-}
-
-fn extract_doc_comment(attrs: &[Attribute]) -> String {
-    let mut lines = Vec::new();
-
-    for attr in attrs {
-        if attr.path().is_ident("doc")
-            && let Meta::NameValue(meta) = &attr.meta
-            && let syn::Expr::Lit(expr_lit) = &meta.value
-            && let Lit::Str(lit_str) = &expr_lit.lit
-        {
-            let line = lit_str.value();
-            let trimmed = line.strip_prefix(' ').unwrap_or(&line);
-            lines.push(trimmed.to_string());
-        }
-    }
-
-    lines.join("\n")
-}
-
-fn extract_description_attr(attrs: &[Attribute]) -> syn::Result<Option<String>> {
-    let mut description = None;
-
-    for attr in attrs
-        .iter()
-        .filter(|attr| attr.path().is_ident("description"))
-    {
-        let value = match &attr.meta {
-            Meta::NameValue(meta) => match &meta.value {
-                syn::Expr::Lit(expr_lit) => match &expr_lit.lit {
-                    Lit::Str(value) => value.value(),
-                    _ => {
-                        return Err(syn::Error::new_spanned(
-                            attr,
-                            "description must be a string literal",
-                        ));
-                    }
-                },
-                _ => {
-                    return Err(syn::Error::new_spanned(
-                        attr,
-                        "description must be a string literal",
-                    ));
-                }
-            },
-            _ => {
-                return Err(syn::Error::new_spanned(
-                    attr,
-                    "expected #[description = \"...\"]",
-                ));
-            }
-        };
-
-        if description.replace(value).is_some() {
-            return Err(syn::Error::new_spanned(
-                attr,
-                "duplicate #[description] attribute",
-            ));
-        }
-    }
-
-    Ok(description)
-}
-
-fn argument_ident(pat: &Pat) -> syn::Result<&syn::Ident> {
-    match pat {
-        Pat::Ident(pat_ident) => Ok(&pat_ident.ident),
-        _ => Err(syn::Error::new_spanned(
-            pat,
-            "tool arguments must use simple identifier patterns",
-        )),
-    }
-}
-
-fn is_tool_execution_context_type(ty: &Type) -> bool {
-    let Type::Path(path) = ty else {
-        return false;
-    };
-    path.path
-        .segments
-        .last()
-        .is_some_and(|segment| segment.ident == "ToolExecutionContext")
-}
-
-fn generate_tool_impl(
-    self_ty: &Type,
-    method: &syn::ImplItemFn,
-) -> syn::Result<proc_macro2::TokenStream> {
-    let sig = &method.sig;
-    let method_name = &sig.ident;
-    let tool_name = method_name.to_string();
-
-    let pascal_name = to_pascal_case(&method_name.to_string());
-    let tool_struct_name = format_ident!("Tool{}", pascal_name);
-    let args_struct_name = format_ident!("{}Args", pascal_name);
-    let definition_name = format_ident!("{}_definition", method_name);
-
-    let description = extract_doc_comment(&method.attrs);
-    let description = if description.is_empty() {
-        format!("Tool: {}", tool_name)
-    } else {
-        description
-    };
-
-    let method_args: Vec<_> = sig
-        .inputs
-        .iter()
-        .filter_map(|arg| match arg {
-            FnArg::Typed(pat_type) => Some(pat_type),
-            FnArg::Receiver(_) => None,
-        })
-        .collect();
-    let json_args: Vec<_> = method_args
-        .iter()
-        .copied()
-        .filter(|pat_type| !is_tool_execution_context_type(pat_type.ty.as_ref()))
-        .collect();
-
-    let arg_fields: Vec<_> = json_args
-        .iter()
-        .map(|pat_type| {
-            let field_name = argument_ident(pat_type.pat.as_ref())?;
-            let ty = &pat_type.ty;
-            let description = extract_description_attr(&pat_type.attrs)?;
-
-            Ok(if let Some(description) = description {
-                quote! {
-                    #[schemars(description = #description)]
-                    pub #field_name: #ty
-                }
-            } else {
-                quote! {
-                    pub #field_name: #ty
-                }
-            })
-        })
-        .collect::<syn::Result<_>>()?;
-
-    let call_args: Vec<_> = method_args
-        .iter()
-        .map(|pat_type| {
-            if is_tool_execution_context_type(pat_type.ty.as_ref()) {
-                Ok(quote! { ctx.clone() })
-            } else {
-                let ident = argument_ident(pat_type.pat.as_ref())?;
-                Ok(quote! { args.#ident })
-            }
-        })
-        .collect::<syn::Result<_>>()?;
-    let method_call = if call_args.is_empty() {
-        quote! { self.ctx.#method_name() }
-    } else {
-        quote! { self.ctx.#method_name(#(#call_args),*) }
-    };
-
-    let awaiter = if sig.asyncness.is_some() {
-        quote! { .await }
-    } else {
-        quote! {}
-    };
-
-    let result_handling = if is_result_type(&sig.output) {
-        quote! {
-            match result {
-                Ok(val) => Ok(format!("{:?}", val).into()),
-                Err(error) => Err(::agen::tool::ToolError::ExecutionFailed(format!("{}", error))),
-            }
-        }
-    } else {
-        quote! {
-            Ok(format!("{:?}", result).into())
-        }
-    };
-
-    let args_struct_def = quote! {
-        #[derive(
-            ::agen::__private::serde::Deserialize,
-            ::agen::__private::schemars::JsonSchema,
-        )]
-        #[serde(crate = "::agen::__private::serde")]
-        #[schemars(crate = "::agen::__private::schemars")]
-        struct #args_struct_name {
-            #(#arg_fields),*
-        }
-    };
-
-    let execute_body = if json_args.is_empty() {
-        quote! {
-            let _: #args_struct_name = ::agen::__private::serde_json::from_str(input_json)
-                .unwrap_or(#args_struct_name {});
-
-            let result = #method_call #awaiter;
-            #result_handling
-        }
-    } else {
-        quote! {
-            let args: #args_struct_name = ::agen::__private::serde_json::from_str(input_json)
-                .map_err(|error| ::agen::tool::ToolError::InvalidArgument(error.to_string()))?;
-
-            let result = #method_call #awaiter;
-            #result_handling
-        }
-    };
-
-    Ok(quote! {
-        #args_struct_def
-
-        #[derive(Clone)]
-        pub struct #tool_struct_name {
-            ctx: #self_ty,
-        }
-
-        #[::agen::__private::async_trait::async_trait]
-        impl ::agen::tool::Tool for #tool_struct_name {
-            async fn execute(
-                &self,
-                input_json: &str,
-                ctx: ::agen::tool::ToolExecutionContext,
-            ) -> Result<::agen::tool::ToolOutput, ::agen::tool::ToolError> {
-                let _ = &ctx;
-                #execute_body
-            }
-        }
-
-        impl #self_ty {
-            /// Returns a tool definition for registration with an `agen::Engine`.
-            pub fn #definition_name(&self) -> ::agen::tool::ToolDefinition {
-                let ctx = self.clone();
-                ::std::sync::Arc::new(move || {
-                    let schema = ::agen::__private::schemars::schema_for!(#args_struct_name);
-                    let meta = ::agen::tool::ToolMeta::new(#tool_name)
-                        .description(#description)
-                        .input_schema(
-                            ::agen::__private::serde_json::to_value(schema)
-                                .unwrap_or_else(|_| ::agen::__private::serde_json::json!({})),
-                        );
-                    let tool: ::std::sync::Arc<dyn ::agen::tool::Tool> =
-                        ::std::sync::Arc::new(#tool_struct_name { ctx: ctx.clone() });
-                    (meta, tool)
-                })
-            }
-        }
-    })
-}
-
-fn is_result_type(return_type: &ReturnType) -> bool {
-    match return_type {
-        ReturnType::Default => false,
-        ReturnType::Type(_, ty) => {
-            if let Type::Path(type_path) = ty.as_ref()
-                && let Some(segment) = type_path.path.segments.last()
-            {
-                return segment.ident == "Result";
-            }
-            false
-        }
-    }
-}
-
-fn to_pascal_case(s: &str) -> String {
-    s.split('_')
-        .map(|part| {
-            let mut chars = part.chars();
-            match chars.next() {
-                None => String::new(),
-                Some(first) => first.to_uppercase().chain(chars).collect(),
-            }
-        })
-        .collect()
-}
-
-/// Marker attribute interpreted by [`tool_registry`].
-#[proc_macro_attribute]
-pub fn tool(attr: TokenStream, item: TokenStream) -> TokenStream {
-    marker_attribute("tool", attr, item)
-}
-
-/// Argument description marker interpreted by [`tool_registry`].
-///
-/// Use it as `#[description = "The argument description"]` on a tool method argument.
-#[proc_macro_attribute]
-pub fn description(attr: TokenStream, item: TokenStream) -> TokenStream {
-    marker_attribute("description", attr, item)
-}
-
-fn marker_attribute(name: &str, attr: TokenStream, item: TokenStream) -> TokenStream {
-    if attr.is_empty() {
-        item
-    } else {
-        syn::Error::new(
-            proc_macro2::Span::call_site(),
-            format!("{name} is a marker interpreted by #[tool_registry]"),
-        )
-        .into_compile_error()
-        .into()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use quote::quote;
-    use syn::parse_quote;
-
-    #[test]
-    fn rejects_tool_registry_arguments() {
-        let implementation: ItemImpl = parse_quote!(impl Registry {});
-        let error = expand_tool_registry(quote!(unexpected), implementation).unwrap_err();
-
-        assert!(error.to_string().contains("does not accept arguments"));
-    }
-
-    #[test]
-    fn rejects_duplicate_tool_markers() {
-        let implementation: ItemImpl = parse_quote! {
-            impl Registry {
-                #[tool]
-                #[tool]
-                fn inspect(&self) {}
-            }
-        };
-        let error = expand_tool_registry(quote!(), implementation).unwrap_err();
-
-        assert!(error.to_string().contains("duplicate #[tool]"));
-    }
-
-    #[test]
-    fn rejects_invalid_description_attributes() {
-        let implementation: ItemImpl = parse_quote! {
-            impl Registry {
-                #[tool]
-                fn inspect(&self, #[description] input: String) {}
-            }
-        };
-        let error = expand_tool_registry(quote!(), implementation).unwrap_err();
-
-        assert!(error.to_string().contains("expected #[description"));
-    }
-
-    #[test]
-    fn rejects_duplicate_description_attributes() {
-        let implementation: ItemImpl = parse_quote! {
-            impl Registry {
-                #[tool]
-                fn inspect(
-                    &self,
-                    #[description = "first"]
-                    #[description = "second"]
-                    input: String,
-                ) {}
-            }
-        };
-        let error = expand_tool_registry(quote!(), implementation).unwrap_err();
-
-        assert!(error.to_string().contains("duplicate #[description]"));
-    }
-
-    #[test]
-    fn generated_code_uses_only_agen_runtime_paths() {
-        let implementation: ItemImpl = parse_quote! {
-            impl Registry {
-                #[tool]
-                fn inspect(&self, input: String) -> Result<String, Error> {
-                    unreachable!()
-                }
-            }
-        };
-        let expanded = expand_tool_registry(quote!(), implementation)
-            .unwrap()
-            .to_string();
-
-        assert!(expanded.contains(":: agen :: tool :: Tool"));
-        assert!(expanded.contains(":: agen :: __private :: serde_json"));
-        assert!(expanded.contains(":: agen :: __private :: serde"));
-        assert!(expanded.contains(":: agen :: __private :: schemars"));
-    }
-}
@@ -1,7 +0,0 @@
-Copyright 2026 Hare
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -1,90 +0,0 @@
-# agen
-
-`agen` is a provider-neutral Rust engine for streaming LLM applications that use tools. It owns the turn loop, typed conversation history, provider wire-format adapters, tool execution, interceptors, usage accounting, and cache-aware state transitions.
-
-> `agen` is pre-1.0. Public APIs may change between minor releases.
-
-## Installation
-
-```toml
-[dependencies]
-agen = "0.2.1"
-```
-
-The default feature set is intentionally empty. Enable the experimental Codex/ChatGPT authentication adapter when needed:
-
-```toml
-agen = { version = "0.2.1", features = ["codex"] }
-```
-
-`agen` requires Rust 1.86 or newer. The companion `agen-macros` package requires Rust 1.85 or newer.
-
-## Quick start
-
-Supply an implementation of [`LlmClient`](https://docs.rs/agen/latest/agen/llm_client/trait.LlmClient.html), then run a turn. The first call consumes the mutable engine and returns a cache-locked engine for later turns.
-
-```no_run
-use agen::{Engine, EngineError};
-use agen::llm_client::LlmClient;
-
-async fn conversation<C: LlmClient>(client: C) -> Result<(), EngineError> {
-    let output = Engine::new(client)
-        .system_prompt("You are a concise assistant.")
-        .run("Explain typed state in one sentence.")
-        .await?;
-
-    let mut engine = output.engine;
-    let _result = engine.run("Give a Rust example.").await?;
-    Ok(())
-}
-```
-
-## Declaring tools
-
-The tool macros are re-exported by `agen`; applications do not need direct dependencies on `serde`, `schemars`, `serde_json`, or `async-trait` for generated code.
-
-```rust
-use agen::tool_registry;
-
-#[derive(Clone)]
-struct Tools;
-
-#[tool_registry]
-impl Tools {
-    /// Returns the supplied text.
-    #[tool]
-    async fn echo(
-        &self,
-        #[description = "Text to return"] text: String,
-    ) -> Result<String, std::io::Error> {
-        Ok(text)
-    }
-}
-
-let definition = Tools.echo_definition();
-assert_eq!(definition().0.name, "echo");
-```
-
-The generated API uses the canonical crate name `agen`. Renaming the `agen` dependency in `Cargo.toml` is not currently supported by these macros.
-
-## Features
-
-| Feature | Default | Adds |
-|---|---:|---|
-| `codex` | No | Experimental Codex/ChatGPT auth-file loading and token refresh support |
-
-The base crate includes provider-neutral transport and Anthropic, OpenAI-compatible, Gemini, and Ollama wire-format schemes. See [`llm_client`](https://docs.rs/agen/latest/agen/llm_client/) for the client boundary.
-
-## Architecture and API scope
-
-The current public modules cover the engine, typed history, client transport/schemes, timeline events, tools, interceptors, pruning, token estimation, and usage records. Their relationships are described in [Architecture](https://gitea.hareworks.net/Hare/yoi/src/branch/develop/crates/agen/docs/architecture.md); behavioral requirements are summarized in [Requirements](https://gitea.hareworks.net/Hare/yoi/src/branch/develop/crates/agen/docs/requirements.md).
-
-Low-level modules remain public in the 0.2 series because downstream Yoi components implement custom clients, event handlers, pruning policies, and tool registries against them. This surface is versioned as pre-1.0 API rather than declared stable.
-
-## Packaging and security
-
-The published package contains source, public documentation, curated examples, and deterministic tests/fixtures. Credentialed fixture-recording utilities are intentionally excluded. Examples that contact a provider read credentials from environment variables and never embed production credentials.
-
-## License
-
-Licensed under the [MIT License](https://gitea.hareworks.net/Hare/yoi/src/branch/develop/LICENSE).
@@ -1,62 +0,0 @@
-# agen architecture
-
-`agen` separates orchestration, event projection, and provider transport so applications can replace an LLM client without changing the turn loop or tool model.
-
-```text
-┌────────────────────────────────────────────┐
-│ Engine                                     │
-│ turn loop · interceptors · tool execution  │
-│ typed state: Mutable → Locked → Mutable    │
-└─────────────────────┬──────────────────────┘
-                      │
-┌─────────────────────▼──────────────────────┐
-│ Timeline                                   │
-│ event dispatch · block collectors          │
-└─────────────────────┬──────────────────────┘
-                      │
-┌─────────────────────▼──────────────────────┐
-│ LlmClient                                  │
-│ transport · provider wire-format schemes   │
-└────────────────────────────────────────────┘
-```
-
-## Main modules
-
-| Module | Responsibility |
-|---|---|
-| `engine` | Turn execution, pause/resume, retries, tool integration, and callbacks |
-| `state` | Sealed `Mutable` and `Locked` type-state markers |
-| `interceptor` | Application-owned control decisions at orchestration boundaries |
-| `tool` / `tool_server` | Tool metadata, registration, execution, and bounded output |
-| `timeline` | Streaming event dispatch, handlers, and block assembly |
-| `llm_client` | Provider-neutral request, response, auth, transport, and scheme contracts |
-| `providers` | Optional higher-level provider adapters such as the `codex` feature |
-| `prune` / `token_counter` | Cache-aware history reduction and token estimation |
-| `usage_record` | Request and token usage accounting |
-
-## Request flow
-
-```text
-Engine history
-  → provider-neutral Request
-    → Scheme::build_request
-      → Provider transport
-```
-
-## Response flow
-
-```text
-streaming response bytes
-  → Scheme event parsing
-    → unified Event values
-      → Timeline handlers and collectors
-        → Engine history/tool decisions
-```
-
-## Type state and cache protection
-
-`Engine<C, Mutable>` permits configuration and history editing. `Engine::run` or `Engine::lock` commits the current prefix and produces `Engine<C, Locked>`. The locked engine may append turns without mutating the committed prefix. `Engine::unlock` explicitly returns to mutable state when an application accepts losing that cache guarantee.
-
-## Public surface
-
-The 0.2 series exposes the low-level client, timeline, tool, pruning, and usage modules because custom clients and orchestration hosts build directly on them. These APIs are intentionally provider-neutral but remain pre-1.0 and may change in later minor releases.
@@ -1,39 +0,0 @@
-# agen requirements
-
-## R1: Turn execution and continuation
-
- `Engine::run` starts a turn and loops through provider output and tool calls.
- An `Interceptor` may continue, cancel, or pause work at defined orchestration boundaries.
- `Engine::resume` continues paused generation without fabricating another user message.
- Cancellation and provider errors are represented as typed `EngineError` values.
-
-## R2: Explicit cache-preserving state
-
- `Engine<C, Mutable>` permits configuration and history edits.
- `Engine::run` or `Engine::lock` transitions to `Engine<C, Locked>` and records the committed prefix.
- A locked engine appends turns but cannot mutate that prefix through mutable-only APIs.
- `Engine::unlock` explicitly abandons the lock before configuration or history changes.
-
-## R3: Tool declarations and execution
-
- `#[tool_registry]` generates a schema and `Tool` implementation for methods marked `#[tool]`.
- `#[description = "..."]` supplies argument descriptions in generated JSON Schema.
- Generated code resolves its runtime and helper dependencies through `::agen`.
- Invalid and duplicate marker attributes produce compile errors rather than panics.
- Tools execute through `ToolServer` with typed context, errors, and output limits.
-
-## R4: Provider-neutral orchestration
-
- `LlmClient` is the boundary between the engine and provider-specific transport.
- Request/response schemes translate provider wire formats into shared request and event types.
- Interceptors, tool execution, timeline collection, and pruning stay above the provider transport.
- Provider-specific capabilities are optional features when they require additional policy or dependencies.
-
-## R5: Publication quality
-
- crates.io metadata includes license, repository, documentation, README, categories, keywords, and MSRV.
- The default feature set and each optional feature compile and test independently.
- Macro expansion compiles in a downstream-style integration test without direct helper dependencies.
- rustdoc builds without dependency documentation.
- Package contents are explicitly bounded and exclude credentialed fixture-recording utilities.
- `cargo package` and `cargo publish --dry-run` are run for `agen-macros` before `agen` because the main package depends on its companion package.
@@ -1,42 +0,0 @@
-#![doc = include_str!("../README.md")]
-
-mod engine;
-mod handler;
-mod message;
-
-pub(crate) mod callback;
-pub mod event;
-pub mod interceptor;
-pub mod llm_client;
-pub mod providers;
-pub mod prune;
-pub mod state;
-pub mod timeline;
-pub mod token_counter;
-pub mod tool;
-pub mod tool_server;
-pub mod usage_record;
-
-pub use agen_macros::{description, tool, tool_registry};
-pub use callback::{TextBlockScope, ThinkingBlockScope, ToolUseBlockScope};
-pub use engine::{
-    Engine, EngineConfig, EngineError, EngineResult, EngineRunOutput, LlmRetryNotice,
-    ToolRegistryError,
-};
-pub use handler::ToolUseBlockStart;
-pub use interceptor::Interceptor;
-pub use message::{ContentPart, Item, Message, Role};
-pub use tool::{ToolCall, ToolExecutionContext, ToolOutputLimits, ToolResult};
-pub use usage_record::UsageRecord;
-
-/// Implementation dependencies used by code generated from `agen` macros.
-///
-/// This module is not a stable user-facing API. It is public only because macro expansion
-/// happens in the downstream crate.
-#[doc(hidden)]
-pub mod __private {
-    pub use async_trait;
-    pub use schemars;
-    pub use serde;
-    pub use serde_json;
-}
@@ -9,14 +9,13 @@ protocol = { workspace = true }
 manifest = { workspace = true }
 ticket = { workspace = true }
 futures = { workspace = true }
-reqwest = { version = "0.13", default-features = false, features = ["blocking", "json", "native-tls"] }
+reqwest = { version = "0.13", default-features = false, features = ["json", "native-tls"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["rt", "macros", "net", "io-util", "sync", "time", "process", "fs"] }
 tokio-tungstenite = { workspace = true }
 uuid = { workspace = true }
-workspace-api.workspace = true
 workdir = { workspace = true }

 [dev-dependencies]
@@ -18,7 +18,7 @@ Does not own:
 - product command names (`yoi`)
 - Worker state authority (`worker`, `session-store` worker metadata)
 - UI rendering (`tui`)
- Engine turn semantics (`agen`)
+- Engine turn semantics (`llm-engine`)

 ## Design notes

@@ -1,29 +1,19 @@
 use futures::{SinkExt, StreamExt};
 use protocol::stream::{decode_event, encode_method};
 use protocol::{ErrorCode, Event, Method};
+use serde::Deserialize;
 use std::collections::VecDeque;
 use std::fmt;
 use tokio::sync::mpsc;
 use tokio_tungstenite::connect_async;
 use tokio_tungstenite::tungstenite::Message as TungsteniteMessage;
 pub use workdir::workspace::WorkingDirectorySummary as BackendWorkingDirectorySummary;
-pub use workspace_api::{
-    Diagnostic as BackendDiagnostic, DiagnosticSeverity as BackendDiagnosticSeverity,
-    ListResponse as BackendRuntimeListResponse, RuntimeSummary as BackendRuntimeSummary,
-    WorkerCapabilitySummary as BackendWorkerCapabilitySummary,
-    WorkerImplementationSummary as BackendWorkerImplementationSummary,
-    WorkerRestoreResponse as BackendWorkerRestoreResponse,
-    WorkerRestoreResult as BackendWorkerRestoreResult, WorkerSummary as BackendWorkerSummary,
-    WorkerWorkspaceSummary as BackendWorkerWorkspaceSummary,
-};

 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct BackendRuntimeTarget {
    /// Workspace Backend API root URL, for example `http://127.0.0.1:8787`.
    /// This is intentionally the Backend endpoint, not a Runtime endpoint.
    pub base_url: String,
-    /// Workspace identity used for every Worker lifecycle and protocol operation.
-    pub workspace_id: String,
    /// Backend-owned Runtime identity used as path authority.
    pub runtime_id: String,
    /// Backend-owned Worker identity used as path authority.
@@ -33,13 +23,11 @@ pub struct BackendRuntimeTarget {
 impl BackendRuntimeTarget {
    pub fn new(
        base_url: impl Into<String>,
-        workspace_id: impl Into<String>,
        runtime_id: impl Into<String>,
        worker_id: impl Into<String>,
    ) -> Self {
        Self {
            base_url: base_url.into(),
-            workspace_id: workspace_id.into(),
            runtime_id: runtime_id.into(),
            worker_id: worker_id.into(),
        }
@@ -69,36 +57,95 @@ impl BackendRuntimeListTarget {
            runtime_id,
        }
    }
+}

-    pub fn select_workspace(&mut self, workspace_id: impl Into<String>) {
-        self.workspace_id = Some(workspace_id.into());
-    }
+#[derive(Debug, Clone, Deserialize)]
+pub struct BackendRuntimeListResponse<T> {
+    pub workspace_id: String,
+    pub limit: usize,
+    pub items: Vec<T>,
+    pub source: String,
+    #[serde(default)]
+    pub diagnostics: Vec<BackendDiagnostic>,
+}

-    pub fn clear_workspace(&mut self) {
-        self.workspace_id = None;
-    }
+#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+pub struct BackendRuntimeSummary {
+    pub runtime_id: String,
+    pub label: String,
+    pub kind: String,
+    pub status: String,
+    #[serde(default)]
+    pub host_ids: Vec<String>,
+    #[serde(default)]
+    pub diagnostics: Vec<BackendDiagnostic>,
+}

-    pub fn workspace_id(&self) -> Option<&str> {
-        self.workspace_id.as_deref()
-    }
+#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+pub struct BackendWorkerWorkspaceSummary {
+    pub visibility: String,
+    pub identity: String,
+}

-    pub fn runtime_target(
-        &self,
-        runtime_id: impl Into<String>,
-        worker_id: impl Into<String>,
-    ) -> Result<BackendRuntimeTarget, BackendRuntimeClientError> {
-        let workspace_id = self.workspace_id.clone().ok_or_else(|| {
-            BackendRuntimeClientError::InvalidTarget(
-                "workspace_id is required before selecting a Backend worker".to_string(),
-            )
-        })?;
-        Ok(BackendRuntimeTarget::new(
-            self.base_url.clone(),
-            workspace_id,
-            runtime_id,
-            worker_id,
-        ))
-    }
+#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+pub struct BackendWorkerImplementationSummary {
+    pub kind: String,
+    pub display_hint: String,
+}
+
+#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+pub struct BackendWorkerCapabilitySummary {
+    pub can_stop: bool,
+    pub can_spawn_followup: bool,
+}
+
+#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+pub struct BackendWorkerSummary {
+    pub runtime_id: String,
+    pub worker_id: String,
+    #[serde(default)]
+    pub human_key: Option<String>,
+    pub host_id: String,
+    #[serde(default)]
+    pub display_name: String,
+    pub label: String,
+    #[serde(default)]
+    pub profile: Option<String>,
+    #[serde(default)]
+    pub singleton_key: Option<String>,
+    #[serde(default)]
+    pub tags: Vec<String>,
+    pub workspace: BackendWorkerWorkspaceSummary,
+    pub state: String,
+    #[serde(default)]
+    pub last_seen_at: Option<String>,
+    #[serde(default)]
+    pub pinned: bool,
+    #[serde(default)]
+    pub retention_state: String,
+    pub implementation: BackendWorkerImplementationSummary,
+    pub capabilities: BackendWorkerCapabilitySummary,
+    #[serde(default)]
+    pub working_directory: Option<BackendWorkingDirectorySummary>,
+    #[serde(default)]
+    pub diagnostics: Vec<BackendDiagnostic>,
+}
+
+#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+pub struct BackendWorkerRestoreResult {
+    pub state: String,
+    #[serde(default)]
+    pub worker: Option<BackendWorkerSummary>,
+    #[serde(default)]
+    pub diagnostics: Vec<BackendDiagnostic>,
+}
+
+#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+pub struct BackendWorkerRestoreResponse {
+    pub workspace_id: String,
+    pub runtime_id: String,
+    pub worker_id: String,
+    pub result: BackendWorkerRestoreResult,
 }

 #[derive(Debug)]
@@ -139,13 +186,7 @@ pub async fn list_backend_workers(
    validate_list_target(target)?;
    let http = reqwest::Client::new();
    if let Some(runtime_id) = target.runtime_id.as_deref() {
-        let path = backend_runtime_workers_path(
-            target
-                .workspace_id
-                .as_deref()
-                .expect("validated Backend Workspace scope"),
-            runtime_id,
-        );
+        let path = backend_runtime_workers_path(target.workspace_id.as_deref(), runtime_id);
        let url = join_base_and_path(&target.base_url, &path);
        return Ok(http
            .get(url)
@@ -156,12 +197,7 @@ pub async fn list_backend_workers(
            .await?);
    }

-    let runtime_path = backend_runtimes_path(
-        target
-            .workspace_id
-            .as_deref()
-            .expect("validated Backend Workspace scope"),
-    );
+    let runtime_path = backend_runtimes_path(target.workspace_id.as_deref());
    let runtime_url = join_base_and_path(&target.base_url, &runtime_path);
    let runtimes = http
        .get(runtime_url)
@@ -174,13 +210,8 @@ pub async fn list_backend_workers(
    let mut items = Vec::new();
    let mut diagnostics = runtimes.diagnostics;
    for runtime in runtimes.items {
-        let path = backend_runtime_workers_path(
-            target
-                .workspace_id
-                .as_deref()
-                .expect("validated Backend Workspace scope"),
-            &runtime.runtime_id,
-        );
+        let path =
+            backend_runtime_workers_path(target.workspace_id.as_deref(), &runtime.runtime_id);
        let url = join_base_and_path(&target.base_url, &path);
        match http
            .get(url)
@@ -197,7 +228,7 @@ pub async fn list_backend_workers(
            }
            Err(error) => diagnostics.push(BackendDiagnostic {
                code: "runtime_worker_list_failed".to_string(),
-                severity: BackendDiagnosticSeverity::Error,
+                severity: Some("error".to_string()),
                message: format!(
                    "failed to list workers for runtime {}: {error}",
                    runtime.runtime_id
@@ -225,13 +256,7 @@ pub async fn list_backend_stopped_workers(
        ));
    };
    let http = reqwest::Client::new();
-    let path = backend_runtime_workers_path(
-        target
-            .workspace_id
-            .as_deref()
-            .expect("validated Backend Workspace scope"),
-        runtime_id,
-    );
+    let path = backend_runtime_workers_path(target.workspace_id.as_deref(), runtime_id);
    let url = join_base_and_path(&target.base_url, &format!("{path}?status=stopped"));
    Ok(http
        .get(url)
@@ -247,11 +272,7 @@ pub async fn restore_backend_worker(
 ) -> Result<BackendWorkerRestoreResponse, BackendRuntimeClientError> {
    validate_target(target)?;
    let http = reqwest::Client::new();
-    let path = backend_runtime_worker_restore_path(
-        &target.workspace_id,
-        &target.runtime_id,
-        &target.worker_id,
-    );
+    let path = backend_runtime_worker_restore_path(None, &target.runtime_id, &target.worker_id);
    let url = join_base_and_path(&target.base_url, &path);
    Ok(http
        .post(url)
@@ -419,11 +440,6 @@ fn validate_target(target: &BackendRuntimeTarget) -> Result<(), BackendRuntimeCl
            "Backend API base URL must start with http:// or https://".to_string(),
        ));
    }
-    if target.workspace_id.is_empty() {
-        return Err(BackendRuntimeClientError::InvalidTarget(
-            "workspace_id is required".to_string(),
-        ));
-    }
    if target.runtime_id.is_empty() {
        return Err(BackendRuntimeClientError::InvalidTarget(
            "runtime_id is required".to_string(),
@@ -450,18 +466,10 @@ fn validate_list_target(
            "Backend API base URL must start with http:// or https://".to_string(),
        ));
    }
-    match target.workspace_id.as_deref() {
-        Some("") => {
-            return Err(BackendRuntimeClientError::InvalidTarget(
-                "workspace_id must not be empty".to_string(),
-            ));
-        }
-        None => {
-            return Err(BackendRuntimeClientError::InvalidTarget(
-                "workspace selection is required before listing Backend workers".to_string(),
-            ));
-        }
-        Some(_) => {}
+    if target.workspace_id.as_deref().is_some_and(str::is_empty) {
+        return Err(BackendRuntimeClientError::InvalidTarget(
+            "workspace_id must not be empty when provided".to_string(),
+        ));
    }
    if target.runtime_id.as_deref().is_some_and(str::is_empty) {
        return Err(BackendRuntimeClientError::InvalidTarget(
@@ -471,35 +479,47 @@ fn validate_list_target(
    Ok(())
 }

-fn backend_runtimes_path(workspace_id: &str) -> String {
-    format!("/api/w/{}/runtimes", path_segment_encode(workspace_id))
+fn backend_runtimes_path(workspace_id: Option<&str>) -> String {
+    match workspace_id {
+        Some(workspace_id) => format!("/api/w/{}/runtimes", path_segment_encode(workspace_id)),
+        None => "/api/runtimes".to_string(),
+    }
 }

-fn backend_runtime_workers_path(workspace_id: &str, runtime_id: &str) -> String {
-    format!(
-        "/api/w/{}/runtimes/{}/workers",
-        path_segment_encode(workspace_id),
-        path_segment_encode(runtime_id)
-    )
+fn backend_runtime_workers_path(workspace_id: Option<&str>, runtime_id: &str) -> String {
+    match workspace_id {
+        Some(workspace_id) => format!(
+            "/api/w/{}/runtimes/{}/workers",
+            path_segment_encode(workspace_id),
+            path_segment_encode(runtime_id)
+        ),
+        None => format!("/api/runtimes/{}/workers", path_segment_encode(runtime_id)),
+    }
 }

 fn backend_runtime_worker_restore_path(
-    workspace_id: &str,
+    workspace_id: Option<&str>,
    runtime_id: &str,
    worker_id: &str,
 ) -> String {
-    format!(
-        "/api/w/{}/runtimes/{}/workers/{}/restore",
-        path_segment_encode(workspace_id),
-        path_segment_encode(runtime_id),
-        path_segment_encode(worker_id)
-    )
+    match workspace_id {
+        Some(workspace_id) => format!(
+            "/api/w/{}/runtimes/{}/workers/{}/restore",
+            path_segment_encode(workspace_id),
+            path_segment_encode(runtime_id),
+            path_segment_encode(worker_id)
+        ),
+        None => format!(
+            "/api/runtimes/{}/workers/{}/restore",
+            path_segment_encode(runtime_id),
+            path_segment_encode(worker_id)
+        ),
+    }
 }

 fn protocol_ws_url(target: &BackendRuntimeTarget) -> String {
    let path = format!(
-        "/api/w/{}/runtimes/{}/workers/{}/protocol/ws",
-        path_segment_encode(&target.workspace_id),
+        "/api/runtimes/{}/workers/{}/protocol/ws",
        path_segment_encode(&target.runtime_id),
        path_segment_encode(&target.worker_id)
    );
@@ -539,21 +559,25 @@ fn percent_encode(input: &str, keep: impl Fn(u8) -> bool) -> String {
    encoded
 }

+#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
+pub struct BackendDiagnostic {
+    pub code: String,
+    #[serde(default)]
+    pub severity: Option<String>,
+    pub message: String,
+}
+
 #[cfg(test)]
 mod tests {
    use super::*;

    #[test]
    fn protocol_url_uses_backend_runtime_worker_identity() {
-        let target = BackendRuntimeTarget::new(
-            "http://127.0.0.1:8787/",
-            "workspace alpha",
-            "runtime/one",
-            "worker one",
-        );
+        let target =
+            BackendRuntimeTarget::new("http://127.0.0.1:8787/", "runtime/one", "worker one");
        assert_eq!(
            protocol_ws_url(&target),
-            "ws://127.0.0.1:8787/api/w/workspace%20alpha/runtimes/runtime%2Fone/workers/worker%20one/protocol/ws"
+            "ws://127.0.0.1:8787/api/runtimes/runtime%2Fone/workers/worker%20one/protocol/ws"
        );
    }

@@ -562,7 +586,6 @@ mod tests {
        let payload = serde_json::json!({
            "runtime_id": "arcadia",
            "worker_id": "worker-opaque-64",
-            "resource_key": "W-64",
            "host_id": "host",
            "display_name": "Coder",
            "label": "Coder",
@@ -599,8 +622,8 @@ mod tests {
    }

    #[test]
-    fn workers_path_requires_workspace_scope_for_status_queries() {
-        let path = backend_runtime_workers_path("team main", "runtime/one");
+    fn workers_path_can_be_workspace_scoped_for_status_queries() {
+        let path = backend_runtime_workers_path(Some("team main"), "runtime/one");
        assert_eq!(
            format!("{path}?status=stopped"),
            "/api/w/team%20main/runtimes/runtime%2Fone/workers?status=stopped"
@@ -608,10 +631,10 @@ mod tests {
    }

    #[test]
-    fn restore_worker_path_requires_workspace_scope() {
+    fn restore_worker_path_uses_backend_runtime_worker_identity() {
        assert_eq!(
-            backend_runtime_worker_restore_path("team main", "runtime/one", "worker one"),
-            "/api/w/team%20main/runtimes/runtime%2Fone/workers/worker%20one/restore"
+            backend_runtime_worker_restore_path(None, "runtime/one", "worker one"),
+            "/api/runtimes/runtime%2Fone/workers/worker%20one/restore"
        );
    }
 }
@@ -1,161 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::fmt;
-
-const DEFAULT_WORKSPACE_LIMIT: usize = 200;
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
-pub struct BackendWorkspace {
-    pub workspace_id: String,
-    pub owner_account_id: Option<String>,
-    pub display_name: String,
-    pub state: String,
-    pub created_at: String,
-    pub updated_at: String,
-}
-
-#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct CreateBackendWorkspaceRequest {
-    pub operation_key: String,
-    pub display_name: String,
-    pub repository: CreateBackendWorkspaceRepository,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct CreateBackendWorkspaceRepository {
-    pub uri: String,
-    pub display_name: Option<String>,
-    pub default_ref: Option<String>,
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
-pub struct CreateBackendWorkspaceResponse {
-    pub workspace: BackendWorkspace,
-    pub repository: CreateBackendWorkspaceRepositoryRecord,
-    pub config_revision: u64,
-    pub request_fingerprint: String,
-    pub replayed: bool,
-}
-
-#[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
-pub struct CreateBackendWorkspaceRepositoryRecord {
-    pub workspace_id: String,
-    pub repository_id: String,
-    pub name: String,
-    pub kind: String,
-    pub uri: String,
-    pub default_ref: Option<String>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct BackendWorkspaceCatalogTarget {
-    pub base_url: String,
-}
-
-impl BackendWorkspaceCatalogTarget {
-    pub fn new(base_url: impl Into<String>) -> Self {
-        Self {
-            base_url: base_url.into(),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum BackendWorkspaceClientError {
-    InvalidTarget(String),
-    RequestFailed { status: u16, message: String },
-    Http(reqwest::Error),
-}
-
-impl fmt::Display for BackendWorkspaceClientError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::InvalidTarget(message) => f.write_str(message),
-            Self::RequestFailed { status, message } => {
-                write!(f, "Backend request failed with HTTP {status}: {message}")
-            }
-            Self::Http(error) => write!(f, "{error}"),
-        }
-    }
-}
-
-impl std::error::Error for BackendWorkspaceClientError {}
-
-impl From<reqwest::Error> for BackendWorkspaceClientError {
-    fn from(error: reqwest::Error) -> Self {
-        Self::Http(error)
-    }
-}
-
-pub async fn list_backend_workspaces(
-    target: &BackendWorkspaceCatalogTarget,
-) -> Result<Vec<BackendWorkspace>, BackendWorkspaceClientError> {
-    validate_target(target)?;
-    let url = format!(
-        "{}/api/workspaces?limit={DEFAULT_WORKSPACE_LIMIT}",
-        target.base_url.trim_end_matches('/')
-    );
-    let response = reqwest::Client::new().get(url).send().await?;
-    let response = require_success(response).await?;
-    Ok(response.json::<Vec<BackendWorkspace>>().await?)
-}
-
-pub async fn create_backend_workspace(
-    target: &BackendWorkspaceCatalogTarget,
-    request: &CreateBackendWorkspaceRequest,
-) -> Result<CreateBackendWorkspaceResponse, BackendWorkspaceClientError> {
-    validate_target(target)?;
-    let url = format!("{}/api/workspaces", target.base_url.trim_end_matches('/'));
-    let response = reqwest::Client::new()
-        .post(url)
-        .json(request)
-        .send()
-        .await?;
-    let response = require_success(response).await?;
-    Ok(response.json::<CreateBackendWorkspaceResponse>().await?)
-}
-
-async fn require_success(
-    response: reqwest::Response,
-) -> Result<reqwest::Response, BackendWorkspaceClientError> {
-    if response.status().is_success() {
-        return Ok(response);
-    }
-    let status = response.status().as_u16();
-    let message = response.text().await.unwrap_or_default();
-    Err(BackendWorkspaceClientError::RequestFailed { status, message })
-}
-
-fn validate_target(
-    target: &BackendWorkspaceCatalogTarget,
-) -> Result<(), BackendWorkspaceClientError> {
-    if !(target.base_url.starts_with("http://") || target.base_url.starts_with("https://")) {
-        return Err(BackendWorkspaceClientError::InvalidTarget(
-            "Backend API base URL must start with http:// or https://".to_string(),
-        ));
-    }
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn create_request_keeps_operation_key_for_exact_retry() {
-        let request = CreateBackendWorkspaceRequest {
-            operation_key: "workspace-create-1".to_string(),
-            display_name: "Alpha".to_string(),
-            repository: CreateBackendWorkspaceRepository {
-                uri: "/srv/repos/alpha".to_string(),
-                display_name: Some("Main".to_string()),
-                default_ref: Some("develop".to_string()),
-            },
-        };
-
-        let retry = request.clone();
-        assert_eq!(retry.operation_key, "workspace-create-1");
-        assert_eq!(retry, request);
-    }
-}
@@ -10,36 +10,29 @@

 pub mod backend_auth;
 pub mod backend_runtime;
-pub mod backend_workspace;
 pub mod runtime_command;
 pub mod spawn;
 pub mod target;
 pub mod ticket_role;
 mod worker_client;
-mod workspace_product;

 pub use backend_auth::{
    BackendAuthClientError, BackendAuthTarget, DeviceLoginPollResponse, DeviceLoginStartResponse,
    poll_device_login, start_device_login, wait_for_device_login,
 };
 pub use backend_runtime::{
-    BackendDiagnostic, BackendDiagnosticSeverity, BackendRuntimeClient, BackendRuntimeClientError,
-    BackendRuntimeListResponse, BackendRuntimeListTarget, BackendRuntimeSummary,
-    BackendRuntimeTarget, BackendWorkerCapabilitySummary, BackendWorkerImplementationSummary,
+    BackendDiagnostic, BackendRuntimeClient, BackendRuntimeClientError, BackendRuntimeListResponse,
+    BackendRuntimeListTarget, BackendRuntimeSummary, BackendRuntimeTarget,
+    BackendWorkerCapabilitySummary, BackendWorkerImplementationSummary,
    BackendWorkerRestoreResponse, BackendWorkerRestoreResult, BackendWorkerSummary,
    BackendWorkerWorkspaceSummary, BackendWorkingDirectorySummary, list_backend_stopped_workers,
    list_backend_workers, restore_backend_worker,
 };
-pub use backend_workspace::{
-    BackendWorkspace, BackendWorkspaceCatalogTarget, BackendWorkspaceClientError,
-    CreateBackendWorkspaceRepository, CreateBackendWorkspaceRequest,
-    CreateBackendWorkspaceResponse, create_backend_workspace, list_backend_workspaces,
-};
 pub use runtime_command::WorkerRuntimeCommand;
 pub use target::{
-    BackendTarget, Dashboard, LocalTarget, ResolvedTarget, Target, TargetError, TargetKind,
-    WorkerByName, WorkerConnection, WorkerConnectionSelector, WorkerList, WorkerListRequest,
-    WorkerResume, WorkerSpawn,
+    BackendTarget, Dashboard, LocalTarget, Target, TargetError, TargetKind, WorkerByName,
+    WorkerConnection, WorkerConnectionSelector, WorkerList, WorkerListRequest, WorkerResume,
+    WorkerSpawn,
 };

 pub use spawn::{
@@ -53,5 +46,3 @@ pub use ticket_role::{
    plan_ticket_role_launch_with_config,
 };
 pub use worker_client::WorkerClient;
-pub use workspace_api::{ObjectiveDetail, ObjectiveSummary};
-pub use workspace_product::BackendWorkspaceProductClient;
@@ -8,24 +8,6 @@ pub enum TargetKind {
    Backend,
 }

-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ResolvedTarget {
-    Local,
-    Backend {
-        base_url: String,
-        workspace_id: String,
-    },
-}
-
-impl ResolvedTarget {
-    pub fn kind(&self) -> TargetKind {
-        match self {
-            Self::Local => TargetKind::Local,
-            Self::Backend { .. } => TargetKind::Backend,
-        }
-    }
-}
-
 impl fmt::Display for TargetKind {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        match self {
@@ -122,14 +104,8 @@ pub struct WorkerResume {
 }

 #[derive(Debug, Clone, PartialEq, Eq)]
-pub enum Dashboard {
-    Local {
-        runtime_command: WorkerRuntimeCommand,
-    },
-    Backend {
-        base_url: String,
-        workspace_id: String,
-    },
+pub struct Dashboard {
+    pub runtime_command: WorkerRuntimeCommand,
 }

 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -156,12 +132,6 @@ impl TargetError {
        }
    }

-    fn invalid(target: TargetKind, message: impl Into<String>) -> Self {
-        Self {
-            message: format!("invalid {target} target: {}", message.into()),
-        }
-    }
-
    fn local_runtime_command(error: std::io::Error) -> Self {
        Self {
            message: format!("failed to resolve local Worker runtime command: {error}"),
@@ -180,13 +150,6 @@ impl std::error::Error for TargetError {}
 pub trait Target: fmt::Debug + Send + Sync {
    fn kind(&self) -> TargetKind;

-    /// Resolve the target once for Workspace product-state operations.
-    ///
-    /// Backend targets must carry an explicit Workspace identity. Callers use
-    /// this value instead of rediscovering Backend/local authority from cwd or
-    /// process configuration after command dispatch.
-    fn resolve(&self) -> Result<ResolvedTarget, TargetError>;
-
    fn spawn_worker(&self) -> Result<WorkerSpawn, TargetError>;

    fn worker_by_name(&self) -> Result<WorkerByName, TargetError>;
@@ -208,10 +171,6 @@ impl Target for LocalTarget {
        TargetKind::Local
    }

-    fn resolve(&self) -> Result<ResolvedTarget, TargetError> {
-        Ok(ResolvedTarget::Local)
-    }
-
    fn spawn_worker(&self) -> Result<WorkerSpawn, TargetError> {
        Ok(WorkerSpawn {
            runtime_command: self.runtime_command()?,
@@ -231,7 +190,7 @@ impl Target for LocalTarget {
    }

    fn dashboard(&self) -> Result<Dashboard, TargetError> {
-        Ok(Dashboard::Local {
+        Ok(Dashboard {
            runtime_command: self.runtime_command()?,
        })
    }
@@ -266,19 +225,6 @@ impl Target for BackendTarget {
        TargetKind::Backend
    }

-    fn resolve(&self) -> Result<ResolvedTarget, TargetError> {
-        let workspace_id = self.workspace_id.clone().ok_or_else(|| {
-            TargetError::invalid(
-                self.kind(),
-                "workspace selection is required for Backend product-state operations",
-            )
-        })?;
-        Ok(ResolvedTarget::Backend {
-            base_url: self.base_url.clone(),
-            workspace_id,
-        })
-    }
-
    fn spawn_worker(&self) -> Result<WorkerSpawn, TargetError> {
        Err(TargetError::unsupported("Worker spawn", self.kind()))
    }
@@ -295,16 +241,7 @@ impl Target for BackendTarget {
    }

    fn dashboard(&self) -> Result<Dashboard, TargetError> {
-        match self.resolve()? {
-            ResolvedTarget::Backend {
-                base_url,
-                workspace_id,
-            } => Ok(Dashboard::Backend {
-                base_url,
-                workspace_id,
-            }),
-            ResolvedTarget::Local => unreachable!("BackendTarget cannot resolve as Local"),
-        }
+        Err(TargetError::unsupported("Dashboard", self.kind()))
    }

    fn list_workers(&self, request: WorkerListRequest) -> Result<WorkerList, TargetError> {
@@ -323,16 +260,9 @@ impl Target for BackendTarget {
        &self,
        selector: WorkerConnectionSelector,
    ) -> Result<WorkerConnection, TargetError> {
-        let workspace_id = self.workspace_id.clone().ok_or_else(|| {
-            TargetError::invalid(
-                self.kind(),
-                "workspace selection is required before connecting to a Backend Worker",
-            )
-        })?;
        Ok(WorkerConnection {
            target: BackendRuntimeTarget::new(
                self.base_url.clone(),
-                workspace_id,
                selector.runtime_id,
                selector.worker_id,
            ),
@@ -344,63 +274,6 @@ impl Target for BackendTarget {
 mod tests {
    use super::*;

-    #[test]
-    fn backend_target_resolves_workspace_scoped_product_state_authority() {
-        let target = BackendTarget::new("http://127.0.0.1:8787", Some("workspace-a"));
-
-        assert_eq!(
-            target.resolve().unwrap(),
-            ResolvedTarget::Backend {
-                base_url: "http://127.0.0.1:8787".to_string(),
-                workspace_id: "workspace-a".to_string(),
-            }
-        );
-    }
-
-    #[test]
-    fn backend_target_rejects_product_state_resolution_without_workspace() {
-        let target = BackendTarget::new("http://127.0.0.1:8787", None::<String>);
-
-        assert!(
-            target
-                .resolve()
-                .unwrap_err()
-                .to_string()
-                .contains("workspace selection is required")
-        );
-    }
-
-    #[test]
-    fn local_target_resolves_local_product_state_authority() {
-        assert_eq!(LocalTarget::new().resolve().unwrap(), ResolvedTarget::Local);
-    }
-
-    #[test]
-    fn backend_target_builds_workspace_scoped_dashboard() {
-        let target = BackendTarget::new("http://127.0.0.1:8787", Some("workspace-a"));
-
-        assert_eq!(
-            target.dashboard().unwrap(),
-            Dashboard::Backend {
-                base_url: "http://127.0.0.1:8787".to_string(),
-                workspace_id: "workspace-a".to_string(),
-            }
-        );
-    }
-
-    #[test]
-    fn backend_target_rejects_dashboard_without_workspace_selection() {
-        let target = BackendTarget::new("http://127.0.0.1:8787", None::<String>);
-
-        assert!(
-            target
-                .dashboard()
-                .unwrap_err()
-                .to_string()
-                .contains("workspace selection is required")
-        );
-    }
-
    #[test]
    fn backend_target_builds_worker_list() {
        let target = BackendTarget::new("http://127.0.0.1:8787", Some("workspace-a"));
@@ -440,27 +313,10 @@ mod tests {
            .unwrap();

        assert_eq!(connection.target.base_url, "http://127.0.0.1:8787");
-        assert_eq!(connection.target.workspace_id, "workspace-a");
        assert_eq!(connection.target.runtime_id, "runtime-a");
        assert_eq!(connection.target.worker_id, "worker-b");
    }

-    #[test]
-    fn backend_target_rejects_worker_connection_before_workspace_selection() {
-        let target = BackendTarget::new("http://127.0.0.1:8787", None::<String>);
-        let error =
-            match target.connect_worker(WorkerConnectionSelector::new("runtime-a", "worker-b")) {
-                Ok(_) => panic!("unscoped connection must fail"),
-                Err(error) => error,
-            };
-
-        assert!(
-            error
-                .to_string()
-                .contains("workspace selection is required")
-        );
-    }
-
    #[test]
    fn backend_target_rejects_local_worker_operations() {
        let target = BackendTarget::new("http://127.0.0.1:8787", None::<String>);
@@ -743,7 +743,6 @@ mod tests {
            },
            status: WorkerStatus::Idle,
            in_flight: protocol::InFlightSnapshot::default(),
-            internal_workers: vec![],
        }
    }

@@ -1,848 +0,0 @@
-use reqwest::Method;
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
-use ticket::{
-    MarkdownText, NewOrchestrationPlanRecord, NewTicket, NewTicketEvent, NewTicketRelation,
-    OrchestrationPlanKind, OrchestrationPlanRecord, Ticket, TicketBackend, TicketDependencyCheck,
-    TicketDoctorReport, TicketError, TicketIdOrSlug, TicketIntakeSummary, TicketItemEdit,
-    TicketListQuery, TicketListState, TicketMarkReady, TicketRef, TicketRelation,
-    TicketRelationKind, TicketRelationView, TicketStateChange, TicketStateSelector, TicketSummary,
-};
-use workspace_api::{
-    ListResponse, ObjectiveCreateRequest, ObjectiveDetail, ObjectiveEditRequest,
-    ObjectiveLinkTicketRequest, ObjectiveStateRequest, ObjectiveSummary,
-    TICKET_ORCHESTRATION_PLANS_QUERY_PATH, TICKET_RELATIONS_QUERY_PATH,
-};
-
-use crate::BackendWorkspaceClientError;
-
-const DEFAULT_PRODUCT_LIST_LIMIT: usize = 1_000;
-
-#[derive(Debug, Deserialize)]
-struct BackendWorkerLaunchOptions {
-    runtimes: Vec<BackendWorkerLaunchRuntime>,
-}
-
-#[derive(Debug, Deserialize)]
-struct BackendWorkerLaunchRuntime {
-    runtime_id: String,
-    can_spawn_worker: bool,
-    working_directory_required: bool,
-}
-
-#[derive(Debug, Deserialize)]
-struct BackendCreateWorkerResponse {
-    runtime_id: String,
-    worker_id: String,
-}
-
-#[derive(Debug, Deserialize)]
-struct BackendWorkspaceOrchestratorResponse {
-    disposition: String,
-    worker: Option<BackendCreateWorkerResponse>,
-}
-
-/// Workspace-scoped Backend client for Ticket and Objective product state.
-///
-/// Construction requires both the selected Backend URL and Workspace identity.
-/// Callers should derive these once from `Target::resolve()` and must not retry
-/// failed requests against repository-local state.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct BackendWorkspaceProductClient {
-    base_url: String,
-    workspace_id: String,
-}
-
-impl BackendWorkspaceProductClient {
-    pub fn new(
-        base_url: impl Into<String>,
-        workspace_id: impl Into<String>,
-    ) -> Result<Self, BackendWorkspaceClientError> {
-        let base_url = base_url.into().trim_end_matches('/').to_string();
-        if base_url.is_empty() {
-            return Err(BackendWorkspaceClientError::InvalidTarget(
-                "Backend base URL must not be empty".into(),
-            ));
-        }
-        let workspace_id = workspace_id.into();
-        if workspace_id.trim().is_empty() {
-            return Err(BackendWorkspaceClientError::InvalidTarget(
-                "Backend Workspace identity must not be empty".into(),
-            ));
-        }
-        Ok(Self {
-            base_url,
-            workspace_id,
-        })
-    }
-
-    pub fn workspace_id(&self) -> &str {
-        &self.workspace_id
-    }
-
-    pub fn list_tickets(
-        &self,
-        query: &TicketListQuery,
-    ) -> Result<Vec<TicketSummary>, BackendWorkspaceClientError> {
-        let state = ticket_list_state_query(query);
-        self.get_json(&format!("/tickets/search?state={state}"))
-    }
-
-    pub fn show_ticket(&self, id: &TicketIdOrSlug) -> Result<Ticket, BackendWorkspaceClientError> {
-        self.get_json(&format!(
-            "/tickets/{}/record",
-            encode_path_segment(&ticket_reference(id))
-        ))
-    }
-
-    pub fn create_ticket(
-        &self,
-        input: &NewTicket,
-    ) -> Result<TicketRef, BackendWorkspaceClientError> {
-        self.send_json(Method::POST, "/tickets", Some(input))
-    }
-
-    pub fn add_ticket_event(
-        &self,
-        id: &TicketIdOrSlug,
-        event: &NewTicketEvent,
-    ) -> Result<(), BackendWorkspaceClientError> {
-        self.send_unit(
-            Method::POST,
-            &format!(
-                "/tickets/{}/thread-events",
-                encode_path_segment(&ticket_reference(id))
-            ),
-            Some(event),
-        )
-    }
-
-    pub fn set_ticket_workflow_state(
-        &self,
-        id: &TicketIdOrSlug,
-        change: &TicketStateChange,
-    ) -> Result<(), BackendWorkspaceClientError> {
-        self.send_unit(
-            Method::POST,
-            &format!(
-                "/tickets/{}/workflow-state",
-                encode_path_segment(&ticket_reference(id))
-            ),
-            Some(change),
-        )
-    }
-
-    pub fn close_ticket(
-        &self,
-        id: &TicketIdOrSlug,
-        resolution: &MarkdownText,
-    ) -> Result<(), BackendWorkspaceClientError> {
-        self.send_unit(
-            Method::POST,
-            &format!(
-                "/tickets/{}/workflow/close",
-                encode_path_segment(&ticket_reference(id))
-            ),
-            Some(resolution),
-        )
-    }
-
-    pub fn add_ticket_relation(
-        &self,
-        id: &TicketIdOrSlug,
-        relation: &NewTicketRelation,
-    ) -> Result<TicketRelation, BackendWorkspaceClientError> {
-        self.send_json(
-            Method::POST,
-            &format!(
-                "/tickets/{}/relations",
-                encode_path_segment(&ticket_reference(id))
-            ),
-            Some(relation),
-        )
-    }
-
-    pub fn query_ticket_relations(
-        &self,
-        ticket: Option<&TicketIdOrSlug>,
-        kind: Option<TicketRelationKind>,
-    ) -> Result<Vec<TicketRelation>, BackendWorkspaceClientError> {
-        #[derive(Serialize)]
-        struct Query<'a> {
-            ticket: Option<&'a TicketIdOrSlug>,
-            kind: Option<TicketRelationKind>,
-        }
-        self.send_json(
-            Method::POST,
-            TICKET_RELATIONS_QUERY_PATH,
-            Some(&Query { ticket, kind }),
-        )
-    }
-
-    pub fn ticket_doctor(&self) -> Result<TicketDoctorReport, BackendWorkspaceClientError> {
-        self.get_json("/tickets/doctor")
-    }
-
-    pub fn list_objectives(
-        &self,
-        limit: usize,
-    ) -> Result<ListResponse<ObjectiveSummary>, BackendWorkspaceClientError> {
-        self.get_json(&format!("/objectives?limit={limit}"))
-    }
-
-    pub fn show_objective(&self, id: &str) -> Result<ObjectiveDetail, BackendWorkspaceClientError> {
-        self.get_json(&format!("/objectives/{}", encode_path_segment(id)))
-    }
-
-    pub fn create_objective(
-        &self,
-        input: &ObjectiveCreateRequest,
-    ) -> Result<ObjectiveDetail, BackendWorkspaceClientError> {
-        self.send_json(Method::POST, "/objectives", Some(input))
-    }
-
-    pub fn edit_objective(
-        &self,
-        id: &str,
-        input: &ObjectiveEditRequest,
-    ) -> Result<ObjectiveDetail, BackendWorkspaceClientError> {
-        self.send_json(
-            Method::PATCH,
-            &format!("/objectives/{}", encode_path_segment(id)),
-            Some(input),
-        )
-    }
-
-    pub fn set_objective_state(
-        &self,
-        id: &str,
-        input: &ObjectiveStateRequest,
-    ) -> Result<ObjectiveDetail, BackendWorkspaceClientError> {
-        self.send_json(
-            Method::POST,
-            &format!("/objectives/{}/state", encode_path_segment(id)),
-            Some(input),
-        )
-    }
-
-    pub fn link_objective_ticket(
-        &self,
-        id: &str,
-        input: &ObjectiveLinkTicketRequest,
-    ) -> Result<ObjectiveDetail, BackendWorkspaceClientError> {
-        self.send_json(
-            Method::POST,
-            &format!("/objectives/{}/ticket-links", encode_path_segment(id)),
-            Some(input),
-        )
-    }
-
-    pub fn unlink_objective_ticket(
-        &self,
-        id: &str,
-        ticket_id: &str,
-    ) -> Result<ObjectiveDetail, BackendWorkspaceClientError> {
-        self.send_json::<(), _>(
-            Method::DELETE,
-            &format!(
-                "/objectives/{}/ticket-links/{}",
-                encode_path_segment(id),
-                encode_path_segment(ticket_id)
-            ),
-            None,
-        )
-    }
-
-    pub fn launch_ticket_intake(
-        &self,
-        ticket_id: &str,
-    ) -> Result<String, BackendWorkspaceClientError> {
-        let options: BackendWorkerLaunchOptions = self.get_json("/workers/launch-options")?;
-        let runtime = options
-            .runtimes
-            .iter()
-            .find(|runtime| runtime.can_spawn_worker && !runtime.working_directory_required)
-            .ok_or_else(|| {
-                BackendWorkspaceClientError::InvalidTarget(
-                    "Backend has no spawn-capable Runtime that supports a Workdir-less Intake Worker"
-                        .to_string(),
-                )
-            })?;
-        let response: BackendCreateWorkerResponse = self.send_json(
-            Method::POST,
-            "/workers",
-            Some(&serde_json::json!({
-                "runtime_id": runtime.runtime_id,
-                "display_name": format!("intake-{ticket_id}"),
-                "profile": "builtin:intake",
-                "initial_submit": [{
-                    "kind": "text",
-                    "content": format!("Please handle intake for Ticket {ticket_id}.")
-                }]
-            })),
-        )?;
-        Ok(format!(
-            "Started Intake Worker {}/{} for Ticket {ticket_id}",
-            response.runtime_id, response.worker_id
-        ))
-    }
-
-    pub fn start_workspace_orchestrator(&self) -> Result<String, BackendWorkspaceClientError> {
-        let response: BackendWorkspaceOrchestratorResponse =
-            self.send_json::<(), _>(Method::POST, "/orchestrator", None)?;
-        let worker = response.worker.ok_or_else(|| {
-            BackendWorkspaceClientError::InvalidTarget(
-                "Backend accepted the Orchestrator request without returning a Worker".to_string(),
-            )
-        })?;
-        Ok(format!(
-            "Workspace Orchestrator {} at {}/{}",
-            response.disposition, worker.runtime_id, worker.worker_id
-        ))
-    }
-
-    pub fn default_product_list_limit() -> usize {
-        DEFAULT_PRODUCT_LIST_LIMIT
-    }
-
-    fn get_json<R: DeserializeOwned>(&self, path: &str) -> Result<R, BackendWorkspaceClientError> {
-        self.send_json::<(), R>(Method::GET, path, None)
-    }
-
-    fn send_json<B: Serialize + ?Sized, R: DeserializeOwned>(
-        &self,
-        method: Method,
-        path: &str,
-        body: Option<&B>,
-    ) -> Result<R, BackendWorkspaceClientError> {
-        let response = self.request(method, path, body)?.send()?;
-        let response = ensure_success(response)?;
-        response.json().map_err(BackendWorkspaceClientError::Http)
-    }
-
-    fn send_unit<B: Serialize + ?Sized>(
-        &self,
-        method: Method,
-        path: &str,
-        body: Option<&B>,
-    ) -> Result<(), BackendWorkspaceClientError> {
-        ensure_success(self.request(method, path, body)?.send()?)?;
-        Ok(())
-    }
-
-    fn request<B: Serialize + ?Sized>(
-        &self,
-        method: Method,
-        path: &str,
-        body: Option<&B>,
-    ) -> Result<reqwest::blocking::RequestBuilder, BackendWorkspaceClientError> {
-        let client = reqwest::blocking::Client::builder().build()?;
-        let url = format!(
-            "{}/api/w/{}/{}",
-            self.base_url,
-            encode_path_segment(&self.workspace_id),
-            path.trim_start_matches('/')
-        );
-        let request = client.request(method, url);
-        Ok(match body {
-            Some(body) => request.json(body),
-            None => request,
-        })
-    }
-}
-
-impl TicketBackend for BackendWorkspaceProductClient {
-    fn default_intake_ready_state_change_body(&self, from: &str) -> String {
-        #[derive(Serialize)]
-        struct Request<'a> {
-            from: &'a str,
-        }
-        self.send_json(
-            Method::POST,
-            "/tickets/default-intake-ready-body",
-            Some(&Request { from }),
-        )
-        .unwrap_or_else(|error| error.to_string())
-    }
-
-    fn list(&self, filter: TicketListQuery) -> ticket::Result<Vec<TicketSummary>> {
-        self.list_tickets(&filter).map_err(ticket_client_error)
-    }
-
-    fn show(&self, id: TicketIdOrSlug) -> ticket::Result<Ticket> {
-        self.show_ticket(&id).map_err(ticket_client_error)
-    }
-
-    fn create(&self, input: NewTicket) -> ticket::Result<TicketRef> {
-        self.create_ticket(&input).map_err(ticket_client_error)
-    }
-
-    fn edit_item(&self, id: TicketIdOrSlug, edit: TicketItemEdit) -> ticket::Result<Ticket> {
-        self.send_json(
-            Method::PATCH,
-            &format!(
-                "/tickets/{}/item",
-                encode_path_segment(&ticket_reference(&id))
-            ),
-            Some(&edit),
-        )
-        .map_err(ticket_client_error)
-    }
-
-    fn dependency_check(&self, id: TicketIdOrSlug) -> ticket::Result<TicketDependencyCheck> {
-        self.get_json(&format!(
-            "/tickets/{}/dependency-check",
-            encode_path_segment(&ticket_reference(&id))
-        ))
-        .map_err(ticket_client_error)
-    }
-
-    fn add_event(&self, id: TicketIdOrSlug, event: NewTicketEvent) -> ticket::Result<()> {
-        self.add_ticket_event(&id, &event)
-            .map_err(ticket_client_error)
-    }
-
-    fn add_state_changed(
-        &self,
-        id: TicketIdOrSlug,
-        change: TicketStateChange,
-    ) -> ticket::Result<()> {
-        self.send_unit(
-            Method::POST,
-            &format!(
-                "/tickets/{}/state-changes",
-                encode_path_segment(&ticket_reference(&id))
-            ),
-            Some(&change),
-        )
-        .map_err(ticket_client_error)
-    }
-
-    fn add_intake_summary(
-        &self,
-        id: TicketIdOrSlug,
-        summary: TicketIntakeSummary,
-    ) -> ticket::Result<()> {
-        self.send_unit(
-            Method::POST,
-            &format!(
-                "/tickets/{}/intake-summaries",
-                encode_path_segment(&ticket_reference(&id))
-            ),
-            Some(&summary),
-        )
-        .map_err(ticket_client_error)
-    }
-
-    fn set_state_field(
-        &self,
-        id: TicketIdOrSlug,
-        field: &str,
-        change: TicketStateChange,
-    ) -> ticket::Result<()> {
-        self.send_unit(
-            Method::POST,
-            &format!(
-                "/tickets/{}/state-fields/{}",
-                encode_path_segment(&ticket_reference(&id)),
-                encode_path_segment(field)
-            ),
-            Some(&change),
-        )
-        .map_err(ticket_client_error)
-    }
-
-    fn set_workflow_state(
-        &self,
-        id: TicketIdOrSlug,
-        change: TicketStateChange,
-    ) -> ticket::Result<()> {
-        self.set_ticket_workflow_state(&id, &change)
-            .map_err(ticket_client_error)
-    }
-
-    fn mark_ready(&self, id: TicketIdOrSlug, request: TicketMarkReady) -> ticket::Result<Ticket> {
-        self.send_json(
-            Method::POST,
-            &format!(
-                "/tickets/{}/workflow/mark-ready",
-                encode_path_segment(&ticket_reference(&id))
-            ),
-            Some(&request),
-        )
-        .map_err(ticket_client_error)
-    }
-
-    fn queue_ready(&self, id: TicketIdOrSlug, _queued_by: &str) -> ticket::Result<()> {
-        self.send_unit::<()>(
-            Method::POST,
-            &format!(
-                "/tickets/{}/workflow/queue",
-                encode_path_segment(&ticket_reference(&id))
-            ),
-            None,
-        )
-        .map_err(ticket_client_error)
-    }
-
-    fn close(&self, id: TicketIdOrSlug, resolution: MarkdownText) -> ticket::Result<()> {
-        self.close_ticket(&id, &resolution)
-            .map_err(ticket_client_error)
-    }
-
-    fn add_ticket_relation(
-        &self,
-        id: TicketIdOrSlug,
-        relation: NewTicketRelation,
-    ) -> ticket::Result<TicketRelation> {
-        BackendWorkspaceProductClient::add_ticket_relation(self, &id, &relation)
-            .map_err(ticket_client_error)
-    }
-
-    fn remove_ticket_relation(
-        &self,
-        id: TicketIdOrSlug,
-        kind: TicketRelationKind,
-        target: TicketIdOrSlug,
-    ) -> ticket::Result<TicketRelation> {
-        #[derive(Serialize)]
-        struct Request {
-            kind: TicketRelationKind,
-            target: String,
-        }
-        self.send_json(
-            Method::DELETE,
-            &format!(
-                "/tickets/{}/relations",
-                encode_path_segment(&ticket_reference(&id))
-            ),
-            Some(&Request {
-                kind,
-                target: ticket_reference(&target),
-            }),
-        )
-        .map_err(ticket_client_error)
-    }
-
-    fn query_ticket_relations(
-        &self,
-        ticket: Option<TicketIdOrSlug>,
-        kind: Option<TicketRelationKind>,
-    ) -> ticket::Result<Vec<TicketRelation>> {
-        BackendWorkspaceProductClient::query_ticket_relations(self, ticket.as_ref(), kind)
-            .map_err(ticket_client_error)
-    }
-
-    fn relation_view(&self, id: TicketIdOrSlug) -> ticket::Result<TicketRelationView> {
-        self.get_json(&format!(
-            "/tickets/{}/relation-view",
-            encode_path_segment(&ticket_reference(&id))
-        ))
-        .map_err(ticket_client_error)
-    }
-
-    fn add_orchestration_plan_record(
-        &self,
-        id: TicketIdOrSlug,
-        record: NewOrchestrationPlanRecord,
-    ) -> ticket::Result<OrchestrationPlanRecord> {
-        self.send_json(
-            Method::POST,
-            &format!(
-                "/tickets/{}/orchestration-plans",
-                encode_path_segment(&ticket_reference(&id))
-            ),
-            Some(&record),
-        )
-        .map_err(ticket_client_error)
-    }
-
-    fn query_orchestration_plan_records(
-        &self,
-        ticket: Option<TicketIdOrSlug>,
-        kind: Option<OrchestrationPlanKind>,
-    ) -> ticket::Result<Vec<OrchestrationPlanRecord>> {
-        #[derive(Serialize)]
-        struct Query {
-            ticket: Option<TicketIdOrSlug>,
-            kind: Option<OrchestrationPlanKind>,
-        }
-        self.send_json(
-            Method::POST,
-            TICKET_ORCHESTRATION_PLANS_QUERY_PATH,
-            Some(&Query { ticket, kind }),
-        )
-        .map_err(ticket_client_error)
-    }
-
-    fn doctor(&self) -> ticket::Result<TicketDoctorReport> {
-        self.ticket_doctor().map_err(ticket_client_error)
-    }
-}
-
-fn ticket_client_error(error: BackendWorkspaceClientError) -> TicketError {
-    TicketError::Sqlite(format!("Backend request failed: {error}"))
-}
-
-fn ensure_success(
-    response: reqwest::blocking::Response,
-) -> Result<reqwest::blocking::Response, BackendWorkspaceClientError> {
-    if response.status().is_success() {
-        return Ok(response);
-    }
-    let status = response.status().as_u16();
-    let message = response
-        .text()
-        .unwrap_or_else(|_| "Backend request failed".to_string());
-    Err(BackendWorkspaceClientError::RequestFailed { status, message })
-}
-
-fn ticket_reference(id: &TicketIdOrSlug) -> String {
-    match id {
-        TicketIdOrSlug::Id(id) => id.to_string(),
-        TicketIdOrSlug::Slug(slug) | TicketIdOrSlug::Query(slug) => slug.clone(),
-    }
-}
-
-fn ticket_list_state_query(query: &TicketListQuery) -> String {
-    match &query.state {
-        TicketStateSelector::Active => "active".to_string(),
-        TicketStateSelector::All => "all".to_string(),
-        TicketStateSelector::States(states) => states
-            .iter()
-            .copied()
-            .map(TicketListState::as_str)
-            .collect::<Vec<_>>()
-            .join(","),
-    }
-}
-
-fn encode_path_segment(value: &str) -> String {
-    let mut encoded = String::with_capacity(value.len());
-    for byte in value.bytes() {
-        if byte.is_ascii_alphanumeric() || matches!(byte, b'-' | b'.' | b'_' | b'~') {
-            encoded.push(char::from(byte));
-        } else {
-            use std::fmt::Write as _;
-            write!(&mut encoded, "%{byte:02X}").expect("writing to String cannot fail");
-        }
-    }
-    encoded
-}
-
-#[cfg(test)]
-mod tests {
-    use std::io::{Read, Write};
-    use std::net::TcpListener;
-    use std::sync::mpsc;
-    use std::thread;
-
-    use super::*;
-
-    fn one_response_server(
-        status: &str,
-        body: &str,
-    ) -> (String, mpsc::Receiver<String>, thread::JoinHandle<()>) {
-        let listener = TcpListener::bind("127.0.0.1:0").unwrap();
-        let address = listener.local_addr().unwrap();
-        let status = status.to_string();
-        let body = body.to_string();
-        let (sender, receiver) = mpsc::channel();
-        let handle = thread::spawn(move || {
-            let (mut stream, _) = listener.accept().unwrap();
-            let mut request = vec![0_u8; 8_192];
-            let bytes = stream.read(&mut request).unwrap();
-            sender
-                .send(String::from_utf8_lossy(&request[..bytes]).to_string())
-                .unwrap();
-            write!(
-                stream,
-                "HTTP/1.1 {status}\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{body}",
-                body.len()
-            )
-            .unwrap();
-        });
-        (format!("http://{address}"), receiver, handle)
-    }
-
-    fn response_sequence_server(
-        responses: Vec<(&'static str, &'static str)>,
-    ) -> (String, mpsc::Receiver<String>, thread::JoinHandle<()>) {
-        let listener = TcpListener::bind("127.0.0.1:0").unwrap();
-        let address = listener.local_addr().unwrap();
-        let (sender, receiver) = mpsc::channel();
-        let handle = thread::spawn(move || {
-            for (status, body) in responses {
-                let (mut stream, _) = listener.accept().unwrap();
-                let mut request = vec![0_u8; 16_384];
-                let bytes = stream.read(&mut request).unwrap();
-                sender
-                    .send(String::from_utf8_lossy(&request[..bytes]).to_string())
-                    .unwrap();
-                write!(
-                    stream,
-                    "HTTP/1.1 {status}\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{body}",
-                    body.len()
-                )
-                .unwrap();
-            }
-        });
-        (format!("http://{address}"), receiver, handle)
-    }
-
-    #[test]
-    fn objective_list_uses_workspace_scoped_backend_route() {
-        let body = r#"{"workspace_id":"workspace-a","limit":1000,"items":[],"source":"sqlite","diagnostics":[]}"#;
-        let (base_url, request, handle) = one_response_server("200 OK", body);
-        let client = BackendWorkspaceProductClient::new(base_url, "workspace-a").unwrap();
-
-        let response = client.list_objectives(1_000).unwrap();
-
-        assert!(response.items.is_empty());
-        assert!(
-            request
-                .recv()
-                .unwrap()
-                .starts_with("GET /api/w/workspace-a/objectives?limit=1000 ")
-        );
-        handle.join().unwrap();
-    }
-
-    #[test]
-    fn backend_mutation_failure_is_returned_without_local_fallback() {
-        let (base_url, request, handle) = one_response_server("403 Forbidden", "denied");
-        let client = BackendWorkspaceProductClient::new(base_url, "workspace-a").unwrap();
-
-        let error = client
-            .create_objective(&ObjectiveCreateRequest {
-                title: "Objective".to_string(),
-                body_md: "body".to_string(),
-                state: "active".to_string(),
-                linked_tickets: Vec::new(),
-            })
-            .unwrap_err();
-
-        assert!(error.to_string().contains("403"));
-        assert!(
-            request
-                .recv()
-                .unwrap()
-                .starts_with("POST /api/w/workspace-a/objectives ")
-        );
-        handle.join().unwrap();
-    }
-
-    #[test]
-    fn ticket_relation_query_uses_workspace_scoped_backend_route() {
-        let (base_url, request, handle) = one_response_server("200 OK", "[]");
-        let client = BackendWorkspaceProductClient::new(base_url, "workspace-a").unwrap();
-
-        let relations = client
-            .query_ticket_relations(
-                Some(&TicketIdOrSlug::Query("T-1".to_string())),
-                Some(TicketRelationKind::Related),
-            )
-            .unwrap();
-
-        assert!(relations.is_empty());
-        let request = request.recv().unwrap();
-        assert!(request.starts_with("POST /api/w/workspace-a/tickets/relations/search "));
-        assert!(request.contains("\"ticket\":{\"Query\":\"T-1\"}"));
-        handle.join().unwrap();
-    }
-
-    #[test]
-    fn orchestration_plan_query_uses_workspace_scoped_backend_route() {
-        let (base_url, request, handle) = one_response_server("200 OK", "[]");
-        let client = BackendWorkspaceProductClient::new(base_url, "workspace-a").unwrap();
-
-        let records = TicketBackend::query_orchestration_plan_records(&client, None, None).unwrap();
-
-        assert!(records.is_empty());
-        assert!(
-            request
-                .recv()
-                .unwrap()
-                .starts_with("POST /api/w/workspace-a/tickets/orchestration-plans/search ")
-        );
-        handle.join().unwrap();
-    }
-
-    #[test]
-    fn ticket_intake_launch_uses_backend_options_and_workspace_worker_route() {
-        let (base_url, requests, handle) = response_sequence_server(vec![
-            (
-                "200 OK",
-                r#"{"runtimes":[{"runtime_id":"embedded","can_spawn_worker":true,"working_directory_required":false}]}"#,
-            ),
-            (
-                "200 OK",
-                r#"{"runtime_id":"embedded","worker_id":"worker-1"}"#,
-            ),
-        ]);
-        let client = BackendWorkspaceProductClient::new(base_url, "workspace-a").unwrap();
-
-        let status = client.launch_ticket_intake("T-1").unwrap();
-
-        assert!(status.contains("embedded/worker-1"));
-        assert!(
-            requests
-                .recv()
-                .unwrap()
-                .starts_with("GET /api/w/workspace-a/workers/launch-options ")
-        );
-        let create_request = requests.recv().unwrap();
-        assert!(create_request.starts_with("POST /api/w/workspace-a/workers "));
-        assert!(create_request.contains("\"profile\":\"builtin:intake\""));
-        assert!(create_request.contains("Ticket T-1"));
-        handle.join().unwrap();
-    }
-
-    #[test]
-    fn workspace_orchestrator_launch_uses_scoped_backend_route() {
-        let body = r#"{"disposition":"created","worker":{"runtime_id":"embedded","worker_id":"worker-2"}}"#;
-        let (base_url, request, handle) = one_response_server("200 OK", body);
-        let client = BackendWorkspaceProductClient::new(base_url, "workspace-a").unwrap();
-
-        let status = client.start_workspace_orchestrator().unwrap();
-
-        assert!(status.contains("created at embedded/worker-2"));
-        assert!(
-            request
-                .recv()
-                .unwrap()
-                .starts_with("POST /api/w/workspace-a/orchestrator ")
-        );
-        handle.join().unwrap();
-    }
-
-    #[test]
-    fn product_client_requires_workspace_identity() {
-        let error = BackendWorkspaceProductClient::new("http://127.0.0.1:8787", "").unwrap_err();
-        assert!(error.to_string().contains("Workspace identity"));
-    }
-
-    #[test]
-    fn ticket_state_query_preserves_local_filter_semantics() {
-        assert_eq!(
-            ticket_list_state_query(&TicketListQuery::active()),
-            "active"
-        );
-        assert_eq!(ticket_list_state_query(&TicketListQuery::all()), "all");
-        assert_eq!(
-            ticket_list_state_query(&TicketListQuery {
-                state: TicketStateSelector::States(
-                    [TicketListState::Ready, TicketListState::InProgress]
-                        .into_iter()
-                        .collect(),
-                ),
-            }),
-            "ready,inprogress"
-        );
-    }
-
-    #[test]
-    fn ticket_and_objective_references_are_path_encoded() {
-        assert_eq!(encode_path_segment("T-1/a"), "T-1%2Fa");
-    }
-}
@@ -1,36 +0,0 @@
-use client::{
-    BackendTarget, CreateBackendWorkspaceRepository, CreateBackendWorkspaceRequest, Target,
-    WorkerConnectionSelector,
-};
-
-#[test]
-fn workspace_creation_request_preserves_operation_key_for_retry() {
-    let request = CreateBackendWorkspaceRequest {
-        operation_key: "workspace-create-1".to_string(),
-        display_name: "Alpha".to_string(),
-        repository: CreateBackendWorkspaceRepository {
-            uri: "/srv/repos/alpha".to_string(),
-            display_name: Some("Main".to_string()),
-            default_ref: Some("develop".to_string()),
-        },
-    };
-
-    assert_eq!(request.clone(), request);
-    assert_eq!(request.operation_key, "workspace-create-1");
-}
-
-#[test]
-fn backend_worker_connection_requires_explicit_workspace_scope() {
-    let target = BackendTarget::new("http://127.0.0.1:8787", None::<String>);
-    let error = match target.connect_worker(WorkerConnectionSelector::new("runtime-a", "worker-a"))
-    {
-        Ok(_) => panic!("unscoped Backend worker connection must fail"),
-        Err(error) => error,
-    };
-
-    assert!(
-        error
-            .to_string()
-            .contains("workspace selection is required")
-    );
-}
@@ -24,6 +24,7 @@ pub const MAX_TOTAL_BYTES: usize = 4 * 1024 * 1024;
 pub const MAX_PATH_BYTES: usize = 512;

 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, ts_rs::TS)]
+#[serde(transparent)]
 pub struct VirtualPath(String);

 impl VirtualPath {
@@ -1790,19 +1791,6 @@ mod tests {
        assert_eq!(path("profiles/main.dcdl").as_str(), "profiles/main.dcdl");
    }

-    #[test]
-    fn virtual_path_serde_shape_is_a_string() {
-        let path = path("profiles/main.dcdl");
-        assert_eq!(
-            serde_json::to_value(&path).unwrap(),
-            serde_json::json!(path.as_str())
-        );
-        assert_eq!(
-            serde_json::from_value::<VirtualPath>(serde_json::json!(path.as_str())).unwrap(),
-            path
-        );
-    }
-
    #[test]
    fn candidate_changes_are_atomic_ordered_and_conflict_checked() {
        let base = ConfigTreeSnapshot::from_entries(
@@ -0,0 +1,14 @@
+[package]
+name = "llm-engine-macros"
+description = "llm-engine's proc macros"
+version = "0.2.0"
+edition.workspace = true
+license.workspace = true
+
+[lib]
+proc-macro = true
+
+[dependencies]
+proc-macro2 = "1"
+quote = "1"
+syn = { version = "2", features = ["full"] }
@@ -0,0 +1,27 @@
+# llm-engine-macros
+
+## Role
+
+`llm-engine-macros` provides procedural macros for declaring Rust methods as LLM-callable tools.
+
+## Boundaries
+
+Owns:
+
+- compile-time generation of tool argument structures and definitions
+- small macro conveniences around tool descriptions and schemas
+
+Does not own:
+
+- runtime permission decisions
+- filesystem scope checks
+- tool execution policy
+- model/tool-loop orchestration
+
+## Design notes
+
+Macros reduce boilerplate, but they must not imply capability. A generated tool definition is still subject to host permissions, application scope, and runtime policy.
+
+## See also
+
+- [`../../docs/design/tool-permissions-scope.md`](../../docs/design/tool-permissions-scope.md)
@@ -0,0 +1,344 @@
+//! llm-engine-macros - Procedural macros for Tool generation
+//!
+//! Provides `#[tool_registry]` and `#[tool]` macros to
+//! automatically generate `Tool` trait implementations from user-defined methods.
+
+use proc_macro::TokenStream;
+use quote::{format_ident, quote};
+use syn::{
+    Attribute, FnArg, ImplItem, ItemImpl, Lit, Meta, Pat, ReturnType, Type, parse_macro_input,
+};
+
+/// Macro applied to an `impl` block that generates tools from methods marked with `#[tool]`.
+///
+/// # Example
+/// ```ignore
+/// #[tool_registry]
+/// impl MyApp {
+///     /// Get user information
+///     /// Retrieves a user from the database by their ID.
+///     #[tool]
+///     async fn get_user(&self, user_id: String) -> Result<User, Error> { ... }
+/// }
+/// ```
+///
+/// This generates:
+/// - `GetUserArgs` struct (for arguments)
+/// - `Tool_get_user` struct (Tool wrapper)
+/// - `impl Tool for Tool_get_user`
+/// - `impl MyApp { fn get_user_tool(&self) -> Tool_get_user }`
+#[proc_macro_attribute]
+pub fn tool_registry(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    let mut impl_block = parse_macro_input!(item as ItemImpl);
+    let self_ty = &impl_block.self_ty;
+
+    let mut generated_items = Vec::new();
+
+    for item in &mut impl_block.items {
+        if let ImplItem::Fn(method) = item {
+            // Look for #[tool] attribute
+            let mut is_tool = false;
+
+            // Iterate through attributes to check for tool and remove it
+            method.attrs.retain(|attr| {
+                if attr.path().is_ident("tool") {
+                    is_tool = true;
+                    false // Remove the attribute
+                } else {
+                    true
+                }
+            });
+
+            if is_tool {
+                let tool_impl = generate_tool_impl(self_ty, method);
+                generated_items.push(tool_impl);
+            }
+        }
+    }
+
+    let expanded = quote! {
+        #impl_block
+
+        #(#generated_items)*
+    };
+
+    TokenStream::from(expanded)
+}
+
+/// Extract description from doc comments
+fn extract_doc_comment(attrs: &[Attribute]) -> String {
+    let mut lines = Vec::new();
+
+    for attr in attrs {
+        if attr.path().is_ident("doc") {
+            if let Meta::NameValue(meta) = &attr.meta {
+                if let syn::Expr::Lit(expr_lit) = &meta.value {
+                    if let Lit::Str(lit_str) = &expr_lit.lit {
+                        let line = lit_str.value();
+                        // Remove only the leading space (after ///)
+                        let trimmed = line.strip_prefix(' ').unwrap_or(&line);
+                        lines.push(trimmed.to_string());
+                    }
+                }
+            }
+        }
+    }
+
+    lines.join("\n")
+}
+
+/// Extract description from #[description = "..."] attribute
+fn extract_description_attr(attrs: &[syn::Attribute]) -> Option<String> {
+    for attr in attrs {
+        if attr.path().is_ident("description")
+            && let Meta::NameValue(meta) = &attr.meta
+            && let syn::Expr::Lit(expr_lit) = &meta.value
+            && let Lit::Str(lit_str) = &expr_lit.lit
+        {
+            return Some(lit_str.value());
+        }
+    }
+    None
+}
+
+fn is_tool_execution_context_type(ty: &Type) -> bool {
+    let Type::Path(path) = ty else {
+        return false;
+    };
+    path.path
+        .segments
+        .last()
+        .is_some_and(|segment| segment.ident == "ToolExecutionContext")
+}
+
+/// Generate Tool implementation from a method
+fn generate_tool_impl(self_ty: &Type, method: &syn::ImplItemFn) -> proc_macro2::TokenStream {
+    let sig = &method.sig;
+    let method_name = &sig.ident;
+    let tool_name = method_name.to_string();
+
+    // Generate struct names (convert to PascalCase)
+    let pascal_name = to_pascal_case(&method_name.to_string());
+    let tool_struct_name = format_ident!("Tool{}", pascal_name);
+    let args_struct_name = format_ident!("{}Args", pascal_name);
+    let definition_name = format_ident!("{}_definition", method_name);
+
+    // Get description from doc comments
+    let description = extract_doc_comment(&method.attrs);
+    let description = if description.is_empty() {
+        format!("Tool: {}", tool_name)
+    } else {
+        description
+    };
+
+    // Parse method arguments (excluding self). A parameter typed as
+    // ToolExecutionContext is supplied from the execution context and is not
+    // exposed in the JSON input schema.
+    let method_args: Vec<_> = sig
+        .inputs
+        .iter()
+        .filter_map(|arg| {
+            if let FnArg::Typed(pat_type) = arg {
+                Some(pat_type)
+            } else {
+                None // Exclude self
+            }
+        })
+        .collect();
+    let json_args: Vec<_> = method_args
+        .iter()
+        .copied()
+        .filter(|pat_type| !is_tool_execution_context_type(pat_type.ty.as_ref()))
+        .collect();
+
+    // Generate argument struct fields
+    let arg_fields: Vec<_> = json_args
+        .iter()
+        .map(|pat_type| {
+            let pat = &pat_type.pat;
+            let ty = &pat_type.ty;
+            let desc = extract_description_attr(&pat_type.attrs);
+
+            // Extract identifier from pattern
+            let field_name = if let Pat::Ident(pat_ident) = pat.as_ref() {
+                &pat_ident.ident
+            } else {
+                panic!("Only simple identifiers are supported for tool arguments");
+            };
+
+            // Convert #[description] to schemars doc if present
+            if let Some(desc_str) = desc {
+                quote! {
+                    #[schemars(description = #desc_str)]
+                    pub #field_name: #ty
+                }
+            } else {
+                quote! {
+                    pub #field_name: #ty
+                }
+            }
+        })
+        .collect();
+
+    // Code to expand method arguments in execute
+    let call_args: Vec<_> = method_args
+        .iter()
+        .map(|pat_type| {
+            if is_tool_execution_context_type(pat_type.ty.as_ref()) {
+                quote! { ctx.clone() }
+            } else if let Pat::Ident(pat_ident) = pat_type.pat.as_ref() {
+                let ident = &pat_ident.ident;
+                quote! { args.#ident }
+            } else {
+                panic!("Only simple identifiers are supported");
+            }
+        })
+        .collect();
+    let method_call = if call_args.is_empty() {
+        quote! { self.ctx.#method_name() }
+    } else {
+        quote! { self.ctx.#method_name(#(#call_args),*) }
+    };
+
+    // Check if method is async
+    let is_async = sig.asyncness.is_some();
+
+    // Parse return type and determine if Result
+    let awaiter = if is_async {
+        quote! { .await }
+    } else {
+        quote! {}
+    };
+
+    // Determine if return type is Result
+    let result_handling = if is_result_type(&sig.output) {
+        quote! {
+            match result {
+                Ok(val) => Ok(format!("{:?}", val).into()),
+                Err(e) => Err(::llm_engine::tool::ToolError::ExecutionFailed(format!("{}", e))),
+            }
+        }
+    } else {
+        quote! {
+            Ok(format!("{:?}", result).into())
+        }
+    };
+
+    // Create empty Args struct if no arguments
+    let args_struct_def = if arg_fields.is_empty() {
+        quote! {
+            #[derive(serde::Deserialize, schemars::JsonSchema)]
+            struct #args_struct_name {}
+        }
+    } else {
+        quote! {
+            #[derive(serde::Deserialize, schemars::JsonSchema)]
+            struct #args_struct_name {
+                #(#arg_fields),*
+            }
+        }
+    };
+
+    // Execute body handling for no arguments case
+    let execute_body = if json_args.is_empty() {
+        quote! {
+            // Allow empty JSON object even with no JSON arguments
+            let _: #args_struct_name = serde_json::from_str(input_json)
+                .unwrap_or(#args_struct_name {});
+
+            let result = #method_call #awaiter;
+            #result_handling
+        }
+    } else {
+        quote! {
+            let args: #args_struct_name = serde_json::from_str(input_json)
+                .map_err(|e| ::llm_engine::tool::ToolError::InvalidArgument(e.to_string()))?;
+
+            let result = #method_call #awaiter;
+            #result_handling
+        }
+    };
+
+    quote! {
+        #args_struct_def
+
+        #[derive(Clone)]
+        pub struct #tool_struct_name {
+            ctx: #self_ty,
+        }
+
+        #[async_trait::async_trait]
+        impl ::llm_engine::tool::Tool for #tool_struct_name {
+            async fn execute(&self, input_json: &str, ctx: ::llm_engine::tool::ToolExecutionContext) -> Result<::llm_engine::tool::ToolOutput, ::llm_engine::tool::ToolError> {
+                let _ = &ctx;
+                #execute_body
+            }
+        }
+
+        impl #self_ty {
+            /// Get ToolDefinition (for registering with Engine)
+            pub fn #definition_name(&self) -> ::llm_engine::tool::ToolDefinition {
+                let ctx = self.clone();
+                ::std::sync::Arc::new(move || {
+                    let schema = schemars::schema_for!(#args_struct_name);
+                    let meta = ::llm_engine::tool::ToolMeta::new(#tool_name)
+                        .description(#description)
+                        .input_schema(serde_json::to_value(schema).unwrap_or(serde_json::json!({})));
+                    let tool: ::std::sync::Arc<dyn ::llm_engine::tool::Tool> =
+                        ::std::sync::Arc::new(#tool_struct_name { ctx: ctx.clone() });
+                    (meta, tool)
+                })
+            }
+        }
+    }
+}
+
+/// Determine if return type is Result
+fn is_result_type(return_type: &ReturnType) -> bool {
+    match return_type {
+        ReturnType::Default => false,
+        ReturnType::Type(_, ty) => {
+            // For Type::Path, check if last segment is "Result"
+            if let Type::Path(type_path) = ty.as_ref() {
+                if let Some(segment) = type_path.path.segments.last() {
+                    return segment.ident == "Result";
+                }
+            }
+            false
+        }
+    }
+}
+
+/// Convert snake_case to PascalCase
+fn to_pascal_case(s: &str) -> String {
+    s.split('_')
+        .map(|part| {
+            let mut chars = part.chars();
+            match chars.next() {
+                None => String::new(),
+                Some(first) => first.to_uppercase().chain(chars).collect(),
+            }
+        })
+        .collect()
+}
+
+/// Marker attribute. Does nothing here as it's processed by `tool_registry`.
+#[proc_macro_attribute]
+pub fn tool(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    item
+}
+
+/// Marker for argument attributes. Interpreted by `tool_registry` during parsing.
+///
+/// # Example
+/// ```ignore
+/// #[tool]
+/// async fn get_user(
+///     &self,
+///     #[description = "The ID of the user to retrieve"] user_id: String
+/// ) -> Result<User, Error> { ... }
+/// ```
+#[proc_macro_attribute]
+pub fn description(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    item
+}
@@ -1,18 +1,9 @@
 [package]
-name = "agen"
-description = "Provider-neutral orchestration for tool-using LLM applications"
+name = "llm-engine"
+description = "A library for building autonomous LLM-powered systems"
 version = "0.2.1"
 edition.workspace = true
-rust-version = "1.86"
 license.workspace = true
-readme = "README.md"
-repository = "https://gitea.hareworks.net/Hare/yoi"
-homepage = "https://gitea.hareworks.net/Hare/yoi"
-documentation = "https://docs.rs/agen"
-keywords = ["llm", "agent", "tools", "streaming", "orchestration"]
-categories = ["api-bindings", "asynchronous"]
-include = ["src/**", "tests/**", "examples/*.rs", "docs/**", "README.md", "LICENSE"]
-autoexamples = false

 [features]
 default = []
@@ -21,7 +12,6 @@ codex = ["dep:chrono"]
 [dependencies]
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-schemars = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 async-trait = { workspace = true }
@@ -33,23 +23,13 @@ eventsource-stream = "0.2"
 zstd = "0.13"
 base64 = "0.22.1"
 chrono = { version = "0.4", default-features = false, features = ["serde", "clock"], optional = true }
-agen-macros = { workspace = true }
+llm-engine-macros = { workspace = true }

 [dev-dependencies]
 clap = { version = "4.5", features = ["derive", "env"] }
+schemars = { workspace = true }
 tempfile = { workspace = true }
 dotenv = "0.15"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 trybuild = "1.0.116"
 wiremock = "0.6.5"
-
-[[example]]
-name = "engine_cancel_demo"
-path = "examples/engine_cancel_demo.rs"
-
-[[example]]
-name = "engine_cli"
-path = "examples/engine_cli.rs"
-
-[package.metadata.docs.rs]
-all-features = true
@@ -0,0 +1,32 @@
+# llm-engine
+
+## Role
+
+`llm-engine` owns provider-independent model turn orchestration over committed history, tools, callbacks, retries, continuation, pruning, and compaction boundaries.
+
+## Boundaries
+
+Owns:
+
+- Engine history mutation and append contracts
+- tool-call loop semantics
+- pre-stream retry and stream-started continuation policy
+- pruning/compaction coordination from the Engine perspective
+- provider-neutral events/callbacks/interceptors
+
+Does not own:
+
+- Host application names, sockets, process lifecycle, or scope delegation
+- Product CLI shape
+- Provider catalog and secret resolution
+- Durable application state outside engine history
+
+## Design notes
+
+The Engine is where turn lifecycle belongs because it sees history, in-flight usage, partial output, and tool-call state. It should not receive context-only volatile facts; model-affecting inputs must first be appended to history.
+
+## See also
+
+- [`../../docs/design/context-history.md`](../../docs/design/context-history.md)
+- [`../../docs/design/compaction.md`](../../docs/design/compaction.md)
+- [`../../docs/design/provider-model-boundary.md`](../../docs/design/provider-model-boundary.md)
@@ -0,0 +1,73 @@
+# llm-engine アーキテクチャ
+
+## 概要
+
+llm-engineは3層構成でLLMとのインタラクションを管理する。
+
+```
+┌─────────────────────────────────────────┐
+│  Engine (オーケストレーション)            │
+│  ターンループ / フック / ツール実行       │
+│  Type-state: Mutable ↔ CacheLocked      │
+└───────────┬─────────────────────────────┘
+            │
+┌───────────▼─────────────────────────────┐
+│  Timeline (イベント処理)                 │
+│  Handler dispatch / Block collectors     │
+└───────────┬─────────────────────────────┘
+            │
+┌───────────▼─────────────────────────────┐
+│  LLM Client (プロトコル)                 │
+│  Provider (HTTP) / Scheme (変換)         │
+│  Anthropic / OpenAI / Gemini / Ollama    │
+└─────────────────────────────────────────┘
+```
+
+## モジュール構成
+
+| モジュール | 責務 | 要件 |
+|---|---|---|
+| `engine` | ターンループ、フック統合、ツール実行、Pause/Resume | R1, R4 |
+| `state` | Type-state (Mutable/CacheLocked) | R2 |
+| `hook` | Hook trait、10フックポイント | R3, R4 |
+| `tool` / `tool_server` | ツール定義・登録・実行 | R3 |
+| `timeline` | イベントストリーム処理、Handler dispatch | — |
+| `handler` | Handler/Kind trait、ブロック別ハンドラ | — |
+| `callback` | クロージャベースイベント購読（`on_text_block`, `on_usage` 等） | — |
+| `llm_client` | LLMプロバイダへのHTTPリクエスト/ストリーミング | — |
+| `llm_client/scheme` | プロバイダ固有ワイヤーフォーマット変換 | — |
+| `llm_client/providers` | Anthropic, OpenAI, Gemini, Ollama実装 | — |
+
+## データフロー
+
+### リクエスト（送信）
+```
+Engine.history (Vec<Item>)
+  → build_request() → Request { items, tools, config }
+    → Scheme.build_request() → プロバイダ固有JSON
+      → Provider.stream() → HTTP POST
+```
+
+### レスポンス（受信）
+```
+HTTP SSE bytes
+  → Provider → SSE events
+    → Scheme.parse_event() → Event (統一型)
+      → Timeline.dispatch() → Handler.on_event()
+        → TextBlockCollector / ToolCallCollector
+          → Engine: 履歴に追加、ツール実行判定
+```
+
+## 内部型
+
+### Item (会話履歴の単位)
+- `Item::Message` — テキストメッセージ (user/assistant)
+- `Item::ToolCall` — ツール呼び出し
+- `Item::ToolResult` — ツール実行結果
+- `Item::Reasoning` — 思考 (Extended Thinking)
+
+### Event (ストリーミングイベント)
+- Meta: `Ping`, `Usage`, `Status`, `Error`
+- Block: `BlockStart` → `BlockDelta`* → `BlockStop` / `BlockAbort`
+
+単一の `Event` 型が全層で共有される（`llm_client::event` で定義、他層はre-export）。
@@ -0,0 +1,48 @@
+# llm-engine 要件
+
+## 前提
+
+a. userメッセージを追加しなくてもagentの途中ママ投げれば、AIはそれを自身の生成途中と認識して普通に継続する
+b. KVキャッシュは速度・効率の面で有利で、コンテキストの事後改変はキャッシュヒット率を大幅に下げる
+c. ツール・フックの基本的なスキーマ自動化を提供する
+
+## 要件
+
+### R1: Resume/Pause
+
+メッセージの送信と生成のResume、一時停止/再開。
+
+- `Engine::run()` でターンを開始
+- フックから `Pause` を返してターンを一時停止
+- `Engine::resume()` でユーザーメッセージを追加せず継続
+- AIは中断を認識せず、継続として処理する
+
+**実装**: `engine.rs` — `resume()`, `get_pending_tool_calls()`, `EngineResult::Paused`
+
+### R2: 暗黙的KVキャッシュ保証
+
+キャッシュを破壊しうる操作を明示的にブロックせずとも、いつの間にかキャッシュ破壊してた状態にはしたくない。
+
+- Type-stateパターン（`Mutable` / `CacheLocked`）でコンパイル時に保証
+- `Engine::lock()` でCacheLocked状態に遷移
+- CacheLocked状態ではシステムプロンプトや履歴の変更APIが型レベルで利用不可
+- `locked_prefix_len` でプレフィックスの不変性を追跡
+
+**実装**: `state.rs` (sealed trait), `engine.rs` (state-specific impl blocks)
+
+### R3: ツール・フックスキーマ自動化
+
+- `#[tool]` マクロでツール定義を自動生成
+- `#[tool_registry]` マクロでツールサーバーを自動構成
+- `Hook` traitで10種のフックポイント
+
+**実装**: `llm-engine-macros/`, `tool.rs`, `tool_server.rs`, `hook.rs`
+
+### R4: フックは上層の関心事
+
+フックはLLMクライアント層ではなく、Engine（オーケストレーション）層に配置する。
+
+- LLMクライアント (`llm_client/`) はストリーミングとプロトコルのみ
+- Engine層でフック実行、ツール統合、Pause/Resume制御
+
+**実装**: `engine.rs` (hook integration), `hook.rs` (trait definitions)
@@ -2,9 +2,9 @@
 //!
 //! Example of cancelling from another thread during streaming

-use agen::llm_client::scheme::{Scheme, anthropic::AnthropicScheme};
-use agen::llm_client::transport::{HttpTransport, ResolvedAuth};
-use agen::{Engine, EngineResult};
+use llm_engine::llm_client::scheme::{Scheme, anthropic::AnthropicScheme};
+use llm_engine::llm_client::transport::{HttpTransport, ResolvedAuth};
+use llm_engine::{Engine, EngineResult};
 use std::time::Duration;

 #[tokio::main]
@@ -38,7 +38,8 @@ use async_trait::async_trait;
 use tracing::info;
 use tracing_subscriber::EnvFilter;

-use agen::{
+use clap::{Parser, ValueEnum};
+use llm_engine::{
    Engine,
    interceptor::{Interceptor, PostToolAction, ToolResultInfo},
    llm_client::{
@@ -50,9 +51,12 @@ use agen::{
        transport::{HttpTransport, ResolvedAuth},
    },
    timeline::{Handler, TextBlockEvent, TextBlockKind, ToolUseBlockEvent, ToolUseBlockKind},
-    tool_registry,
 };
-use clap::{Parser, ValueEnum};
+use llm_engine_macros::tool_registry;
+
+// Required imports for macro expansion
+use schemars;
+use serde;

 // =============================================================================
 // Provider Definition
@@ -19,11 +19,11 @@
 mod recorder;
 mod scenarios;

-use agen::llm_client::scheme::{
+use clap::{Parser, ValueEnum};
+use llm_engine::llm_client::scheme::{
    Scheme, anthropic::AnthropicScheme, gemini::GeminiScheme, openai_chat::OpenAIScheme,
 };
-use agen::llm_client::transport::{HttpTransport, ResolvedAuth};
-use clap::{Parser, ValueEnum};
+use llm_engine::llm_client::transport::{HttpTransport, ResolvedAuth};

 fn make_transport<S: Scheme>(scheme: S, model: &str, auth: ResolvedAuth) -> HttpTransport<S> {
    let cap = scheme.default_capability();
@@ -7,8 +7,8 @@ use std::io::{BufWriter, Write};
 use std::path::Path;
 use std::time::{Instant, SystemTime, UNIX_EPOCH};

-use agen::llm_client::{LlmClient, Request};
 use futures::StreamExt;
+use llm_engine::llm_client::{LlmClient, Request};

 /// Recorded event
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
@@ -2,7 +2,7 @@
 //!
 //! Defines requests and output file names for each scenario

-use agen::llm_client::{Request, ToolDefinition};
+use llm_engine::llm_client::{Request, ToolDefinition};

 /// Test scenario
 pub struct TestScenario {
@@ -88,7 +88,7 @@ pub enum EngineResult {
    Yielded,
 }

-/// Result of [`Engine::run`] or [`Engine::resume`].
+/// Result of [`Engine<C, Mutable>::run()`] / [`Engine<C, Mutable>::resume()`].
 ///
 /// Contains the `Locked` Engine (ready for subsequent runs) and the outcome.
 pub struct EngineRunOutput<C: LlmClient> {
@@ -181,7 +181,7 @@ pub struct Engine<C: LlmClient, S: EngineState = Mutable> {
    locked_prefix_len: usize,
    /// AgentTurn count.
    ///
-    /// Once retry (`agen-stream-continuation`) is implemented, an
+    /// Once retry (`llm-engine-stream-continuation`) is implemented, an
    /// AgentTurn collapses N retried `LlmCall`s with identical input;
    /// today retry is not implemented so AgentTurn and LlmCall fire 1:1
    /// and the increment site (the LLM-call loop) is shared.
@@ -1242,7 +1242,7 @@ impl<C: LlmClient, S: EngineState> Engine<C, S> {
            }

            // LlmCall boundary fires per LLM generation request — today
-            // 1:1 with AgentTurn, but retry (`agen-stream-continuation`)
+            // 1:1 with AgentTurn, but retry (`llm-engine-stream-continuation`)
            // will multiply this within a single AgentTurn.
            let current_llm_call = self.llm_call_count;
            for cb in &self.llm_call_start_cbs {
@@ -1696,7 +1696,8 @@ impl<C: LlmClient> Engine<C, Mutable> {
    /// Register a tool factory for deferred initialization.
    ///
    /// The factory is queued and executed at the next `run()` or `resume()` call.
-    /// Duplicate name detection occurs when pending tools are flushed before that call.
+    /// Duplicate name detection occurs at that point and surfaces as
+    /// [`EngineError::ToolRegistry`].
    pub fn register_tool(&mut self, factory: EngineToolDefinition) {
        self.tool_server.register_tool(factory);
    }
@@ -1879,7 +1880,7 @@ impl<C: LlmClient> Engine<C, Mutable> {
    /// This is the primary entry point for first use. Equivalent to
    /// `self.lock()` followed by `locked.run(user_input)`.
    ///
-    /// Subsequent runs can call [`Engine::run`] directly.
+    /// Subsequent runs can use [`Engine<C, Locked>::run()`] directly.
    /// To edit state between turns, call [`unlock()`](Engine::unlock) first.
    pub async fn run(
        self,
@@ -32,7 +32,7 @@ pub trait Kind {
 /// # Examples
 ///
 /// ```ignore
-/// use agen::timeline::{Handler, TextBlockEvent, TextBlockKind};
+/// use llm_engine::timeline::{Handler, TextBlockEvent, TextBlockKind};
 ///
 /// struct TextCollector {
 ///     texts: Vec<String>,
@@ -0,0 +1,66 @@
+//! llm-engine - LLM Engine Library
+//!
+//! Provides components for managing interactions with LLMs.
+//!
+//! # Main Components
+//!
+//! - [`Engine`] - Central component for managing LLM interactions
+//! - [`tool::Tool`] - Tools that can be invoked by the LLM
+//! - [`interceptor::Interceptor`] - Control-flow delegation for the execution loop
+//! - Closure-based event callbacks via `Engine::on_text_block()`, `on_tool_use_block()`, etc.
+//!
+//! # Quick Start
+//!
+//! ```ignore
+//! use llm_engine::{Engine, Item};
+//!
+//! // Create a Engine
+//! let mut engine = Engine::new(client)
+//!     .system_prompt("You are a helpful assistant.");
+//!
+//! // Register tools (optional)
+//! // engine.register_tool(my_tool_definition)?;
+//!
+//! // Run the interaction
+//! let history = engine.run("Hello!").await?;
+//! ```
+//!
+//! # Cache Protection
+//!
+//! `run()` automatically locks the cache. To edit state between turns,
+//! call `unlock_cache()` first; the next `run()` re-locks automatically.
+//!
+//! ```ignore
+//! engine.run("user input").await?;
+//! engine.unlock_cache();
+//! engine.set_system_prompt("new prompt");
+//! engine.run("next input").await?;
+//! ```
+
+mod engine;
+mod handler;
+mod message;
+
+pub(crate) mod callback;
+pub mod event;
+pub mod interceptor;
+pub mod llm_client;
+pub mod providers;
+pub mod prune;
+pub mod state;
+pub mod timeline;
+pub mod token_counter;
+pub mod tool;
+pub mod tool_server;
+pub mod usage_record;
+
+pub use callback::{TextBlockScope, ThinkingBlockScope, ToolUseBlockScope};
+pub use engine::{
+    Engine, EngineConfig, EngineError, EngineResult, EngineRunOutput, LlmRetryNotice,
+    ToolRegistryError,
+};
+pub use handler::ToolUseBlockStart;
+pub use interceptor::Interceptor;
+pub use message::{ContentPart, Item, Message, Role};
+pub use tool::{ToolCall, ToolExecutionContext, ToolOutputLimits, ToolResult};
+pub use usage_record::UsageRecord;
@@ -30,7 +30,7 @@ pub enum AuthRequirement {
 /// リクエスト毎に認証ヘッダを動的に組み立てるプロバイダ。
 ///
 /// access token が refresh で更新されたり、複数ヘッダを同時に注入する
-/// 必要があるケースで使う。実体は呼び出し側に置き、agen は
+/// 必要があるケースで使う。実体は呼び出し側に置き、llm-engine は
 /// trait を知るだけ。
 ///
 /// 返したヘッダはそのまま `HeaderMap` に挿入される。`Authorization`
@@ -8,7 +8,7 @@ use std::time::Duration;

 /// 指数バックオフ + ジッター + 累積タイムアウトを表すポリシー。
 ///
-/// `Default` は agen 全体の固定値を返す。呼び出し側からの上書きが
+/// `Default` は llm-engine 全体の固定値を返す。呼び出し側からの上書きが
 /// 必要になったら拡張する。
 #[derive(Debug, Clone)]
 pub struct RetryPolicy {
@@ -4,8 +4,8 @@
 //! function_call item が first-class で、SSE イベントも `response.*` 名前空間で
 //! 流れる。
 //!
-//! - リクエスト JSON 生成: `request`
-//! - SSE イベントパース → [`Event`](crate::llm_client::event::Event) 変換: `events`
+//! - リクエスト JSON 生成: [`request`]
+//! - SSE イベントパース → [`Event`](crate::llm_client::event::Event) 変換: [`events`]

 mod capability;
 mod events;
@@ -69,7 +69,7 @@ impl fmt::Debug for RequestTrace {
 /// # Examples
 ///
 /// ```ignore
-/// use agen::Item;
+/// use llm_engine::Item;
 ///
 /// let user = Item::user_message("Hello!");
 /// let assistant = Item::assistant_message("Hi there!");
@@ -24,7 +24,7 @@ mod private {
 /// # Examples
 ///
 /// ```ignore
-/// use agen::Engine;
+/// use llm_engine::Engine;
 ///
 /// let mut engine = Engine::new(client)
 ///     .system_prompt("You are helpful.");
@@ -348,7 +348,7 @@ where
 /// # Examples
 ///
 /// ```ignore
-/// use agen::{Timeline, Handler, TextBlockKind, TextBlockEvent};
+/// use llm_engine::{Timeline, Handler, TextBlockKind, TextBlockEvent};
 ///
 /// struct MyHandler;
 /// impl Handler<TextBlockKind> for MyHandler {
@@ -364,7 +364,7 @@ impl Default for ToolExecutionContext {
 /// # Manual Implementation
 ///
 /// ```ignore
-/// use agen::tool::{Tool, ToolError, ToolExecutionContext, ToolMeta, ToolDefinition, ToolOutput};
+/// use llm_engine::tool::{Tool, ToolError, ToolExecutionContext, ToolMeta, ToolDefinition, ToolOutput};
 /// use std::sync::Arc;
 ///
 /// struct MyTool { counter: std::sync::atomic::AtomicUsize }
@@ -8,13 +8,13 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::{Arc, Mutex};
 use std::time::Duration;

-use agen::Engine;
-use agen::llm_client::event::{Event, ResponseStatus, StatusEvent as ClientStatusEvent};
-use agen::llm_client::retry::RetryPolicy;
-use agen::llm_client::{ClientError, LlmClient, Request, ResponseStream};
-use agen::tool::{Tool, ToolDefinition, ToolError, ToolMeta, ToolOutput};
 use async_trait::async_trait;
 use common::MockLlmClient;
+use llm_engine::Engine;
+use llm_engine::llm_client::event::{Event, ResponseStatus, StatusEvent as ClientStatusEvent};
+use llm_engine::llm_client::retry::RetryPolicy;
+use llm_engine::llm_client::{ClientError, LlmClient, Request, ResponseStream};
+use llm_engine::tool::{Tool, ToolDefinition, ToolError, ToolMeta, ToolOutput};

 #[derive(Clone)]
 struct FailOnceClient {
@@ -221,7 +221,7 @@ impl Tool for FixedOutputTool {
    async fn execute(
        &self,
        _input_json: &str,
-        _ctx: agen::tool::ToolExecutionContext,
+        _ctx: llm_engine::tool::ToolExecutionContext,
    ) -> Result<ToolOutput, ToolError> {
        Ok(self.output.clone())
    }
@@ -260,7 +260,6 @@ async fn test_callback_tool_result_events() {
        ToolOutput {
            summary: "did the thing".into(),
            content: Some("full detail body".into()),
-            attachments: Vec::new(),
        },
    ));

@@ -297,7 +296,7 @@ impl Tool for ErroringTool {
    async fn execute(
        &self,
        _input_json: &str,
-        _ctx: agen::tool::ToolExecutionContext,
+        _ctx: llm_engine::tool::ToolExecutionContext,
    ) -> Result<ToolOutput, ToolError> {
        Err(ToolError::ExecutionFailed(self.message.clone()))
    }
@@ -6,11 +6,11 @@ use std::path::{Path, PathBuf};
 use std::pin::Pin;
 use std::sync::{Arc, Mutex};

-use agen::llm_client::event::{BlockType, DeltaContent, Event};
-use agen::llm_client::{ClientError, LlmClient, Request};
-use agen::timeline::{Handler, TextBlockEvent, TextBlockKind, Timeline};
 use async_trait::async_trait;
 use futures::Stream;
+use llm_engine::llm_client::event::{BlockType, DeltaContent, Event};
+use llm_engine::llm_client::{ClientError, LlmClient, Request};
+use llm_engine::timeline::{Handler, TextBlockEvent, TextBlockKind, Timeline};

 use std::sync::atomic::{AtomicUsize, Ordering};

@@ -272,7 +272,7 @@ pub fn assert_timeline_integration(subdir: &str) {
    });

    for event in &events {
-        let timeline_event: agen::timeline::event::Event = event.clone().into();
+        let timeline_event: llm_engine::timeline::event::Event = event.clone().into();
        timeline.dispatch(&timeline_event);
    }

@@ -9,10 +9,10 @@ use std::path::Path;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};

-use agen::Engine;
-use agen::tool::{Tool, ToolDefinition, ToolError, ToolMeta, ToolOutput};
 use async_trait::async_trait;
 use common::MockLlmClient;
+use llm_engine::Engine;
+use llm_engine::tool::{Tool, ToolDefinition, ToolError, ToolMeta, ToolOutput};

 /// Fixture directory path
 fn fixtures_dir() -> std::path::PathBuf {
@@ -61,7 +61,7 @@ impl Tool for MockWeatherTool {
    async fn execute(
        &self,
        input_json: &str,
-        _ctx: agen::tool::ToolExecutionContext,
+        _ctx: llm_engine::tool::ToolExecutionContext,
    ) -> Result<ToolOutput, ToolError> {
        self.call_count.fetch_add(1, Ordering::SeqCst);

@@ -102,7 +102,7 @@ fn test_mock_client_from_fixture() {
 /// Creates a client with programmatically constructed events instead of using fixture files.
 #[test]
 fn test_mock_client_from_events() {
-    use agen::llm_client::event::Event;
+    use llm_engine::llm_client::event::Event;

    // Specify events directly
    let events = vec![
@@ -180,7 +180,7 @@ async fn test_engine_tool_call() {
 /// Useful when test independence is needed and external file dependency should be eliminated.
 #[tokio::test]
 async fn test_engine_with_programmatic_events() {
-    use agen::llm_client::event::{Event, ResponseStatus, StatusEvent};
+    use llm_engine::llm_client::event::{Event, ResponseStatus, StatusEvent};

    // Construct event sequence programmatically
    let events = vec![
@@ -208,8 +208,8 @@ async fn test_engine_with_programmatic_events() {
 /// correctly extracts id, name, and input (JSON).
 #[tokio::test]
 async fn test_tool_call_collector_integration() {
-    use agen::llm_client::event::Event;
-    use agen::timeline::{Timeline, ToolCallCollector};
+    use llm_engine::llm_client::event::Event;
+    use llm_engine::timeline::{Timeline, ToolCallCollector};

    // Event sequence containing ToolUse block
    let events = vec![
@@ -225,7 +225,7 @@ async fn test_tool_call_collector_integration() {

    // Dispatch events
    for event in &events {
-        let timeline_event: agen::timeline::event::Event = event.clone().into();
+        let timeline_event: llm_engine::timeline::event::Event = event.clone().into();
        timeline.dispatch(&timeline_event);
    }

@@ -8,12 +8,12 @@ mod common;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::{Arc, Mutex};

-use agen::Item;
-use agen::llm_client::event::{Event, ResponseStatus, StatusEvent};
-use agen::tool::{Tool, ToolDefinition, ToolError, ToolMeta, ToolOutput};
-use agen::{Engine, EngineError};
 use async_trait::async_trait;
 use common::MockLlmClient;
+use llm_engine::Item;
+use llm_engine::llm_client::event::{Event, ResponseStatus, StatusEvent};
+use llm_engine::tool::{Tool, ToolDefinition, ToolError, ToolMeta, ToolOutput};
+use llm_engine::{Engine, EngineError};

 // =============================================================================
 // Mutable State Tests
@@ -150,7 +150,7 @@ impl Tool for CountingTool {
    async fn execute(
        &self,
        _input_json: &str,
-        _ctx: agen::tool::ToolExecutionContext,
+        _ctx: llm_engine::tool::ToolExecutionContext,
    ) -> Result<ToolOutput, ToolError> {
        self.calls.fetch_add(1, Ordering::SeqCst);
        Ok(format!("{}-ok", self.name).into())
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hare	532c833875	fix: track retained assignment parents	2026-08-20 11:47:09 +09:00
Hare	23289f6656	fix: validate assignment runtime snapshots	2026-08-20 11:47:09 +09:00
Hare	c71d5f05f0	fix: preserve retained assignment history	2026-08-20 11:47:09 +09:00
Hare	d8aac9748d	fix: bind assignment events to tickets	2026-08-20 11:47:09 +09:00
Hare	ce084714dc	fix: enforce assignment workspace references	2026-08-20 11:47:09 +09:00
Hare	ca6d0746b1	docs: add workspace schema migration runbook	2026-08-20 11:47:09 +09:00
Hare	9147ac303b	feat: enforce workspace-scoped resource references	2026-08-20 11:47:09 +09:00